diff --git a/CMakeLists.txt b/CMakeLists.txt
index d012e5f3..212e5b60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -447,7 +447,7 @@ if(GPERF)
   find_package(Gperftools REQUIRED)
 endif()
 
-target_include_directories(devilution PUBLIC Source SourceS SourceX ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(devilution PUBLIC 3rdParty/PKWare Source SourceS SourceX ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(${BIN_TARGET} PRIVATE
   SourceS
   SourceX
diff --git a/Source/all.h b/Source/all.h
deleted file mode 100644
index 188e8e36..00000000
--- a/Source/all.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file all.h
- *
- * Include all application headers.
- */
-#pragma once
-
-#include <SDL.h>
-#include <map>
-#include <vector>
-
-#ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
-#else
-#include "sdl2_backports.h"
-#endif
-
-#include "sdl_compat.h"
-
-#include "miniwin.h"
-#include "soundsample.h"
-#include "thread.h"
-#include "ui_fwd.h"
-
-#include <limits.h>
-
-#include "../SourceX/qol.h"
-
-#include "appfat.h"
-#include "automap.h"
-#include "capture.h"
-#include "codec.h"
-#include "control.h"
-#include "cursor.h"
-#include "dead.h"
-#ifdef _DEBUG
-#include "debug.h"
-#endif
-#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 "render.h" // linked last, likely .s/.asm
diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index 0253507c..18fa411a 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -3,10 +3,13 @@
  *
  * Implementation of error dialogs.
  */
-#include "all.h"
-#include "storm/storm.h"
+
 #include <config.h>
 
+#include "diablo.h"
+#include "storm/storm.h"
+#include "ui_fwd.h"
+
 namespace devilution {
 
 namespace {
diff --git a/Source/capture.cpp b/Source/capture.cpp
index 150ac36d..ab45ac40 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -5,10 +5,14 @@
  */
 #include <fstream>
 
-#include "all.h"
-#include "storm/storm.h"
-#include "paths.h"
+#include "DiabloUI/diabloui.h"
+#include "dx.h"
 #include "file_util.h"
+#include "palette.h"
+#include "paths.h"
+#include "render.h"
+#include "storm/storm.h"
+#include "ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/codec.cpp b/Source/codec.cpp
index ef98e069..70139fb3 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -3,11 +3,14 @@
  *
  * Implementation of save game encryption algorithm.
  */
-#include "all.h"
 
 #include <cstddef>
 #include <cstdint>
 
+#include "appfat.h"
+#include "miniwin.h"
+#include "sha.h"
+
 namespace devilution {
 
 typedef struct CodecSignature {
diff --git a/Source/codec.h b/Source/codec.h
index 0502ef91..35e8359e 100644
--- a/Source/codec.h
+++ b/Source/codec.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 int codec_decode(BYTE *pbSrcDst, DWORD size, const char *pszPassword);
diff --git a/Source/control.cpp b/Source/control.cpp
index ac9b5079..e4aa6168 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -3,10 +3,24 @@
  *
  * Implementation of the character and main control panels
  */
-#include "all.h"
+#include "control.h"
 
 #include <cstddef>
 
+#include "automap.h"
+#include "cursor.h"
+#include "DiabloUI/diabloui.h"
+#include "error.h"
+#include "gamemenu.h"
+#include "init.h"
+#include "inv.h"
+#include "lighting.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "stores.h"
+#include "towners.h"
+#include "trigs.h"
+
 namespace devilution {
 
 namespace {
diff --git a/Source/control.h b/Source/control.h
index 8cc4828c..dc3478b5 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -10,6 +10,7 @@
 #include "engine.h"
 #include "spelldat.h"
 #include "spells.h"
+#include "ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index db41d0ef..0a3aa552 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -3,7 +3,16 @@
  *
  * Implementation of cursor tracking functionality.
  */
-#include "all.h"
+#include "cursor.h"
+
+#include "control.h"
+#include "doom.h"
+#include "inv.h"
+#include "missiles.h"
+#include "render.h"
+#include "towners.h"
+#include "track.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/cursor.h b/Source/cursor.h
index 0b9b034e..75045b00 100644
--- a/Source/cursor.h
+++ b/Source/cursor.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
+
 namespace devilution {
 
 enum cursor_id : uint8_t {
diff --git a/Source/dead.cpp b/Source/dead.cpp
index 785edd66..55917299 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -3,7 +3,13 @@
  *
  * Implementation of functions for placing dead monsters.
  */
-#include "all.h"
+#include "dead.h"
+
+#include <SDL.h>
+
+#include "gendung.h"
+#include "lighting.h"
+#include "misdat.h"
 #include "monster.h"
 
 namespace devilution {
diff --git a/Source/dead.h b/Source/dead.h
index 13fcf7e2..f70c8e12 100644
--- a/Source/dead.h
+++ b/Source/dead.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #define MAXDEAD 31
diff --git a/Source/debug.cpp b/Source/debug.cpp
index 2b770be3..4959f808 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -3,7 +3,10 @@
  *
  * Implementation of debug functions.
  */
-#include "all.h"
+
+#include "cursor.h"
+#include "inv.h"
+#include "spells.h"
 
 namespace devilution {
 
diff --git a/Source/debug.h b/Source/debug.h
index 1b2f729a..22b3523e 100644
--- a/Source/debug.h
+++ b/Source/debug.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 extern BYTE *pSquareCel;
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index dc9c9ebb..f615e686 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -3,16 +3,54 @@
  *
  * Implementation of the main game initialization functions.
  */
-#include "all.h"
-#include "paths.h"
-#include "console.h"
-#include "options.h"
-#include "multi.h"
-#include "sound.h"
-#include "storm/storm.h"
-#include "DiabloUI/diabloui.h"
 #include <config.h>
 
+#include "automap.h"
+#include "capture.h"
+#include "console.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#ifdef _DEBUG
+#include "debug.h"
+#endif
+#include "DiabloUI/diabloui.h"
+#include "doom.h"
+#include "drlg_l1.h"
+#include "drlg_l2.h"
+#include "drlg_l3.h"
+#include "drlg_l4.h"
+#include "dx.h"
+#include "encrypt.h"
+#include "error.h"
+#include "gamemenu.h"
+#include "gmenu.h"
+#include "help.h"
+#include "init.h"
+#include "lighting.h"
+#include "loadsave.h"
+#include "mainmenu.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "movie.h"
+#include "multi.h"
+#include "nthread.h"
+#include "options.h"
+#include "paths.h"
+#include "pfile.h"
+#include "plrmsg.h"
+#include "restrict.h"
+#include "setmaps.h"
+#include "sound.h"
+#include "qol.h"
+#include "stores.h"
+#include "storm/storm.h"
+#include "themes.h"
+#include "towners.h"
+#include "town.h"
+#include "track.h"
+#include "trigs.h"
+
 namespace devilution {
 
 #ifndef DEFAULT_WIDTH
diff --git a/Source/diablo.h b/Source/diablo.h
index b8785068..ff402645 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -7,10 +7,11 @@
 
 #include <stdint.h>
 
-#include "gendung.h"
 #ifdef _DEBUG
 #include "monstdat.h"
 #endif
+#include "gendung.h"
+#include "init.h"
 
 namespace devilution {
 
diff --git a/Source/doom.cpp b/Source/doom.cpp
index eb0734ba..0357df88 100644
--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@@ -3,7 +3,9 @@
  *
  * Implementation of the map of the stars quest.
  */
-#include "all.h"
+#include "doom.h"
+
+#include "control.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 8a10849c..bd66d2c7 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of the cathedral level generation algorithms.
  */
-#include "all.h"
+#include "drlg_l1.h"
+
+#include "lighting.h"
+#include "player.h"
+#include "quests.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h
index 12e96316..334deec3 100644
--- a/Source/drlg_l1.h
+++ b/Source/drlg_l1.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 extern int UberRow;
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index b63982a3..a26fe806 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -3,10 +3,16 @@
  *
  * Implementation of the catacombs level generation algorithms.
  */
+#include "drlg_l2.h"
 
 #include <algorithm>
 
-#include "all.h"
+#include "diablo.h"
+#include "drlg_l1.h"
+#include "objects.h"
+#include "player.h"
+#include "quests.h"
+#include "setmaps.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h
index 4c953dcc..468d74a3 100644
--- a/Source/drlg_l2.h
+++ b/Source/drlg_l2.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 struct HALLNODE {
diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index 9e250746..7b88db44 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -6,7 +6,13 @@
 
 #include <algorithm>
 
-#include "all.h"
+#include "drlg_l1.h"
+#include "lighting.h"
+#include "monster.h"
+#include "objdat.h"
+#include "objects.h"
+#include "quests.h"
+#include "setmaps.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h
index b4ff044b..eef11239 100644
--- a/Source/drlg_l3.h
+++ b/Source/drlg_l3.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 void AddFenceDoors();
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index 05a36451..8ce79aaa 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of the hell level generation algorithms.
  */
-#include "all.h"
+
+#include "drlg_l1.h"
+#include "monster.h"
+#include "multi.h"
+#include "objdat.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index 375ea965..a57b6b77 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 extern int diabquad1x;
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index f5c0561b..9812c656 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -3,8 +3,10 @@
  *
  * Implementation of functions for updating game state from network commands.
  */
-#include "all.h"
+
+#include "nthread.h"
 #include "storm/storm.h"
+#include "thread.h"
 
 namespace devilution {
 
diff --git a/Source/dx.cpp b/Source/dx.cpp
index d007da8e..3ca8438a 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -3,12 +3,15 @@
  *
  * Implementation of functions setting up the graphics pipeline.
  */
-#include "all.h"
-#include "storm/storm.h"
-#include "../SourceX/display.h"
-#include "options.h"
+#include "dx.h"
+
 #include <SDL.h>
 
+#include "display.h"
+#include "options.h"
+#include "render.h"
+#include "storm/storm.h"
+
 #ifdef __3DS__
 #include <3ds.h>
 #endif
diff --git a/Source/dx.h b/Source/dx.h
index 5a9b17e8..682bf5f6 100644
--- a/Source/dx.h
+++ b/Source/dx.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "engine.h"
+
 namespace devilution {
 
 CelOutputBuffer GlobalBackBuffer();
diff --git a/Source/effects.cpp b/Source/effects.cpp
index fa0e070f..4b0ae0cb 100644
--- a/Source/effects.cpp
+++ b/Source/effects.cpp
@@ -3,10 +3,12 @@
  *
  * Implementation of functions for loading and playing sounds.
  */
-#include "all.h"
-#include "sound.h"
 #include <SDL_mixer.h>
 
+#include "init.h"
+#include "player.h"
+#include "sound.h"
+
 namespace devilution {
 
 int sfxdelay;
diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index 9352baec..21b7feba 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -3,8 +3,10 @@
  *
  * Implementation of functions for compression and decompressing MPQ data.
  */
-#include "all.h"
-#include "../3rdParty/PKWare/pkware.h"
+#include "encrypt.h"
+
+#include "engine.h"
+#include "pkware.h"
 
 namespace devilution {
 
diff --git a/Source/encrypt.h b/Source/encrypt.h
index 09c55a5f..3fe5cd35 100644
--- a/Source/encrypt.h
+++ b/Source/encrypt.h
@@ -5,6 +5,10 @@
  */
 #pragma once
 
+#include <SDL.h>
+
+#include "miniwin.h"
+
 namespace devilution {
 
 struct TDataInfo {
diff --git a/Source/engine.cpp b/Source/engine.cpp
index 5ad99fdc..db1c5a04 100644
--- a/Source/engine.cpp
+++ b/Source/engine.cpp
@@ -10,7 +10,9 @@
  * - File loading
  * - Video playback
  */
-#include "all.h"
+
+#include "lighting.h"
+#include "movie.h"
 #include "options.h"
 #include "storm/storm.h"
 
diff --git a/Source/engine.h b/Source/engine.h
index 4a71adbe..2dd12c0b 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -15,14 +15,14 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
-#include <stdint.h>
-
 #include <SDL.h>
+#include <stdint.h>
 
 #ifdef USE_SDL1
 #include "sdl2_to_1_2_backports.h"
 #endif
 
+#include "appfat.h"
 #include "miniwin.h"
 
 namespace devilution {
diff --git a/Source/error.cpp b/Source/error.cpp
index 3394d6a0..12a6951e 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -3,7 +3,10 @@
  *
  * Implementation of in-game message functions.
  */
-#include "all.h"
+#include "error.h"
+
+#include "control.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index 1e731012..16ed56bf 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -1,11 +1,17 @@
-
 /**
  * @file gamemenu.cpp
  *
  * Implementation of the in-game menu functions.
  */
-#include "all.h"
+#include "gamemenu.h"
+
+#include "cursor.h"
+#include "error.h"
+#include "gmenu.h"
+#include "init.h"
+#include "loadsave.h"
 #include "options.h"
+#include "pfile.h"
 #include "sound.h"
 
 namespace devilution {
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index aef2e4e3..3ab08c8b 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -3,7 +3,8 @@
  *
  * Implementation of general dungeon generation code.
  */
-#include "all.h"
+
+#include "init.h"
 #include "options.h"
 
 namespace devilution {
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index 9eb74e30..b66ac68a 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -3,10 +3,13 @@
  *
  * Implementation of the in-game navigation and interaction.
  */
-#include "all.h"
+#include "gmenu.h"
 
-#include "../SourceX/controls/axis_direction.h"
-#include "../SourceX/controls/controller_motion.h"
+#include "control.h"
+#include "controls/axis_direction.h"
+#include "controls/controller_motion.h"
+#include "stores.h"
+#include "ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/help.cpp b/Source/help.cpp
index 382aa825..9f5b0bb5 100644
--- a/Source/help.cpp
+++ b/Source/help.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of the in-game help text.
  */
-#include "all.h"
+
+#include "control.h"
+#include "init.h"
+#include "minitext.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/Source/help.h b/Source/help.h
index 19822ab5..f337422d 100644
--- a/Source/help.h
+++ b/Source/help.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "engine.h"
+
 namespace devilution {
 
 extern bool helpflag;
diff --git a/Source/init.cpp b/Source/init.cpp
index 2a302238..56ac5092 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -3,15 +3,17 @@
  *
  * Implementation of routines for initializing the environment, disable screen saver, load MPQ.
  */
+#include <config.h>
+#include <SDL.h>
 #include <string>
 #include <vector>
 
-#include "all.h"
-#include "paths.h"
-#include "storm/storm.h"
 #include "DiabloUI/diabloui.h"
-#include <SDL.h>
-#include <config.h>
+#include "dx.h"
+#include "paths.h"
+#include "pfile.h"
+#include "storm/storm.h"
+#include "ui_fwd.h"
 
 #ifdef __vita__
 // increase default allowed heap size on Vita
diff --git a/Source/init.h b/Source/init.h
index e3d3d019..137a0d37 100644
--- a/Source/init.h
+++ b/Source/init.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 extern int gbActive;
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 2d80f850..ef3035a3 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -3,8 +3,15 @@
  *
  * Implementation of load screens.
  */
-#include "all.h"
-#include "../SourceX/DiabloUI/art_draw.h"
+
+#include "control.h"
+#include "DiabloUI/art_draw.h"
+#include "dx.h"
+#include "init.h"
+#include "loadsave.h"
+#include "palette.h"
+#include "pfile.h"
+#include "plrmsg.h"
 
 namespace devilution {
 
diff --git a/Source/interfac.h b/Source/interfac.h
index 018c68cf..28d2e890 100644
--- a/Source/interfac.h
+++ b/Source/interfac.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "ui_fwd.h"
+
 namespace devilution {
 
 #define UI_OFFSET_Y ((Sint16)((gnScreenHeight - 480) / 2))
diff --git a/Source/inv.cpp b/Source/inv.cpp
index cd4aaae2..49e9a95b 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -3,8 +3,13 @@
  *
  * Implementation of player inventory.
  */
-#include "all.h"
+
+#include "cursor.h"
+#include "minitext.h"
 #include "options.h"
+#include "plrmsg.h"
+#include "stores.h"
+#include "towners.h"
 
 namespace devilution {
 
diff --git a/Source/itemdat.cpp b/Source/itemdat.cpp
index 76cab673..65e739d4 100644
--- a/Source/itemdat.cpp
+++ b/Source/itemdat.cpp
@@ -3,7 +3,8 @@
  *
  * Implementation of all item data.
  */
-#include "all.h"
+
+#include "itemdat.h"
 
 namespace devilution {
 
diff --git a/Source/itemdat.h b/Source/itemdat.h
index 1bb52e26..aa743f46 100644
--- a/Source/itemdat.h
+++ b/Source/itemdat.h
@@ -5,9 +5,10 @@
  */
 #pragma once
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 
+#include "objdat.h"
 #include "spelldat.h"
 
 namespace devilution {
diff --git a/Source/items.cpp b/Source/items.cpp
index be51b5b2..e8cce2a4 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3,11 +3,18 @@
  *
  * Implementation of item functionality.
  */
+#include <algorithm>
+#include <limits.h>
 #include <stdint.h>
 
-#include <algorithm>
-#include "all.h"
+#include "cursor.h"
+#include "doom.h"
+#include "dx.h"
+#include "init.h"
+#include "lighting.h"
+#include "missiles.h"
 #include "options.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/Source/items.h b/Source/items.h
index 9a61840c..8f537891 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include "engine.h"
 #include "itemdat.h"
 
 namespace devilution {
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index 20d296d3..cec9d3d2 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of light and vision.
  */
-#include "all.h"
+#include "lighting.h"
+
+#include "automap.h"
+#include "diablo.h"
+#include "player.h"
 
 namespace devilution {
 
diff --git a/Source/lighting.h b/Source/lighting.h
index c050d666..bfc900da 100644
--- a/Source/lighting.h
+++ b/Source/lighting.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 #define MAXLIGHTS 32
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index e16ef2f6..7e768a9d 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -3,7 +3,23 @@
  *
  * Implementation of save game functionality.
  */
-#include "all.h"
+#include "loadsave.h"
+
+#include <limits.h>
+
+#include "automap.h"
+#include "codec.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#include "doom.h"
+#include "init.h"
+#include "inv.h"
+#include "lighting.h"
+#include "missiles.h"
+#include "mpqapi.h"
+#include "pfile.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp
index c45ce29a..dce2d145 100644
--- a/Source/mainmenu.cpp
+++ b/Source/mainmenu.cpp
@@ -3,10 +3,13 @@
  *
  * Implementation of functions for interacting with the main menu.
  */
-#include "all.h"
-#include "options.h"
-#include "storm/storm.h"
+
 #include "DiabloUI/diabloui.h"
+#include "init.h"
+#include "movie.h"
+#include "options.h"
+#include "pfile.h"
+#include "storm/storm.h"
 
 namespace devilution {
 
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 973b95a7..f83da34a 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -3,7 +3,9 @@
  *
  * Implementation of scrolling dialog text.
  */
-#include "all.h"
+
+#include "control.h"
+#include "dx.h"
 
 namespace devilution {
 
diff --git a/Source/minitext.h b/Source/minitext.h
index c8e0b9bc..b7904b3c 100644
--- a/Source/minitext.h
+++ b/Source/minitext.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "engine.h"
+
 namespace devilution {
 
 extern bool qtextflag;
diff --git a/Source/misdat.cpp b/Source/misdat.cpp
index 3433a15e..9614e67d 100644
--- a/Source/misdat.cpp
+++ b/Source/misdat.cpp
@@ -3,7 +3,9 @@
  *
  * Implementation of data related to missiles.
  */
-#include "all.h"
+#include "misdat.h"
+
+#include "missiles.h"
 
 namespace devilution {
 
diff --git a/Source/misdat.h b/Source/misdat.h
index c044803e..c94c9d3f 100644
--- a/Source/misdat.h
+++ b/Source/misdat.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "effects.h"
+
 namespace devilution {
 
 enum mienemy_type : uint8_t {
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 6594198d..6e6f5f2c 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -3,7 +3,18 @@
  *
  * Implementation of missile functionality.
  */
-#include "all.h"
+#include "missiles.h"
+
+#include <limits.h>
+
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#include "init.h"
+#include "inv.h"
+#include "lighting.h"
+#include "spells.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/missiles.h b/Source/missiles.h
index d6e10b22..c310dc50 100644
--- a/Source/missiles.h
+++ b/Source/missiles.h
@@ -7,7 +7,9 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
 #include "misdat.h"
+#include "spelldat.h"
 
 namespace devilution {
 
diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp
index 21bb9365..d6a60585 100644
--- a/Source/monstdat.cpp
+++ b/Source/monstdat.cpp
@@ -3,7 +3,10 @@
  *
  * Implementation of all monster data.
  */
-#include "all.h"
+#include "monstdat.h"
+
+#include "monster.h"
+#include "textdat.h"
 
 namespace devilution {
 
diff --git a/Source/monstdat.h b/Source/monstdat.h
index 229e1d7d..2d6cdcc7 100644
--- a/Source/monstdat.h
+++ b/Source/monstdat.h
@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include <SDL.h>
 #include <stdint.h>
 
 namespace devilution {
diff --git a/Source/monster.cpp b/Source/monster.cpp
index ce58b8e4..38ef0261 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -4,10 +4,27 @@
  * Implementation of monster functionality, AI, actions, spawning, loading, etc.
  */
 #include <algorithm>
+#include <limits.h>
 
-#include "all.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#ifdef _DEBUG
+#include "debug.h"
+#endif
+#include "drlg_l1.h"
+#include "drlg_l4.h"
+#include "init.h"
+#include "lighting.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "movie.h"
 #include "options.h"
+#include "sound.h"
 #include "storm/storm.h"
+#include "themes.h"
+#include "towners.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/monster.h b/Source/monster.h
index cdf1fefb..7c236b48 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -7,7 +7,9 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
 #include "monstdat.h"
+#include "sound.h"
 
 namespace devilution {
 
diff --git a/Source/movie.cpp b/Source/movie.cpp
index 02a00f34..6676b2af 100644
--- a/Source/movie.cpp
+++ b/Source/movie.cpp
@@ -3,9 +3,10 @@
  *
  * Implementation of video playback.
  */
-#include "all.h"
+
+#include "diablo.h"
+#include "display.h"
 #include "storm/storm.h"
-#include "../SourceX/display.h"
 
 namespace devilution {
 
diff --git a/Source/movie.h b/Source/movie.h
index 9f7934ef..1f6b2b82 100644
--- a/Source/movie.h
+++ b/Source/movie.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 extern BYTE movie_playing;
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index d57c4b6e..2dd52311 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -3,6 +3,8 @@
  *
  * Implementation of functions for creating and editing MPQ files.
  */
+#include "mpqapi.h"
+
 #include <cerrno>
 #include <cinttypes>
 #include <cstdint>
@@ -11,8 +13,10 @@
 #include <memory>
 #include <type_traits>
 
-#include "all.h"
-#include "../SourceS/file_util.h"
+#include "appfat.h"
+#include "encrypt.h"
+#include "engine.h"
+#include "file_util.h"
 
 namespace devilution {
 
diff --git a/Source/mpqapi.h b/Source/mpqapi.h
index a8dd3e1d..9a44453c 100644
--- a/Source/mpqapi.h
+++ b/Source/mpqapi.h
@@ -5,8 +5,11 @@
  */
 #pragma once
 
+#include <SDL.h>
 #include <stdint.h>
 
+#include "miniwin.h"
+
 namespace devilution {
 
 struct _FILEHEADER {
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 8d13fce2..d73999c9 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -3,11 +3,28 @@
  *
  * Implementation of function for sending and reciving network messages.
  */
-#include "all.h"
-#include "storm/storm.h"
+#include <limits.h>
+
+#include "automap.h"
+#include "control.h"
+#include "dead.h"
 #include "DiabloUI/diabloui.h"
+#include "drlg_l1.h"
+#include "dthread.h"
+#include "encrypt.h"
+#include "gamemenu.h"
+#include "lighting.h"
+#include "missiles.h"
+#include "nthread.h"
 #include "objects.h"
 #include "options.h"
+#include "pfile.h"
+#include "plrmsg.h"
+#include "spells.h"
+#include "storm/storm.h"
+#include "sync.h"
+#include "town.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 0e722f26..7ceaddb3 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -3,13 +3,20 @@
  *
  * Implementation of functions for keeping multiplaye games in sync.
  */
-#include "all.h"
-#include "diablo.h"
-#include "options.h"
-#include "storm/storm.h"
-#include "DiabloUI/diabloui.h"
+
 #include <config.h>
 
+#include "diablo.h"
+#include "DiabloUI/diabloui.h"
+#include "dthread.h"
+#include "nthread.h"
+#include "options.h"
+#include "pfile.h"
+#include "plrmsg.h"
+#include "storm/storm.h"
+#include "sync.h"
+#include "tmsg.h"
+
 namespace devilution {
 
 bool gbSomebodyWonGameKludge;
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index b552f274..6cb4a244 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -3,8 +3,11 @@
  *
  * Implementation of functions for managing game ticks.
  */
-#include "all.h"
+
+#include "diablo.h"
+#include "gmenu.h"
 #include "storm/storm.h"
+#include "thread.h"
 
 namespace devilution {
 
diff --git a/Source/nthread.h b/Source/nthread.h
index 76227e4e..5873fc42 100644
--- a/Source/nthread.h
+++ b/Source/nthread.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "miniwin.h"
+#include "player.h"
+
 namespace devilution {
 
 extern BYTE sgbNetUpdateRate;
diff --git a/Source/objdat.cpp b/Source/objdat.cpp
index cf5921b8..3a1f9bb9 100644
--- a/Source/objdat.cpp
+++ b/Source/objdat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of all object data.
  */
-#include "all.h"
+#include "objdat.h"
 
 namespace devilution {
 
diff --git a/Source/objdat.h b/Source/objdat.h
index 1c76d0f9..4c02ca08 100644
--- a/Source/objdat.h
+++ b/Source/objdat.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "gendung.h"
+
 namespace devilution {
 
 enum theme_id : int8_t {
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 0e6a5d8e..1292f263 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -3,10 +3,25 @@
  *
  * Implementation of object functionality, interaction, spawning, loading, etc.
  */
+#include <limits.h>
 #include <stdint.h>
 
-#include "all.h"
+#include "automap.h"
+#include "control.h"
+#include "cursor.h"
+#include "drlg_l1.h"
+#include "drlg_l4.h"
+#include "error.h"
+#include "init.h"
+#include "lighting.h"
+#include "minitext.h"
+#include "missiles.h"
 #include "options.h"
+#include "setmaps.h"
+#include "stores.h"
+#include "themes.h"
+#include "towners.h"
+#include "track.h"
 
 namespace devilution {
 
diff --git a/Source/pack.cpp b/Source/pack.cpp
index 6e377c13..ade37022 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of functions for minifying player data structure.
  */
-#include "all.h"
+#include "pack.h"
+
+#include "init.h"
+#include "loadsave.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 0d13d996..7bea3a6c 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -3,9 +3,12 @@
  *
  * Implementation of functions for handling the engines color palette.
  */
-#include "all.h"
+
+#include "display.h"
+#include "dx.h"
 #include "options.h"
-#include "../SourceX/display.h"
+#include "render.h"
+#include "sdl_compat.h"
 #include "storm/storm.h"
 
 namespace devilution {
diff --git a/Source/palette.h b/Source/palette.h
index 33af2c22..4a7a54c6 100644
--- a/Source/palette.h
+++ b/Source/palette.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 // Diablo uses a 256 color palette
diff --git a/Source/path.cpp b/Source/path.cpp
index 1478c64f..a80291c5 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -3,7 +3,9 @@
  *
  * Implementation of the path finding algorithms.
  */
-#include "all.h"
+#include "path.h"
+
+#include "gendung.h"
 
 namespace devilution {
 
diff --git a/Source/path.h b/Source/path.h
index 6936aaad..4f6d4e6a 100644
--- a/Source/path.h
+++ b/Source/path.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #define MAX_PATH_LENGTH 25
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 053b0e15..63083366 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -3,12 +3,19 @@
  *
  * Implementation of the save game encoding functionality.
  */
+#include "pfile.h"
+
 #include <string>
 
-#include "all.h"
+#include "codec.h"
+#include "file_util.h"
+#include "init.h"
+#include "loadsave.h"
+#include "mainmenu.h"
+#include "mpqapi.h"
+#include "pack.h"
 #include "paths.h"
 #include "storm/storm.h"
-#include "file_util.h"
 
 namespace devilution {
 
diff --git a/Source/player.cpp b/Source/player.cpp
index 05d4d84b..9b468c8e 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -5,9 +5,22 @@
  */
 #include <algorithm>
 
-#include "all.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#include "gamemenu.h"
+#include "init.h"
+#include "lighting.h"
+#include "loadsave.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "nthread.h"
 #include "options.h"
+#include "qol.h"
+#include "spells.h"
+#include "stores.h"
 #include "storm/storm.h"
+#include "towners.h"
 
 namespace devilution {
 
diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
index 2112c345..83f52009 100644
--- a/Source/plrmsg.cpp
+++ b/Source/plrmsg.cpp
@@ -3,7 +3,10 @@
  *
  * Implementation of functionality for printing the ingame chat messages.
  */
-#include "all.h"
+#include "plrmsg.h"
+
+#include "control.h"
+#include "inv.h"
 
 namespace devilution {
 
diff --git a/Source/portal.cpp b/Source/portal.cpp
index 29b4b351..4e38926f 100644
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@@ -3,7 +3,13 @@
  *
  * Implementation of functionality for handling town portals.
  */
-#include "all.h"
+#include "portal.h"
+
+#include "lighting.h"
+#include "misdat.h"
+#include "missiles.h"
+#include "multi.h"
+#include "player.h"
 
 namespace devilution {
 
diff --git a/Source/portal.h b/Source/portal.h
index b8a33094..73d5ba63 100644
--- a/Source/portal.h
+++ b/Source/portal.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "gendung.h"
+
 namespace devilution {
 
 #define MAXPORTAL 4
diff --git a/Source/quests.cpp b/Source/quests.cpp
index b4068c5c..7319a95f 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -3,9 +3,17 @@
  *
  * Implementation of functionality for handling quests.
  */
-#include "all.h"
+
+#include "control.h"
+#include "cursor.h"
 #include "gendung.h"
+#include "init.h"
+#include "minitext.h"
+#include "missiles.h"
 #include "options.h"
+#include "stores.h"
+#include "towners.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/render.cpp b/Source/render.cpp
index ab1c8a87..e1c6e11a 100644
--- a/Source/render.cpp
+++ b/Source/render.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of functionality for rendering the level tiles.
  */
-#include "all.h"
+#include "render.h"
+
+#include <limits.h>
+
+#include "lighting.h"
 #include "options.h"
 
 namespace devilution {
diff --git a/Source/render.h b/Source/render.h
index ed3f55f6..1a522706 100644
--- a/Source/render.h
+++ b/Source/render.h
@@ -14,8 +14,8 @@ namespace devilution {
 #define BUFFER_BORDER_RIGHT devilution::borderRight
 #define BUFFER_BORDER_BOTTOM 16
 
-#define TILE_WIDTH		64
-#define TILE_HEIGHT		32
+#define TILE_WIDTH 64
+#define TILE_HEIGHT 32
 
 /**
  * @brief Blit current world CEL to the given buffer
diff --git a/Source/restrict.cpp b/Source/restrict.cpp
index 6f7a4775..bf1f6a9b 100644
--- a/Source/restrict.cpp
+++ b/Source/restrict.cpp
@@ -3,7 +3,8 @@
  *
  * Implementation of functionality for checking if the game will be able run on the system.
  */
-#include "all.h"
+
+#include "appfat.h"
 #include "paths.h"
 
 namespace devilution {
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 7bf9488f..53f807a6 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -3,7 +3,30 @@
  *
  * Implementation of functionality for rendering the dungeons, monsters and calling other render routines.
  */
-#include "all.h"
+
+#include "automap.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#ifdef _DEBUG
+#include "debug.h"
+#endif
+#include "doom.h"
+#include "dx.h"
+#include "error.h"
+#include "gmenu.h"
+#include "help.h"
+#include "init.h"
+#include "inv.h"
+#include "lighting.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "nthread.h"
+#include "plrmsg.h"
+#include "qol.h"
+#include "render.h"
+#include "stores.h"
+#include "towners.h"
 
 namespace devilution {
 
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index f6adb461..0d2424c6 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -3,7 +3,16 @@
  *
  * Implementation of functionality the special quest dungeons.
  */
-#include "all.h"
+#include "setmaps.h"
+
+#include "drlg_l1.h"
+#include "drlg_l2.h"
+#include "drlg_l3.h"
+#include "objdat.h"
+#include "objects.h"
+#include "palette.h"
+#include "quests.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/sha.cpp b/Source/sha.cpp
index 011ddf74..c3676a20 100644
--- a/Source/sha.cpp
+++ b/Source/sha.cpp
@@ -3,9 +3,12 @@
  *
  * Implementation of functionality for calculating X-SHA-1 (a flawed implementation of SHA-1).
  */
-#include "all.h"
+#include "sha.h"
 
 #include <cstdint>
+#include <SDL.h>
+
+#include "appfat.h"
 
 namespace devilution {
 
diff --git a/Source/sha.h b/Source/sha.h
index d3026d4b..9d605b78 100644
--- a/Source/sha.h
+++ b/Source/sha.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #define SHA1HashSize 20
diff --git a/Source/sound.cpp b/Source/sound.cpp
index 9bf586d7..d53433dc 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -3,14 +3,15 @@
  *
  * Implementation of functions setting up the audio pipeline.
  */
-#include "all.h"
-#include "options.h"
-#include "storm/storm.h"
-#include "../SourceX/stubs.h"
-#include "../SourceX/storm_sdl_rw.h"
 #include <SDL.h>
 #include <SDL_mixer.h>
 
+#include "init.h"
+#include "options.h"
+#include "storm_sdl_rw.h"
+#include "storm/storm.h"
+#include "stubs.h"
+
 namespace devilution {
 
 bool gbSndInited;
diff --git a/Source/sound.h b/Source/sound.h
index 2611c25f..37b6fb63 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
 #include "soundsample.h"
 
 namespace devilution {
diff --git a/Source/spelldat.cpp b/Source/spelldat.cpp
index 14405685..5d386b1b 100644
--- a/Source/spelldat.cpp
+++ b/Source/spelldat.cpp
@@ -3,7 +3,7 @@
  *
  * Implementation of all spell data.
  */
-#include "all.h"
+#include "spelldat.h"
 
 namespace devilution {
 
diff --git a/Source/spells.cpp b/Source/spells.cpp
index 4ab5228e..c27bebaa 100644
--- a/Source/spells.cpp
+++ b/Source/spells.cpp
@@ -3,7 +3,12 @@
  *
  * Implementation of functionality for casting player spells.
  */
-#include "all.h"
+
+#include "control.h"
+#include "cursor.h"
+#include "gamemenu.h"
+#include "inv.h"
+#include "missiles.h"
 
 namespace devilution {
 
diff --git a/Source/stores.cpp b/Source/stores.cpp
index a4463377..62b22ea8 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -3,10 +3,16 @@
  *
  * Implementation of functionality for stores and towner dialogs.
  */
-#include "all.h"
-#include "options.h"
+#include "stores.h"
+
 #include <algorithm>
 
+#include "cursor.h"
+#include "init.h"
+#include "minitext.h"
+#include "options.h"
+#include "towners.h"
+
 namespace devilution {
 
 namespace {
diff --git a/Source/stores.h b/Source/stores.h
index 9b1be027..43f99243 100644
--- a/Source/stores.h
+++ b/Source/stores.h
@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include "control.h"
 #include "engine.h"
 
 namespace devilution {
diff --git a/Source/sync.cpp b/Source/sync.cpp
index e27dc969..9177bc8f 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -3,7 +3,11 @@
  *
  * Implementation of functionality for syncing game state with other players.
  */
-#include "all.h"
+#include <limits.h>
+
+#include "gendung.h"
+#include "monster.h"
+#include "player.h"
 
 namespace devilution {
 
diff --git a/Source/textdat.cpp b/Source/textdat.cpp
index 612f6335..4d370c47 100644
--- a/Source/textdat.cpp
+++ b/Source/textdat.cpp
@@ -3,7 +3,6 @@
  *
  * Implementation of all dialog texts.
  */
-#include "all.h"
 #include "textdat.h"
 
 namespace devilution {
diff --git a/Source/themes.cpp b/Source/themes.cpp
index 79fe7c10..033c4359 100644
--- a/Source/themes.cpp
+++ b/Source/themes.cpp
@@ -3,7 +3,13 @@
  *
  * Implementation of the theme room placing algorithms.
  */
-#include "all.h"
+#include "themes.h"
+
+#include "items.h"
+#include "monster.h"
+#include "objects.h"
+#include "quests.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/themes.h b/Source/themes.h
index 0c206a02..b0d93c55 100644
--- a/Source/themes.h
+++ b/Source/themes.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "objdat.h"
+
 namespace devilution {
 
 struct ThemeStruct {
diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp
index ddb5c677..ec985d60 100644
--- a/Source/tmsg.cpp
+++ b/Source/tmsg.cpp
@@ -3,7 +3,9 @@
  *
  * Implementation of functionality transmitting chat messages.
  */
-#include "all.h"
+#include "tmsg.h"
+
+#include "diablo.h"
 
 namespace devilution {
 
diff --git a/Source/tmsg.h b/Source/tmsg.h
index 7def37ed..59591883 100644
--- a/Source/tmsg.h
+++ b/Source/tmsg.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #pragma pack(push, 1)
diff --git a/Source/town.cpp b/Source/town.cpp
index fa29fae8..b69f1464 100644
--- a/Source/town.cpp
+++ b/Source/town.cpp
@@ -3,7 +3,13 @@
  *
  * Implementation of functionality for rendering the town, towners and calling other render routines.
  */
-#include "all.h"
+#include "town.h"
+
+#include "drlg_l1.h"
+#include "init.h"
+#include "player.h"
+#include "quests.h"
+#include "trigs.h"
 
 namespace devilution {
 
diff --git a/Source/town.h b/Source/town.h
index 8b86af7f..dce14daa 100644
--- a/Source/town.h
+++ b/Source/town.h
@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "interfac.h"
+
 namespace devilution {
 
 void TownOpenHive();
diff --git a/Source/towners.cpp b/Source/towners.cpp
index 0134fd58..0296f694 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -3,7 +3,12 @@
  *
  * Implementation of functionality for loading and spawning towners.
  */
-#include "all.h"
+#include "towners.h"
+
+#include "cursor.h"
+#include "inv.h"
+#include "minitext.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/Source/towners.h b/Source/towners.h
index 1cfb6822..fa81a419 100644
--- a/Source/towners.h
+++ b/Source/towners.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "items.h"
+#include "player.h"
 #include "quests.h"
 
 namespace devilution {
diff --git a/Source/track.cpp b/Source/track.cpp
index 7f1d788b..dbabf7de 100644
--- a/Source/track.cpp
+++ b/Source/track.cpp
@@ -3,7 +3,9 @@
  *
  * Implementation of functionality tracking what the mouse cursor is pointing at.
  */
-#include "all.h"
+
+#include "cursor.h"
+#include "player.h"
 
 namespace devilution {
 
diff --git a/Source/trigs.cpp b/Source/trigs.cpp
index 84703107..87b47722 100644
--- a/Source/trigs.cpp
+++ b/Source/trigs.cpp
@@ -3,7 +3,12 @@
  *
  * Implementation of functionality for triggering events when the player enters an area.
  */
-#include "all.h"
+#include "trigs.h"
+
+#include "control.h"
+#include "cursor.h"
+#include "error.h"
+#include "init.h"
 
 namespace devilution {
 
diff --git a/Source/trigs.h b/Source/trigs.h
index a5be4d22..629e7db9 100644
--- a/Source/trigs.h
+++ b/Source/trigs.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "interfac.h"
+
 namespace devilution {
 
 #define MAXTRIGGERS 7
diff --git a/SourceS/soundsample.h b/SourceS/soundsample.h
index 93a550cb..cd00bee8 100644
--- a/SourceS/soundsample.h
+++ b/SourceS/soundsample.h
@@ -1,6 +1,9 @@
 #pragma once
+
 #include <SDL_mixer.h>
 
+#include "miniwin.h"
+
 namespace devilution {
 
 class SoundSample final {
diff --git a/SourceS/ui_fwd.h b/SourceS/ui_fwd.h
index bce5df00..a25c1152 100644
--- a/SourceS/ui_fwd.h
+++ b/SourceS/ui_fwd.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 extern Uint16 gnScreenWidth;
diff --git a/SourceX/DiabloUI/art.h b/SourceX/DiabloUI/art.h
index b9d0ac36..7a97e4e3 100644
--- a/SourceX/DiabloUI/art.h
+++ b/SourceX/DiabloUI/art.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../sdl_ptrs.h"
+#include "sdl_ptrs.h"
 #include "storm/storm.h"
 
 namespace devilution {
diff --git a/SourceX/DiabloUI/art_draw.cpp b/SourceX/DiabloUI/art_draw.cpp
index ca57f70d..d046f47f 100644
--- a/SourceX/DiabloUI/art_draw.cpp
+++ b/SourceX/DiabloUI/art_draw.cpp
@@ -2,6 +2,8 @@
 
 #include "DiabloUI/diabloui.h"
 #include "display.h"
+#include "render.h"
+#include "sdl_compat.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/art_draw.h b/SourceX/DiabloUI/art_draw.h
index 4013bda0..7fc69571 100644
--- a/SourceX/DiabloUI/art_draw.h
+++ b/SourceX/DiabloUI/art_draw.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "all.h"
-
-#include "../SourceX/DiabloUI/art.h"
+#include "DiabloUI/art.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/credits.cpp b/SourceX/DiabloUI/credits.cpp
index 828008b5..bbde7348 100644
--- a/SourceX/DiabloUI/credits.cpp
+++ b/SourceX/DiabloUI/credits.cpp
@@ -2,17 +2,17 @@
 #include <memory>
 #include <vector>
 
+#include "control.h"
 #include "controls/menu_controls.h"
-#include "all.h"
-#include "display.h"
-#include "sdl_ptrs.h"
-
-#include "DiabloUI/diabloui.h"
-#include "DiabloUI/credits_lines.h"
-#include "DiabloUI/support_lines.h"
-#include "DiabloUI/art.h"
 #include "DiabloUI/art_draw.h"
+#include "DiabloUI/art.h"
+#include "DiabloUI/credits_lines.h"
+#include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
+#include "DiabloUI/support_lines.h"
+#include "display.h"
+#include "sdl_compat.h"
+#include "sdl_ptrs.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp
index c50e0e41..b24344b5 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/SourceX/DiabloUI/diabloui.cpp
@@ -3,8 +3,6 @@
 #include <algorithm>
 #include <string>
 
-#include "storm/storm.h"
-
 #include "controls/controller.h"
 #include "controls/menu_controls.h"
 #include "DiabloUI/art_draw.h"
@@ -14,7 +12,11 @@
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/text_draw.h"
 #include "display.h"
+#include "dx.h"
+#include "palette.h"
+#include "sdl_compat.h"
 #include "sdl_ptrs.h"
+#include "storm/storm.h"
 #include "stubs.h"
 #include "utf8.h"
 
diff --git a/SourceX/DiabloUI/dialogs.cpp b/SourceX/DiabloUI/dialogs.cpp
index e3f62c08..98c31dbc 100644
--- a/SourceX/DiabloUI/dialogs.cpp
+++ b/SourceX/DiabloUI/dialogs.cpp
@@ -1,13 +1,14 @@
 #include "DiabloUI/dialogs.h"
 
+#include "control.h"
 #include "controls/menu_controls.h"
-#include "all.h"
-#include "dx.h"
-#include "DiabloUI/diabloui.h"
 #include "DiabloUI/button.h"
-#include "DiabloUI/fonts.h"
+#include "DiabloUI/diabloui.h"
 #include "DiabloUI/errorart.h"
+#include "DiabloUI/fonts.h"
 #include "display.h"
+#include "dx.h"
+#include "palette.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp
index 69c6bb0b..18a9faca 100644
--- a/SourceX/DiabloUI/fonts.cpp
+++ b/SourceX/DiabloUI/fonts.cpp
@@ -1,6 +1,8 @@
 #include "DiabloUI/fonts.h"
+
+#include "diablo.h"
 #include "file_util.h"
-#include "../SourceS/paths.h"
+#include "paths.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/fonts.h b/SourceX/DiabloUI/fonts.h
index ed1ef91d..b070597c 100644
--- a/SourceX/DiabloUI/fonts.h
+++ b/SourceX/DiabloUI/fonts.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include "all.h"
-
-#include <stdint.h>
 #include <SDL_ttf.h>
+#include <stdint.h>
 
 #include "DiabloUI/art.h"
 
diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp
index f5447a54..8b99b86d 100644
--- a/SourceX/DiabloUI/mainmenu.cpp
+++ b/SourceX/DiabloUI/mainmenu.cpp
@@ -1,4 +1,5 @@
-#include "all.h"
+
+#include "control.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/selok.h"
 
diff --git a/SourceX/DiabloUI/progress.cpp b/SourceX/DiabloUI/progress.cpp
index be6d5ddd..69093745 100644
--- a/SourceX/DiabloUI/progress.cpp
+++ b/SourceX/DiabloUI/progress.cpp
@@ -1,11 +1,12 @@
-#include "all.h"
-#include "display.h"
-
+#include "control.h"
 #include "controls/menu_controls.h"
+#include "DiabloUI/art_draw.h"
 #include "DiabloUI/button.h"
 #include "DiabloUI/diabloui.h"
-#include "DiabloUI/art_draw.h"
 #include "DiabloUI/fonts.h"
+#include "display.h"
+#include "dx.h"
+#include "palette.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/selconn.cpp b/SourceX/DiabloUI/selconn.cpp
index 3bbf2c00..16f6902e 100644
--- a/SourceX/DiabloUI/selconn.cpp
+++ b/SourceX/DiabloUI/selconn.cpp
@@ -1,8 +1,8 @@
 #include "selconn.h"
 
-#include "all.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
+#include "stores.h"
 #include "storm/storm.h"
 
 namespace devilution {
diff --git a/SourceX/DiabloUI/selgame.cpp b/SourceX/DiabloUI/selgame.cpp
index bbb5b4b4..33495e16 100644
--- a/SourceX/DiabloUI/selgame.cpp
+++ b/SourceX/DiabloUI/selgame.cpp
@@ -1,14 +1,15 @@
 #include "selgame.h"
 
-#include "all.h"
-#include "storm/storm.h"
 #include "config.h"
+#include "control.h"
 #include "DiabloUI/diabloui.h"
-#include "DiabloUI/text.h"
 #include "DiabloUI/dialogs.h"
-#include "DiabloUI/selok.h"
 #include "DiabloUI/selhero.h"
+#include "DiabloUI/selok.h"
+#include "DiabloUI/text.h"
+#include "mainmenu.h"
 #include "options.h"
+#include "storm/storm.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/selgame.h b/SourceX/DiabloUI/selgame.h
index e0164fb3..7e86e5ca 100644
--- a/SourceX/DiabloUI/selgame.h
+++ b/SourceX/DiabloUI/selgame.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "all.h"
+
+#include "gendung.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp
index 985e5965..144965f7 100644
--- a/SourceX/DiabloUI/selhero.cpp
+++ b/SourceX/DiabloUI/selhero.cpp
@@ -4,17 +4,18 @@
 #include <chrono>
 #include <random>
 
+#include "control.h"
 #include "DiabloUI/diabloui.h"
-#include "all.h"
 #include "DiabloUI/dialogs.h"
 #include "DiabloUI/scrollbar.h"
-#include "DiabloUI/selyesno.h"
-#include "DiabloUI/selok.h"
 #include "DiabloUI/selgame.h"
+#include "DiabloUI/selok.h"
+#include "DiabloUI/selyesno.h"
 #include "options.h"
+#include "pfile.h"
 
 #ifdef __3DS__
-#include "../platform/ctr/keyboard.h"
+#include "platform/ctr/keyboard.h"
 #endif
 
 namespace devilution {
diff --git a/SourceX/DiabloUI/selok.cpp b/SourceX/DiabloUI/selok.cpp
index ea2a40be..ef2d56c8 100644
--- a/SourceX/DiabloUI/selok.cpp
+++ b/SourceX/DiabloUI/selok.cpp
@@ -1,7 +1,8 @@
-#include "all.h"
+#include "DiabloUI/selok.h"
+
+#include "control.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
-#include "DiabloUI/selok.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/selok.h b/SourceX/DiabloUI/selok.h
index 44078abb..2fe68810 100644
--- a/SourceX/DiabloUI/selok.h
+++ b/SourceX/DiabloUI/selok.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "all.h"
-
 namespace devilution {
+
 void UiSelOkDialog(const char *title, const char *body, bool background);
 void selok_Free();
 void selok_Select(int value);
diff --git a/SourceX/DiabloUI/selyesno.cpp b/SourceX/DiabloUI/selyesno.cpp
index 6281c881..6559ce71 100644
--- a/SourceX/DiabloUI/selyesno.cpp
+++ b/SourceX/DiabloUI/selyesno.cpp
@@ -1,6 +1,6 @@
 #include "selyesno.h"
 
-#include "all.h"
+#include "control.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
 
diff --git a/SourceX/DiabloUI/selyesno.h b/SourceX/DiabloUI/selyesno.h
index d526c7f9..3e2ae70d 100644
--- a/SourceX/DiabloUI/selyesno.h
+++ b/SourceX/DiabloUI/selyesno.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "all.h"
-
 namespace devilution {
+
 bool UiSelHeroYesNoDialog(const char *title, const char *body);
 void selyesno_Free();
 void selyesno_Select(int value);
diff --git a/SourceX/DiabloUI/title.cpp b/SourceX/DiabloUI/title.cpp
index 70931369..2f605d07 100644
--- a/SourceX/DiabloUI/title.cpp
+++ b/SourceX/DiabloUI/title.cpp
@@ -1,4 +1,4 @@
-#include "all.h"
+#include "control.h"
 #include "controls/menu_controls.h"
 #include "DiabloUI/diabloui.h"
 
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.cpp b/SourceX/DiabloUI/ttf_render_wrapped.cpp
index 03275608..d014667b 100644
--- a/SourceX/DiabloUI/ttf_render_wrapped.cpp
+++ b/SourceX/DiabloUI/ttf_render_wrapped.cpp
@@ -3,6 +3,15 @@
 #include <cstddef>
 #include <cstring>
 
+#include <SDL.h>
+#ifdef USE_SDL1
+#include "sdl2_to_1_2_backports.h"
+#else
+#include "sdl2_backports.h"
+#endif
+
+#include "sdl_compat.h"
+
 namespace devilution {
 
 namespace {
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.h b/SourceX/DiabloUI/ttf_render_wrapped.h
index abce44c6..1a35381a 100644
--- a/SourceX/DiabloUI/ttf_render_wrapped.h
+++ b/SourceX/DiabloUI/ttf_render_wrapped.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include "all.h"
-
-#include <stdint.h>
 #include <SDL_ttf.h>
+#include <stdint.h>
 
 namespace devilution {
 
diff --git a/SourceX/controls/controller.h b/SourceX/controls/controller.h
index 46e2c8bd..8d50d353 100644
--- a/SourceX/controls/controller.h
+++ b/SourceX/controls/controller.h
@@ -2,8 +2,7 @@
 
 #include <SDL.h>
 
-#include "all.h"
-#include "./controller_buttons.h"
+#include "controller_buttons.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/devices/game_controller.cpp b/SourceX/controls/devices/game_controller.cpp
index 08c965d9..9807839b 100644
--- a/SourceX/controls/devices/game_controller.cpp
+++ b/SourceX/controls/devices/game_controller.cpp
@@ -6,14 +6,14 @@
 
 #include "controls/controller_motion.h"
 #include "controls/devices/joystick.h"
-#include "stubs.h"
 #include "sdl_ptrs.h"
-
-// Defined in SourceX/controls/plctrls.cpp
-extern "C" bool sgbControllerActive;
+#include "stubs.h"
 
 namespace devilution {
 
+// Defined in SourceX/controls/plctrls.cpp
+extern bool sgbControllerActive;
+
 std::vector<GameController> *const GameController::controllers_ = new std::vector<GameController>;
 
 ControllerButton GameController::ToControllerButton(const SDL_Event &event)
diff --git a/SourceX/controls/devices/joystick.cpp b/SourceX/controls/devices/joystick.cpp
index 8fe76516..bf88dd56 100644
--- a/SourceX/controls/devices/joystick.cpp
+++ b/SourceX/controls/devices/joystick.cpp
@@ -1,4 +1,3 @@
-
 #include "controls/devices/joystick.h"
 
 #include <cstddef>
@@ -6,11 +5,11 @@
 #include "controls/controller_motion.h"
 #include "stubs.h"
 
-// Defined in SourceX/controls/plctrls.cpp
-extern "C" bool sgbControllerActive;
-
 namespace devilution {
 
+// Defined in SourceX/controls/plctrls.cpp
+extern bool sgbControllerActive;
+
 std::vector<Joystick> *const Joystick::joysticks_ = new std::vector<Joystick>;
 
 ControllerButton Joystick::ToControllerButton(const SDL_Event &event) const
diff --git a/SourceX/controls/game_controls.cpp b/SourceX/controls/game_controls.cpp
index dad17f9a..4c0b0650 100644
--- a/SourceX/controls/game_controls.cpp
+++ b/SourceX/controls/game_controls.cpp
@@ -9,7 +9,9 @@
 #include "controls/menu_controls.h"
 #include "controls/modifier_hints.h"
 #include "controls/plrctrls.h"
+#include "gmenu.h"
 #include "options.h"
+#include "stores.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/menu_controls.cpp b/SourceX/controls/menu_controls.cpp
index 08e4f060..c5c1b5ce 100644
--- a/SourceX/controls/menu_controls.cpp
+++ b/SourceX/controls/menu_controls.cpp
@@ -5,6 +5,7 @@
 #include "controls/controller_motion.h"
 #include "controls/remap_keyboard.h"
 #include "DiabloUI/diabloui.h"
+#include "sdl_compat.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/menu_controls.h b/SourceX/controls/menu_controls.h
index 162faec7..5919499d 100644
--- a/SourceX/controls/menu_controls.h
+++ b/SourceX/controls/menu_controls.h
@@ -1,9 +1,8 @@
 #pragma once
 
+#include <SDL.h>
 #include <stdint.h>
 
-#include "all.h"
-
 namespace devilution {
 
 enum MenuAction : uint8_t {
diff --git a/SourceX/controls/modifier_hints.cpp b/SourceX/controls/modifier_hints.cpp
index b5d7ecdc..a79ab64e 100644
--- a/SourceX/controls/modifier_hints.cpp
+++ b/SourceX/controls/modifier_hints.cpp
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "all.h"
+#include "control.h"
 #include "controls/controller.h"
 #include "controls/game_controls.h"
 #include "options.h"
diff --git a/SourceX/controls/plrctrls.cpp b/SourceX/controls/plrctrls.cpp
index cb5fde0b..4363b5e7 100644
--- a/SourceX/controls/plrctrls.cpp
+++ b/SourceX/controls/plrctrls.cpp
@@ -4,9 +4,20 @@
 #include <algorithm>
 #include <list>
 
+#include "automap.h"
+#include "control.h"
 #include "controls/controller.h"
 #include "controls/controller_motion.h"
 #include "controls/game_controls.h"
+#include "cursor.h"
+#include "gmenu.h"
+#include "help.h"
+#include "inv.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "stores.h"
+#include "towners.h"
+#include "trigs.h"
 
 #define SPLICONLENGTH 56
 
diff --git a/SourceX/controls/plrctrls.h b/SourceX/controls/plrctrls.h
index 5bb9bd8e..9f8cf797 100644
--- a/SourceX/controls/plrctrls.h
+++ b/SourceX/controls/plrctrls.h
@@ -3,8 +3,6 @@
 
 #include <stdint.h>
 
-#include "all.h"
-
 namespace devilution {
 
 typedef enum belt_item_type : uint8_t {
diff --git a/SourceX/display.cpp b/SourceX/display.cpp
index 316f5c49..210b7291 100644
--- a/SourceX/display.cpp
+++ b/SourceX/display.cpp
@@ -1,16 +1,18 @@
 #include "display.h"
-#include "DiabloUI/diabloui.h"
-#include "controls/game_controls.h"
-#include "controls/controller.h"
-#include "controls/devices/game_controller.h"
-#include "controls/devices/joystick.h"
-#include "controls/devices/kbcontroller.h"
-#include "options.h"
 
 #ifdef __vita__
 #include <psp2/power.h>
 #endif
 
+#include "control.h"
+#include "controls/controller.h"
+#include "controls/devices/game_controller.h"
+#include "controls/devices/joystick.h"
+#include "controls/devices/kbcontroller.h"
+#include "controls/game_controls.h"
+#include "DiabloUI/diabloui.h"
+#include "options.h"
+
 #ifdef USE_SDL1
 #ifndef SDL1_VIDEO_MODE_BPP
 #define SDL1_VIDEO_MODE_BPP 0
@@ -130,7 +132,7 @@ bool SpawnWindow(const char *lpWindowName)
 	// https://github.com/diasurgical/devilutionX/issues/1434
 	SDL_setenv("SDL_AUDIODRIVER", "winmm", /*overwrite=*/false);
 #endif
-	
+
 	int initFlags = SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK;
 #ifndef USE_SDL1
 	initFlags |= SDL_INIT_GAMECONTROLLER;
diff --git a/SourceX/display.h b/SourceX/display.h
index 88e1a74c..08b1a04f 100644
--- a/SourceX/display.h
+++ b/SourceX/display.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <cstdint>
-
-#include "sdl_ptrs.h"
+#include <type_traits>
 
 #include <SDL.h>
 #ifdef USE_SDL1
@@ -11,7 +10,8 @@
 #include "sdl2_backports.h"
 #endif
 
-#include <type_traits>
+#include "ui_fwd.h"
+#include "sdl_ptrs.h"
 
 namespace devilution {
 
diff --git a/SourceX/dvlnet/abstract_net.h b/SourceX/dvlnet/abstract_net.h
index c83bf433..7865cda8 100644
--- a/SourceX/dvlnet/abstract_net.h
+++ b/SourceX/dvlnet/abstract_net.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <vector>
+#include <exception>
 #include <memory>
 #include <string>
-#include <exception>
+#include <vector>
 
-#include "all.h"
 #include "storm/storm.h"
 
 namespace devilution {
diff --git a/SourceX/dvlnet/base.h b/SourceX/dvlnet/base.h
index d2555565..708a7dfe 100644
--- a/SourceX/dvlnet/base.h
+++ b/SourceX/dvlnet/base.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <string>
-#include <map>
-#include <deque>
 #include <array>
+#include <deque>
+#include <map>
 #include <memory>
+#include <string>
 
-#include "all.h"
 #include "dvlnet/abstract_net.h"
 #include "dvlnet/packet.h"
 
diff --git a/SourceX/dvlnet/base_protocol.h b/SourceX/dvlnet/base_protocol.h
index 1b54a880..f88d669e 100644
--- a/SourceX/dvlnet/base_protocol.h
+++ b/SourceX/dvlnet/base_protocol.h
@@ -5,8 +5,9 @@
 #include <map>
 #include <memory>
 
-#include "dvlnet/packet.h"
 #include "dvlnet/base.h"
+#include "dvlnet/packet.h"
+#include "player.h"
 
 namespace devilution {
 namespace net {
diff --git a/SourceX/dvlnet/cdwrap.h b/SourceX/dvlnet/cdwrap.h
index a3498655..fa56c9be 100644
--- a/SourceX/dvlnet/cdwrap.h
+++ b/SourceX/dvlnet/cdwrap.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <vector>
-#include <memory>
-#include <string>
 #include <exception>
 #include <map>
-
-#include "all.h"
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "dvlnet/abstract_net.h"
 
diff --git a/SourceX/dvlnet/loopback.h b/SourceX/dvlnet/loopback.h
index d7f4da92..4a90cc7b 100644
--- a/SourceX/dvlnet/loopback.h
+++ b/SourceX/dvlnet/loopback.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <string>
 #include <queue>
+#include <string>
 
-#include "all.h"
 #include "dvlnet/abstract_net.h"
 
 namespace devilution {
diff --git a/SourceX/main.cpp b/SourceX/main.cpp
index 2dfb50cf..dca8dcfb 100644
--- a/SourceX/main.cpp
+++ b/SourceX/main.cpp
@@ -9,7 +9,7 @@
 #include <gtest/gtest.h>
 #endif
 
-#include "all.h"
+#include "diablo.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 c6b852ad..c7c4ec39 100644
--- a/SourceX/miniwin/misc_msg.cpp
+++ b/SourceX/miniwin/misc_msg.cpp
@@ -2,16 +2,19 @@
 #include <deque>
 #include <SDL.h>
 
-#include "all.h"
-#include "display.h"
-#include "stubs.h"
+#include "control.h"
+#include "controls/controller.h"
 #include "controls/controller_motion.h"
 #include "controls/game_controls.h"
 #include "controls/plrctrls.h"
 #include "controls/remap_keyboard.h"
 #include "controls/touch.h"
+#include "cursor.h"
 #include "display.h"
-#include "controls/controller.h"
+#include "inv.h"
+#include "movie.h"
+#include "sdl_compat.h"
+#include "stubs.h"
 
 #ifdef __SWITCH__
 #include "platform/switch/docking.h"
diff --git a/SourceX/platform/switch/docking.cpp b/SourceX/platform/switch/docking.cpp
index bfafaab2..515e7c14 100644
--- a/SourceX/platform/switch/docking.cpp
+++ b/SourceX/platform/switch/docking.cpp
@@ -1,7 +1,10 @@
+#include "platform/switch/docking.h"
+
 #include <switch.h>
 #include <SDL.h>
+
+#include "diablo.h"
 #include "display.h"
-#include "platform/switch/docking.h"
 
 namespace devilution {
 
diff --git a/SourceX/qol.cpp b/SourceX/qol.cpp
index 1eb4c492..c7f2aa4a 100644
--- a/SourceX/qol.cpp
+++ b/SourceX/qol.cpp
@@ -3,9 +3,11 @@
  *
  * Quality of life features
  */
-#include "all.h"
-#include "options.h"
+
+#include "control.h"
+#include "cursor.h"
 #include "DiabloUI/art_draw.h"
+#include "options.h"
 
 namespace devilution {
 namespace {
diff --git a/SourceX/soundsample.cpp b/SourceX/soundsample.cpp
index c60f687b..f97fd8e9 100644
--- a/SourceX/soundsample.cpp
+++ b/SourceX/soundsample.cpp
@@ -1,8 +1,14 @@
-#include "all.h"
-#include "stubs.h"
+#include "soundsample.h"
+
 #include <SDL.h>
+#ifdef USE_SDL1
+#include "sdl2_to_1_2_backports.h"
+#else
+#include "sdl2_backports.h"
+#endif
 
 #include "storm_sdl_rw.h"
+#include "stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp
index dba6b05e..ca344207 100644
--- a/SourceX/storm/storm.cpp
+++ b/SourceX/storm/storm.cpp
@@ -1,25 +1,26 @@
+#include "storm/storm.h"
+
 #include <cstddef>
 #include <cstdint>
+#include <SDL_endian.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
+#include <smacker.h>
 #include <string>
 
-#include "all.h"
-#include "options.h"
-#include "paths.h"
-#include "storm/storm.h"
-
 #if !SDL_VERSION_ATLEAST(2, 0, 4)
 #include <queue>
 #endif
 
-#include "display.h"
-#include "stubs.h"
 #include "Radon.hpp"
-#include <SDL.h>
-#include <SDL_endian.h>
-#include <SDL_mixer.h>
-#include <smacker.h>
 
 #include "DiabloUI/diabloui.h"
+#include "display.h"
+#include "dx.h"
+#include "options.h"
+#include "paths.h"
+#include "sdl_compat.h"
+#include "stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/storm/storm_net.cpp b/SourceX/storm/storm_net.cpp
index 5e824ec2..ea192015 100644
--- a/SourceX/storm/storm_net.cpp
+++ b/SourceX/storm/storm_net.cpp
@@ -4,11 +4,11 @@
 #include <thread>
 #endif
 
-#include "all.h"
-#include "options.h"
-#include "stubs.h"
 #include "dvlnet/abstract_net.h"
+#include "mainmenu.h"
+#include "options.h"
 #include "storm/storm_dvlnet.h"
+#include "stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/storm_sdl_rw.cpp b/SourceX/storm_sdl_rw.cpp
index e83471dd..2b47e84b 100644
--- a/SourceX/storm_sdl_rw.cpp
+++ b/SourceX/storm_sdl_rw.cpp
@@ -3,9 +3,8 @@
 #include <cstdint>
 #include <cstring>
 
-#include "all.h"
+#include "engine.h"
 #include "storm/storm.h"
-#include "../Source/engine.h"
 
 namespace devilution {
 
diff --git a/SourceX/storm_sdl_rw.h b/SourceX/storm_sdl_rw.h
index 0e9ec9af..f9e2f095 100644
--- a/SourceX/storm_sdl_rw.h
+++ b/SourceX/storm_sdl_rw.h
@@ -2,7 +2,7 @@
 
 #include <SDL.h>
 
-#include "../SourceS/miniwin/misc.h"
+#include "miniwin.h"
 
 namespace devilution {
 
diff --git a/SourceX/thread.cpp b/SourceX/thread.cpp
index a70b473a..af14b4f0 100644
--- a/SourceX/thread.cpp
+++ b/SourceX/thread.cpp
@@ -1,8 +1,11 @@
-#include "all.h"
-#include "stubs.h"
+#include "thread.h"
+
 #include <SDL.h>
 #include <set>
 
+#include "appfat.h"
+#include "stubs.h"
+
 namespace devilution {
 
 static int SDLCALL thread_translate(void *ptr)
diff --git a/test/appfat_test.cpp b/test/appfat_test.cpp
index ee814991..2fa42b39 100644
--- a/test/appfat_test.cpp
+++ b/test/appfat_test.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "appfat.h"
+#include "diablo.h"
 
 using namespace devilution;
 
diff --git a/test/automap_test.cpp b/test/automap_test.cpp
index 2855f825..df46a387 100644
--- a/test/automap_test.cpp
+++ b/test/automap_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "automap.h"
 
 using namespace devilution;
 
diff --git a/test/codec_test.cpp b/test/codec_test.cpp
index 7c9359f3..00dd13f8 100644
--- a/test/codec_test.cpp
+++ b/test/codec_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "codec.h"
 
 using namespace devilution;
 
diff --git a/test/control_test.cpp b/test/control_test.cpp
index f2dbcea2..18147238 100644
--- a/test/control_test.cpp
+++ b/test/control_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "control.h"
 
 using namespace devilution;
 
diff --git a/test/cursor_test.cpp b/test/cursor_test.cpp
index 5ac3f567..e7516429 100644
--- a/test/cursor_test.cpp
+++ b/test/cursor_test.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "cursor.h"
+#include "itemdat.h"
 
 using namespace devilution;
 
diff --git a/test/dead_test.cpp b/test/dead_test.cpp
index abb60218..ca6c0384 100644
--- a/test/dead_test.cpp
+++ b/test/dead_test.cpp
@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "dead.h"
+#include "engine.h"
+#include "gendung.h"
 
 using namespace devilution;
 
diff --git a/test/diablo_test.cpp b/test/diablo_test.cpp
index 4a671b31..f2c0ca13 100644
--- a/test/diablo_test.cpp
+++ b/test/diablo_test.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "diablo.h"
+#include "multi.h"
 
 using namespace devilution;
 
diff --git a/test/doom_test.cpp b/test/doom_test.cpp
index 44b7d7db..9cb914f7 100644
--- a/test/doom_test.cpp
+++ b/test/doom_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "doom.h"
 
 using namespace devilution;
 
diff --git a/test/drlg_l1_test.cpp b/test/drlg_l1_test.cpp
index db501eb6..221d5441 100644
--- a/test/drlg_l1_test.cpp
+++ b/test/drlg_l1_test.cpp
@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "diablo.h"
+#include "drlg_l1.h"
+#include "lighting.h"
 
 using namespace devilution;
 
diff --git a/test/drlg_l2_test.cpp b/test/drlg_l2_test.cpp
index c516b964..4d98edac 100644
--- a/test/drlg_l2_test.cpp
+++ b/test/drlg_l2_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "drlg_l2.h"
 
 using namespace devilution;
 
diff --git a/test/drlg_l3_test.cpp b/test/drlg_l3_test.cpp
index fc3220a8..f1e4a5b5 100644
--- a/test/drlg_l3_test.cpp
+++ b/test/drlg_l3_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "drlg_l3.h"
 
 using namespace devilution;
 
diff --git a/test/drlg_l4_test.cpp b/test/drlg_l4_test.cpp
index bfe1efbd..7f351e30 100644
--- a/test/drlg_l4_test.cpp
+++ b/test/drlg_l4_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "drlg_l4.h"
 
 using namespace devilution;
 
diff --git a/test/effects_test.cpp b/test/effects_test.cpp
index a2db1b62..8d2cd6c5 100644
--- a/test/effects_test.cpp
+++ b/test/effects_test.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "effects.h"
+#include "player.h"
 
 using namespace devilution;
 
diff --git a/test/inv_test.cpp b/test/inv_test.cpp
index 484aeb84..6bbd8185 100644
--- a/test/inv_test.cpp
+++ b/test/inv_test.cpp
@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "cursor.h"
+#include "inv.h"
+#include "player.h"
 
 using namespace devilution;
 
diff --git a/test/lighting_test.cpp b/test/lighting_test.cpp
index 5b61e681..962cb3e2 100644
--- a/test/lighting_test.cpp
+++ b/test/lighting_test.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "control.h"
+#include "lighting.h"
 
 using namespace devilution;
 
diff --git a/test/missiles_test.cpp b/test/missiles_test.cpp
index 5cdd03bd..902d5f8e 100644
--- a/test/missiles_test.cpp
+++ b/test/missiles_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "missiles.h"
 
 using namespace devilution;
 
diff --git a/test/pack_test.cpp b/test/pack_test.cpp
index eed6183d..831ee5a3 100644
--- a/test/pack_test.cpp
+++ b/test/pack_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "pack.h"
 
 using namespace devilution;
 
diff --git a/test/player_test.cpp b/test/player_test.cpp
index 0a2b746b..952997bc 100644
--- a/test/player_test.cpp
+++ b/test/player_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "player.h"
 
 using namespace devilution;
 
diff --git a/test/scrollrt_test.cpp b/test/scrollrt_test.cpp
index 34142029..47a9d575 100644
--- a/test/scrollrt_test.cpp
+++ b/test/scrollrt_test.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "diablo.h"
+#include "scrollrt.h"
 #include "ui_fwd.h"
 
 using namespace devilution;
diff --git a/test/stores_test.cpp b/test/stores_test.cpp
index 1f7c5ca2..fa588e6e 100644
--- a/test/stores_test.cpp
+++ b/test/stores_test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
-#include "all.h"
+
+#include "stores.h"
 
 using namespace devilution;
 
diff --git a/test/writehero_test.cpp b/test/writehero_test.cpp
index 494e2d3d..5e050bac 100644
--- a/test/writehero_test.cpp
+++ b/test/writehero_test.cpp
@@ -1,10 +1,14 @@
-#include <gtest/gtest.h>
-#include "picosha2.h"
-#include <fstream>
-#include <vector>
 #include <cstdio>
-#include "all.h"
+#include <fstream>
+#include <gtest/gtest.h>
+#include <vector>
+
+#include "loadsave.h"
+#include "pack.h"
 #include "paths.h"
+#include "pfile.h"
+
+#include "picosha2.h"
 
 using namespace devilution;