diff --git a/src/audio/audio.c b/src/audio/audio.c
index 300ea16e0c..6d69d80285 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -16,12 +16,7 @@
 
 #include "../config.h"
 #include "../interface/viewport.h"
-#include "../interface/window.h"
 #include "../localisation/language.h"
-#include "../platform/platform.h"
-#include "../ride/ride.h"
-#include "../world/map.h"
-#include "../world/sprite.h"
 #include "audio.h"
 #include "mixer.h"
 #include "../openrct2.h"
diff --git a/src/cmdline/ConvertCommand.cpp b/src/cmdline/ConvertCommand.cpp
index ff2027d4e0..a6ae65d4d4 100644
--- a/src/cmdline/ConvertCommand.cpp
+++ b/src/cmdline/ConvertCommand.cpp
@@ -25,7 +25,6 @@
 extern "C"
 {
     #include "../game.h"
-    #include "../scenario.h"
     #include "../openrct2.h"
     #include "../interface/window.h"
 }
diff --git a/src/core/FileScanner.cpp b/src/core/FileScanner.cpp
index 1e03ea3e5b..1f6b6d8ecb 100644
--- a/src/core/FileScanner.cpp
+++ b/src/core/FileScanner.cpp
@@ -26,6 +26,11 @@
     #include <sys/types.h>
     #include <sys/stat.h>
     #include <unistd.h>
+#elif defined(__WINDOWS__)
+    extern "C" {
+        // Windows needs this for widechar <-> utf8 conversion utils
+        #include "../localisation/language.h"
+    }
 #endif
 
 #include <stack>
@@ -37,7 +42,6 @@
 
 extern "C"
 {
-    #include "../localisation/localisation.h"
     #include "../platform/platform.h"
 }
 
diff --git a/src/core/FileScanner.h b/src/core/FileScanner.h
index 032419524e..c7fd41cad9 100644
--- a/src/core/FileScanner.h
+++ b/src/core/FileScanner.h
@@ -18,11 +18,6 @@
 
 #include "../common.h"
 
