diff --git a/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp
index d22aff5ffd..fe258ebbfe 100644
--- a/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp
+++ b/src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp
@@ -29,6 +29,7 @@ extern "C"
     #include "../../interface/viewport.h"
     #include "../../interface/window.h"
     #include "../../intro.h"
+    #include "../../platform/platform.h"
     #include "../../rct2.h"
     #include "../drawing.h"
     #include "../lightfx.h"
diff --git a/src/openrct2/game.h b/src/openrct2/game.h
index 85af48415f..d58b282484 100644
--- a/src/openrct2/game.h
+++ b/src/openrct2/game.h
@@ -19,7 +19,6 @@
 
 #include "rct2/addresses.h"
 #include "common.h"
-#include "platform/platform.h"
 #include "scenario/scenario.h"
 
 enum GAME_COMMAND {
diff --git a/src/openrct2/windows/editor_object_selection.c b/src/openrct2/windows/editor_object_selection.c
index cc7c302c54..43da0d524b 100644
--- a/src/openrct2/windows/editor_object_selection.c
+++ b/src/openrct2/windows/editor_object_selection.c
@@ -29,6 +29,7 @@
 #include "../object_list.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
+#include "../platform/platform.h"
 #include "../rct1.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
diff --git a/src/openrct2/windows/map.c b/src/openrct2/windows/map.c
index 607f991443..e47dfc47b6 100644
--- a/src/openrct2/windows/map.c
+++ b/src/openrct2/windows/map.c
@@ -1696,8 +1696,8 @@ static void map_window_set_pixels(rct_window *w)
 				colour = map_window_get_pixel_colour_ride(x, y);
 				break;
 			}
-			destination[0] = HIBYTE(colour);
-			destination[1] = LOBYTE(colour);
+			destination[0] = (colour >> 8) & 0xFF;
+			destination[1] = colour;
 		}
 		x += dx;
 		y += dy;