make headers include headers they depend on, don't rely on the c(xx)

file to do that. (This is a requirement for header precompiling.)

diff --git a/simgear/environment/visual_enviro.cxx b/simgear/environment/visual_enviro.cxx
index d3888f5c50b880c52e85a37b123773e66f75958f..1f8d3acf8fd0f4196de71d21193eb6bf1dac794b 100644 (file)
--- a/simgear/environment/visual_enviro.cxx
+++ b/simgear/environment/visual_enviro.cxx
@@ -23,7 +23,6 @@
 #  include <simgear_config.h>
 #endif
 
-#include <plib/sg.h>
 #include <simgear/constants.h>
 #include <simgear/structure/SGReferenced.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>

diff --git a/simgear/environment/visual_enviro.hxx b/simgear/environment/visual_enviro.hxx
index 1c901b098734cb9005cd78ac70264463c75b2934..e51bd4d69540671bea5f611a2cbb83e2f4ce0524 100644 (file)
--- a/simgear/environment/visual_enviro.hxx
+++ b/simgear/environment/visual_enviro.hxx
@@ -22,6 +22,8 @@
 #ifndef _VISUAL_ENVIRO_HXX
 #define _VISUAL_ENVIRO_HXX
 
+#include <plib/sg.h>
+
 #include <simgear/compiler.h>
 #include STL_STRING
 #include <vector>

diff --git a/simgear/scene/model/animation.hxx b/simgear/scene/model/animation.hxx
index c4ab3d9ebfc4782c5cf654c678ac913d41404b44..118f74ef1b534be01fd2bc124b599a392a7e0ac2 100644 (file)
--- a/simgear/scene/model/animation.hxx
+++ b/simgear/scene/model/animation.hxx
@@ -14,9 +14,6 @@
 #include <vector>
 #include <map>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
-
 #include <plib/sg.h>
 #include <plib/ssg.h>
 
@@ -24,6 +21,9 @@ SG_USING_STD(map);
 #include <simgear/props/props.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+SG_USING_STD(vector);
+SG_USING_STD(map);
+
 
 // Don't pull in the headers, since we don't need them here.
 class SGInterpTable;

diff --git a/simgear/scene/model/custtrans.cxx b/simgear/scene/model/custtrans.cxx
index c34dc02c3a3ee6eb421bfbe23966d127b172a0d8..b885701342c0cfa92e9bce4106e34e0513edb13a 100755 (executable)
--- a/simgear/scene/model/custtrans.cxx
+++ b/simgear/scene/model/custtrans.cxx
@@ -2,7 +2,6 @@
      $Id$
 */
 
-#include "plib/ssg.h"
 #include "custtrans.hxx"
 void _ssgPushMatrix ( sgMat4 m );
 void _ssgPopMatrix  ();

diff --git a/simgear/scene/model/custtrans.hxx b/simgear/scene/model/custtrans.hxx
index 2b0da4a54be09a6b865aff7e02576e51b1f5f88f..50df89853f4c400846fac7cbb02895c1ed91af6a 100755 (executable)
--- a/simgear/scene/model/custtrans.hxx
+++ b/simgear/scene/model/custtrans.hxx
@@ -5,6 +5,8 @@
 #ifndef _SG_CUSTOM_TRANSFORM_HXX
 #define _SG_CUSTOM_TRANSFORM_HXX 1
 
