Remove header dependencies where possible, to speed up rebuilds.

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index fd6bda35e116e4dae23d277444c30847599a28b9..64ef9e747d5f0fb0c63d96114a5a012863a14f88 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -20,7 +20,9 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
+
 #include "acmodel.hxx"
+#include "model.hxx"
 
 
 \f

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index 08ffd139fcc0151a354254ccc39588951e76dbc8..2898c2e9313e33169722dbfb2f5ab6872133c11b 100644 (file)
--- a/src/Model/acmodel.hxx
+++ b/src/Model/acmodel.hxx
@@ -15,11 +15,13 @@
 SG_USING_STD(string);
 SG_USING_STD(vector);
 
-#include <simgear/misc/props.hxx>
+#include <Main/fgfs.hxx>       // for FGSubsystem
 
-#include <Main/fgfs.hxx>
 
-#include "model.hxx"
+// Don't pull in the headers, since we don't need them here.
+class ssgRoot;
+class ssgSelector;
+class FG3DModel;
 
 
 class FGAircraftModel : public FGSubsystem
@@ -47,5 +49,3 @@ private:
 };
 
 #endif // __ACMODEL_HXX
-
-

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 4ed1c6bbbdde00f149ca50f0b8d54552ab1c721d..2a0ecc5708e63bd55fede784bf3577fe9ecec222 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -3,10 +3,13 @@
 //
 // This file is in the Public Domain, and comes with no warranty.
 
-#include "modelmgr.hxx"
+#include <plib/ssg.h>
 
 #include <Main/fg_props.hxx>
 
+#include "modelmgr.hxx"
+#include "model.hxx"
+
 
 FGModelMgr::FGModelMgr ()
   : _selector(new ssgSelector)

diff --git a/src/Model/modelmgr.hxx b/src/Model/modelmgr.hxx
index 15933d63cc42122e2f650abc0c9a6e4c7144e6ad..84e25839c9d5bc2eb7fb7d8382ced2bcb3df867f 100644 (file)
--- a/src/Model/modelmgr.hxx
+++ b/src/Model/modelmgr.hxx
@@ -12,17 +12,17 @@
 
 #include <vector>
 
-#include <plib/ssg.h>
+#include <simgear/compiler.h>  // for SG_USING_STD
 
-#include <simgear/compiler.h>
-#include <simgear/misc/props.hxx>
-
-#include <Main/fgfs.hxx>
-
-#include "model.hxx"
+#include <Main/fgfs.hxx>       // for FGSubsystem
 
 SG_USING_STD(vector);
 
+// Don't pull in headers, since we don't need them here.
+class ssgSelector;
+class SGPropertyNode;
+class FG3DModel;
+
 
 /**
  * Manage a list of user-specified models.
@@ -62,6 +62,3 @@ private:
 };
 
 #endif // __MODELMGR_HXX
-
-
-