Remove extra includes from headers.

65 files changed, 54 insertions, 34 deletions

diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index c2e7a4c02..118a4e76a 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -32,6 +32,7 @@
 #include "fs/mkdir.h"
 #include "fs/paths.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/gettext.h"
 
diff --git a/src/configuration.cpp b/src/configuration.cpp
index f0436707d..bc872b4d5 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -31,6 +31,7 @@
 
 #include "listeners/configlistener.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/foreach.h"
diff --git a/src/dirs.cpp b/src/dirs.cpp
index 80ad3242f..ae46f2721 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -38,6 +38,8 @@
 #include "fs/files.h"
 #endif  // defined(__native_client__) || (defined(ANDROID) &&
         // defined(USE_SDL2))
+
+#include "utils/cast.h"
 #include "utils/gettext.h"
 
 #ifdef ANDROID
diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp
index 59097e5be..60fc9f977 100644
--- a/src/fs/virtfs/fsdir.cpp
+++ b/src/fs/virtfs/fsdir.cpp
@@ -30,6 +30,7 @@
 #include "fs/virtfs/fsfuncs.h"
 #include "fs/virtfs/list.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
 #include "utils/stdmove.h"
diff --git a/src/fs/virtfs/fsdirrwops.cpp b/src/fs/virtfs/fsdirrwops.cpp
index 9527aaf5b..bef2534fb 100644
--- a/src/fs/virtfs/fsdirrwops.cpp
+++ b/src/fs/virtfs/fsdirrwops.cpp
@@ -24,6 +24,8 @@
 
 #include "fs/virtfs/file.h"
 
+#include "utils/cast.h"
+
 PRAGMA48(GCC diagnostic push)
 PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_rwops.h>
diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index d3821b5b9..830909778 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -28,6 +28,7 @@
 #include "fs/virtfs/zipreader.h"
 #include "fs/virtfs/ziplocalheader.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
 #include "utils/stringutils.h"
diff --git a/src/fs/virtfs/fsziprwops.cpp b/src/fs/virtfs/fsziprwops.cpp
index 3dbe7ece7..e9f72c469 100644
--- a/src/fs/virtfs/fsziprwops.cpp
+++ b/src/fs/virtfs/fsziprwops.cpp
@@ -25,6 +25,8 @@
 #include "fs/virtfs/file.h"
 #include "fs/virtfs/fsfuncs.h"
 
+#include "utils/cast.h"
+
 PRAGMA48(GCC diagnostic push)
 PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_rwops.h>
diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp
index 4bbdd6af7..3302fd7c0 100644
--- a/src/fs/virtfs/zipreader.cpp
+++ b/src/fs/virtfs/zipreader.cpp
@@ -25,6 +25,7 @@
 #include "fs/virtfs/zipentry.h"
 #include "fs/virtfs/ziplocalheader.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h
index ce977fb5f..4028895fb 100644
--- a/src/gui/models/iconsmodel.h
+++ b/src/gui/models/iconsmodel.h
@@ -25,7 +25,6 @@
 
 #include "gui/models/listmodel.h"
 
-#include "utils/cast.h"
 #include "utils/foreach.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
index 3b4933ce2..a49a7cfc5 100644
--- a/src/gui/models/itemsmodel.h
+++ b/src/gui/models/itemsmodel.h
@@ -29,7 +29,6 @@
 
 #include "resources/db/itemdb.h"
 
-#include "utils/cast.h"
 #include "utils/foreach.h"
 
 #include <list>
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 8b558d17a..206daa02a 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -31,7 +31,6 @@
 
 #include "gui/models/listmodel.h"
 
-#include "utils/cast.h"
 #include "utils/gettext.h"
 
 /**
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 0905bf22a..00f295cc4 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -28,8 +28,6 @@
 
 #include "gui/color.h"
 
-#include "utils/cast.h"
-
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/gui/theme.h b/src/gui/theme.h
index b617002ad..9ef477452 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -34,7 +34,6 @@
 
 #include "gui/palette.h"
 
-#include "utils/cast.h"
 #include "utils/stringvector.h"
 
 #include "localconsts.h"
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 712c1f90a..4f7e0e941 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -32,8 +32,6 @@
 
 #include "gui/models/listmodel.h"
 
-#include "utils/cast.h"
-
 /**
  * Class controlling the game's color palette.
  */
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index 16689d6a9..20d019f8d 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -27,8 +27,6 @@
 
 #include "gui/models/serverslistmodel.h"
 
