diff --git a/src/audio/audio.c b/src/audio/audio.c
index 50e4610528..6cb2e71362 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
diff --git a/src/audio/mixer.cpp b/src/audio/mixer.cpp
index 8603ee0768..2f594ff835 100644
--- a/src/audio/mixer.cpp
+++ b/src/audio/mixer.cpp
@@ -15,7 +15,6 @@
 #pragma endregion
 
 extern "C" {
-	#include "../addresses.h"
 	#include "../config.h"
 	#include "../platform/platform.h"
 	#include "../localisation/localisation.h"
diff --git a/src/config.c b/src/config.c
index 2ad7ecf630..ff9ea7c3d8 100644
--- a/src/config.c
+++ b/src/config.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "addresses.h"
 #include "config.h"
 #include "interface/keyboard_shortcut.h"
 #include "interface/themes.h"
diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c
index c9088a739e..e2d1204ac1 100644
--- a/src/drawing/drawing.c
+++ b/src/drawing/drawing.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../common.h"
 #include "../localisation/localisation.h"
 #include "../interface/window.h"
diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h
index d87dde1898..eb7e05bedb 100644
--- a/src/drawing/drawing.h
+++ b/src/drawing/drawing.h
@@ -19,6 +19,9 @@
 
 #include "../common.h"
 #include "font.h"
+#ifndef NO_RCT2
+	#include "../addresses.h"
+#endif
 
 // For g1 only enable packing when still relying on vanilla
 #ifndef NO_RCT2
diff --git a/src/drawing/engines/SoftwareDrawingEngine.cpp b/src/drawing/engines/SoftwareDrawingEngine.cpp
index 792fd3690e..0b73560cbf 100644
--- a/src/drawing/engines/SoftwareDrawingEngine.cpp
+++ b/src/drawing/engines/SoftwareDrawingEngine.cpp
@@ -22,6 +22,7 @@
 
 extern "C"
 {
+    #include "../../addresses.h"
     #include "../../config.h"
     #include "../../game.h"
     #include "../../interface/screenshot.h"
diff --git a/src/drawing/rect.c b/src/drawing/rect.c
index c30e92319a..444aa6dbbd 100644
--- a/src/drawing/rect.c
+++ b/src/drawing/rect.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../common.h"
 #include "../interface/colour.h"
 #include "../platform/platform.h"
diff --git a/src/editor.h b/src/editor.h
index 98fb324777..ea23dee573 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -18,7 +18,6 @@
 #define _EDITOR_H_
 
 #include "rct2.h"
-#include "addresses.h"
 
 typedef enum {
 	EDITOR_STEP_OBJECT_SELECTION,			// 0
diff --git a/src/game.c b/src/game.c
index 2bfbb275bf..7ad6ff11f1 100644
--- a/src/game.c
+++ b/src/game.c
@@ -67,6 +67,10 @@ bool gInUpdateCode = false;
 int gGameCommandNestLevel;
 bool gGameCommandIsNetworked;
 
+#ifdef NO_RCT2
+uint32 gCurrentTicks;
+#endif
+
 GAME_COMMAND_CALLBACK_POINTER* game_command_callback = 0;
 GAME_COMMAND_CALLBACK_POINTER* game_command_callback_table[] = {
 	0,
diff --git a/src/game.h b/src/game.h
index a0d9c0c155..36528b236e 100644
--- a/src/game.h
+++ b/src/game.h
@@ -130,7 +130,11 @@ extern rct_string_id gErrorStringId;
 
 extern GAME_COMMAND_POINTER* new_game_command_table[68];
 
+#ifndef NO_RCT2
 #define gCurrentTicks				RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32)
+#else
+extern uint32 gCurrentTicks;
+#endif
 
 extern uint16 gTicksSinceLastUpdate;
 extern uint32 gLastTickCount;
diff --git a/src/interface/chat.c b/src/interface/chat.c
index 8aaf221aef..6857cb4082 100644
--- a/src/interface/chat.c
+++ b/src/interface/chat.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "chat.h"
 #include "../addresses.h"
+#include "chat.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"
 #include "../interface/themes.h"
diff --git a/src/interface/console.c b/src/interface/console.c
index 13b850bdbf..e0dbeb6dcd 100644
--- a/src/interface/console.c
+++ b/src/interface/console.c
@@ -17,7 +17,6 @@
 #include <stdarg.h>
 #include <SDL_scancode.h>
 
-#include "../addresses.h"
 #include "../drawing/drawing.h"
 #include "../localisation/localisation.h"
 #include "../localisation/user.h"
diff --git a/src/interface/graph.c b/src/interface/graph.c
index 34b50e7613..6543a12d54 100644
--- a/src/interface/graph.c
+++ b/src/interface/graph.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
 #include "graph.h"
diff --git a/src/intro.c b/src/intro.c
index 34cccbbec5..b330b1b499 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "addresses.h"
 #include "audio/audio.h"
 #include "audio/mixer.h"
 #include "drawing/drawing.h"
diff --git a/src/localisation/date.c b/src/localisation/date.c
index 6f79089e22..5b075a046c 100644
--- a/src/localisation/date.c
+++ b/src/localisation/date.c
@@ -15,7 +15,6 @@
 #pragma endregion
 
 #include <time.h>
-#include "../addresses.h"
 #include "../game.h"
 #include "date.h"
 #include "string_ids.h"
diff --git a/src/localisation/date.h b/src/localisation/date.h
index 3c49b3a2af..44dde370fb 100644
--- a/src/localisation/date.h
+++ b/src/localisation/date.h
@@ -18,6 +18,9 @@
 #define _DATE_H_
 
 #include "../common.h"
+#ifndef NO_RCT2
+	#include "../addresses.h"
+#endif
 
 enum {
 	MONTH_MARCH,
diff --git a/src/localisation/localisation.c b/src/localisation/localisation.c
index 5c6eea2924..674c3e53e1 100644
--- a/src/localisation/localisation.c
+++ b/src/localisation/localisation.c
@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include "../common.h"
+#include "../addresses.h"
 
 #ifdef __WINDOWS__
 #include <windows.h>
@@ -23,7 +24,6 @@
 #include <errno.h>
 #endif // __WINDOWS__
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../util/util.h"
diff --git a/src/management/news_item.c b/src/management/news_item.c
index 64e9ac1605..91b3fcbf9d 100644
--- a/src/management/news_item.c
+++ b/src/management/news_item.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../input.h"
 #include "../interface/window.h"
diff --git a/src/network/NetworkServerAdvertiser.cpp b/src/network/NetworkServerAdvertiser.cpp
index b8629e943d..4edc77149d 100644
--- a/src/network/NetworkServerAdvertiser.cpp
+++ b/src/network/NetworkServerAdvertiser.cpp
@@ -25,7 +25,6 @@
 
 extern "C"
 {
-    #include "../addresses.h"
     #include "../config.h"
     #include "../localisation/date.h"
     #include "../management/finance.h"
diff --git a/src/network/twitch.cpp b/src/network/twitch.cpp
index 6db9c544a0..5139669f29 100644
--- a/src/network/twitch.cpp
+++ b/src/network/twitch.cpp
@@ -35,7 +35,6 @@
 
 extern "C"
 {
-    #include "../addresses.h"
     #include "../config.h"
     #include "../drawing/drawing.h"
     #include "../game.h"
diff --git a/src/object/WaterObject.cpp b/src/object/WaterObject.cpp
index ac11a2c062..f32113ada3 100644
--- a/src/object/WaterObject.cpp
+++ b/src/object/WaterObject.cpp
@@ -19,7 +19,6 @@
 
 extern "C"
 {
-    #include "../addresses.h"
     #include "../localisation/localisation.h"
 }
 
diff --git a/src/object_list.h b/src/object_list.h
index ea30c27761..7a88deb25b 100644
--- a/src/object_list.h
+++ b/src/object_list.h
@@ -20,6 +20,9 @@
 	extern rct_water_type				*gWaterEntries[1];
 	extern rct_stex_entry				*gStexEntries[1];
 #else
+
+	#include "addresses.h"
+
 	#define gRideEntries				RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES,				rct_ride_entry*)
 	#define gSmallSceneryEntries		RCT2_ADDRESS(RCT2_ADDRESS_SMALL_SCENERY_ENTRIES,	rct_small_scenery_entry*)
 	#define gLargeSceneryEntries		RCT2_ADDRESS(RCT2_ADDRESS_LARGE_SCENERY_ENTRIES,	rct_large_scenery_entry*)
diff --git a/src/paint/map_element/banner.c b/src/paint/map_element/banner.c
index 188972c709..365fa5a23a 100644
--- a/src/paint/map_element/banner.c
+++ b/src/paint/map_element/banner.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../paint.h"
 #include "../../addresses.h"
+#include "../paint.h"
 #include "../../config.h"
 #include "../../game.h"
 #include "../../interface/viewport.h"
diff --git a/src/paint/map_element/entrance.c b/src/paint/map_element/entrance.c
index 18628eccd9..cae9b3d870 100644
--- a/src/paint/map_element/entrance.c
+++ b/src/paint/map_element/entrance.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../paint.h"
 #include "../../addresses.h"
+#include "../paint.h"
 #include "../../config.h"
 #include "../../game.h"
 #include "../../interface/viewport.h"
diff --git a/src/paint/map_element/fence.c b/src/paint/map_element/fence.c
index 93b7b7c36d..f0bddf6146 100644
--- a/src/paint/map_element/fence.c
+++ b/src/paint/map_element/fence.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../../common.h"
 #include "../../addresses.h"
+#include "../../common.h"
 #include "../../world/map.h"
 #include "../../drawing/drawing.h"
 #include "../../world/scenery.h"
diff --git a/src/paint/map_element/map_element.c b/src/paint/map_element/map_element.c
index 25b8b52f37..312c8c103d 100644
--- a/src/paint/map_element/map_element.c
+++ b/src/paint/map_element/map_element.c
@@ -14,9 +14,9 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../paint.h"
 #include "../../interface/viewport.h"
-#include "../../addresses.h"
 #include "map_element.h"
 #include "../../drawing/drawing.h"
 #include "../../ride/ride_data.h"
diff --git a/src/paint/map_element/path.c b/src/paint/map_element/path.c
index faddef03cc..ac7fe632ee 100644
--- a/src/paint/map_element/path.c
+++ b/src/paint/map_element/path.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "map_element.h"
 #include "../../addresses.h"
+#include "map_element.h"
 #include "../../interface/viewport.h"
 #include "../../ride/track.h"
 #include "../../world/footpath.h"
diff --git a/src/paint/map_element/scenery.c b/src/paint/map_element/scenery.c
index 9b62a8b875..45808c33c0 100644
--- a/src/paint/map_element/scenery.c
+++ b/src/paint/map_element/scenery.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "map_element.h"
 #include "../../addresses.h"
+#include "map_element.h"
 #include "../../config.h"
 #include "../../game.h"
 #include "../../interface/viewport.h"
diff --git a/src/paint/map_element/scenery_multiple.c b/src/paint/map_element/scenery_multiple.c
index a4ef388648..151a6e80cb 100644
--- a/src/paint/map_element/scenery_multiple.c
+++ b/src/paint/map_element/scenery_multiple.c
@@ -14,10 +14,10 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "map_element.h"
 #include "../paint.h"
 #include "../supports.h"
-#include "../../addresses.h"
 #include "../../config.h"
 #include "../../game.h"
 #include "../../interface/viewport.h"
diff --git a/src/paint/map_element/surface.c b/src/paint/map_element/surface.c
index 9d4912e3c3..a9b77f9356 100644
--- a/src/paint/map_element/surface.c
+++ b/src/paint/map_element/surface.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../cheats.h"
 #include "../../common.h"
 #include "../../config.h"
diff --git a/src/paint/paint.c b/src/paint/paint.c
index a02fa6dc26..73dcc3061a 100644
--- a/src/paint/paint.c
+++ b/src/paint/paint.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../addresses.h"
 #include "paint.h"
 #include "../drawing/drawing.h"
 #include "../localisation/localisation.h"
@@ -21,7 +22,6 @@
 #include "../interface/viewport.h"
 #include "map_element/map_element.h"
 #include "sprite/sprite.h"
-#include "../addresses.h"
 
 const uint32 construction_markers[] = {
 	COLOUR_DARK_GREEN << 19 | COLOUR_GREY << 24 | IMAGE_TYPE_USE_PALETTE << 28, // White
diff --git a/src/paint/paint.h b/src/paint/paint.h
index 394e3fcbde..4d051fc4b2 100644
--- a/src/paint/paint.h
+++ b/src/paint/paint.h
@@ -21,6 +21,9 @@
 #include "../world/map.h"
 #include "../interface/colour.h"
 #include "../drawing/drawing.h"
+#ifndef NO_RCT2
+	#include "../addresses.h"
+#endif
 
 typedef struct attached_paint_struct attached_paint_struct;
 struct paint_struct;
diff --git a/src/paint/sprite/misc.c b/src/paint/sprite/misc.c
index 78ecce90d9..1114290ebc 100644
--- a/src/paint/sprite/misc.c
+++ b/src/paint/sprite/misc.c
@@ -15,7 +15,6 @@
 #pragma endregion
 
 #include "../../world/sprite.h"
-#include "../../addresses.h"
 #include "../../drawing/drawing.h"
 #include "../../interface/viewport.h"
 #include "../../paint/sprite/sprite.h"
diff --git a/src/paint/sprite/sprite.c b/src/paint/sprite/sprite.c
index 8dbb8b1d4c..b701bf4573 100644
--- a/src/paint/sprite/sprite.c
+++ b/src/paint/sprite/sprite.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "sprite.h"
 #include "../paint.h"
 #include "../../drawing/drawing.h"
diff --git a/src/platform/posix.c b/src/platform/posix.c
index 1847495e28..48dac48ce2 100644
--- a/src/platform/posix.c
+++ b/src/platform/posix.c
@@ -26,7 +26,6 @@
 #include <pwd.h>
 #include <time.h>
 #include <SDL_syswm.h>
-#include "../addresses.h"
 #include "../config.h"
 #include "../localisation/language.h"
 #include "../openrct2.h"
diff --git a/src/rct1.c b/src/rct1.c
index 64363c3185..4534c71e9d 100644
--- a/src/rct1.c
+++ b/src/rct1.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "addresses.h"
 #include "config.h"
 #include "game.h"
 #include "localisation/string_ids.h"
diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp
index 3c103d070a..5aa479679a 100644
--- a/src/rct1/S4Importer.cpp
+++ b/src/rct1/S4Importer.cpp
@@ -27,6 +27,7 @@
 
 extern "C"
 {
+    #include "../addresses.h"
     #include "../audio/audio.h"
     #include "../cheats.h"
     #include "../editor.h"
diff --git a/src/rct2.c b/src/rct2.c
index bfdffe5236..c0112550bc 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -17,7 +17,6 @@
 #pragma warning(disable : 4996) // GetVersionExA deprecated
 
 #include <time.h>
-#include "addresses.h"
 #include "audio/audio.h"
 #include "audio/mixer.h"
 #include "config.h"
diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp
index 6a3a176e89..3b2aa6a261 100644
--- a/src/rct2/S6Exporter.cpp
+++ b/src/rct2/S6Exporter.cpp
@@ -21,6 +21,7 @@
 
 extern "C"
 {
+    #include "../addresses.h"
     #include "../config.h"
     #include "../game.h"
     #include "../interface/viewport.h"
diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp
index b116930db9..b7277b94e9 100644
--- a/src/rct2/S6Importer.cpp
+++ b/src/rct2/S6Importer.cpp
@@ -21,6 +21,7 @@
 
 extern "C"
 {
+    #include "../addresses.h"
     #include "../config.h"
     #include "../game.h"
     #include "../interface/viewport.h"
diff --git a/src/ride/cable_lift.c b/src/ride/cable_lift.c
index 64e5491157..ace8ede636 100644
--- a/src/ride/cable_lift.c
+++ b/src/ride/cable_lift.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../addresses.h"
 #include "../world/sprite.h"
 #include "cable_lift.h"
 #include "ride.h"
diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c
index b76b9315f7..d1b1f8f04f 100644
--- a/src/ride/coaster/virginia_reel.c
+++ b/src/ride/coaster/virginia_reel.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../track_paint.h"
 #include "../track.h"
diff --git a/src/ride/gentle/car_ride.c b/src/ride/gentle/car_ride.c
index 143fd64b59..efd5db241f 100644
--- a/src/ride/gentle/car_ride.c
+++ b/src/ride/gentle/car_ride.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../track_paint.h"
 #include "../track.h"
@@ -653,4 +654,4 @@ TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(int trackType, int direct
 	}
 
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/src/ride/gentle/circus_show.c b/src/ride/gentle/circus_show.c
index 19a9649d1b..d8a2f04935 100644
--- a/src/ride/gentle/circus_show.c
+++ b/src/ride/gentle/circus_show.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/crooked_house.c b/src/ride/gentle/crooked_house.c
index ada2e86d23..36c8427e99 100644
--- a/src/ride/gentle/crooked_house.c
+++ b/src/ride/gentle/crooked_house.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/dodgems.c b/src/ride/gentle/dodgems.c
index 2cc7634911..c65c548cdf 100644
--- a/src/ride/gentle/dodgems.c
+++ b/src/ride/gentle/dodgems.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/ferris_wheel.c b/src/ride/gentle/ferris_wheel.c
index b80ebde274..f52af22c7b 100644
--- a/src/ride/gentle/ferris_wheel.c
+++ b/src/ride/gentle/ferris_wheel.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/flying_saucers.c b/src/ride/gentle/flying_saucers.c
index d931aee6c8..2a2642d1a8 100644
--- a/src/ride/gentle/flying_saucers.c
+++ b/src/ride/gentle/flying_saucers.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/ghost_train.c b/src/ride/gentle/ghost_train.c
index 9c26d614fd..c9e474b522 100644
--- a/src/ride/gentle/ghost_train.c
+++ b/src/ride/gentle/ghost_train.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../track_paint.h"
 #include "../track.h"
 #include "../vehicle_paint.h"
diff --git a/src/ride/gentle/haunted_house.c b/src/ride/gentle/haunted_house.c
index 5e51d6e683..8a9e25cf84 100644
--- a/src/ride/gentle/haunted_house.c
+++ b/src/ride/gentle/haunted_house.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/merry_go_round.c b/src/ride/gentle/merry_go_round.c
index 44995444cd..e159635e84 100644
--- a/src/ride/gentle/merry_go_round.c
+++ b/src/ride/gentle/merry_go_round.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/gentle/mini_golf.c b/src/ride/gentle/mini_golf.c
index 1e6bdc68b7..5b3c6e0fb9 100644
--- a/src/ride/gentle/mini_golf.c
+++ b/src/ride/gentle/mini_golf.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../config.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
diff --git a/src/ride/gentle/mini_helicopters.c b/src/ride/gentle/mini_helicopters.c
index 1468d7b162..fe56dfcedf 100644
--- a/src/ride/gentle/mini_helicopters.c
+++ b/src/ride/gentle/mini_helicopters.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../track_paint.h"
 #include "../track.h"
 #include "../vehicle_paint.h"
@@ -297,4 +298,4 @@ TRACK_PAINT_FUNCTION get_track_paint_function_mini_helicopters(int trackType, in
 	}
 
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/src/ride/gentle/monorail_cycles.c b/src/ride/gentle/monorail_cycles.c
index a2f9b9a989..d636cc8e81 100644
--- a/src/ride/gentle/monorail_cycles.c
+++ b/src/ride/gentle/monorail_cycles.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../track_paint.h"
 #include "../track.h"
diff --git a/src/ride/gentle/observation_tower.c b/src/ride/gentle/observation_tower.c
index 0a7c59b0cc..6c749ef259 100644
--- a/src/ride/gentle/observation_tower.c
+++ b/src/ride/gentle/observation_tower.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
diff --git a/src/ride/gentle/space_rings.c b/src/ride/gentle/space_rings.c
index bdb2c29aa8..eecf3a11d1 100644
--- a/src/ride/gentle/space_rings.c
+++ b/src/ride/gentle/space_rings.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../track_paint.h"
diff --git a/src/ride/gentle/spiral_slide.c b/src/ride/gentle/spiral_slide.c
index 242a11a30a..bb113ebb6e 100644
--- a/src/ride/gentle/spiral_slide.c
+++ b/src/ride/gentle/spiral_slide.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/ride.h b/src/ride/ride.h
index 79b9ac79f5..f232470100 100644
--- a/src/ride/ride.h
+++ b/src/ride/ride.h
@@ -17,7 +17,6 @@
 #ifndef _RIDE_H_
 #define _RIDE_H_
 
-#include "../addresses.h"
 #include "../common.h"
 #include "../peep/peep.h"
 #include "../world/map.h"
diff --git a/src/ride/shops/misc.c b/src/ride/shops/misc.c
index d12f791795..5a1f866a42 100644
--- a/src/ride/shops/misc.c
+++ b/src/ride/shops/misc.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../../addresses.h"
 #include "../../paint/supports.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
diff --git a/src/ride/station.c b/src/ride/station.c
index 68fbda67ab..96a1da1d46 100644
--- a/src/ride/station.c
+++ b/src/ride/station.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../scenario.h"
 #include "../world/sprite.h"
diff --git a/src/ride/thrill/3d_cinema.c b/src/ride/thrill/3d_cinema.c
index d76e31b3e9..19ba970e92 100644
--- a/src/ride/thrill/3d_cinema.c
+++ b/src/ride/thrill/3d_cinema.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/thrill/enterprise.c b/src/ride/thrill/enterprise.c
index ab6142f83c..6012f309f8 100644
--- a/src/ride/thrill/enterprise.c
+++ b/src/ride/thrill/enterprise.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../track_paint.h"
diff --git a/src/ride/thrill/go_karts.c b/src/ride/thrill/go_karts.c
index a5d307530f..550a03965c 100644
--- a/src/ride/thrill/go_karts.c
+++ b/src/ride/thrill/go_karts.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../track_paint.h"
 #include "../track.h"
diff --git a/src/ride/thrill/launched_freefall.c b/src/ride/thrill/launched_freefall.c
index 081451e988..be76745fe3 100644
--- a/src/ride/thrill/launched_freefall.c
+++ b/src/ride/thrill/launched_freefall.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../../common.h"
 #include "../../addresses.h"
+#include "../../common.h"
 #include "../../config.h"
 #include "../../interface/viewport.h"
 #include "../../world/sprite.h"
diff --git a/src/ride/thrill/magic_carpet.c b/src/ride/thrill/magic_carpet.c
index b9341be915..240094f632 100644
--- a/src/ride/thrill/magic_carpet.c
+++ b/src/ride/thrill/magic_carpet.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/thrill/motion_simulator.c b/src/ride/thrill/motion_simulator.c
index 41463fb3b5..c99c474aee 100644
--- a/src/ride/thrill/motion_simulator.c
+++ b/src/ride/thrill/motion_simulator.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/thrill/pirate_ship.c b/src/ride/thrill/pirate_ship.c
index 31d94c7d72..91ddbf3c8c 100644
--- a/src/ride/thrill/pirate_ship.c
+++ b/src/ride/thrill/pirate_ship.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/thrill/roto_drop.c b/src/ride/thrill/roto_drop.c
index d8581d451b..74d5c633d2 100644
--- a/src/ride/thrill/roto_drop.c
+++ b/src/ride/thrill/roto_drop.c
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../../common.h"
 #include "../../addresses.h"
+#include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../track_paint.h"
diff --git a/src/ride/thrill/swinging_inverter_ship.c b/src/ride/thrill/swinging_inverter_ship.c
index 78fb09dd3a..4eab8f9ec7 100644
--- a/src/ride/thrill/swinging_inverter_ship.c
+++ b/src/ride/thrill/swinging_inverter_ship.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/thrill/twist.c b/src/ride/thrill/twist.c
index 7013f3956c..74c046c28d 100644
--- a/src/ride/thrill/twist.c
+++ b/src/ride/thrill/twist.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../track_paint.h"
diff --git a/src/ride/track_design_save.c b/src/ride/track_design_save.c
index 21f24143ef..04d6ce0e0e 100644
--- a/src/ride/track_design_save.c
+++ b/src/ride/track_design_save.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../config.h"
 #include "../game.h"
diff --git a/src/ride/transport/chairlift.c b/src/ride/transport/chairlift.c
index 2502df9936..16f3827ca0 100644
--- a/src/ride/transport/chairlift.c
+++ b/src/ride/transport/chairlift.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../world/map.h"
 #include "../track_paint.h"
 #include "../track.h"
diff --git a/src/ride/transport/lift.c b/src/ride/transport/lift.c
index cb4374ec46..87cfe430c4 100644
--- a/src/ride/transport/lift.c
+++ b/src/ride/transport/lift.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
diff --git a/src/ride/transport/monorail.c b/src/ride/transport/monorail.c
index 550de5ccdd..ddee68a14e 100644
--- a/src/ride/transport/monorail.c
+++ b/src/ride/transport/monorail.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../track_paint.h"
 #include "../track.h"
diff --git a/src/ride/vehicle_paint.c b/src/ride/vehicle_paint.c
index c0bdec6275..7342b76dd4 100644
--- a/src/ride/vehicle_paint.c
+++ b/src/ride/vehicle_paint.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../addresses.h"
 #include "../paint/paint.h"
 #include "../drawing/drawing.h"
 #include "../world/sprite.h"
diff --git a/src/ride/water/boat_ride.c b/src/ride/water/boat_ride.c
index 233a287f4c..20f03ad46b 100644
--- a/src/ride/water/boat_ride.c
+++ b/src/ride/water/boat_ride.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../track_paint.h"
@@ -144,4 +145,4 @@ TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(int trackType, int direc
 	}
 
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/src/ride/water/river_rafts.c b/src/ride/water/river_rafts.c
index c6b2f2ec8f..29284de600 100644
--- a/src/ride/water/river_rafts.c
+++ b/src/ride/water/river_rafts.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../../common.h"
 #include "../../interface/viewport.h"
 #include "../../paint/supports.h"
diff --git a/src/ride/water/submarine_ride.c b/src/ride/water/submarine_ride.c
index 963cb67d0e..7fd3ebea1a 100644
--- a/src/ride/water/submarine_ride.c
+++ b/src/ride/water/submarine_ride.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../../addresses.h"
 #include "../track_paint.h"
 #include "../track.h"
 #include "../vehicle_paint.h"
diff --git a/src/scenario_list.c b/src/scenario_list.c
index 29819410d6..2c8670a28e 100644
--- a/src/scenario_list.c
+++ b/src/scenario_list.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "addresses.h"
 #include "config.h"
 #include "localisation/localisation.h"
 #include "object_list.h"
diff --git a/src/util/sawyercoding.c b/src/util/sawyercoding.c
index 89eaf9e658..513db84cfe 100644
--- a/src/util/sawyercoding.c
+++ b/src/util/sawyercoding.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../platform/platform.h"
 #include "sawyercoding.h"
 #include "../scenario.h"
diff --git a/src/windows/banner.c b/src/windows/banner.c
index e7521be533..038dd118c5 100644
--- a/src/windows/banner.c
+++ b/src/windows/banner.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../config.h"
 #include "../localisation/localisation.h"
diff --git a/src/windows/cheats.c b/src/windows/cheats.c
index a95e7b8f30..03da1fdfe9 100644
--- a/src/windows/cheats.c
+++ b/src/windows/cheats.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../interface/widget.h"
diff --git a/src/windows/debug_paint.c b/src/windows/debug_paint.c
index 1e7790f7dc..e894e3e5fe 100644
--- a/src/windows/debug_paint.c
+++ b/src/windows/debug_paint.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../input.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/windows/demolish_ride_prompt.c b/src/windows/demolish_ride_prompt.c
index a4dfe4f3f6..db59b45f04 100644
--- a/src/windows/demolish_ride_prompt.c
+++ b/src/windows/demolish_ride_prompt.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/windows/editor_bottom_toolbar.c b/src/windows/editor_bottom_toolbar.c
index 006e5da84f..0c3c57bca0 100644
--- a/src/windows/editor_bottom_toolbar.c
+++ b/src/windows/editor_bottom_toolbar.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../config.h"
 #include "../game.h"
diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c
index e15e36503b..7714792a7c 100644
--- a/src/windows/editor_object_selection.c
+++ b/src/windows/editor_object_selection.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../config.h"
diff --git a/src/windows/editor_scenario_options.c b/src/windows/editor_scenario_options.c
index 438caae72c..d71cf0668e 100644
--- a/src/windows/editor_scenario_options.c
+++ b/src/windows/editor_scenario_options.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/windows/footpath.c b/src/windows/footpath.c
index b5f02c1d2a..71495e3a48 100644
--- a/src/windows/footpath.c
+++ b/src/windows/footpath.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"
 #include "../localisation/localisation.h"
diff --git a/src/windows/game_bottom_toolbar.c b/src/windows/game_bottom_toolbar.c
index 020eb2c44d..2c8b7cc9c0 100644
--- a/src/windows/game_bottom_toolbar.c
+++ b/src/windows/game_bottom_toolbar.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../input.h"
diff --git a/src/windows/land.c b/src/windows/land.c
index 07a5c31c08..e8c83029ed 100644
--- a/src/windows/land.c
+++ b/src/windows/land.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../input.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c
index 2cfcec11dd..035802025a 100644
--- a/src/windows/loadsave.c
+++ b/src/windows/loadsave.c
@@ -15,7 +15,6 @@
 #pragma endregion
 
 #include <time.h>
-#include "../addresses.h"
 #include "../config.h"
 #include "../editor.h"
 #include "../game.h"
diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c
index 0bd5022aba..790893060b 100644
--- a/src/windows/mapgen.c
+++ b/src/windows/mapgen.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../input.h"
 #include "../interface/widget.h"
diff --git a/src/windows/maze_construction.c b/src/windows/maze_construction.c
index dcdc3d9d4e..c24344c013 100644
--- a/src/windows/maze_construction.c
+++ b/src/windows/maze_construction.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../drawing/drawing.h"
 #include "../game.h"
diff --git a/src/windows/music_credits.c b/src/windows/music_credits.c
index f00dcfa3de..8c8c410c50 100644
--- a/src/windows/music_credits.c
+++ b/src/windows/music_credits.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"
 #include "../interface/widget.h"
diff --git a/src/windows/new_campaign.c b/src/windows/new_campaign.c
index a750178805..a7d1b6c9a6 100644
--- a/src/windows/new_campaign.c
+++ b/src/windows/new_campaign.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../localisation/localisation.h"
diff --git a/src/windows/news.c b/src/windows/news.c
index 1e47bfd406..ba0ba0d039 100644
--- a/src/windows/news.c
+++ b/src/windows/news.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../management/news_item.h"
 #include "../localisation/localisation.h"
diff --git a/src/windows/options.c b/src/windows/options.c
index d435de023f..e4de61ceac 100644
--- a/src/windows/options.c
+++ b/src/windows/options.c
@@ -22,7 +22,6 @@
  *      Padding between the widgets and the window needs reducing, an artifact from originally being inside group boxes.
  */
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"
 #include "../config.h"
diff --git a/src/windows/player.c b/src/windows/player.c
index 6103b4dab5..92d06e9dc0 100644
--- a/src/windows/player.c
+++ b/src/windows/player.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../input.h"
diff --git a/src/windows/publisher_credits.c b/src/windows/publisher_credits.c
index 228f9d8b1f..9caa31fb9a 100644
--- a/src/windows/publisher_credits.c
+++ b/src/windows/publisher_credits.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"
 #include "../interface/widget.h"
diff --git a/src/windows/research.c b/src/windows/research.c
index 519dcfa686..9ce7d4bdee 100644
--- a/src/windows/research.c
+++ b/src/windows/research.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../localisation/localisation.h"
 #include "../interface/widget.h"
diff --git a/src/windows/save_prompt.c b/src/windows/save_prompt.c
index 207aa89c97..59c71c7dd0 100644
--- a/src/windows/save_prompt.c
+++ b/src/windows/save_prompt.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../config.h"
 #include "../game.h"
diff --git a/src/windows/shortcut_keys.c b/src/windows/shortcut_keys.c
index e5ab221720..ad808bdb42 100644
--- a/src/windows/shortcut_keys.c
+++ b/src/windows/shortcut_keys.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../interface/window.h"
 #include "../interface/widget.h"
diff --git a/src/windows/sign.c b/src/windows/sign.c
index 30987a1b64..c57d62def3 100644
--- a/src/windows/sign.c
+++ b/src/windows/sign.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../config.h"
 #include "../localisation/localisation.h"
diff --git a/src/windows/staff_fire_prompt.c b/src/windows/staff_fire_prompt.c
index 28d5cce41f..e02bfd018c 100644
--- a/src/windows/staff_fire_prompt.c
+++ b/src/windows/staff_fire_prompt.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/windows/text_input.c b/src/windows/text_input.c
index d1bf4d93d5..e1618fed54 100644
--- a/src/windows/text_input.c
+++ b/src/windows/text_input.c
@@ -21,7 +21,6 @@
  * that is used for inputing new text for ride names and peep names.
  */
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../platform/platform.h"
 #include "../interface/window.h"
diff --git a/src/windows/themes.c b/src/windows/themes.c
index 58855d16d7..6d787f2e17 100644
--- a/src/windows/themes.c
+++ b/src/windows/themes.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../drawing/drawing.h"
diff --git a/src/windows/tile_inspector.c b/src/windows/tile_inspector.c
index efc6a12a2f..c486b01358 100644
--- a/src/windows/tile_inspector.c
+++ b/src/windows/tile_inspector.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../input.h"
 #include "../localisation/localisation.h"
 #include "../interface/themes.h"
diff --git a/src/windows/title_command_editor.c b/src/windows/title_command_editor.c
index 8f74c16417..b39ba9f0c0 100644
--- a/src/windows/title_command_editor.c
+++ b/src/windows/title_command_editor.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../input.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/windows/title_editor.c b/src/windows/title_editor.c
index 4b743ce3af..145c84b939 100644
--- a/src/windows/title_editor.c
+++ b/src/windows/title_editor.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../drawing/drawing.h"
diff --git a/src/windows/title_exit.c b/src/windows/title_exit.c
index 91a27f34d2..ed09619fa1 100644
--- a/src/windows/title_exit.c
+++ b/src/windows/title_exit.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../sprites.h"
diff --git a/src/windows/title_logo.c b/src/windows/title_logo.c
index e23e4c8995..c033b1996d 100644
--- a/src/windows/title_logo.c
+++ b/src/windows/title_logo.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"
 #include "../interface/widget.h"
diff --git a/src/windows/title_menu.c b/src/windows/title_menu.c
index cb83d49817..5e831d842f 100644
--- a/src/windows/title_menu.c
+++ b/src/windows/title_menu.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../editor.h"
 #include "../game.h"
diff --git a/src/windows/title_options.c b/src/windows/title_options.c
index f2f0dd7b81..7b42f89125 100644
--- a/src/windows/title_options.c
+++ b/src/windows/title_options.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../game.h"
 #include "../intro.h"
diff --git a/src/windows/track_manage.c b/src/windows/track_manage.c
index 592f0ad3ef..fb4467697d 100644
--- a/src/windows/track_manage.c
+++ b/src/windows/track_manage.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../interface/themes.h"
 #include "../interface/widget.h"
diff --git a/src/windows/viewport.c b/src/windows/viewport.c
index d988abc91f..6dfb877a13 100644
--- a/src/windows/viewport.c
+++ b/src/windows/viewport.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"
 #include "../world/map.h"
diff --git a/src/windows/water.c b/src/windows/water.c
index 4a7b345420..6659ad9896 100644
--- a/src/windows/water.c
+++ b/src/windows/water.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../input.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
diff --git a/src/world/banner.c b/src/world/banner.c
index e7e31679dd..8dac0254f0 100644
--- a/src/world/banner.c
+++ b/src/world/banner.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../addresses.h"
 #include "../game.h"
 #include "../localisation/localisation.h"
 #include "../ride/ride.h"
diff --git a/src/world/duck.c b/src/world/duck.c
index b7a2e2f364..20fe8da091 100644
--- a/src/world/duck.c
+++ b/src/world/duck.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"
 #include "../localisation/date.h"
diff --git a/src/world/footpath.c b/src/world/footpath.c
index ebbc2a2f82..3f6feed7dd 100644
--- a/src/world/footpath.c
+++ b/src/world/footpath.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../cheats.h"
 #include "../config.h"
 #include "../game.h"
diff --git a/src/world/map.h b/src/world/map.h
index f015269b5b..0008a7ff80 100644
--- a/src/world/map.h
+++ b/src/world/map.h
@@ -18,6 +18,9 @@
 #define _MAP_H_
 
 #include "../common.h"
+#ifndef NO_RCT2
+	#include "../addresses.h"
+#endif
 
 #pragma pack(push, 1)
 typedef struct rct_map_element_surface_properties {
diff --git a/src/world/map_animation.c b/src/world/map_animation.c
index 072f9ba677..d41b45ec0c 100644
--- a/src/world/map_animation.c
+++ b/src/world/map_animation.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
diff --git a/src/world/mapgen.c b/src/world/mapgen.c
index 9cfe25c232..f00075d8fd 100644
--- a/src/world/mapgen.c
+++ b/src/world/mapgen.c
@@ -15,7 +15,6 @@
 #pragma endregion
 
 #include <time.h>
-#include "../addresses.h"
 #include "../object.h"
 #include "../util/util.h"
 #include "map.h"
diff --git a/src/world/scenery.c b/src/world/scenery.c
index 58ebb72e45..648a7acc97 100644
--- a/src/world/scenery.c
+++ b/src/world/scenery.c
@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../game.h"
 #include "../common.h"
 #include "../localisation/localisation.h"