diff --git a/src/ATC/AIGAVFRTraffic.cxx b/src/ATC/AIGAVFRTraffic.cxx
index 26aa36896..6941a2489 100644
--- a/src/ATC/AIGAVFRTraffic.cxx
+++ b/src/ATC/AIGAVFRTraffic.cxx
@@ -23,24 +23,20 @@
 #  include <config.h>
 #endif
 
-//#include <simgear/scene/model/location.hxx>
-
 #include <Airports/runways.hxx>
 #include <Main/globals.hxx>
-//#include <Scenery/scenery.hxx>
-//#include <Scenery/tilemgr.hxx>
 #include <simgear/math/point3d.hxx>
-//#include <simgear/math/sg_geodesy.hxx>
-//#include <simgear/misc/sg_path.hxx>
 #include <string>
 #include <math.h>
 
 SG_USING_STD(string);
 
+#include "ATC.hxx"
 #include "ATCmgr.hxx"
 #include "AILocalTraffic.hxx"
 #include "AIGAVFRTraffic.hxx"
 #include "ATCutils.hxx"
+#include "tower.hxx"
 
 FGAIGAVFRTraffic::FGAIGAVFRTraffic() {
 	ATC = globals->get_ATC_mgr();
diff --git a/src/ATC/AIGAVFRTraffic.hxx b/src/ATC/AIGAVFRTraffic.hxx
index fcfc79d4b..56b296534 100644
--- a/src/ATC/AIGAVFRTraffic.hxx
+++ b/src/ATC/AIGAVFRTraffic.hxx
@@ -25,10 +25,6 @@
 #include <simgear/math/point3d.hxx>
 #include <Main/fg_props.hxx>
 
-#include "tower.hxx"
-#include "AIPlane.hxx"
-#include "ATCProjection.hxx"
-#include "ground.hxx"
 #include "AILocalTraffic.hxx"
 
 #include <string>
diff --git a/src/ATC/AILocalTraffic.hxx b/src/ATC/AILocalTraffic.hxx
index 8b6a5920e..5336de741 100644
--- a/src/ATC/AILocalTraffic.hxx
+++ b/src/ATC/AILocalTraffic.hxx
@@ -25,11 +25,14 @@
 #include <simgear/math/point3d.hxx>
 #include <Main/fg_props.hxx>
 
-#include "tower.hxx"
 #include "AIPlane.hxx"
 #include "ATCProjection.hxx"
 #include "ground.hxx"
 
+class FGGround;
+class FGTower;
+class Gate;
+
 #include <string>
 SG_USING_STD(string);
 
diff --git a/src/ATC/ATCDialog.cxx b/src/ATC/ATCDialog.cxx
index 6265c6b54..8fc3e0f1e 100644
--- a/src/ATC/ATCDialog.cxx
+++ b/src/ATC/ATCDialog.cxx
@@ -39,10 +39,8 @@
 #include <Airports/simple.hxx>
 
 #include <sstream>
-#include <map>
 
 SG_USING_STD(ostringstream);
-SG_USING_STD(map);
 
 FGATCDialog *current_atcdialog;
 
diff --git a/src/ATC/ATCDialog.hxx b/src/ATC/ATCDialog.hxx
index af3f918e0..76cf2cc9f 100644
--- a/src/ATC/ATCDialog.hxx
+++ b/src/ATC/ATCDialog.hxx
@@ -23,8 +23,14 @@
 
 #include <simgear/compiler.h>
 
+#include <vector>
+#include <map>
+
 #include "ATC.hxx"
 
+SG_USING_STD(vector);
+SG_USING_STD(map);
+
 class NewGUI;
 
 // ATCMenuEntry - an encapsulation of an entry in the ATC dialog
diff --git a/src/ATC/ATCmgr.cxx b/src/ATC/ATCmgr.cxx
index 5aee09557..c06c64382 100644
--- a/src/ATC/ATCmgr.cxx
+++ b/src/ATC/ATCmgr.cxx
@@ -25,11 +25,15 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <Airports/simple.hxx>
+
 #include "ATCmgr.hxx"
 #include "commlist.hxx"
 #include "ATCdisplay.hxx"
 #include "ATCDialog.hxx"
 #include "ATCutils.hxx"
+#include "transmissionlist.hxx"
+#include "ground.hxx"
+
 
 /*
 // periodic radio station search wrapper
diff --git a/src/ATC/ATCmgr.hxx b/src/ATC/ATCmgr.hxx
index 881abcf8f..04d53e062 100644
--- a/src/ATC/ATCmgr.hxx
+++ b/src/ATC/ATCmgr.hxx
@@ -31,13 +31,8 @@
 #include <list>
 #include <map>
 
-#include "atis.hxx"
 #include "tower.hxx"
 #include "approach.hxx"
-#include "ground.hxx"
-#include "ATC.hxx"
-#include "ATCVoice.hxx"
-#include "transmissionlist.hxx"
 
 SG_USING_STD(string);
 SG_USING_STD(list);
diff --git a/src/ATC/ground.cxx b/src/ATC/ground.cxx
index 7475f7ae0..1a1948383 100644
--- a/src/ATC/ground.cxx
+++ b/src/ATC/ground.cxx
@@ -33,10 +33,10 @@
 #include STL_FSTREAM
 
 #include "ground.hxx"
-#include "ATCmgr.hxx"
-#include "ATCutils.hxx"
 #include "ATCdisplay.hxx"
+#include "ATCutils.hxx"
 #include "AILocalTraffic.hxx"
+#include "ATCmgr.hxx"
 
 SG_USING_STD(ifstream);
 SG_USING_STD(cout);
diff --git a/src/ATC/ground.hxx b/src/ATC/ground.hxx
index 318191c82..43f5c0a31 100644
--- a/src/ATC/ground.hxx
+++ b/src/ATC/ground.hxx
@@ -21,29 +21,31 @@
 #ifndef _FG_GROUND_HXX
 #define _FG_GROUND_HXX
 
+#include <map>
+#include <vector>
+#include <list>
+
+#include <simgear/math/point3d.hxx>
+#include <simgear/misc/sgstream.hxx>
+#include <simgear/math/sg_geodesy.hxx>
+#include <simgear/props/props.hxx>
+
+#include "ATC.hxx"
+#include "ATCProjection.hxx"
+
 #include STL_IOSTREAM
 #include STL_STRING
 
 SG_USING_STD(string);
 SG_USING_STD(ios);
 
-#include <map>
-#include <vector>
-#include <list>
-#include <simgear/math/point3d.hxx>
-#include <simgear/misc/sgstream.hxx>
-#include <simgear/math/sg_geodesy.hxx>
-
-#include "ATC.hxx"
-//#include "ATCmgr.hxx"
-#include "ATCProjection.hxx"
-#include "AIEntity.hxx"
-//#include "AILocalTraffic.hxx"	// RunwayDetails - this is a temporary hack
-
 SG_USING_STD(map);
 SG_USING_STD(vector);
 SG_USING_STD(list);
 
+class FGAIEntity;
+class FGATCMgr;
+
 //////////////////////////////////////////////////////
 // Types for the logical network data structure
 enum arc_type {
@@ -308,8 +310,8 @@ private:
     //NextClearance(ground_rec &g);
 	
 	// environment - need to make sure we're getting the surface winds and not winds aloft.
-	SGPropertyNode* wind_from_hdg;	//degrees
-	SGPropertyNode* wind_speed_knots;		//knots
+	SGPropertyNode_ptr wind_from_hdg;	//degrees
+	SGPropertyNode_ptr wind_speed_knots;		//knots
 	
 	// for failure modeling
 	string trans_ident;		// transmitted ident
diff --git a/src/ATC/tower.hxx b/src/ATC/tower.hxx
index 75896a050..a1ed67892 100644
--- a/src/ATC/tower.hxx
+++ b/src/ATC/tower.hxx
@@ -24,9 +24,7 @@
 #include <simgear/compiler.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/sgstream.hxx>
-//#include <simgear/math/sg_geodesy.hxx>
 #include <plib/sg.h>
-//#include <Airports/runways.hxx>
 
 #include STL_IOSTREAM
 #include STL_STRING
@@ -35,11 +33,12 @@ SG_USING_STD(string);
 SG_USING_STD(ios);
 
 #include "ATC.hxx"
-//#include "ATCmgr.hxx"
-#include "ground.hxx"
 #include "ATCProjection.hxx"
 #include "AIPlane.hxx"
 
+class FGATCMgr;
+class FGGround;
+
 //DCL - a complete guess for now.
 #define FG_TOWER_DEFAULT_RANGE 30