11 files changed, 13 insertions, 15 deletions
diff --git a/src/configuration.h b/src/configuration.h
index 2a5f123d3..96f11d127 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -24,10 +24,10 @@
 #define CONFIGURATION_H
 
 #include "utils/stringutils.h"
-#include "utils/xml.h"
-
 #ifdef ENABLE_PUGIXML
 #include "utils/xmlwriter.h"
+#else
+#include "utils/xml.h"
 #endif  // ENABLE_PUGIXML
 
 #include "defaults.h"
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
index d9cdf6fd0..d6755be16 100644
--- a/src/gui/models/touchactionmodel.h
+++ b/src/gui/models/touchactionmodel.h
@@ -25,7 +25,7 @@
 
 #include "gui/models/namesmodel.h"
 
-#include "gui/widgets/setupitem.h"
+#include <map>
 
 class TouchActionsModel final : public NamesModel
 {
diff --git a/src/gui/shortcut/spellshortcut.cpp b/src/gui/shortcut/spellshortcut.cpp
index 6b6a842ed..06457972b 100644
--- a/src/gui/shortcut/spellshortcut.cpp
+++ b/src/gui/shortcut/spellshortcut.cpp
@@ -23,6 +23,7 @@
 #include "gui/shortcut/spellshortcut.h"
 
 #include "spellmanager.h"
+#include "textcommand.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/buyingstoreselldialog.h b/src/gui/windows/buyingstoreselldialog.h
index db197bd22..af59e0a54 100644
--- a/src/gui/windows/buyingstoreselldialog.h
+++ b/src/gui/windows/buyingstoreselldialog.h
@@ -27,8 +27,6 @@
 
 #include "gui/widgets/selldialog.h"
 
-class Being;
-
 /**
  * The sell dialog.
  *
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 2e31ca80f..40405f3e8 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -23,6 +23,7 @@
 #include "gui/windows/textcommandeditor.h"
 
 #include "spellmanager.h"
+#include "textcommand.h"
 
 #include "input/keyboardconfig.h"
 
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 6aee4c139..4bc7d0ca2 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -33,8 +33,6 @@ class Button;
 class OnlinePlayer;
 class ScrollArea;
 
-struct SDL_Thread;
-
 /**
  * Update progress window GUI
  *
diff --git a/src/net/download.h b/src/net/download.h
index ddceb158f..c265090af 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -41,8 +41,6 @@ typedef size_t (*WriteFunction)( void *ptr, size_t size, size_t nmemb,
                                  void *stream);
 
 struct SDL_Thread;
-struct curl_httppost;
-struct curl_slist;
 
 namespace Net
 {
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index f8faa327b..9ec86d05d 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -33,8 +33,6 @@ class Image;
 class ImageCollection;
 class ImageVertexes;
 
-struct SDL_Surface;
-
 /**
  * A central point of control for graphics.
  */
diff --git a/src/resources/loaders/musicloader.h b/src/resources/loaders/musicloader.h
index a321c9107..06ee28312 100644
--- a/src/resources/loaders/musicloader.h
+++ b/src/resources/loaders/musicloader.h
@@ -27,9 +27,7 @@
 
 #include <string>
 
-class Resource;
 class SDLMusic;
-class SoundEffect;
 
 namespace Loader
 {
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 8a87fe521..79ec80a40 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -23,6 +23,7 @@
 #include "spellmanager.h"
 
 #include "configuration.h"
+#include "textcommand.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
diff --git a/src/spellmanager.h b/src/spellmanager.h
index 41664e7e1..814cbf5db 100644
--- a/src/spellmanager.h
+++ b/src/spellmanager.h
@@ -23,9 +23,14 @@
 #ifndef SPELLMANAGER_H
 #define SPELLMANAGER_H
 
-#include "textcommand.h"
+#include <string>
+#include <map>
+#include <vector>
 
-#include "being/being.h"
+#include "localconsts.h"
+
+class Being;
+class TextCommand;
 
 class SpellManager final
 {