Remove the references to fg_os.hxx since the UL_USE_XXX variable is located in the...

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index bbdbda878f85260a37ba212f6d87e8a841b42ecc..48deee30cd54fa5ac836d0b3b20391e99f7830fb 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -39,7 +39,6 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 
-#include <Main/fg_os.hxx> // Must come *before* pu.h!
 #include <plib/pu.h>
 
 #include <Include/general.hxx>

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index 0b1289b5976463860f5b96a35e50fb1e16113365..1683e15c97741ed3ac1a027ac845015c1b4aea83 100644 (file)
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -33,7 +33,6 @@
 #  include <windows.h>
 #endif
 
-#include <Main/fg_os.hxx>  // must come before pu.h
 #include <plib/pu.h>
 
 #include <simgear/structure/exception.hxx>

diff --git a/src/GUI/gui_local.cxx b/src/GUI/gui_local.cxx
index cb839815f2ae5b584e116c21f0a961980187f9b3..e881cd2a7c40613e917434926154a83c404cd866 100644 (file)
--- a/src/GUI/gui_local.cxx
+++ b/src/GUI/gui_local.cxx
@@ -6,7 +6,6 @@
 #  include <windows.h>
 #endif
 
-#include <Main/fg_os.hxx>   // needed before pu.h
 #include <plib/pu.h>        // plib include
 
 #include <FDM/flight.hxx>

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 4f6193693a3df9baf30fca2d0750e9869d7767ac..e2d888aa1b36f5f3cdc6ebccf88f5ac5bd882931 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -4,7 +4,6 @@
 
 #include <string.h>
 #include <iostream>
-#include <Main/fg_os.hxx> // To set toolkit for pu.h
 #include <plib/pu.h>
 #include <simgear/debug/logstream.hxx>
 

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 49d4fe94c6b7f017ad3e95dd2fe15e8c49a4bee6..6e96a5aa060778a16902cbf9b205aef63219254c 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -11,7 +11,6 @@
 #  include <config.h>
 #endif
 
-#include <Main/fg_os.hxx>
 #include <plib/pu.h>
 
 #include <simgear/compiler.h>  // for SG_USING_STD

diff --git a/src/GUI/puList.hxx b/src/GUI/puList.hxx
index 64489b8106717fe0eaf7eda29635bc34afd59836..563763a0b0eaf0fc79a6f0a238e4071dd875da36 100644 (file)
--- a/src/GUI/puList.hxx
+++ b/src/GUI/puList.hxx
@@ -7,7 +7,6 @@
 #  include <config.h>
 #endif
 
-#include <Main/fg_os.hxx> // To set toolkit for pu.h
 #include <plib/pu.h>