diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index 2e937feb4..19364ca71 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -682,7 +682,8 @@ int TMenu_application::do_level()
     menu.set_handler(id, menu_item_handler);
     if (!_enabled[i]) menu.disable(id);
   }
-  menu.add_static(-1, 0, "Cerca", 1,-3);
+  
+  menu.add_static(DLG_NULL, 0, "Cerca", 1,-3); 
   TEdit_field& ef = menu.add_string(DLG_USER, 0, "", -12, -3, 50, "", bwidth+1);
   ef.set_handler(menu_find_handler);
   
diff --git a/ba/ba1100.cpp b/ba/ba1100.cpp
index 8c93aca57..7cd14a744 100755
--- a/ba/ba1100.cpp
+++ b/ba/ba1100.cpp
@@ -1,6 +1,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+// Serve per GetFreeSpace
+#define XVT_INCL_NATIVE
+#define STRICT
+
 #include <applicat.h>
 #include <isam.h>
 #include <mask.h>
@@ -13,11 +17,6 @@
 #include <extcdecl.h>
 #include <execp.h>
 
-#if XVT_OS == XVT_OS_WIN
-#define STRICT
-#include <windows.h>
-#endif
-
 #include "ba1.h"
 #include "ba1100.h"
 
@@ -650,11 +649,6 @@ void TManutenzione_app::delete_riga ()
 
 }
 
-#if XVT_OS == XVT_OS_WIN
-// Serve per GetFreeSpace
-#include <windows.h>
-#endif
-
 void TManutenzione_app::update_dir()
 {
   // Particolare significato dei flags oltre i 10000:
diff --git a/ba/ba2200.cpp b/ba/ba2200.cpp
index 1db5409b9..0f9c8ab34 100755
--- a/ba/ba2200.cpp
+++ b/ba/ba2200.cpp
@@ -1,7 +1,8 @@
-#define STRICT
-#include <windows.h>
 #include <direct.h>
 
+#define XVT_INCL_NATIVE
+#define STRICT
+
 #include <applicat.h>
 #include <colors.h>
 #include <config.h>