Removed superfluous #includes taken from checkheaders list.

Resolves: Mana-Mantis #265.

Trivial fix.

40 files changed, 0 insertions, 75 deletions

diff --git a/src/actor.cpp b/src/actor.cpp
index 44a89600..5ab7ab51 100644
--- a/src/actor.cpp
+++ b/src/actor.cpp
@@ -23,7 +23,6 @@
 #include "map.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 Actor::Actor():
         mMap(NULL)
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index df568d72..e43d94e1 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -21,7 +21,6 @@
 #include "actorsprite.h"
 
 #include "client.h"
-#include "effectmanager.h"
 #include "event.h"
 #include "imagesprite.h"
 #include "localplayer.h"
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 5d038a18..a4b61ed3 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -23,7 +23,6 @@
 
 #include "localplayer.h"
 
-#include "utils/stringutils.h"
 #include "utils/dtor.h"
 
 #include <cassert>
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index ec666d80..bd00ede8 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -22,15 +22,12 @@
 #include "animatedsprite.h"
 
 #include "graphics.h"
-#include "log.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include "utils/xml.h"
-
 #include <cassert>
 
 AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
diff --git a/src/avatar.cpp b/src/avatar.cpp
index f11bf535..b47333b6 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -20,10 +20,6 @@
 
 #include "avatar.h"
 
-#include "localplayer.h"
-
-#include <sstream>
-
 Avatar::Avatar(const std::string &name):
         mName(name),
         mHp(0), mMaxHp(0),
diff --git a/src/being.cpp b/src/being.cpp
index d0442610..543b16d0 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -37,9 +37,7 @@
 #include "playerrelations.h"
 #include "simpleanimation.h"
 #include "sound.h"
-#include "sprite.h"
 #include "text.h"
-#include "statuseffect.h"
 
 #include "gui/gui.h"
 #include "gui/socialwindow.h"
@@ -59,13 +57,10 @@
 #include "resources/iteminfo.h"
 #include "resources/monsterdb.h"
 #include "resources/npcdb.h"
-#include "resources/resourcemanager.h"
 #include "resources/theme.h"
 #include "resources/userpalette.h"
 
-#include "utils/dtor.h"
 #include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include <cassert>
 #include <cmath>
diff --git a/src/being.h b/src/being.h
index 49995641..7f6f8007 100644
--- a/src/being.h
+++ b/src/being.h
@@ -25,7 +25,6 @@
 #include "actorsprite.h"
 #include "listener.h"
 #include "map.h"
-#include "particlecontainer.h"
 #include "position.h"
 #include "vector.h"
 
diff --git a/src/chatlog.cpp b/src/chatlog.cpp
index d45bea22..f33b1aff 100644
--- a/src/chatlog.cpp
+++ b/src/chatlog.cpp
@@ -35,7 +35,6 @@
 #include <Carbon/Carbon.h>
 #endif
 
-#include "log.h"
 #include "configuration.h"
 
 #include "utils/stringutils.h"
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 293e170c..ec45825f 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -22,13 +22,10 @@
 
 #include "game.h"
 #include "graphics.h"
-#include "openglgraphics.h"
 #include "map.h"
 
 #include "resources/image.h"
 
-#include "utils/dtor.h"
-
 #include <SDL.h>
 
 #define BUFFER_WIDTH 100
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 366d804a..f41645a9 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -20,8 +20,6 @@
 
 #include "defaults.h"
 
-#include "utils/stringutils.h"
-
 #include "being.h"
 #include "graphics.h"
 #include "client.h"
diff --git a/src/game.cpp b/src/game.cpp
index cb754701..1eb66572 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -52,7 +52,6 @@
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
 #include "gui/npcdialog.h"
-#include "gui/npcpostdialog.h"
 #include "gui/okdialog.h"
 #include "gui/outfitwindow.h"
 #include "gui/quitdialog.h"
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 7e5f04fa..84838d15 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -22,8 +22,6 @@
 #ifndef GUI_CHANGEEMAIL_H
 #define GUI_CHANGEEMAIL_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 361debe4..d356a5df 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -22,8 +22,6 @@
 #ifndef CHANGEPASSWORDDIALOG_H
 #define CHANGEPASSWORDDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 6d565135..2c0444bf 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -22,10 +22,6 @@
 #ifndef CHAR_SELECT_H
 #define CHAR_SELECT_H
 
-#include "being.h"
-#include "guichanfwd.h"
-#include "main.h"
-
 #include "gui/widgets/window.h"
 
 #include "net/charhandler.h"
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 5688bf30..dcb3523d 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -23,7 +23,6 @@
 #define EQUIPMENTWINDOW_H
 
 #include "equipment.h"
-#include "guichanfwd.h"
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 4ae80309..0ddd13f7 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -28,7 +28,6 @@
 #include "gui/widgets/window.h"
 
 #include "net/inventoryhandler.h"
-#include "net/net.h"
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 8fa1052c..d0dc2c69 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -22,8 +22,6 @@
 #ifndef QUITDIALOG_H
 #define QUITDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 43e83a68..4be94bb8 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -22,8 +22,6 @@
 #ifndef SETUP_H
 #define SETUP_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 764f9d51..3b1b1832 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -22,8 +22,6 @@
 #ifndef SKILLDIALOG_H
 #define SKILLDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 85abe3a4..dedeeffc 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -23,8 +23,6 @@
 
 #include <vector>
 
