19 files changed, 38 insertions, 1 deletions
diff --git a/src/net/download.h b/src/net/download.h
index ec55e60ae..cb74e5e0a 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <string>
 
+#include "localconsts.h"
+
 enum DownloadStatus
 {
     DOWNLOAD_STATUS_CANCELLED = -3,
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index b5f5e8baa..f6a1ec7ba 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -28,6 +28,8 @@
 #include <SDL_types.h>
 #include <string>
 
+#include "localconsts.h"
+
 namespace EAthena
 {
 
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index 58937434c..530702e7d 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -28,6 +28,8 @@
 #include <iosfwd>
 #include <SDL_types.h>
 
+#include "localconsts.h"
+
 namespace EAthena
 {
 
diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index 86277d5d7..34de55889 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -23,6 +23,8 @@
 #ifndef PACKETCOUNTERS_H
 #define PACKETCOUNTERS_H
 
+#include "localconsts.h"
+
 class PacketCounters final
 {
 public:
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 35804b34e..adc79a6b8 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -28,6 +28,8 @@
 #include <SDL_types.h>
 #include <string>
 
+#include "localconsts.h"
+
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 17c1cb5e5..72341c4c1 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -28,6 +28,8 @@
 #include <iosfwd>
 #include <SDL_types.h>
 
+#include "localconsts.h"
+
 namespace TmwAthena
 {
 
diff --git a/src/resources/action.h b/src/resources/action.h
index 0ad4ceaa1..dbb572ef3 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -25,8 +25,9 @@
 
 #include <map>
 
-class Animation;
+#include "localconsts.h"
 
+class Animation;
 
 /**
  * An action consists of several animations, one for each direction.
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
index a4890b24e..09767a472 100644
--- a/src/resources/ambientlayer.h
+++ b/src/resources/ambientlayer.h
@@ -22,6 +22,8 @@
 #ifndef RESOURCES_AMBIENTOVERLAY_H
 #define RESOURCES_AMBIENTOVERLAY_H
 
+#include "localconsts.h"
+
 class Graphics;
 class Image;
 
diff --git a/src/resources/animation.h b/src/resources/animation.h
index ad4b1b187..55db8b717 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -26,6 +26,8 @@
 #include <vector>
 #include <string>
 
+#include "localconsts.h"
+
 class Image;
 
 /**
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 1aa955d68..0ac7662ae 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -25,6 +25,8 @@
 #include <map>
 #include <string>
 
+#include "localconsts.h"
+
 /**
  * Color information database.
  */
diff --git a/src/resources/dye.h b/src/resources/dye.h
index c519d6aec..1655ce051 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -28,6 +28,8 @@
 
 #include <SDL_stdinc.h>
 
+#include "localconsts.h"
+
 const int dyePalateSize = 9;
 const int sPaleteIndex = 7;
 const int aPaleteIndex = 8;
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 1c210263a..bb4fbc4f5 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -27,6 +27,8 @@
 #include <list>
 #include <map>
 
+#include "localconsts.h"
+
 class AnimatedSprite;
 
 struct EmoteSprite final
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index a95a53900..8603fa119 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -22,6 +22,8 @@
 
 #include <iosfwd>
 
+#include "localconsts.h"
+
 struct SDL_Surface;
 
 class ImageWriter final
diff --git a/src/resources/music.h b/src/resources/music.h
index 7e75ceaeb..e002f6b2f 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -27,6 +27,8 @@
 
 #include <SDL_mixer.h>
 
+#include "localconsts.h"
+
 /**
  * Defines a class for loading and storing music.
  */
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 7d6d38416..7ed510ac4 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -32,6 +32,8 @@
 #include <map>
 #include <set>
 
+#include "localconsts.h"
+
 class AnimationDelayLoad;
 class Image;
 class ImageSet;
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 203e3a8f8..6900669c9 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -27,6 +27,8 @@
 
 #include <SDL_mixer.h>
 
+#include "localconsts.h"
+
 /**
  * Defines a class for loading and storing sound effects.
  */
diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h
index 37168e093..b488595db 100644
--- a/src/resources/wallpaper.h
+++ b/src/resources/wallpaper.h
@@ -25,6 +25,8 @@
 
 #include <string>
 
+#include "localconsts.h"
+
 /**
  * Handles organizing and choosing of wallpapers.
  */
diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h
index 71c604f38..4a62c6da8 100644
--- a/src/utils/translation/podict.h
+++ b/src/utils/translation/podict.h
@@ -24,6 +24,8 @@
 #include <string>
 #include <map>
 
+#include "localconsts.h"
+
 typedef std::map <std::string, std::string> PoMap;
 
 class PoDict final
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 40922db5d..e72d72070 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -29,6 +29,8 @@
 
 #include <string>
 
+#include "localconsts.h"
+
 #define XmlNodePtr xmlNodePtr
 #define xmlNameEqual(node, str) xmlStrEqual((node)->name, BAD_CAST (str))
 #define XmlTextWriterPtr xmlTextWriterPtr