diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index 2dd9f9b56..d9c908a8b 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 char sz_error_buf[256];
 BOOL terminating;
diff --git a/Source/automap.cpp b/Source/automap.cpp
index 24953eb63..a3298c53f 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 // BUGFIX: only the first 256 elements are ever read
 WORD automaptype[512];
diff --git a/Source/capture.cpp b/Source/capture.cpp
index 904e541e0..067496703 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 void CaptureScreen()
 {
diff --git a/Source/codec.cpp b/Source/codec.cpp
index b844f4c84..5b5d6747b 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int codec_decode(void *pbSrcDst, int size, char *pszPassword)
 {
diff --git a/Source/control.cpp b/Source/control.cpp
index 08c2bcfdf..7652c4995 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 char sgbNextTalkSave; // weak
 char sgbTalkSavePos;  // weak
diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index ecce10c05..124ba1a76 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int cursH;      // weak
 int icursH28;   // idb
diff --git a/Source/dead.cpp b/Source/dead.cpp
index dcc69bcb6..eb4f87273 100644
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 // unused, this was probably for blood boil/burn
 int spurtndx;
diff --git a/Source/debug.cpp b/Source/debug.cpp
index 08274a6e2..1673d9e93 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 void *pSquareCel;
 char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 01d9c3cec..bd42dd964 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -1,6 +1,6 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
+#include "../DiabloUI/diabloui.h"
 
 HWND ghMainWnd;
 int glMid1Seed[NUMLEVELS];
diff --git a/Source/diablo.h b/Source/diablo.h
index b6592fba0..1780d17ee 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -2,6 +2,82 @@
 #ifndef __DIABLO_H__
 #define __DIABLO_H__
 
+#include "../types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "appfat.h"
+#include "automap.h"
+#include "capture.h"
+#include "codec.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#include "debug.h"
+#include "doom.h"
+#include "drlg_l1.h"
+#include "drlg_l2.h"
+#include "drlg_l3.h"
+#include "drlg_l4.h"
+#include "dthread.h"
+#include "dx.h"
+#include "effects.h"
+#include "encrypt.h"
+#include "engine.h"
+#include "error.h"
+#include "fault.h"
+#include "gamemenu.h"
+#include "gendung.h"
+#include "gmenu.h"
+#include "help.h"
+#include "init.h"
+#include "interfac.h"
+#include "inv.h"
+#include "items.h"
+#include "lighting.h"
+#include "loadsave.h"
+#include "logging.h"
+#include "mainmenu.h"
+#include "minitext.h"
+#include "missiles.h"
+#include "monster.h"
+#include "movie.h"
+#include "mpqapi.h"
+#include "msg.h"
+#include "msgcmd.h"
+#include "multi.h"
+#include "nthread.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 "spells.h"
+#include "stores.h"
+#include "sync.h"
+#include "textdat.h" // check file name
+#include "themes.h"
+#include "tmsg.h"
+#include "town.h"
+#include "towners.h"
+#include "track.h"
+#include "trigs.h"
+#include "wave.h"
+#include "render.h" // linked last, likely .s/.asm
+#ifdef __cplusplus
+}
+#endif
+
 extern HWND ghMainWnd;
 extern int glMid1Seed[NUMLEVELS];
 extern int glMid2Seed[NUMLEVELS];
diff --git a/Source/doom.cpp b/Source/doom.cpp
index 3fd729259..eff49b2ed 100644
--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int doom_quest_time;
 int doom_stars_drawn;
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index edf60e3b1..c268d22bd 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 char L5dungeon[80][80];
 unsigned char L5dflags[DMAXX][DMAXY];
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index 05381c410..0e71ab0e1 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int nSx1;
 int nSx2; // weak
diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp
index 7851ff4f3..3c598c6bd 100644
--- a/Source/drlg_l3.cpp
+++ b/Source/drlg_l3.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 char lavapool;  // weak
 int abyssx;     // weak
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index ecc57126a..46b668ba8 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int diabquad1x; // weak
 int diabquad1y; // weak
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index 34c7199c1..1aabb4f66 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 #ifdef __cplusplus
 static CCritSect sgMemCrit;
diff --git a/Source/dx.cpp b/Source/dx.cpp
index e145b22af..141efe610 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 BYTE *sgpBackBuf;
 LPDIRECTDRAW lpDDInterface;
diff --git a/Source/effects.cpp b/Source/effects.cpp
index 0df91e16a..e6997cbe0 100644
--- a/Source/effects.cpp
+++ b/Source/effects.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 int sfxdelay; // weak
 int sfxdnum;
diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index d678cadeb..a1d287217 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/PKWare/pkware.h"
 
 DWORD hashtable[1280];
 
diff --git a/Source/engine.cpp b/Source/engine.cpp
index ee46817a7..6e77744cb 100644
--- a/Source/engine.cpp
+++ b/Source/engine.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 #if (_MSC_VER >= 800) && (_MSC_VER <= 1200)
 #pragma warning(disable : 4731) // frame pointer register 'ebp' modified by inline assembly code
diff --git a/Source/error.cpp b/Source/error.cpp
index 7e9c3f3b0..97681dd36 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 char msgtable[MAX_SEND_STR_LEN];
 char msgdelay;
diff --git a/Source/fault.cpp b/Source/fault.cpp
index ec6cdd6f9..459a724b1 100644
--- a/Source/fault.cpp
+++ b/Source/fault.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter;
 
diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index 47e450df7..49fecb8d1 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 TMenuItem sgSingleMenu[6] = {
 	// clang-format off
diff --git a/Source/gendung.cpp b/Source/gendung.cpp
index 84a6361dc..631556b4c 100644
--- a/Source/gendung.cpp
+++ b/Source/gendung.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 WORD level_frame_types[MAXTILES];
 int themeCount;
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index 7a1788a80..bd0e538c7 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 void *optbar_cel;
 BOOLEAN byte_634464; // weak
diff --git a/Source/help.cpp b/Source/help.cpp
index 819ecd698..085d2f17f 100644
--- a/Source/help.cpp
+++ b/Source/help.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int help_select_line; // weak
 int dword_634494;     // weak
diff --git a/Source/init.cpp b/Source/init.cpp
index 0ab42f056..eafa5fe9c 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -1,6 +1,6 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
+#include "../DiabloUI/diabloui.h"
 
 _SNETVERSIONDATA fileinfo;
 int gbActive; // weak
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 47a11f5c9..4fd3e57fd 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 void *sgpBackCel;
 int sgdwProgress;
diff --git a/Source/inv.cpp b/Source/inv.cpp
index 79216766a..7663a14aa 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 BOOL invflag;
 void *pInvCels;
diff --git a/Source/items.cpp b/Source/items.cpp
index c6c1ac798..8c52ae8fc 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int itemactive[MAXITEMS];
 int uitemflag;
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index d0eab5468..2c0233e9d 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 LightListStruct VisionList[MAXVISION];
 unsigned char lightactive[MAXLIGHTS];
diff --git a/Source/list.h b/Source/list.h
index 49706c9d0..4c511a8c1 100644
--- a/Source/list.h
+++ b/Source/list.h
@@ -6,6 +6,8 @@
 #include <stddef.h> // for offsetof
 #include <typeinfo> // for typeid
 
+#include "../3rdParty/Storm/Source/storm.h"
+
 #ifdef _MSC_VER
 #pragma warning (disable : 4291) // no matching operator delete found
 #endif
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 3be16f8b5..db21b657b 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 unsigned char *tbuff;
 
diff --git a/Source/logging.cpp b/Source/logging.cpp
index cb8844216..203ad3d96 100644
--- a/Source/logging.cpp
+++ b/Source/logging.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 #ifdef __cplusplus
 static CCritSect sgMemCrit;
diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp
index 2a7dc4146..3ad64ec5b 100644
--- a/Source/mainmenu.cpp
+++ b/Source/mainmenu.cpp
@@ -1,6 +1,6 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
+#include "../DiabloUI/diabloui.h"
 
 char gszHero[16];
 
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 3f068854f..c10b2bdbf 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int qtexty; // weak
 char *qtextptr;
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 19061e6af..7d679faba 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int missileactive[MAXMISSILES];
 int missileavail[MAXMISSILES];
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 47c04b892..c0ec0467a 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 // Tracks which missile files are already loaded
 int MissileFileFlag;
diff --git a/Source/movie.cpp b/Source/movie.cpp
index 380d07fd5..c447c59ea 100644
--- a/Source/movie.cpp
+++ b/Source/movie.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 BYTE movie_playing;
 BOOL loop_movie;
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index dacd6d778..d566d79ec 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 int sgdwMpqOffset; // idb
 char mpq_buf[4096];
diff --git a/Source/msg.cpp b/Source/msg.cpp
index a025569f9..4c09184d5 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -1,6 +1,6 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
+#include "../DiabloUI/diabloui.h"
 
 static DWORD sgdwOwnerWait;
 static DWORD sgdwRecvOffset;
diff --git a/Source/msgcmd.cpp b/Source/msgcmd.cpp
index c04c90a99..f97f20e50 100644
--- a/Source/msgcmd.cpp
+++ b/Source/msgcmd.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 #include "list.h"
 
 #define COMMAND_LEN 128
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 2efc98316..455e450aa 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -1,6 +1,6 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
+#include "../DiabloUI/diabloui.h"
 
 BOOLEAN gbSomebodyWonGameKludge; // weak
 TBuffer sgHiPriBuf;
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 52f528090..d660ce340 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 char byte_679704; // weak
 int gdwMsgLenTbl[MAX_PLRS];
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 3b261d2a7..89e288649 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int trapid;  // weak
 int trapdir; // weak
diff --git a/Source/pack.cpp b/Source/pack.cpp
index 5478da58a..c79f6ebf4 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 void PackPlayer(PkPlayerStruct *pPack, int pnum, BOOL manashield)
 {
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 96092e804..a3a198fc1 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 PALETTEENTRY logical_palette[256];
 PALETTEENTRY system_palette[256];
diff --git a/Source/path.cpp b/Source/path.cpp
index b417905db..e6b93dbec 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 // preallocated nodes, search is terminated after 300 nodes are visited
 PATHNODE path_nodes[MAXPATHNODES];
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index ea888c301..d9eae78f7 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -1,6 +1,6 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
+#include "../DiabloUI/diabloui.h"
 
 #define PASSWORD_SINGLE "xrgyrkj1"
 #define PASSWORD_MULTI "szqnlsk1"
diff --git a/Source/player.cpp b/Source/player.cpp
index ed220abc6..1c2146da4 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 int plr_lframe_size;
 int plr_wframe_size;
diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
index a644c480a..0ffc1c06b 100644
--- a/Source/plrmsg.cpp
+++ b/Source/plrmsg.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 static unsigned char plr_msg_slot;
 _plrmsg plr_msgs[PMSG_COUNT];
diff --git a/Source/portal.cpp b/Source/portal.cpp
index b0d5dc19c..e98e1a8d3 100644
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 PortalStruct portal[MAXPORTAL];
 int portalindex;
diff --git a/Source/quests.cpp b/Source/quests.cpp
index ce2ec71ed..c4bc57b8a 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int qtopline; // idb
 BOOL questlog;
diff --git a/Source/render.cpp b/Source/render.cpp
index 103283978..c439cd2cb 100644
--- a/Source/render.cpp
+++ b/Source/render.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 #include "_asm.cpp"
 
 int WorldBoolFlag = 0;
diff --git a/Source/restrict.cpp b/Source/restrict.cpp
index 380c4b8fd..643c54c5b 100644
--- a/Source/restrict.cpp
+++ b/Source/restrict.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 BOOL SystemSupported()
 {
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 656d30d96..d95fa9fe5 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 int light_table_index; // weak
 int PitchTbl[1024];
diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp
index 3e195f6e8..262c9b979 100644
--- a/Source/setmaps.cpp
+++ b/Source/setmaps.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 // BUGFIX: constant data should be const
 unsigned char SkelKingTrans1[8] = {
diff --git a/Source/sha.cpp b/Source/sha.cpp
index c7ef540a4..2a4d19bd5 100644
--- a/Source/sha.cpp
+++ b/Source/sha.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 SHA1Context sgSHA1[3];
 
diff --git a/Source/sound.cpp b/Source/sound.cpp
index 524dfb4e0..70356ebd0 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 LPDIRECTSOUNDBUFFER DSBs[8];
 LPDIRECTSOUND sglpDS;
diff --git a/Source/spells.cpp b/Source/spells.cpp
index cc1b8ce9e..05afd9861 100644
--- a/Source/spells.cpp
+++ b/Source/spells.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 SpellData spelldata[MAX_SPELLS] = {
 	// clang-format off
diff --git a/Source/stores.cpp b/Source/stores.cpp
index 051edbdd3..c2d3f1e42 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int stextup;    // weak
 int storenumh;  // weak
diff --git a/Source/sync.cpp b/Source/sync.cpp
index f49991f07..e97509eee 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 WORD sync_word_6AA708[MAXMONSTERS];
 int sgnMonsters;
diff --git a/Source/textdat.cpp b/Source/textdat.cpp
index fabb5f94f..fb7c0b693 100644
--- a/Source/textdat.cpp
+++ b/Source/textdat.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 /* todo: move text out of struct */
 
diff --git a/Source/themes.cpp b/Source/themes.cpp
index e0ac7098a..9a6b33208 100644
--- a/Source/themes.cpp
+++ b/Source/themes.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int numthemes; // idb
 BOOL armorFlag;
diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp
index fd673f728..d5b20a79f 100644
--- a/Source/tmsg.cpp
+++ b/Source/tmsg.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 static TMsg *sgpTimedMsgHead;
 
diff --git a/Source/town.cpp b/Source/town.cpp
index 1f37e3486..1ac1a9485 100644
--- a/Source/town.cpp
+++ b/Source/town.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 void town_clear_upper_buf(BYTE *pBuff)
 {
diff --git a/Source/towners.cpp b/Source/towners.cpp
index 081b89ba7..3ced7f25f 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int storeflag; // weak
 int sgnCowMsg;
diff --git a/Source/track.cpp b/Source/track.cpp
index fc02a7a96..86f3d5f1c 100644
--- a/Source/track.cpp
+++ b/Source/track.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 static BYTE sgbIsScrolling;
 static DWORD sgdwLastWalk;
diff --git a/Source/trigs.cpp b/Source/trigs.cpp
index f3fd0d911..7af6c48a5 100644
--- a/Source/trigs.cpp
+++ b/Source/trigs.cpp
@@ -1,6 +1,4 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
 
 int trigflag_0;
 int trigflag_1;
diff --git a/Source/wave.cpp b/Source/wave.cpp
index 2dbde315a..ebb75cea4 100644
--- a/Source/wave.cpp
+++ b/Source/wave.cpp
@@ -1,6 +1,5 @@
-//HEADER_GOES_HERE
-
-#include "../types.h"
+#include "diablo.h"
+#include "../3rdParty/Storm/Source/storm.h"
 
 BOOL WCloseFile(HANDLE file)
 {
diff --git a/types.h b/types.h
index ef715d13d..2ce7dfefd 100644
--- a/types.h
+++ b/types.h
@@ -42,10 +42,6 @@
 #include "enums.h"
 #include "structs.h"
 
-#include "DiabloUI/diabloui.h"
-#include "3rdParty/Storm/Source/storm.h"
-#include "3rdParty/PKWare/pkware.h"
-
 // If defined, use copy protection [Default -> Defined]
 //#define COPYPROT
 
@@ -61,84 +57,4 @@
 // If defined, fix palette glitch in Windows Vista+ [Default -> Undefined]
 //#define COLORFIX
 
-// If defined, use standard memcpy() in place of qmemcpy() [Default -> Undefined]
-// Will be replaced with [rep movsd] if optimization is used
-#define FAST_MEMCPY
-
-// header files
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "Source/appfat.h"
-#include "Source/automap.h"
-#include "Source/capture.h"
-#include "Source/codec.h"
-#include "Source/control.h"
-#include "Source/cursor.h"
-#include "Source/dead.h"
-#include "Source/debug.h"
-#include "Source/diablo.h"
-#include "Source/doom.h"
-#include "Source/drlg_l1.h"
-#include "Source/drlg_l2.h"
-#include "Source/drlg_l3.h"
-#include "Source/drlg_l4.h"
-#include "Source/dthread.h"
-#include "Source/dx.h"
-#include "Source/effects.h"
-#include "Source/encrypt.h"
-#include "Source/engine.h"
-#include "Source/error.h"
-#include "Source/fault.h"
-#include "Source/gamemenu.h"
-#include "Source/gendung.h"
-#include "Source/gmenu.h"
-#include "Source/help.h"
-#include "Source/init.h"
-#include "Source/interfac.h"
-#include "Source/inv.h"
-#include "Source/items.h"
-#include "Source/lighting.h"
-#include "Source/loadsave.h"
-#include "Source/logging.h"
-#include "Source/mainmenu.h"
-#include "Source/minitext.h"
-#include "Source/missiles.h"
-#include "Source/monster.h"
-#include "Source/movie.h"
-#include "Source/mpqapi.h"
-#include "Source/msg.h"
-#include "Source/msgcmd.h"
-#include "Source/multi.h"
-#include "Source/nthread.h"
-#include "Source/objects.h"
-#include "Source/pack.h"
-#include "Source/palette.h"
-#include "Source/path.h"
-#include "Source/pfile.h"
-#include "Source/player.h"
-#include "Source/plrmsg.h"
-#include "Source/portal.h"
-#include "Source/quests.h"
-#include "Source/restrict.h"
-#include "Source/scrollrt.h"
-#include "Source/setmaps.h"
-#include "Source/sha.h"
-#include "Source/sound.h"
-#include "Source/spells.h"
-#include "Source/stores.h"
-#include "Source/sync.h"
-#include "Source/textdat.h" // check file name
-#include "Source/themes.h"
-#include "Source/tmsg.h"
-#include "Source/town.h"
-#include "Source/towners.h"
-#include "Source/track.h"
-#include "Source/trigs.h"
-#include "Source/wave.h"
-#include "Source/render.h" // linked last, likely .s/.asm
-#ifdef __cplusplus
-}
-#endif
-
 #endif