+#include "plib/ssg.h"
+
 class SGCustomTransform : public ssgBranch
 {
 public:

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index 8021b302d81a31314855247c3ca07aef5a9cc43b..6d42025dbc6da36ef04c39fd7594a8adcf94360c 100644 (file)
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -7,8 +7,6 @@
 #include <simgear_config.h>
 #endif
 
-#include <simgear/compiler.h>
-
 #include <string.h>             // for strcmp()
 
 #include <vector>

diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index 2f8648e2c14957aa997b4f5e5ea3b92274c232c9..5d64a5d8add39daa9740e95e217104810d6b87e2 100644 (file)
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -10,6 +10,8 @@
 # error This library requires C++
 #endif
 
+#include <simgear/compiler.h>
+
 #include <vector>
 #include <set>
 

diff --git a/simgear/scene/model/personality.cxx b/simgear/scene/model/personality.cxx
index 622137e81e13b1cf852e1f094926a5633e88fabc..a1374165f003e9b7129bb1589169d8dce908897e 100755 (executable)
--- a/simgear/scene/model/personality.cxx
+++ b/simgear/scene/model/personality.cxx
@@ -2,8 +2,6 @@
  * $Id$
  */
 
-#include <simgear/compiler.h>
-
 #include "personality.hxx"
 
 void SGPersonalityBranch::setDoubleValue( double value, SGAnimation *anim, int var_id, int var_num )

diff --git a/simgear/scene/model/personality.hxx b/simgear/scene/model/personality.hxx
index 468d1e9c8cee6626d1b51a69fd8dc0effdc60209..e5392b2d0786fee82da9dfabd08ff0fda37c5cb6 100755 (executable)
--- a/simgear/scene/model/personality.hxx
+++ b/simgear/scene/model/personality.hxx
@@ -5,12 +5,13 @@
 #ifndef _SG_PERSONALITY_HXX
 #define _SG_PERSONALITY_HXX 1
 
+#include <simgear/compiler.h>
+#include <plib/ssg.h>
+
 #include <map>
 
 SG_USING_STD(map);
 
-#include <plib/ssg.h>
-
 class SGAnimation;
 
 class SGPersonalityBranch : public ssgBranch {

diff --git a/simgear/scene/model/shadowvolume.cxx b/simgear/scene/model/shadowvolume.cxx
index cd32bf5d7f370b6575dc0bf3859f88aa540ae1a2..970fe3e7f4bc5decae7928bc1b37560817adee8d 100644 (file)
--- a/simgear/scene/model/shadowvolume.cxx
+++ b/simgear/scene/model/shadowvolume.cxx
@@ -25,8 +25,6 @@
 #endif
 
 #include <plib/sg.h>
-#include <plib/ssg.h>
-#include <simgear/props/props.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/screen/extensions.hxx>
 #include <simgear/scene/model/animation.hxx>

diff --git a/simgear/scene/model/shadowvolume.hxx b/simgear/scene/model/shadowvolume.hxx
index ee4b31afd04e1f84ec99839499e8ee58e0264deb..2a46cecc226e844060b5e2220d7c2315ea64d221 100644 (file)
--- a/simgear/scene/model/shadowvolume.hxx
+++ b/simgear/scene/model/shadowvolume.hxx
@@ -23,9 +23,13 @@
 #ifndef _SHADOWVOLUME_HXX
 #define _SHADOWVOLUME_HXX
 
+#include <simgear/compiler.h>
 #include <simgear/structure/ssgSharedPtr.hxx>
+#include <simgear/props/props.hxx>
 
+#include <plib/ssg.h>
 #include <plib/sg.h>
+
 #include <vector>
 #include <map>
 

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 309b63dd254f0a7dc1512ada7b2bba3bd6995c3a..9929028144df6914ae8499b37f8a78dbbd60ebf8 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -36,7 +36,6 @@
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/extensions.hxx>
 #include <simgear/screen/texture.hxx>
 #include <simgear/structure/ssgSharedPtr.hxx>

diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index f6ed4d5ac8a002db1d7456a9b3494a0e28ce8a7c..4baa0d5816d2440474efa5eaef81157c020fcaa9 100644 (file)
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -28,6 +28,7 @@
 #define _SG_CLOUD_HXX_
 
 #include <simgear/compiler.h>
+#include <simgear/misc/sg_path.hxx>
 
 #include <plib/ssg.h>
 

diff --git a/simgear/scene/tgdb/pt_lights.cxx b/simgear/scene/tgdb/pt_lights.cxx
index 3d2234bf4bc459c50a8c906a5d327621498fbae3..76a89d710add7032bd09a141205720796b3bcf84 100644 (file)
--- a/simgear/scene/tgdb/pt_lights.cxx
+++ b/simgear/scene/tgdb/pt_lights.cxx
@@ -27,7 +27,6 @@
 #include <plib/sg.h>
 
 #include <simgear/scene/material/mat.hxx>
-#include <simgear/scene/material/matlib.hxx>
 
 #include "vasi.hxx"
 

diff --git a/simgear/scene/tgdb/pt_lights.hxx b/simgear/scene/tgdb/pt_lights.hxx
index b8e8318aa12981f3230f70779a8ac408c2425f8a..7e5aa5ed760d503773e1cee23d0556057094a790 100644 (file)
--- a/simgear/scene/tgdb/pt_lights.hxx
+++ b/simgear/scene/tgdb/pt_lights.hxx
@@ -39,6 +39,7 @@
 #include <plib/ssg.h>          // plib include
 
 #include <simgear/math/sg_types.hxx>
+#include <simgear/scene/material/matlib.hxx>
 
 SG_USING_STD(string);
 SG_USING_STD(vector);

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index a490a4d0bdc3ff4262bee9b079c1093e98406d5b..05f61553df646d24eddf1ccbc395379aeef2f487 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -15,10 +15,6 @@
 #include <limits.h>
 #include <string.h>            // memcpy()
 
-#include <simgear/compiler.h>
-
-#include SG_GL_H
-
 #include "GLBitmaps.h"
 
 GlBitmap::GlBitmap( GLenum mode, GLint width, GLint height, GLubyte *bitmap )

diff --git a/simgear/screen/GLBitmaps.h b/simgear/screen/GLBitmaps.h
index dc346bd63d73c09df103fcdce1989cc927182bd9..f6fb05f424a28bc1ac9aa490e760175b80aff7b7 100644 (file)
--- a/simgear/screen/GLBitmaps.h
+++ b/simgear/screen/GLBitmaps.h
@@ -1,3 +1,7 @@
+#include <simgear/compiler.h>
+
+#include SG_GL_H
+
 class GlBitmap
 {
 public:

diff --git a/simgear/screen/jpgfactory.cxx b/simgear/screen/jpgfactory.cxx
index 26a82014d3cea7fbe3a1c39ec018fd611996d4fa..49621fe5a22f8a2a9fd4a50531ec139611aa08b6 100644 (file)
--- a/simgear/screen/jpgfactory.cxx
+++ b/simgear/screen/jpgfactory.cxx
@@ -25,9 +25,6 @@
 #  include <windows.h>
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #include <plib/ssg.h>
 
 #include "jpgfactory.hxx"

diff --git a/simgear/screen/jpgfactory.hxx b/simgear/screen/jpgfactory.hxx
index 9ad0a74d31e1716033eb7aa0934116b7c08ab3be..abc0318670fcd69af3a34942988f03cc38fed655 100644 (file)
--- a/simgear/screen/jpgfactory.hxx
+++ b/simgear/screen/jpgfactory.hxx
@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
 #include <jpeglib.h>
 #include <jerror.h>
 

diff --git a/simgear/screen/ssgEntityArray.cxx b/simgear/screen/ssgEntityArray.cxx
index 88297806fbfb943eb9cec4f3709739e45f3d60bc..bf1c12da9fc18cc2e17e228ff7b9c8ea82794b3f 100644 (file)
--- a/simgear/screen/ssgEntityArray.cxx
+++ b/simgear/screen/ssgEntityArray.cxx
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #include "ssgEntityArray.hxx"

diff --git a/simgear/screen/ssgEntityArray.hxx b/simgear/screen/ssgEntityArray.hxx
index 659d6d6c5ea4134b801f45a66342d894737510b8..3b0c65cc1f4c1e6eab7fe335ab6b6fd1d5a17c22 100644 (file)
--- a/simgear/screen/ssgEntityArray.hxx
+++ b/simgear/screen/ssgEntityArray.hxx
@@ -2,7 +2,7 @@
 #define _SSG_ENTITY_ARRAY_HXX
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #include <plib/ssg.h>