[Pingus-CVS] CVS: Games/Pingus/src DemoPlayer.cc,1.6,1.7 EntranceData.cc,1.4,1.5 EntranceData.hh,1.8,1.9 ExitData.cc,1.7,1.8 ExitData.hh,1.7,1.8 GroundpieceData.cc,1.3,1.4 GroundpieceData.hh,1.12,1.13 HotspotData.cc,1.4,1.5 HotspotData.hh,1.6,1.7 HurryUp.cc,1.12,1.13 LiquidData.cc,1.6,1.7 LiquidData.hh,1.9,1.10 Loading.hh,1.5,1.6 PLF.hh,1.28,1.29 PLFParser.hh,1.7,1.8 PLTXML.hh,1.10,1.11 Pingu.cc,1.72,1.73 PinguAction.cc,1.22,1.23 PinguAction.hh,1.30,1.31 PinguActionFactory.cc,1.3,1.4 PinguActionFactory.hh,1.2,1.3 PinguBmpMap.cc,1.6,1.7 PinguBmpMap.hh,1.5,1.6 PinguMap.hh,1.10,1.11 PingusCounter.cc,1.10,1.11 PingusCounter.hh,1.5,1.6 PingusCounterBar.cc,1.6,1.7 PingusCounterBar.hh,1.2,1.3 PingusGameSession.cc,1.13,1.14 PingusGameSession.hh,1.8,1.9 PingusMapManager.hh,1.4,1.5 PingusMenuManager.hh,1.4,1.5 PingusMessageBox.hh,1.6,1.7 PingusResource.hh,1.9,1.10 PingusSoundReal.cc,1.18,1.19 PingusSoundReal.hh,1.11,1.12 PingusSpotMap.cc,1.52,1.53 PingusSpotMap.hh,1.19,1.20 PingusSubMenu.hh,1.1,1.2 Playfield.cc,1.33,1.34 Playfield.hh,1.23,1.24 PlayfieldView.cc,1.7,1.8 PlayfieldView.hh,1.6,1.7 Position.hh,1.7,1.8 Range.hh,1.3,1.4 ResDescriptor.cc,1.12,1.13 ResDescriptor.hh,1.10,1.11 Server.cc,1.26,1.27 Server.hh,1.16,1.17 SmallMap.hh,1.13,1.14 SmallMapImage.cc,1.9,1.10 SmallMapImage.hh,1.2,1.3 Sprite.cc,1.15,1.16 Sprite.hh,1.14,1.15 StringConverter.hh,1.8,1.9 SurfaceButton.cc,1.37,1.38 SurfaceButton.hh,1.22,1.23 Theme.hh,1.15,1.16 ThemeSelector.cc,1.56,1.57 ThemeSelector.hh,1.15,1.16 TimeDisplay.cc,1.9,1.10 TimeDisplay.hh,1.5,1.6 Trap.hh,1.21,1.22 TrapData.cc,1.8,1.9 TrapData.hh,1.12,1.13 TrueServer.cc,1.29,1.30 View.cc,1.17,1.18 View.hh,1.10,1.11 WeatherData.cc,1.1,1.2 WeatherData.hh,1.2,1.3 World.hh,1.34,1.35 WorldObjData.hh,1.12,1.13 WorldObjGroupData.cc,1.3,1.4 XMLPLF.cc,1.42,1.43 XMLPLF.hh,1.12,1.13 XMLhelper.cc,1.15,1.16 XMLhelper.hh,1.16,1.17

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv16882

Modified Files:
        DemoPlayer.cc EntranceData.cc EntranceData.hh ExitData.cc 
        ExitData.hh GroundpieceData.cc GroundpieceData.hh 
        HotspotData.cc HotspotData.hh HurryUp.cc LiquidData.cc 
        LiquidData.hh Loading.hh PLF.hh PLFParser.hh PLTXML.hh 
        Pingu.cc PinguAction.cc PinguAction.hh PinguActionFactory.cc 
        PinguActionFactory.hh PinguBmpMap.cc PinguBmpMap.hh 
        PinguMap.hh PingusCounter.cc PingusCounter.hh 
        PingusCounterBar.cc PingusCounterBar.hh PingusGameSession.cc 
        PingusGameSession.hh PingusMapManager.hh PingusMenuManager.hh 
        PingusMessageBox.hh PingusResource.hh PingusSoundReal.cc 
        PingusSoundReal.hh PingusSpotMap.cc PingusSpotMap.hh 
        PingusSubMenu.hh Playfield.cc Playfield.hh PlayfieldView.cc 
        PlayfieldView.hh Position.hh Range.hh ResDescriptor.cc 
        ResDescriptor.hh Server.cc Server.hh SmallMap.hh 
        SmallMapImage.cc SmallMapImage.hh Sprite.cc Sprite.hh 
        StringConverter.hh SurfaceButton.cc SurfaceButton.hh Theme.hh 
        ThemeSelector.cc ThemeSelector.hh TimeDisplay.cc 
        TimeDisplay.hh Trap.hh TrapData.cc TrapData.hh TrueServer.cc 
        View.cc View.hh WeatherData.cc WeatherData.hh World.hh 
        WorldObjData.hh WorldObjGroupData.cc XMLPLF.cc XMLPLF.hh 
        XMLhelper.cc XMLhelper.hh 
Log Message:
reduced header dependencies


Index: DemoPlayer.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/DemoPlayer.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DemoPlayer.cc       5 Dec 2001 09:15:50 -0000       1.6
+++ DemoPlayer.cc       8 Jun 2002 20:19:53 -0000       1.7
@@ -1,81 +1,82 @@
-//  $Id$
-//
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <fstream>
-#include "globals.hh"
-#include "algo.hh"
-#include "PingusError.hh"
-#include "DemoPlayer.hh"
-
+//  $Id$
+//
+//  Pingus - A free Lemmings clone
+//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include <fstream>
+#include "globals.hh"
+#include "algo.hh"
+#include "PingusError.hh"
+#include "DemoPlayer.hh"
+#include "my_gettext.hh"
+
 using namespace std;
 
