Remove unneeded inclusions of windows.h, GL.h and GLU.H

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 2d6fddb85db8261f4c70a2fd990f318e0820b53a..de8e6241c7fd780da74c550fa740074037db7d13 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -25,10 +25,6 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #if defined ( __CYGWIN__ )
 #include <ieeefp.h>
 #endif
@@ -37,8 +33,6 @@
 #include <simgear/constants.h>
 #include <simgear/structure/exception.hxx>
 
-#include SG_GL_H
-
 #include <string.h>
 #include <string>
 

diff --git a/simgear/scene/sky/dome.cxx b/simgear/scene/sky/dome.cxx
index 5842af3fbf4efeb610099fe0fa751569e8b34f11..1e3fbdc3b8518ae7f1f606b35ce6db4e04220752 100644 (file)
--- a/simgear/scene/sky/dome.cxx
+++ b/simgear/scene/sky/dome.cxx
@@ -23,10 +23,6 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <math.h>
 
 #include <simgear/compiler.h>

diff --git a/simgear/screen/RenderTexture.cpp b/simgear/screen/RenderTexture.cpp
index 6d5bb80531dc05932628f24e534635769737fa11..ec6a8e899e3c80097a04f3913f1482fe2114eab1 100644 (file)
--- a/simgear/screen/RenderTexture.cpp
+++ b/simgear/screen/RenderTexture.cpp
@@ -51,10 +51,6 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/screen/extensions.hxx>

diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx
index 171e4665d4515705bab7c6274231d9148fa4fc23..e763351459f7107935f12777937840ad704b1d88 100644 (file)
--- a/simgear/structure/subsystem_mgr.hxx
+++ b/simgear/structure/subsystem_mgr.hxx
@@ -25,19 +25,6 @@
 
 #include <simgear/compiler.h>
 
-#if 0
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#endif
-
-#include <string>
-SG_USING_STD(string);
-
-#include <vector>
-SG_USING_STD(vector);
-#endif
-
 #include <string>
 #include <map>
 #include <vector>

diff --git a/simgear/timing/timestamp.cxx b/simgear/timing/timestamp.cxx
index 458502ea2516f4cae61b59dc0c8c6d995f63f410..f2eefcf583e5ab7db544921e8baadb72d0b7ce1f 100644 (file)
--- a/simgear/timing/timestamp.cxx
+++ b/simgear/timing/timestamp.cxx
@@ -28,10 +28,6 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <ctime>