From ff72b68731e512133fd1ab8c2684d60a277379d7 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Sun, 27 Jul 2008 15:15:33 +0000
Subject: [PATCH] Remove unneeded inclusions of windows.h, GL.h and GLU.H

---
 simgear/scene/material/matlib.cxx   |  6 ------
 simgear/scene/sky/dome.cxx          |  4 ----
 simgear/screen/RenderTexture.cpp    |  4 ----
 simgear/structure/subsystem_mgr.hxx | 13 -------------
 simgear/timing/timestamp.cxx        |  4 ----
 5 files changed, 31 deletions(-)

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 2d6fddb8..de8e6241 100644
--- 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 5842af3f..1e3fbdc3 100644
--- 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 6d5bb805..ec6a8e89 100644
--- 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 171e4665..e7633514 100644
--- 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 458502ea..f2eefcf5 100644
--- 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>
-- 
2.39.5