diff --git a/src/openrct2/ride/ride_data.c b/src/openrct2/ride/RideData.cpp
similarity index 99%
rename from src/openrct2/ride/ride_data.c
rename to src/openrct2/ride/RideData.cpp
index 97d21393bf..aaff4d9012 100644
--- a/src/openrct2/ride/ride_data.c
+++ b/src/openrct2/ride/RideData.cpp
@@ -1,4 +1,4 @@
-#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
+#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers
 /*****************************************************************************
  * OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
  *
@@ -24,13 +24,14 @@
  * https://gist.github.com/kevinburke/eaeb1d8149a6eef0dcc1
  */
 
-#include "../localisation/Localisation.h"
-#include "Ride.h"
-#include "ride_data.h"
-#include "Track.h"
 #include "../audio/audio.h"
-#include "../sprites.h"
+#include "../core/Util.hpp"
 #include "../interface/Colour.h"
+#include "../localisation/Localisation.h"
+#include "../sprites.h"
+#include "Ride.h"
+#include "Track.h"
+#include "ride_data.h"
 
 const bool hasRunningTrack[RIDE_TYPE_COUNT] = {
     true,   // 0 Spiral Roller coaster
@@ -2585,7 +2586,7 @@ const uint8 RideConstructionDefaultTrackType[] = {
     TRACK_ELEM_END_STATION,     // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
 };
 
-#define TRACK_COLOUR_PRESETS(...)       {countof(((track_colour[]){__VA_ARGS__})), {__VA_ARGS__}}
+#define TRACK_COLOUR_PRESETS(...)       {Util::CountOf(((track_colour[]){__VA_ARGS__})), {__VA_ARGS__}}
 
 #define DEFAULT_FLAT_RIDE_COLOUR_PRESET TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW } )
 #define DEFAULT_STALL_COLOUR_PRESET     TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED } )
diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt
index 8d2cacbf13..f05d47d1e0 100644
--- a/test/testpaint/CMakeLists.txt
+++ b/test/testpaint/CMakeLists.txt
@@ -54,7 +54,7 @@ endif ()
 
 set(OPENRCT2_SRCPATH "${ROOT_DIR}/src/openrct2")
 file(GLOB_RECURSE ORCT2_RIDE_SOURCES "${OPENRCT2_SRCPATH}/ride/*/*.cpp")
-file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c"
+file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/RideData.cpp"
                                          "${OPENRCT2_SRCPATH}/ride/TrackData.cpp"
                                          "${OPENRCT2_SRCPATH}/ride/TrackDataOld.cpp"
                                          "${OPENRCT2_SRCPATH}/ride/track_paint.c"