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/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index b4816611c0d61d0ae951c1164dd003f23100ee72..721abc2bc2a6008c3099cae4b4ece7d944b1fd24 100644 (file)
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -39,7 +39,6 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>
-#include <simgear/xml/easyxml.hxx>
 
 #include STL_STRING
 #include <vector>
@@ -49,9 +48,6 @@ SG_USING_STD(vector);
 SG_USING_STD(sort);
 SG_USING_STD(random_shuffle);
 
-#include "parking.hxx"
-#include "groundnetwork.hxx"
-#include "runwayprefs.hxx"
 #include "dynamics.hxx"
 
 /********** FGAirport Dynamics *********************************************/

diff --git a/src/Airports/dynamics.hxx b/src/Airports/dynamics.hxx
index 4eb8b4bc179c99bbb03227717ed07266cd5b5bc7..7543ffca9d087062a73aa12589e6beeca0261df8 100644 (file)
--- a/src/Airports/dynamics.hxx
+++ b/src/Airports/dynamics.hxx
@@ -23,14 +23,19 @@
 #define _AIRPORT_DYNAMICS_HXX_
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                        
+#endif
+
+#include <simgear/xml/easyxml.hxx>
+
+#include "parking.hxx"
+#include "groundnetwork.hxx"
+#include "runwayprefs.hxx"
 
-  
 
 class FGAirportDynamics : public XMLVisitor {
-  
+
 private:
   double _longitude;    // degrees
   double _latitude;     // degrees

diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 7f77222e65f222465a872cb1decf18b71d978520..c6632882c7262d3d850d5e951fca93d8930f0043 100644 (file)
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -27,8 +27,6 @@
 #include <math.h>
 #include <algorithm>
 
-#include <simgear/compiler.h>
-
 //#include <plib/sg.h>
 //#include <plib/ul.h>
 

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index c7a8b215f51501fe9ea937d12d06c671d631ea75..10b0c1a7d784104156cb533d3cffba9aa44abb88 100644 (file)
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -24,6 +24,8 @@
 #ifndef _GROUNDNETWORK_HXX_
 #define _GROUNDNETWORK_HXX_
 
+#include <simgear/compiler.h>
+
 #include STL_STRING
 #include <vector>
 

diff --git a/src/Airports/parking.hxx b/src/Airports/parking.hxx
index 14069d9fca761f5eda5d9a335187823892dbc981..a64d5509b40a5ef0a760df2a4f7b3921192c9d4d 100644 (file)
--- a/src/Airports/parking.hxx
+++ b/src/Airports/parking.hxx
@@ -25,16 +25,16 @@
 #ifndef _PARKING_HXX_
 #define _PARKING_HXX_
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif     
+#endif
+
+#include <simgear/compiler.h>
 
 #include STL_STRING
 #include <vector>
 
 
-
-
 SG_USING_STD(string);
 SG_USING_STD(vector);
 

diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx
index 839f0a810fd67295bffb429418d4af9f94ec4fee..4db99ea18ffe5107b89d6d4eb61e0ac8345d5a4f 100644 (file)
--- a/src/Cockpit/panel_io.hxx
+++ b/src/Cockpit/panel_io.hxx
@@ -25,15 +25,17 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H          
+#ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
 
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM
+#include STL_STRING
 
 SG_USING_STD(istream);
+SG_USING_STD(string);
 
 class FGPanel;