diff --git a/Source/all.h b/Source/all.h
index 81d674f74..188e8e360 100644
--- a/Source/all.h
+++ b/Source/all.h
@@ -17,7 +17,12 @@
 
 #include "sdl_compat.h"
 
-#include "../types.h"
+#include "miniwin.h"
+#include "soundsample.h"
+#include "thread.h"
+#include "ui_fwd.h"
+
+#include <limits.h>
 
 #include "../SourceX/qol.h"
 
diff --git a/Source/automap.cpp b/Source/automap.cpp
index d11b5991e..821bc1558 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -10,6 +10,8 @@
 #include "inv.h"
 #include "monster.h"
 #include "setmaps.h"
+#include "miniwin.h"
+#include "ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/engine.h b/Source/engine.h
index baacd817f..4a71adbe2 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -23,7 +23,7 @@
 #include "sdl2_to_1_2_backports.h"
 #endif
 
-#include "../types.h"
+#include "miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/sound.h b/Source/sound.h
index 121730313..2611c25f0 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "soundsample.h"
+
 namespace devilution {
 
 #define VOLUME_MIN -1600
diff --git a/types.h b/types.h
deleted file mode 100644
index e88bc6d7c..000000000
--- a/types.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file types.h
- *
- * Include OS headers and set compiler state.
- */
-#ifndef _TYPES_H
-#define _TYPES_H
-
-#include "miniwin.h"
-#include "soundsample.h"
-#include "thread.h"
-#include "ui_fwd.h"
-
-#include <limits.h>
-
-#endif