diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2327ff570..86d9d50c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,13 +224,13 @@ add_library(devilution STATIC
   Source/player.cpp
   Source/plrmsg.cpp
   Source/portal.cpp
-  Source/spelldat.cpp
   Source/quests.cpp
   Source/render.cpp
   Source/restrict.cpp
   Source/scrollrt.cpp
   Source/setmaps.cpp
   Source/sha.cpp
+  Source/spelldat.cpp
   Source/spells.cpp
   Source/stores.cpp
   Source/sync.cpp
diff --git a/Source/all.h b/Source/all.h
new file mode 100644
index 000000000..9b16d993c
--- /dev/null
+++ b/Source/all.h
@@ -0,0 +1,93 @@
+#ifndef __ALL_H__
+#define __ALL_H__
+
+#include <SDL.h>
+
+#ifdef USE_SDL1
+#include "sdl2_to_1_2_backports.h"
+#else
+#include "sdl2_backports.h"
+#endif
+
+#include "sdl_compat.h"
+
+#include "../types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "appfat.h"
+#include "automap.h"
+#include "capture.h"
+#include "codec.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#include "debug.h"
+#include "diablo.h"
+#include "doom.h"
+#include "drlg_l1.h"
+#include "drlg_l2.h"
+#include "drlg_l3.h"
+#include "drlg_l4.h"
+#include "dthread.h"
+#include "dx.h"
+#include "effects.h"
+#include "encrypt.h"
+#include "engine.h"
+#include "error.h"
+#include "gamemenu.h"
+#include "gendung.h"
+#include "gmenu.h"
+#include "help.h"
+#include "init.h"
+#include "interfac.h"
+#include "inv.h"
+#include "itemdat.h"
+#include "items.h"
+#include "lighting.h"
+#include "loadsave.h"
+#include "mainmenu.h"
+#include "minitext.h"
+#include "misdat.h"
+#include "missiles.h"
+#include "monstdat.h"
+#include "monster.h"
+#include "movie.h"
+#include "mpqapi.h"
+#include "msg.h"
+#include "multi.h"
+#include "nthread.h"
+#include "objdat.h"
+#include "objects.h"
+#include "pack.h"
+#include "palette.h"
+#include "path.h"
+#include "pfile.h"
+#include "player.h"
+#include "plrmsg.h"
+#include "portal.h"
+#include "quests.h"
+#include "restrict.h"
+#include "scrollrt.h"
+#include "setmaps.h"
+#include "sha.h"
+#include "sound.h"
+#include "spelldat.h"
+#include "spells.h"
+#include "stores.h"
+#include "sync.h"
+#include "textdat.h" // check file name
+#include "themes.h"
+#include "tmsg.h"
+#include "town.h"
+#include "towners.h"
+#include "track.h"
+#include "trigs.h"
+#include "wave.h"
+#include "render.h" // linked last, likely .s/.asm
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ALL_H__ */
diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index 4b7702cf6..231152285 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include <config.h>
 
diff --git a/Source/automap.cpp b/Source/automap.cpp
index 311871bc6..eb6d8a06c 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/capture.cpp b/Source/capture.cpp
index b425bab7b..56379b44b 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -1,6 +1,6 @@
 #include <fstream>
 
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "file_util.h"
 
diff --git a/Source/codec.cpp b/Source/codec.cpp
index 127af291c..dbe104dfc 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/control.cpp b/Source/control.cpp
index 9a616d9e5..653b56877 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index 312999b4a..ffe96325b 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/dead.cpp b/Source/dead.cpp
index 7bb978e88..0d6838dc1 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/debug.cpp b/Source/debug.cpp
index a05dc61fa..11cbd4880 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 5a75a4e9e..1a7528838 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 #include <config.h>
diff --git a/Source/diablo.h b/Source/diablo.h
index aee94eac4..c3a6de331 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -1,94 +1,6 @@
 #ifndef __DIABLO_H__
 #define __DIABLO_H__
 
-#include <SDL.h>
-
-#ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
-#else
-#include "sdl2_backports.h"
-#endif
-
-#include "sdl_compat.h"
-
-#include "../types.h"
-
-//#ifdef __cplusplus
-//extern "C" {
-//#endif
-#include "appfat.h"
-#include "automap.h"
-#include "capture.h"
-#include "codec.h"
-#include "control.h"
-#include "cursor.h"
-#include "dead.h"
-#include "debug.h"
-#include "doom.h"
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
-#include "dthread.h"
-#include "dx.h"
-#include "effects.h"
-#include "encrypt.h"
-#include "engine.h"
-#include "error.h"
-#include "gamemenu.h"
-#include "gendung.h"
-#include "gmenu.h"
-#include "help.h"
-#include "init.h"
-#include "interfac.h"
-#include "inv.h"
-#include "itemdat.h"
-#include "items.h"
-#include "lighting.h"
-#include "loadsave.h"
-#include "mainmenu.h"
-#include "minitext.h"
-#include "misdat.h"
-#include "missiles.h"
-#include "monstdat.h"
-#include "monster.h"
-#include "movie.h"
-#include "mpqapi.h"
-#include "msg.h"
-#include "multi.h"
-#include "nthread.h"
-#include "objdat.h"
-#include "objects.h"
-#include "pack.h"
-#include "palette.h"
-#include "path.h"
-#include "pfile.h"
-#include "player.h"
-#include "plrmsg.h"
-#include "portal.h"
-#include "quests.h"
-#include "restrict.h"
-#include "scrollrt.h"
-#include "setmaps.h"
-#include "sha.h"
-#include "sound.h"
-#include "spelldat.h"
-#include "spells.h"
-#include "stores.h"
-#include "sync.h"
-#include "textdat.h" // check file name
-#include "themes.h"
-#include "tmsg.h"
-#include "town.h"
-#include "towners.h"
-#include "track.h"
-#include "trigs.h"
-#include "wave.h"
-#include "render.h" // linked last, likely .s/.asm
-//#ifdef __cplusplus
-//}
-//#endif
-
 extern HWND ghMainWnd;
 extern int glMid1Seed[NUMLEVELS];
 extern int glMid2Seed[NUMLEVELS];
diff --git a/Source/doom.cpp b/Source/doom.cpp
index d3a765257..cacddbb5e 100644
--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 1eb1cecd0..e3d24dea7 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index 8ad90762d..218887550 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index 16afb736e..36213b742 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index 6fb078a41..e564dfa51 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index 8a2fd70a1..be6eda8d8 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/effects.cpp b/Source/effects.cpp
index 88674ea91..6805324a2 100644
--- a/Source/effects.cpp
+++ b/Source/effects.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include <SDL_mixer.h>
 
diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index ecd0c6166..d3c4b3d33 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/PKWare/pkware.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/engine.cpp b/Source/engine.cpp
index ea970350b..ea2aa5eab 100644
--- a/Source/engine.cpp
+++ b/Source/engine.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/error.cpp b/Source/error.cpp
index 6f27a020c..b0cd5afa8 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index 050e06f56..f0a7e0d87 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index 8352c7ac7..f5e605900 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index 769cfcd26..af2933e92 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/help.cpp b/Source/help.cpp
index bfd8d97a2..0c08aa5b0 100644
--- a/Source/help.cpp
+++ b/Source/help.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/init.cpp b/Source/init.cpp
index 90fb2629c..edb25527f 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 85122da5b..baf3396cb 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/inv.cpp b/Source/inv.cpp
index f104a17be..e30506d54 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/itemdat.cpp b/Source/itemdat.cpp
index c1ed50493..1662ffb9d 100644
--- a/Source/itemdat.cpp
+++ b/Source/itemdat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/items.cpp b/Source/items.cpp
index 1861dc5e9..fc4873c33 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index 8ecf8f413..0874bc8f7 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 59b8f5fb2..d8cf2e79e 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp
index 29f779df5..8b8c1b20b 100644
--- a/Source/mainmenu.cpp
+++ b/Source/mainmenu.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 3e74adbe5..390d5b1b3 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/misdat.cpp b/Source/misdat.cpp
index a7face746..30b883995 100644
--- a/Source/misdat.cpp
+++ b/Source/misdat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index be3fe2844..3afac4ee2 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp
index c94cf7fd4..f12abcc30 100644
--- a/Source/monstdat.cpp
+++ b/Source/monstdat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 00bafcdc1..5c89fa88c 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/movie.cpp b/Source/movie.cpp
index 79a7138db..1ac3a421c 100644
--- a/Source/movie.cpp
+++ b/Source/movie.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../SourceX/display.h"
 
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index ee0642b50..78d2505a2 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -3,7 +3,7 @@
 #include <cerrno>
 #include <fstream>
 
-#include "diablo.h"
+#include "all.h"
 #include "../SourceS/file_util.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 40381f716..58bb5cc37 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 8800c33a2..83f686b81 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 9b2c5c858..61e7d0967 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/objdat.cpp b/Source/objdat.cpp
index 1b805ff78..8a2c2f941 100644
--- a/Source/objdat.cpp
+++ b/Source/objdat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 33242a8e6..b05247f54 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/pack.cpp b/Source/pack.cpp
index 0d2719aa6..d2266f2ef 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/palette.cpp b/Source/palette.cpp
index fbac933e7..7ad0d029c 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/path.cpp b/Source/path.cpp
index cda28e6cd..52f49c0eb 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 994f19fdf..80f2e26f3 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 #include "file_util.h"
diff --git a/Source/player.cpp b/Source/player.cpp
index bc9c14653..4754457d6 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
index 15d18ce31..76c2efb73 100644
--- a/Source/plrmsg.cpp
+++ b/Source/plrmsg.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/portal.cpp b/Source/portal.cpp
index b614c66ef..edb159ba7 100644
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/quests.cpp b/Source/quests.cpp
index a2fe3a1c4..91fc910a3 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/render.cpp b/Source/render.cpp
index 14b1f0fae..e35a39f71 100644
--- a/Source/render.cpp
+++ b/Source/render.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/restrict.cpp b/Source/restrict.cpp
index 72e8a1a29..b66f59e79 100644
--- a/Source/restrict.cpp
+++ b/Source/restrict.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 5d639702e..19a9bcc89 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index ed17daf8d..fa9665b16 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/sha.cpp b/Source/sha.cpp
index b19f3d1e2..bb25b427c 100644
--- a/Source/sha.cpp
+++ b/Source/sha.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 #include <cstdint>
 
diff --git a/Source/spelldat.cpp b/Source/spelldat.cpp
index 1017c0039..03ecffdbe 100644
--- a/Source/spelldat.cpp
+++ b/Source/spelldat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/spells.cpp b/Source/spells.cpp
index a9af150de..61f36ce81 100644
--- a/Source/spells.cpp
+++ b/Source/spells.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/stores.cpp b/Source/stores.cpp
index bc05dc8ac..824325d68 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/sync.cpp b/Source/sync.cpp
index d30e917f8..fcf63b4ec 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/textdat.cpp b/Source/textdat.cpp
index 30f828d67..a0d489031 100644
--- a/Source/textdat.cpp
+++ b/Source/textdat.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/themes.cpp b/Source/themes.cpp
index 337b842cf..1eaee19bf 100644
--- a/Source/themes.cpp
+++ b/Source/themes.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp
index e3e6894c3..74adf7b4e 100644
--- a/Source/tmsg.cpp
+++ b/Source/tmsg.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/town.cpp b/Source/town.cpp
index ff16fa380..8fe574026 100644
--- a/Source/town.cpp
+++ b/Source/town.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/towners.cpp b/Source/towners.cpp
index 38c8b7ab6..92dd97dcd 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/track.cpp b/Source/track.cpp
index f11f8af74..829d5fa52 100644
--- a/Source/track.cpp
+++ b/Source/track.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/trigs.cpp b/Source/trigs.cpp
index 82e4ca430..7b98b3e92 100644
--- a/Source/trigs.cpp
+++ b/Source/trigs.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 DEVILUTION_BEGIN_NAMESPACE
 
diff --git a/Source/wave.cpp b/Source/wave.cpp
index 145768a52..f7b6358aa 100644
--- a/Source/wave.cpp
+++ b/Source/wave.cpp
@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/SourceS/devilution.h b/SourceS/devilution.h
deleted file mode 100644
index 62363acba..000000000
--- a/SourceS/devilution.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "diablo.h"
-#include "../3rdParty/Storm/Source/storm.h"
diff --git a/SourceT/automap_test.cpp b/SourceT/automap_test.cpp
index a855c7392..809c326ab 100644
--- a/SourceT/automap_test.cpp
+++ b/SourceT/automap_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Automap, InitAutomap) {
 	dvl::InitAutomapOnce();
diff --git a/SourceT/codec_test.cpp b/SourceT/codec_test.cpp
index 69631d041..d0255dc6d 100644
--- a/SourceT/codec_test.cpp
+++ b/SourceT/codec_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Codec, codec_get_encoded_len) {
 	EXPECT_EQ(dvl::codec_get_encoded_len(50), 72);
diff --git a/SourceT/control_test.cpp b/SourceT/control_test.cpp
index a0a445ecf..b403f73a0 100644
--- a/SourceT/control_test.cpp
+++ b/SourceT/control_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Control, SetSpell) {
 	dvl::pnumlines = 1;
diff --git a/SourceT/cursor_test.cpp b/SourceT/cursor_test.cpp
index 01eceb387..43e8eae4c 100644
--- a/SourceT/cursor_test.cpp
+++ b/SourceT/cursor_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Cursor, SetCursor) {
 	int i = dvl::ICURS_SPIKED_CLUB + dvl::CURSOR_FIRSTITEM;
diff --git a/SourceT/dead_test.cpp b/SourceT/dead_test.cpp
index 5ad255478..8adb4fc49 100644
--- a/SourceT/dead_test.cpp
+++ b/SourceT/dead_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Dead, AddDead) {
 	dvl::AddDead(21, 48, 8, dvl::DIR_W);
diff --git a/SourceT/diablo_test.cpp b/SourceT/diablo_test.cpp
index 7a78a084a..a67168476 100644
--- a/SourceT/diablo_test.cpp
+++ b/SourceT/diablo_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Diablo, diablo_pause_game_unpause) {
 	dvl::PauseMode = 1;
diff --git a/SourceT/doom_test.cpp b/SourceT/doom_test.cpp
index bf66e4602..ff410215e 100644
--- a/SourceT/doom_test.cpp
+++ b/SourceT/doom_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Doom, doom_get_frame_from_time) {
 	dvl::DoomQuestState = 1200 * 8 + 548;
diff --git a/SourceT/drlg_l1_test.cpp b/SourceT/drlg_l1_test.cpp
index 4419f7b3b..9ee651554 100644
--- a/SourceT/drlg_l1_test.cpp
+++ b/SourceT/drlg_l1_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Drlg_l1, DRLG_Init_Globals_4flag) {
 	dvl::lightflag = false;
diff --git a/SourceT/drlg_l2_test.cpp b/SourceT/drlg_l2_test.cpp
index dc31a2622..856e6e21d 100644
--- a/SourceT/drlg_l2_test.cpp
+++ b/SourceT/drlg_l2_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Drlg_l2, InitDungeon) {
 	dvl::InitDungeon();
diff --git a/SourceT/drlg_l3_test.cpp b/SourceT/drlg_l3_test.cpp
index d02051825..125e336a0 100644
--- a/SourceT/drlg_l3_test.cpp
+++ b/SourceT/drlg_l3_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Drlg_l3, AddFenceDoors_x) {
 	memset(dvl::dungeon, 0, sizeof(dvl::dungeon));
diff --git a/SourceT/drlg_l4_test.cpp b/SourceT/drlg_l4_test.cpp
index 294b3f5ca..067bf0699 100644
--- a/SourceT/drlg_l4_test.cpp
+++ b/SourceT/drlg_l4_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Drlg_l4, IsDURWall) {
 	EXPECT_EQ(dvl::IsDURWall(25), true);
diff --git a/SourceT/effects_test.cpp b/SourceT/effects_test.cpp
index 88b5dd6d8..4a7f7a2f3 100644
--- a/SourceT/effects_test.cpp
+++ b/SourceT/effects_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "devilution.h"
+#include "all.h"
 
 TEST(Drlg_l4, calc_snd_position_center) {
 	dvl::plr[dvl::myplr].WorldX = 50;
diff --git a/SourceX/DiabloUI/art.h b/SourceX/DiabloUI/art.h
index 1b8f6b064..d776cff97 100644
--- a/SourceX/DiabloUI/art.h
+++ b/SourceX/DiabloUI/art.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 namespace dvl {
 
diff --git a/SourceX/DiabloUI/art_draw.h b/SourceX/DiabloUI/art_draw.h
index 2a841a251..03c14cc46 100644
--- a/SourceX/DiabloUI/art_draw.h
+++ b/SourceX/DiabloUI/art_draw.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 #include "DiabloUI/art.h"
 
diff --git a/SourceX/DiabloUI/credits.cpp b/SourceX/DiabloUI/credits.cpp
index 71edf0575..988b01a91 100644
--- a/SourceX/DiabloUI/credits.cpp
+++ b/SourceX/DiabloUI/credits.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "controls/menu_controls.h"
-#include "devilution.h"
+#include "all.h"
 #include "display.h"
 
 #include "DiabloUI/diabloui.h"
diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp
index bc5407ee1..5ebbc2b40 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/SourceX/DiabloUI/diabloui.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "display.h"
 #include "stubs.h"
 #include "utf8.h"
diff --git a/SourceX/DiabloUI/dialogs.cpp b/SourceX/DiabloUI/dialogs.cpp
index 7f3740d87..865c0b105 100644
--- a/SourceX/DiabloUI/dialogs.cpp
+++ b/SourceX/DiabloUI/dialogs.cpp
@@ -1,7 +1,7 @@
 #include "DiabloUI/dialogs.h"
 
 #include "controls/menu_controls.h"
-#include "devilution.h"
+#include "all.h"
 #include "dx.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/button.h"
diff --git a/SourceX/DiabloUI/fonts.h b/SourceX/DiabloUI/fonts.h
index af54e0f21..4848bbd9d 100644
--- a/SourceX/DiabloUI/fonts.h
+++ b/SourceX/DiabloUI/fonts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 #include <SDL_ttf.h>
 
diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp
index 0ee165ddd..4426c78f0 100644
--- a/SourceX/DiabloUI/mainmenu.cpp
+++ b/SourceX/DiabloUI/mainmenu.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/selok.h"
 
diff --git a/SourceX/DiabloUI/progress.cpp b/SourceX/DiabloUI/progress.cpp
index ab9004dc6..d12ef4989 100644
--- a/SourceX/DiabloUI/progress.cpp
+++ b/SourceX/DiabloUI/progress.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "display.h"
 
 #include "DiabloUI/button.h"
diff --git a/SourceX/DiabloUI/selconn.cpp b/SourceX/DiabloUI/selconn.cpp
index bef1bf1ea..5ed1ea16c 100644
--- a/SourceX/DiabloUI/selconn.cpp
+++ b/SourceX/DiabloUI/selconn.cpp
@@ -1,6 +1,6 @@
 #include "selconn.h"
 
-#include "devilution.h"
+#include "all.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
 
diff --git a/SourceX/DiabloUI/selgame.cpp b/SourceX/DiabloUI/selgame.cpp
index 6dd05e09f..84e48254e 100644
--- a/SourceX/DiabloUI/selgame.cpp
+++ b/SourceX/DiabloUI/selgame.cpp
@@ -1,6 +1,6 @@
 #include "selgame.h"
 
-#include "devilution.h"
+#include "all.h"
 #include "config.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp
index c017f8c56..35247854b 100644
--- a/SourceX/DiabloUI/selhero.cpp
+++ b/SourceX/DiabloUI/selhero.cpp
@@ -6,7 +6,7 @@
 
 #include "DiabloUI/diabloui.h"
 #include "../../DiabloUI/diabloui.h"
-#include "devilution.h"
+#include "all.h"
 #include "DiabloUI/dialogs.h"
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/selyesno.h"
diff --git a/SourceX/DiabloUI/selok.cpp b/SourceX/DiabloUI/selok.cpp
index f28e00508..4ff71bafd 100644
--- a/SourceX/DiabloUI/selok.cpp
+++ b/SourceX/DiabloUI/selok.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
 #include "DiabloUI/selok.h"
diff --git a/SourceX/DiabloUI/selok.h b/SourceX/DiabloUI/selok.h
index 05e953588..b0d0b3b8f 100644
--- a/SourceX/DiabloUI/selok.h
+++ b/SourceX/DiabloUI/selok.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 void UiSelOkDialog(const char *title, const char *body, bool background);
diff --git a/SourceX/DiabloUI/selyesno.cpp b/SourceX/DiabloUI/selyesno.cpp
index a53344fa4..bb6a5574a 100644
--- a/SourceX/DiabloUI/selyesno.cpp
+++ b/SourceX/DiabloUI/selyesno.cpp
@@ -1,6 +1,6 @@
 #include "selyesno.h"
 
-#include "devilution.h"
+#include "all.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
 
diff --git a/SourceX/DiabloUI/selyesno.h b/SourceX/DiabloUI/selyesno.h
index 4405b5dcd..b63954c15 100644
--- a/SourceX/DiabloUI/selyesno.h
+++ b/SourceX/DiabloUI/selyesno.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 bool UiSelHeroYesNoDialog(const char *title, const char *body);
diff --git a/SourceX/DiabloUI/text_draw.h b/SourceX/DiabloUI/text_draw.h
index 3cb9f973a..1721b8780 100644
--- a/SourceX/DiabloUI/text_draw.h
+++ b/SourceX/DiabloUI/text_draw.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 
diff --git a/SourceX/DiabloUI/title.cpp b/SourceX/DiabloUI/title.cpp
index 8c40834e6..2c683d236 100644
--- a/SourceX/DiabloUI/title.cpp
+++ b/SourceX/DiabloUI/title.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "controls/menu_controls.h"
 #include "DiabloUI/diabloui.h"
 
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.h b/SourceX/DiabloUI/ttf_render_wrapped.h
index 150ba4472..f54ee5abe 100644
--- a/SourceX/DiabloUI/ttf_render_wrapped.h
+++ b/SourceX/DiabloUI/ttf_render_wrapped.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 #include <SDL_ttf.h>
 
diff --git a/SourceX/DiabloUI/ui_item.h b/SourceX/DiabloUI/ui_item.h
index fcb3497d8..78929cc83 100644
--- a/SourceX/DiabloUI/ui_item.h
+++ b/SourceX/DiabloUI/ui_item.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "devilution.h"
+#include "all.h"
 #include "stubs.h"
 
 #include "DiabloUI/art.h"
diff --git a/SourceX/controls/controller_buttons.h b/SourceX/controls/controller_buttons.h
index 9e1405fa0..bc821b6a2 100644
--- a/SourceX/controls/controller_buttons.h
+++ b/SourceX/controls/controller_buttons.h
@@ -1,7 +1,7 @@
 #pragma once
 // Unifies joystick, gamepad, and keyboard controller APIs.
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 
diff --git a/SourceX/controls/controller_motion.h b/SourceX/controls/controller_motion.h
index e2dfca1a4..20f5d902d 100644
--- a/SourceX/controls/controller_motion.h
+++ b/SourceX/controls/controller_motion.h
@@ -2,7 +2,7 @@
 
 // Processes and stores mouse and joystick motion.
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 
diff --git a/SourceX/controls/game_controls.h b/SourceX/controls/game_controls.h
index 7dfb8a941..8a16a62f1 100644
--- a/SourceX/controls/game_controls.h
+++ b/SourceX/controls/game_controls.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 
diff --git a/SourceX/controls/menu_controls.h b/SourceX/controls/menu_controls.h
index b878857e5..fa84f8b34 100644
--- a/SourceX/controls/menu_controls.h
+++ b/SourceX/controls/menu_controls.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 
diff --git a/SourceX/controls/modifier_hints.cpp b/SourceX/controls/modifier_hints.cpp
index ede43ea23..25246c52c 100644
--- a/SourceX/controls/modifier_hints.cpp
+++ b/SourceX/controls/modifier_hints.cpp
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "devilution.h"
+#include "all.h"
 #include "controls/controller.h"
 #include "controls/game_controls.h"
 
diff --git a/SourceX/controls/plrctrls.h b/SourceX/controls/plrctrls.h
index 2bc22d072..830c26f2c 100644
--- a/SourceX/controls/plrctrls.h
+++ b/SourceX/controls/plrctrls.h
@@ -1,7 +1,7 @@
 #pragma once
 // Controller actions implementation
 
-#include "devilution.h"
+#include "all.h"
 
 namespace dvl {
 
diff --git a/SourceX/display.h b/SourceX/display.h
index 064d7bcc2..06dc5ff0b 100644
--- a/SourceX/display.h
+++ b/SourceX/display.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "devilution.h"
+#include "all.h"
 #include <SDL.h>
 #include <type_traits>
 
diff --git a/SourceX/dvlnet/abstract_net.h b/SourceX/dvlnet/abstract_net.h
index a01fcde86..9ae76ca62 100644
--- a/SourceX/dvlnet/abstract_net.h
+++ b/SourceX/dvlnet/abstract_net.h
@@ -5,7 +5,8 @@
 #include <string>
 #include <exception>
 
-#include "devilution.h"
+#include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 namespace dvl {
 namespace net {
diff --git a/SourceX/dvlnet/base.h b/SourceX/dvlnet/base.h
index 3157480b1..2323ee825 100644
--- a/SourceX/dvlnet/base.h
+++ b/SourceX/dvlnet/base.h
@@ -6,7 +6,7 @@
 #include <array>
 #include <memory>
 
-#include "devilution.h"
+#include "all.h"
 #include "dvlnet/abstract_net.h"
 #include "dvlnet/packet.h"
 
diff --git a/SourceX/dvlnet/cdwrap.h b/SourceX/dvlnet/cdwrap.h
index 0bee0aab9..d6a57c772 100644
--- a/SourceX/dvlnet/cdwrap.h
+++ b/SourceX/dvlnet/cdwrap.h
@@ -6,7 +6,7 @@
 #include <exception>
 #include <map>
 
-#include "devilution.h"
+#include "all.h"
 
 #include "dvlnet/abstract_net.h"
 
diff --git a/SourceX/dvlnet/loopback.h b/SourceX/dvlnet/loopback.h
index c196794b3..c1758e462 100644
--- a/SourceX/dvlnet/loopback.h
+++ b/SourceX/dvlnet/loopback.h
@@ -3,7 +3,8 @@
 #include <string>
 #include <queue>
 
-#include "devilution.h"
+#include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 #include "dvlnet/abstract_net.h"
 
 namespace dvl {
diff --git a/SourceX/dx.cpp b/SourceX/dx.cpp
index 9d0a1a895..555d67d06 100644
--- a/SourceX/dx.cpp
+++ b/SourceX/dx.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "display.h"
 #include <SDL.h>
diff --git a/SourceX/main.cpp b/SourceX/main.cpp
index 71d54a144..d49005898 100644
--- a/SourceX/main.cpp
+++ b/SourceX/main.cpp
@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 #endif
 
-#include "devilution.h"
+#include "all.h"
 
 #if !defined(__APPLE__)
 extern "C" const char *__asan_default_options()
diff --git a/SourceX/miniwin/misc_msg.cpp b/SourceX/miniwin/misc_msg.cpp
index daf5d1186..900d98391 100644
--- a/SourceX/miniwin/misc_msg.cpp
+++ b/SourceX/miniwin/misc_msg.cpp
@@ -2,7 +2,7 @@
 #include <deque>
 #include <SDL.h>
 
-#include "devilution.h"
+#include "all.h"
 #include "display.h"
 #include "stubs.h"
 #include "controls/controller_motion.h"
diff --git a/SourceX/sound.cpp b/SourceX/sound.cpp
index 91ac87169..d54cb936e 100644
--- a/SourceX/sound.cpp
+++ b/SourceX/sound.cpp
@@ -1,4 +1,5 @@
-#include "devilution.h"
+#include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 #include "stubs.h"
 #include <SDL.h>
 #include <SDL_mixer.h>
diff --git a/SourceX/soundsample.cpp b/SourceX/soundsample.cpp
index 836aa7927..3b9124de8 100644
--- a/SourceX/soundsample.cpp
+++ b/SourceX/soundsample.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "stubs.h"
 #include <SDL.h>
 
diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp
index 74ac2ddfc..cf4a7c8fc 100644
--- a/SourceX/storm/storm.cpp
+++ b/SourceX/storm/storm.cpp
@@ -1,4 +1,5 @@
-#include "devilution.h"
+#include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 #if !SDL_VERSION_ATLEAST(2, 0, 4)
 #include <queue>
diff --git a/SourceX/storm/storm_dx.cpp b/SourceX/storm/storm_dx.cpp
index 095d5adb9..3529a70cb 100644
--- a/SourceX/storm/storm_dx.cpp
+++ b/SourceX/storm/storm_dx.cpp
@@ -1,6 +1,7 @@
 #include <SDL.h>
 
-#include "devilution.h"
+#include "all.h"
+#include "../3rdParty/Storm/Source/storm.h"
 #include "display.h"
 #include "stubs.h"
 
diff --git a/SourceX/storm/storm_net.cpp b/SourceX/storm/storm_net.cpp
index 94e0b19d3..ba2df1c68 100644
--- a/SourceX/storm/storm_net.cpp
+++ b/SourceX/storm/storm_net.cpp
@@ -1,6 +1,6 @@
 #include <memory>
 
-#include "devilution.h"
+#include "all.h"
 #include "stubs.h"
 #include "dvlnet/abstract_net.h"
 
diff --git a/SourceX/thread.cpp b/SourceX/thread.cpp
index f2918e5b9..0331a82db 100644
--- a/SourceX/thread.cpp
+++ b/SourceX/thread.cpp
@@ -1,4 +1,4 @@
-#include "devilution.h"
+#include "all.h"
 #include "stubs.h"
 #include <SDL.h>
 #include <set>