-#include "utils/cast.h"
-
 #include "localconsts.h"
 
 class ServersListBox final : public ListBox
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index d611b7dce..93c702381 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -39,7 +39,6 @@
 #include "gui/popups/popupmenu.h"
 #include "gui/popups/skillpopup.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/skillrectanglelistbox.h b/src/gui/widgets/skillrectanglelistbox.h
index 16fc610a4..88698de1c 100644
--- a/src/gui/widgets/skillrectanglelistbox.h
+++ b/src/gui/widgets/skillrectanglelistbox.h
@@ -36,7 +36,6 @@
 #include "gui/popups/popupmenu.h"
 #include "gui/popups/skillpopup.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index d023fa442..017f465c7 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -33,7 +33,6 @@
 
 #include "gui/widgets/tabs/socialfriendsfunctor.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/foreach.h"
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 9a23938ca..8652a54fe 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -26,7 +26,6 @@
 
 #include "being/localplayer.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/foreach.h"
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index 9f8a8ff67..ff8544232 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -28,7 +28,6 @@
 
 #include "being/localplayer.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/foreach.h"
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index b86799f6a..80b5910f3 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -34,7 +34,6 @@
 
 #include "input/keyboardconfig.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 1287bfed1..d7f22c1f7 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -30,7 +30,6 @@
 
 #include "net/partyhandler.h"
 
-#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/foreach.h"
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index d8ce21df0..87b0335c1 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -30,7 +30,6 @@
 
 #include "gui/models/beingslistmodel.h"
 
-#include "utils/cast.h"
 #include "utils/gettext.h"
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index bcde2e411..fefd862a0 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -73,8 +73,6 @@
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
 
