diff --git a/openrct2.vcxproj b/openrct2.vcxproj
index 2dbd7bb69f..db48dcb07b 100644
--- a/openrct2.vcxproj
+++ b/openrct2.vcxproj
@@ -88,7 +88,7 @@
     <None Include="openrct2.exe" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\addresses.c" />
+    <ClCompile Include="src\rct2\addresses.c" />
     <ClCompile Include="src\audio\audio.c" />
     <ClCompile Include="src\audio\mixer.cpp" />
     <ClCompile Include="src\cheats.c" />
@@ -140,7 +140,7 @@
     <ClCompile Include="src\drawing\string.c" />
     <ClCompile Include="src\editor.c" />
     <ClCompile Include="src\game.c" />
-    <ClCompile Include="src\hook.c" />
+    <ClCompile Include="src\rct2\hook.c" />
     <ClCompile Include="src\image_io.c" />
     <ClCompile Include="src\input.c" />
     <ClCompile Include="src\interface\chat.c" />
@@ -422,7 +422,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resources\resource.h" />
-    <ClInclude Include="src\addresses.h" />
+    <ClInclude Include="src\rct2\addresses.h" />
     <ClInclude Include="src\audio\audio.h" />
     <ClInclude Include="src\audio\mixer.h" />
     <ClInclude Include="src\cheats.h" />
@@ -476,7 +476,7 @@
     <ClInclude Include="src\drawing\lightfx.h" />
     <ClInclude Include="src\editor.h" />
     <ClInclude Include="src\game.h" />
-    <ClInclude Include="src\hook.h" />
+    <ClInclude Include="src\rct2\hook.h" />
     <ClInclude Include="src\image_io.h" />
     <ClInclude Include="src\input.h" />
     <ClInclude Include="src\interface\chat.h" />
diff --git a/openrct2.vcxproj.user b/openrct2.vcxproj.user
index b782b153c4..47c2861aaf 100644
--- a/openrct2.vcxproj.user
+++ b/openrct2.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LocalDebuggerCommand>$(TargetDir)\openrct2.exe</LocalDebuggerCommand>
diff --git a/src/drawing/font.c b/src/drawing/font.c
index 529e5cc4bb..59321b9ddb 100644
--- a/src/drawing/font.c
+++ b/src/drawing/font.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"
 #include "drawing.h"
diff --git a/src/drawing/scrolling_text.c b/src/drawing/scrolling_text.c
index df8d2e0a98..0840cc08ae 100644
--- a/src/drawing/scrolling_text.c
+++ b/src/drawing/scrolling_text.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../config.h"
 #include "../interface/colour.h"
 #include "../localisation/localisation.h"
diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c
index 75ac2f2c5f..136256090b 100644
--- a/src/drawing/sprite.c
+++ b/src/drawing/sprite.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../common.h"
 #include "../OpenRCT2.h"
 #include "../sprites.h"
diff --git a/src/editor.c b/src/editor.c
index a4d148fd96..04b136b623 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "addresses.h"
+#include "rct2/addresses.h"
 #include "audio/audio.h"
 #include "drawing/drawing.h"
 #include "editor.h"
diff --git a/src/game.h b/src/game.h
index d9da7e5fd3..02e7117638 100644
--- a/src/game.h
+++ b/src/game.h
@@ -17,7 +17,7 @@
 #ifndef _GAME_H_
 #define _GAME_H_
 
-#include "addresses.h"
+#include "rct2/addresses.h"
 #include "common.h"
 #include "platform/platform.h"
 #include "scenario/scenario.h"
diff --git a/src/object_list.h b/src/object_list.h
index 02ec640eba..ea44b2ce81 100644
--- a/src/object_list.h
+++ b/src/object_list.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "addresses.h"
+#include "rct2/addresses.h"
 #include "ride/ride.h"
 #include "world/banner.h"
 #include "world/entrance.h"
diff --git a/src/paint/map_element/map_element.h b/src/paint/map_element/map_element.h
index e2e7580ec8..c9ab63c37d 100644
--- a/src/paint/map_element/map_element.h
+++ b/src/paint/map_element/map_element.h
@@ -17,7 +17,7 @@
 #ifndef _PAINT_MAP_ELEMENT_H
 #define _PAINT_MAP_ELEMENT_H
 
-#include "../../addresses.h"
+#include "../../rct2/addresses.h"
 #include "../../common.h"
 #include "../../world/map.h"
 
diff --git a/src/paint/paint.h b/src/paint/paint.h
index 4b2f916fad..0ff5d71246 100644
--- a/src/paint/paint.h
+++ b/src/paint/paint.h
@@ -17,7 +17,7 @@
 #ifndef _PAINT_H
 #define _PAINT_H
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../common.h"
 #include "../world/map.h"
 #include "../interface/colour.h"
diff --git a/src/addresses.c b/src/rct2/addresses.c
similarity index 100%
rename from src/addresses.c
rename to src/rct2/addresses.c
diff --git a/src/addresses.h b/src/rct2/addresses.h
similarity index 99%
rename from src/addresses.h
rename to src/rct2/addresses.h
index 52e065d459..10b57cb1be 100644
--- a/src/addresses.h
+++ b/src/rct2/addresses.h
@@ -19,7 +19,7 @@
 
 #ifndef NO_RCT2
 
-#include "common.h"
+#include "../common.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4731)
diff --git a/src/hook.c b/src/rct2/hook.c
similarity index 99%
rename from src/hook.c
rename to src/rct2/hook.c
index 8c1f664c4a..35c10d6526 100644
--- a/src/hook.c
+++ b/src/rct2/hook.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "common.h"
+#include "../common.h"
 
 #ifndef NO_RCT2
 
