From 1eb8ae1fbf43359eec09b99885a9280f529c86fb Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Thu, 21 Feb 2013 11:32:02 +0000
Subject: [PATCH] Give the FGAirport class a sane filename.

simple.[cxx|hxx] -> airport.[cxx|hxx]
---
 src/AIModel/AIAircraft.cxx                   | 2 +-
 src/AIModel/AIFlightPlan.cxx                 | 2 +-
 src/AIModel/AIFlightPlanCreate.cxx           | 2 +-
 src/AIModel/AIFlightPlanCreateCruise.cxx     | 2 +-
 src/AIModel/AIFlightPlanCreatePushBack.cxx   | 2 +-
 src/AIModel/AIManager.cxx                    | 2 +-
 src/ATC/atc_mgr.cxx                          | 2 +-
 src/ATC/atcdialog.cxx                        | 2 +-
 src/ATC/trafficcontrol.cxx                   | 2 +-
 src/ATCDCL/ATC.cxx                           | 2 +-
 src/ATCDCL/ATCutils.hxx                      | 2 +-
 src/Airports/CMakeLists.txt                  | 4 ++--
 src/Airports/{simple.cxx => airport.cxx}     | 2 +-
 src/Airports/{simple.hxx => airport.hxx}     | 2 +-
 src/Airports/apt_loader.cxx                  | 2 +-
 src/Airports/dynamicloader.cxx               | 2 +-
 src/Airports/dynamics.cxx                    | 2 +-
 src/Airports/groundnetwork.cxx               | 2 +-
 src/Airports/runwayprefs.cxx                 | 2 +-
 src/Airports/runways.cxx                     | 2 +-
 src/Airports/sidstar.cxx                     | 2 +-
 src/Airports/xmlloader.cxx                   | 2 +-
 src/Autopilot/route_mgr.cxx                  | 2 +-
 src/Cockpit/NavDisplay.cxx                   | 2 +-
 src/Cockpit/groundradar.cxx                  | 2 +-
 src/Environment/environment_mgr.cxx          | 2 +-
 src/Environment/fgclouds.cxx                 | 2 +-
 src/Environment/metarairportfilter.hxx       | 2 +-
 src/Environment/metarproperties.hxx          | 2 +-
 src/GUI/AirportList.cxx                      | 2 +-
 src/GUI/MapWidget.cxx                        | 2 +-
 src/Instrumentation/KLN89/kln89.cxx          | 2 +-
 src/Instrumentation/KLN89/kln89_page_apt.cxx | 2 +-
 src/Instrumentation/dclgps.cxx               | 2 +-
 src/Instrumentation/gps.cxx                  | 2 +-
 src/Instrumentation/mk_viii.cxx              | 2 +-
 src/Instrumentation/mk_viii.hxx              | 2 +-
 src/Main/fg_init.cxx                         | 2 +-
 src/Main/positioninit.cxx                    | 2 +-
 src/Navaids/FlightPlan.hxx                   | 2 +-
 src/Navaids/LevelDXML.cxx                    | 2 +-
 src/Navaids/NavDataCache.cxx                 | 2 +-
 src/Navaids/navdb.cxx                        | 2 +-
 src/Navaids/navrecord.cxx                    | 2 +-
 src/Navaids/route.cxx                        | 2 +-
 src/Navaids/waypoint.cxx                     | 2 +-
 src/Scripting/NasalPositioned.cxx            | 2 +-
 src/Traffic/SchedFlight.cxx                  | 2 +-
 src/Traffic/Schedule.cxx                     | 2 +-
 src/Traffic/TrafficMgr.cxx                   | 2 +-
 50 files changed, 51 insertions(+), 51 deletions(-)
 rename src/Airports/{simple.cxx => airport.cxx} (99%)
 rename src/Airports/{simple.hxx => airport.hxx} (99%)

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index b5ef24187..d8f07ba7f 100644
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -27,7 +27,7 @@
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/util.hxx>
 
 #include <string>
diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index 5699a620c..ce20ea2b3 100644
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -33,7 +33,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/fg_init.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/groundnetwork.hxx>
diff --git a/src/AIModel/AIFlightPlanCreate.cxx b/src/AIModel/AIFlightPlanCreate.cxx
index e9851862a..caad321e2 100644
--- a/src/AIModel/AIFlightPlanCreate.cxx
+++ b/src/AIModel/AIFlightPlanCreate.cxx
@@ -30,7 +30,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>
 #include "AIAircraft.hxx"