-#include "guichanfwd.h"
-
 #include "playerinfo.h"
 
 #include "gui/widgets/window.h"
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 275dd8c9..103111a7 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -22,7 +22,6 @@
 #ifndef STATUS_H
 #define STATUS_H
 
-#include "guichanfwd.h"
 #include "listener.h"
 
 #include "gui/widgets/window.h"
diff --git a/src/gui/trade.h b/src/gui/trade.h
index ac602669..e22f8863 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -22,8 +22,6 @@
 #ifndef TRADE_H
 #define TRADE_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index dd330afd..87999d5d 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -22,8 +22,6 @@
 #ifndef UNREGISTERDIALOG_H
 #define UNREGISTERDIALOG_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 3b449371..93e36b5b 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -22,7 +22,6 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
-#include "actorspritemanager.h"
 #include "listener.h"
 #include "position.h"
 
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 245306ae..3c556f01 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "log.h"
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 2d65c7e9..0e5abef8 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -27,7 +27,6 @@
 #include "playerinfo.h"
 
 #include "net/inventoryhandler.h"
-#include "net/net.h"
 
 #include "resources/iteminfo.h"
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 65143d69..ec2bf6ed 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -20,7 +20,6 @@
 
 #include "configuration.h"
 #include "keyboardconfig.h"
-#include "log.h"
 
 #include "gui/sdlinput.h"
 #include "gui/setup_keyboard.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4aec2399..17641ed4 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -23,19 +23,16 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "effectmanager.h"
 #include "event.h"
 #include "flooritem.h"
 #include "graphics.h"
 #include "guild.h"
 #include "item.h"
-#include "log.h"
 #include "map.h"
 #include "particle.h"
 #include "playerinfo.h"
 #include "simpleanimation.h"
 #include "sound.h"
-#include "text.h"
 
 #include "gui/gui.h"
 #include "gui/okdialog.h"
@@ -54,8 +51,6 @@
 #include "resources/animation.h"
 #include "resources/imageset.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
-#include "resources/theme.h"
 #include "resources/userpalette.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 25fc3563..0694e39e 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -23,7 +23,6 @@
 #define CHARHANDLER_H
 
 #include "localplayer.h"
-#include "logindata.h"
 #include "playerinfo.h"
 
 #include <iosfwd>
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 9b0c8d95..0c5d889f 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -22,8 +22,6 @@
 #ifndef MAPHANDLER_H
 #define MAPHANDLER_H
 
-#include "logindata.h"
-
 #include <iosfwd>
 
 namespace Net {
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 1d8c66af..4b8474dd 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -19,9 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "client.h"
-#include "main.h"
-
 #ifndef GENERALHANDLER_H
 #define GENERALHANDLER_H
 
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 021a57f3..22675d5a 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -24,8 +24,6 @@
 
 #include "being.h"
 
-#include "net/serverinfo.h"
-
 #include <string>
 
 class LoginData
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index b3534b83..d7676a92 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -24,7 +24,6 @@
 
 #include "being.h"
 #include "flooritem.h"
-#include "localplayer.h"
 
 namespace Net {
 
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 7818e9d2..c24b7d64 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -25,8 +25,6 @@
 
 #include "resources/image.h"
 
-#include "utils/stringutils.h"
-
 #ifdef USE_OPENGL
 
 #ifdef __APPLE__
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index ee96e19c..23638eec 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -22,8 +22,6 @@
 #ifndef OPENGLGRAPHICS_H
 #define OPENGLGRAPHICS_H
 
-#include "main.h"
-
 #include "graphics.h"
 
 #ifdef USE_OPENGL
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index a8e2bebb..1915822f 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -27,7 +27,6 @@
 #include "listener.h"
 #include "log.h"
 
-#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
 namespace PlayerInfo {
diff --git a/src/resources/image.h b/src/resources/image.h
index 1db52ca0..9fdc0997 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -22,8 +22,6 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "main.h"
-
 #include "resources/resource.h"
 
 #include <SDL.h>
diff --git a/src/text.cpp b/src/text.cpp
index 216b02e2..53b21e79 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -27,9 +27,7 @@
 #include "textrenderer.h"
 
 #include "gui/gui.h"
-#include "gui/palette.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/image.h"
 #include "resources/theme.h"
 
diff --git a/src/text.h b/src/text.h
index c884b394..70dd4a89 100644
--- a/src/text.h
+++ b/src/text.h
@@ -24,7 +24,6 @@
 #define TEXT_H
 
 #include "graphics.h"
-#include "guichanfwd.h"
 
 #include <guichan/color.hpp>
 
diff --git a/src/textparticle.h b/src/textparticle.h
index 7d99a057..79af7406 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -22,7 +22,6 @@
 #ifndef TEXTPARTICLE_H
 #define TEXTPARTICLE_H
 
-#include "guichanfwd.h"
 #include "particle.h"
 
 class TextParticle : public Particle