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/GUI/AirportList.cxx b/src/GUI/AirportList.cxx
index 9e2496c1e5e184cd214360820d8c4e12e6646dec..2cdbd58a3e240b5841ebc4effa1ca6e74a6c8a67 100644 (file)
--- a/src/GUI/AirportList.cxx
+++ b/src/GUI/AirportList.cxx
@@ -1,4 +1,3 @@
-#include <string.h>    // strncpy()
 
 #include <Main/globals.hxx>
 #include <Airports/simple.hxx>

diff --git a/src/GUI/AirportList.hxx b/src/GUI/AirportList.hxx
index 16a8e8522be91cbf08919813a481c16d74e97658..acac58badaf6e14a036b1bbdc501cd2cbefe04ac 100644 (file)
--- a/src/GUI/AirportList.hxx
+++ b/src/GUI/AirportList.hxx
@@ -1,11 +1,17 @@
 // AirportList.hxx - scrolling list of airports.
 
 #ifndef __AIRPORTLIST_HXX
+#define __AIRPORTLIST_HXX
+
+#include <simgear/compiler.h>
+#include STL_STRING
 
 #include <plib/pu.h>
 
 #include "puList.hxx"
 
+SG_USING_STD(string);
+
 class FGAirportList;
 
 class AirportList : public puList
@@ -28,5 +34,3 @@ class AirportList : public puList
 };
 
 #endif // __AIRPORTLIST_HXX
-
-// end of AirportList.hxx

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index e37bb4cafea6912362caef05fde126ff70788e6e..90ffca177246dd0536cd3cc1854e6f885dd38c9c 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -10,7 +10,6 @@
 #include <Autopilot/auto_gui.hxx>
 #include <Input/input.hxx>
 #include <Main/globals.hxx>
-#include <Main/fg_props.hxx>
 
 #include "new_gui.hxx"
 #include "menubar.hxx"

diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx
index 4d21903a580a778d9bdfb748f9c1ee298679c494..2bcef85f3548fc8c05d0de4bbaed02b870521ef8 100644 (file)
--- a/src/GUI/menubar.hxx
+++ b/src/GUI/menubar.hxx
@@ -8,6 +8,7 @@
 #endif
 
 #include <simgear/compiler.h>  // for SG_USING_STD
+#include <Main/fg_props.hxx>
 
 #include <plib/pu.h>
 

diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx
index 2cb747854bb17fed52aaba61ff986f57db17cd27..83e8848fba69e2616b47d88a3764e96007522f55 100644 (file)
--- a/src/Instrumentation/wxradar.cxx
+++ b/src/Instrumentation/wxradar.cxx
@@ -25,7 +25,6 @@
 #endif
 
 #include <plib/sg.h>
-#include <plib/ssg.h>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Cockpit/panel.hxx>

diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx
index 5fde855a6a7214fb5cef161df4084281d286abc2..b2f7139f8f77ca458231c5ce1d3a9511eae40df7 100644 (file)
--- a/src/Instrumentation/wxradar.hxx
+++ b/src/Instrumentation/wxradar.hxx
@@ -23,6 +23,8 @@
 #ifndef _INST_WXRADAR_HXX
 #define _INST_WXRADAR_HXX
 
+#include <plib/ssg.h>
+
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/environment/visual_enviro.hxx>