@@ -24,8 +24,8 @@
 	#include <sys/mman.h>
 #endif // __WINDOWS__
 
+#include "../platform/platform.h"
 #include "hook.h"
-#include "platform/platform.h"
 
 void* _hookTableAddress = 0;
 int _hookTableOffset = 0;
diff --git a/src/hook.h b/src/rct2/hook.h
similarity index 97%
rename from src/hook.h
rename to src/rct2/hook.h
index d4cee25f61..89e54955ea 100644
--- a/src/hook.h
+++ b/src/rct2/hook.h
@@ -19,7 +19,7 @@
 
 #ifndef NO_RCT2
 
-#include "common.h"
+#include "../common.h"
 
 enum {
 	X86_FLAG_CARRY = 1 << 0,
diff --git a/src/rct2/interop.c b/src/rct2/interop.c
index 792069186c..a653469090 100644
--- a/src/rct2/interop.c
+++ b/src/rct2/interop.c
@@ -30,11 +30,11 @@
 	#include <unistd.h>
 #endif // defined(__unix__) || defined(__MACOSX__)
 
-#include "../addresses.h"
-#include "../hook.h"
 #include "../OpenRCT2.h"
 #include "../util/sawyercoding.h"
 #include "../util/util.h"
+#include "addresses.h"
+#include "hook.h"
 #include "interop.h"
 
 #if defined(USE_MMAP) && (defined(__unix__) || defined(__MACOSX__)) && !defined(NO_RCT2)
diff --git a/src/ride/ride.c b/src/ride/ride.c
index 5c1d87ab90..c9e0620e99 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"
 #include "../cheats.h"
diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h
index fa73ae5d63..5914f56c35 100644
--- a/src/ride/track_paint.h
+++ b/src/ride/track_paint.h
@@ -17,7 +17,7 @@
 #ifndef _TRACK_PAINT_H
 #define _TRACK_PAINT_H
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "ride_data.h"
 #include "../common.h"
 #include "../paint/map_element/map_element.h"
diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c
index ab5c4e1843..a3ddc0da9f 100644
--- a/src/ride/vehicle.c
+++ b/src/ride/vehicle.c
@@ -19,7 +19,7 @@
 #include "../audio/mixer.h"
 #include "../config.h"
 #include "../editor.h"
-#include "../hook.h"
+#include "../rct2/hook.h"
 #include "../interface/viewport.h"
 #include "../localisation/localisation.h"
 #include "../OpenRCT2.h"
diff --git a/src/scenario/scenario.h b/src/scenario/scenario.h
index 47adf01016..f165f45f59 100644
--- a/src/scenario/scenario.h
+++ b/src/scenario/scenario.h
@@ -17,7 +17,7 @@
 #ifndef _SCENARIO_H_
 #define _SCENARIO_H_
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../common.h"
 #include "../management/award.h"
 #include "../management/finance.h"
diff --git a/src/world/map.c b/src/world/map.c
index 4ff7a54e28..348cca235a 100644
--- a/src/world/map.c
+++ b/src/world/map.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../audio/audio.h"
 #include "../cheats.h"
 #include "../config.h"
diff --git a/src/world/sprite.c b/src/world/sprite.c
index 570c95d021..25ce79e0b2 100644
--- a/src/world/sprite.c
+++ b/src/world/sprite.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
+#include "../rct2/addresses.h"
 #include "../audio/audio.h"
 #include "../cheats.h"
 #include "../game.h"
diff --git a/test/testpaint/PaintIntercept.cpp b/test/testpaint/PaintIntercept.cpp
index 1f0aebbb18..89c744156d 100644
--- a/test/testpaint/PaintIntercept.cpp
+++ b/test/testpaint/PaintIntercept.cpp
@@ -19,7 +19,7 @@
 
 extern "C" {
 #include "../../src/common.h"
-#include "../../src/hook.h"
+#include "../../src/rct2/hook.h"
 #include "../../src/interface/viewport.h"
 #include "../../src/paint/supports.h"
 }
diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp
index a5a74ce3b0..6dcdd738a0 100644
--- a/test/testpaint/TestPaint.cpp
+++ b/test/testpaint/TestPaint.cpp
@@ -28,7 +28,7 @@ extern "C" {
     #include "../../src/paint/supports.h"
     #include "../../src/ride/track_data.h"
     #include "../../src/interface/viewport.h"
-    #include "../../src/hook.h"
+    #include "../../src/rct2/hook.h"
 }
 
 namespace TestPaint
diff --git a/test/testpaint/testpaint.vcxproj b/test/testpaint/testpaint.vcxproj
index c0191e40cf..68d2d584af 100644
--- a/test/testpaint/testpaint.vcxproj
+++ b/test/testpaint/testpaint.vcxproj
@@ -93,10 +93,10 @@
     <ClCompile Include="TestTrack.cpp" />
     <ClCompile Include="Utils.cpp" />
     <ClCompile Include="VerticalTunnelCall.cpp" />
-    <ClCompile Include="..\..\src\addresses.c" />
     <ClCompile Include="..\..\src\diagnostic.c" />
-    <ClCompile Include="..\..\src\hook.c" />
     <ClCompile Include="..\..\src\paint\map_element\map_element.c" />
+    <ClCompile Include="..\..\src\rct2\addresses.c" />
+    <ClCompile Include="..\..\src\rct2\hook.c" />
     <ClCompile Include="..\..\src\ride\coaster\air_powered_vertical_coaster.c" />
     <ClCompile Include="..\..\src\ride\coaster\bobsleigh_coaster.c" />
     <ClCompile Include="..\..\src\ride\coaster\compact_inverted_coaster.c" />