From 409dee5a9d3348babe750413a81191fa090d5926 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sun, 19 Sep 2004 16:33:38 +0000
Subject: [PATCH] Remove unnecessary inclusions of sg.h ans ssg.h

---
 src/ATC/AIEntity.hxx               | 5 ++---
 src/ATC/AIGAVFRTraffic.hxx         | 2 --
 src/ATC/AILocalTraffic.hxx         | 2 --
 src/ATC/AIPlane.hxx                | 2 --
 src/Cockpit/cockpit.hxx            | 1 +
 src/Cockpit/panel.hxx              | 3 ++-
 src/Model/model_panel.hxx          | 3 ---
 src/MultiPlayer/mpplayer.hxx       | 5 ++++-
 src/MultiPlayer/multiplayrxmgr.hxx | 1 -
 src/MultiPlayer/multiplaytxmgr.hxx | 1 -
 src/Scenery/hitlist.hxx            | 5 +++--
 src/Scenery/tileentry.hxx          | 3 +--
 src/Scenery/tilemgr.hxx            | 4 ++--
 13 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/ATC/AIEntity.hxx b/src/ATC/AIEntity.hxx
index d3d60ac2d..0cf5e52ca 100644
--- a/src/ATC/AIEntity.hxx
+++ b/src/ATC/AIEntity.hxx
@@ -21,13 +21,12 @@
 #ifndef _FG_AIEntity_HXX
 #define _FG_AIEntity_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
-
 #include <simgear/math/point3d.hxx>
 #include <simgear/scene/model/model.hxx>
 #include <simgear/scene/model/placement.hxx>
 
