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

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index b9e97281eec961215903ed5ba78903572657a554..e9eb1fc7fd6187c8e9a907a467b9e1928f2bc6cf 100644 (file)
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -25,14 +25,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include SG_GLU_H
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index ad5165959193f37c09bb51f3c84c204ae16e3d13..8357cbb673cc52d9a79a5c0c570c376d44ebfe43 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -30,17 +30,11 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>              // char related functions
 #include <string.h>             // strcmp()
 
-#include SG_GLU_H
-
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 0e33f411a8a40d0a6dc595b7863e7017fa79be00..9782e7f5986f5f51cef67d954a547f22dc46bcec 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -34,10 +34,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #ifdef __CYGWIN__
 #include <ieeefp.h>
 #endif
@@ -50,7 +46,9 @@
 #include <deque>        // STL double ended queue
 #include <fstream>
 
-#include <osg/State>
+namespace osg {
+    class State;
+}
 
 #include <simgear/math/SGMath.hxx>
 #include <simgear/constants.h>

diff --git a/src/Cockpit/hud_rwy.cxx b/src/Cockpit/hud_rwy.cxx
index 6a3a90ac483f52dc9bd52a3ae1333208e9061681..e1b1692dbe213ac909cc8b1c8d6e5a45e7046070 100644 (file)
--- a/src/Cockpit/hud_rwy.cxx
+++ b/src/Cockpit/hud_rwy.cxx
@@ -32,7 +32,6 @@
 #include <Environment/environment_mgr.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/polar3d.hxx>
-#include SG_GLU_H
 #include <ATCDCL/ATCutils.hxx>
 
 

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 5be11a20e142f61c2b05c2f34324b2c0db84fb72..b529b037201bb928ede8666151619368f77f5634 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -31,10 +31,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <stdio.h>     // sprintf
 #include <string.h>
 
@@ -46,8 +42,6 @@
 
 #include <simgear/compiler.h>
 
-#include SG_GLU_H
-
 #include <plib/fnt.h>
 
 #include <simgear/debug/logstream.hxx>

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index a8241b9d43717e465793b1dc78fbbbaa3b5e84f8..0b9f71906ce8afd79bbbfe3ddd2eab85572cf4ae 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -30,10 +30,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <osg/ref_ptr>
 #include <osg/StateSet>
 #include <osg/Texture2D>

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 37b383ed932eea3f0a4cca0cde4f34719b4840f9..418267f2398a4e72af4604d50d2d4ab944ab879e 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -22,10 +22,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <string.h>            // for strcmp()
 
 #include <simgear/compiler.h>

diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx
index 0cb6df674b73c8666fad387d6abd6ff5fd84c88f..5d5fd09fbc550a7b7e6572b293aaf79147450942 100644 (file)
--- a/src/Cockpit/panel_io.hxx
+++ b/src/Cockpit/panel_io.hxx
@@ -25,10 +25,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <iosfwd>

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index 026ebdcb8c3a7634f73252dacd873ceb155e9772..3e50bb459704e8b02f0c42e9417f6c1839783fa6 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -25,10 +25,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
-#endif
-
 #include <math.h>
 
 #include <plib/sg.h>

diff --git a/src/Environment/fgmetar.cxx b/src/Environment/fgmetar.cxx
index d12d0018905b8019151a212dc9f7e3a6cdb03dab..c172d92a7b180819203a4d6c052a6e93b7da28d4 100644 (file)
--- a/src/Environment/fgmetar.cxx
+++ b/src/Environment/fgmetar.cxx
@@ -36,10 +36,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-
 #include <simgear/math/sg_random.h>
 #include <simgear/timing/sg_time.hxx>
 #include <Main/fg_props.hxx>

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 09fc0f782b258f7c72ff1bd60046180cc24d6015..77c98d9edeb826f7fbe4cf13a10bdf00f0524dc4 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -30,10 +30,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <string>
 
 #include <simgear/structure/exception.hxx>

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index f778349dd11024a951bfcc8cb790a565731cff1a..aeb7861678d94199602c7f491f4973b492818fde 100644 (file)
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -29,10 +29,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <plib/pu.h>
 
 #include <simgear/structure/exception.hxx>

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 833649411840f6335cd997a6b7e0c6da7132d6d8..0428f7304a88e1b64820866dddcf5388ad6e5bf6 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -32,12 +32,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include SG_GL_H
-
 #include <fstream>
 #include <string>
 #include <cstring>