diff --git a/src/AIModel/AIFlightPlanCreateCruise.cxx b/src/AIModel/AIFlightPlanCreateCruise.cxx
index 15c3d643f..beecef8eb 100644
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
@@ -26,7 +26,7 @@
 #include <fstream>
 #include <iostream>
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>
 
diff --git a/src/AIModel/AIFlightPlanCreatePushBack.cxx b/src/AIModel/AIFlightPlanCreatePushBack.cxx
index d774f3b51..cb5ade5cc 100644
--- a/src/AIModel/AIFlightPlanCreatePushBack.cxx
+++ b/src/AIModel/AIFlightPlanCreatePushBack.cxx
@@ -27,7 +27,7 @@
 
 #include <simgear/math/sg_geodesy.hxx>
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>
 
diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index 3c5617247..3e28cd0be 100644
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -29,7 +29,7 @@
 #include <boost/foreach.hpp>
 
 #include <Main/globals.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 #include "AIManager.hxx"
 #include "AIAircraft.hxx"
diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index 67d53c9fc..980e9df80 100644
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -27,7 +27,7 @@
 #include <iostream>
 
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Scenery/scenery.hxx>
 #include "atc_mgr.hxx"
 
diff --git a/src/ATC/atcdialog.cxx b/src/ATC/atcdialog.cxx
index 1bf0c9cdd..ad75f3001 100644
--- a/src/ATC/atcdialog.cxx
+++ b/src/ATC/atcdialog.cxx
@@ -41,7 +41,7 @@
 #include <Main/fg_props.hxx>
 #include <GUI/gui.h>		// mkDialog
 #include <GUI/new_gui.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <ATC/CommStation.hxx>
 
 using std::string;
diff --git a/src/ATC/trafficcontrol.cxx b/src/ATC/trafficcontrol.cxx
index f35a02e88..137c68aeb 100644
--- a/src/ATC/trafficcontrol.cxx
+++ b/src/ATC/trafficcontrol.cxx
@@ -48,7 +48,7 @@
 #include <Traffic/TrafficMgr.hxx>
 #include <Airports/groundnetwork.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Radio/radio.hxx>
 #include <signal.h>
 
diff --git a/src/ATCDCL/ATC.cxx b/src/ATCDCL/ATC.cxx
index 9e868017b..223661974 100644
--- a/src/ATCDCL/ATC.cxx
+++ b/src/ATCDCL/ATC.cxx
@@ -33,7 +33,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <ATC/CommStation.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 FGATC::FGATC() :
     freq(0),
diff --git a/src/ATCDCL/ATCutils.hxx b/src/ATCDCL/ATCutils.hxx
index 38f0bda59..478ba7e9d 100644
--- a/src/ATCDCL/ATCutils.hxx
+++ b/src/ATCDCL/ATCutils.hxx
@@ -18,7 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 
 #include <math.h>
diff --git a/src/Airports/CMakeLists.txt b/src/Airports/CMakeLists.txt
index 43f2a999f..f0cde69e7 100644
--- a/src/Airports/CMakeLists.txt
+++ b/src/Airports/CMakeLists.txt
@@ -13,7 +13,7 @@ set(SOURCES
 	runwayprefs.cxx
 	runways.cxx
 	sidstar.cxx
-	simple.cxx
+	airport.cxx
 	xmlloader.cxx
 	)
 
@@ -30,7 +30,7 @@ set(HEADERS
 	runwayprefs.hxx
 	runways.hxx
 	sidstar.hxx
-	simple.hxx
+	airport.hxx
 	xmlloader.hxx
 	)
     		
diff --git a/src/Airports/simple.cxx b/src/Airports/airport.cxx
similarity index 99%
rename from src/Airports/simple.cxx
rename to src/Airports/airport.cxx
index 1ed7e9934..ba85516dd 100644
--- a/src/Airports/simple.cxx
+++ b/src/Airports/airport.cxx
@@ -28,7 +28,7 @@
 #  include <config.h>
 #endif
 
-#include "simple.hxx"
+#include "airport.hxx"
 
 #include <cassert>
 #include <boost/foreach.hpp>
diff --git a/src/Airports/simple.hxx b/src/Airports/airport.hxx
similarity index 99%
rename from src/Airports/simple.hxx
rename to src/Airports/airport.hxx
index a628712b0..b58b2f345 100644
--- a/src/Airports/simple.hxx
+++ b/src/Airports/airport.hxx
@@ -1,4 +1,4 @@
-// simple.hxx -- a really simplistic class to manage airport ID,
+// airport.hxx -- a really simplistic class to manage airport ID,
 //                 lat, lon of the center of one of it's runways, and
 //                 elevation in feet.
 //
