Change casing of header files

src/openrct2-ui/input/KeyboardShortcut.cpp

@@ -31,7 +31,7 @@
 #include <openrct2/network/network.h>
 #include <openrct2/platform/platform.h>
 #include <openrct2/ride/Track.h>
-#include <openrct2/ride/track_paint.h>
+#include <openrct2/ride/TrackPaint.h>
 #include <openrct2/title/TitleScreen.h>
 #include <openrct2/util/Util.h>
 #include <openrct2/windows/Intent.h>

src/openrct2-ui/input/MouseInput.cpp

@@ -32,7 +32,7 @@
 #include <openrct2/interface/Window.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/platform/platform.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/scenario/Scenario.h>
 #include <openrct2/world/Banner.h>
 #include <openrct2/world/Map.h>

src/openrct2-ui/windows/DebugPaint.cpp

@@ -21,7 +21,7 @@
     #include <openrct2/localisation/Localisation.h>
     #include <openrct2/paint/tile_element/TileElement.h>
     #include <openrct2/paint/Paint.h>
-    #include <openrct2/ride/track_paint.h>
+    #include <openrct2/ride/TrackPaint.h>
 
 enum WINDOW_DEBUG_PAINT_WIDGET_IDX
 {

src/openrct2-ui/windows/Finances.cpp

@@ -23,7 +23,7 @@
 #include <openrct2/interface/Widget.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Localisation.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/sprites.h>
 #include <openrct2-ui/interface/Dropdown.h>
 

src/openrct2-ui/windows/Guest.cpp

@@ -27,7 +27,7 @@
 #include <openrct2/network/network.h>
 #include <openrct2/peep/Peep.h>
 #include <openrct2/peep/Staff.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/sprites.h>
 #include <openrct2/util/Util.h>
 #include <openrct2/windows/Intent.h>

src/openrct2-ui/windows/NewCampaign.cpp

@@ -22,7 +22,7 @@
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/interface/Widget.h>
 #include <openrct2/ride/Ride.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2-ui/interface/Dropdown.h>
 
 #define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF)

src/openrct2-ui/windows/NewRide.cpp

@@ -33,7 +33,7 @@
 #include <openrct2/management/Research.h>
 #include <openrct2/object/ObjectLimits.h>
 #include <openrct2/rct1/RCT1.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/ride/TrackData.h>
 #include <openrct2/sprites.h>
 #include <openrct2/util/Util.h>

src/openrct2-ui/windows/Ride.cpp

@@ -39,7 +39,7 @@
 #include <openrct2/peep/Staff.h>
 #include <openrct2/rct1/RCT1.h>
 #include <openrct2/ride/RideGroupManager.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/ride/Track.h>
 #include <openrct2/ride/TrackData.h>
 #include <openrct2/sprites.h>

src/openrct2-ui/windows/RideConstruction.cpp

@@ -30,7 +30,7 @@
 #include <openrct2/network/network.h>
 #include <openrct2/ride/Ride.h>
 #include <openrct2/ride/RideGroupManager.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/ride/Track.h>
 #include <openrct2/ride/TrackData.h>
 #include <openrct2/sprites.h>

src/openrct2-ui/windows/TileInspector.cpp

@@ -25,7 +25,7 @@
 #include <openrct2/interface/Widget.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/localisation/StringIds.h>
-#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/RideData.h>
 #include <openrct2/ride/Track.h>
 #include <openrct2/sprites.h>
 #include <openrct2-ui/interface/Dropdown.h>

src/openrct2/EditorObjectSelectionSession.cpp

@@ -23,7 +23,7 @@
 #include "object/ObjectManager.h"
 #include "object/ObjectRepository.h"
 #include "OpenRCT2.h"
-#include "ride/ride_data.h"
+#include "ride/RideData.h"
 #include "windows/Intent.h"
 #include "windows/_legacy.h"
 #include "world/footpath.h"

src/openrct2/actions/RideCreateAction.hpp

@@ -26,7 +26,7 @@
 #include "../interface/Window.h"
 #include "../world/Park.h"
 #include "../rct1/RCT1.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../ride/Ride.h"
 #include "../ride/Station.h"
 

src/openrct2/interface/Console.cpp

@@ -41,7 +41,7 @@
 #include "../peep/Staff.h"
 #include "../platform/platform.h"
 #include "../ride/Ride.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../util/SawyerCoding.h"
 #include "../util/Util.h"
 #include "../Version.h"

src/openrct2/interface/Viewport.cpp

@@ -26,7 +26,7 @@
 #include "../paint/Paint.h"
 #include "../paint/Supports.h"
 #include "../peep/Staff.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../ride/TrackData.h"
 #include "../world/Banner.h"
 #include "../world/Climate.h"

src/openrct2/interface/ViewportInteraction.cpp

@@ -22,7 +22,7 @@
 #include "../localisation/Localisation.h"
 #include "../OpenRCT2.h"
 #include "../ride/Ride.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../ride/Track.h"
 #include "../scenario/Scenario.h"
 #include "../windows/Intent.h"

src/openrct2/management/Marketing.cpp

@@ -20,7 +20,7 @@
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../ride/Ride.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../Cheats.h"
 #include "Finance.h"
 #include "Marketing.h"

src/openrct2/management/Research.cpp

@@ -27,7 +27,7 @@
 #include "../scenario/Scenario.h"
 #include "../rct1/RCT1.h"
 #include "../ride/Ride.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../ride/RideGroupManager.h"
 #include "../ride/TrackData.h"
 #include "../world/scenery.h"

src/openrct2/paint/PaintHelpers.cpp

@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../interface/Viewport.h"
-#include "../ride/track_paint.h"
+#include "../ride/TrackPaint.h"
 #include "Paint.h"
 
 paint_struct * sub_98196C_rotated(

src/openrct2/paint/sprite/Sprite.cpp

@@ -18,9 +18,9 @@
 #include "../Paint.h"
 #include "../../drawing/Drawing.h"
 #include "../../world/sprite.h"
-#include "../../ride/ride_data.h"
+#include "../../ride/RideData.h"
 #include "../../interface/Viewport.h"
-#include "../../ride/vehicle_paint.h"
+#include "../../ride/VehiclePaint.h"
 
 /**
  * Paint Quadrant

src/openrct2/paint/tile_element/Entrance.cpp

@@ -18,7 +18,7 @@
 #include "../../Game.h"
 #include "../../interface/Viewport.h"
 #include "../../localisation/Localisation.h"
-#include "../../ride/ride_data.h"
+#include "../../ride/RideData.h"
 #include "../../world/Entrance.h"
 #include "../../world/footpath.h"
 #include "../Paint.h"

src/openrct2/paint/tile_element/Path.cpp

@@ -21,7 +21,7 @@
 #include "../../object/ObjectList.h"
 #include "../../peep/Staff.h"
 #include "../../ride/Track.h"
-#include "../../ride/track_paint.h"
+#include "../../ride/TrackPaint.h"
 #include "../../world/footpath.h"
 #include "../../world/scenery.h"
 #include "../Paint.h"

src/openrct2/paint/tile_element/TileElement.cpp

@@ -20,9 +20,9 @@
 #include "../../Game.h"
 #include "../../interface/Viewport.h"
 #include "../../localisation/Localisation.h"
-#include "../../ride/ride_data.h"
+#include "../../ride/RideData.h"
 #include "../../ride/TrackData.h"
-#include "../../ride/track_paint.h"
+#include "../../ride/TrackPaint.h"
 #include "../../world/sprite.h"
 #include "../../world/Banner.h"
 #include "../../world/Entrance.h"

src/openrct2/peep/Peep.cpp

@@ -35,7 +35,7 @@
 #include "../ride/Station.h"
 #include "../ride/Track.h"
 #include "../ride/Ride.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../scenario/Scenario.h"
 #include "../sprites.h"
 #include "../util/Util.h"

src/openrct2/rct1/S4Importer.cpp

@@ -48,7 +48,7 @@
 #include "../peep/Peep.h"
 #include "../peep/Staff.h"
 #include "RCT1.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../ride/Track.h"
 #include "../util/SawyerCoding.h"
 #include "../util/Util.h"

src/openrct2/ride/CableLift.cpp

@@ -21,8 +21,8 @@
 #include "CableLift.h"
 #include "Ride.h"
 #include "Track.h"
-#include "ride_data.h"
-#include "vehicle_data.h"
+#include "RideData.h"
+#include "VehicleData.h"
 
 static void cable_lift_update_moving_to_end_of_station(rct_vehicle * vehicle);
 static void cable_lift_update_waiting_to_depart(rct_vehicle * vehicle);

src/openrct2/ride/Ride.cpp

@@ -51,7 +51,7 @@
 #include "CableLift.h"
 #include "music_list.h"
 #include "Ride.h"
-#include "ride_data.h"
+#include "RideData.h"
 #include "RideGroupManager.h"
 #include "Station.h"
 #include "Track.h"

src/openrct2/ride/RideData.cpp

@@ -31,7 +31,7 @@
 #include "../sprites.h"
 #include "Ride.h"
 #include "Track.h"
-#include "ride_data.h"
+#include "RideData.h"
 
 // clang-format off
 const bool hasRunningTrack[RIDE_TYPE_COUNT] = {

src/openrct2/ride/RideGroupManager.cpp

@@ -23,7 +23,7 @@
 #include "../localisation/StringIds.h"
 #include "../management/Research.h"
 #include "Ride.h"
-#include "ride_data.h"
+#include "RideData.h"
 #include "Track.h"
 #include "TrackData.h"
 

src/openrct2/ride/RideGroupManager.h

@@ -23,7 +23,7 @@ extern "C"
 {
 #endif
     #include "../common.h"
-    #include "ride_data.h"
+    #include "RideData.h"
 #ifdef __cplusplus
 }
 #endif

src/openrct2/ride/Track.cpp

@@ -32,7 +32,7 @@
 #include "../world/Park.h"
 #include "../world/scenery.h"
 #include "Ride.h"
-#include "ride_data.h"
+#include "RideData.h"
 #include "ride_ratings.h"
 #include "RideGroupManager.h"
 #include "Station.h"

src/openrct2/ride/TrackData.cpp

@@ -17,7 +17,7 @@
 #include "../core/Util.hpp"
 #include "Track.h"
 #include "TrackData.h"
-#include "track_paint.h"
+#include "TrackPaint.h"
 
 // clang-format off
 const rct_track_coordinates FlatTrackCoordinates[] = {

src/openrct2/ride/TrackData.h

@@ -18,7 +18,7 @@
 
 #include "../common.h"
 #include "Track.h"
-#include "track_paint.h"
+#include "TrackPaint.h"
 
 #ifdef __cplusplus
 extern "C" {

src/openrct2/ride/TrackDesign.cpp

@@ -36,7 +36,7 @@
 #include "../world/scenery.h"
 #include "../world/SmallScenery.h"
 #include "Ride.h"
-#include "ride_data.h"
+#include "RideData.h"
 #include "Track.h"
 #include "TrackData.h"
 #include "TrackDesign.h"

src/openrct2/ride/TrackPaint.cpp

@@ -26,8 +26,8 @@
 #include "../world/Map.h"
 #include "../world/sprite.h"
 #include "TrackData.h"
-#include "ride_data.h"
-#include "track_paint.h"
+#include "RideData.h"
+#include "TrackPaint.h"
 
 // clang-format off
 /* rct2: 0x007667AC */

src/openrct2/ride/TrackPaint.h

@@ -17,7 +17,7 @@
 #ifndef _TRACK_PAINT_H
 #define _TRACK_PAINT_H
 
-#include "ride_data.h"
+#include "RideData.h"
 #include "../common.h"
 #include "../paint/tile_element/TileElement.h"
 #include "../paint/Paint.h"

src/openrct2/ride/Vehicle.cpp

@@ -38,11 +38,11 @@
 #include "Vehicle.h"
 #include "CableLift.h"
 #include "Ride.h"
-#include "ride_data.h"
+#include "RideData.h"
 #include "Station.h"
 #include "Track.h"
 #include "TrackData.h"
-#include "vehicle_data.h"
+#include "VehicleData.h"
 
 static void vehicle_update(rct_vehicle * vehicle);
 

src/openrct2/ride/VehicleData.cpp

@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../core/Util.hpp"
-#include "vehicle_data.h"
+#include "VehicleData.h"
 
 // clang-format off
 /** rct2: 0x0099F100 */

src/openrct2/ride/VehiclePaint.cpp

@@ -20,10 +20,10 @@
 #include "../drawing/LightFX.h"
 #include "../interface/Viewport.h"
 #include "../paint/Paint.h"
-#include "../ride/ride_data.h"
+#include "../ride/RideData.h"
 #include "../world/sprite.h"
 #include "Track.h"
-#include "vehicle_paint.h"
+#include "VehiclePaint.h"
 
 // clang-format off
 // 0x0098E52C:

src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/coaster/BobsleighCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x006FE5B4 */
 static void bobsleigh_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/BolligerMabillardTrack.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 #include "BolligerMabillardTrack.h"
 
 void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/CompactInvertedCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008AE6E0 */
 static void compact_inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A7AF8 */
 static void corkscrew_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/FlyingRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x007C6FF4 */
 static void flying_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,

src/openrct2/ride/coaster/GigaCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008AD674 */
 static void giga_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,

src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x0087694C */
 static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x00890CB4 */
 static void inverted_hairpin_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008B0460 */
 static void inverted_impulse_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/InvertedRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A92E8 */
 static void inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/JuniorRollerCoaster.cpp

@@ -24,9 +24,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 #include "JuniorRollerCoaster.h"
 
 enum

src/openrct2/ride/coaster/LayDownRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x0082491C */
 static void lay_down_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */
 static void lim_launched_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/LoopingRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 #define LOOPING_RC_BOOSTER_NE_SW (SPR_CSG_BEGIN + 55679)
 #define LOOPING_RC_BOOSTER_NW_SE (SPR_CSG_BEGIN + 55680)

src/openrct2/ride/coaster/MineRide.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008B08D0 */
 static void mine_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,

src/openrct2/ride/coaster/MineTrainCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x0071BFA4 */
 static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/MiniRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A4ABC */
 static void mini_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,

src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008AFE9C */
 static void mini_suspended_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x00792D88 */
 static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/coaster/ReverserRollerCoaster.cpp

@@ -22,10 +22,10 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 #ifndef NO_VEHICLES
 /**

src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x0077839C */
 static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/StandUpRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A7114 */
 static void stand_up_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/Steeplechase.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A59A8 */
 static void steeplechase_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A8958 */
 static void suspended_swinging_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/coaster/TwisterRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 #include "BolligerMabillardTrack.h"
 
 /** rct2: 0x008AB6A4 */

src/openrct2/ride/coaster/VirginiaReel.cpp

@@ -20,8 +20,8 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 // 0x009927E6:
 static const vehicle_boundbox _virginiaReelBoundbox[] = {

src/openrct2/ride/coaster/WildMouse.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/coaster/WoodenRollerCoaster.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 typedef struct sprite_bb_2
 {

src/openrct2/ride/coaster/WoodenWildMouse.cpp

@@ -22,9 +22,9 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../../world/sprite.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/gentle/CarRide.cpp

@@ -19,10 +19,10 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/gentle/CircusShow.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /**
  * rct2: 0x0077084A

src/openrct2/ride/gentle/CrookedHouse.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 typedef struct rct_crooked_house_bound_box
 {

src/openrct2/ride/gentle/Dodgems.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/gentle/FerrisWheel.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 static const uint8 edges_1x4_ne_sw[] = {
     EDGE_NW | EDGE_SE,

src/openrct2/ride/gentle/FlyingSaucers.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/gentle/GhostTrain.cpp

@@ -18,10 +18,10 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/gentle/HauntedHouse.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 typedef struct haunted_house_bound_box
 {

src/openrct2/ride/gentle/Maze.cpp

@@ -21,7 +21,7 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/gentle/MerryGoRound.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x0142805C */
 static const uint32 merry_go_round_rider_offsets[] = { 0, 32, 64, 96, 16, 48, 80, 112 };

src/openrct2/ride/gentle/MiniGolf.cpp

@@ -20,10 +20,10 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../TrackData.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/gentle/MiniHelicopters.cpp

@@ -18,10 +18,10 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
-#include "../ride_data.h"
+#include "../RideData.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 /** rct2: 0x */
 static void paint_mini_helicopters_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,

src/openrct2/ride/gentle/MonorailCycles.cpp

@@ -20,8 +20,8 @@
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/gentle/ObservationTower.cpp

@@ -20,8 +20,8 @@
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/gentle/SpaceRings.cpp

@@ -19,7 +19,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/gentle/SpiralSlide.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/ride_ratings.c

@@ -21,7 +21,7 @@
 #include "../world/footpath.h"
 #include "../world/Map.h"
 #include "Ride.h"
-#include "ride_data.h"
+#include "RideData.h"
 #include "ride_ratings.h"
 #include "Station.h"
 #include "Track.h"

src/openrct2/ride/shops/Facility.cpp

@@ -20,7 +20,7 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /**
  *

src/openrct2/ride/shops/Shop.cpp

@@ -20,7 +20,7 @@
 #include "../../sprites.h"
 #include "../../world/Map.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /**
  *

src/openrct2/ride/thrill/3dCinema.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /**
  * rct2: 0x007664C2

src/openrct2/ride/thrill/Enterprise.cpp

@@ -19,7 +19,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x008A2ABC */
 static void paint_enterprise_structure(paint_session * session, Ride * ride, sint8 xOffset, sint8 yOffset, uint16 height,

src/openrct2/ride/thrill/GoKarts.cpp

@@ -20,8 +20,8 @@
 #include "../../paint/Supports.h"
 #include "../../world/Map.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/thrill/LaunchedFreefall.cpp

@@ -21,8 +21,8 @@
 #include "../../paint/Supports.h"
 #include "../../world/sprite.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/thrill/MagicCarpet.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/thrill/MotionSimulator.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 enum
 {

src/openrct2/ride/thrill/PirateShip.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 // 1 2 0 3 4
 static const uint8 track_map_1x5[][5] = {

src/openrct2/ride/thrill/RotoDrop.cpp

@@ -19,8 +19,8 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
-#include "../vehicle_paint.h"
+#include "../TrackPaint.h"
+#include "../VehiclePaint.h"
 
 enum
 {

src/openrct2/ride/thrill/SwingingInverterShip.cpp

@@ -18,7 +18,7 @@
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../Track.h"
-#include "../track_paint.h"
+#include "../TrackPaint.h"
 
 /** rct2: 0x01428010 */
 static const uint32 swinging_inverter_ship_base_sprite_offset[] = { 0, 16, 0, 16 };