-#include "utils/cast.h"
-
 #include "localconsts.h"
 
 /**
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index 12f76e897..ed9110ba4 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -28,8 +28,6 @@
 #include "gui/themecolorsidoperators.h"
 #include "gui/theme.h"
 
-#include "utils/cast.h"
-
 #include "localconsts.h"
 
 class Widget;
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 8b8d3bf47..a87c0cada 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -41,8 +41,6 @@
 #include "input/inputactiondata.h"
 #include "input/inputmanager.h"
 
-#include "utils/cast.h"
-
 #include "localconsts.h"
 
 #define defaultAction(name) \
diff --git a/src/logger.cpp b/src/logger.cpp
index 69b37fc51..e7efa82d7 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -26,6 +26,7 @@
 
 #include "listeners/debugmessagelistener.h"
 
+#include "utils/cast.h"
 #include "utils/foreach.h"
 #include "utils/stringutils.h"
 
diff --git a/src/logger.h b/src/logger.h
index 5efa0779f..15b955795 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -23,8 +23,6 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "utils/cast.h"
-
 #include "localconsts.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 5d9c434de..769a498b3 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -26,6 +26,8 @@
 #include "settings.h"
 
 #include "fs/files.h"
+
+#include "utils/cast.h"
 #include "utils/sdlhelper.h"
 
 #include <zlib.h>
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 0596e9952..28aefef7a 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -27,6 +27,7 @@
 #include "logger.h"
 #include "settings.h"
 
+#include "utils/cast.h"
 #include "utils/dtor.h"
 
 #include "net/logindata.h"
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 949d82cf6..ad7909c7a 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -27,6 +27,7 @@
 
 #include "net/packetinfo.h"
 
+#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
diff --git a/src/net/eathena/generalrecv.cpp b/src/net/eathena/generalrecv.cpp
index 58f16c9df..2074fe31e 100644
--- a/src/net/eathena/generalrecv.cpp
+++ b/src/net/eathena/generalrecv.cpp
@@ -27,6 +27,7 @@
 
 #include "net/messagein.h"
 
+#include "utils/cast.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index a53748be0..c5cb79fda 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -27,6 +27,7 @@
 #include "net/net.h"
 #include "net/packetcounters.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 4c6194fdd..79ac29f51 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -79,6 +79,7 @@
 
 #include "resources/db/networkdb.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
 
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 11b28d510..f474da086 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -24,6 +24,7 @@
 
 #include "net/packetcounters.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 #include "logger.h"
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 1be005220..3e07ee28b 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -31,6 +31,8 @@
 
 #include "localconsts.h"
 
+UTILS_CAST_H
+
 #define createOutPacket(name) MessageOut outMsg(name); \
     outMsg.writeInt16(CAST_S16(name), #name)
 
diff --git a/src/net/packetlimiter.cpp b/src/net/packetlimiter.cpp
index b6eee37ae..8dc8211b2 100644
--- a/src/net/packetlimiter.cpp
+++ b/src/net/packetlimiter.cpp
@@ -23,6 +23,7 @@
 #include "configuration.h"
 #include "settings.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/timer.h"
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 577d384b7..1e0019219 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -67,6 +67,7 @@
 #include "net/tmwa/searchstorehandler.h"
 #include "net/tmwa/vendinghandler.h"
 
+#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
diff --git a/src/net/tmwa/generalrecv.cpp b/src/net/tmwa/generalrecv.cpp
index f9f933d85..0bc1c6a4c 100644
--- a/src/net/tmwa/generalrecv.cpp
+++ b/src/net/tmwa/generalrecv.cpp
@@ -27,6 +27,7 @@
 
 #include "net/messagein.h"
 
+#include "utils/cast.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 845df01e3..792f88743 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -27,6 +27,7 @@
 #include "net/net.h"
 #include "net/packetcounters.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 30ec6e8ec..ebc4db9e6 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -59,6 +59,8 @@
 
 #include "net/tmwa/messagein.h"
 
+#include "utils/cast.h"
+
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/particle/particle.h b/src/particle/particle.h
index 1db2f565b..7004af0e6 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -30,8 +30,6 @@
 
 #include "enums/simpletypes/beingid.h"
 
-#include "utils/cast.h"
-
 #include "particle/particleengine.h"
 
 #include "localconsts.h"
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index 2e06ae495..e67120688 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -25,8 +25,6 @@
 
 #include "particle/particle.h"
 
-#include "utils/cast.h"
-
 class TextParticle final : public Particle
 {
     public:
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index 4d4b68083..8c4cd79e6 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -27,6 +27,8 @@
 
 #include "fs/virtfs/tools.h"
 
+#include "utils/cast.h"
+
 #include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index 7401933a6..6d244960f 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -25,6 +25,8 @@
 
 #include "enums/resources/map/blockmask.h"
 
+#include "utils/cast.h"
+
 #include "resources/beinginfo.h"
 
 #include "resources/sprite/spritereference.h"
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 4093a95b8..d0511e872 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -35,6 +35,7 @@
 
 #include "resources/db/colordb.h"
 
+#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 92d06ce40..0fe990fed 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -23,6 +23,7 @@
 
 #include "configuration.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
 
diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp
index 08038d796..eafb9745e 100644
--- a/src/resources/db/npcdb.cpp
+++ b/src/resources/db/npcdb.cpp
@@ -31,6 +31,7 @@
 
 #include "resources/sprite/spritereference.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/db/unitsdb.cpp b/src/resources/db/unitsdb.cpp
index e9b310c6d..998dd7230 100644
--- a/src/resources/db/unitsdb.cpp
+++ b/src/resources/db/unitsdb.cpp
@@ -26,6 +26,7 @@
 
 #include "const/resources/currency.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/stdmove.h"
 
diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp
index 353f09fec..03f35a77c 100644
--- a/src/resources/image/image.cpp
+++ b/src/resources/image/image.cpp
@@ -35,6 +35,7 @@
 
 #include "resources/resourcemanager/resourcemanager.h"
 
+#include "utils/cast.h"
 #include "utils/sdlcheckutils.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 59a44c87f..9f6bb2ecc 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -26,6 +26,7 @@
 
 #include "resources/image/image.h"
 
+#include "utils/cast.h"
 #include "utils/dtor.h"
 
 #include "debug.h"
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index b1d5baf7d..d9485a52c 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -22,6 +22,7 @@
 
 #include "resources/imagewriter.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 
 #include <png.h>
diff --git a/src/resources/inventory/complexinventory.cpp b/src/resources/inventory/complexinventory.cpp
index 065b77e49..4d77cfdde 100644
--- a/src/resources/inventory/complexinventory.cpp
+++ b/src/resources/inventory/complexinventory.cpp
@@ -26,6 +26,8 @@
 
 #include "being/playerinfo.h"
 
+#include "utils/cast.h"
+
 #include "resources/item/complexitem.h"
 
 #include "debug.h"
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 3ae809058..c952b7ffa 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -33,8 +33,6 @@
 #include "enums/resources/map/maplayerposition.h"
 #include "enums/resources/map/maptype.h"
 
-#include "utils/cast.h"
-
 #include "listeners/configlistener.h"
 
 #include "resources/memorycounter.h"
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index e75df7b44..256618e66 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -24,6 +24,8 @@
 
 #include "logger.h"
 
+#include "utils/cast.h"
+
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "debug.h"
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index c599dd165..cdbc7f5cd 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -34,6 +34,7 @@
 
 #include "resources/sprite/spritedef.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
 
diff --git a/src/resources/sdlgfxblitfunc.cpp b/src/resources/sdlgfxblitfunc.cpp
index 97a6e7bc4..6efce719a 100644
--- a/src/resources/sdlgfxblitfunc.cpp
+++ b/src/resources/sdlgfxblitfunc.cpp
@@ -29,6 +29,7 @@ LGPL (c) A. Schiffler
 #ifndef USE_SDL2
 #include "resources/sdlgfxblitfunc.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index d28091ce5..e9e54b046 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -30,6 +30,8 @@
 
 #include "fs/virtfs/fs.h"
 
+#include "utils/cast.h"
+
 #include "resources/sdlmusic.h"
 #include "resources/soundeffect.h"
 
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index dae875b5a..ce62b537c 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -27,6 +27,7 @@
 
 #include "fs/paths.h"
 
+#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/process.h"
 
diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h
index 777d19784..6833e9528 100644
--- a/src/utils/buildhex.h
+++ b/src/utils/buildhex.h
@@ -25,6 +25,8 @@
 
 #include "localconsts.h"
 
+UTILS_CAST_H
+
 PRAGMA48(GCC diagnostic push)
 PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #ifndef SDL_BIG_ENDIAN
diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp
index ccffdea22..dca31ab5e 100644
--- a/src/utils/sdlhelper.cpp
+++ b/src/utils/sdlhelper.cpp
@@ -24,6 +24,7 @@
 
 #include "logger.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 #if defined(USE_X11) && defined(USE_OPENGL)
diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h
index 54e7e0b41..920ad4164 100644
--- a/src/utils/sdlpixel.h
+++ b/src/utils/sdlpixel.h
@@ -66,8 +66,6 @@
 
 #include "gui/color.h"
 
-#include "utils/cast.h"
-
 PRAGMA48(GCC diagnostic push)
 PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL.h>
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index ea15cb6bb..90204fb49 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -26,6 +26,7 @@
 
 #include "fs/virtfs/fs.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/fuzzer.h"
 #include "utils/stringutils.h"
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index bf94c3443..12ae1d794 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -26,6 +26,7 @@
 
 #include "fs/virtfs/fs.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/fuzzer.h"
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp
index c68059399..3a1646168 100644
--- a/src/utils/xml/tinyxml2.cpp
+++ b/src/utils/xml/tinyxml2.cpp
@@ -26,6 +26,7 @@
 
 #include "fs/virtfs/fs.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/fuzzer.h"
 #include "utils/stringutils.h"