diff --git a/src/Airports/apt_loader.cxx b/src/Airports/apt_loader.cxx
index c223890fc..f4ad7793a 100644
--- a/src/Airports/apt_loader.cxx
+++ b/src/Airports/apt_loader.cxx
@@ -43,7 +43,7 @@
 
 #include <string>
 
-#include "simple.hxx"
+#include "airport.hxx"
 #include "runways.hxx"
 #include "pavement.hxx"
 #include <Navaids/NavDataCache.hxx>
diff --git a/src/Airports/dynamicloader.cxx b/src/Airports/dynamicloader.cxx
index bf9335ae3..d35891b0d 100644
--- a/src/Airports/dynamicloader.cxx
+++ b/src/Airports/dynamicloader.cxx
@@ -25,7 +25,7 @@
 
 #include <Navaids/NavDataCache.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 /*****************************************************************************
  * Helper function for parsing position string
diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index d505d580c..3c45a1c45 100644
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -42,7 +42,7 @@
 #include <ATCDCL/ATCutils.hxx>
 #include <Navaids/NavDataCache.hxx>
 
-#include "simple.hxx"
+#include "airport.hxx"
 #include "dynamics.hxx"
 
 using std::string;
diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 62d229f68..3ea86f979 100644
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -43,7 +43,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/timing/timestamp.hxx>
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/runways.hxx>
 
diff --git a/src/Airports/runwayprefs.cxx b/src/Airports/runwayprefs.cxx
index fac1807fb..2a2fceb0f 100644
--- a/src/Airports/runwayprefs.cxx
+++ b/src/Airports/runwayprefs.cxx
@@ -36,7 +36,7 @@
 #include <Airports/runways.hxx>
 
 #include "runwayprefs.hxx"
