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/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/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/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,