-struct DirectoryInfo
-{
-    const utf8 *    Name;
-};
-
 struct FileInfo
 {
     const utf8 *    Name;
diff --git a/src/drawing/IDrawingEngine.h b/src/drawing/IDrawingEngine.h
index 90bee4d6a1..a4ded3b623 100644
--- a/src/drawing/IDrawingEngine.h
+++ b/src/drawing/IDrawingEngine.h
@@ -61,7 +61,7 @@ namespace DrawingEngineFactory
     IDrawingEngine * CreateSoftware();
     IDrawingEngine * CreateSoftwareWithHardwareDisplay();
     IDrawingEngine * CreateOpenGL();
-};
+}
 
 interface IRainDrawer
 {
diff --git a/src/drawing/NewDrawing.h b/src/drawing/NewDrawing.h
index 370ad89d0e..e4edc6cd17 100644
--- a/src/drawing/NewDrawing.h
+++ b/src/drawing/NewDrawing.h
@@ -16,11 +16,16 @@
 
 #pragma once
 
+#include <SDL_video.h>
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+#include "../rct2.h"
+#include "drawing.h"
+
 extern rct_string_id DrawingEngineStringIds[3];
 
 sint32 drawing_engine_get_type();
diff --git a/src/drawing/engines/opengl/DrawCommands.h b/src/drawing/engines/opengl/DrawCommands.h
index 194f3f9eb2..952d5118d6 100644
--- a/src/drawing/engines/opengl/DrawCommands.h
+++ b/src/drawing/engines/opengl/DrawCommands.h
@@ -19,6 +19,7 @@
 #include "../../../common.h"
 #include "OpenGLAPI.h"
 #include "GLSLTypes.h"
+#include "TextureCache.h"
 
 struct DrawRectCommand {
     uint32 flags;
@@ -43,4 +44,4 @@ struct DrawImageCommand {
     CachedTextureInfo texPalette;
     sint32 bounds[4];
     bool mask;
-};
\ No newline at end of file
+};
diff --git a/src/interface/keyboard_shortcut.h b/src/interface/keyboard_shortcut.h
index a956c00da2..c0da2707d3 100644
--- a/src/interface/keyboard_shortcut.h
+++ b/src/interface/keyboard_shortcut.h
@@ -17,6 +17,8 @@
 #ifndef _INTERFACE_KEYBOARD_SHORTCUT_H_
 #define _INTERFACE_KEYBOARD_SHORTCUT_H_
 
+#include "../common.h"
+
 #define SHORTCUT_UNDEFINED 0xFFFF
 
 /** The current shortcut being changed. */
diff --git a/src/intro.c b/src/intro.c
index a2185dc0b1..58c21b9d7a 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -18,8 +18,6 @@
 #include "audio/mixer.h"
 #include "drawing/drawing.h"
 #include "intro.h"
-#include "localisation/localisation.h"
-#include "platform/platform.h"
 #include "sprites.h"
 
 #define BACKROUND_COLOUR_DARK		10
diff --git a/src/network/NetworkGroup.h b/src/network/NetworkGroup.h
index aec1795bd8..58f2b1bf40 100644
--- a/src/network/NetworkGroup.h
+++ b/src/network/NetworkGroup.h
@@ -18,6 +18,7 @@
 
 #include <array>
 #include <jansson.h>
+#include <string>
 #include "NetworkPacket.h"
 #include "../common.h"
 
diff --git a/src/paint/map_element/surface.c b/src/paint/map_element/surface.c
index bce51b239b..0d5ca840fa 100644
--- a/src/paint/map_element/surface.c
+++ b/src/paint/map_element/surface.c
@@ -15,12 +15,9 @@
 #pragma endregion
 
 #include "../../cheats.h"
-#include "../../common.h"
 #include "../../config.h"
 #include "../../interface/viewport.h"
 #include "../../peep/staff.h"
-#include "../../world/map.h"
-#include "../paint.h"
 #include "map_element.h"
 #include "surface.h"
 
diff --git a/src/ride/vehicle.h b/src/ride/vehicle.h
index 1e1d325b9d..fd33c7cccf 100644
--- a/src/ride/vehicle.h
+++ b/src/ride/vehicle.h
@@ -18,6 +18,7 @@
 #define _VEHICLE_H_
 
 #include "../common.h"
+#include "../world/map.h"
 
 #pragma pack(push, 1)
 /* size: 0x2 */
diff --git a/src/title.h b/src/title.h
index 151b58dbc3..244f1b994b 100644
--- a/src/title.h
+++ b/src/title.h
@@ -18,6 +18,7 @@
 #define _TITLE_H_
 
 #include <SDL.h>
+#include "drawing/drawing.h"
 
 enum {
 	TITLE_SCRIPT_WAIT,
diff --git a/src/windows/footpath.c b/src/windows/footpath.c
index 673c50957b..7c8d9f2287 100644
--- a/src/windows/footpath.c
+++ b/src/windows/footpath.c
@@ -20,13 +20,10 @@
 #include "../input.h"
 #include "../sprites.h"
 #include "../interface/widget.h"
-#include "../interface/window.h"
 #include "../interface/viewport.h"
 #include "../world/footpath.h"
-#include "../world/map.h"
 #include "dropdown.h"
 #include "../interface/themes.h"
-#include "../cheats.h"
 
 enum {
 	PATH_CONSTRUCTION_MODE_LAND,
diff --git a/src/world/climate.h b/src/world/climate.h
index 38322c4384..0e6d5a1531 100644
--- a/src/world/climate.h
+++ b/src/world/climate.h
@@ -18,6 +18,7 @@
 #define _CLIMATE_H_
 
 #include "../common.h"
+#include "../drawing/drawing.h"
 
 enum {
 	CLIMATE_COOL_AND_WET,
diff --git a/src/world/footpath.c b/src/world/footpath.c
index 594d94501d..c30166656f 100644
--- a/src/world/footpath.c
+++ b/src/world/footpath.c
@@ -15,17 +15,11 @@
 #pragma endregion
 
 #include "../cheats.h"
-#include "../config.h"
 #include "../game.h"
 #include "../localisation/localisation.h"
-#include "../management/finance.h"
 #include "../network/network.h"
 #include "../util/util.h"
 #include "../object_list.h"
-#include "footpath.h"
-#include "map.h"
-#include "map_animation.h"
-#include "scenery.h"
 #include "../ride/track.h"
 #include "../ride/track_data.h"