Eliminate dependency of flight.hxx on model.hxx, to avoid unnecessary

rebuilding.

diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim.cxx
index 96aed0b4407a4e693c0f4264bf8f9a36712593e5..b53ba890ab39e75fbd7c82d2fa975e35c3b7a344 100644 (file)
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim.cxx
@@ -25,9 +25,12 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 
+
 #include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
+#include <Model/model.hxx>
+#include <Main/location.hxx>
 #include <FDM/flight.hxx>
 #include <FDM/LaRCsim/ls_cockpit.h>
 #include <FDM/LaRCsim/ls_generic.h>
@@ -39,6 +42,7 @@
 #include "IO360.hxx"
 #include "LaRCsim.hxx"
 
+
 FGLaRCsim::FGLaRCsim( double dt ) {
 //     set_delta_t( dt );
 

diff --git a/src/FDM/YASim/YASim.cxx b/src/FDM/YASim/YASim.cxx
index a4cacde98a651f33d8b7e37e0ee4f458f904f0f2..f8c109abd27be3cf2cb89ac5cb8286e80abfb862 100644 (file)
--- a/src/FDM/YASim/YASim.cxx
+++ b/src/FDM/YASim/YASim.cxx
@@ -4,6 +4,8 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Model/acmodel.hxx>
+#include <Model/model.hxx>
+#include <Main/location.hxx>
 
 #include "FGFDM.hpp"
 #include "Atmosphere.hpp"

diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index 1bf5808271882e86baf2a50d30408787490ec033..4d0588702eceb948fbfdc5d11e15a6240dde1a93 100644 (file)
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -34,6 +34,8 @@
 #include <FDM/LaRCsim/ls_interface.h>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Main/location.hxx>
+#include <Model/model.hxx>
 #include <Model/acmodel.hxx>
 
 #include "flight.hxx"

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index a458aac0712e25b73bab86dcefeb64e01523f980..810ec38b80ac2f84801628128c37ef03fb74b00d 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -90,11 +90,7 @@
 #include <string>
 
 #include <simgear/constants.h>
-// #include <simgear/timing/timestamp.hxx>
-
 #include <Main/fgfs.hxx>
-#include <Model/model.hxx>
-#include <Main/location.hxx>
 
 SG_USING_STD(list);
 SG_USING_STD(vector);