@@ -45,14 +39,6 @@
 
 #include <stdlib.h>
 
-// for help call back
-#ifdef WIN32
-# include <shellapi.h>
-# ifdef __CYGWIN__
-#  include <sys/cygwin.h>
-# endif
-#endif
-
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 5db934f7411004408248a0dedf66bb8069d48c86..21d96e6582f12d9dd16d9aed0f3fdbc346a0de3f 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -24,10 +24,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <math.h>

diff --git a/src/Input/jssuper.h b/src/Input/jssuper.h
index 94a4f752e3d1ff77ec700d207c53913b0d1e36eb..3b395c4cd21566608f0010c7b936fff5f256db2d 100644 (file)
--- a/src/Input/jssuper.h
+++ b/src/Input/jssuper.h
@@ -25,10 +25,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
-#endif
-
 #include <string.h>            // plib/js.h should really include this !!!!!!
 #include <plib/js.h>
 

diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index 28fe5d994f8b0247d392972d90c5cbdffc9653b6..53a688e230671458324c476141b54cdfdbd1b910 100644 (file)
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -29,12 +29,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#   include <windows.h>
-#endif
-
-#include SG_GLU_H
-
 #include <simgear/constants.h>
 #include <simgear/misc/sg_path.hxx>
 

diff --git a/src/Instrumentation/render_area_2d.cxx b/src/Instrumentation/render_area_2d.cxx
index d0dbdf6e18b522e2c116e4b4dd120c1693ff774c..e1155fb68c5ecfdbd058ae1010b1b4185ff4c525 100644 (file)
--- a/src/Instrumentation/render_area_2d.cxx
+++ b/src/Instrumentation/render_area_2d.cxx
@@ -26,14 +26,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#   include <windows.h>
-#endif
-
 #include "render_area_2d.hxx"
 
-#include SG_GL_H
-
 
 static const float dummy_normals[][3] = {{0.0f, 0.0f, 0.0f},
                                          {0.0f, 0.0f, 0.0f},

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 9e4a57513f4ddacac5c668b80f636704723d43ae..e9394211a786f325298260073eb148d19d258081 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -46,12 +46,6 @@ SG_USING_STD(endl);
 #include "globals.hxx"
 
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#  include <pthread.h>
-#endif
-
 #include "fg_os.hxx"
 
 char *homedir = ::getenv( "HOME" );

diff --git a/src/Main/fg_commands.hxx b/src/Main/fg_commands.hxx
index 78342163c4b74bf027ac2c6e10be657665b7a346..1694ca02cb0aec34a0d402ba4bb74b76bb8c712f 100644 (file)
--- a/src/Main/fg_commands.hxx
+++ b/src/Main/fg_commands.hxx
@@ -12,10 +12,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/structure/commands.hxx>
 #include <simgear/props/props.hxx>
 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 56204bff1c9eb15aa633e020c6d3f38b57e84ea1..92b24b0ae5cc1bc4c482d4671ee20efa8934dd2e 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -32,11 +32,6 @@
 #  include <signal.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#endif
-
 #include <plib/netSocket.h>
 
 #include <simgear/props/props.hxx>

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index f40a5045235bfead324b9292e93f57c20edf2886..368dba6429f914682813d34b50558b620045f257 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -25,10 +25,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <osg/ref_ptr>
 #include <osg/AlphaFunc>
 #include <osg/BlendFunc>

diff --git a/src/Network/lfsglass.cxx b/src/Network/lfsglass.cxx
index a1ca7e97b7d643ab72e0383d0b69c79c4ef1ad20..e8e6adbb92c6d7331eabc55bfd4e73c36d5a25f9 100644 (file)
--- a/src/Network/lfsglass.cxx
+++ b/src/Network/lfsglass.cxx
@@ -31,10 +31,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
 

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index cb15cff8513f73c1c2e12bdebdf260d4ec679747..800ddf687e2f1f703c589654d7a2a350ad644c17 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -26,14 +26,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include SG_GL_H
-
 #include <cmath>
 
 #include <simgear/constants.h>

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index 84c32aa90d591f0699514abd96e50cb60111eb7f..ab256eed8599cda03b9cb7a9a873ed584b254eb3 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -34,10 +34,6 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <simgear/structure/subsystem_mgr.hxx>