diff --git a/src/openrct2/ride/music_list.c b/src/openrct2/ride/MusicList.cpp
similarity index 97%
rename from src/openrct2/ride/music_list.c
rename to src/openrct2/ride/MusicList.cpp
index 4c3ca2057a..7323ab2700 100644
--- a/src/openrct2/ride/music_list.c
+++ b/src/openrct2/ride/MusicList.cpp
@@ -17,10 +17,11 @@
 #include "../audio/audio.h"
 #include "../common.h"
 #include "../Context.h"
-#include "music_list.h"
+#include "../core/Util.hpp"
+#include "MusicList.h"
 
 
-#define MAKE_TUNEID_LIST(...) (uint8[]){(countof(((uint8[]){__VA_ARGS__}))), __VA_ARGS__}
+#define MAKE_TUNEID_LIST(...) (uint8[]){(Util::CountOf(((uint8[]){__VA_ARGS__}))), __VA_ARGS__}
 
 // 0x009AEF28
 uint8 * gRideMusicStyleTuneIds[] =
diff --git a/src/openrct2/ride/music_list.h b/src/openrct2/ride/MusicList.h
similarity index 100%
rename from src/openrct2/ride/music_list.h
rename to src/openrct2/ride/MusicList.h
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 37b7960eb2..a77fd4c146 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -50,7 +50,7 @@
 #include "../world/Scenery.h"
 #include "../world/Sprite.h"
 #include "CableLift.h"
-#include "music_list.h"
+#include "MusicList.h"
 #include "Ride.h"
 #include "RideData.h"
 #include "RideGroupManager.h"