Some more include cleanups.

Signed-off-by: Ira Rice <irarice@gmail.com>

17 files changed, 11 insertions, 23 deletions

diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 8d7156a9..54c319de 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
-
 #include "animation.h"
 
 #include "../utils/dtor.h"
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index d769b2b8..f0758c25 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -27,7 +27,8 @@
 
 #include <guichan/listmodel.hpp>
 
-class BuddyList : public gcn::ListModel {
+class BuddyList : public gcn::ListModel
+{
     public:
         /**
          * Constructor
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index f80ca6b3..7456f0e4 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -19,14 +19,12 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <cassert>
 #include <libxml/tree.h>
 
 #include "colordb.h"
 
 #include "../log.h"
 
-#include "../utils/dtor.h"
 #include "../utils/gettext.h"
 #include "../utils/xml.h"
 
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index fd760c3f..63d85501 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -19,7 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
 #include <sstream>
 
 #include "dye.h"
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 2f43822d..adc1635c 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -20,11 +20,9 @@
  */
 
 #include "emotedb.h"
-#include "resourcemanager.h"
 
 #include "../log.h"
 
-#include "../utils/dtor.h"
 #include "../utils/gettext.h"
 #include "../utils/xml.h"
 
diff --git a/src/resources/image.h b/src/resources/image.h
index 5b376053..9af10fda 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -40,6 +40,8 @@
 #include "resource.h"
 
 class Dye;
+class SDL_Rect;
+class SDL_Surface;
 
 /**
  * Defines a class for loading and storing images.
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index 8ad6c5d4..c182b44c 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <cassert>
-#include <string>
 
 #include <guichan/color.hpp>
 #include <guichan/sdl/sdlpixel.hpp>
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index a9133846..039d3afb 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <iosfwd>
-
 struct SDL_Surface;
 
 class ImageWriter
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 752ea38b..9976f0d4 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -24,8 +24,6 @@
 #include <libxml/tree.h>
 
 #include "itemdb.h"
-#include "iteminfo.h"
-#include "resourcemanager.h"
 
 #include "../log.h"
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index e7c23ca2..08a7acd0 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -26,6 +26,8 @@
 
 #include "iteminfo.h"
 
+class ItemInfo;
+
 /**
  * The namespace that holds the item information.
  */
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index a4ec3b69..2278dc67 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <zlib.h>
 
+#include "animation.h"
 #include "image.h"
 #include "mapreader.h"
 #include "resourcemanager.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index ef945c3f..0ed553c3 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -22,8 +22,6 @@
 #ifndef MAPREADER_H
 #define MAPREADER_H
 
-#include <iosfwd>
-
 #include <libxml/tree.h>
 
 class Map;
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index c7926260..c7824a5d 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "monsterdb.h"
-#include "resourcemanager.h"
+#include "monsterinfo.h"
 
 #include "../log.h"
 
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 6fbde55f..0a218661 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -24,7 +24,7 @@
 
 #include <map>
 
-#include "monsterinfo.h"
+class MonsterInfo;
 
 /**
  * Monster information database.
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 88572481..73c3939d 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -20,11 +20,9 @@
  */
 
 #include "npcdb.h"
-#include "resourcemanager.h"
 
 #include "../log.h"
 
-#include "../utils/dtor.h"
 #include "../utils/gettext.h"
 #include "../utils/xml.h"
 
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 303b82c8..7c5f989e 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -62,8 +62,7 @@ class Resource
         /**
          * Destructor.
          */
-        virtual
-        ~Resource();
+        virtual ~Resource();
 
     private:
         std::string mIdPath; /**< Path identifying this resource. */
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 05ec9e54..116df930 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -35,8 +35,7 @@ class SoundEffect : public Resource
         /**
          * Destructor.
          */
-        virtual
-        ~SoundEffect();
+        virtual ~SoundEffect();
 
         /**
          * Loads a sample from a buffer in memory.