9 files changed, 4 insertions, 13 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 1abad8ec..2a0482d9 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -21,13 +21,10 @@
  *  $Id$
  */
 
-#include "../main.h"
-#include "../graphics.h"
-#include "image.h"
 #include "../log.h"
+#include "image.h"
 #include <iostream>
 #include <SDL_image.h>
-#include "resourcemanager.h"
 
 #ifndef USE_OPENGL
 Image::Image(SDL_Surface *image):
diff --git a/src/resources/image.h b/src/resources/image.h
index b41876d2..7fe83a66 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -29,7 +29,6 @@
 #ifdef USE_OPENGL
 #include <SDL_opengl.h>
 #endif
-#include <string>
 
 
 /**
diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index b0f88011..f5abb5cb 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -23,13 +23,11 @@
  
 #include <guichan.hpp>
  
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <iostream>
 
 #include "itemmanager.h"
 #include "resourcemanager.h"
-#include "../main.h"
 #include "../log.h"
 
 // MSVC libxml2 at the moment doesn't work right when using MinGW, missing this
diff --git a/src/resources/itemmanager.h b/src/resources/itemmanager.h
index 8b8c437f..7cc26a25 100644
--- a/src/resources/itemmanager.h
+++ b/src/resources/itemmanager.h
@@ -53,4 +53,6 @@ class ItemManager
         ItemInfo *unknown;
 };
 
+extern ItemManager *itemDb;
+
 #endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index dd95d611..5d15fd08 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -21,9 +21,8 @@
  *  $Id$
  */
 
-#include "../main.h"
-#include "mapreader.h"
 #include "../log.h"
+#include "mapreader.h"
 #include "resourcemanager.h"
 #include "../graphic/spriteset.h"
 #include "../base64.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 241945f1..d0faac6d 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -26,7 +26,6 @@
 
 #include "../map.h"
 #include "../graphic/spriteset.h"
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <vector>
 
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 6b41dd76..9cc848ad 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "music.h"
-#include "resourcemanager.h"
 
 Music::Music(Mix_Chunk *music):
     music(music)
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 8b846ffb..70247a12 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -21,7 +21,6 @@
  *  $Id$
  */
 
-#include "../main.h"
 #include "resourcemanager.h"
 #include "../log.h"
 #include <iostream>
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index ba0af415..30d405d3 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "soundeffect.h"
-#include "resourcemanager.h"
 
 SoundEffect::SoundEffect(Mix_Chunk *soundEffect):
     soundEffect(soundEffect)