Remove unnecessary inclusions of sg.h ans ssg.h

diff --git a/src/ATC/AIEntity.hxx b/src/ATC/AIEntity.hxx
index d3d60ac2db2d38d286fe4ccf4ac2759d80197bfa..0cf5e52cad12e06d7b90c6ca714612b1c0482120 100644 (file)
--- 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 e2bbb5733b5fe596b7b3ba81b407133b790afa2f..c094f60a437fa61b1dc76abbccf7cf40380df5b3 100644 (file)
--- 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 ac7eea0b4598466a9eb459c38e5e200c1b5c5690..808739f3a00357ff9019db1bdae0483fd88d0178 100644 (file)
--- 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 466807ba43da724a16908f907501b3fc5845a226..630767207c7ca8e93347e3e627ad9db99db769c5 100644 (file)
--- 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 e6c33fb8f1de2bc865c8fd544193fd3259787396..b5749201a3c500cd8de43b3c522ad0820f5d3bc5 100644 (file)
--- 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 b99889ce1628f26788f8ffb033bc1a3480998e4b..7cfdf0e2eb72fe6f49566e6a6bfb15ece1de5c54 100644 (file)
--- 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 49ff7507cdc4808dfd16a0df661ae88bcbbd8fde..ba6abf74198227956c5ea4ed8fe349c1bbc5d663 100644 (file)
--- 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 d1f5c7c740a723b977029d8a12c2804a5b23e34d..c16d9f1b0de3e2a707ea314ef102f97d0c4c66fb 100644 (file)
--- 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 497bc633a03e08e600eb46d900af0cd0521348f8..5127eaaae400972ad1dbd7c64edf9d0905288e83 100644 (file)
--- 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 99941fe484c33cd73f2ec0fce36a7116eb38b209..fd6d1d1f92b4f2af6f40e17f3da7eb866cd1b304 100644 (file)
--- 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 7956b343eaa75b1f488657f61c1dd284306431db..3ba8f3ba90602fa961bc5104d4cd6689f8def05c 100644 (file)
--- 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 d3476c061d54ca4a923cdaed8521d153a3c16076..21ecf3798bee1c0b095463463b5b8473df40cd35 100644 (file)
--- 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 1d0426485de6a225618476d516240364cca63c49..7c4a1910563abba22955f0449d230ada5769ad87 100644 (file)
--- 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;