+class ssgBranch;
+
 
 /*****************************************************************
 *
diff --git a/src/ATC/AIGAVFRTraffic.hxx b/src/ATC/AIGAVFRTraffic.hxx
index e2bbb5733..c094f60a4 100644
--- a/src/ATC/AIGAVFRTraffic.hxx
+++ b/src/ATC/AIGAVFRTraffic.hxx
@@ -22,8 +22,6 @@
 #ifndef _FG_AIGAVFRTraffic_HXX
 #define _FG_AIGAVFRTraffic_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
 #include <simgear/math/point3d.hxx>
 #include <Main/fg_props.hxx>
 
diff --git a/src/ATC/AILocalTraffic.hxx b/src/ATC/AILocalTraffic.hxx
index ac7eea0b4..808739f3a 100644
--- a/src/ATC/AILocalTraffic.hxx
+++ b/src/ATC/AILocalTraffic.hxx
@@ -22,8 +22,6 @@
 #ifndef _FG_AILocalTraffic_HXX
 #define _FG_AILocalTraffic_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
 #include <simgear/math/point3d.hxx>
 #include <Main/fg_props.hxx>
 
diff --git a/src/ATC/AIPlane.hxx b/src/ATC/AIPlane.hxx
index 466807ba4..630767207 100644
--- a/src/ATC/AIPlane.hxx
+++ b/src/ATC/AIPlane.hxx
@@ -21,8 +21,6 @@
 #ifndef _FG_AI_PLANE_HXX
 #define _FG_AI_PLANE_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/scene/model/model.hxx>
 
diff --git a/src/Cockpit/cockpit.hxx b/src/Cockpit/cockpit.hxx
index e6c33fb8f..b5749201a 100644
--- a/src/Cockpit/cockpit.hxx
+++ b/src/Cockpit/cockpit.hxx
@@ -32,6 +32,7 @@
 #endif
 
 
+#include <Aircraft/aircraft.hxx>
 #include "panel.hxx"
 
 // Class fg_Cockpit          This class is a holder for the heads up display
diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index b99889ce1..7cfdf0e2e 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -34,7 +34,6 @@
 #  include <windows.h>
 #endif
 
-#include <plib/ssg.h>
 #include <plib/fnt.h>
 
 #include <simgear/compiler.h>
@@ -53,6 +52,8 @@
 SG_USING_STD(vector);
 SG_USING_STD(map);
 
+
+class ssgTexture;
 class FGPanelInstrument;
 
 
diff --git a/src/Model/model_panel.hxx b/src/Model/model_panel.hxx
index 49ff7507c..ba6abf741 100644
--- a/src/Model/model_panel.hxx
+++ b/src/Model/model_panel.hxx
@@ -14,9 +14,6 @@
 
 SG_USING_STD(vector);
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
-
 #include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 
diff --git a/src/MultiPlayer/mpplayer.hxx b/src/MultiPlayer/mpplayer.hxx
index d1f5c7c74..c16d9f1b0 100644
--- a/src/MultiPlayer/mpplayer.hxx
+++ b/src/MultiPlayer/mpplayer.hxx
@@ -41,7 +41,6 @@
 
 #include "mpmessages.hxx"
 
-#include <plib/ssg.h>
 #include <plib/sg.h>
 #include <plib/netSocket.h>
 #include <simgear/io/sg_socket_udp.hxx>
@@ -54,6 +53,10 @@ SG_USING_STD(string);
 #define TIME_TO_LIVE 10
 
 
+class ssgEntity;
+class ssgTransform;
+
+
 class MPPlayer {
 public:
 
diff --git a/src/MultiPlayer/multiplayrxmgr.hxx b/src/MultiPlayer/multiplayrxmgr.hxx
index 497bc633a..5127eaaae 100644
--- a/src/MultiPlayer/multiplayrxmgr.hxx
+++ b/src/MultiPlayer/multiplayrxmgr.hxx
@@ -38,7 +38,6 @@
 SG_USING_STD(string);
 
 #include <simgear/compiler.h>
-#include <plib/ssg.h>
 #include <plib/netSocket.h>
 
 // Maximum number of players that can exist at any time
diff --git a/src/MultiPlayer/multiplaytxmgr.hxx b/src/MultiPlayer/multiplaytxmgr.hxx
index 99941fe48..fd6d1d1f9 100644
--- a/src/MultiPlayer/multiplaytxmgr.hxx
+++ b/src/MultiPlayer/multiplaytxmgr.hxx
@@ -38,7 +38,6 @@
 SG_USING_STD(string);
 
 #include <simgear/compiler.h>
-#include <plib/ssg.h>
 #include <plib/netSocket.h>
 
 // Maximum number of players that can exist at any time
diff --git a/src/Scenery/hitlist.hxx b/src/Scenery/hitlist.hxx
index 7956b343e..3ba8f3ba9 100644
--- a/src/Scenery/hitlist.hxx
+++ b/src/Scenery/hitlist.hxx
@@ -13,10 +13,11 @@
 
 #include <vector>
 
-#include <plib/ssg.h>
-
 SG_USING_STD(vector);
 
+class ssgEntity;
+class ssgBranch;
+
 class FGHitRec {
 
 private:
diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index d3476c061..21ecf3798 100644
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -38,8 +38,6 @@
 #include <vector>
 #include STL_STRING
 
-#include <plib/ssg.h>		// plib includes
-
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -56,6 +54,7 @@ typedef vector < Point3D > point_list;
 typedef point_list::iterator point_list_iterator;
 typedef point_list::const_iterator const_point_list_iterator;
 
+class ssgTransform;
 class FGTileEntry;
 
 
diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 1d0426485..7c4a19105 100644
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -35,8 +35,6 @@
 
 #include <queue>
 
-#include <plib/ssg.h>
-
 #include <simgear/bucket/newbucket.hxx>
 #if defined(ENABLE_THREADS) && ENABLE_THREADS
 #  include <simgear/threads/SGQueue.hxx>
@@ -56,6 +54,8 @@ SG_USING_STD( queue );
 
 
 // forward declaration
+class ssgBranch;
+class ssgEntity;
 class FGTileEntry;
 class FGDeferredModel;
 
-- 
2.39.5