🚚 Split up all.h in to proper header relations

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

Source/all.h

@@ -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

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 {

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 {
 

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 {

Source/codec.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 int codec_decode(BYTE *pbSrcDst, DWORD size, const char *pszPassword);

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 {

Source/control.h

@@ -10,6 +10,7 @@
 #include "engine.h"
 #include "spelldat.h"
 #include "spells.h"
+#include "ui_fwd.h"
 
 namespace devilution {
 

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 {
 

Source/cursor.h

@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
+
 namespace devilution {
 
 enum cursor_id : uint8_t {

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 {

Source/dead.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #define MAXDEAD 31

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 {
 

Source/debug.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 extern BYTE *pSquareCel;

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

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 {
 

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 {
 

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 {
 

Source/drlg_l1.h

@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 extern int UberRow;

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 {
 

Source/drlg_l2.h

@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 struct HALLNODE {

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 {
 

Source/drlg_l3.h

@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 void AddFenceDoors();

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 {
 

Source/drlg_l4.h

@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "gendung.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 extern int diabquad1x;

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 {
 

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

Source/dx.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "engine.h"
+
 namespace devilution {
 
 CelOutputBuffer GlobalBackBuffer();

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;

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 {
 

Source/encrypt.h

@@ -5,6 +5,10 @@
  */
 #pragma once
 
+#include <SDL.h>
+
+#include "miniwin.h"
+
 namespace devilution {
 
 struct TDataInfo {

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"
 

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 {

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 {
 

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 {

Source/gendung.cpp

@@ -3,7 +3,8 @@
  *
  * Implementation of general dungeon generation code.
  */
-#include "all.h"
+
+#include "init.h"
 #include "options.h"
 
 namespace devilution {

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 {
 

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 {
 

Source/help.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "engine.h"
+
 namespace devilution {
 
 extern bool helpflag;

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

Source/init.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 extern int gbActive;

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 {
 

Source/interfac.h

@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "ui_fwd.h"
+
 namespace devilution {
 
 #define UI_OFFSET_Y ((Sint16)((gnScreenHeight - 480) / 2))

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 {
 

Source/itemdat.cpp

@@ -3,7 +3,8 @@
  *
  * Implementation of all item data.
  */
-#include "all.h"
+
+#include "itemdat.h"
 
 namespace devilution {
 

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 {

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 {
 

Source/items.h

@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include "engine.h"
 #include "itemdat.h"
 
 namespace devilution {

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 {
 

Source/lighting.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 #define MAXLIGHTS 32

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 {
 

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 {
 

Source/minitext.cpp

@@ -3,7 +3,9 @@
  *
  * Implementation of scrolling dialog text.
  */
-#include "all.h"
+
+#include "control.h"
+#include "dx.h"
 
 namespace devilution {
 

Source/minitext.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "engine.h"
+
 namespace devilution {
 
 extern bool qtextflag;

Source/misdat.cpp

@@ -3,7 +3,9 @@
  *
  * Implementation of data related to missiles.
  */
-#include "all.h"
+#include "misdat.h"
+
+#include "missiles.h"
 
 namespace devilution {
 

Source/misdat.h

@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "effects.h"
+
 namespace devilution {
 
 enum mienemy_type : uint8_t {

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 {
 

Source/missiles.h

@@ -7,7 +7,9 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
 #include "misdat.h"
+#include "spelldat.h"
 
 namespace devilution {
 

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 {
 

Source/monstdat.h

@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include <SDL.h>
 #include <stdint.h>
 
 namespace devilution {

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 {
 

Source/monster.h

@@ -7,7 +7,9 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
 #include "monstdat.h"
+#include "sound.h"
 
 namespace devilution {
 

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 {
 

Source/movie.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 extern BYTE movie_playing;

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 {
 

Source/mpqapi.h

@@ -5,8 +5,11 @@
  */
 #pragma once
 
+#include <SDL.h>
 #include <stdint.h>
 
+#include "miniwin.h"
+
 namespace devilution {
 
 struct _FILEHEADER {

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 {
 

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;

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 {
 

Source/nthread.h

@@ -5,6 +5,9 @@
  */
 #pragma once
 
+#include "miniwin.h"
+#include "player.h"
+
 namespace devilution {
 
 extern BYTE sgbNetUpdateRate;

Source/objdat.cpp

@@ -3,7 +3,7 @@
  *
  * Implementation of all object data.
  */
-#include "all.h"
+#include "objdat.h"
 
 namespace devilution {
 

Source/objdat.h

@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "gendung.h"
+
 namespace devilution {
 
 enum theme_id : int8_t {

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 {
 

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 {
 

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 {

Source/palette.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "miniwin.h"
+
 namespace devilution {
 
 // Diablo uses a 256 color palette

Source/path.cpp

@@ -3,7 +3,9 @@
  *
  * Implementation of the path finding algorithms.
  */
-#include "all.h"
+#include "path.h"
+
+#include "gendung.h"
 
 namespace devilution {
 

Source/path.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #define MAX_PATH_LENGTH 25

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 {
 

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 {
 

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 {
 

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 {
 

Source/portal.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "gendung.h"
+
 namespace devilution {
 
 #define MAXPORTAL 4

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 {
 

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 {

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

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 {

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 {
 

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 {
 

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 {
 

Source/sha.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <SDL.h>
+
 namespace devilution {
 
 #define SHA1HashSize 20

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;

Source/sound.h

@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include "miniwin.h"
 #include "soundsample.h"
 
 namespace devilution {

Source/spelldat.cpp

@@ -3,7 +3,7 @@
  *
  * Implementation of all spell data.
  */
-#include "all.h"
+#include "spelldat.h"
 
 namespace devilution {
 

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 {
 

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 {

Source/stores.h

@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include "control.h"
 #include "engine.h"
 
 namespace devilution {

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 {
 

Source/textdat.cpp

@@ -3,7 +3,6 @@
  *
  * Implementation of all dialog texts.
  */
-#include "all.h"
 #include "textdat.h"
 
 namespace devilution {

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 {