-DemoPlayer::DemoPlayer()
-{
-}
-
-DemoPlayer::~DemoPlayer()
-{
-}
-
-std::string 
-DemoPlayer::get_levelname()
-{
-  return levelname;
-}
-
-void
-DemoPlayer::load(const std::string& arg_filename)
-{
-  const int buffer_size = 256;
-  char buffer[buffer_size];
-  std::string filename;
-  ifstream in;
-  
-  filename = arg_filename;
-
-  in.open(filename.c_str());
-
-  if (!in)
-    throw PingusError(_("DemoPlayer: Couldn't load ") + filename);
-
-  in >> levelname; 
-  in.get(); // \n ueberlesen
-  std::cout << "DemoPlayer: LevelName=" << levelname << std::endl;
-
-  while(!(in.getline(buffer, buffer_size).eof()))
-    {
-      cout << "Readline: " << buffer << endl;
-      event_queue.push(PingusEvent(buffer));
-      std::cout << "Parsed: " << event_queue.back().game_time << ":" << 
event_queue.back().str << std::endl;
-    }
-}
-
-const PingusEvent& 
-DemoPlayer::peek_event()
-{
-  return event_queue.front();
-}
-
-void
-DemoPlayer::dequeue_event()
-{
-  event_queue.pop();
-}
-
-/* EOF */
+DemoPlayer::DemoPlayer()
+{
+}
+
+DemoPlayer::~DemoPlayer()
+{
+}
+
+std::string 
+DemoPlayer::get_levelname()
+{
+  return levelname;
+}
+
+void
+DemoPlayer::load(const std::string& arg_filename)
+{
+  const int buffer_size = 256;
+  char buffer[buffer_size];
+  std::string filename;
+  ifstream in;
+  
+  filename = arg_filename;
+
+  in.open(filename.c_str());
+
+  if (!in)
+    throw PingusError(_("DemoPlayer: Couldn't load ") + filename);
+
+  in >> levelname; 
+  in.get(); // \n ueberlesen
+  std::cout << "DemoPlayer: LevelName=" << levelname << std::endl;
+
+  while(!(in.getline(buffer, buffer_size).eof()))
+    {
+      cout << "Readline: " << buffer << endl;
+      event_queue.push(PingusEvent(buffer));
+      std::cout << "Parsed: " << event_queue.back().game_time << ":" << 
event_queue.back().str << std::endl;
+    }
+}
+
+const PingusEvent& 
+DemoPlayer::peek_event()
+{
+  return event_queue.front();
+}
+
+void
+DemoPlayer::dequeue_event()
+{
+  event_queue.pop();
+}
+
+/* EOF */

Index: EntranceData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EntranceData.cc     7 Jun 2002 20:35:14 -0000       1.4
+++ EntranceData.cc     8 Jun 2002 20:19:53 -0000       1.5
@@ -24,6 +24,8 @@
 #include "EntranceData.hh"
 #include "PingusError.hh"
 #include "StringConverter.hh"
+#include "XMLhelper.hh"
+#include "Position.hh"
 
 
 boost::shared_ptr<WorldObjData> 

Index: EntranceData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/EntranceData.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- EntranceData.hh     7 Jun 2002 20:35:14 -0000       1.8
+++ EntranceData.hh     8 Jun 2002 20:19:53 -0000       1.9
@@ -21,15 +21,13 @@
 #define ENTRANCE_DATA_HH
 
 #include <string>
-
+#include <iosfwd>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "WorldObjData.hh"
 #include "ResDescriptor.hh"
 
-namespace std {
-  template <class T> class char_traits;
-  template <class T1, class T2> struct basic_ofstream;
-  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
-}
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
 
 
 class EntranceData : public WorldObjData

Index: ExitData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitData.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ExitData.cc 7 Jun 2002 20:35:14 -0000       1.7
+++ ExitData.cc 8 Jun 2002 20:19:53 -0000       1.8
@@ -21,6 +21,8 @@
 #include "editor/PLFObj.hh"
 #include "ExitData.hh"
 #include "StringConverter.hh"
+#include "XMLhelper.hh"
+#include "Position.hh"
 
 void 
 ExitData::write_xml(std::ofstream* xml)

