diff --git a/projects/VC7.1/SimGear.vcproj b/projects/VC7.1/SimGear.vcproj
index 2824ccf0..1c1bb2c8 100755
--- a/projects/VC7.1/SimGear.vcproj
+++ b/projects/VC7.1/SimGear.vcproj
@@ -799,24 +799,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -841,6 +823,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -853,9 +856,6 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1211,6 +1247,22 @@
RelativePath="..\..\simgear\scene\material\matmodel.hxx"
>
+
+
+
+
+
+
+
+
+#endif
#include
@@ -33,6 +36,8 @@
#include "interpolater.hxx"
+#include
+
using std::string;
// Constructor -- starts with an empty table.
diff --git a/simgear/misc/interpolator.cxx b/simgear/misc/interpolator.cxx
index 8720088e..4e398068 100644
--- a/simgear/misc/interpolator.cxx
+++ b/simgear/misc/interpolator.cxx
@@ -18,6 +18,8 @@
#include "interpolator.hxx"
+#include
+
void SGInterpolator::addNew(SGPropertyNode* prop, int nPoints)
{
// Set the property type to a double, if it isn't already, and
diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index 6f4d235f..d563fee3 100644
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -8,7 +8,7 @@
// $Id$
#ifdef HAVE_CONFIG_H
-# include
+# include
#endif
// #include
@@ -18,6 +18,8 @@
#include "props.hxx"
#include "condition.hxx"
+#include
+
using std::istream;
using std::ostream;
diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx
index f15c10ca..9524e78e 100644
--- a/simgear/props/props.cxx
+++ b/simgear/props/props.cxx
@@ -6,6 +6,10 @@
//
// $Id$
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include "props.hxx"
#include
diff --git a/simgear/scene/bvh/BVHLineSegmentVisitor.cxx b/simgear/scene/bvh/BVHLineSegmentVisitor.cxx
index 7ba9a944..d8ac44f9 100644
--- a/simgear/scene/bvh/BVHLineSegmentVisitor.cxx
+++ b/simgear/scene/bvh/BVHLineSegmentVisitor.cxx
@@ -15,6 +15,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
+#include
#include "BVHLineSegmentVisitor.hxx"
#include
diff --git a/simgear/scene/material/Effect.cxx b/simgear/scene/material/Effect.cxx
index 1c465700..a50dfd78 100644
--- a/simgear/scene/material/Effect.cxx
+++ b/simgear/scene/material/Effect.cxx
@@ -14,6 +14,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include "Effect.hxx"
#include "Technique.hxx"
#include "Pass.hxx"
diff --git a/simgear/scene/material/EffectCullVisitor.cxx b/simgear/scene/material/EffectCullVisitor.cxx
index dec2b1bd..a1a4fa82 100644
--- a/simgear/scene/material/EffectCullVisitor.cxx
+++ b/simgear/scene/material/EffectCullVisitor.cxx
@@ -14,6 +14,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include
#include "EffectCullVisitor.hxx"
diff --git a/simgear/scene/material/EffectGeode.cxx b/simgear/scene/material/EffectGeode.cxx
index 78b17ac0..799b567c 100644
--- a/simgear/scene/material/EffectGeode.cxx
+++ b/simgear/scene/material/EffectGeode.cxx
@@ -14,6 +14,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include "EffectGeode.hxx"
#include "Effect.hxx"
#include "Technique.hxx"
diff --git a/simgear/scene/material/Technique.cxx b/simgear/scene/material/Technique.cxx
index a49951e6..b8ceaa59 100644
--- a/simgear/scene/material/Technique.cxx
+++ b/simgear/scene/material/Technique.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include "Technique.hxx"
#include "Pass.hxx"
diff --git a/simgear/scene/material/makeEffect.cxx b/simgear/scene/material/makeEffect.cxx
index f437c460..913fcfbd 100644
--- a/simgear/scene/material/makeEffect.cxx
+++ b/simgear/scene/material/makeEffect.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include "Effect.hxx"
#include "Technique.hxx"
#include "Pass.hxx"
diff --git a/simgear/scene/model/CheckSceneryVisitor.cxx b/simgear/scene/model/CheckSceneryVisitor.cxx
index d6fdd129..cc471176 100644
--- a/simgear/scene/model/CheckSceneryVisitor.cxx
+++ b/simgear/scene/model/CheckSceneryVisitor.cxx
@@ -14,6 +14,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include
#include
@@ -21,6 +25,8 @@
#include "CheckSceneryVisitor.hxx"
#include "SGPagedLOD.hxx"
+#include
+
using namespace simgear;
CheckSceneryVisitor::CheckSceneryVisitor(osgDB::DatabasePager* dbp, osg::Vec3 &position, double range)
diff --git a/simgear/scene/model/SGPagedLOD.cxx b/simgear/scene/model/SGPagedLOD.cxx
index 88777b80..37cc4e5c 100644
--- a/simgear/scene/model/SGPagedLOD.cxx
+++ b/simgear/scene/model/SGPagedLOD.cxx
@@ -14,6 +14,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include
#include
@@ -23,6 +27,8 @@
#include "SGReaderWriterXMLOptions.hxx"
#include "SGPagedLOD.hxx"
+#include
+
using namespace osg;
using namespace simgear;
diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx
index b4317547..e5b5a744 100644
--- a/simgear/scene/model/modellib.cxx
+++ b/simgear/scene/model/modellib.cxx
@@ -34,6 +34,8 @@
#include "modellib.hxx"
+#include
+
using namespace simgear;
diff --git a/simgear/scene/model/persparam.cxx b/simgear/scene/model/persparam.cxx
index e855152c..167c9a20 100755
--- a/simgear/scene/model/persparam.cxx
+++ b/simgear/scene/model/persparam.cxx
@@ -2,9 +2,15 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include
#include "persparam.hxx"
+#include
+
template <> double
SGPersonalityParameter::getNodeValue( const SGPropertyNode *props,
const char *name,
diff --git a/simgear/structure/SGBinding.cxx b/simgear/structure/SGBinding.cxx
index e65b4d2a..35d2ec0e 100644
--- a/simgear/structure/SGBinding.cxx
+++ b/simgear/structure/SGBinding.cxx
@@ -7,9 +7,15 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include
#include "SGBinding.hxx"
+#include
+
SGBinding::SGBinding()
: _command(0),
_arg(new SGPropertyNode),
diff --git a/simgear/structure/commands.cxx b/simgear/structure/commands.cxx
index 16706d96..f0ec0daa 100644
--- a/simgear/structure/commands.cxx
+++ b/simgear/structure/commands.cxx
@@ -4,6 +4,10 @@
//
// $Id$
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
#include
#include
@@ -12,6 +16,8 @@
#include "commands.hxx"
+#include
+
////////////////////////////////////////////////////////////////////////
diff --git a/simgear/structure/event_mgr.cxx b/simgear/structure/event_mgr.cxx
index a62e83f9..5384031a 100644
--- a/simgear/structure/event_mgr.cxx
+++ b/simgear/structure/event_mgr.cxx
@@ -1,5 +1,7 @@
#include "event_mgr.hxx"
+#include
+
void SGEventMgr::add(SGCallback* cb,
double interval, double delay,
bool repeat, bool simtime)
diff --git a/simgear/structure/subsystem_mgr.cxx b/simgear/structure/subsystem_mgr.cxx
index 1385d8ea..1b8e1824 100644
--- a/simgear/structure/subsystem_mgr.cxx
+++ b/simgear/structure/subsystem_mgr.cxx
@@ -5,6 +5,8 @@
#include "exception.hxx"
#include "subsystem_mgr.hxx"
+#include
+
////////////////////////////////////////////////////////////////////////