From 2b2b4fa8a3ba6fe6ce42dd3063ab1fa744216d0a Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Mon, 17 Apr 2006 12:59:35 +0000
Subject: [PATCH] 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.)

---
 src/Airports/dynamics.cxx      |  4 ----
 src/Airports/dynamics.hxx      | 13 +++++++++----
 src/Airports/groundnetwork.cxx |  2 --
 src/Airports/groundnetwork.hxx |  2 ++
 src/Airports/parking.hxx       |  8 ++++----
 src/Cockpit/panel_io.hxx       |  4 +++-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index b4816611c..721abc2bc 100644
--- 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 4eb8b4bc1..7543ffca9 100644
--- 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 7f77222e6..c6632882c 100644
--- 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 c7a8b215f..10b0c1a7d 100644
--- 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 14069d9fc..a64d5509b 100644
--- 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 839f0a810..4db99ea18 100644
--- 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;