-#include "simple.hxx"
+#include "airport.hxx"
 
 /******************************************************************************
  * ScheduleTime
diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index 753eaf0d5..72fb1609d 100644
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -37,7 +37,7 @@
 
 #include "runways.hxx"
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Navaids/procedure.hxx>
 #include <Navaids/navrecord.hxx>
 #include <Navaids/NavDataCache.hxx>
diff --git a/src/Airports/sidstar.cxx b/src/Airports/sidstar.cxx
index e19ff1925..93360b432 100644
--- a/src/Airports/sidstar.cxx
+++ b/src/Airports/sidstar.cxx
@@ -30,7 +30,7 @@
 
 
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 
 #include "sidstar.hxx"
diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index 8ff3eb1fd..59a9ca969 100644
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -32,7 +32,7 @@
 #include "runwayprefloader.hxx"
 
 #include "dynamics.hxx"
-#include "simple.hxx"
+#include "airport.hxx"
 #include "runwayprefs.hxx"
 
 #include <Navaids/NavDataCache.hxx>
diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index 4c41ebe7f..96f76325d 100644
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -51,7 +51,7 @@
 #include "Navaids/positioned.hxx"
 #include <Navaids/waypoint.hxx>
 #include <Navaids/procedure.hxx>
-#include "Airports/simple.hxx"
+#include "Airports/airport.hxx"
 #include "Airports/runways.hxx"
 #include <GUI/new_gui.hxx>
 #include <GUI/dialog.hxx>
diff --git a/src/Cockpit/NavDisplay.cxx b/src/Cockpit/NavDisplay.cxx
index 26720404a..4c96c3dde 100644
--- a/src/Cockpit/NavDisplay.cxx
+++ b/src/Cockpit/NavDisplay.cxx
@@ -70,7 +70,7 @@ using std::string;
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navlist.hxx>
 #include <Navaids/fix.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include "od_gauge.hxx"
 
diff --git a/src/Cockpit/groundradar.cxx b/src/Cockpit/groundradar.cxx
index b7d283413..7a2af9b62 100644
--- a/src/Cockpit/groundradar.cxx
+++ b/src/Cockpit/groundradar.cxx
@@ -38,7 +38,7 @@
 #include <Main/globals.hxx>
 #include <Viewer/renderer.hxx>
 #include <Cockpit/panel.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/pavement.hxx>
 #include <simgear/math/sg_geodesy.hxx>
diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index b4e62bc15..9aca5b0b5 100644
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -43,7 +43,7 @@
 #include "precipitation_mgr.hxx"
 #include "ridge_lift.hxx"
 #include "terrainsampler.hxx"
-#include "Airports/simple.hxx"
+#include "Airports/airport.hxx"
 #include "gravity.hxx"
 #include "magvarmanager.hxx"
 
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 2374cd236..f19d9d6fc 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -40,7 +40,7 @@
 #include <Main/globals.hxx>
 #include <Main/util.hxx>
 #include <Viewer/renderer.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 #include "fgclouds.hxx"
 
diff --git a/src/Environment/metarairportfilter.hxx b/src/Environment/metarairportfilter.hxx
index f31eb64f5..b20ac0a7e 100644
--- a/src/Environment/metarairportfilter.hxx
+++ b/src/Environment/metarairportfilter.hxx
@@ -22,7 +22,7 @@
 #ifndef __METARAIRPORTFILTER_HXX
 #define __METARAIRPORTFILTER_HXX
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <simgear/props/props.hxx>
 
 namespace Environment {
diff --git a/src/Environment/metarproperties.hxx b/src/Environment/metarproperties.hxx
index 7d108100d..eac1af780 100644
--- a/src/Environment/metarproperties.hxx
+++ b/src/Environment/metarproperties.hxx
@@ -23,7 +23,7 @@
 #ifndef __METARPROPERTIES_HXX
 #define __METARPROPERTIES_HXX
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/tiedpropertylist.hxx>
 
diff --git a/src/GUI/AirportList.cxx b/src/GUI/AirportList.cxx
index da25a861d..5bff4f899 100644
--- a/src/GUI/AirportList.cxx
+++ b/src/GUI/AirportList.cxx
@@ -3,7 +3,7 @@
 #endif
 
 #include <Main/globals.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 #include "AirportList.hxx"
 
diff --git a/src/GUI/MapWidget.cxx b/src/GUI/MapWidget.cxx
index 778cd72a7..b8bac7236 100644
--- a/src/GUI/MapWidget.cxx
+++ b/src/GUI/MapWidget.cxx
@@ -21,7 +21,7 @@
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navlist.hxx>
 #include <Navaids/fix.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Main/fg_os.hxx>      // fgGetKeyModifiers()
 #include <Navaids/routePath.hxx>
diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx
index 4cb507441..a084fea50 100644
--- a/src/Instrumentation/KLN89/kln89.cxx
+++ b/src/Instrumentation/KLN89/kln89.cxx
@@ -48,7 +48,7 @@
 
 #include <Main/fg_props.hxx>
 #include <simgear/structure/commands.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 #include <cstdio>
 
diff --git a/src/Instrumentation/KLN89/kln89_page_apt.cxx b/src/Instrumentation/KLN89/kln89_page_apt.cxx
index c89c0f299..52a0778c3 100644
--- a/src/Instrumentation/KLN89/kln89_page_apt.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_apt.cxx
@@ -34,7 +34,7 @@
 #include <ATC/CommStation.hxx>
 #include <Main/globals.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 using std::string;
 
diff --git a/src/Instrumentation/dclgps.cxx b/src/Instrumentation/dclgps.cxx
index aeeb54fdc..24fba0040 100644
--- a/src/Instrumentation/dclgps.cxx
+++ b/src/Instrumentation/dclgps.cxx
@@ -34,7 +34,7 @@
 #include <Main/fg_props.hxx>
 #include <Navaids/fix.hxx>
 #include <Navaids/navrecord.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 
 #include <fstream>
diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 3c26a539b..22094602b 100644
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -22,7 +22,7 @@
 #include "Navaids/positioned.hxx"
 #include <Navaids/waypoint.hxx>
 #include "Navaids/navrecord.hxx"
-#include "Airports/simple.hxx"
+#include "Airports/airport.hxx"
 #include "Airports/runways.hxx"
 #include "Autopilot/route_mgr.hxx"
 
diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 9b0ee2b48..eb40aee4d 100644
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -76,7 +76,7 @@
 using std::string;
 
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 #if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
 #  include <Include/version.h>
diff --git a/src/Instrumentation/mk_viii.hxx b/src/Instrumentation/mk_viii.hxx
index 25b50c3e4..81a33580b 100644
--- a/src/Instrumentation/mk_viii.hxx
+++ b/src/Instrumentation/mk_viii.hxx
@@ -38,7 +38,7 @@ using std::map;
 class SGSampleGroup;
 
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/globals.hxx>
 #include <Sound/voiceplayer.hxx>
 
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 58bd9aeba..729301c24 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -59,7 +59,7 @@
 #include <Aircraft/replay.hxx>
 #include <Aircraft/FlightHistory.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 
 #include <AIModel/AIManager.hxx>
diff --git a/src/Main/positioninit.cxx b/src/Main/positioninit.cxx
index 777709ccf..eb3579967 100644
--- a/src/Main/positioninit.cxx
+++ b/src/Main/positioninit.cxx
@@ -32,7 +32,7 @@
 
 #include <Navaids/navlist.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <AIModel/AIManager.hxx>
 
diff --git a/src/Navaids/FlightPlan.hxx b/src/Navaids/FlightPlan.hxx
index 84944069a..d00c4860f 100644
--- a/src/Navaids/FlightPlan.hxx
+++ b/src/Navaids/FlightPlan.hxx
@@ -25,7 +25,7 @@
 #define FG_FLIGHTPLAN_HXX
 
 #include <Navaids/route.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 typedef SGSharedPtr<FGAirport> FGAirportRef;
     
diff --git a/src/Navaids/LevelDXML.cxx b/src/Navaids/LevelDXML.cxx
index 41866cb71..73b8f78f2 100644
--- a/src/Navaids/LevelDXML.cxx
+++ b/src/Navaids/LevelDXML.cxx
@@ -10,7 +10,7 @@
 #include <simgear/misc/sg_path.hxx>
 
 #include <Navaids/waypoint.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 using std::string;
 using std::vector;
diff --git a/src/Navaids/NavDataCache.cxx b/src/Navaids/NavDataCache.cxx
index 3cc8a255e..1f1dc251a 100644
--- a/src/Navaids/NavDataCache.cxx
+++ b/src/Navaids/NavDataCache.cxx
@@ -51,7 +51,7 @@
 #include <Main/globals.hxx>
 #include "markerbeacon.hxx"
 #include "navrecord.hxx"
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <ATC/CommStation.hxx>
 #include "fix.hxx"
diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 42e0c2381..9cc1654a9 100644
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -40,7 +40,7 @@
 #include "navlist.hxx"
 #include <Main/globals.hxx>
 #include <Navaids/markerbeacon.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Main/fg_props.hxx>
diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index c73e04b8f..dc5cf7ab2 100644
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -37,7 +37,7 @@
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navdb.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Main/fg_props.hxx>
 #include <Navaids/NavDataCache.hxx>
diff --git a/src/Navaids/route.cxx b/src/Navaids/route.cxx
index 9123d24c3..6d6558a69 100644
--- a/src/Navaids/route.cxx
+++ b/src/Navaids/route.cxx
@@ -48,7 +48,7 @@
 #include <Navaids/procedure.hxx>
 #include <Navaids/waypoint.hxx>
 #include <Navaids/LevelDXML.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
 using std::string;
 using std::vector;
diff --git a/src/Navaids/waypoint.cxx b/src/Navaids/waypoint.cxx
index 81e2c5c82..aaeedd53c 100644
--- a/src/Navaids/waypoint.cxx
+++ b/src/Navaids/waypoint.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/structure/exception.hxx>
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 
 using std::string;
diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx
index 4e10bd7d8..a01bf0c86 100644
--- a/src/Scripting/NasalPositioned.cxx
+++ b/src/Scripting/NasalPositioned.cxx
@@ -37,7 +37,7 @@
 #include <simgear/bucket/newbucket.hxx>
 
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/parking.hxx>
 #include <Scripting/NasalSys.hxx>
diff --git a/src/Traffic/SchedFlight.cxx b/src/Traffic/SchedFlight.cxx
index 784c1443a..4dc29b519 100644
--- a/src/Traffic/SchedFlight.cxx
+++ b/src/Traffic/SchedFlight.cxx
@@ -57,7 +57,7 @@
 
 #include <AIModel/AIFlightPlan.hxx>
 #include <AIModel/AIManager.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/fg_init.hxx>   // That's pretty ugly, but I need fgFindAirportID
 
 
diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx
index ea1ef0480..4ad1ed778 100644
--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@@ -47,7 +47,7 @@
 #include <AIModel/AIFlightPlan.hxx>
 #include <AIModel/AIManager.hxx>
 #include <AIModel/AIAircraft.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/fg_init.hxx>   // That's pretty ugly, but I need fgFindAirportID
 
 
diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 5c56d5451..a9ab6e794 100644
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -64,7 +64,7 @@
 #include <AIModel/AIAircraft.hxx>
 #include <AIModel/AIFlightPlan.hxx>
 #include <AIModel/AIBase.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/fg_init.hxx>
 
 #include "TrafficMgr.hxx"
-- 
2.39.5