Remove dependency on acmodel.hxx out of flight.hxx (which is included

many places) and into the files that actually use it.

diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim.cxx
index 43223bf4cf9bfbde1f8fc6a0df2a7a126bf3e165..96aed0b4407a4e693c0f4264bf8f9a36712593e5 100644 (file)
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim.cxx
@@ -34,6 +34,7 @@
 #include <FDM/LaRCsim/ls_interface.h>
 #include <FDM/LaRCsimIC.hxx>
 #include <FDM/UIUCModel/uiuc_aircraft.h>
+#include <Model/acmodel.hxx>
 
 #include "IO360.hxx"
 #include "LaRCsim.hxx"

diff --git a/src/FDM/YASim/YASim.cxx b/src/FDM/YASim/YASim.cxx
index c5352f6b911ee1b4c89121b1e94689485cf27829..c7b283893d1b48d05ed86dca70bf6306a8e81615 100644 (file)
--- a/src/FDM/YASim/YASim.cxx
+++ b/src/FDM/YASim/YASim.cxx
@@ -3,6 +3,7 @@
 #include <simgear/xml/easyxml.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Model/acmodel.hxx>
 
 #include "FGFDM.hpp"
 #include "Atmosphere.hpp"

diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index 3ce32a6c85e4fbba0e35a5189cef314674a666ac..362fc062b6b5b41475be7af4e66033d5b0de66ca 100644 (file)
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -34,6 +34,7 @@
 #include <FDM/LaRCsim/ls_interface.h>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Model/acmodel.hxx>
 
 #include "flight.hxx"
 

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 8dc1aaebb3dc48c8c2198e494519b988e196990a..7f61f21490237f41abe2683453519ce08c54704b 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -93,7 +93,6 @@
 // #include <simgear/timing/timestamp.hxx>
 
 #include <Main/fgfs.hxx>
-#include <Model/acmodel.hxx>
 #include <Model/model.hxx>
 #include <Main/location.hxx>
 
@@ -101,6 +100,8 @@ SG_USING_STD(list);
 SG_USING_STD(vector);
 SG_USING_STD(string);
 
+class FGAircraftModel;
+
 
 typedef double FG_VECTOR_3[3];