Index: ExitData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ExitData.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ExitData.hh 4 Dec 2001 12:18:49 -0000       1.7
+++ ExitData.hh 8 Jun 2002 20:19:53 -0000       1.8
@@ -24,6 +24,9 @@
 #include "ResDescriptor.hh"
 #include "WorldObjData.hh"
 
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
+
 ///
 class ExitData : public WorldObjData
 {

Index: GroundpieceData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GroundpieceData.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GroundpieceData.cc  31 Aug 2001 07:51:51 -0000      1.3
+++ GroundpieceData.cc  8 Jun 2002 20:19:53 -0000       1.4
@@ -20,6 +20,7 @@
 #include <list>
 #include "XMLhelper.hh"
 #include "editor/EditorGroundpieceObj.hh"
+#include "boost/smart_ptr.hpp"
 
 GroundpieceData::GPType 
 GroundpieceData::string_to_type(const std::string& arg_type) 

Index: GroundpieceData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/GroundpieceData.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- GroundpieceData.hh  7 Jun 2002 20:35:14 -0000       1.12
+++ GroundpieceData.hh  8 Jun 2002 20:19:53 -0000       1.13
@@ -20,18 +20,13 @@
 #ifndef GROUNDPIECEDATA_HH
 #define GROUNDPIECEDATA_HH
 
+#include <iosfwd>
 #include <ClanLib/core.h>
 #include <ClanLib/display.h>
 
 #include "ResDescriptor.hh"
 
 class EditorObj;
-
-namespace std {
-  template <class T> class char_traits;
-  template <class T1, class T2> struct basic_ofstream;
-  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
-}
 
 namespace boost {
   template <class T> class shared_ptr;

Index: HotspotData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HotspotData.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HotspotData.cc      15 Jan 2002 10:48:49 -0000      1.4
+++ HotspotData.cc      8 Jun 2002 20:19:53 -0000       1.5
@@ -20,6 +20,8 @@
 #include "Hotspot.hh"
 #include "EditorHotspot.hh"
 #include "HotspotData.hh"
+#include "XMLhelper.hh"
+#include "Position.hh"
 
 void 
 HotspotData::write_xml(std::ofstream* xml)

Index: HotspotData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HotspotData.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HotspotData.hh      7 Jun 2002 20:35:14 -0000       1.6
+++ HotspotData.hh      8 Jun 2002 20:19:53 -0000       1.7
@@ -20,14 +20,13 @@
 #ifndef HOTSPOT_DATA_HH
 #define HOTSPOT_DATA_HH
 
+#include <iosfwd>
+#include <ClanLib/core.h>
 #include "ResDescriptor.hh"
 #include "WorldObjData.hh"
 
-namespace std {
-  template <class T> class char_traits;
-   template <class T1, class T2> struct basic_ofstream;
-  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
-}
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
 
 
 class HotspotData : public WorldObjData

Index: HurryUp.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/HurryUp.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- HurryUp.cc  8 Jun 2002 18:39:57 -0000       1.12
+++ HurryUp.cc  8 Jun 2002 20:19:53 -0000       1.13
@@ -20,6 +20,7 @@
 #include "PingusResource.hh"
 #include "HurryUp.hh"
 #include "Client.hh"
+#include "World.hh"
 #include "Server.hh"
 
 HurryUp::HurryUp()

Index: LiquidData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LiquidData.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LiquidData.cc       15 Jan 2002 10:48:49 -0000      1.6
+++ LiquidData.cc       8 Jun 2002 20:19:53 -0000       1.7
@@ -22,6 +22,8 @@
 #include "editor/PLFObj.hh"
 #include "StringConverter.hh"
 #include "LiquidData.hh"
+#include "XMLhelper.hh"
+#include "Position.hh"
 
 void 
 LiquidData::write_xml(std::ofstream* xml)

Index: LiquidData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/LiquidData.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- LiquidData.hh       7 Jun 2002 20:35:14 -0000       1.9
+++ LiquidData.hh       8 Jun 2002 20:19:53 -0000       1.10
@@ -20,14 +20,14 @@
 #ifndef LIQUIDDATA_HH
 #define LIQUIDDATA_HH
 
+#include <iosfwd>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "ResDescriptor.hh"
 #include "WorldObjData.hh"
 
-namespace std {
-  template <class T> class char_traits;
-  template <class T1, class T2> struct basic_ofstream;
-  typedef struct basic_ofstream<char, char_traits<char> > ofstream;
-}
+
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
 
 ///
 class LiquidData : public WorldObjData

Index: Loading.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Loading.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Loading.hh  14 Dec 2000 21:35:54 -0000      1.5
+++ Loading.hh  8 Jun 2002 20:19:53 -0000       1.6
@@ -20,7 +20,9 @@
 #ifndef LOADING_HH
 #define LOADING_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/display.h>
+
+class CL_Font;
 
 ///
 class Loading

Index: PLF.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PLF.hh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- PLF.hh      11 Feb 2002 00:09:49 -0000      1.28
+++ PLF.hh      8 Jun 2002 20:19:53 -0000       1.29
@@ -20,21 +20,13 @@
 #ifndef PLF_HH
 #define PLF_HH
 
-#include <iostream>
 #include <string>
 #include <vector>
 #include <map>
 
 #include "boost/smart_ptr.hpp"
 
-#include "WeatherData.hh"
 #include "ActionData.hh"
-#include "EntranceData.hh"
-#include "ExitData.hh"
-#include "HotspotData.hh"
-#include "LiquidData.hh"
-#include "TrapData.hh"
-#include "PinguMap.hh"
 #include "WeatherData.hh"
 #include "WorldObjData.hh"
 #include "GroundpieceData.hh"

Index: PLFParser.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PLFParser.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PLFParser.hh        19 Jun 2000 07:26:08 -0000      1.7
+++ PLFParser.hh        8 Jun 2002 20:19:53 -0000       1.8
@@ -22,7 +22,6 @@
 
 #include <fstream>
 #include <string>
-#include <vector>
 
 /** This gets thrown if a end of file is found inside a PLF file */
 class PLFParserEOF {

Index: PLTXML.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PLTXML.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PLTXML.hh   23 Mar 2002 07:37:09 -0000      1.10
+++ PLTXML.hh   8 Jun 2002 20:19:53 -0000       1.11
@@ -23,8 +23,10 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "XMLhelper.hh"
 #include "backgrounds/SurfaceBackgroundData.hh"
+
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
 
 class PLTXML
 {

Index: Pingu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Pingu.cc,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Pingu.cc    1 Jun 2002 18:05:34 -0000       1.72
+++ Pingu.cc    8 Jun 2002 20:19:53 -0000       1.73
@@ -40,6 +40,7 @@
 #include "ColMap.hh"
 #include "PinguActionFactory.hh"
 #include "FVec.hh"
+#include "my_gettext.hh"
 
 const float deadly_velocity = 20.0;
 int   Pingu::id_counter = 0;

Index: PinguAction.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguAction.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PinguAction.cc      3 Apr 2002 21:00:07 -0000       1.22
+++ PinguAction.cc      8 Jun 2002 20:19:53 -0000       1.23
@@ -23,6 +23,7 @@
 #include "World.hh"
 #include "PingusResource.hh"
 #include "PinguAction.hh"
+#include "Pingu.hh"
 
 // Initialise class static.
 const int PinguAction::pingu_height = 26;

Index: PinguAction.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguAction.hh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- PinguAction.hh      1 Jun 2002 18:04:23 -0000       1.30
+++ PinguAction.hh      8 Jun 2002 20:19:53 -0000       1.31
@@ -20,14 +20,8 @@
 #ifndef PINGU_ACTION_HH
 #define PINGU_ACTION_HH
 
-#include <ClanLib/core.h>
-#include "boost/smart_ptr.hpp"
-
-#include "Sprite.hh"
 #include "WorldObj.hh"
 #include "PinguEnums.hh"
-#include "Pingu.hh"
-#include "my_gettext.hh"
 
 ///
 class Pingu;

Index: PinguActionFactory.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguActionFactory.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PinguActionFactory.cc       26 Jan 2002 00:36:39 -0000      1.3
+++ PinguActionFactory.cc       8 Jun 2002 20:19:53 -0000       1.4
@@ -45,6 +45,7 @@
 #include "actions/Walker.hh"
 
 #include "PinguActionFactory.hh"
+#include "boost/smart_ptr.hpp"
 
 PinguActionFactory::PinguActionFactory ()
 {

Index: PinguActionFactory.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguActionFactory.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PinguActionFactory.hh       16 Aug 2001 22:00:50 -0000      1.2
+++ PinguActionFactory.hh       8 Jun 2002 20:19:53 -0000       1.3
@@ -22,10 +22,13 @@
 
 #include <map>
 #include <string>
-#include "boost/smart_ptr.hpp"
 
 class PinguActionAbstractFactory;
 class PinguAction;
+
+namespace boost {
+  template <class T> class shared_ptr;
+}
 
 class PinguActionFactory
 {

Index: PinguBmpMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguBmpMap.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PinguBmpMap.cc      5 Dec 2001 09:15:51 -0000       1.6
+++ PinguBmpMap.cc      8 Jun 2002 20:19:53 -0000       1.7
@@ -21,6 +21,7 @@
 #include "globals.hh"
 #include "PingusError.hh"
 #include "PingusResource.hh"
+#include "ColMap.hh"
 
 /* Headers needed for i18n / gettext */
 #include <clocale>

Index: PinguBmpMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguBmpMap.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PinguBmpMap.hh      14 Dec 2000 21:35:55 -0000      1.5
+++ PinguBmpMap.hh      8 Jun 2002 20:19:53 -0000       1.6
@@ -20,10 +20,12 @@
 #ifndef PINGUBMPMAP_HH
 #define PINGUBMPMAP_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/display.h>
 
 #include "PinguMap.hh"
-#include "ColMap.hh"
+
+class ColMap;
+class ResDescriptor;
 
 ///
 class PinguBmpMap : public PinguMap 

Index: PinguMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguMap.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PinguMap.hh 15 Aug 2001 07:35:27 -0000      1.10
+++ PinguMap.hh 8 Jun 2002 20:19:53 -0000       1.11
@@ -20,11 +20,12 @@
 #ifndef PINGUMAP_HH
 #define PINGUMAP_HH
 
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
 #include "WorldObj.hh"
 
 class ColMap;
+class CL_Surface;
+class CL_SurfaceProvider;
+
 
 /** The type of the map, currently we have a random, a bitmap and a
     spot map, the only map, which is currently supported is the spot

Index: PingusCounter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounter.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PingusCounter.cc    8 Jun 2002 18:39:57 -0000       1.10
+++ PingusCounter.cc    8 Jun 2002 20:19:53 -0000       1.11
@@ -23,6 +23,8 @@
 #include "globals.hh"
 #include "PingusResource.hh"
 #include "PingusCounter.hh"
+#include "World.hh"
+#include "Client.hh"
 
 /* Headers needed for i18n / gettext */
 #include <clocale>

Index: PingusCounter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounter.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PingusCounter.hh    15 Jan 2002 17:52:02 -0000      1.5
+++ PingusCounter.hh    8 Jun 2002 20:19:53 -0000       1.6
@@ -22,13 +22,12 @@
 
 #include <ClanLib/core.h>
 
-#include "Client.hh"
-#include "World.hh"
 #include "GuiObj.hh"
 
-///
+class World;
 class Client;
 
+///
 class PingusCounter : public GuiObj
 {
 private:

Index: PingusCounterBar.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounterBar.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PingusCounterBar.cc 7 Jun 2002 14:50:34 -0000       1.6
+++ PingusCounterBar.cc 8 Jun 2002 20:19:53 -0000       1.7
@@ -20,6 +20,8 @@
 #include <ClanLib/display.h>
 
 #include "PingusCounterBar.hh"
+#include "Server.hh"
+#include "World.hh"
 
 std::ostream& operator<<(std::ostream& s, const CL_Rect& rect)
 {

Index: PingusCounterBar.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusCounterBar.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PingusCounterBar.hh 7 Jun 2002 14:50:34 -0000       1.2
+++ PingusCounterBar.hh 8 Jun 2002 20:19:53 -0000       1.3
@@ -21,8 +21,9 @@
 #define PINGUSCOUNTERBAR_HH
 
 #include <ClanLib/core.h>
-#include "Server.hh"
 #include "GuiObj.hh"
+
+class Server;
 
 class PingusCounterBar : public GuiObj
 {

Index: PingusGameSession.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusGameSession.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PingusGameSession.cc        7 Jun 2002 19:10:33 -0000       1.13
+++ PingusGameSession.cc        8 Jun 2002 20:19:53 -0000       1.14
@@ -24,6 +24,7 @@
 #include "MouseController.hh"
 #include "System.hh"
 #include "PingusGameSession.hh"
+#include "PingusGameSessionResult.hh"
 
 using boost::shared_ptr;
 

Index: PingusGameSession.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusGameSession.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PingusGameSession.hh        7 Jun 2002 19:10:33 -0000       1.8
+++ PingusGameSession.hh        8 Jun 2002 20:19:53 -0000       1.9
@@ -22,10 +22,10 @@
 
 #include <string>
 
-#include "PingusGameSessionResult.hh"
 class Client;
 class Server;
 class PLF;
+class PingusGameSessionResult;
 
 /** You can use this class to start up a game session, which consist
     of a single level. */

Index: PingusMapManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMapManager.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PingusMapManager.hh 15 Jan 2002 10:48:49 -0000      1.4
+++ PingusMapManager.hh 8 Jun 2002 20:19:54 -0000       1.5
@@ -21,7 +21,6 @@
 #define PINGUSMAPMANAGER_HH
 
 #include <string>
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
 
 /* Support to assert macro under MS's compiler */

Index: PingusMenuManager.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMenuManager.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PingusMenuManager.hh        7 Jun 2002 14:50:34 -0000       1.4
+++ PingusMenuManager.hh        8 Jun 2002 20:19:54 -0000       1.5
@@ -21,13 +21,14 @@
 #define PINGUSMENUMANAGER_HH
 
 #include <list>
-#include "PingusSubMenu.hh"
 #include "MenuBackground.hh"
 #include "ExitMenu.hh"
 #include "Story.hh"
 
 #include "PingusMenu.hh"
 #include "Intro.hh"
+
+class PingusSubMenu;
 
 class PingusMenuManager
 {

Index: PingusMessageBox.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusMessageBox.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PingusMessageBox.hh 18 Mar 2001 17:45:04 -0000      1.6
+++ PingusMessageBox.hh 8 Jun 2002 20:19:54 -0000       1.7
@@ -21,8 +21,8 @@
 #define PINGUSMESSAGEBOX_HH
 
 #include <string>
-#include <ClanLib/core.h>
-#include <ClanLib/display.h>
+
+class CL_Font;
 
 ///
 class PingusMessageBox

Index: PingusResource.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusResource.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PingusResource.hh   18 Mar 2001 17:45:04 -0000      1.9
+++ PingusResource.hh   8 Jun 2002 20:19:54 -0000       1.10
@@ -21,12 +21,12 @@
 #define PINGUSRESOURCE_HH
 
 #include <string>
-#include <vector>
 #include <map>
 
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
 #include "ResDescriptor.hh"
+
+class CL_Font;
 
 /** General Resource Managing class, it provides wrappers around
     CL_Surface::load(), CL_Font::load() and friends.  This class is

Index: PingusSoundReal.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSoundReal.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- PingusSoundReal.cc  13 Jan 2002 15:24:18 -0000      1.18
+++ PingusSoundReal.cc  8 Jun 2002 20:19:54 -0000       1.19
@@ -24,6 +24,7 @@
 
 // Needed cause of missing include in some sound file...
 #include <ClanLib/core.h>
+#include <ClanLib/sound.h>
 
 #ifdef HAVE_LIBCLANVORBIS
 #  include <ClanLib/vorbis.h>

Index: PingusSoundReal.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSoundReal.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PingusSoundReal.hh  15 Jan 2002 10:48:49 -0000      1.11
+++ PingusSoundReal.hh  8 Jun 2002 20:19:54 -0000       1.12
@@ -23,12 +23,13 @@
 #define PINGUSSOUNDREAL_HH
 
 #include "audio.hh"
-#include <string>
 #include <map>
 
 #include "PingusSound.hh"
-#include <ClanLib/sound.h>
 #include <ClanLib/Core/System/error.h>
+
+class CL_SoundBuffer;
+class CL_SoundBuffer_Session;
 
 /** A simple wrapper class around SDL_Mixer, it will init itself
     automatically if a sound is played. */

Index: PingusSpotMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSpotMap.cc,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- PingusSpotMap.cc    7 Jun 2002 19:10:33 -0000       1.52
+++ PingusSpotMap.cc    8 Jun 2002 20:19:54 -0000       1.53
@@ -29,6 +29,7 @@
 #include "Timer.hh"
 #include "PingusSpotMap.hh"
 #include "my_gettext.hh"
+#include "ColMap.hh"
 
 using namespace std;
 

Index: PingusSpotMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSpotMap.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- PingusSpotMap.hh    7 Jun 2002 19:10:33 -0000       1.19
+++ PingusSpotMap.hh    8 Jun 2002 20:19:54 -0000       1.20
@@ -21,18 +21,16 @@
 #ifndef PingusSpotMap_HH
 #define PingusSpotMap_HH
 
-#include <fstream>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <cstdio>
-#include <ClanLib/core.h>
+#include <ClanLib/display.h>
 
 #include "globals.hh"
 #include "PinguMap.hh"
-#include "ColMap.hh"
+#include "GroundpieceData.hh"
 
 class PLF;
+class ColMap;
 
 class MapTileSurface
 {

Index: PingusSubMenu.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PingusSubMenu.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PingusSubMenu.hh    14 Jun 2001 11:07:19 -0000      1.1
+++ PingusSubMenu.hh    8 Jun 2002 20:19:54 -0000       1.2
@@ -20,7 +20,8 @@
 #ifndef PINGUSSUBMENU_HH
 #define PINGUSSUBMENU_HH
 
-#include <ClanLib/display.h>
+class CL_Key;
+class CL_InputDevice;
 
 class PingusMenuManager;
 

Index: Playfield.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Playfield.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Playfield.cc        8 Jun 2002 18:39:57 -0000       1.33
+++ Playfield.cc        8 Jun 2002 20:19:54 -0000       1.34
@@ -32,6 +32,7 @@
 #include "GameTime.hh"
 #include "boost/smart_ptr.hpp"
 #include "PinguHolder.hh"
+#include "World.hh"
 
 using boost::shared_ptr;
 

Index: Playfield.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Playfield.hh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Playfield.hh        8 Jun 2002 18:39:57 -0000       1.23
+++ Playfield.hh        8 Jun 2002 20:19:54 -0000       1.24
@@ -22,20 +22,19 @@
 
 #include <ClanLib/core.h>
 
-#include "Range.hh"
 #include "ButtonPanel.hh"
 #include "GuiObj.hh"
-#include "World.hh"
 #include "View.hh"
-#include "PinguInfo.hh"
-#include "Server.hh"
 #include "Client.hh"
 #include "Controller.hh"
 
-///
-class Client;
+class World;
+class Server;
+class PinguInfo;
+class PinguHolder;
 class ButtonPanel;
 
+///
 class Playfield : public GuiObj
 {
 private:  

Index: PlayfieldView.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PlayfieldView.cc    8 Jun 2002 16:08:16 -0000       1.7
+++ PlayfieldView.cc    8 Jun 2002 20:19:54 -0000       1.8
@@ -19,6 +19,7 @@
 
 #include <ClanLib/display.h>
 #include "PlayfieldView.hh"
+#include "World.hh"
 
 PlayfieldView::PlayfieldView (World * w, const CL_Rect& rect)
   : world (w), x_offset (0), y_offset (0)

Index: PlayfieldView.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PlayfieldView.hh    8 Jun 2002 16:08:16 -0000       1.6
+++ PlayfieldView.hh    8 Jun 2002 20:19:54 -0000       1.7
@@ -21,8 +21,9 @@
 #define PLAYFIELDVIEW_HH
 
 #include "GuiObj.hh"
-#include "World.hh"
 #include "Pingu.hh"
+
+class World;
 
 class PlayfieldView : public GuiObj
 {

Index: Position.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Position.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Position.hh 27 Apr 2001 20:44:37 -0000      1.7
+++ Position.hh 8 Jun 2002 20:19:54 -0000       1.8
@@ -20,7 +20,7 @@
 #ifndef POSITION_HH
 #define POSITION_HH
 
-#include <iostream>
+#include <iosfwd>
 #include <ClanLib/core.h>
 
 /**

Index: Range.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Range.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Range.hh    18 Jun 2000 17:01:50 -0000      1.3
+++ Range.hh    8 Jun 2002 20:19:54 -0000       1.4
@@ -22,8 +22,6 @@
 
 // A class similar to an integer, but keeps the value in a given range.
 
-#include <iostream>
-
 ///
 class Range
 {

Index: ResDescriptor.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ResDescriptor.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ResDescriptor.cc    15 Aug 2001 22:01:45 -0000      1.12
+++ ResDescriptor.cc    8 Jun 2002 20:19:54 -0000       1.13
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
 #include "ResDescriptor.hh"
 #include "PingusError.hh"
 

Index: ResDescriptor.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ResDescriptor.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ResDescriptor.hh    15 Jan 2002 10:48:49 -0000      1.10
+++ ResDescriptor.hh    8 Jun 2002 20:19:54 -0000       1.11
@@ -20,7 +20,7 @@
 #ifndef RESDESCRIPTOR_HH
 #define RESDESCRIPTOR_HH
 
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <assert.h>
 

Index: Server.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Server.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Server.cc   8 Jun 2002 16:08:16 -0000       1.26
+++ Server.cc   8 Jun 2002 20:19:54 -0000       1.27
@@ -32,6 +32,7 @@
 #include "PLF.hh"
 #include "StringConverter.hh"
 #include "boost/smart_ptr.hpp"
+#include "World.hh"
 
 using namespace std;
 

Index: Server.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Server.hh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Server.hh   7 Jun 2002 19:10:33 -0000       1.16
+++ Server.hh   8 Jun 2002 20:19:54 -0000       1.17
@@ -21,11 +21,12 @@
 #define SERVER_HH
 
 #include <string>
-#include <fstream>
 
-#include "World.hh"
+#include "PLF.hh"
 #include "ActionHolder.hh"
 #include "DemoRecorder.hh"
+
+class World;
 
 /** An Event in the Pingus World
 

Index: SmallMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMap.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SmallMap.hh 7 Jun 2002 19:10:33 -0000       1.13
+++ SmallMap.hh 8 Jun 2002 20:19:54 -0000       1.14
@@ -20,8 +20,9 @@
 #ifndef SMALLMAP_HH
 #define SMALLMAP_HH
 
-#include "Client.hh"
 #include "GuiObj.hh"
+
+class ColMap;
 
 ///
 class Client;

Index: SmallMapImage.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMapImage.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SmallMapImage.cc    7 Jun 2002 19:10:33 -0000       1.9
+++ SmallMapImage.cc    8 Jun 2002 20:19:54 -0000       1.10
@@ -23,6 +23,7 @@
 #include "SmallMapImage.hh"
 #include "PLF.hh"
 #include "ColMap.hh"
+#include "Server.hh"
 
 using boost::shared_ptr;
 

Index: SmallMapImage.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMapImage.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SmallMapImage.hh    7 Jun 2002 14:50:34 -0000       1.2
+++ SmallMapImage.hh    8 Jun 2002 20:19:54 -0000       1.3
@@ -21,8 +21,10 @@
 #define SMALLMAPIMAGE_HH
 
 #include <ClanLib/display.h>
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "GuiObj.hh"
-#include "Server.hh"
+
+class Server;
 
 /** The base image of the small map, it doesn't handle any userinput,
     it only generates the surface */

Index: Sprite.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Sprite.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Sprite.cc   15 Jan 2002 10:48:49 -0000      1.15
+++ Sprite.cc   8 Jun 2002 20:19:54 -0000       1.16
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <ClanLib/Core/Math/cl_vector.h>
 #include "PingusResource.hh"
 #include "Sprite.hh"
 

Index: Sprite.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Sprite.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Sprite.hh   23 Sep 2001 16:33:48 -0000      1.14
+++ Sprite.hh   8 Jun 2002 20:19:54 -0000       1.15
@@ -21,8 +21,9 @@
 #define SPRITE_HH
 
 #include <ClanLib/display.h>
-#include <ClanLib/core.h>
-#include "ResDescriptor.hh"
+
+class CL_Vector;
+class ResDescriptor;
 
 class Sprite
 {

Index: StringConverter.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/StringConverter.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StringConverter.hh  4 Aug 2001 12:46:22 -0000       1.8
+++ StringConverter.hh  8 Jun 2002 20:19:54 -0000       1.9
@@ -33,6 +33,8 @@
 #include <strstream>
 #endif
 
+class CL_Vector;
+
 template <class T>
 std::string to_string(const T& any)
 {
@@ -48,6 +50,7 @@
   return temp;
 #endif
 }
+
 
 template <class T>
 void from_string(const std::string& rep, T& x)

Index: SurfaceButton.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.cc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- SurfaceButton.cc    17 Jan 2002 23:34:33 -0000      1.37
+++ SurfaceButton.cc    8 Jun 2002 20:19:54 -0000       1.38
@@ -27,7 +27,7 @@
 #include "PingusMenuManager.hh"
 #include "Credits.hh"
 #include "editor/Editor.hh"
-
+#include "ThemeSelector.hh"
 #include "SurfaceButton.hh"
 
 /* Headers needed for i18n / gettext */

Index: SurfaceButton.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SurfaceButton.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- SurfaceButton.hh    6 Jun 2002 14:05:44 -0000       1.22
+++ SurfaceButton.hh    8 Jun 2002 20:19:54 -0000       1.23
@@ -24,10 +24,7 @@
 
 #include <ClanLib/core.h>
 
-#include "PingusMenu.hh"
 #include "worldmap/PingusWorldMapManager.hh"
-#include "ThemeSelector.hh"
-#include "PingusMenu.hh"
 #include "MultiplayerConfig.hh"
 // #include "FileSelector.hh"
 

Index: Theme.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Theme.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Theme.hh    1 Jun 2002 17:55:29 -0000       1.15
+++ Theme.hh    8 Jun 2002 20:19:54 -0000       1.16
@@ -23,12 +23,11 @@
 
 #include <string>
 #include <vector>
-#include <fstream>
-#include <sstream>
-#include <ClanLib/core.h>
 
 #include "MultiLineText.hh"
 #include "PLTXML.hh"
+
+class CL_Font;
 
 ///
 class Theme

Index: ThemeSelector.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ThemeSelector.cc,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ThemeSelector.cc    1 Jun 2002 18:05:35 -0000       1.56
+++ ThemeSelector.cc    8 Jun 2002 20:19:54 -0000       1.57
@@ -29,6 +29,7 @@
 #include "PingusSound.hh"
 #include "PathManager.hh"
 #include "System.hh"
+#include "Theme.hh"
 
 using namespace std;
 

Index: ThemeSelector.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/ThemeSelector.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ThemeSelector.hh    25 Jul 2001 19:49:48 -0000      1.15
+++ ThemeSelector.hh    8 Jun 2002 20:19:54 -0000       1.16
@@ -21,13 +21,13 @@
 #define THEMESELECTOR_HH
 
 #include <ClanLib/core.h>
+#include <ClanLib/display.h>
 
 #include <vector>
 #include <string>
 
-#include "Theme.hh"
-#include "AlphaButton.hh"
-
+class Theme;
+class AlphaButton;
 ///
 class ListItem
 {

Index: TimeDisplay.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TimeDisplay.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TimeDisplay.cc      15 Jan 2002 11:10:17 -0000      1.9
+++ TimeDisplay.cc      8 Jun 2002 20:19:54 -0000       1.10
@@ -24,6 +24,8 @@
 #include "GameTime.hh"
 #include "PingusResource.hh"
 #include "TimeDisplay.hh"
+#include "World.hh"
+#include "Server.hh"
 
 TimeDisplay::TimeDisplay()
 {

Index: TimeDisplay.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TimeDisplay.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TimeDisplay.hh      16 Dec 2000 23:11:20 -0000      1.5
+++ TimeDisplay.hh      8 Jun 2002 20:19:54 -0000       1.6
@@ -21,7 +21,8 @@
 #define TIMEDISPLAY_HH
 
 #include "GuiObj.hh"
-#include "Server.hh"
+
+class Server;
 
 ///
 class TimeDisplay : public GuiObj

Index: Trap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Trap.hh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Trap.hh     8 Jun 2002 16:08:16 -0000       1.21
+++ Trap.hh     8 Jun 2002 20:19:54 -0000       1.22
@@ -20,11 +20,8 @@
 #ifndef TRAP_HH
 #define TRAP_HH
 
-#include <string>
-#include <ClanLib/core.h>
 #include <ClanLib/display.h>
 #include "GameCounter.hh"
-#include "Pingu.hh"
 #include "WorldObj.hh"
 #include "TrapData.hh"
 

Index: TrapData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrapData.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TrapData.cc 15 Jan 2002 10:48:49 -0000      1.8
+++ TrapData.cc 8 Jun 2002 20:19:54 -0000       1.9
@@ -30,6 +30,7 @@
 #include "editor/PLFObj.hh"
 #include "XMLhelper.hh"
 #include "TrapData.hh"
+#include "Position.hh"
 
 void
 TrapData::write_xml(std::ofstream* xml)

Index: TrapData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrapData.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- TrapData.hh 21 Jan 2002 12:06:09 -0000      1.12
+++ TrapData.hh 8 Jun 2002 20:19:54 -0000       1.13
@@ -22,10 +22,16 @@
 
 #include <config.h>
 #include <string>
-#include <iostream>
-
-#include "boost/smart_ptr.hpp"
+#include <iosfwd>
+#include <ClanLib/core.h>
 #include "WorldObjData.hh"
+
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
+
+namespace boost {
+  template <class T> class shared_ptr;
+}
 
 /// Structure holding all the data needed for a trap.
 class TrapData : public WorldObjData

Index: TrueServer.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/TrueServer.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- TrueServer.cc       7 Jun 2002 19:10:33 -0000       1.29
+++ TrueServer.cc       8 Jun 2002 20:19:54 -0000       1.30
@@ -23,6 +23,7 @@
 #include "globals.hh"
 #include "PLF.hh"
 #include "TrueServer.hh"
+#include "World.hh"
 
 using namespace std;
 

Index: View.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- View.cc     8 Jun 2002 16:08:16 -0000       1.17
+++ View.cc     8 Jun 2002 20:19:54 -0000       1.18
@@ -24,6 +24,7 @@
 #include "MouseController.hh"
 #include "View.hh"
 #include "globals.hh"
+#include "World.hh"
 
 // static variables
 World* View::world;

Index: View.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- View.hh     8 Jun 2002 16:08:16 -0000       1.10
+++ View.hh     8 Jun 2002 20:19:54 -0000       1.11
@@ -21,9 +21,10 @@
 #define VIEW_HH
 
 #include "Range.hh"
-#include "World.hh"
 #include "Controller.hh"
 #include "CaptureRectangle.hh"
+
+class World;
 
 /** A class to controll the rentering of the playfield, each display on 
     the screen, which displays the pingus world is an view object. */

Index: WeatherData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WeatherData.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WeatherData.cc      10 Aug 2001 11:05:32 -0000      1.1
+++ WeatherData.cc      8 Jun 2002 20:19:54 -0000       1.2
@@ -19,6 +19,7 @@
 
 #include "editor/EditorObj.hh"
 #include "WeatherData.hh"
+#include "boost/smart_ptr.hpp"
 
 std::list<boost::shared_ptr<EditorObj> > 
 WeatherData::create_EditorObj ()

Index: WeatherData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WeatherData.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WeatherData.hh      10 Aug 2001 10:56:13 -0000      1.2
+++ WeatherData.hh      8 Jun 2002 20:19:54 -0000       1.3
@@ -22,9 +22,13 @@
 
 #include <string>
 #include <list>
-#include "boost/smart_ptr.hpp"
 
 class EditorObj;
+
+namespace boost {
+
+  template <class T> class shared_ptr;
+}
 
 class WeatherData
 {

Index: World.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/World.hh,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- World.hh    8 Jun 2002 16:08:16 -0000       1.34
+++ World.hh    8 Jun 2002 20:19:54 -0000       1.35
@@ -20,11 +20,12 @@
 #ifndef WORLD_HH
 #define WORLD_HH
 
-#include <ClanLib/core.h>
+#include <list>
 #include "boost/smart_ptr.hpp"
-#include "Pingu.hh"
+#include "WorldObj.hh"
 
 // Forward declarations
+class CL_Vector;
 class ActionHolder;
 class Entrance;
 class Exit;
@@ -34,11 +35,10 @@
 class ParticleHolder;
 class PinguHolder;
 class PinguMap;
+class Pingu;
 class Trap;
 class View;
 class ColMap;
-class WorldObj;
-
 class WorldImpl;
 
 /** The World holds all objects of the pingu enviroment. 

Index: WorldObjData.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObjData.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- WorldObjData.hh     1 Jun 2002 17:59:20 -0000       1.12
+++ WorldObjData.hh     8 Jun 2002 20:19:54 -0000       1.13
@@ -22,14 +22,14 @@
 
 #include <list>
 
-#include "boost/smart_ptr.hpp"
-#include "XMLhelper.hh"
 #include "editor/EditorObj.hh"
+#include "boost/smart_ptr.hpp"
 
 class WorldObj;
 
+
 typedef std::list<boost::shared_ptr<EditorObj> > EditorObjLst;
-typedef std::list<boost::shared_ptr<EditorObj> >::iterator EditorObjLstIter;
+typedef EditorObjLst::iterator                   EditorObjLstIter;
 
 /** The root data class for all objects in the Pingus world.  Each
     objects needs a data object for creating, which should be

Index: WorldObjGroupData.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObjGroupData.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WorldObjGroupData.cc        7 Jun 2002 20:35:14 -0000       1.3
+++ WorldObjGroupData.cc        8 Jun 2002 20:19:54 -0000       1.4
@@ -17,11 +17,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <fstream>
 #include "editor/EditorObj.hh"
 #include "editor/EditorObjGroup.hh"
 #include "WorldObj.hh"
 #include "WorldObjGroupData.hh"
-
 
 void 
 WorldObjGroupData::add (boost::shared_ptr<WorldObjData> data)

Index: XMLPLF.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/XMLPLF.cc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- XMLPLF.cc   11 Feb 2002 00:09:49 -0000      1.42
+++ XMLPLF.cc   8 Jun 2002 20:19:54 -0000       1.43
@@ -27,6 +27,12 @@
 #include "StringConverter.hh"
 #include "WorldObjDataFactory.hh"
 #include "WorldObjGroupData.hh"
+#include "ExitData.hh"
+#include "EntranceData.hh"
+#include "TrapData.hh"
+#include "HotspotData.hh"
+#include "LiquidData.hh"
+#include "Position.hh"
 
 using namespace std;
 

Index: XMLPLF.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/XMLPLF.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- XMLPLF.hh   10 Aug 2001 10:56:14 -0000      1.12
+++ XMLPLF.hh   8 Jun 2002 20:19:54 -0000       1.13
@@ -20,10 +20,10 @@
 #ifndef XMLPLF_HH
 #define XMLPLF_HH
 
-#include "XMLhelper.hh"
-#include "Position.hh"
-#include "Color.hh"
 #include "PLF.hh"
+
+class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
+class _xmlNode; typedef _xmlNode* xmlNodePtr;
 
 class XMLPLF : public PLF
 {

Index: XMLhelper.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/XMLhelper.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- XMLhelper.cc        1 Mar 2002 23:04:33 -0000       1.15
+++ XMLhelper.cc        8 Jun 2002 20:19:54 -0000       1.16
@@ -17,8 +17,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <fstream>
 #include "StringConverter.hh"
 #include "XMLhelper.hh"
+#include "Position.hh"
+#include "Color.hh"
+#include "ResDescriptor.hh"
 
 // Hack: if xmlIsBlankNode() is not present, we define an empty dummy
 #ifdef NO_XMLISBLANKNODE

Index: XMLhelper.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/XMLhelper.hh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- XMLhelper.hh        7 May 2002 08:49:23 -0000       1.16
+++ XMLhelper.hh        8 Jun 2002 20:19:54 -0000       1.17
@@ -21,12 +21,10 @@
 #define XMLHELPER_HH
 
 #include <config.h>
-#include <iostream>
 #include <string>
-#include <fstream>
+#include <iosfwd>
 
 #include <config.h>
-#include <ClanLib/core.h>
 
 // FIX: Under windows, it's necessary to use libxml/parser.h, or MS's
 // compiler will fails.
@@ -35,33 +33,33 @@
   #include <libxml/parser.h>
   #undef list
 #else
-#ifdef LIBXML_2
-#include <libxml/parser.h>
-#else
-#include <parser.h>
-#endif
+  #ifdef LIBXML_2
+    #include <libxml/parser.h>
+  #else
+    #include <parser.h>
+  #endif
 #endif
 
-#include "ResDescriptor.hh"
-#include "Position.hh"
-#include "Color.hh"
-
 // Some compatibility stuff
 #ifdef LIBXML_2
-#define ROOT children
+  #define ROOT children
 #else // libxml 1.x
-#define children childs
-#define ROOT root
+  #define children childs
+  #define ROOT root
 #endif
 
 // Hack: if xmlIsBlankNode() is not present, we define an empty dummy
 #ifdef NO_XMLISBLANKNODE
-int xmlIsBlankNode(xmlNodePtr node);
+  int xmlIsBlankNode(xmlNodePtr node);
 #endif
 
+class CL_Vector;
+class Color;
+class Position;
+class ResDescriptor;
+
 class XMLhelper
 {
-private:
 
 public:
   static std::string XMLhelper::encode_entities(const std::string& arg_str);