diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp
index 9406c5e713..d784e6fe6a 100644
--- a/src/openrct2-ui/UiContext.cpp
+++ b/src/openrct2-ui/UiContext.cpp
@@ -887,10 +887,10 @@ private:
     }
 
     static void DrawWeatherWindow(
-        DrawPixelInfo* dpi, IWeatherDrawer* weatherDrawer, rct_window* original_w, int16_t left, int16_t right, int16_t top,
+        DrawPixelInfo* dpi, IWeatherDrawer* weatherDrawer, WindowBase* original_w, int16_t left, int16_t right, int16_t top,
         int16_t bottom, DrawWeatherFunc drawFunc)
     {
-        rct_window* w{};
+        WindowBase* w{};
         auto itStart = WindowGetIterator(original_w);
         for (auto it = std::next(itStart);; it++)
         {
diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp
index a825ca342c..087f9e2c05 100644
--- a/src/openrct2-ui/WindowManager.cpp
+++ b/src/openrct2-ui/WindowManager.cpp
@@ -38,7 +38,7 @@ public:
         WindowNewRideInitVars();
     }
 
-    rct_window* OpenWindow(WindowClass wc) override
+    WindowBase* OpenWindow(WindowClass wc) override
     {
         switch (wc)
         {
@@ -144,7 +144,7 @@ public:
         }
     }
 
-    rct_window* OpenView(uint8_t view) override
+    WindowBase* OpenView(uint8_t view) override
     {
         switch (view)
         {
@@ -183,7 +183,7 @@ public:
         }
     }
 
-    rct_window* OpenDetails(uint8_t type, int32_t id) override
+    WindowBase* OpenDetails(uint8_t type, int32_t id) override
     {
         switch (type)
         {
@@ -207,17 +207,17 @@ public:
         }
     }
 
-    rct_window* ShowError(StringId title, StringId message, const Formatter& args) override
+    WindowBase* ShowError(StringId title, StringId message, const Formatter& args) override
     {
         return WindowErrorOpen(title, message, args);
     }
 
-    rct_window* ShowError(std::string_view title, std::string_view message) override
+    WindowBase* ShowError(std::string_view title, std::string_view message) override
     {
         return WindowErrorOpen(title, message);
     }
 
-    rct_window* OpenIntent(Intent* intent) override
+    WindowBase* OpenIntent(Intent* intent) override
     {
         switch (intent->GetWindowClass())
         {
@@ -516,7 +516,7 @@ public:
             {
                 uint8_t bannerIndex = static_cast<uint8_t>(intent.GetUIntExtra(INTENT_EXTRA_BANNER_INDEX));
 
-                rct_window* w = WindowFindByNumber(WindowClass::Banner, bannerIndex);
+                WindowBase* w = WindowFindByNumber(WindowClass::Banner, bannerIndex);
                 if (w != nullptr)
                 {
                     w->Invalidate();
@@ -620,7 +620,7 @@ public:
         WindowAllWheelInput();
     }
 
-    rct_window* GetOwner(const rct_viewport* viewport) override
+    WindowBase* GetOwner(const Viewport* viewport) override
     {
         for (auto& w : g_window_list)
         {
diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp
index 4387e66b3b..1e6dfe700d 100644
--- a/src/openrct2-ui/input/MouseInput.cpp
+++ b/src/openrct2-ui/input/MouseInput.cpp
@@ -62,7 +62,7 @@ ScreenCoordsXY gTooltipCursor;
 static int16_t _clickRepeatTicks;
 
 static MouseState GameGetNextInput(ScreenCoordsXY& screenCoords);
-static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex);
+static void InputWidgetOver(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex);
 static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber windowNumber, WidgetIndex widgetIndex);
 static void InputWidgetOverFlatbuttonInvalidate();
 void ProcessMouseOver(const ScreenCoordsXY& screenCoords);
@@ -71,29 +71,29 @@ void InvalidateScroll();
 static RCTMouseData* GetMouseInput();
 void TileElementRightClick(int32_t type, TileElement* tileElement, const ScreenCoordsXY& screenCoords);
 static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState state);
-static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex);
+static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex);
 void InputStateWidgetPressed(
-    const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, rct_window* w, Widget* widget);
+    const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, WindowBase* w, Widget* widget);
 void SetCursor(CursorID cursor_id);
 static void InputWindowPositionContinue(
-    rct_window& w, const ScreenCoordsXY& lastScreenCoords, const ScreenCoordsXY& newScreenCoords);
-static void InputWindowPositionEnd(rct_window& w, const ScreenCoordsXY& screenCoords);
-static void InputWindowResizeBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void InputWindowResizeContinue(rct_window& w, const ScreenCoordsXY& screenCoords);
+    WindowBase& w, const ScreenCoordsXY& lastScreenCoords, const ScreenCoordsXY& newScreenCoords);
+static void InputWindowPositionEnd(WindowBase& w, const ScreenCoordsXY& screenCoords);
+static void InputWindowResizeBegin(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void InputWindowResizeContinue(WindowBase& w, const ScreenCoordsXY& screenCoords);
 static void InputWindowResizeEnd();
-static void InputViewportDragBegin(rct_window& w);
+static void InputViewportDragBegin(WindowBase& w);
 static void InputViewportDragContinue();
 static void InputViewportDragEnd();
-static void InputScrollBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void InputScrollContinue(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void InputScrollBegin(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void InputScrollContinue(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
 static void InputScrollEnd();
-static void InputScrollPartUpdateHThumb(rct_window& w, WidgetIndex widgetIndex, int32_t x, int32_t scroll_id);
-static void InputScrollPartUpdateHLeft(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
-static void InputScrollPartUpdateHRight(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
-static void InputScrollPartUpdateVThumb(rct_window& w, WidgetIndex widgetIndex, int32_t y, int32_t scroll_id);
-static void InputScrollPartUpdateVTop(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
-static void InputScrollPartUpdateVBottom(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id);
-static void InputUpdateTooltip(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void InputScrollPartUpdateHThumb(WindowBase& w, WidgetIndex widgetIndex, int32_t x, int32_t scroll_id);
+static void InputScrollPartUpdateHLeft(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id);
+static void InputScrollPartUpdateHRight(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id);
+static void InputScrollPartUpdateVThumb(WindowBase& w, WidgetIndex widgetIndex, int32_t y, int32_t scroll_id);
+static void InputScrollPartUpdateVTop(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id);
+static void InputScrollPartUpdateVBottom(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id);
+static void InputUpdateTooltip(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
 
 #pragma region Mouse input
 
@@ -103,7 +103,7 @@ static void InputUpdateTooltip(rct_window* w, WidgetIndex widgetIndex, const Scr
  */
 void GameHandleInput()
 {
-    WindowVisitEach([](rct_window* w) { WindowEventPeriodicUpdateCall(w); });
+    WindowVisitEach([](WindowBase* w) { WindowEventPeriodicUpdateCall(w); });
 
     InvalidateAllWindowsAfterInput();
 
@@ -171,7 +171,7 @@ static RCTMouseData* GetMouseInput()
  *
  *  rct2: 0x006E957F
  */
-static void InputScrollDragBegin(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex)
+static void InputScrollDragBegin(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex)
 {
     _inputState = InputState::ScrollRight;
     gInputDragLast = screenCoords;
@@ -188,7 +188,7 @@ static void InputScrollDragBegin(const ScreenCoordsXY& screenCoords, rct_window*
  * Based on (heavily changed)
  *  rct2: 0x006E9E0E,  0x006E9ED0
  */
-static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, rct_window* w)
+static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, WindowBase* w)
 {
     WidgetIndex widgetIndex = _dragWidget.widget_index;
     uint8_t scrollIndex = _dragScrollIndex;
@@ -231,7 +231,7 @@ static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, rct_wind
  */
 static void InputScrollRight(const ScreenCoordsXY& screenCoords, MouseState state)
 {
-    rct_window* w = WindowFindByNumber(_dragWidget.window_classification, _dragWidget.window_number);
+    WindowBase* w = WindowFindByNumber(_dragWidget.window_classification, _dragWidget.window_number);
     if (w == nullptr)
     {
         ContextShowCursor();
@@ -267,7 +267,7 @@ static void InputScrollRight(const ScreenCoordsXY& screenCoords, MouseState stat
  */
 static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState state)
 {
-    rct_window* w;
+    WindowBase* w;
     Widget* widget;
     WidgetIndex widgetIndex;
 
@@ -459,7 +459,7 @@ static void GameHandleInputMouse(const ScreenCoordsXY& screenCoords, MouseState
 
 #pragma region Window positioning / resizing
 
-void InputWindowPositionBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+void InputWindowPositionBegin(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     _inputState = InputState::PositioningWindow;
     gInputDragLast = screenCoords - w.windowPos;
@@ -469,7 +469,7 @@ void InputWindowPositionBegin(rct_window& w, WidgetIndex widgetIndex, const Scre
 }
 
 static void InputWindowPositionContinue(
-    rct_window& w, const ScreenCoordsXY& lastScreenCoords, const ScreenCoordsXY& newScreenCoords)
+    WindowBase& w, const ScreenCoordsXY& lastScreenCoords, const ScreenCoordsXY& newScreenCoords)
 {
     int32_t snapProximity;
 
@@ -477,7 +477,7 @@ static void InputWindowPositionContinue(
     WindowMoveAndSnap(w, newScreenCoords - lastScreenCoords, snapProximity);
 }
 
-static void InputWindowPositionEnd(rct_window& w, const ScreenCoordsXY& screenCoords)
+static void InputWindowPositionEnd(WindowBase& w, const ScreenCoordsXY& screenCoords)
 {
     _inputState = InputState::Normal;
     gTooltipTimeout = 0;
@@ -485,7 +485,7 @@ static void InputWindowPositionEnd(rct_window& w, const ScreenCoordsXY& screenCo
     WindowEventMovedCall(&w, screenCoords);
 }
 
-static void InputWindowResizeBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void InputWindowResizeBegin(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     _inputState = InputState::Resizing;
     gInputDragLast = screenCoords;
@@ -496,7 +496,7 @@ static void InputWindowResizeBegin(rct_window& w, WidgetIndex widgetIndex, const
     _originalWindowHeight = w.height;
 }
 
-static void InputWindowResizeContinue(rct_window& w, const ScreenCoordsXY& screenCoords)
+static void InputWindowResizeContinue(WindowBase& w, const ScreenCoordsXY& screenCoords)
 {
     if (screenCoords.y < static_cast<int32_t>(ContextGetHeight()) - 2)
     {
@@ -519,7 +519,7 @@ static void InputWindowResizeEnd()
 
 #pragma region Viewport dragging
 
-static void InputViewportDragBegin(rct_window& w)
+static void InputViewportDragBegin(WindowBase& w)
 {
     w.flags &= ~WF_SCROLLING_TO_LOCATION;
     _inputState = InputState::ViewportRight;
@@ -539,8 +539,8 @@ static void InputViewportDragBegin(rct_window& w)
 
 static void InputViewportDragContinue()
 {
-    rct_window* w;
-    rct_viewport* viewport;
+    WindowBase* w;
+    Viewport* viewport;
 
     auto newDragCoords = ContextGetCursorPosition();
     const CursorState* cursorState = ContextGetCursorState();
@@ -606,7 +606,7 @@ static void InputViewportDragEnd()
 
 #pragma region Scroll bars
 
-static void InputScrollBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void InputScrollBegin(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     const auto& widget = w.widgets[widgetIndex];
 
@@ -676,7 +676,7 @@ static void InputScrollBegin(rct_window& w, WidgetIndex widgetIndex, const Scree
     WindowInvalidateByNumber(w.classification, w.number);
 }
 
-static void InputScrollContinue(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void InputScrollContinue(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t scroll_part, scroll_id;
 
@@ -743,7 +743,7 @@ static void InputScrollEnd()
  *
  *  rct2: 0x006E98F2
  */
-static void InputScrollPartUpdateHThumb(rct_window& w, WidgetIndex widgetIndex, int32_t x, int32_t scroll_id)
+static void InputScrollPartUpdateHThumb(WindowBase& w, WidgetIndex widgetIndex, int32_t x, int32_t scroll_id)
 {
     const auto& widget = w.widgets[widgetIndex];
     auto& scroll = w.scrolls[scroll_id];
@@ -782,7 +782,7 @@ static void InputScrollPartUpdateHThumb(rct_window& w, WidgetIndex widgetIndex,
  *
  *  rct2: 0x006E99A9
  */
-static void InputScrollPartUpdateVThumb(rct_window& w, WidgetIndex widgetIndex, int32_t y, int32_t scroll_id)
+static void InputScrollPartUpdateVThumb(WindowBase& w, WidgetIndex widgetIndex, int32_t y, int32_t scroll_id)
 {
     const auto& widget = w.widgets[widgetIndex];
     auto& scroll = w.scrolls[scroll_id];
@@ -821,7 +821,7 @@ static void InputScrollPartUpdateVThumb(rct_window& w, WidgetIndex widgetIndex,
  *
  *  rct2: 0x006E9A60
  */
-static void InputScrollPartUpdateHLeft(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
+static void InputScrollPartUpdateHLeft(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id)
 {
     if (WindowFindByNumber(w.classification, w.number) != nullptr)
     {
@@ -838,7 +838,7 @@ static void InputScrollPartUpdateHLeft(rct_window& w, WidgetIndex widgetIndex, i
  *
  *  rct2: 0x006E9ABF
  */
-static void InputScrollPartUpdateHRight(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
+static void InputScrollPartUpdateHRight(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id)
 {
     const auto& widget = w.widgets[widgetIndex];
     if (WindowFindByNumber(w.classification, w.number) != nullptr)
@@ -864,7 +864,7 @@ static void InputScrollPartUpdateHRight(rct_window& w, WidgetIndex widgetIndex,
  *
  *  rct2: 0x006E9C37
  */
-static void InputScrollPartUpdateVTop(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
+static void InputScrollPartUpdateVTop(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id)
 {
     if (WindowFindByNumber(w.classification, w.number) != nullptr)
     {
@@ -881,7 +881,7 @@ static void InputScrollPartUpdateVTop(rct_window& w, WidgetIndex widgetIndex, in
  *
  *  rct2: 0x006E9C96
  */
-static void InputScrollPartUpdateVBottom(rct_window& w, WidgetIndex widgetIndex, int32_t scroll_id)
+static void InputScrollPartUpdateVBottom(WindowBase& w, WidgetIndex widgetIndex, int32_t scroll_id)
 {
     const auto& widget = w.widgets[widgetIndex];
     if (WindowFindByNumber(w.classification, w.number) != nullptr)
@@ -911,7 +911,7 @@ static void InputScrollPartUpdateVBottom(rct_window& w, WidgetIndex widgetIndex,
  *
  *  rct2: 0x006E9253
  */
-static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex)
+static void InputWidgetOver(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowClass windowClass = WindowClass::Null;
     rct_windownumber windowNumber = 0;
@@ -980,7 +980,7 @@ static void InputWidgetOverChangeCheck(WindowClass windowClass, rct_windownumber
  */
 static void InputWidgetOverFlatbuttonInvalidate()
 {
-    rct_window* w = WindowFindByNumber(gHoverWidget.window_classification, gHoverWidget.window_number);
+    WindowBase* w = WindowFindByNumber(gHoverWidget.window_classification, gHoverWidget.window_number);
     if (w != nullptr)
     {
         WindowEventInvalidateCall(w);
@@ -995,7 +995,7 @@ static void InputWidgetOverFlatbuttonInvalidate()
  *
  *  rct2: 0x006E95F9
  */
-static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, WidgetIndex widgetIndex)
+static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowClass windowClass = WindowClass::Null;
     rct_windownumber windowNumber = 0;
@@ -1103,7 +1103,7 @@ static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, W
  */
 void ProcessMouseOver(const ScreenCoordsXY& screenCoords)
 {
-    rct_window* window;
+    WindowBase* window;
 
     CursorID cursorId = CursorID::Arrow;
     auto ft = Formatter();
@@ -1186,7 +1186,7 @@ void ProcessMouseTool(const ScreenCoordsXY& screenCoords)
 {
     if (_inputFlags & INPUT_FLAG_TOOL_ACTIVE)
     {
-        rct_window* w = WindowFindByNumber(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number);
+        WindowBase* w = WindowFindByNumber(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number);
 
         if (w == nullptr)
             ToolCancel();
@@ -1200,7 +1200,7 @@ void ProcessMouseTool(const ScreenCoordsXY& screenCoords)
  *  rct2: 0x006E8DA7
  */
 void InputStateWidgetPressed(
-    const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, rct_window* w, Widget* widget)
+    const ScreenCoordsXY& screenCoords, MouseState state, WidgetIndex widgetIndex, WindowBase* w, Widget* widget)
 {
     WindowClass cursor_w_class;
     rct_windownumber cursor_w_number;
@@ -1208,7 +1208,7 @@ void InputStateWidgetPressed(
     cursor_w_number = gPressedWidget.window_number;
     WidgetIndex cursor_widgetIndex = gPressedWidget.widget_index;
 
-    rct_window* cursor_w = WindowFindByNumber(cursor_w_class, cursor_w_number);
+    WindowBase* cursor_w = WindowFindByNumber(cursor_w_class, cursor_w_number);
     if (cursor_w == nullptr)
     {
         _inputState = InputState::Reset;
@@ -1469,7 +1469,7 @@ void InputStateWidgetPressed(
     }
 }
 
-static void InputUpdateTooltip(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void InputUpdateTooltip(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (gTooltipWidget.window_classification == WindowClass::Null)
     {
@@ -1550,7 +1550,7 @@ void SetCursor(CursorID cursor_id)
  */
 void InvalidateScroll()
 {
-    rct_window* w = WindowFindByNumber(gPressedWidget.window_classification, gPressedWidget.window_number);
+    WindowBase* w = WindowFindByNumber(gPressedWidget.window_classification, gPressedWidget.window_number);
     if (w != nullptr)
     {
         // Reset to basic scroll
@@ -1581,7 +1581,7 @@ void StoreMouseInput(MouseState state, const ScreenCoordsXY& screenCoords)
 
 void GameHandleEdgeScroll()
 {
-    rct_window* mainWindow;
+    WindowBase* mainWindow;
     int32_t scrollX, scrollY;
 
     mainWindow = WindowGetMain();
@@ -1620,8 +1620,8 @@ bool InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER modifier)
 
 void InputScrollViewport(const ScreenCoordsXY& scrollScreenCoords)
 {
-    rct_window* mainWindow = WindowGetMain();
-    rct_viewport* viewport = mainWindow->viewport;
+    WindowBase* mainWindow = WindowGetMain();
+    Viewport* viewport = mainWindow->viewport;
 
     const int32_t speed = gConfigGeneral.EdgeScrollingSpeed;
 
diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp
index b678c36b15..f80d732942 100644
--- a/src/openrct2-ui/input/Shortcuts.cpp
+++ b/src/openrct2-ui/input/Shortcuts.cpp
@@ -84,7 +84,7 @@ static void ShortcutRotateConstructionObject()
         return;
 
     // Rotate scenery
-    rct_window* w = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* w = WindowFindByClass(WindowClass::Scenery);
     if (w != nullptr && !WidgetIsDisabled(*w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON)
         && w->widgets[WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type != WindowWidgetType::Empty)
     {
@@ -193,7 +193,7 @@ static void ShortcutAdjustLand()
     {
         if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)))
         {
-            rct_window* window = WindowFindByClass(WindowClass::TopToolbar);
+            WindowBase* window = WindowFindByClass(WindowClass::TopToolbar);
             if (window != nullptr)
             {
                 window->Invalidate();
@@ -212,7 +212,7 @@ static void ShortcutAdjustWater()
     {
         if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)))
         {
-            rct_window* window = WindowFindByClass(WindowClass::TopToolbar);
+            WindowBase* window = WindowFindByClass(WindowClass::TopToolbar);
             if (window != nullptr)
             {
                 window->Invalidate();
@@ -231,7 +231,7 @@ static void ShortcutBuildScenery()
     {
         if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)))
         {
-            rct_window* window = WindowFindByClass(WindowClass::TopToolbar);
+            WindowBase* window = WindowFindByClass(WindowClass::TopToolbar);
             if (window != nullptr)
             {
                 window->Invalidate();
@@ -250,7 +250,7 @@ static void ShortcutBuildPaths()
     {
         if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)))
         {
-            rct_window* window = WindowFindByClass(WindowClass::TopToolbar);
+            WindowBase* window = WindowFindByClass(WindowClass::TopToolbar);
             if (window != nullptr)
             {
                 window->Invalidate();
@@ -382,7 +382,7 @@ static void ShortcutOpenCheatWindow()
         return;
 
     // Check if window is already open
-    rct_window* window = WindowFindByClass(WindowClass::Cheats);
+    WindowBase* window = WindowFindByClass(WindowClass::Cheats);
     if (window != nullptr)
     {
         WindowClose(*window);
@@ -408,7 +408,7 @@ static void ShortcutClearScenery()
     {
         if (!(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)))
         {
-            rct_window* window = WindowFindByClass(WindowClass::TopToolbar);
+            WindowBase* window = WindowFindByClass(WindowClass::TopToolbar);
             if (window != nullptr)
             {
                 window->Invalidate();
@@ -450,10 +450,10 @@ static void ShortcutOpenSceneryPicker()
         || (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR && gEditorStep != EditorStep::LandscapeEditor))
         return;
 
-    rct_window* window_scenery = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* window_scenery = WindowFindByClass(WindowClass::Scenery);
     if (window_scenery == nullptr)
     {
-        rct_window* window_toolbar = WindowFindByClass(WindowClass::TopToolbar);
+        WindowBase* window_toolbar = WindowFindByClass(WindowClass::TopToolbar);
         if (window_toolbar != nullptr)
         {
             window_toolbar->Invalidate();
@@ -515,7 +515,7 @@ static void ShortcutToggleVisibility()
     if (windowTileInspectorSelectedIndex < 0)
         return;
 
-    rct_window* w = WindowFindByClass(WindowClass::TileInspector);
+    WindowBase* w = WindowFindByClass(WindowClass::TileInspector);
     if (w == nullptr)
         return;
 
@@ -530,7 +530,7 @@ static void ShortcutToggleVisibility()
 
 static void ShortcutIncreaseElementHeight()
 {
-    rct_window* w = WindowFindByClass(WindowClass::TileInspector);
+    WindowBase* w = WindowFindByClass(WindowClass::TileInspector);
     if (w != nullptr)
     {
         int action = -1;
@@ -571,7 +571,7 @@ static void ShortcutIncreaseElementHeight()
 
 static void ShortcutDecreaseElementHeight()
 {
-    rct_window* w = WindowFindByClass(WindowClass::TileInspector);
+    WindowBase* w = WindowFindByClass(WindowClass::TileInspector);
     if (w != nullptr)
     {
         int action = -1;
@@ -635,7 +635,7 @@ static void ShortcutConstructionTurnLeft()
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
         return;
 
-    rct_window* window = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* window = WindowFindByClass(WindowClass::Footpath);
     if (window != nullptr)
     {
         WindowFootpathKeyboardShortcutTurnLeft();
@@ -650,7 +650,7 @@ static void ShortcutConstructionTurnRight()
 {
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
         return;
-    rct_window* window = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* window = WindowFindByClass(WindowClass::Footpath);
     if (window != nullptr)
     {
         WindowFootpathKeyboardShortcutTurnRight();
@@ -666,7 +666,7 @@ static void ShortcutConstructionSlopeUp()
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
         return;
 
-    rct_window* window = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* window = WindowFindByClass(WindowClass::Footpath);
     if (window != nullptr)
     {
         WindowFootpathKeyboardShortcutSlopeUp();
@@ -682,7 +682,7 @@ static void ShortcutConstructionBuildCurrent()
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
         return;
 
-    rct_window* window = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* window = WindowFindByClass(WindowClass::Footpath);
     if (window != nullptr)
     {
         WindowFootpathKeyboardShortcutBuildCurrent();
@@ -698,7 +698,7 @@ static void ShortcutConstructionSlopeDown()
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
         return;
 
-    rct_window* window = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* window = WindowFindByClass(WindowClass::Footpath);
     if (window != nullptr)
     {
         WindowFootpathKeyboardShortcutSlopeDown();
@@ -714,7 +714,7 @@ static void ShortcutConstructionDemolishCurrent()
     if (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)
         return;
 
-    rct_window* window = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* window = WindowFindByClass(WindowClass::Footpath);
     if (window != nullptr)
     {
         WindowFootpathKeyboardShortcutDemolishCurrent();
diff --git a/src/openrct2-ui/interface/Dropdown.h b/src/openrct2-ui/interface/Dropdown.h
index 179268d034..049e32cd67 100644
--- a/src/openrct2-ui/interface/Dropdown.h
+++ b/src/openrct2-ui/interface/Dropdown.h
@@ -51,10 +51,10 @@ void WindowDropdownShowImage(
     int32_t x, int32_t y, int32_t extray, uint8_t colour, uint8_t flags, int32_t numItems, int32_t itemWidth,
     int32_t itemHeight, int32_t numColumns);
 void WindowDropdownClose();
-int32_t DropdownIndexFromPoint(const ScreenCoordsXY& loc, rct_window* w);
-void WindowDropdownShowColour(rct_window* w, Widget* widget, uint8_t dropdownColour, uint8_t selectedColour);
+int32_t DropdownIndexFromPoint(const ScreenCoordsXY& loc, WindowBase* w);
+void WindowDropdownShowColour(WindowBase* w, Widget* widget, uint8_t dropdownColour, uint8_t selectedColour);
 void WindowDropdownShowColourAvailable(
-    rct_window* w, Widget* widget, uint8_t dropdownColour, uint8_t selectedColour, uint32_t availableColours);
+    WindowBase* w, Widget* widget, uint8_t dropdownColour, uint8_t selectedColour, uint32_t availableColours);
 uint32_t DropdownGetAppropriateImageDropdownItemsPerRow(uint32_t numItems);
 bool WindowDropDownHasMultipleColumns(size_t numItems);
 
diff --git a/src/openrct2-ui/interface/InGameConsole.cpp b/src/openrct2-ui/interface/InGameConsole.cpp
index 0c7934df6b..09342b0fde 100644
--- a/src/openrct2-ui/interface/InGameConsole.cpp
+++ b/src/openrct2-ui/interface/InGameConsole.cpp
@@ -248,10 +248,10 @@ void InGameConsole::Update()
     if (_isOpen)
     {
         // When scrolling the map, the console pixels get copied... therefore invalidate the screen
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
-            rct_viewport* mainViewport = WindowGetViewport(mainWindow);
+            Viewport* mainViewport = WindowGetViewport(mainWindow);
             if (mainViewport != nullptr)
             {
                 if (_lastMainViewport != mainViewport->viewPos)
diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp
index e1a1dd87f5..d8d6106faa 100644
--- a/src/openrct2-ui/interface/LandTool.cpp
+++ b/src/openrct2-ui/interface/LandTool.cpp
@@ -55,7 +55,7 @@ uint32_t LandTool::SizeToSpriteIndex(uint16_t size)
     return 0xFFFFFFFF;
 }
 
-void LandTool::ShowSurfaceStyleDropdown(rct_window* w, Widget* widget, ObjectEntryIndex currentSurfaceType)
+void LandTool::ShowSurfaceStyleDropdown(WindowBase* w, Widget* widget, ObjectEntryIndex currentSurfaceType)
 {
     auto& objManager = GetContext()->GetObjectManager();
 
@@ -89,7 +89,7 @@ void LandTool::ShowSurfaceStyleDropdown(rct_window* w, Widget* widget, ObjectEnt
     gDropdownDefaultIndex = defaultIndex;
 }
 
-void LandTool::ShowEdgeStyleDropdown(rct_window* w, Widget* widget, ObjectEntryIndex currentEdgeType)
+void LandTool::ShowEdgeStyleDropdown(WindowBase* w, Widget* widget, ObjectEntryIndex currentEdgeType)
 {
     auto& objManager = GetContext()->GetObjectManager();
 
diff --git a/src/openrct2-ui/interface/LandTool.h b/src/openrct2-ui/interface/LandTool.h
index da7763f387..dab9395cad 100644
--- a/src/openrct2-ui/interface/LandTool.h
+++ b/src/openrct2-ui/interface/LandTool.h
@@ -29,6 +29,6 @@ extern money64 gWaterToolLowerCost;
 namespace LandTool
 {
     uint32_t SizeToSpriteIndex(uint16_t size);
-    void ShowSurfaceStyleDropdown(rct_window* w, Widget* widget, ObjectEntryIndex currentSurfaceType);
-    void ShowEdgeStyleDropdown(rct_window* w, Widget* widget, ObjectEntryIndex currentEdgeType);
+    void ShowSurfaceStyleDropdown(WindowBase* w, Widget* widget, ObjectEntryIndex currentSurfaceType);
+    void ShowEdgeStyleDropdown(WindowBase* w, Widget* widget, ObjectEntryIndex currentEdgeType);
 } // namespace LandTool
diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp
index 5d1db17228..ecf6ae169f 100644
--- a/src/openrct2-ui/interface/Theme.cpp
+++ b/src/openrct2-ui/interface/Theme.cpp
@@ -871,15 +871,15 @@ StringId ThemeDescGetName(WindowClass wc)
 
 void ColourSchemeUpdateAll()
 {
-    WindowVisitEach([](rct_window* w) { ColourSchemeUpdate(w); });
+    WindowVisitEach([](WindowBase* w) { ColourSchemeUpdate(w); });
 }
 
-void ColourSchemeUpdate(rct_window* window)
+void ColourSchemeUpdate(WindowBase* window)
 {
     ColourSchemeUpdateByClass(window, window->classification);
 }
 
-void ColourSchemeUpdateByClass(rct_window* window, WindowClass classification)
+void ColourSchemeUpdateByClass(WindowBase* window, WindowClass classification)
 {
     const WindowTheme* windowTheme;
     const UIThemeWindowEntry* entry = ThemeManager::CurrentTheme->GetEntry(classification);
diff --git a/src/openrct2-ui/interface/Theme.h b/src/openrct2-ui/interface/Theme.h
index 80e33fc68b..e0def3382d 100644
--- a/src/openrct2-ui/interface/Theme.h
+++ b/src/openrct2-ui/interface/Theme.h
@@ -21,9 +21,9 @@ enum
     UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR = 1 << 4,
 };
 
-void ColourSchemeUpdate(rct_window* window);
+void ColourSchemeUpdate(WindowBase* window);
 void ColourSchemeUpdateAll();
-void ColourSchemeUpdateByClass(rct_window* window, WindowClass classification);
+void ColourSchemeUpdateByClass(WindowBase* window, WindowClass classification);
 
 void ThemeManagerInitialise();
 void ThemeManagerLoadAvailableThemes();
diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp
index 2da0e9084a..6d41295d7e 100644
--- a/src/openrct2-ui/interface/ViewportInteraction.cpp
+++ b/src/openrct2-ui/interface/ViewportInteraction.cpp
@@ -612,7 +612,7 @@ static void ViewportInteractionRemoveScenery(TileElement* tileElement, const Coo
  */
 static void ViewportInteractionRemoveFootpath(TileElement* tileElement, const CoordsXY& mapCoords)
 {
-    rct_window* w;
+    WindowBase* w;
     TileElement* tileElement2;
 
     auto z = tileElement->GetBaseZ();
@@ -760,7 +760,7 @@ static Peep* ViewportInteractionGetClosestPeep(ScreenCoordsXY screenCoords, int3
  */
 CoordsXY ViewportInteractionGetTileStartAtCursor(const ScreenCoordsXY& screenCoords)
 {
-    rct_window* window = WindowFindFromPoint(screenCoords);
+    WindowBase* window = WindowFindFromPoint(screenCoords);
     if (window == nullptr || window->viewport == nullptr)
     {
         CoordsXY ret{};
diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp
index 6f35c38bdb..4d3e29e020 100644
--- a/src/openrct2-ui/interface/Widget.cpp
+++ b/src/openrct2-ui/interface/Widget.cpp
@@ -22,32 +22,32 @@
 #include <openrct2/sprites.h>
 #include <openrct2/util/Util.h>
 
-static void WidgetFrameDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetResizeDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetButtonDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetTabDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetFlatButtonDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetTextButton(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetTextCentred(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetText(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetTextInset(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetTextBoxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetGroupboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetCaptionDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetCheckboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetCloseboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
-static void WidgetScrollDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
+static void WidgetFrameDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetResizeDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetButtonDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetTabDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetFlatButtonDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetTextButton(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetTextCentred(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetText(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetTextInset(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetTextBoxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetGroupboxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetCaptionDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetCheckboxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetCloseboxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
+static void WidgetScrollDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
 static void WidgetHScrollbarDraw(
-    DrawPixelInfo* dpi, const rct_scroll& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour);
+    DrawPixelInfo* dpi, const ScrollBar& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour);
 static void WidgetVScrollbarDraw(
-    DrawPixelInfo* dpi, const rct_scroll& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour);
-static void WidgetDrawImage(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
+    DrawPixelInfo* dpi, const ScrollBar& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour);
+static void WidgetDrawImage(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
 
 /**
  *
  *  rct2: 0x006EB2A8
  */
-void WidgetDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+void WidgetDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     const auto* widget = GetWidgetByIndex(w, widgetIndex);
     if (widget == nullptr)
@@ -117,7 +117,7 @@ void WidgetDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006EB6CE
  */
-static void WidgetFrameDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetFrameDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -151,7 +151,7 @@ static void WidgetFrameDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widge
  *
  *  rct2: 0x006EB765
  */
-static void WidgetResizeDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetResizeDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -182,7 +182,7 @@ static void WidgetResizeDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widg
  *
  *  rct2: 0x006EB8E5
  */
-static void WidgetButtonDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetButtonDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -214,7 +214,7 @@ static void WidgetButtonDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widg
  *
  *  rct2: 0x006EB806
  */
-static void WidgetTabDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetTabDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     auto& widget = w.widgets[widgetIndex];
@@ -263,7 +263,7 @@ static void WidgetTabDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetI
  *
  *  rct2: 0x006EB861
  */
-static void WidgetFlatButtonDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetFlatButtonDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     if (!WidgetIsDisabled(w, widgetIndex) && WidgetIsHighlighted(w, widgetIndex))
     {
@@ -303,7 +303,7 @@ static void WidgetFlatButtonDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex
  *
  *  rct2: 0x006EBBEB
  */
-static void WidgetTextButton(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetTextButton(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -334,7 +334,7 @@ static void WidgetTextButton(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widg
  *
  *  rct2: 0x006EBC41
  */
-static void WidgetTextCentred(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetTextCentred(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -380,7 +380,7 @@ static void WidgetTextCentred(DrawPixelInfo* dpi, rct_window& w, WidgetIndex wid
  *
  *  rct2: 0x006EBD52
  */
-static void WidgetText(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetText(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -429,7 +429,7 @@ static void WidgetText(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetInde
  *
  *  rct2: 0x006EBD1F
  */
-static void WidgetTextInset(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetTextInset(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -469,7 +469,7 @@ static std::pair<StringId, void*> WidgetGetStringidAndArgs(const Widget& widget)
  *
  *  rct2: 0x006EB535
  */
-static void WidgetGroupboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetGroupboxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -530,7 +530,7 @@ static void WidgetGroupboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex wi
  *
  *  rct2: 0x006EB2F9
  */
-static void WidgetCaptionDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetCaptionDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto* widget = &w.widgets[widgetIndex];
@@ -579,7 +579,7 @@ static void WidgetCaptionDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex wid
  *
  *  rct2: 0x006EBB85
  */
-static void WidgetCloseboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetCloseboxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -616,7 +616,7 @@ static void WidgetCloseboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex wi
  *
  *  rct2: 0x006EBAD9
  */
-static void WidgetCheckboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetCheckboxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -657,7 +657,7 @@ static void WidgetCheckboxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex wi
  *
  *  rct2: 0x006EBD96
  */
-static void WidgetScrollDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetScrollDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     int32_t scrollIndex = WindowGetScrollDataIndex(w, widgetIndex);
@@ -726,7 +726,7 @@ static void WidgetScrollDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widg
 }
 
 static void WidgetHScrollbarDraw(
-    DrawPixelInfo* dpi, const rct_scroll& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour)
+    DrawPixelInfo* dpi, const ScrollBar& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour)
 {
     colour &= 0x7F;
     // Trough
@@ -764,7 +764,7 @@ static void WidgetHScrollbarDraw(
 }
 
 static void WidgetVScrollbarDraw(
-    DrawPixelInfo* dpi, const rct_scroll& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour)
+    DrawPixelInfo* dpi, const ScrollBar& scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour)
 {
     colour &= 0x7F;
     // Trough
@@ -799,7 +799,7 @@ static void WidgetVScrollbarDraw(
  *
  *  rct2: 0x006EB951
  */
-static void WidgetDrawImage(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetDrawImage(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     // Get the widget
     const auto& widget = w.widgets[widgetIndex];
@@ -848,26 +848,26 @@ static void WidgetDrawImage(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widge
     }
 }
 
-bool WidgetIsDisabled(const rct_window& w, WidgetIndex widgetIndex)
+bool WidgetIsDisabled(const WindowBase& w, WidgetIndex widgetIndex)
 {
     if (w.classification == WindowClass::Custom)
         return w.widgets[widgetIndex].flags & WIDGET_FLAGS::IS_DISABLED;
     return (w.disabled_widgets & (1LL << widgetIndex)) != 0;
 }
 
-bool WidgetIsHoldable(const rct_window& w, WidgetIndex widgetIndex)
+bool WidgetIsHoldable(const WindowBase& w, WidgetIndex widgetIndex)
 {
     if (w.classification == WindowClass::Custom)
         return w.widgets[widgetIndex].flags & WIDGET_FLAGS::IS_HOLDABLE;
     return (w.hold_down_widgets & (1LL << widgetIndex)) != 0;
 }
 
-bool WidgetIsVisible(const rct_window& w, WidgetIndex widgetIndex)
+bool WidgetIsVisible(const WindowBase& w, WidgetIndex widgetIndex)
 {
     return w.widgets[widgetIndex].IsVisible();
 }
 
-bool WidgetIsPressed(const rct_window& w, WidgetIndex widgetIndex)
+bool WidgetIsPressed(const WindowBase& w, WidgetIndex widgetIndex)
 {
     if (w.classification == WindowClass::Custom)
     {
@@ -899,7 +899,7 @@ bool WidgetIsPressed(const rct_window& w, WidgetIndex widgetIndex)
     return false;
 }
 
-bool WidgetIsHighlighted(const rct_window& w, WidgetIndex widgetIndex)
+bool WidgetIsHighlighted(const WindowBase& w, WidgetIndex widgetIndex)
 {
     if (gHoverWidget.window_classification != w.classification)
         return false;
@@ -910,7 +910,7 @@ bool WidgetIsHighlighted(const rct_window& w, WidgetIndex widgetIndex)
     return true;
 }
 
-bool WidgetIsActiveTool(const rct_window& w, WidgetIndex widgetIndex)
+bool WidgetIsActiveTool(const WindowBase& w, WidgetIndex widgetIndex)
 {
     if (!(InputTestFlag(INPUT_FLAG_TOOL_ACTIVE)))
         return false;
@@ -935,7 +935,7 @@ bool WidgetIsActiveTool(const rct_window& w, WidgetIndex widgetIndex)
  *  edi: widget
  */
 void WidgetScrollGetPart(
-    rct_window& w, const Widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords,
+    WindowBase& w, const Widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords,
     int32_t* output_scroll_area, int32_t* scroll_id)
 {
     *scroll_id = 0;
@@ -1039,7 +1039,7 @@ void WidgetScrollGetPart(
     }
 }
 
-Widget* GetWidgetByIndex(const rct_window& w, WidgetIndex widgetIndex)
+Widget* GetWidgetByIndex(const WindowBase& w, WidgetIndex widgetIndex)
 {
     // Make sure we don't go out of bounds if we are given a bad widget index
     WidgetIndex index = 0;
@@ -1057,7 +1057,7 @@ Widget* GetWidgetByIndex(const rct_window& w, WidgetIndex widgetIndex)
     return nullptr;
 }
 
-static void SafeSetWidgetFlag(rct_window& w, WidgetIndex widgetIndex, WidgetFlags mask, bool value)
+static void SafeSetWidgetFlag(WindowBase& w, WidgetIndex widgetIndex, WidgetFlags mask, bool value)
 {
     Widget* widget = GetWidgetByIndex(w, widgetIndex);
     if (widget == nullptr)
@@ -1071,12 +1071,12 @@ static void SafeSetWidgetFlag(rct_window& w, WidgetIndex widgetIndex, WidgetFlag
         widget->flags &= ~mask;
 }
 
-void WidgetSetEnabled(rct_window& w, WidgetIndex widgetIndex, bool enabled)
+void WidgetSetEnabled(WindowBase& w, WidgetIndex widgetIndex, bool enabled)
 {
     WidgetSetDisabled(w, widgetIndex, !enabled);
 }
 
-void WidgetSetDisabled(rct_window& w, WidgetIndex widgetIndex, bool value)
+void WidgetSetDisabled(WindowBase& w, WidgetIndex widgetIndex, bool value)
 {
     SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_DISABLED, value);
     if (value)
@@ -1089,7 +1089,7 @@ void WidgetSetDisabled(rct_window& w, WidgetIndex widgetIndex, bool value)
     }
 }
 
-void WidgetSetHoldable(rct_window& w, WidgetIndex widgetIndex, bool value)
+void WidgetSetHoldable(WindowBase& w, WidgetIndex widgetIndex, bool value)
 {
     SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_HOLDABLE, value);
     if (value)
@@ -1102,12 +1102,12 @@ void WidgetSetHoldable(rct_window& w, WidgetIndex widgetIndex, bool value)
     }
 }
 
-void WidgetSetVisible(rct_window& w, WidgetIndex widgetIndex, bool value)
+void WidgetSetVisible(WindowBase& w, WidgetIndex widgetIndex, bool value)
 {
     SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_HIDDEN, !value);
 }
 
-void WidgetSetPressed(rct_window& w, WidgetIndex widgetIndex, bool value)
+void WidgetSetPressed(WindowBase& w, WidgetIndex widgetIndex, bool value)
 {
     SafeSetWidgetFlag(w, widgetIndex, WIDGET_FLAGS::IS_PRESSED, value);
     if (value)
@@ -1116,12 +1116,12 @@ void WidgetSetPressed(rct_window& w, WidgetIndex widgetIndex, bool value)
         w.pressed_widgets &= ~(1uLL << widgetIndex);
 }
 
-void WidgetSetCheckboxValue(rct_window& w, WidgetIndex widgetIndex, bool value)
+void WidgetSetCheckboxValue(WindowBase& w, WidgetIndex widgetIndex, bool value)
 {
     WidgetSetPressed(w, widgetIndex, value);
 }
 
-static void WidgetTextBoxDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex)
+static void WidgetTextBoxDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex)
 {
     int32_t no_lines = 0;
     char wrapped_string[TEXT_INPUT_SIZE];
diff --git a/src/openrct2-ui/interface/Widget.h b/src/openrct2-ui/interface/Widget.h
index b0ee28bff6..05fc1939ac 100644
--- a/src/openrct2-ui/interface/Widget.h
+++ b/src/openrct2-ui/interface/Widget.h
@@ -13,4 +13,4 @@
 #include <openrct2/interface/Widget.h>
 
 ImageId GetColourButtonImage(colour_t colour);
-Widget* GetWidgetByIndex(const rct_window& w, WidgetIndex widgetIndex);
+Widget* GetWidgetByIndex(const WindowBase& w, WidgetIndex widgetIndex);
diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp
index b7beb95d76..f945e5a245 100644
--- a/src/openrct2-ui/interface/Window.cpp
+++ b/src/openrct2-ui/interface/Window.cpp
@@ -200,8 +200,8 @@ static ScreenCoordsXY GetCentrePositionForNewWindow(int32_t width, int32_t heigh
     return ScreenCoordsXY{ (screenWidth - width) / 2, std::max(TOP_TOOLBAR_HEIGHT + 1, (screenHeight - height) / 2) };
 }
 
-rct_window* WindowCreate(
-    std::unique_ptr<rct_window>&& wp, WindowClass cls, ScreenCoordsXY pos, int32_t width, int32_t height, uint32_t flags)
+WindowBase* WindowCreate(
+    std::unique_ptr<WindowBase>&& wp, WindowClass cls, ScreenCoordsXY pos, int32_t width, int32_t height, uint32_t flags)
 {
     if (flags & WF_AUTO_POSITION)
     {
@@ -287,27 +287,27 @@ rct_window* WindowCreate(
     return w;
 }
 
-rct_window* WindowCreate(
+WindowBase* WindowCreate(
     const ScreenCoordsXY& pos, int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags)
 {
-    auto w = std::make_unique<rct_window>();
+    auto w = std::make_unique<WindowBase>();
     w->event_handlers = event_handlers;
     return WindowCreate(std::move(w), cls, pos, width, height, flags);
 }
 
-rct_window* WindowCreateAutoPos(int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags)
+WindowBase* WindowCreateAutoPos(int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags)
 {
     auto pos = GetAutoPositionForNewWindow(width, height);
     return WindowCreate(pos, width, height, event_handlers, cls, flags);
 }
 
-rct_window* WindowCreateCentred(int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags)
+WindowBase* WindowCreateCentred(int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags)
 {
     auto pos = GetCentrePositionForNewWindow(width, height);
     return WindowCreate(pos, width, height, event_handlers, cls, flags);
 }
 
-static int32_t WindowGetWidgetIndex(const rct_window& w, Widget* widget)
+static int32_t WindowGetWidgetIndex(const WindowBase& w, Widget* widget)
 {
     int32_t i = 0;
     for (Widget* widget2 = w.widgets; widget2->type != WindowWidgetType::Last; widget2++, i++)
@@ -316,7 +316,7 @@ static int32_t WindowGetWidgetIndex(const rct_window& w, Widget* widget)
     return -1;
 }
 
-static int32_t WindowGetScrollIndex(const rct_window& w, int32_t targetWidgetIndex)
+static int32_t WindowGetScrollIndex(const WindowBase& w, int32_t targetWidgetIndex)
 {
     if (w.widgets[targetWidgetIndex].type != WindowWidgetType::Scroll)
         return -1;
@@ -334,7 +334,7 @@ static int32_t WindowGetScrollIndex(const rct_window& w, int32_t targetWidgetInd
     return scrollIndex;
 }
 
-static Widget* WindowGetScrollWidget(const rct_window& w, int32_t scrollIndex)
+static Widget* WindowGetScrollWidget(const WindowBase& w, int32_t scrollIndex)
 {
     for (Widget* widget = w.widgets; widget->type != WindowWidgetType::Last; widget++)
     {
@@ -353,7 +353,7 @@ static Widget* WindowGetScrollWidget(const rct_window& w, int32_t scrollIndex)
  *
  *  rct2: 0x006E78E3
  */
-static void WindowScrollWheelInput(rct_window& w, int32_t scrollIndex, int32_t wheel)
+static void WindowScrollWheelInput(WindowBase& w, int32_t scrollIndex, int32_t wheel)
 {
     auto& scroll = w.scrolls[scrollIndex];
     Widget* widget = WindowGetScrollWidget(w, scrollIndex);
@@ -384,7 +384,7 @@ static void WindowScrollWheelInput(rct_window& w, int32_t scrollIndex, int32_t w
  *
  *  rct2: 0x006E793B
  */
-static int32_t WindowWheelInput(rct_window& w, int32_t wheel)
+static int32_t WindowWheelInput(WindowBase& w, int32_t wheel)
 {
     int32_t i = 0;
     for (Widget* widget = w.widgets; widget->type != WindowWidgetType::Last; widget++)
@@ -409,7 +409,7 @@ static int32_t WindowWheelInput(rct_window& w, int32_t wheel)
  *
  *  rct2: 0x006E79FB
  */
-static void WindowViewportWheelInput(rct_window& w, int32_t wheel)
+static void WindowViewportWheelInput(WindowBase& w, int32_t wheel)
 {
     if (gScreenFlags & (SCREEN_FLAGS_TRACK_MANAGER | SCREEN_FLAGS_TITLE_DEMO))
         return;
@@ -420,7 +420,7 @@ static void WindowViewportWheelInput(rct_window& w, int32_t wheel)
         WindowZoomOut(w, true);
 }
 
-static bool WindowOtherWheelInput(rct_window& w, WidgetIndex widgetIndex, int32_t wheel)
+static bool WindowOtherWheelInput(WindowBase& w, WidgetIndex widgetIndex, int32_t wheel)
 {
     // HACK: Until we have a new window system that allows us to add new events like mouse wheel easily,
     //       this selective approach will have to do.
@@ -537,7 +537,7 @@ void WindowAllWheelInput()
     // Check window cursor is over
     if (!(InputTestFlag(INPUT_FLAG_5)))
     {
-        rct_window* w = WindowFindFromPoint(cursorState->position);
+        WindowBase* w = WindowFindFromPoint(cursorState->position);
         if (w != nullptr)
         {
             // Check if main window
@@ -587,7 +587,7 @@ void ApplyScreenSaverLockSetting()
  * Initialises scroll widgets to their virtual size.
  *  rct2: 0x006EAEB8
  */
-void WindowInitScrollWidgets(rct_window& w)
+void WindowInitScrollWidgets(WindowBase& w)
 {
     Widget* widget;
     int32_t widget_index, scroll_index;
@@ -629,7 +629,7 @@ void WindowInitScrollWidgets(rct_window& w)
  *
  *  rct2: 0x006EB15C
  */
-void WindowDrawWidgets(rct_window& w, DrawPixelInfo* dpi)
+void WindowDrawWidgets(WindowBase& w, DrawPixelInfo* dpi)
 {
     Widget* widget;
     WidgetIndex widgetIndex;
@@ -674,7 +674,7 @@ void WindowDrawWidgets(rct_window& w, DrawPixelInfo* dpi)
  *
  *  rct2: 0x006EA776
  */
-static void WindowInvalidatePressedImageButton(const rct_window& w)
+static void WindowInvalidatePressedImageButton(const WindowBase& w)
 {
     WidgetIndex widgetIndex;
     Widget* widget;
@@ -696,7 +696,7 @@ static void WindowInvalidatePressedImageButton(const rct_window& w)
  */
 void InvalidateAllWindowsAfterInput()
 {
-    WindowVisitEach([](rct_window* w) {
+    WindowVisitEach([](WindowBase* w) {
         WindowUpdateScrollWidgets(*w);
         WindowInvalidatePressedImageButton(*w);
         WindowEventResizeCall(w);
@@ -807,7 +807,7 @@ void Window::TextInputOpen(
     WindowTextInputOpen(this, callWidget, title, description, descriptionArgs, existingText, existingArgs, maxLength);
 }
 
-void WindowAlignTabs(rct_window* w, WidgetIndex start_tab_id, WidgetIndex end_tab_id)
+void WindowAlignTabs(WindowBase* w, WidgetIndex start_tab_id, WidgetIndex end_tab_id)
 {
     int32_t i, x = w->widgets[start_tab_id].left;
     int32_t tab_width = w->widgets[start_tab_id].width();
diff --git a/src/openrct2-ui/interface/Window.h b/src/openrct2-ui/interface/Window.h
index 1c1b5cbae0..e75ad01e14 100644
--- a/src/openrct2-ui/interface/Window.h
+++ b/src/openrct2-ui/interface/Window.h
@@ -12,7 +12,7 @@
 #include <openrct2/interface/Window.h>
 #include <openrct2/interface/Window_internal.h>
 
-struct Window : rct_window
+struct Window : WindowBase
 {
     virtual bool IsLegacy() override;
     virtual void OnDraw(DrawPixelInfo& dpi) override;
@@ -37,4 +37,4 @@ struct Window : rct_window
 
 void WindowAllWheelInput();
 void ApplyScreenSaverLockSetting();
-void WindowAlignTabs(rct_window* w, WidgetIndex start_tab_id, WidgetIndex end_tab_id);
+void WindowAlignTabs(WindowBase* w, WidgetIndex start_tab_id, WidgetIndex end_tab_id);
diff --git a/src/openrct2-ui/scripting/CustomListView.cpp b/src/openrct2-ui/scripting/CustomListView.cpp
index 0af3349552..3e516da361 100644
--- a/src/openrct2-ui/scripting/CustomListView.cpp
+++ b/src/openrct2-ui/scripting/CustomListView.cpp
@@ -209,7 +209,7 @@ namespace OpenRCT2::Scripting
 
 } // namespace OpenRCT2::Scripting
 
-CustomListView::CustomListView(rct_window* parent, size_t scrollIndex)
+CustomListView::CustomListView(WindowBase* parent, size_t scrollIndex)
     : ParentWindow(parent)
     , ScrollIndex(scrollIndex)
 {
@@ -549,7 +549,7 @@ void CustomListView::MouseUp(const ScreenCoordsXY& pos)
     }
 }
 
-void CustomListView::Paint(rct_window* w, DrawPixelInfo* dpi, const rct_scroll* scroll) const
+void CustomListView::Paint(WindowBase* w, DrawPixelInfo* dpi, const ScrollBar* scroll) const
 {
     auto paletteIndex = ColourMapA[w->colours[1]].mid_light;
     GfxFillRect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width, dpi->y + dpi->height } }, paletteIndex);
@@ -665,7 +665,7 @@ void CustomListView::Paint(rct_window* w, DrawPixelInfo* dpi, const rct_scroll*
 }
 
 void CustomListView::PaintHeading(
-    rct_window* w, DrawPixelInfo* dpi, const ScreenCoordsXY& pos, const ScreenSize& size, const std::string& text,
+    WindowBase* w, DrawPixelInfo* dpi, const ScreenCoordsXY& pos, const ScreenSize& size, const std::string& text,
     ColumnSortOrder sortOrder, bool isPressed) const
 {
     auto boxFlags = 0;
diff --git a/src/openrct2-ui/scripting/CustomListView.h b/src/openrct2-ui/scripting/CustomListView.h
index e89a598bb2..3178d9121c 100644
--- a/src/openrct2-ui/scripting/CustomListView.h
+++ b/src/openrct2-ui/scripting/CustomListView.h
@@ -94,7 +94,7 @@ namespace OpenRCT2::Ui::Windows
     private:
         static constexpr int32_t HEADER_ROW = -1;
 
-        rct_window* ParentWindow{};
+        WindowBase* ParentWindow{};
         size_t ScrollIndex{};
         std::vector<ListViewColumn> Columns;
         std::vector<ListViewItem> Items;
@@ -120,7 +120,7 @@ namespace OpenRCT2::Ui::Windows
         DukValue OnClick;
         DukValue OnHighlight;
 
-        CustomListView(rct_window* parent, size_t scrollIndex);
+        CustomListView(WindowBase* parent, size_t scrollIndex);
         ScrollbarType GetScrollbars() const;
         void SetScrollbars(ScrollbarType value, bool initialising = false);
         const std::vector<ListViewColumn>& GetColumns() const;
@@ -136,11 +136,11 @@ namespace OpenRCT2::Ui::Windows
         void MouseOver(const ScreenCoordsXY& pos, bool isMouseDown);
         void MouseDown(const ScreenCoordsXY& pos);
         void MouseUp(const ScreenCoordsXY& pos);
-        void Paint(rct_window* w, DrawPixelInfo* dpi, const rct_scroll* scroll) const;
+        void Paint(WindowBase* w, DrawPixelInfo* dpi, const ScrollBar* scroll) const;
 
     private:
         void PaintHeading(
-            rct_window* w, DrawPixelInfo* dpi, const ScreenCoordsXY& pos, const ScreenSize& size, const std::string& text,
+            WindowBase* w, DrawPixelInfo* dpi, const ScreenCoordsXY& pos, const ScreenSize& size, const std::string& text,
             ColumnSortOrder sortOrder, bool isPressed) const;
         void PaintSeperator(DrawPixelInfo* dpi, const ScreenCoordsXY& pos, const ScreenSize& size, const char* text) const;
         void PaintCell(
diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index 7e3699f099..c57ddddce4 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -347,7 +347,7 @@ namespace OpenRCT2::Ui::Windows
 
         CustomWindowInfo(const CustomWindowInfo&) = delete;
 
-        const CustomWidgetDesc* GetCustomWidgetDesc(rct_window* w, size_t widgetIndex) const
+        const CustomWidgetDesc* GetCustomWidgetDesc(WindowBase* w, size_t widgetIndex) const
         {
             if (widgetIndex < WidgetIndexMap.size())
             {
@@ -371,13 +371,13 @@ namespace OpenRCT2::Ui::Windows
             return nullptr;
         }
 
-        CustomWidgetDesc* GetCustomWidgetDesc(rct_window* w, size_t widgetIndex)
+        CustomWidgetDesc* GetCustomWidgetDesc(WindowBase* w, size_t widgetIndex)
         {
             return const_cast<CustomWidgetDesc*>(std::as_const(*this).GetCustomWidgetDesc(w, widgetIndex));
         }
     };
 
-    static CustomWindowInfo& GetInfo(rct_window* w);
+    static CustomWindowInfo& GetInfo(WindowBase* w);
     static void InvokeEventHandler(const std::shared_ptr<Plugin>& owner, const DukValue& dukHandler);
     static void InvokeEventHandler(
         const std::shared_ptr<Plugin>& owner, const DukValue& dukHandler, const std::vector<DukValue>& args);
@@ -1124,7 +1124,7 @@ namespace OpenRCT2::Ui::Windows
 
     rct_windownumber CustomWindow::_nextWindowNumber;
 
-    rct_window* WindowCustomOpen(std::shared_ptr<Plugin> owner, DukValue dukDesc)
+    WindowBase* WindowCustomOpen(std::shared_ptr<Plugin> owner, DukValue dukDesc)
     {
         auto desc = CustomWindowDesc::FromDukValue(dukDesc);
         uint16_t windowFlags = WF_RESIZABLE | WF_TRANSPARENT;
@@ -1145,7 +1145,7 @@ namespace OpenRCT2::Ui::Windows
         return window;
     }
 
-    static CustomWindowInfo& GetInfo(rct_window* w)
+    static CustomWindowInfo& GetInfo(WindowBase* w)
     {
         return *(static_cast<CustomWindowInfo*>(w->custom_info));
     }
@@ -1163,7 +1163,7 @@ namespace OpenRCT2::Ui::Windows
         scriptEngine.ExecutePluginCall(owner, dukHandler, args, false);
     }
 
-    std::string GetWindowTitle(rct_window* w)
+    std::string GetWindowTitle(WindowBase* w)
     {
         if (w->custom_info != nullptr)
         {
@@ -1173,7 +1173,7 @@ namespace OpenRCT2::Ui::Windows
         return {};
     }
 
-    void UpdateWindowTitle(rct_window* w, std::string_view value)
+    void UpdateWindowTitle(WindowBase* w, std::string_view value)
     {
         if (w->custom_info != nullptr)
         {
@@ -1182,7 +1182,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    void UpdateWindowTab(rct_window* w, int32_t tabIndex)
+    void UpdateWindowTab(WindowBase* w, int32_t tabIndex)
     {
         if (w->classification == WindowClass::Custom && w->custom_info != nullptr)
         {
@@ -1194,7 +1194,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    void UpdateWidgetText(rct_window* w, WidgetIndex widgetIndex, std::string_view value)
+    void UpdateWidgetText(WindowBase* w, WidgetIndex widgetIndex, std::string_view value)
     {
         if (w->custom_info != nullptr)
         {
@@ -1209,7 +1209,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    void UpdateWidgetItems(rct_window* w, WidgetIndex widgetIndex, const std::vector<std::string>& items)
+    void UpdateWidgetItems(WindowBase* w, WidgetIndex widgetIndex, const std::vector<std::string>& items)
     {
         if (w->custom_info != nullptr)
         {
@@ -1223,7 +1223,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    void UpdateWidgetColour(rct_window* w, WidgetIndex widgetIndex, colour_t colour)
+    void UpdateWidgetColour(WindowBase* w, WidgetIndex widgetIndex, colour_t colour)
     {
         if (w->custom_info != nullptr)
         {
@@ -1250,7 +1250,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    void UpdateWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex, int32_t selectedIndex)
+    void UpdateWidgetSelectedIndex(WindowBase* w, WidgetIndex widgetIndex, int32_t selectedIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1297,7 +1297,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    std::vector<std::string> GetWidgetItems(rct_window* w, WidgetIndex widgetIndex)
+    std::vector<std::string> GetWidgetItems(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1311,7 +1311,7 @@ namespace OpenRCT2::Ui::Windows
         return {};
     }
 
-    colour_t GetWidgetColour(rct_window* w, WidgetIndex widgetIndex)
+    colour_t GetWidgetColour(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1325,7 +1325,7 @@ namespace OpenRCT2::Ui::Windows
         return COLOUR_BLACK;
     }
 
-    int32_t GetWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex)
+    int32_t GetWidgetSelectedIndex(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1339,7 +1339,7 @@ namespace OpenRCT2::Ui::Windows
         return -1;
     }
 
-    rct_window* FindCustomWindowByClassification(std::string_view classification)
+    WindowBase* FindCustomWindowByClassification(std::string_view classification)
     {
         for (const auto& w : g_window_list)
         {
@@ -1355,7 +1355,7 @@ namespace OpenRCT2::Ui::Windows
         return nullptr;
     }
 
-    std::optional<WidgetIndex> FindWidgetIndexByName(rct_window* w, std::string_view name)
+    std::optional<WidgetIndex> FindWidgetIndexByName(WindowBase* w, std::string_view name)
     {
         if (w->custom_info != nullptr)
         {
@@ -1375,7 +1375,7 @@ namespace OpenRCT2::Ui::Windows
         return std::nullopt;
     }
 
-    std::string GetWidgetName(rct_window* w, WidgetIndex widgetIndex)
+    std::string GetWidgetName(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1389,7 +1389,7 @@ namespace OpenRCT2::Ui::Windows
         return {};
     }
 
-    void SetWidgetName(rct_window* w, WidgetIndex widgetIndex, std::string_view name)
+    void SetWidgetName(WindowBase* w, WidgetIndex widgetIndex, std::string_view name)
     {
         if (w->custom_info != nullptr)
         {
@@ -1402,7 +1402,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    std::string GetWidgetTooltip(rct_window* w, WidgetIndex widgetIndex)
+    std::string GetWidgetTooltip(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1416,7 +1416,7 @@ namespace OpenRCT2::Ui::Windows
         return {};
     }
 
-    void SetWidgetTooltip(rct_window* w, WidgetIndex widgetIndex, std::string_view tooltip)
+    void SetWidgetTooltip(WindowBase* w, WidgetIndex widgetIndex, std::string_view tooltip)
     {
         if (w->custom_info != nullptr)
         {
@@ -1429,7 +1429,7 @@ namespace OpenRCT2::Ui::Windows
         }
     }
 
-    CustomListView* GetCustomListView(rct_window* w, WidgetIndex widgetIndex)
+    CustomListView* GetCustomListView(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1443,7 +1443,7 @@ namespace OpenRCT2::Ui::Windows
         return nullptr;
     }
 
-    int32_t GetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex)
+    int32_t GetWidgetMaxLength(WindowBase* w, WidgetIndex widgetIndex)
     {
         if (w->custom_info != nullptr)
         {
@@ -1457,7 +1457,7 @@ namespace OpenRCT2::Ui::Windows
         return 0;
     }
 
-    void SetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex, int32_t value)
+    void SetWidgetMaxLength(WindowBase* w, WidgetIndex widgetIndex, int32_t value)
     {
         if (w->custom_info != nullptr)
         {
@@ -1473,7 +1473,7 @@ namespace OpenRCT2::Ui::Windows
     void CloseWindowsOwnedByPlugin(std::shared_ptr<Plugin> plugin)
     {
         // Get all the windows that need closing
-        std::vector<std::shared_ptr<rct_window>> customWindows;
+        std::vector<std::shared_ptr<WindowBase>> customWindows;
         for (const auto& window : g_window_list)
         {
             if (window->classification == WindowClass::Custom)
diff --git a/src/openrct2-ui/scripting/CustomWindow.h b/src/openrct2-ui/scripting/CustomWindow.h
index 098dba1b4e..c0e40b5f98 100644
--- a/src/openrct2-ui/scripting/CustomWindow.h
+++ b/src/openrct2-ui/scripting/CustomWindow.h
@@ -21,25 +21,25 @@ namespace OpenRCT2::Ui::Windows
 {
     class CustomListView;
 
-    std::string GetWindowTitle(rct_window* w);
-    void UpdateWindowTitle(rct_window* w, std::string_view value);
-    void UpdateWindowTab(rct_window* w, int32_t tabIndex);
-    void UpdateWidgetText(rct_window* w, WidgetIndex widget, std::string_view string_view);
-    void UpdateWidgetItems(rct_window* w, WidgetIndex widgetIndex, const std::vector<std::string>& items);
-    void UpdateWidgetColour(rct_window* w, WidgetIndex widgetIndex, colour_t colour);
-    void UpdateWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex, int32_t selectedIndex);
-    std::vector<std::string> GetWidgetItems(rct_window* w, WidgetIndex widgetIndex);
-    colour_t GetWidgetColour(rct_window* w, WidgetIndex widgetIndex);
-    int32_t GetWidgetSelectedIndex(rct_window* w, WidgetIndex widgetIndex);
-    rct_window* FindCustomWindowByClassification(std::string_view classification);
-    std::optional<WidgetIndex> FindWidgetIndexByName(rct_window* w, std::string_view name);
-    std::string GetWidgetName(rct_window* w, WidgetIndex widgetIndex);
-    void SetWidgetName(rct_window* w, WidgetIndex widgetIndex, std::string_view name);
-    std::string GetWidgetTooltip(rct_window* w, WidgetIndex widgetIndex);
-    void SetWidgetTooltip(rct_window* w, WidgetIndex widgetIndex, std::string_view tooltip);
-    CustomListView* GetCustomListView(rct_window* w, WidgetIndex widgetIndex);
-    int32_t GetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex);
-    void SetWidgetMaxLength(rct_window* w, WidgetIndex widgetIndex, int32_t value);
+    std::string GetWindowTitle(WindowBase* w);
+    void UpdateWindowTitle(WindowBase* w, std::string_view value);
+    void UpdateWindowTab(WindowBase* w, int32_t tabIndex);
+    void UpdateWidgetText(WindowBase* w, WidgetIndex widget, std::string_view string_view);
+    void UpdateWidgetItems(WindowBase* w, WidgetIndex widgetIndex, const std::vector<std::string>& items);
+    void UpdateWidgetColour(WindowBase* w, WidgetIndex widgetIndex, colour_t colour);
+    void UpdateWidgetSelectedIndex(WindowBase* w, WidgetIndex widgetIndex, int32_t selectedIndex);
+    std::vector<std::string> GetWidgetItems(WindowBase* w, WidgetIndex widgetIndex);
+    colour_t GetWidgetColour(WindowBase* w, WidgetIndex widgetIndex);
+    int32_t GetWidgetSelectedIndex(WindowBase* w, WidgetIndex widgetIndex);
+    WindowBase* FindCustomWindowByClassification(std::string_view classification);
+    std::optional<WidgetIndex> FindWidgetIndexByName(WindowBase* w, std::string_view name);
+    std::string GetWidgetName(WindowBase* w, WidgetIndex widgetIndex);
+    void SetWidgetName(WindowBase* w, WidgetIndex widgetIndex, std::string_view name);
+    std::string GetWidgetTooltip(WindowBase* w, WidgetIndex widgetIndex);
+    void SetWidgetTooltip(WindowBase* w, WidgetIndex widgetIndex, std::string_view tooltip);
+    CustomListView* GetCustomListView(WindowBase* w, WidgetIndex widgetIndex);
+    int32_t GetWidgetMaxLength(WindowBase* w, WidgetIndex widgetIndex);
+    void SetWidgetMaxLength(WindowBase* w, WidgetIndex widgetIndex, int32_t value);
     void CloseWindowsOwnedByPlugin(std::shared_ptr<Plugin> plugin);
 } // namespace OpenRCT2::Ui::Windows
 
diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp
index 48f087a523..ac68c1065f 100644
--- a/src/openrct2-ui/scripting/ScUi.hpp
+++ b/src/openrct2-ui/scripting/ScUi.hpp
@@ -35,7 +35,7 @@ namespace OpenRCT2::Scripting
 
 namespace OpenRCT2::Ui::Windows
 {
-    rct_window* WindowCustomOpen(std::shared_ptr<OpenRCT2::Scripting::Plugin> owner, DukValue dukDesc);
+    WindowBase* WindowCustomOpen(std::shared_ptr<OpenRCT2::Scripting::Plugin> owner, DukValue dukDesc);
 }
 
 namespace OpenRCT2::Scripting
diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp
index c2d4e558c7..f290176a1b 100644
--- a/src/openrct2-ui/scripting/ScViewport.hpp
+++ b/src/openrct2-ui/scripting/ScViewport.hpp
@@ -242,7 +242,7 @@ namespace OpenRCT2::Scripting
         }
 
     private:
-        rct_window* GetWindow() const
+        WindowBase* GetWindow() const
         {
             if (_class == WindowClass::MainWindow)
                 return WindowGetMain();
@@ -250,7 +250,7 @@ namespace OpenRCT2::Scripting
             return WindowFindByNumber(_class, _number);
         }
 
-        rct_viewport* GetViewport() const
+        Viewport* GetViewport() const
         {
             auto w = GetWindow();
             if (w != nullptr)
diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp
index 51d3f6fa57..b0dabe4cef 100644
--- a/src/openrct2-ui/scripting/ScWidget.hpp
+++ b/src/openrct2-ui/scripting/ScWidget.hpp
@@ -42,7 +42,7 @@ namespace OpenRCT2::Scripting
         {
         }
 
-        static DukValue ToDukValue(duk_context* ctx, rct_window* w, WidgetIndex widgetIndex);
+        static DukValue ToDukValue(duk_context* ctx, WindowBase* w, WidgetIndex widgetIndex);
 
     private:
         std::shared_ptr<ScWindow> window_get() const;
@@ -401,7 +401,7 @@ namespace OpenRCT2::Scripting
         static void Register(duk_context* ctx);
 
     protected:
-        rct_window* GetWindow() const
+        WindowBase* GetWindow() const
         {
             if (_class == WindowClass::MainWindow)
                 return WindowGetMain();
@@ -989,7 +989,7 @@ namespace OpenRCT2::Scripting
         }
     };
 
-    inline DukValue ScWidget::ToDukValue(duk_context* ctx, rct_window* w, WidgetIndex widgetIndex)
+    inline DukValue ScWidget::ToDukValue(duk_context* ctx, WindowBase* w, WidgetIndex widgetIndex)
     {
         const auto& widget = w->widgets[widgetIndex];
         auto c = w->classification;
diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp
index 95f5231d3f..7c1aa37fc7 100644
--- a/src/openrct2-ui/scripting/ScWindow.hpp
+++ b/src/openrct2-ui/scripting/ScWindow.hpp
@@ -30,7 +30,7 @@ namespace OpenRCT2::Scripting
         rct_windownumber _number;
 
     public:
-        ScWindow(rct_window* w)
+        ScWindow(WindowBase* w)
             : ScWindow(w->classification, w->number)
         {
         }
@@ -358,7 +358,7 @@ namespace OpenRCT2::Scripting
         }
 
     private:
-        rct_window* GetWindow() const
+        WindowBase* GetWindow() const
         {
             return WindowFindByNumber(_class, _number);
         }
diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp
index 7cb9b06383..e1bb23c6f4 100644
--- a/src/openrct2-ui/title/TitleSequencePlayer.cpp
+++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp
@@ -392,7 +392,7 @@ namespace OpenRCT2::Title
 
         void StoreCurrentViewLocation()
         {
-            rct_window* w = WindowGetMain();
+            WindowBase* w = WindowGetMain();
             if (w != nullptr && w->viewport_smart_follow_sprite.IsNull())
             {
                 _previousWindowWidth = w->width;
@@ -406,7 +406,7 @@ namespace OpenRCT2::Title
          */
         void RestoreViewLocationIfResized()
         {
-            rct_window* w = WindowGetMain();
+            WindowBase* w = WindowGetMain();
             if (w != nullptr && w->viewport_smart_follow_sprite.IsNull())
             {
                 if (w->width != _previousWindowWidth || w->height != _previousWindowHeight)
diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp
index 8afeb58959..e052932374 100644
--- a/src/openrct2-ui/windows/About.cpp
+++ b/src/openrct2-ui/windows/About.cpp
@@ -265,7 +265,7 @@ private:
  *
  *  rct2: 0x0066D2AC
  */
-rct_window* WindowAboutOpen()
+WindowBase* WindowAboutOpen()
 {
     return WindowFocusOrCreate<AboutWindow>(WindowClass::About, WW, WH, WF_CENTRE_SCREEN);
 }
diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp
index 8b419b2a0e..67c3daabdc 100644
--- a/src/openrct2-ui/windows/AssetPacks.cpp
+++ b/src/openrct2-ui/windows/AssetPacks.cpp
@@ -337,7 +337,7 @@ private:
     }
 };
 
-rct_window* WindowAssetPacksOpen()
+WindowBase* WindowAssetPacksOpen()
 {
     auto flags = WF_AUTO_POSITION | WF_CENTRE_SCREEN;
     return WindowFocusOrCreate<AssetPacksWindow>(WindowClass::AssetPacks, WW, WH, flags);
diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index 13784b786b..64cc65814d 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -298,7 +298,7 @@ public:
  *
  *  rct2: 0x006BA305
  */
-rct_window* WindowBannerOpen(rct_windownumber number)
+WindowBase* WindowBannerOpen(rct_windownumber number)
 {
     auto w = static_cast<BannerWindow*>(WindowBringToFrontByNumber(WindowClass::Banner, number));
 
diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp
index 5380348235..d87c131f6e 100644
--- a/src/openrct2-ui/windows/Changelog.cpp
+++ b/src/openrct2-ui/windows/Changelog.cpp
@@ -313,7 +313,7 @@ private:
     }
 };
 
-rct_window* WindowChangelogOpen(int personality)
+WindowBase* WindowChangelogOpen(int personality)
 {
     auto* window = WindowBringToFrontByClass(WindowClass::Changelog);
     if (window == nullptr)
diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp
index 6fee437acc..1269236167 100644
--- a/src/openrct2-ui/windows/Cheats.cpp
+++ b/src/openrct2-ui/windows/Cheats.cpp
@@ -1111,7 +1111,7 @@ private:
     }
 };
 
-rct_window* WindowCheatsOpen()
+WindowBase* WindowCheatsOpen()
 {
     auto* window = WindowBringToFrontByClass(WindowClass::Cheats);
     if (window == nullptr)
diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp
index 5fc7e02e07..590df8173d 100644
--- a/src/openrct2-ui/windows/ClearScenery.cpp
+++ b/src/openrct2-ui/windows/ClearScenery.cpp
@@ -197,7 +197,7 @@ public:
     }
 };
 
-rct_window* WindowClearSceneryOpen()
+WindowBase* WindowClearSceneryOpen()
 {
     auto* w = static_cast<CleanSceneryWindow*>(WindowBringToFrontByClass(WindowClass::ClearScenery));
 
diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp
index 8e7f673ec5..b5806b2530 100644
--- a/src/openrct2-ui/windows/CustomCurrency.cpp
+++ b/src/openrct2-ui/windows/CustomCurrency.cpp
@@ -220,7 +220,7 @@ public:
     }
 };
 
-rct_window* CustomCurrencyWindowOpen()
+WindowBase* CustomCurrencyWindowOpen()
 {
     return WindowFocusOrCreate<CustomCurrencyWindow>(WindowClass::CustomCurrencyConfig, WW, WH, WF_CENTRE_SCREEN);
 }
diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp
index 0a5fbaa424..18e134b733 100644
--- a/src/openrct2-ui/windows/DebugPaint.cpp
+++ b/src/openrct2-ui/windows/DebugPaint.cpp
@@ -143,7 +143,7 @@ public:
     }
 };
 
-rct_window* WindowDebugPaintOpen()
+WindowBase* WindowDebugPaintOpen()
 {
     auto* window = WindowFocusOrCreate<DebugPaintWindow>(
         WindowClass::DebugPaint, { 16, ContextGetHeight() - 16 - 33 - WINDOW_HEIGHT }, WINDOW_WIDTH, WINDOW_HEIGHT,
diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
index 5a7c41678f..39948972e4 100644
--- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
@@ -92,9 +92,9 @@ public:
     }
 };
 
-rct_window* WindowRideDemolishPromptOpen(const Ride& ride)
+WindowBase* WindowRideDemolishPromptOpen(const Ride& ride)
 {
-    rct_window* w;
+    WindowBase* w;
     DemolishRidePromptWindow* newWindow;
 
     w = WindowFindByClass(WindowClass::DemolishRidePrompt);
diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp
index ce5ec43e54..e5fbf93254 100644
--- a/src/openrct2-ui/windows/Dropdown.cpp
+++ b/src/openrct2-ui/windows/Dropdown.cpp
@@ -433,7 +433,7 @@ void WindowDropdownClose()
  * New function based on 6e914e
  * returns -1 if index is invalid
  */
-int32_t DropdownIndexFromPoint(const ScreenCoordsXY& loc, rct_window* w)
+int32_t DropdownIndexFromPoint(const ScreenCoordsXY& loc, WindowBase* w)
 {
     if (w->classification == WindowClass::Dropdown)
     {
@@ -446,7 +446,7 @@ int32_t DropdownIndexFromPoint(const ScreenCoordsXY& loc, rct_window* w)
 /**
  *  rct2: 0x006ED43D
  */
-void WindowDropdownShowColour(rct_window* w, Widget* widget, uint8_t dropdownColour, uint8_t selectedColour)
+void WindowDropdownShowColour(WindowBase* w, Widget* widget, uint8_t dropdownColour, uint8_t selectedColour)
 {
     int32_t defaultIndex = -1;
     // Set items
diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
index 0e82f07d19..757ab6c65b 100644
--- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
@@ -181,7 +181,7 @@ private:
 
     bool CheckObjectSelection() const
     {
-        rct_window* w;
+        WindowBase* w;
 
         auto [missingObjectType, errorString] = Editor::CheckObjectSelection();
         if (missingObjectType == ObjectType::None)
@@ -390,7 +390,7 @@ private:
  * Creates the main editor top toolbar window.
  * rct2: 0x0066F052 (part of 0x0066EF38)
  */
-rct_window* WindowEditorBottomToolbarOpen()
+WindowBase* WindowEditorBottomToolbarOpen()
 {
     auto* window = WindowCreate<EditorBottomToolbarWindow>(
         WindowClass::BottomToolbar, ScreenCoordsXY(0, ContextGetHeight() - 32), ContextGetWidth(), 32,
diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
index a56edd57f5..cccc9fd226 100644
--- a/src/openrct2-ui/windows/EditorInventionsList.cpp
+++ b/src/openrct2-ui/windows/EditorInventionsList.cpp
@@ -576,7 +576,7 @@ private:
  *
  *  rct2: 0x00684E04
  */
-rct_window* WindowEditorInventionsListOpen()
+WindowBase* WindowEditorInventionsListOpen()
 {
     return WindowFocusOrCreate<InventionListWindow>(
         WindowClass::EditorInventionList, WW, WH, WF_NO_SCROLLING | WF_RESIZABLE | WF_CENTRE_SCREEN);
diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index 675d18f10b..c88a3b40e4 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -1519,7 +1519,7 @@ private:
  *
  * rct2: 0x006AA64E
  */
-rct_window* WindowEditorObjectSelectionOpen()
+WindowBase* WindowEditorObjectSelectionOpen()
 {
     return WindowFocusOrCreate<EditorObjectSelectionWindow>(
         WindowClass::EditorObjectSelection, 755, 400, WF_10 | WF_RESIZABLE | WF_CENTRE_SCREEN);
diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
index 28151533dd..25247f45bc 100644
--- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
+++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
@@ -121,24 +121,24 @@ static Widget *window_editor_objective_options_widgets[] = {
 
 #pragma region Events
 
-static void WindowEditorObjectiveOptionsMainMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowEditorObjectiveOptionsMainResize(rct_window *w);
-static void WindowEditorObjectiveOptionsMainMousedown(rct_window *w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowEditorObjectiveOptionsMainDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowEditorObjectiveOptionsMainUpdate(rct_window *w);
-static void WindowEditorObjectiveOptionsMainTextinput(rct_window *w, WidgetIndex widgetIndex, char *text);
-static void WindowEditorObjectiveOptionsMainInvalidate(rct_window *w);
-static void WindowEditorObjectiveOptionsMainPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowEditorObjectiveOptionsMainMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowEditorObjectiveOptionsMainResize(WindowBase *w);
+static void WindowEditorObjectiveOptionsMainMousedown(WindowBase *w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowEditorObjectiveOptionsMainDropdown(WindowBase *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowEditorObjectiveOptionsMainUpdate(WindowBase *w);
+static void WindowEditorObjectiveOptionsMainTextinput(WindowBase *w, WidgetIndex widgetIndex, char *text);
+static void WindowEditorObjectiveOptionsMainInvalidate(WindowBase *w);
+static void WindowEditorObjectiveOptionsMainPaint(WindowBase *w, DrawPixelInfo *dpi);
 
-static void WindowEditorObjectiveOptionsRidesMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowEditorObjectiveOptionsRidesResize(rct_window *w);
-static void WindowEditorObjectiveOptionsRidesUpdate(rct_window *w);
-static void WindowEditorObjectiveOptionsRidesScrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
-static void WindowEditorObjectiveOptionsRidesScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowEditorObjectiveOptionsRidesScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowEditorObjectiveOptionsRidesInvalidate(rct_window *w);
-static void WindowEditorObjectiveOptionsRidesPaint(rct_window *w, DrawPixelInfo *dpi);
-static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window *w, DrawPixelInfo *dpi, int32_t scrollIndex);
+static void WindowEditorObjectiveOptionsRidesMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowEditorObjectiveOptionsRidesResize(WindowBase *w);
+static void WindowEditorObjectiveOptionsRidesUpdate(WindowBase *w);
+static void WindowEditorObjectiveOptionsRidesScrollgetheight(WindowBase *w, int32_t scrollIndex, int32_t *width, int32_t *height);
+static void WindowEditorObjectiveOptionsRidesScrollmousedown(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowEditorObjectiveOptionsRidesScrollmouseover(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowEditorObjectiveOptionsRidesInvalidate(WindowBase *w);
+static void WindowEditorObjectiveOptionsRidesPaint(WindowBase *w, DrawPixelInfo *dpi);
+static void WindowEditorObjectiveOptionsRidesScrollpaint(WindowBase *w, DrawPixelInfo *dpi, int32_t scrollIndex);
 
 // 0x009A9DF4
 static WindowEventList window_objective_options_main_events([](auto& events)
@@ -188,15 +188,15 @@ static uint64_t window_editor_objective_options_page_hold_down_widgets[] = {
 
 #pragma endregion
 
-static void WindowEditorObjectiveOptionsUpdateDisabledWidgets(rct_window* w);
+static void WindowEditorObjectiveOptionsUpdateDisabledWidgets(WindowBase* w);
 
 /**
  *
  *  rct2: 0x0067137D
  */
-rct_window* WindowEditorObjectiveOptionsOpen()
+WindowBase* WindowEditorObjectiveOptionsOpen()
 {
-    rct_window* w;
+    WindowBase* w;
 
     w = WindowBringToFrontByClass(WindowClass::EditorObjectiveOptions);
     if (w != nullptr)
@@ -215,7 +215,7 @@ rct_window* WindowEditorObjectiveOptionsOpen()
     return w;
 }
 
-static void WindowEditorObjectiveOptionsSetPressedTab(rct_window* w)
+static void WindowEditorObjectiveOptionsSetPressedTab(WindowBase* w)
 {
     int32_t i;
     for (i = WIDX_TAB_1; i <= WIDX_TAB_2; i++)
@@ -223,12 +223,12 @@ static void WindowEditorObjectiveOptionsSetPressedTab(rct_window* w)
     w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
 }
 
-static void WindowEditorObjectiveOptionsAnchorBorderWidgets(rct_window* w)
+static void WindowEditorObjectiveOptionsAnchorBorderWidgets(WindowBase* w)
 {
     w->ResizeFrameWithPage();
 }
 
-static void WindowEditorObjectiveOptionsDrawTabImages(rct_window* w, DrawPixelInfo* dpi)
+static void WindowEditorObjectiveOptionsDrawTabImages(WindowBase* w, DrawPixelInfo* dpi)
 {
     Widget* widget;
     int32_t spriteIndex;
@@ -258,7 +258,7 @@ static void WindowEditorObjectiveOptionsDrawTabImages(rct_window* w, DrawPixelIn
  *
  *  rct2: 0x00668496
  */
-static void WindowEditorObjectiveOptionsSetPage(rct_window* w, int32_t page)
+static void WindowEditorObjectiveOptionsSetPage(WindowBase* w, int32_t page)
 {
     if (w->page == page)
         return;
@@ -283,7 +283,7 @@ static void WindowEditorObjectiveOptionsSetPage(rct_window* w, int32_t page)
  *
  *  rct2: 0x0067201D
  */
-static void WindowEditorObjectiveOptionsSetObjective(rct_window* w, int32_t objective)
+static void WindowEditorObjectiveOptionsSetObjective(WindowBase* w, int32_t objective)
 {
     gScenarioObjective.Type = objective;
     w->Invalidate();
@@ -329,7 +329,7 @@ static void WindowEditorObjectiveOptionsSetObjective(rct_window* w, int32_t obje
  *
  *  rct2: 0x006719CA
  */
-static void WindowEditorObjectiveOptionsMainMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowEditorObjectiveOptionsMainMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -364,12 +364,12 @@ static void WindowEditorObjectiveOptionsMainMouseup(rct_window* w, WidgetIndex w
  *
  *  rct2: 0x00672254
  */
-static void WindowEditorObjectiveOptionsMainResize(rct_window* w)
+static void WindowEditorObjectiveOptionsMainResize(WindowBase* w)
 {
     WindowSetResize(*w, 450, 229, 450, 229);
 }
 
-static void WindowEditorObjectiveOptionsShowObjectiveDropdown(rct_window* w)
+static void WindowEditorObjectiveOptionsShowObjectiveDropdown(WindowBase* w)
 {
     int32_t numItems = 0, objectiveType;
     Widget* dropdownWidget;
@@ -409,7 +409,7 @@ static void WindowEditorObjectiveOptionsShowObjectiveDropdown(rct_window* w)
     }
 }
 
-static void WindowEditorObjectiveOptionsShowCategoryDropdown(rct_window* w)
+static void WindowEditorObjectiveOptionsShowCategoryDropdown(WindowBase* w)
 {
     int32_t i;
     Widget* dropdownWidget;
@@ -427,7 +427,7 @@ static void WindowEditorObjectiveOptionsShowCategoryDropdown(rct_window* w)
     Dropdown::SetChecked(gScenarioCategory, true);
 }
 
-static void WindowEditorObjectiveOptionsArg1Increase(rct_window* w)
+static void WindowEditorObjectiveOptionsArg1Increase(WindowBase* w)
 {
     switch (gScenarioObjective.Type)
     {
@@ -491,7 +491,7 @@ static void WindowEditorObjectiveOptionsArg1Increase(rct_window* w)
     }
 }
 
-static void WindowEditorObjectiveOptionsArg1Decrease(rct_window* w)
+static void WindowEditorObjectiveOptionsArg1Decrease(WindowBase* w)
 {
     switch (gScenarioObjective.Type)
     {
@@ -555,7 +555,7 @@ static void WindowEditorObjectiveOptionsArg1Decrease(rct_window* w)
     }
 }
 
-static void WindowEditorObjectiveOptionsArg2Increase(rct_window* w)
+static void WindowEditorObjectiveOptionsArg2Increase(WindowBase* w)
 {
     if (gScenarioObjective.Year >= 25)
     {
@@ -568,7 +568,7 @@ static void WindowEditorObjectiveOptionsArg2Increase(rct_window* w)
     }
 }
 
-static void WindowEditorObjectiveOptionsArg2Decrease(rct_window* w)
+static void WindowEditorObjectiveOptionsArg2Decrease(WindowBase* w)
 {
     if (gScenarioObjective.Year <= 1)
     {
@@ -585,7 +585,7 @@ static void WindowEditorObjectiveOptionsArg2Decrease(rct_window* w)
  *
  *  rct2: 0x00671A0D
  */
-static void WindowEditorObjectiveOptionsMainMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowEditorObjectiveOptionsMainMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -614,7 +614,7 @@ static void WindowEditorObjectiveOptionsMainMousedown(rct_window* w, WidgetIndex
  *
  *  rct2: 0x00671A54
  */
-static void WindowEditorObjectiveOptionsMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowEditorObjectiveOptionsMainDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     uint8_t newObjectiveType;
 
@@ -643,7 +643,7 @@ static void WindowEditorObjectiveOptionsMainDropdown(rct_window* w, WidgetIndex
  *
  *  rct2: 0x006721E7
  */
-static void WindowEditorObjectiveOptionsMainUpdate(rct_window* w)
+static void WindowEditorObjectiveOptionsMainUpdate(WindowBase* w)
 {
     uint32_t parkFlags;
     uint8_t objectiveType;
@@ -670,7 +670,7 @@ static void WindowEditorObjectiveOptionsMainUpdate(rct_window* w)
  *
  *  rct2: 0x00671A73
  */
-static void WindowEditorObjectiveOptionsMainTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowEditorObjectiveOptionsMainTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if (text == nullptr)
         return;
@@ -704,7 +704,7 @@ static void WindowEditorObjectiveOptionsMainTextinput(rct_window* w, WidgetIndex
  *
  *  rct2: 0x0067161C
  */
-static void WindowEditorObjectiveOptionsMainInvalidate(rct_window* w)
+static void WindowEditorObjectiveOptionsMainInvalidate(WindowBase* w)
 {
     auto widgets = window_editor_objective_options_widgets[w->page];
     if (w->widgets != widgets)
@@ -760,7 +760,7 @@ static void WindowEditorObjectiveOptionsMainInvalidate(rct_window* w)
  *
  *  rct2: 0x0067161C
  */
-static void WindowEditorObjectiveOptionsMainPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowEditorObjectiveOptionsMainPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     int32_t width;
     StringId stringId;
@@ -906,7 +906,7 @@ static void WindowEditorObjectiveOptionsMainPaint(rct_window* w, DrawPixelInfo*
  *
  *  rct2: 0x006724A4
  */
-static void WindowEditorObjectiveOptionsRidesMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowEditorObjectiveOptionsRidesMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -924,7 +924,7 @@ static void WindowEditorObjectiveOptionsRidesMouseup(rct_window* w, WidgetIndex
  *
  *  rct2: 0x006725A8
  */
-static void WindowEditorObjectiveOptionsRidesResize(rct_window* w)
+static void WindowEditorObjectiveOptionsRidesResize(WindowBase* w)
 {
     WindowSetResize(*w, 380, 224, 380, 224);
 }
@@ -933,7 +933,7 @@ static void WindowEditorObjectiveOptionsRidesResize(rct_window* w)
  *
  *  rct2: 0x00672544
  */
-static void WindowEditorObjectiveOptionsRidesUpdate(rct_window* w)
+static void WindowEditorObjectiveOptionsRidesUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -962,7 +962,7 @@ static void WindowEditorObjectiveOptionsRidesUpdate(rct_window* w)
  *  rct2: 0x006724BF
  */
 static void WindowEditorObjectiveOptionsRidesScrollgetheight(
-    rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+    WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     *height = w->no_list_items * 12;
 }
@@ -972,7 +972,7 @@ static void WindowEditorObjectiveOptionsRidesScrollgetheight(
  *  rct2: 0x006724FC
  */
 static void WindowEditorObjectiveOptionsRidesScrollmousedown(
-    rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+    WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     auto i = screenCoords.y / 12;
     if (i < 0 || i >= w->no_list_items)
@@ -992,7 +992,7 @@ static void WindowEditorObjectiveOptionsRidesScrollmousedown(
  *  rct2: 0x006724CC
  */
 static void WindowEditorObjectiveOptionsRidesScrollmouseover(
-    rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+    WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t i;
 
@@ -1011,7 +1011,7 @@ static void WindowEditorObjectiveOptionsRidesScrollmouseover(
  *
  *  rct2: 0x006722B5
  */
-static void WindowEditorObjectiveOptionsRidesInvalidate(rct_window* w)
+static void WindowEditorObjectiveOptionsRidesInvalidate(WindowBase* w)
 {
     Widget* widgets;
 
@@ -1035,7 +1035,7 @@ static void WindowEditorObjectiveOptionsRidesInvalidate(rct_window* w)
  *
  *  rct2: 0x00672340
  */
-static void WindowEditorObjectiveOptionsRidesPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowEditorObjectiveOptionsRidesPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowEditorObjectiveOptionsDrawTabImages(w, dpi);
@@ -1048,7 +1048,7 @@ static void WindowEditorObjectiveOptionsRidesPaint(rct_window* w, DrawPixelInfo*
  *
  *  rct2: 0x0067236F
  */
-static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowEditorObjectiveOptionsRidesScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     int32_t colour = ColourMapA[w->colours[1]].mid_light;
     GfxFillRect(dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } }, colour);
@@ -1097,7 +1097,7 @@ static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window* w, DrawPixe
  *
  *  rct2: 0x00672609
  */
-static void WindowEditorObjectiveOptionsUpdateDisabledWidgets(rct_window* w)
+static void WindowEditorObjectiveOptionsUpdateDisabledWidgets(WindowBase* w)
 {
     // Check if there are any rides (not shops or facilities)
     const auto& rideManager = GetRideManager();
diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
index 8135e91f7c..820d5763ad 100644
--- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp
+++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
@@ -1236,7 +1236,7 @@ private:
 #pragma endregion
 };
 
-rct_window* WindowEditorScenarioOptionsOpen()
+WindowBase* WindowEditorScenarioOptionsOpen()
 {
     return WindowFocusOrCreate<EditorScenarioOptionsWindow>(WindowClass::EditorScenarioOptions, 280, 148, WF_NO_SCROLLING);
 }
diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp
index cf60353b73..38527f967d 100644
--- a/src/openrct2-ui/windows/Error.cpp
+++ b/src/openrct2-ui/windows/Error.cpp
@@ -107,7 +107,7 @@ public:
     }
 };
 
-rct_window* WindowErrorOpen(std::string_view title, std::string_view message)
+WindowBase* WindowErrorOpen(std::string_view title, std::string_view message)
 {
     WindowCloseByClass(WindowClass::Error);
 
@@ -161,7 +161,7 @@ rct_window* WindowErrorOpen(std::string_view title, std::string_view message)
         WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_RESIZABLE);
 }
 
-rct_window* WindowErrorOpen(StringId title, StringId message, const Formatter& args)
+WindowBase* WindowErrorOpen(StringId title, StringId message, const Formatter& args)
 {
     auto titlez = FormatStringID(title, args.Data());
     auto messagez = FormatStringID(message, args.Data());
diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp
index d21cb4ffee..8de723064b 100644
--- a/src/openrct2-ui/windows/Finances.cpp
+++ b/src/openrct2-ui/windows/Finances.cpp
@@ -1037,17 +1037,17 @@ static FinancesWindow* FinancesWindowOpen(uint8_t page)
     return window;
 }
 
-rct_window* WindowFinancesOpen()
+WindowBase* WindowFinancesOpen()
 {
     return WindowFocusOrCreate<FinancesWindow>(WindowClass::Finances, WW_OTHER_TABS, WH_SUMMARY, WF_10);
 }
 
-rct_window* WindowFinancesResearchOpen()
+WindowBase* WindowFinancesResearchOpen()
 {
     return FinancesWindowOpen(WINDOW_FINANCES_PAGE_RESEARCH);
 }
 
-rct_window* WindowFinancesMarketingOpen()
+WindowBase* WindowFinancesMarketingOpen()
 {
     return FinancesWindowOpen(WINDOW_FINANCES_PAGE_MARKETING);
 }
diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp
index 7e51268b65..7df93b085b 100644
--- a/src/openrct2-ui/windows/Footpath.cpp
+++ b/src/openrct2-ui/windows/Footpath.cpp
@@ -1406,7 +1406,7 @@ public:
  *
  *  rct2: 0x006A7C43
  */
-rct_window* WindowFootpathOpen()
+WindowBase* WindowFootpathOpen()
 {
     if (!FootpathSelectDefault())
     {
@@ -1424,7 +1424,7 @@ void WindowFootpathResetSelectedPath()
 
 void WindowFootpathKeyboardShortcutTurnLeft()
 {
-    rct_window* w = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* w = WindowFindByClass(WindowClass::Footpath);
     if (w != nullptr)
     {
         auto* footpathWindow = static_cast<FootpathWindow*>(w);
@@ -1437,7 +1437,7 @@ void WindowFootpathKeyboardShortcutTurnLeft()
 
 void WindowFootpathKeyboardShortcutTurnRight()
 {
-    rct_window* w = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* w = WindowFindByClass(WindowClass::Footpath);
     if (w != nullptr)
     {
         auto* footpathWindow = static_cast<FootpathWindow*>(w);
@@ -1450,7 +1450,7 @@ void WindowFootpathKeyboardShortcutTurnRight()
 
 void WindowFootpathKeyboardShortcutSlopeDown()
 {
-    rct_window* w = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* w = WindowFindByClass(WindowClass::Footpath);
     if (w != nullptr)
     {
         auto* footpathWindow = static_cast<FootpathWindow*>(w);
@@ -1463,7 +1463,7 @@ void WindowFootpathKeyboardShortcutSlopeDown()
 
 void WindowFootpathKeyboardShortcutSlopeUp()
 {
-    rct_window* w = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* w = WindowFindByClass(WindowClass::Footpath);
     if (w != nullptr)
     {
         auto* footpathWindow = static_cast<FootpathWindow*>(w);
@@ -1476,7 +1476,7 @@ void WindowFootpathKeyboardShortcutSlopeUp()
 
 void WindowFootpathKeyboardShortcutDemolishCurrent()
 {
-    rct_window* w = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* w = WindowFindByClass(WindowClass::Footpath);
     if (w != nullptr)
     {
         auto* footpathWindow = static_cast<FootpathWindow*>(w);
@@ -1489,7 +1489,7 @@ void WindowFootpathKeyboardShortcutDemolishCurrent()
 
 void WindowFootpathKeyboardShortcutBuildCurrent()
 {
-    rct_window* w = WindowFindByClass(WindowClass::Footpath);
+    WindowBase* w = WindowFindByClass(WindowClass::Footpath);
     if (w != nullptr)
     {
         auto* footpathWindow = static_cast<FootpathWindow*>(w);
diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index ee44904414..9553845b17 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -69,19 +69,19 @@ static Widget window_game_bottom_toolbar_widgets[] =
 
 uint8_t gToolbarDirtyFlags;
 
-static void WindowGameBottomToolbarMouseup(rct_window *w, WidgetIndex widgetIndex);
-static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback);
-static void WindowGameBottomToolbarInvalidate(rct_window *w);
-static void WindowGameBottomToolbarPaint(rct_window *w, DrawPixelInfo *dpi);
-static void WindowGameBottomToolbarUpdate(rct_window* w);
-static void WindowGameBottomToolbarCursor(rct_window *w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
-static void WindowGameBottomToolbarUnknown05(rct_window *w);
+static void WindowGameBottomToolbarMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static OpenRCT2String WindowGameBottomToolbarTooltip(WindowBase* w, const WidgetIndex widgetIndex, const StringId fallback);
+static void WindowGameBottomToolbarInvalidate(WindowBase *w);
+static void WindowGameBottomToolbarPaint(WindowBase *w, DrawPixelInfo *dpi);
+static void WindowGameBottomToolbarUpdate(WindowBase* w);
+static void WindowGameBottomToolbarCursor(WindowBase *w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID *cursorId);
+static void WindowGameBottomToolbarUnknown05(WindowBase *w);
 
-static void WindowGameBottomToolbarDrawLeftPanel(DrawPixelInfo *dpi, rct_window *w);
-static void WindowGameBottomToolbarDrawParkRating(DrawPixelInfo *dpi, rct_window *w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor);
-static void WindowGameBottomToolbarDrawRightPanel(DrawPixelInfo *dpi, rct_window *w);
-static void WindowGameBottomToolbarDrawNewsItem(DrawPixelInfo *dpi, rct_window *w);
-static void WindowGameBottomToolbarDrawMiddlePanel(DrawPixelInfo *dpi, rct_window *w);
+static void WindowGameBottomToolbarDrawLeftPanel(DrawPixelInfo *dpi, WindowBase *w);
+static void WindowGameBottomToolbarDrawParkRating(DrawPixelInfo *dpi, WindowBase *w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor);
+static void WindowGameBottomToolbarDrawRightPanel(DrawPixelInfo *dpi, WindowBase *w);
+static void WindowGameBottomToolbarDrawNewsItem(DrawPixelInfo *dpi, WindowBase *w);
+static void WindowGameBottomToolbarDrawMiddlePanel(DrawPixelInfo *dpi, WindowBase *w);
 
 /**
  *
@@ -99,13 +99,13 @@ static WindowEventList window_game_bottom_toolbar_events([](auto& events)
 });
 // clang-format on
 
-static void WindowGameBottomToolbarInvalidateDirtyWidgets(rct_window* w);
+static void WindowGameBottomToolbarInvalidateDirtyWidgets(WindowBase* w);
 
 /**
  * Creates the main game bottom toolbar window.
  *  rct2: 0x0066B52F (part of 0x0066B3E8)
  */
-rct_window* WindowGameBottomToolbarOpen()
+WindowBase* WindowGameBottomToolbarOpen()
 {
     int32_t screenWidth = ContextGetWidth();
     int32_t screenHeight = ContextGetHeight();
@@ -114,7 +114,7 @@ rct_window* WindowGameBottomToolbarOpen()
     uint32_t line_height = FontGetLineHeight(FontStyle::Medium);
     uint32_t toolbar_height = line_height * 2 + 12;
 
-    rct_window* window = WindowCreate(
+    WindowBase* window = WindowCreate(
         ScreenCoordsXY(0, screenHeight - toolbar_height), screenWidth, toolbar_height, &window_game_bottom_toolbar_events,
         WindowClass::BottomToolbar, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
     window->widgets = window_game_bottom_toolbar_widgets;
@@ -133,7 +133,7 @@ rct_window* WindowGameBottomToolbarOpen()
  *
  *  rct2: 0x0066C588
  */
-static void WindowGameBottomToolbarMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowGameBottomToolbarMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     News::Item* newsItem;
 
@@ -176,7 +176,7 @@ static void WindowGameBottomToolbarMouseup(rct_window* w, WidgetIndex widgetInde
                 if (!subjectLoc.has_value())
                     break;
 
-                rct_window* mainWindow = WindowGetMain();
+                WindowBase* mainWindow = WindowGetMain();
                 if (mainWindow != nullptr)
                     WindowScrollToLocation(*mainWindow, subjectLoc.value());
             }
@@ -188,7 +188,7 @@ static void WindowGameBottomToolbarMouseup(rct_window* w, WidgetIndex widgetInde
     }
 }
 
-static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback)
+static OpenRCT2String WindowGameBottomToolbarTooltip(WindowBase* w, const WidgetIndex widgetIndex, const StringId fallback)
 {
     int32_t month, day;
     auto ft = Formatter();
@@ -217,7 +217,7 @@ static OpenRCT2String WindowGameBottomToolbarTooltip(rct_window* w, const Widget
  *
  *  rct2: 0x0066BBA0
  */
-static void WindowGameBottomToolbarInvalidate(rct_window* w)
+static void WindowGameBottomToolbarInvalidate(WindowBase* w)
 {
     // Figure out how much line height we have to work with.
     uint32_t line_height = FontGetLineHeight(FontStyle::Medium);
@@ -346,7 +346,7 @@ void WindowGameBottomToolbarInvalidateNewsItem()
  *
  *  rct2: 0x0066BC87
  */
-static void WindowGameBottomToolbarPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowGameBottomToolbarPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     auto leftWidget = window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET];
     auto rightWidget = window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET];
@@ -384,7 +384,7 @@ static void WindowGameBottomToolbarPaint(rct_window* w, DrawPixelInfo* dpi)
     }
 }
 
-static void WindowGameBottomToolbarDrawLeftPanel(DrawPixelInfo* dpi, rct_window* w)
+static void WindowGameBottomToolbarDrawLeftPanel(DrawPixelInfo* dpi, WindowBase* w)
 {
     const auto topLeft = w->windowPos
         + ScreenCoordsXY{ window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].left + 1,
@@ -458,7 +458,7 @@ static void WindowGameBottomToolbarDrawLeftPanel(DrawPixelInfo* dpi, rct_window*
  *  rct2: 0x0066C76C
  */
 static void WindowGameBottomToolbarDrawParkRating(
-    DrawPixelInfo* dpi, rct_window* w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor)
+    DrawPixelInfo* dpi, WindowBase* w, int32_t colour, const ScreenCoordsXY& coords, uint8_t factor)
 {
     int16_t bar_width;
 
@@ -478,7 +478,7 @@ static void WindowGameBottomToolbarDrawParkRating(
     GfxDrawSprite(dpi, ImageId(SPR_RATING_HIGH), coords + ScreenCoordsXY{ 114, 0 });
 }
 
-static void WindowGameBottomToolbarDrawRightPanel(DrawPixelInfo* dpi, rct_window* w)
+static void WindowGameBottomToolbarDrawRightPanel(DrawPixelInfo* dpi, WindowBase* w)
 {
     const auto topLeft = w->windowPos
         + ScreenCoordsXY{ window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left + 1,
@@ -550,7 +550,7 @@ static void WindowGameBottomToolbarDrawRightPanel(DrawPixelInfo* dpi, rct_window
  *
  *  rct2: 0x0066BFA5
  */
-static void WindowGameBottomToolbarDrawNewsItem(DrawPixelInfo* dpi, rct_window* w)
+static void WindowGameBottomToolbarDrawNewsItem(DrawPixelInfo* dpi, WindowBase* w)
 {
     int32_t width;
     News::Item* newsItem;
@@ -651,7 +651,7 @@ static void WindowGameBottomToolbarDrawNewsItem(DrawPixelInfo* dpi, rct_window*
     }
 }
 
-static void WindowGameBottomToolbarDrawMiddlePanel(DrawPixelInfo* dpi, rct_window* w)
+static void WindowGameBottomToolbarDrawMiddlePanel(DrawPixelInfo* dpi, WindowBase* w)
 {
     Widget* middleOutsetWidget = &window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET];
 
@@ -688,7 +688,7 @@ static void WindowGameBottomToolbarDrawMiddlePanel(DrawPixelInfo* dpi, rct_windo
  *
  *  rct2: 0x0066C6D8
  */
-static void WindowGameBottomToolbarUpdate(rct_window* w)
+static void WindowGameBottomToolbarUpdate(WindowBase* w)
 {
     w->frame_no++;
     if (w->frame_no >= 24)
@@ -702,7 +702,7 @@ static void WindowGameBottomToolbarUpdate(rct_window* w)
  *  rct2: 0x0066C644
  */
 static void WindowGameBottomToolbarCursor(
-    rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
+    WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords, CursorID* cursorId)
 {
     switch (widgetIndex)
     {
@@ -719,7 +719,7 @@ static void WindowGameBottomToolbarCursor(
  *
  *  rct2: 0x0066C6F2
  */
-static void WindowGameBottomToolbarUnknown05(rct_window* w)
+static void WindowGameBottomToolbarUnknown05(WindowBase* w)
 {
     WindowGameBottomToolbarInvalidateDirtyWidgets(w);
 }
@@ -728,7 +728,7 @@ static void WindowGameBottomToolbarUnknown05(rct_window* w)
  *
  *  rct2: 0x0066C6F2
  */
-static void WindowGameBottomToolbarInvalidateDirtyWidgets(rct_window* w)
+static void WindowGameBottomToolbarInvalidateDirtyWidgets(WindowBase* w)
 {
     if (gToolbarDirtyFlags & BTM_TB_DIRTY_FLAG_MONEY)
     {
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index a72423c036..364cbb63ff 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -625,7 +625,7 @@ private:
                 pickupAction.SetCallback([peepnum = number](const GameAction* ga, const GameActions::Result* result) {
                     if (result->Error != GameActions::Status::Ok)
                         return;
-                    rct_window* wind = WindowFindByNumber(WindowClass::Peep, peepnum);
+                    WindowBase* wind = WindowFindByNumber(WindowClass::Peep, peepnum);
                     if (wind != nullptr)
                     {
                         ToolSet(*wind, WC_PEEP__WIDX_PICKUP, Tool::Picker);
@@ -692,7 +692,7 @@ private:
 
     void GuestFollow()
     {
-        rct_window* main = WindowGetMain();
+        WindowBase* main = WindowGetMain();
         WindowFollowSprite(*main, EntityId::FromUnderlying(number));
     }
 
@@ -1908,7 +1908,7 @@ private:
  *  rct2: 0x006989E9
  *
  */
-rct_window* WindowGuestOpen(Peep* peep)
+WindowBase* WindowGuestOpen(Peep* peep)
 {
     if (peep == nullptr)
     {
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index 211c77073c..4be3e690fe 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -955,7 +955,7 @@ private:
     }
 };
 
-rct_window* WindowGuestListOpen()
+WindowBase* WindowGuestListOpen()
 {
     auto* window = WindowBringToFrontByClass(WindowClass::GuestList);
     if (window == nullptr)
@@ -968,7 +968,7 @@ rct_window* WindowGuestListOpen()
 /**
  * @param index The number of the ride or index of the thought
  */
-rct_window* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index)
+WindowBase* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index)
 {
     auto* w = static_cast<GuestListWindow*>(WindowGuestListOpen());
     if (w != nullptr)
diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp
index 65fb320ea9..53c5b0cdf3 100644
--- a/src/openrct2-ui/windows/InstallTrack.cpp
+++ b/src/openrct2-ui/windows/InstallTrack.cpp
@@ -401,7 +401,7 @@ private:
     }
 };
 
-rct_window* WindowInstallTrackOpen(const utf8* path)
+WindowBase* WindowInstallTrackOpen(const utf8* path)
 {
     auto trackDesign = TrackDesignImport(path);
     if (trackDesign == nullptr)
diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp
index 01c62435d8..1648af3996 100644
--- a/src/openrct2-ui/windows/Land.cpp
+++ b/src/openrct2-ui/windows/Land.cpp
@@ -338,7 +338,7 @@ private:
     }
 };
 
-rct_window* WindowLandOpen()
+WindowBase* WindowLandOpen()
 {
     return WindowFocusOrCreate<LandWindow>(WindowClass::Land, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0);
 }
diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp
index 5a4bab1f15..abae7d7e22 100644
--- a/src/openrct2-ui/windows/LandRights.cpp
+++ b/src/openrct2-ui/windows/LandRights.cpp
@@ -399,7 +399,7 @@ private:
     }
 };
 
-rct_window* WindowLandRightsOpen()
+WindowBase* WindowLandRightsOpen()
 {
     return WindowFocusOrCreate<LandRightsWindow>(
         WindowClass::LandRights, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0);
diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index 3f10762b6c..66f4c781a5 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -82,7 +82,7 @@ static Widget window_loadsave_widgets[] =
 
 #pragma endregion
 
-static rct_window* WindowOverwritePromptOpen(const char* name, const char* path);
+static WindowBase* WindowOverwritePromptOpen(const char* name, const char* path);
 
 enum
 {
@@ -1031,7 +1031,7 @@ public:
 #pragma endregion
 };
 
-rct_window* WindowLoadsaveOpen(
+WindowBase* WindowLoadsaveOpen(
     int32_t type, std::string_view defaultPath, std::function<void(int32_t result, std::string_view)> callback,
     TrackDesign* trackDesign)
 {
@@ -1117,8 +1117,8 @@ static Widget window_overwrite_prompt_widgets[] = {
     WIDGETS_END,
 };
 
-static void WindowOverwritePromptMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowOverwritePromptPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowOverwritePromptMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowOverwritePromptPaint(WindowBase* w, DrawPixelInfo* dpi);
 
 static WindowEventList window_overwrite_prompt_events([](auto& events) {
     events.mouse_up = &WindowOverwritePromptMouseup;
@@ -1128,9 +1128,9 @@ static WindowEventList window_overwrite_prompt_events([](auto& events) {
 static char _window_overwrite_prompt_name[256];
 static char _window_overwrite_prompt_path[MAX_PATH];
 
-static rct_window* WindowOverwritePromptOpen(const char* name, const char* path)
+static WindowBase* WindowOverwritePromptOpen(const char* name, const char* path)
 {
-    rct_window* w;
+    WindowBase* w;
 
     WindowCloseByClass(WindowClass::LoadsaveOverwritePrompt);
 
@@ -1149,7 +1149,7 @@ static rct_window* WindowOverwritePromptOpen(const char* name, const char* path)
     return w;
 }
 
-static void WindowOverwritePromptMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowOverwritePromptMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -1170,7 +1170,7 @@ static void WindowOverwritePromptMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowOverwritePromptPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowOverwritePromptPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
 
diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp
index 53b0f137b9..b37b39c74d 100644
--- a/src/openrct2-ui/windows/Main.cpp
+++ b/src/openrct2-ui/windows/Main.cpp
@@ -71,7 +71,7 @@ private:
  * Creates the main window that holds the main viewport.
  *  rct2: 0x0066B3E8
  */
-rct_window* WindowMainOpen()
+WindowBase* WindowMainOpen()
 {
     return WindowCreate<MainWindow>(WindowClass::MainWindow, { 0, 0 }, ContextGetWidth(), ContextGetHeight(), WF_STICK_TO_BACK);
 }
diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index 4ea0da55cc..cc1686bbaf 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -650,7 +650,7 @@ public:
         auto mapCoords = CoordsXY{ std::clamp(c.x, 0, MAXIMUM_MAP_SIZE_BIG - 1), std::clamp(c.y, 0, MAXIMUM_MAP_SIZE_BIG - 1) };
         auto mapZ = TileElementHeight(mapCoords);
 
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             WindowScrollToLocation(*mainWindow, { mapCoords, mapZ });
@@ -928,7 +928,7 @@ private:
 
     void CentreMapOnViewPoint()
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         int16_t ax, bx, cx, dx;
         int16_t bp, di;
 
@@ -1243,11 +1243,11 @@ private:
      */
     void PaintHudRectangle(DrawPixelInfo* dpi)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow == nullptr)
             return;
 
-        rct_viewport* mainViewport = mainWindow->viewport;
+        Viewport* mainViewport = mainWindow->viewport;
         if (mainViewport == nullptr)
             return;
 
@@ -1441,11 +1441,11 @@ private:
     };
 };
 
-rct_window* WindowMapOpen()
+WindowBase* WindowMapOpen()
 {
     try
     {
-        rct_window* w = WindowFocusOrCreate<MapWindow>(WindowClass::Map, 245, 259, WF_10);
+        WindowBase* w = WindowFocusOrCreate<MapWindow>(WindowClass::Map, 245, 259, WF_10);
         w->selected_tab = 0;
         w->list_information_type = 0;
         return w;
@@ -1458,7 +1458,7 @@ rct_window* WindowMapOpen()
 
 void WindowMapReset()
 {
-    rct_window* w;
+    WindowBase* w;
 
     // Check if window is even opened
     w = WindowBringToFrontByClass(WindowClass::Map);
diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp
index 3e34f778a7..27252433c6 100644
--- a/src/openrct2-ui/windows/MapGen.cpp
+++ b/src/openrct2-ui/windows/MapGen.cpp
@@ -197,34 +197,34 @@ static Widget* PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
 
 #pragma region Events
 
-static void WindowMapgenSharedClose(rct_window* w);
-static void WindowMapgenSharedMouseup(rct_window* w, WidgetIndex widgetIndex);
+static void WindowMapgenSharedClose(WindowBase* w);
+static void WindowMapgenSharedMouseup(WindowBase* w, WidgetIndex widgetIndex);
 
-static void WindowMapgenBaseMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowMapgenBaseMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowMapgenBaseDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowMapgenBaseUpdate(rct_window* w);
-static void WindowMapgenTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
-static void WindowMapgenBaseInvalidate(rct_window* w);
-static void WindowMapgenBasePaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowMapgenBaseMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowMapgenBaseMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowMapgenBaseDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowMapgenBaseUpdate(WindowBase* w);
+static void WindowMapgenTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text);
+static void WindowMapgenBaseInvalidate(WindowBase* w);
+static void WindowMapgenBasePaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowMapgenRandomMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowMapgenRandomMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowMapgenRandomUpdate(rct_window* w);
-static void WindowMapgenRandomInvalidate(rct_window* w);
-static void WindowMapgenRandomPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowMapgenRandomMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowMapgenRandomMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowMapgenRandomUpdate(WindowBase* w);
+static void WindowMapgenRandomInvalidate(WindowBase* w);
+static void WindowMapgenRandomPaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowMapgenSimplexMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowMapgenSimplexMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowMapgenSimplexDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowMapgenSimplexUpdate(rct_window* w);
-static void WindowMapgenSimplexInvalidate(rct_window* w);
-static void WindowMapgenSimplexPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowMapgenSimplexMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowMapgenSimplexMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowMapgenSimplexDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowMapgenSimplexUpdate(WindowBase* w);
+static void WindowMapgenSimplexInvalidate(WindowBase* w);
+static void WindowMapgenSimplexPaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowMapgenHeightmapMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowMapgenHeightmapMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowMapgenHeightmapInvalidate(rct_window* w);
-static void WindowMapgenHeightmapPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowMapgenHeightmapMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowMapgenHeightmapMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowMapgenHeightmapInvalidate(WindowBase* w);
+static void WindowMapgenHeightmapPaint(WindowBase* w, DrawPixelInfo* dpi);
 
 static WindowEventList BaseEvents([](auto& events) {
     events.close = &WindowMapgenSharedClose;
@@ -374,9 +374,9 @@ constexpr int32_t WATERLEVEL_MIN = 0;
 constexpr int32_t WATERLEVEL_MAX = 54;
 constexpr int32_t MAX_SMOOTH_ITERATIONS = 20;
 
-static void WindowMapgenSetPage(rct_window* w, int32_t page);
-static void WindowMapgenSetPressedTab(rct_window* w);
-static void WindowMapgenDrawTabImages(DrawPixelInfo* dpi, rct_window* w);
+static void WindowMapgenSetPage(WindowBase* w, int32_t page);
+static void WindowMapgenSetPressedTab(WindowBase* w);
+static void WindowMapgenDrawTabImages(DrawPixelInfo* dpi, WindowBase* w);
 
 enum class ResizeDirection
 {
@@ -419,9 +419,9 @@ static void WindowMapgenChangeMapSize(int32_t sizeOffset)
         _mapSize.x = std::clamp(_mapSize.x + sizeOffset, MINIMUM_MAP_SIZE_TECHNICAL, MAXIMUM_MAP_SIZE_TECHNICAL);
 }
 
-rct_window* WindowMapgenOpen()
+WindowBase* WindowMapgenOpen()
 {
-    rct_window* w = WindowBringToFrontByClass(WindowClass::Mapgen);
+    WindowBase* w = WindowBringToFrontByClass(WindowClass::Mapgen);
     if (w != nullptr)
     {
         return w;
@@ -445,12 +445,12 @@ rct_window* WindowMapgenOpen()
     return w;
 }
 
-static void WindowMapgenSharedClose(rct_window* w)
+static void WindowMapgenSharedClose(WindowBase* w)
 {
     MapGenUnloadHeightmap();
 }
 
-static void WindowMapgenSharedMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMapgenSharedMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -466,7 +466,7 @@ static void WindowMapgenSharedMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowMapgenInputMapSize(rct_window* w, WidgetIndex callingWidget, int32_t currentValue)
+static void WindowMapgenInputMapSize(WindowBase* w, WidgetIndex callingWidget, int32_t currentValue)
 {
     Formatter ft;
     ft.Add<int16_t>(MINIMUM_MAP_SIZE_PRACTICAL);
@@ -479,7 +479,7 @@ static void WindowMapgenInputMapSize(rct_window* w, WidgetIndex callingWidget, i
 
 #pragma region Base page
 
-static void WindowMapgenBaseMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMapgenBaseMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowMapgenSharedMouseup(w, widgetIndex);
 
@@ -523,7 +523,7 @@ static void WindowMapgenBaseMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowMapgenBaseMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowMapgenBaseMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -572,7 +572,7 @@ static void WindowMapgenBaseMousedown(rct_window* w, WidgetIndex widgetIndex, Wi
     }
 }
 
-static void WindowMapgenBaseDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowMapgenBaseDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     int32_t type;
 
@@ -615,7 +615,7 @@ static void WindowMapgenBaseDropdown(rct_window* w, WidgetIndex widgetIndex, int
     }
 }
 
-static void WindowMapgenBaseUpdate(rct_window* w)
+static void WindowMapgenBaseUpdate(WindowBase* w)
 {
     // Tab animation
     if (++w->frame_no >= TabAnimationLoops[w->page])
@@ -623,7 +623,7 @@ static void WindowMapgenBaseUpdate(rct_window* w)
     WidgetInvalidate(*w, WIDX_TAB_1);
 }
 
-static void WindowMapgenTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowMapgenTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     int32_t value;
     char* end;
@@ -662,7 +662,7 @@ static void WindowMapgenTextinput(rct_window* w, WidgetIndex widgetIndex, char*
     w->Invalidate();
 }
 
-static void WindowMapgenBaseInvalidate(rct_window* w)
+static void WindowMapgenBaseInvalidate(WindowBase* w)
 {
     if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_BASE])
     {
@@ -682,7 +682,7 @@ static void WindowMapgenBaseInvalidate(rct_window* w)
     ft.Add<uint16_t>(_mapSize.x - 2);
 }
 
-static void WindowMapgenDrawDropdownButton(rct_window* w, DrawPixelInfo* dpi, WidgetIndex widgetIndex, ImageId image)
+static void WindowMapgenDrawDropdownButton(WindowBase* w, DrawPixelInfo* dpi, WidgetIndex widgetIndex, ImageId image)
 {
     const auto& widget = w->widgets[widgetIndex];
     ScreenCoordsXY pos = { w->windowPos.x + widget.left, w->windowPos.y + widget.top };
@@ -705,7 +705,7 @@ static void WindowMapgenDrawDropdownButton(rct_window* w, DrawPixelInfo* dpi, Wi
 }
 
 static void WindowMapgenDrawDropdownButtons(
-    rct_window* w, DrawPixelInfo* dpi, WidgetIndex floorWidgetIndex, WidgetIndex edgeWidgetIndex)
+    WindowBase* w, DrawPixelInfo* dpi, WidgetIndex floorWidgetIndex, WidgetIndex edgeWidgetIndex)
 {
     auto& objManager = GetContext()->GetObjectManager();
     const auto surfaceObj = static_cast<TerrainSurfaceObject*>(
@@ -731,7 +731,7 @@ static void WindowMapgenDrawDropdownButtons(
     WindowMapgenDrawDropdownButton(w, dpi, edgeWidgetIndex, edgeImage);
 }
 
-static void WindowMapgenBasePaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMapgenBasePaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowMapgenDrawTabImages(dpi, w);
@@ -767,7 +767,7 @@ static void WindowMapgenBasePaint(rct_window* w, DrawPixelInfo* dpi)
 
 #pragma region Random page
 
-static void WindowMapgenRandomMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMapgenRandomMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowMapgenSharedMouseup(w, widgetIndex);
 
@@ -800,11 +800,11 @@ static void WindowMapgenRandomMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowMapgenRandomMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowMapgenRandomMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
 }
 
-static void WindowMapgenRandomUpdate(rct_window* w)
+static void WindowMapgenRandomUpdate(WindowBase* w)
 {
     // Tab animation
     if (++w->frame_no >= TabAnimationLoops[w->page])
@@ -812,7 +812,7 @@ static void WindowMapgenRandomUpdate(rct_window* w)
     WidgetInvalidate(*w, WIDX_TAB_2);
 }
 
-static void WindowMapgenRandomInvalidate(rct_window* w)
+static void WindowMapgenRandomInvalidate(WindowBase* w)
 {
     if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM])
     {
@@ -829,7 +829,7 @@ static void WindowMapgenRandomInvalidate(rct_window* w)
     WindowMapgenSetPressedTab(w);
 }
 
-static void WindowMapgenRandomPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMapgenRandomPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowMapgenDrawTabImages(dpi, w);
@@ -839,7 +839,7 @@ static void WindowMapgenRandomPaint(rct_window* w, DrawPixelInfo* dpi)
 
 #pragma region Simplex page
 
-static void WindowMapgenSimplexMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMapgenSimplexMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowMapgenSharedMouseup(w, widgetIndex);
 
@@ -878,7 +878,7 @@ static void WindowMapgenSimplexMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowMapgenSimplexMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowMapgenSimplexMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -959,7 +959,7 @@ static void WindowMapgenSimplexMousedown(rct_window* w, WidgetIndex widgetIndex,
     }
 }
 
-static void WindowMapgenSimplexDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowMapgenSimplexDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     int32_t type;
 
@@ -1002,7 +1002,7 @@ static void WindowMapgenSimplexDropdown(rct_window* w, WidgetIndex widgetIndex,
     }
 }
 
-static void WindowMapgenSimplexUpdate(rct_window* w)
+static void WindowMapgenSimplexUpdate(WindowBase* w)
 {
     // Tab animation
     if (++w->frame_no >= TabAnimationLoops[w->page])
@@ -1010,7 +1010,7 @@ static void WindowMapgenSimplexUpdate(rct_window* w)
     WidgetInvalidate(*w, WIDX_TAB_3);
 }
 
-static void WindowMapgenSimplexInvalidate(rct_window* w)
+static void WindowMapgenSimplexInvalidate(WindowBase* w)
 {
     if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_SIMPLEX])
     {
@@ -1045,7 +1045,7 @@ static void WindowMapgenSimplexInvalidate(rct_window* w)
     ft.Add<uint16_t>(_mapSize.x - 2);
 }
 
-static void WindowMapgenSimplexPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMapgenSimplexPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowMapgenDrawTabImages(dpi, w);
@@ -1114,7 +1114,7 @@ static void WindowMapgenSimplexPaint(rct_window* w, DrawPixelInfo* dpi)
 
 #pragma region Heightmap page
 
-static void WindowMapgenHeightmapMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowMapgenHeightmapMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -1180,7 +1180,7 @@ static void WindowMapgenHeightmapLoadsaveCallback(int32_t result, const utf8* pa
         }
 
         // The window needs to be open while using the map
-        rct_window* const w = ContextOpenWindow(WindowClass::Mapgen);
+        WindowBase* const w = ContextOpenWindow(WindowClass::Mapgen);
         _heightmapLoaded = true;
         WindowMapgenSetPage(w, WINDOW_MAPGEN_PAGE_HEIGHTMAP);
 
@@ -1188,7 +1188,7 @@ static void WindowMapgenHeightmapLoadsaveCallback(int32_t result, const utf8* pa
     }
 }
 
-static void WindowMapgenHeightmapMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMapgenHeightmapMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowMapgenSharedMouseup(w, widgetIndex);
 
@@ -1235,7 +1235,7 @@ static void WindowMapgenHeightmapMouseup(rct_window* w, WidgetIndex widgetIndex)
     WindowMapgenHeightmapGenerateMap();
 }
 
-static void WindowMapgenHeightmapInvalidate(rct_window* w)
+static void WindowMapgenHeightmapInvalidate(WindowBase* w)
 {
     if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP])
     {
@@ -1250,7 +1250,7 @@ static void WindowMapgenHeightmapInvalidate(rct_window* w)
     WindowMapgenSetPressedTab(w);
 }
 
-static void WindowMapgenHeightmapPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMapgenHeightmapPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowMapgenDrawTabImages(dpi, w);
@@ -1313,7 +1313,7 @@ static void WindowMapgenHeightmapPaint(rct_window* w, DrawPixelInfo* dpi)
 
 #pragma region Common
 
-static void WindowMapgenSetPage(rct_window* w, int32_t page)
+static void WindowMapgenSetPage(WindowBase* w, int32_t page)
 {
     w->page = page;
     w->frame_no = 0;
@@ -1349,7 +1349,7 @@ static void WindowMapgenSetPage(rct_window* w, int32_t page)
     w->Invalidate();
 }
 
-static void WindowMapgenSetPressedTab(rct_window* w)
+static void WindowMapgenSetPressedTab(WindowBase* w)
 {
     int32_t i;
     for (i = 0; i < WINDOW_MAPGEN_PAGE_COUNT; i++)
@@ -1357,7 +1357,7 @@ static void WindowMapgenSetPressedTab(rct_window* w)
     w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
 }
 
-static void WindowMapgenDrawTabImage(DrawPixelInfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
+static void WindowMapgenDrawTabImage(DrawPixelInfo* dpi, WindowBase* w, int32_t page, int32_t spriteIndex)
 {
     WidgetIndex widgetIndex = WIDX_TAB_1 + page;
 
@@ -1375,7 +1375,7 @@ static void WindowMapgenDrawTabImage(DrawPixelInfo* dpi, rct_window* w, int32_t
     }
 }
 
-static void WindowMapgenDrawTabImages(DrawPixelInfo* dpi, rct_window* w)
+static void WindowMapgenDrawTabImages(DrawPixelInfo* dpi, WindowBase* w)
 {
     WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_BASE, SPR_G2_TAB_LAND);
     WindowMapgenDrawTabImage(dpi, w, WINDOW_MAPGEN_PAGE_RANDOM, SPR_G2_TAB_TREE);
diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp
index e2dcc75bd8..1a9f40819b 100644
--- a/src/openrct2-ui/windows/MapTooltip.cpp
+++ b/src/openrct2-ui/windows/MapTooltip.cpp
@@ -23,8 +23,8 @@ static Widget window_map_tooltip_widgets[] = {
     WIDGETS_END,
 };
 
-static void WindowMapTooltipUpdate(rct_window *w);
-static void WindowMapTooltipPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowMapTooltipUpdate(WindowBase *w);
+static void WindowMapTooltipPaint(WindowBase *w, DrawPixelInfo *dpi);
 
 static WindowEventList window_map_tooltip_events([](auto& events)
 {
@@ -100,7 +100,7 @@ void WindowMapTooltipUpdateVisibility()
  */
 static void WindowMapTooltipOpen()
 {
-    rct_window* w;
+    WindowBase* w;
 
     constexpr int32_t width = 200;
     constexpr int32_t height = 44;
@@ -128,7 +128,7 @@ static void WindowMapTooltipOpen()
  *
  *  rct2: 0x006EE8CE
  */
-static void WindowMapTooltipUpdate(rct_window* w)
+static void WindowMapTooltipUpdate(WindowBase* w)
 {
     w->Invalidate();
 }
@@ -137,7 +137,7 @@ static void WindowMapTooltipUpdate(rct_window* w)
  *
  *  rct2: 0x006EE894
  */
-static void WindowMapTooltipPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMapTooltipPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     StringId stringId;
     std::memcpy(&stringId, _mapTooltipArgs.Data(), sizeof(StringId));
diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp
index 6e6ef39392..62a60810b6 100644
--- a/src/openrct2-ui/windows/MazeConstruction.cpp
+++ b/src/openrct2-ui/windows/MazeConstruction.cpp
@@ -428,7 +428,7 @@ private:
     }
 };
 
-rct_window* WindowMazeConstructionOpen()
+WindowBase* WindowMazeConstructionOpen()
 {
     return WindowFocusOrCreate<MazeConstructionWindow>(
         WindowClass::RideConstruction, ScreenCoordsXY(0, 29), WW, WH, WF_NO_AUTO_CLOSE);
@@ -436,7 +436,7 @@ rct_window* WindowMazeConstructionOpen()
 
 void WindowMazeConstructionUpdatePressedWidgets()
 {
-    rct_window* w;
+    WindowBase* w;
 
     w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr)
diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp
index 58fd7fb1ae..4b2eab106f 100644
--- a/src/openrct2-ui/windows/Multiplayer.cpp
+++ b/src/openrct2-ui/windows/Multiplayer.cpp
@@ -120,40 +120,40 @@ static constexpr StringId WindowMultiplayerPageTitles[] = {
 
 static uint8_t _selectedGroup = 0;
 
-static void WindowMultiplayerInformationMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowMultiplayerInformationResize(rct_window *w);
-static void WindowMultiplayerInformationUpdate(rct_window *w);
-static void WindowMultiplayerInformationInvalidate(rct_window *w);
-static void WindowMultiplayerInformationPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowMultiplayerInformationMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowMultiplayerInformationResize(WindowBase *w);
+static void WindowMultiplayerInformationUpdate(WindowBase *w);
+static void WindowMultiplayerInformationInvalidate(WindowBase *w);
+static void WindowMultiplayerInformationPaint(WindowBase *w, DrawPixelInfo *dpi);
 
-static void WindowMultiplayerPlayersMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowMultiplayerPlayersResize(rct_window *w);
-static void WindowMultiplayerPlayersUpdate(rct_window *w);
-static void WindowMultiplayerPlayersScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
-static void WindowMultiplayerPlayersScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowMultiplayerPlayersScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowMultiplayerPlayersInvalidate(rct_window *w);
-static void WindowMultiplayerPlayersPaint(rct_window *w, DrawPixelInfo *dpi);
-static void WindowMultiplayerPlayersScrollpaint(rct_window *w, DrawPixelInfo *dpi, int32_t scrollIndex);
+static void WindowMultiplayerPlayersMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowMultiplayerPlayersResize(WindowBase *w);
+static void WindowMultiplayerPlayersUpdate(WindowBase *w);
+static void WindowMultiplayerPlayersScrollgetsize(WindowBase *w, int32_t scrollIndex, int32_t *width, int32_t *height);
+static void WindowMultiplayerPlayersScrollmousedown(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowMultiplayerPlayersScrollmouseover(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowMultiplayerPlayersInvalidate(WindowBase *w);
+static void WindowMultiplayerPlayersPaint(WindowBase *w, DrawPixelInfo *dpi);
+static void WindowMultiplayerPlayersScrollpaint(WindowBase *w, DrawPixelInfo *dpi, int32_t scrollIndex);
 
-static void WindowMultiplayerGroupsMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowMultiplayerGroupsResize(rct_window *w);
-static void WindowMultiplayerGroupsMousedown(rct_window *w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowMultiplayerGroupsDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowMultiplayerGroupsUpdate(rct_window *w);
-static void WindowMultiplayerGroupsScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
-static void WindowMultiplayerGroupsScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowMultiplayerGroupsScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowMultiplayerGroupsTextInput(rct_window *w, WidgetIndex widgetIndex, char *text);
-static void WindowMultiplayerGroupsInvalidate(rct_window *w);
-static void WindowMultiplayerGroupsPaint(rct_window *w, DrawPixelInfo *dpi);
-static void WindowMultiplayerGroupsScrollpaint(rct_window *w, DrawPixelInfo *dpi, int32_t scrollIndex);
+static void WindowMultiplayerGroupsMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowMultiplayerGroupsResize(WindowBase *w);
+static void WindowMultiplayerGroupsMousedown(WindowBase *w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowMultiplayerGroupsDropdown(WindowBase *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowMultiplayerGroupsUpdate(WindowBase *w);
+static void WindowMultiplayerGroupsScrollgetsize(WindowBase *w, int32_t scrollIndex, int32_t *width, int32_t *height);
+static void WindowMultiplayerGroupsScrollmousedown(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowMultiplayerGroupsScrollmouseover(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowMultiplayerGroupsTextInput(WindowBase *w, WidgetIndex widgetIndex, char *text);
+static void WindowMultiplayerGroupsInvalidate(WindowBase *w);
+static void WindowMultiplayerGroupsPaint(WindowBase *w, DrawPixelInfo *dpi);
+static void WindowMultiplayerGroupsScrollpaint(WindowBase *w, DrawPixelInfo *dpi, int32_t scrollIndex);
 
-static void WindowMultiplayerOptionsMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowMultiplayerOptionsResize(rct_window *w);
-static void WindowMultiplayerOptionsUpdate(rct_window *w);
-static void WindowMultiplayerOptionsInvalidate(rct_window *w);
-static void WindowMultiplayerOptionsPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowMultiplayerOptionsMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowMultiplayerOptionsResize(WindowBase *w);
+static void WindowMultiplayerOptionsUpdate(WindowBase *w);
+static void WindowMultiplayerOptionsInvalidate(WindowBase *w);
+static void WindowMultiplayerOptionsPaint(WindowBase *w, DrawPixelInfo *dpi);
 
 static WindowEventList window_multiplayer_information_events([](auto& events)
 {
@@ -223,16 +223,16 @@ static constexpr const int32_t window_multiplayer_animation_frames[] = {
     4,
 };
 
-static void WindowMultiplayerDrawTabImages(rct_window* w, DrawPixelInfo* dpi);
-static void WindowMultiplayerSetPage(rct_window* w, int32_t page);
+static void WindowMultiplayerDrawTabImages(WindowBase* w, DrawPixelInfo* dpi);
+static void WindowMultiplayerSetPage(WindowBase* w, int32_t page);
 
 static bool _windowInformationSizeDirty;
 static ScreenCoordsXY _windowInformationSize;
 
-rct_window* WindowMultiplayerOpen()
+WindowBase* WindowMultiplayerOpen()
 {
     // Check if window is already open
-    rct_window* window = WindowBringToFrontByClass(WindowClass::Multiplayer);
+    WindowBase* window = WindowBringToFrontByClass(WindowClass::Multiplayer);
     if (window == nullptr)
     {
         window = WindowCreateAutoPos(
@@ -243,7 +243,7 @@ rct_window* WindowMultiplayerOpen()
     return window;
 }
 
-static void WindowMultiplayerSetPage(rct_window* w, int32_t page)
+static void WindowMultiplayerSetPage(WindowBase* w, int32_t page)
 {
     _windowInformationSizeDirty = true;
 
@@ -264,12 +264,12 @@ static void WindowMultiplayerSetPage(rct_window* w, int32_t page)
     w->Invalidate();
 }
 
-static void WindowMultiplayerAnchorBorderWidgets(rct_window* w)
+static void WindowMultiplayerAnchorBorderWidgets(WindowBase* w)
 {
     w->ResizeFrameWithPage();
 }
 
-static void WindowMultiplayerSetPressedTab(rct_window* w)
+static void WindowMultiplayerSetPressedTab(WindowBase* w)
 {
     for (int32_t i = WIDX_TAB1; i <= WIDX_TAB4; i++)
     {
@@ -278,7 +278,7 @@ static void WindowMultiplayerSetPressedTab(rct_window* w)
     w->pressed_widgets |= 1LL << (WIDX_TAB1 + w->page);
 }
 
-static void WindowMultiplayerGroupsShowGroupDropdown(rct_window* w, Widget* widget)
+static void WindowMultiplayerGroupsShowGroupDropdown(WindowBase* w, Widget* widget)
 {
     Widget* dropdownWidget;
     int32_t numItems, i;
@@ -308,7 +308,7 @@ static void WindowMultiplayerGroupsShowGroupDropdown(rct_window* w, Widget* widg
 
 #pragma region Information page
 
-static void WindowMultiplayerInformationMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMultiplayerInformationMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -377,26 +377,26 @@ static ScreenCoordsXY WindowMultiplayerInformationGetSize()
     return _windowInformationSize;
 }
 
-static void WindowMultiplayerInformationResize(rct_window* w)
+static void WindowMultiplayerInformationResize(WindowBase* w)
 {
     auto size = WindowMultiplayerInformationGetSize();
     WindowSetResize(*w, size.x, size.y, size.x, size.y);
 }
 
-static void WindowMultiplayerInformationUpdate(rct_window* w)
+static void WindowMultiplayerInformationUpdate(WindowBase* w)
 {
     w->frame_no++;
     WidgetInvalidate(*w, WIDX_TAB1 + w->page);
 }
 
-static void WindowMultiplayerInformationInvalidate(rct_window* w)
+static void WindowMultiplayerInformationInvalidate(WindowBase* w)
 {
     WindowMultiplayerSetPressedTab(w);
     WindowMultiplayerAnchorBorderWidgets(w);
     WindowAlignTabs(w, WIDX_TAB1, WIDX_TAB4);
 }
 
-static void WindowMultiplayerInformationPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMultiplayerInformationPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowMultiplayerDrawTabImages(w, dpi);
@@ -463,7 +463,7 @@ static bool IsServerPlayerInvisible()
     return NetworkIsServerPlayerInvisible() && !gConfigGeneral.DebuggingTools;
 }
 
-static void WindowMultiplayerPlayersMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMultiplayerPlayersMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -482,7 +482,7 @@ static void WindowMultiplayerPlayersMouseup(rct_window* w, WidgetIndex widgetInd
     }
 }
 
-static void WindowMultiplayerPlayersResize(rct_window* w)
+static void WindowMultiplayerPlayersResize(WindowBase* w)
 {
     WindowSetResize(*w, 420, 124, 500, 450);
 
@@ -495,13 +495,13 @@ static void WindowMultiplayerPlayersResize(rct_window* w)
     w->Invalidate();
 }
 
-static void WindowMultiplayerPlayersUpdate(rct_window* w)
+static void WindowMultiplayerPlayersUpdate(WindowBase* w)
 {
     w->frame_no++;
     WidgetInvalidate(*w, WIDX_TAB1 + w->page);
 }
 
-static void WindowMultiplayerPlayersScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+static void WindowMultiplayerPlayersScrollgetsize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     int32_t i;
 
@@ -522,7 +522,7 @@ static void WindowMultiplayerPlayersScrollgetsize(rct_window* w, int32_t scrollI
     }
 }
 
-static void WindowMultiplayerPlayersScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowMultiplayerPlayersScrollmousedown(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t index;
 
@@ -537,7 +537,7 @@ static void WindowMultiplayerPlayersScrollmousedown(rct_window* w, int32_t scrol
     WindowPlayerOpen(NetworkGetPlayerID(player));
 }
 
-static void WindowMultiplayerPlayersScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowMultiplayerPlayersScrollmouseover(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t index;
 
@@ -549,7 +549,7 @@ static void WindowMultiplayerPlayersScrollmouseover(rct_window* w, int32_t scrol
     w->Invalidate();
 }
 
-static void WindowMultiplayerPlayersInvalidate(rct_window* w)
+static void WindowMultiplayerPlayersInvalidate(WindowBase* w)
 {
     WindowMultiplayerSetPressedTab(w);
     WindowMultiplayerAnchorBorderWidgets(w);
@@ -558,7 +558,7 @@ static void WindowMultiplayerPlayersInvalidate(rct_window* w)
     WindowAlignTabs(w, WIDX_TAB1, WIDX_TAB4);
 }
 
-static void WindowMultiplayerPlayersPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMultiplayerPlayersPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     StringId stringId;
 
@@ -573,7 +573,7 @@ static void WindowMultiplayerPlayersPaint(rct_window* w, DrawPixelInfo* dpi)
     DrawTextBasic(dpi, screenCoords, stringId, ft, { w->colours[2] });
 }
 
-static void WindowMultiplayerPlayersScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowMultiplayerPlayersScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     ScreenCoordsXY screenCoords;
     screenCoords.y = 0;
@@ -677,7 +677,7 @@ static void WindowMultiplayerPlayersScrollpaint(rct_window* w, DrawPixelInfo* dp
 
 #pragma region Groups page
 
-static void WindowMultiplayerGroupsMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMultiplayerGroupsMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -713,7 +713,7 @@ static void WindowMultiplayerGroupsMouseup(rct_window* w, WidgetIndex widgetInde
     }
 }
 
-static void WindowMultiplayerGroupsResize(rct_window* w)
+static void WindowMultiplayerGroupsResize(WindowBase* w)
 {
     WindowSetResize(*w, 320, 200, 320, 500);
 
@@ -724,7 +724,7 @@ static void WindowMultiplayerGroupsResize(rct_window* w)
     w->Invalidate();
 }
 
-static void WindowMultiplayerGroupsMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowMultiplayerGroupsMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -737,7 +737,7 @@ static void WindowMultiplayerGroupsMousedown(rct_window* w, WidgetIndex widgetIn
     }
 }
 
-static void WindowMultiplayerGroupsDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowMultiplayerGroupsDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (dropdownIndex == -1)
     {
@@ -760,13 +760,13 @@ static void WindowMultiplayerGroupsDropdown(rct_window* w, WidgetIndex widgetInd
     w->Invalidate();
 }
 
-static void WindowMultiplayerGroupsUpdate(rct_window* w)
+static void WindowMultiplayerGroupsUpdate(WindowBase* w)
 {
     w->frame_no++;
     WidgetInvalidate(*w, WIDX_TAB1 + w->page);
 }
 
-static void WindowMultiplayerGroupsScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+static void WindowMultiplayerGroupsScrollgetsize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     int32_t i;
 
@@ -787,7 +787,7 @@ static void WindowMultiplayerGroupsScrollgetsize(rct_window* w, int32_t scrollIn
     }
 }
 
-static void WindowMultiplayerGroupsScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowMultiplayerGroupsScrollmousedown(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t index;
 
@@ -803,7 +803,7 @@ static void WindowMultiplayerGroupsScrollmousedown(rct_window* w, int32_t scroll
     GameActions::Execute(&networkModifyGroup);
 }
 
-static void WindowMultiplayerGroupsScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowMultiplayerGroupsScrollmouseover(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t index;
 
@@ -815,7 +815,7 @@ static void WindowMultiplayerGroupsScrollmouseover(rct_window* w, int32_t scroll
     w->Invalidate();
 }
 
-static void WindowMultiplayerGroupsTextInput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowMultiplayerGroupsTextInput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if (widgetIndex != WIDX_RENAME_GROUP)
         return;
@@ -827,7 +827,7 @@ static void WindowMultiplayerGroupsTextInput(rct_window* w, WidgetIndex widgetIn
     GameActions::Execute(&networkModifyGroup);
 }
 
-static void WindowMultiplayerGroupsInvalidate(rct_window* w)
+static void WindowMultiplayerGroupsInvalidate(WindowBase* w)
 {
     WindowMultiplayerSetPressedTab(w);
     WindowMultiplayerAnchorBorderWidgets(w);
@@ -842,7 +842,7 @@ static void WindowMultiplayerGroupsInvalidate(rct_window* w)
     }
 }
 
-static void WindowMultiplayerGroupsPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMultiplayerGroupsPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     thread_local std::string _buffer;
 
@@ -889,7 +889,7 @@ static void WindowMultiplayerGroupsPaint(rct_window* w, DrawPixelInfo* dpi)
     }
 }
 
-static void WindowMultiplayerGroupsScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowMultiplayerGroupsScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     auto screenCoords = ScreenCoordsXY{ 0, 0 };
 
@@ -934,7 +934,7 @@ static void WindowMultiplayerGroupsScrollpaint(rct_window* w, DrawPixelInfo* dpi
 
 #pragma region Options page
 
-static void WindowMultiplayerOptionsMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowMultiplayerOptionsMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -965,18 +965,18 @@ static void WindowMultiplayerOptionsMouseup(rct_window* w, WidgetIndex widgetInd
     }
 }
 
-static void WindowMultiplayerOptionsResize(rct_window* w)
+static void WindowMultiplayerOptionsResize(WindowBase* w)
 {
     WindowSetResize(*w, 300, 100, 300, 100);
 }
 
-static void WindowMultiplayerOptionsUpdate(rct_window* w)
+static void WindowMultiplayerOptionsUpdate(WindowBase* w)
 {
     w->frame_no++;
     WidgetInvalidate(*w, WIDX_TAB1 + w->page);
 }
 
-static void WindowMultiplayerOptionsInvalidate(rct_window* w)
+static void WindowMultiplayerOptionsInvalidate(WindowBase* w)
 {
     WindowMultiplayerSetPressedTab(w);
     WindowMultiplayerAnchorBorderWidgets(w);
@@ -992,7 +992,7 @@ static void WindowMultiplayerOptionsInvalidate(rct_window* w)
     WidgetSetCheckboxValue(*w, WIDX_KNOWN_KEYS_ONLY_CHECKBOX, gConfigNetwork.KnownKeysOnly);
 }
 
-static void WindowMultiplayerOptionsPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMultiplayerOptionsPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowMultiplayerDrawTabImages(w, dpi);
@@ -1000,7 +1000,7 @@ static void WindowMultiplayerOptionsPaint(rct_window* w, DrawPixelInfo* dpi)
 
 #pragma endregion
 
-static void WindowMultiplayerDrawTabImage(rct_window* w, DrawPixelInfo* dpi, int32_t page, int32_t spriteIndex)
+static void WindowMultiplayerDrawTabImage(WindowBase* w, DrawPixelInfo* dpi, int32_t page, int32_t spriteIndex)
 {
     WidgetIndex widgetIndex = WIDX_TAB1 + page;
 
@@ -1022,7 +1022,7 @@ static void WindowMultiplayerDrawTabImage(rct_window* w, DrawPixelInfo* dpi, int
     }
 }
 
-static void WindowMultiplayerDrawTabImages(rct_window* w, DrawPixelInfo* dpi)
+static void WindowMultiplayerDrawTabImages(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowMultiplayerDrawTabImage(w, dpi, WINDOW_MULTIPLAYER_PAGE_INFORMATION, SPR_TAB_KIOSKS_AND_FACILITIES_0);
     WindowMultiplayerDrawTabImage(w, dpi, WINDOW_MULTIPLAYER_PAGE_PLAYERS, SPR_TAB_GUESTS_0);
diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp
index d8f92aa8cc..434165ba48 100644
--- a/src/openrct2-ui/windows/NetworkStatus.cpp
+++ b/src/openrct2-ui/windows/NetworkStatus.cpp
@@ -130,7 +130,7 @@ private:
     std::string _password;
 };
 
-rct_window* WindowNetworkStatusOpen(const std::string& text, close_callback onClose)
+WindowBase* WindowNetworkStatusOpen(const std::string& text, close_callback onClose)
 {
     auto window = WindowFocusOrCreate<NetworkStatusWindow>(
         WindowClass::NetworkStatus, 420, 90, WF_10 | WF_TRANSPARENT | WF_CENTRE_SCREEN);
@@ -152,7 +152,7 @@ void WindowNetworkStatusClose()
     networkWindow->Close();
 }
 
-rct_window* WindowNetworkStatusOpenPassword()
+WindowBase* WindowNetworkStatusOpenPassword()
 {
     auto window = WindowFocusOrCreate<NetworkStatusWindow>(
         WindowClass::NetworkStatus, 420, 90, WF_10 | WF_TRANSPARENT | WF_CENTRE_SCREEN);
diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp
index fdae70b614..518d1d26b0 100644
--- a/src/openrct2-ui/windows/NewCampaign.cpp
+++ b/src/openrct2-ui/windows/NewCampaign.cpp
@@ -371,7 +371,7 @@ public:
     }
 };
 
-rct_window* WindowNewCampaignOpen(int16_t campaignType)
+WindowBase* WindowNewCampaignOpen(int16_t campaignType)
 {
     auto w = static_cast<NewCampaignWindow*>(WindowBringToFrontByClass(WindowClass::NewCampaign));
     if (w != nullptr)
diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp
index f6afe838e4..d5e18d14d6 100644
--- a/src/openrct2-ui/windows/NewRide.cpp
+++ b/src/openrct2-ui/windows/NewRide.cpp
@@ -946,9 +946,9 @@ void WindowNewRideInitVars()
  *
  *  rct2: 0x006B3CFF
  */
-rct_window* WindowNewRideOpen()
+WindowBase* WindowNewRideOpen()
 {
-    rct_window* window;
+    WindowBase* window;
 
     window = WindowBringToFrontByClass(WindowClass::ConstructRide);
     if (window)
@@ -963,7 +963,7 @@ rct_window* WindowNewRideOpen()
     return window;
 }
 
-rct_window* WindowNewRideOpenResearch()
+WindowBase* WindowNewRideOpenResearch()
 {
     auto w = static_cast<NewRideWindow*>(WindowNewRideOpen());
     w->SetPage(RESEARCH_TAB);
diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp
index a4d9479afd..8a85a529a9 100644
--- a/src/openrct2-ui/windows/News.cpp
+++ b/src/openrct2-ui/windows/News.cpp
@@ -110,7 +110,7 @@ public:
         }
         else if (_pressedButtonIndex > 1)
         {
-            static rct_window* _mainWindow;
+            static WindowBase* _mainWindow;
             auto subjectLoc = News::GetSubjectLocation(newsItem.Type, newsItem.Assoc);
             if (subjectLoc.has_value() && (_mainWindow = WindowGetMain()) != nullptr)
             {
@@ -308,7 +308,7 @@ public:
     }
 };
 
-rct_window* WindowNewsOpen()
+WindowBase* WindowNewsOpen()
 {
     return WindowFocusOrCreate<NewsWindow>(WindowClass::RecentNews, WW, WH, 0);
 }
diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp
index 8dfc3f0cd3..34ad3a4ecb 100644
--- a/src/openrct2-ui/windows/NewsOptions.cpp
+++ b/src/openrct2-ui/windows/NewsOptions.cpp
@@ -271,7 +271,7 @@ private:
     };
 };
 
-rct_window* WindowNewsOptionsOpen()
+WindowBase* WindowNewsOptionsOpen()
 {
     return WindowFocusOrCreate<NewsOptionsWindow>(WindowClass::NotificationOptions, WW, WH, WF_CENTRE_SCREEN);
 }
diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp
index 1fe6629872..4cefa4fe6a 100644
--- a/src/openrct2-ui/windows/ObjectLoadError.cpp
+++ b/src/openrct2-ui/windows/ObjectLoadError.cpp
@@ -324,7 +324,7 @@ static constexpr StringId GetStringFromObjectType(const ObjectType type)
     }
 }
 
-class ObjectLoadErrorWindow final : public rct_window
+class ObjectLoadErrorWindow final : public WindowBase
 {
 private:
     std::vector<ObjectEntryDescriptor> _invalidEntries;
@@ -563,7 +563,7 @@ public:
     }
 };
 
-rct_window* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects)
+WindowBase* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects)
 {
     // Check if window is already open
     auto* window = WindowBringToFrontByClass(WindowClass::ObjectLoadError);
diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp
index 9f6e84dba7..1885191caa 100644
--- a/src/openrct2-ui/windows/Options.cpp
+++ b/src/openrct2-ui/windows/Options.cpp
@@ -612,7 +612,7 @@ public:
         if (page == WINDOW_OPTIONS_PAGE_ADVANCED)
             return AdvancedTooltip(widgetIndex, fallback);
 
-        return rct_window::OnTooltip(widgetIndex, fallback);
+        return WindowBase::OnTooltip(widgetIndex, fallback);
     }
 
 private:
@@ -934,7 +934,7 @@ private:
                 gConfigGeneral.AlwaysShowGridlines ^= 1;
                 ConfigSaveDefault();
                 GfxInvalidateScreen();
-                rct_window* mainWindow = WindowGetMain();
+                WindowBase* mainWindow = WindowGetMain();
                 if (mainWindow != nullptr)
                 {
                     if (gConfigGeneral.AlwaysShowGridlines)
@@ -2117,7 +2117,7 @@ private:
         GfxInvalidateScreen();
     }
 
-    uint8_t GetScrollPercentage(const Widget& widget, const rct_scroll& scroll)
+    uint8_t GetScrollPercentage(const Widget& widget, const ScrollBar& scroll)
     {
         uint8_t w = widget.width() - 1;
         return static_cast<float>(scroll.h_left) / (scroll.h_right - w) * 100;
@@ -2184,7 +2184,7 @@ private:
  *
  *  rct2: 0x006BAC5B
  */
-rct_window* WindowOptionsOpen()
+WindowBase* WindowOptionsOpen()
 {
     return WindowFocusOrCreate<OptionsWindow>(WindowClass::Options, WW, WH, WF_CENTRE_SCREEN);
 }
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index fffb7bbcc2..a92ea9e6d2 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -1304,7 +1304,7 @@ static ParkWindow* ParkWindowOpen(uint8_t page)
  *
  *  rct2: 0x00667C48
  */
-rct_window* WindowParkEntranceOpen()
+WindowBase* WindowParkEntranceOpen()
 {
     return ParkWindowOpen(WINDOW_PARK_PAGE_ENTRANCE);
 }
@@ -1313,7 +1313,7 @@ rct_window* WindowParkEntranceOpen()
  *
  *  rct2: 0x00667CA4
  */
-rct_window* WindowParkRatingOpen()
+WindowBase* WindowParkRatingOpen()
 {
     return ParkWindowOpen(WINDOW_PARK_PAGE_RATING);
 }
@@ -1322,7 +1322,7 @@ rct_window* WindowParkRatingOpen()
  *
  *  rct2: 0x00667D35
  */
-rct_window* WindowParkGuestsOpen()
+WindowBase* WindowParkGuestsOpen()
 {
     return ParkWindowOpen(WINDOW_PARK_PAGE_GUESTS);
 }
@@ -1331,7 +1331,7 @@ rct_window* WindowParkGuestsOpen()
  *
  *  rct2: 0x00667E57
  */
-rct_window* WindowParkObjectiveOpen()
+WindowBase* WindowParkObjectiveOpen()
 {
     auto* wnd = ParkWindowOpen(WINDOW_PARK_PAGE_OBJECTIVE);
     if (wnd != nullptr)
@@ -1348,7 +1348,7 @@ rct_window* WindowParkObjectiveOpen()
  *
  *  rct2: 0x00667DC6
  */
-rct_window* WindowParkAwardsOpen()
+WindowBase* WindowParkAwardsOpen()
 {
     return ParkWindowOpen(WINDOW_PARK_PAGE_AWARDS);
 }
diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp
index 3afd599d0b..011c0bc6bf 100644
--- a/src/openrct2-ui/windows/PatrolArea.cpp
+++ b/src/openrct2-ui/windows/PatrolArea.cpp
@@ -285,7 +285,7 @@ private:
     }
 };
 
-rct_window* WindowPatrolAreaOpen(EntityId staffId)
+WindowBase* WindowPatrolAreaOpen(EntityId staffId)
 {
     auto w = WindowFocusOrCreate<PatrolAreaWindow>(
         WindowClass::PatrolArea, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0);
diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp
index 56d41418ac..f5738e006b 100644
--- a/src/openrct2-ui/windows/Player.cpp
+++ b/src/openrct2-ui/windows/Player.cpp
@@ -81,14 +81,14 @@ static Widget *window_player_page_widgets[] = {
 
 #pragma region Events
 
-static void WindowPlayerOverviewClose(rct_window *w);
-static void WindowPlayerOverviewMouseUp(rct_window *w, WidgetIndex widgetIndex);
-static void WindowPlayerOverviewResize(rct_window *w);
-static void WindowPlayerOverviewMouseDown(rct_window *w, WidgetIndex widgetIndex, Widget *widget);
-static void WindowPlayerOverviewDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowPlayerOverviewUpdate(rct_window* w);
-static void WindowPlayerOverviewInvalidate(rct_window *w);
-static void WindowPlayerOverviewPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowPlayerOverviewClose(WindowBase *w);
+static void WindowPlayerOverviewMouseUp(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowPlayerOverviewResize(WindowBase *w);
+static void WindowPlayerOverviewMouseDown(WindowBase *w, WidgetIndex widgetIndex, Widget *widget);
+static void WindowPlayerOverviewDropdown(WindowBase *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowPlayerOverviewUpdate(WindowBase* w);
+static void WindowPlayerOverviewInvalidate(WindowBase *w);
+static void WindowPlayerOverviewPaint(WindowBase *w, DrawPixelInfo *dpi);
 
 static WindowEventList window_player_overview_events([](auto& events)
 {
@@ -102,12 +102,12 @@ static WindowEventList window_player_overview_events([](auto& events)
     events.paint = &WindowPlayerOverviewPaint;
 });
 
-static void WindowPlayerStatisticsClose(rct_window *w);
-static void WindowPlayerStatisticsMouseUp(rct_window *w, WidgetIndex widgetIndex);
-static void WindowPlayerStatisticsResize(rct_window *w);
-static void WindowPlayerStatisticsUpdate(rct_window* w);
-static void WindowPlayerStatisticsInvalidate(rct_window *w);
-static void WindowPlayerStatisticsPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowPlayerStatisticsClose(WindowBase *w);
+static void WindowPlayerStatisticsMouseUp(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowPlayerStatisticsResize(WindowBase *w);
+static void WindowPlayerStatisticsUpdate(WindowBase* w);
+static void WindowPlayerStatisticsInvalidate(WindowBase *w);
+static void WindowPlayerStatisticsPaint(WindowBase *w, DrawPixelInfo *dpi);
 
 static WindowEventList window_player_statistics_events([](auto& events)
 {
@@ -128,14 +128,14 @@ static WindowEventList *window_player_page_events[] = {
 
 // clang-format on
 
-static void WindowPlayerSetPage(rct_window* w, int32_t page);
-static void WindowPlayerDrawTabImages(DrawPixelInfo* dpi, rct_window* w);
-static void WindowPlayerUpdateViewport(rct_window* w, bool scroll);
-static void WindowPlayerUpdateTitle(rct_window* w);
+static void WindowPlayerSetPage(WindowBase* w, int32_t page);
+static void WindowPlayerDrawTabImages(DrawPixelInfo* dpi, WindowBase* w);
+static void WindowPlayerUpdateViewport(WindowBase* w, bool scroll);
+static void WindowPlayerUpdateTitle(WindowBase* w);
 
-rct_window* WindowPlayerOpen(uint8_t id)
+WindowBase* WindowPlayerOpen(uint8_t id)
 {
-    rct_window* window;
+    WindowBase* window;
 
     window = WindowBringToFrontByNumber(WindowClass::Player, id);
     if (window == nullptr)
@@ -169,7 +169,7 @@ rct_window* WindowPlayerOpen(uint8_t id)
     return window;
 }
 
-static void WindowPlayerOverviewShowGroupDropdown(rct_window* w, Widget* widget)
+static void WindowPlayerOverviewShowGroupDropdown(WindowBase* w, Widget* widget)
 {
     Widget* dropdownWidget;
     int32_t numItems, i;
@@ -196,11 +196,11 @@ static void WindowPlayerOverviewShowGroupDropdown(rct_window* w, Widget* widget)
     Dropdown::SetChecked(NetworkGetGroupIndex(NetworkGetPlayerGroup(player)), true);
 }
 
-void WindowPlayerOverviewClose(rct_window* w)
+void WindowPlayerOverviewClose(WindowBase* w)
 {
 }
 
-void WindowPlayerOverviewMouseUp(rct_window* w, WidgetIndex widgetIndex)
+void WindowPlayerOverviewMouseUp(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -213,7 +213,7 @@ void WindowPlayerOverviewMouseUp(rct_window* w, WidgetIndex widgetIndex)
             break;
         case WIDX_LOCATE:
         {
-            rct_window* mainWindow = WindowGetMain();
+            WindowBase* mainWindow = WindowGetMain();
             if (mainWindow != nullptr)
             {
                 int32_t player = NetworkGetPlayerIndex(static_cast<uint8_t>(w->number));
@@ -238,7 +238,7 @@ void WindowPlayerOverviewMouseUp(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-void WindowPlayerOverviewMouseDown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+void WindowPlayerOverviewMouseDown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -248,7 +248,7 @@ void WindowPlayerOverviewMouseDown(rct_window* w, WidgetIndex widgetIndex, Widge
     }
 }
 
-void WindowPlayerOverviewDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+void WindowPlayerOverviewDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     const auto playerId = static_cast<uint8_t>(w->number);
     const auto playerIdx = NetworkGetPlayerIndex(playerId);
@@ -272,12 +272,12 @@ void WindowPlayerOverviewDropdown(rct_window* w, WidgetIndex widgetIndex, int32_
     GameActions::Execute(&playerSetGroupAction);
 }
 
-void WindowPlayerOverviewResize(rct_window* w)
+void WindowPlayerOverviewResize(WindowBase* w)
 {
     WindowSetResize(*w, 240, 170, 500, 300);
 }
 
-void WindowPlayerOverviewUpdate(rct_window* w)
+void WindowPlayerOverviewUpdate(WindowBase* w)
 {
     w->frame_no++;
     WidgetInvalidate(*w, WIDX_TAB_1 + w->page);
@@ -300,7 +300,7 @@ void WindowPlayerOverviewUpdate(rct_window* w)
     WindowPlayerUpdateViewport(w, scroll);
 }
 
-void WindowPlayerOverviewPaint(rct_window* w, DrawPixelInfo* dpi)
+void WindowPlayerOverviewPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowPlayerDrawTabImages(dpi, w);
@@ -359,7 +359,7 @@ void WindowPlayerOverviewPaint(rct_window* w, DrawPixelInfo* dpi)
     }
 }
 
-void WindowPlayerOverviewInvalidate(rct_window* w)
+void WindowPlayerOverviewInvalidate(WindowBase* w)
 {
     int32_t playerIndex = NetworkGetPlayerIndex(static_cast<uint8_t>(w->number));
     if (playerIndex == -1)
@@ -395,7 +395,7 @@ void WindowPlayerOverviewInvalidate(rct_window* w)
 
     WindowAlignTabs(w, WIDX_TAB_1, WIDX_TAB_2);
 
-    rct_viewport* viewport = w->viewport;
+    Viewport* viewport = w->viewport;
     if (viewport != nullptr)
     {
         Widget* viewportWidget = &window_player_overview_widgets[WIDX_VIEWPORT];
@@ -414,7 +414,7 @@ void WindowPlayerOverviewInvalidate(rct_window* w)
     WidgetSetEnabled(*w, WIDX_KICK, canKick && !isOwnWindow && !isServer);
 }
 
-void WindowPlayerStatisticsClose(rct_window* w)
+void WindowPlayerStatisticsClose(WindowBase* w)
 {
     if (w->error.var_480)
     {
@@ -422,7 +422,7 @@ void WindowPlayerStatisticsClose(rct_window* w)
     }
 }
 
-void WindowPlayerStatisticsMouseUp(rct_window* w, WidgetIndex widgetIndex)
+void WindowPlayerStatisticsMouseUp(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -436,12 +436,12 @@ void WindowPlayerStatisticsMouseUp(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-void WindowPlayerStatisticsResize(rct_window* w)
+void WindowPlayerStatisticsResize(WindowBase* w)
 {
     WindowSetResize(*w, 210, 80, 210, 80);
 }
 
-void WindowPlayerStatisticsUpdate(rct_window* w)
+void WindowPlayerStatisticsUpdate(WindowBase* w)
 {
     w->frame_no++;
     WidgetInvalidate(*w, WIDX_TAB_1 + w->page);
@@ -452,7 +452,7 @@ void WindowPlayerStatisticsUpdate(rct_window* w)
     }
 }
 
-void WindowPlayerStatisticsInvalidate(rct_window* w)
+void WindowPlayerStatisticsInvalidate(WindowBase* w)
 {
     if (window_player_page_widgets[w->page] != w->widgets)
     {
@@ -471,7 +471,7 @@ void WindowPlayerStatisticsInvalidate(rct_window* w)
     WindowAlignTabs(w, WIDX_TAB_1, WIDX_TAB_2);
 }
 
-void WindowPlayerStatisticsPaint(rct_window* w, DrawPixelInfo* dpi)
+void WindowPlayerStatisticsPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowPlayerDrawTabImages(dpi, w);
@@ -497,7 +497,7 @@ void WindowPlayerStatisticsPaint(rct_window* w, DrawPixelInfo* dpi)
     DrawTextBasic(dpi, screenCoords, STR_MONEY_SPENT, ft);
 }
 
-static void WindowPlayerSetPage(rct_window* w, int32_t page)
+static void WindowPlayerSetPage(WindowBase* w, int32_t page)
 {
     int32_t originalPage = w->page;
 
@@ -538,7 +538,7 @@ static void WindowPlayerSetPage(rct_window* w, int32_t page)
     }
 }
 
-static void WindowPlayerDrawTabImages(DrawPixelInfo* dpi, rct_window* w)
+static void WindowPlayerDrawTabImages(DrawPixelInfo* dpi, WindowBase* w)
 {
     Widget* widget;
 
@@ -566,7 +566,7 @@ static void WindowPlayerDrawTabImages(DrawPixelInfo* dpi, rct_window* w)
     }
 }
 
-static void WindowPlayerUpdateViewport(rct_window* w, bool scroll)
+static void WindowPlayerUpdateViewport(WindowBase* w, bool scroll)
 {
     int32_t playerIndex = NetworkGetPlayerIndex(static_cast<uint8_t>(w->number));
     if (playerIndex == -1)
@@ -574,7 +574,7 @@ static void WindowPlayerUpdateViewport(rct_window* w, bool scroll)
         return;
     }
 
-    rct_viewport* viewport = w->viewport;
+    Viewport* viewport = w->viewport;
     if (viewport != nullptr)
     {
         auto coord = NetworkGetPlayerLastActionCoord(playerIndex);
@@ -613,7 +613,7 @@ static void WindowPlayerUpdateViewport(rct_window* w, bool scroll)
     }
 }
 
-static void WindowPlayerUpdateTitle(rct_window* w)
+static void WindowPlayerUpdateTitle(WindowBase* w)
 {
     auto ft = Formatter::Common();
     int32_t player = NetworkGetPlayerIndex(static_cast<uint8_t>(w->number));
diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp
index 8971cd409d..6014d12709 100644
--- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp
@@ -91,9 +91,9 @@ public:
     }
 };
 
-rct_window* WindowRideRefurbishPromptOpen(const Ride& ride)
+WindowBase* WindowRideRefurbishPromptOpen(const Ride& ride)
 {
-    rct_window* w;
+    WindowBase* w;
     RefurbishRidePromptWindow* newWindow;
 
     w = WindowFindByClass(WindowClass::DemolishRidePrompt);
diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp
index 14be48f7e1..6b009ceefc 100644
--- a/src/openrct2-ui/windows/Research.cpp
+++ b/src/openrct2-ui/windows/Research.cpp
@@ -101,17 +101,17 @@ static Widget *window_research_page_widgets[] = {
 
 #pragma region Events
 
-static void WindowResearchDevelopmentMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowResearchDevelopmentUpdate(rct_window *w);
-static void WindowResearchDevelopmentInvalidate(rct_window *w);
-static void WindowResearchDevelopmentPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowResearchDevelopmentMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowResearchDevelopmentUpdate(WindowBase *w);
+static void WindowResearchDevelopmentInvalidate(WindowBase *w);
+static void WindowResearchDevelopmentPaint(WindowBase *w, DrawPixelInfo *dpi);
 
-static void WindowResearchFundingMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowResearchFundingMousedown(rct_window *w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowResearchFundingDropdown(rct_window *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowResearchFundingUpdate(rct_window *w);
-static void WindowResearchFundingInvalidate(rct_window *w);
-static void WindowResearchFundingPaint(rct_window *w, DrawPixelInfo *dpi);
+static void WindowResearchFundingMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowResearchFundingMousedown(WindowBase *w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowResearchFundingDropdown(WindowBase *w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowResearchFundingUpdate(WindowBase *w);
+static void WindowResearchFundingInvalidate(WindowBase *w);
+static void WindowResearchFundingPaint(WindowBase *w, DrawPixelInfo *dpi);
 
 //
 static WindowEventList window_research_development_events([](auto& events)
@@ -154,13 +154,13 @@ static constexpr const StringId ResearchStageNames[] = {
     STR_RESEARCH_STAGE_UNKNOWN,
 };
 
-static void WindowResearchSetPage(rct_window* w, int32_t page);
-static void WindowResearchSetPressedTab(rct_window* w);
-static void WindowResearchDrawTabImages(DrawPixelInfo* dpi, rct_window* w);
+static void WindowResearchSetPage(WindowBase* w, int32_t page);
+static void WindowResearchSetPressedTab(WindowBase* w);
+static void WindowResearchDrawTabImages(DrawPixelInfo* dpi, WindowBase* w);
 
-rct_window* WindowResearchOpen()
+WindowBase* WindowResearchOpen()
 {
-    rct_window* w;
+    WindowBase* w;
 
     w = WindowBringToFrontByClass(WindowClass::Research);
     if (w == nullptr)
@@ -196,7 +196,7 @@ rct_window* WindowResearchOpen()
  *
  *  rct2: 0x006B6B38
  */
-static void WindowResearchDevelopmentMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowResearchDevelopmentMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -217,7 +217,7 @@ static void WindowResearchDevelopmentMouseup(rct_window* w, WidgetIndex widgetIn
  *
  *  rct2: 0x0069CBA6
  */
-static void WindowResearchDevelopmentUpdate(rct_window* w)
+static void WindowResearchDevelopmentUpdate(WindowBase* w)
 {
     // Tab animation
     if (++w->frame_no >= window_research_tab_animation_loops[w->page])
@@ -229,7 +229,7 @@ static void WindowResearchDevelopmentUpdate(rct_window* w)
  *
  *  rct2: 0x006B6819
  */
-static void WindowResearchDevelopmentInvalidate(rct_window* w)
+static void WindowResearchDevelopmentInvalidate(WindowBase* w)
 {
     if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_DEVELOPMENT])
     {
@@ -253,7 +253,7 @@ static void WindowResearchDevelopmentInvalidate(rct_window* w)
  *
  *  rct2: 0x006B689B
  */
-static void WindowResearchDevelopmentPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowResearchDevelopmentPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowResearchDrawTabImages(dpi, w);
@@ -261,7 +261,7 @@ static void WindowResearchDevelopmentPaint(rct_window* w, DrawPixelInfo* dpi)
     WindowResearchDevelopmentPagePaint(w, dpi, WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP);
 }
 
-void WindowResearchDevelopmentPagePaint(rct_window* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex)
+void WindowResearchDevelopmentPagePaint(WindowBase* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex)
 {
     baseWidgetIndex = baseWidgetIndex - WIDX_CURRENTLY_IN_DEVELOPMENT_GROUP;
 
@@ -391,7 +391,7 @@ void WindowResearchDevelopmentPagePaint(rct_window* w, DrawPixelInfo* dpi, Widge
  *
  *  rct2: 0x0069DB3F
  */
-static void WindowResearchFundingMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowResearchFundingMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -423,7 +423,7 @@ static void WindowResearchFundingMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x0069DB66
  */
-static void WindowResearchFundingMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowResearchFundingMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON)
         return;
@@ -447,7 +447,7 @@ static void WindowResearchFundingMousedown(rct_window* w, WidgetIndex widgetInde
  *
  *  rct2: 0x0069DB6D
  */
-static void WindowResearchFundingDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowResearchFundingDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON || dropdownIndex == -1)
         return;
@@ -460,7 +460,7 @@ static void WindowResearchFundingDropdown(rct_window* w, WidgetIndex widgetIndex
  *
  *  rct2: 0x0069DC23
  */
-static void WindowResearchFundingUpdate(rct_window* w)
+static void WindowResearchFundingUpdate(WindowBase* w)
 {
     // Tab animation
     if (++w->frame_no >= window_research_tab_animation_loops[w->page])
@@ -472,7 +472,7 @@ static void WindowResearchFundingUpdate(rct_window* w)
  *
  *  rct2: 0x0069DA64
  */
-static void WindowResearchFundingInvalidate(rct_window* w)
+static void WindowResearchFundingInvalidate(WindowBase* w)
 {
     if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_FUNDING])
     {
@@ -528,7 +528,7 @@ static void WindowResearchFundingInvalidate(rct_window* w)
  *
  *  rct2: 0x0069DAF0
  */
-static void WindowResearchFundingPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowResearchFundingPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowResearchDrawTabImages(dpi, w);
@@ -536,7 +536,7 @@ static void WindowResearchFundingPaint(rct_window* w, DrawPixelInfo* dpi)
     WindowResearchFundingPagePaint(w, dpi, WIDX_RESEARCH_FUNDING);
 }
 
-void WindowResearchFundingPagePaint(rct_window* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex)
+void WindowResearchFundingPagePaint(WindowBase* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex)
 {
     if (gParkFlags & PARK_FLAGS_NO_MONEY)
         return;
@@ -555,7 +555,7 @@ void WindowResearchFundingPagePaint(rct_window* w, DrawPixelInfo* dpi, WidgetInd
  *
  *  rct2: 0x0069CAC5
  */
-static void WindowResearchSetPage(rct_window* w, int32_t page)
+static void WindowResearchSetPage(WindowBase* w, int32_t page)
 {
     w->page = page;
     w->frame_no = 0;
@@ -585,7 +585,7 @@ static void WindowResearchSetPage(rct_window* w, int32_t page)
     w->Invalidate();
 }
 
-static void WindowResearchSetPressedTab(rct_window* w)
+static void WindowResearchSetPressedTab(WindowBase* w)
 {
     int32_t i;
     for (i = 0; i < WINDOW_RESEARCH_PAGE_COUNT; i++)
@@ -593,7 +593,7 @@ static void WindowResearchSetPressedTab(rct_window* w)
     w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
 }
 
-static void WindowResearchDrawTabImage(DrawPixelInfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
+static void WindowResearchDrawTabImage(DrawPixelInfo* dpi, WindowBase* w, int32_t page, int32_t spriteIndex)
 {
     WidgetIndex widgetIndex = WIDX_TAB_1 + page;
 
@@ -613,7 +613,7 @@ static void WindowResearchDrawTabImage(DrawPixelInfo* dpi, rct_window* w, int32_
     }
 }
 
-static void WindowResearchDrawTabImages(DrawPixelInfo* dpi, rct_window* w)
+static void WindowResearchDrawTabImages(DrawPixelInfo* dpi, WindowBase* w)
 {
     WindowResearchDrawTabImage(dpi, w, WINDOW_RESEARCH_PAGE_DEVELOPMENT, SPR_TAB_FINANCES_RESEARCH_0);
     WindowResearchDrawTabImage(dpi, w, WINDOW_RESEARCH_PAGE_FUNDING, SPR_TAB_FINANCES_SUMMARY_0);
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index c8ac301c96..80221f8dec 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -429,107 +429,107 @@ static constexpr const uint64_t window_ride_page_hold_down_widgets[] = {
 
 #pragma region Events
 
-static void WindowRideInitViewport(rct_window* w);
+static void WindowRideInitViewport(WindowBase* w);
 
-static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideMainResize(rct_window* w);
-static void WindowRideMainMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideMainUpdate(rct_window* w);
-static void WindowRideMainTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
-static void WindowRideMainViewportRotate(rct_window* w);
-static void WindowRideMainInvalidate(rct_window* w);
-static void WindowRideMainPaint(rct_window* w, DrawPixelInfo* dpi);
-static void WindowRideMainFollowRide(rct_window* w);
+static void WindowRideMainMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideMainResize(WindowBase* w);
+static void WindowRideMainMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideMainDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideMainUpdate(WindowBase* w);
+static void WindowRideMainTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text);
+static void WindowRideMainViewportRotate(WindowBase* w);
+static void WindowRideMainInvalidate(WindowBase* w);
+static void WindowRideMainPaint(WindowBase* w, DrawPixelInfo* dpi);
+static void WindowRideMainFollowRide(WindowBase* w);
 
-static void WindowRideVehicleMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideVehicleResize(rct_window* w);
-static void WindowRideVehicleMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideVehicleDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideVehicleUpdate(rct_window* w);
-static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback);
-static void WindowRideVehicleInvalidate(rct_window* w);
-static void WindowRideVehiclePaint(rct_window* w, DrawPixelInfo* dpi);
-static void WindowRideVehicleScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex);
+static void WindowRideVehicleMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideVehicleResize(WindowBase* w);
+static void WindowRideVehicleMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideVehicleDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideVehicleUpdate(WindowBase* w);
+static OpenRCT2String WindowRideVehicleTooltip(WindowBase* const w, const WidgetIndex widgetIndex, StringId fallback);
+static void WindowRideVehicleInvalidate(WindowBase* w);
+static void WindowRideVehiclePaint(WindowBase* w, DrawPixelInfo* dpi);
+static void WindowRideVehicleScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex);
 
-static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideOperatingResize(rct_window* w);
-static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideOperatingLengthWindow(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideOperatingTweakTextInput(rct_window* w, const Ride& ride);
-static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideOperatingUpdate(rct_window* w);
-static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
-static void WindowRideOperatingInvalidate(rct_window* w);
-static void WindowRideOperatingPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowRideOperatingMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideOperatingResize(WindowBase* w);
+static void WindowRideOperatingMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideOperatingLengthWindow(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideOperatingTweakTextInput(WindowBase* w, const Ride& ride);
+static void WindowRideOperatingDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideOperatingUpdate(WindowBase* w);
+static void WindowRideOperatingTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text);
+static void WindowRideOperatingInvalidate(WindowBase* w);
+static void WindowRideOperatingPaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowRideMaintenanceMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideMaintenanceResize(rct_window* w);
-static void WindowRideMaintenanceMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideMaintenanceUpdate(rct_window* w);
-static void WindowRideMaintenanceInvalidate(rct_window* w);
-static void WindowRideMaintenancePaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowRideMaintenanceMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideMaintenanceResize(WindowBase* w);
+static void WindowRideMaintenanceMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideMaintenanceDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideMaintenanceUpdate(WindowBase* w);
+static void WindowRideMaintenanceInvalidate(WindowBase* w);
+static void WindowRideMaintenancePaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowRideColourClose(rct_window* w);
-static void WindowRideColourMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideColourResize(rct_window* w);
-static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideColourDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideColourUpdate(rct_window* w);
-static void WindowRideColourTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowRideColourTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowRideColourInvalidate(rct_window* w);
-static void WindowRideColourPaint(rct_window* w, DrawPixelInfo* dpi);
-static void WindowRideColourScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex);
+static void WindowRideColourClose(WindowBase* w);
+static void WindowRideColourMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideColourResize(WindowBase* w);
+static void WindowRideColourMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideColourDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideColourUpdate(WindowBase* w);
+static void WindowRideColourTooldown(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowRideColourTooldrag(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowRideColourInvalidate(WindowBase* w);
+static void WindowRideColourPaint(WindowBase* w, DrawPixelInfo* dpi);
+static void WindowRideColourScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex);
 
-static void WindowRideMusicMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideMusicResize(rct_window* w);
-static void WindowRideMusicMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideMusicDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideMusicUpdate(rct_window* w);
-static void WindowRideMusicInvalidate(rct_window* w);
-static void WindowRideMusicPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowRideMusicMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideMusicResize(WindowBase* w);
+static void WindowRideMusicMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideMusicDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideMusicUpdate(WindowBase* w);
+static void WindowRideMusicInvalidate(WindowBase* w);
+static void WindowRideMusicPaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowRideMeasurementsClose(rct_window* w);
-static void WindowRideMeasurementsMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideMeasurementsResize(rct_window* w);
-static void WindowRideMeasurementsMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideMeasurementsDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowRideMeasurementsUpdate(rct_window* w);
-static void WindowRideMeasurementsTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowRideMeasurementsTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowRideMeasurementsToolabort(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideMeasurementsInvalidate(rct_window* w);
-static void WindowRideMeasurementsPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowRideMeasurementsClose(WindowBase* w);
+static void WindowRideMeasurementsMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideMeasurementsResize(WindowBase* w);
+static void WindowRideMeasurementsMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideMeasurementsDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowRideMeasurementsUpdate(WindowBase* w);
+static void WindowRideMeasurementsTooldown(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowRideMeasurementsTooldrag(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowRideMeasurementsToolabort(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideMeasurementsInvalidate(WindowBase* w);
+static void WindowRideMeasurementsPaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowRideGraphsMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideGraphsResize(rct_window* w);
-static void WindowRideGraphsMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideGraphsUpdate(rct_window* w);
-static void WindowRideGraphsScrollgetheight(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
-static void WindowRideGraphs15(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType);
-static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback);
-static void WindowRideGraphsInvalidate(rct_window* w);
-static void WindowRideGraphsPaint(rct_window* w, DrawPixelInfo* dpi);
-static void WindowRideGraphsScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex);
+static void WindowRideGraphsMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideGraphsResize(WindowBase* w);
+static void WindowRideGraphsMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideGraphsUpdate(WindowBase* w);
+static void WindowRideGraphsScrollgetheight(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height);
+static void WindowRideGraphs15(WindowBase* w, int32_t scrollIndex, int32_t scrollAreaType);
+static OpenRCT2String WindowRideGraphsTooltip(WindowBase* w, const WidgetIndex widgetIndex, const StringId fallback);
+static void WindowRideGraphsInvalidate(WindowBase* w);
+static void WindowRideGraphsPaint(WindowBase* w, DrawPixelInfo* dpi);
+static void WindowRideGraphsScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex);
 
-static void WindowRideIncomeMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideIncomeResize(rct_window* w);
-static void WindowRideIncomeMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowRideIncomeUpdate(rct_window* w);
-static void WindowRideIncomeTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
-static void WindowRideIncomeInvalidate(rct_window* w);
-static void WindowRideIncomePaint(rct_window* w, DrawPixelInfo* dpi);
-static bool WindowRideIncomeCanModifyPrimaryPrice(rct_window* w);
+static void WindowRideIncomeMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideIncomeResize(WindowBase* w);
+static void WindowRideIncomeMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowRideIncomeUpdate(WindowBase* w);
+static void WindowRideIncomeTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text);
+static void WindowRideIncomeInvalidate(WindowBase* w);
+static void WindowRideIncomePaint(WindowBase* w, DrawPixelInfo* dpi);
+static bool WindowRideIncomeCanModifyPrimaryPrice(WindowBase* w);
 
-static void WindowRideCustomerMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowRideCustomerResize(rct_window* w);
-static void WindowRideCustomerUpdate(rct_window* w);
-static void WindowRideCustomerInvalidate(rct_window* w);
-static void WindowRideCustomerPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowRideCustomerMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowRideCustomerResize(WindowBase* w);
+static void WindowRideCustomerUpdate(WindowBase* w);
+static void WindowRideCustomerInvalidate(WindowBase* w);
+static void WindowRideCustomerPaint(WindowBase* w, DrawPixelInfo* dpi);
 
-static void WindowRideSetPage(rct_window* w, int32_t page);
+static void WindowRideSetPage(WindowBase* w, int32_t page);
 
 // 0x0098DFD4
 static WindowEventList window_ride_main_events([](auto& events) {
@@ -862,7 +862,7 @@ static RideObjectEntry* VehicleDropdownRideType = nullptr;
 static bool VehicleDropdownExpanded = false;
 static std::vector<VehicleTypeLabel> VehicleDropdownData;
 
-static void WindowRideDrawTabImage(DrawPixelInfo* dpi, rct_window* w, int32_t page, int32_t spriteIndex)
+static void WindowRideDrawTabImage(DrawPixelInfo* dpi, WindowBase* w, int32_t page, int32_t spriteIndex)
 {
     WidgetIndex widgetIndex = WIDX_TAB_1 + page;
 
@@ -883,7 +883,7 @@ static void WindowRideDrawTabImage(DrawPixelInfo* dpi, rct_window* w, int32_t pa
  *
  *  rct2: 0x006B2E88
  */
-static void WindowRideDrawTabMain(DrawPixelInfo* dpi, rct_window* w)
+static void WindowRideDrawTabMain(DrawPixelInfo* dpi, WindowBase* w)
 {
     WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast<int32_t>(WINDOW_RIDE_PAGE_MAIN);
     if (!WidgetIsDisabled(*w, widgetIndex))
@@ -921,7 +921,7 @@ static void WindowRideDrawTabMain(DrawPixelInfo* dpi, rct_window* w)
  *
  *  rct2: 0x006B2B68
  */
-static void WindowRideDrawTabVehicle(DrawPixelInfo* dpi, rct_window* w)
+static void WindowRideDrawTabVehicle(DrawPixelInfo* dpi, WindowBase* w)
 {
     WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast<int32_t>(WINDOW_RIDE_PAGE_VEHICLE);
     const auto& widget = w->widgets[widgetIndex];
@@ -992,7 +992,7 @@ static void WindowRideDrawTabVehicle(DrawPixelInfo* dpi, rct_window* w)
  *
  *  rct2: 0x006B2F42
  */
-static void WindowRideDrawTabCustomer(DrawPixelInfo* dpi, rct_window* w)
+static void WindowRideDrawTabCustomer(DrawPixelInfo* dpi, WindowBase* w)
 {
     WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast<int32_t>(WINDOW_RIDE_PAGE_CUSTOMER);
 
@@ -1015,7 +1015,7 @@ static void WindowRideDrawTabCustomer(DrawPixelInfo* dpi, rct_window* w)
  *
  *  rct2: 0x006B2B35
  */
-static void WindowRideDrawTabImages(DrawPixelInfo* dpi, rct_window* w)
+static void WindowRideDrawTabImages(DrawPixelInfo* dpi, WindowBase* w)
 {
     WindowRideDrawTabVehicle(dpi, w);
     WindowRideDrawTabImage(dpi, w, WINDOW_RIDE_PAGE_OPERATING, SPR_TAB_GEARS_0);
@@ -1033,7 +1033,7 @@ static void WindowRideDrawTabImages(DrawPixelInfo* dpi, rct_window* w)
  *
  * rct2: 0x006AEB9F
  */
-static void WindowRideDisableTabs(rct_window* w)
+static void WindowRideDisableTabs(WindowBase* w)
 {
     uint32_t disabled_tabs = 0;
     auto ride = GetRide(w->rideId);
@@ -1153,9 +1153,9 @@ static void WindowRideUpdateOverallView(const Ride& ride)
  *
  *  rct2: 0x006AEAB4
  */
-static rct_window* WindowRideOpen(const Ride& ride)
+static WindowBase* WindowRideOpen(const Ride& ride)
 {
-    rct_window* w;
+    WindowBase* w;
 
     w = WindowCreateAutoPos(316, 207, window_ride_page_events[0], WindowClass::Ride, WF_10 | WF_RESIZABLE);
     w->widgets = window_ride_page_widgets[WINDOW_RIDE_PAGE_MAIN];
@@ -1185,14 +1185,14 @@ static rct_window* WindowRideOpen(const Ride& ride)
  *
  *  rct2: 0x006ACC28
  */
-rct_window* WindowRideMainOpen(const Ride& ride)
+WindowBase* WindowRideMainOpen(const Ride& ride)
 {
     if (ride.type >= RIDE_TYPE_COUNT)
     {
         return nullptr;
     }
 
-    rct_window* w = WindowBringToFrontByNumber(WindowClass::Ride, ride.id.ToUnderlying());
+    WindowBase* w = WindowBringToFrontByNumber(WindowClass::Ride, ride.id.ToUnderlying());
     if (w == nullptr)
     {
         w = WindowRideOpen(ride);
@@ -1225,7 +1225,7 @@ rct_window* WindowRideMainOpen(const Ride& ride)
  *
  *  rct2: 0x006ACCCE
  */
-static rct_window* WindowRideOpenStation(const Ride& ride, StationIndex stationIndex)
+static WindowBase* WindowRideOpenStation(const Ride& ride, StationIndex stationIndex)
 {
     if (ride.type >= RIDE_TYPE_COUNT)
         return nullptr;
@@ -1273,7 +1273,7 @@ static rct_window* WindowRideOpenStation(const Ride& ride, StationIndex stationI
     return w;
 }
 
-rct_window* WindowRideOpenTrack(TileElement* tileElement)
+WindowBase* WindowRideOpenTrack(TileElement* tileElement)
 {
     assert(tileElement != nullptr);
     auto rideIndex = tileElement->GetRideIndex();
@@ -1314,7 +1314,7 @@ rct_window* WindowRideOpenTrack(TileElement* tileElement)
  *
  *  rct2: 0x006ACAC2
  */
-rct_window* WindowRideOpenVehicle(Vehicle* vehicle)
+WindowBase* WindowRideOpenVehicle(Vehicle* vehicle)
 {
     if (vehicle == nullptr)
         return nullptr;
@@ -1338,7 +1338,7 @@ rct_window* WindowRideOpenVehicle(Vehicle* vehicle)
         view++;
     }
 
-    rct_window* w = WindowFindByNumber(WindowClass::Ride, ride->id.ToUnderlying());
+    WindowBase* w = WindowFindByNumber(WindowClass::Ride, ride->id.ToUnderlying());
     if (w != nullptr)
     {
         w->Invalidate();
@@ -1360,7 +1360,7 @@ rct_window* WindowRideOpenVehicle(Vehicle* vehicle)
                     continue;
 
                 numPeepsLeft--;
-                rct_window* w2 = WindowFindByNumber(WindowClass::Peep, vehicle->peep[i]);
+                WindowBase* w2 = WindowFindByNumber(WindowClass::Peep, vehicle->peep[i]);
                 if (w2 == nullptr)
                 {
                     auto intent = Intent(WindowClass::Peep);
@@ -1406,7 +1406,7 @@ rct_window* WindowRideOpenVehicle(Vehicle* vehicle)
  *
  *  rct2: 0x006AF1D2
  */
-static void WindowRideSetPage(rct_window* w, int32_t page)
+static void WindowRideSetPage(WindowBase* w, int32_t page)
 {
     int32_t listen;
 
@@ -1458,7 +1458,7 @@ static void WindowRideSetPage(rct_window* w, int32_t page)
         w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON;
 }
 
-static void WindowRideSetPressedTab(rct_window* w)
+static void WindowRideSetPressedTab(WindowBase* w)
 {
     int32_t i;
     for (i = 0; i < WINDOW_RIDE_PAGE_COUNT; i++)
@@ -1466,14 +1466,14 @@ static void WindowRideSetPressedTab(rct_window* w)
     w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page);
 }
 
-static void WindowRideAnchorBorderWidgets(rct_window* w)
+static void WindowRideAnchorBorderWidgets(WindowBase* w)
 {
     w->ResizeFrameWithPage();
 }
 
 #pragma region Main
 
-static std::optional<StationIndex> GetStationIndexFromViewSelection(const rct_window& w)
+static std::optional<StationIndex> GetStationIndexFromViewSelection(const WindowBase& w)
 {
     const auto* ride = GetRide(RideId::FromUnderlying(w.number));
     if (ride == nullptr)
@@ -1500,7 +1500,7 @@ static std::optional<StationIndex> GetStationIndexFromViewSelection(const rct_wi
  *
  *  rct2: 0x006AF994
  */
-static void WindowRideInitViewport(rct_window* w)
+static void WindowRideInitViewport(WindowBase* w)
 {
     if (w->page != WINDOW_RIDE_PAGE_MAIN)
         return;
@@ -1600,7 +1600,7 @@ static void WindowRideInitViewport(rct_window* w)
  *
  *  rct2: 0x006AF315
  */
-static void WindowRideRename(rct_window* w)
+static void WindowRideRename(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride != nullptr)
@@ -1615,7 +1615,7 @@ static void WindowRideRename(rct_window* w)
  *
  *  rct2: 0x006AF17E
  */
-static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideMainMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -1690,7 +1690,7 @@ static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006AF4A2
  */
-static void WindowRideMainResize(rct_window* w)
+static void WindowRideMainResize(WindowBase* w)
 {
     int32_t minHeight = 180;
     if (ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE)
@@ -1755,7 +1755,7 @@ static bool TrainMustBeHidden(const Ride& ride, int32_t trainIndex)
  *
  *  rct2: 0x006AF825
  */
-static void WindowRideShowViewDropdown(rct_window* w, Widget* widget)
+static void WindowRideShowViewDropdown(WindowBase* w, Widget* widget)
 {
     Widget* dropdownWidget = widget - 1;
     auto ride = GetRide(w->rideId);
@@ -1860,7 +1860,7 @@ static void WindowRideSetDropdown(RideStatusDropdownInfo& info, RideStatus statu
     }
 }
 
-static void WindowRideShowOpenDropdown(rct_window* w, Widget* widget)
+static void WindowRideShowOpenDropdown(WindowBase* w, Widget* widget)
 {
     RideStatusDropdownInfo info;
     info.Ride = GetRide(w->rideId);
@@ -1929,7 +1929,7 @@ static void PopulateRideTypeDropdown()
     RideDropdownDataLanguage = ls.GetCurrentLanguage();
 }
 
-static void WindowRideShowRideTypeDropdown(rct_window* w, Widget* widget)
+static void WindowRideShowRideTypeDropdown(WindowBase* w, Widget* widget)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -1964,7 +1964,7 @@ static void WindowRideShowRideTypeDropdown(rct_window* w, Widget* widget)
     Dropdown::SetChecked(pos, true);
 }
 
-static void WindowRideShowLocateDropdown(rct_window* w, Widget* widget)
+static void WindowRideShowLocateDropdown(WindowBase* w, Widget* widget)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -1983,7 +1983,7 @@ static void WindowRideShowLocateDropdown(rct_window* w, Widget* widget)
     }
 }
 
-static void WindowRideMainFollowRide(rct_window* w)
+static void WindowRideMainFollowRide(WindowBase* w)
 {
     auto* ride = GetRide(w->rideId);
     if (ride != nullptr)
@@ -1998,7 +1998,7 @@ static void WindowRideMainFollowRide(rct_window* w)
                     if (vehicle != nullptr)
                     {
                         auto headVehicleSpriteIndex = vehicle->sprite_index;
-                        rct_window* w_main = WindowGetMain();
+                        WindowBase* w_main = WindowGetMain();
                         WindowFollowSprite(*w_main, headVehicleSpriteIndex);
                     }
                 }
@@ -2072,7 +2072,7 @@ static void PopulateVehicleTypeDropdown(const Ride& ride, bool forceRefresh)
     VehicleDropdownDataLanguage = ls.GetCurrentLanguage();
 }
 
-static void WindowRideShowVehicleTypeDropdown(rct_window* w, Widget* widget)
+static void WindowRideShowVehicleTypeDropdown(WindowBase* w, Widget* widget)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -2114,7 +2114,7 @@ static void WindowRideShowVehicleTypeDropdown(rct_window* w, Widget* widget)
  *
  *  rct2: 0x006AF1BD
  */
-static void WindowRideMainMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideMainMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -2137,7 +2137,7 @@ static void WindowRideMainMousedown(rct_window* w, WidgetIndex widgetIndex, Widg
  *
  *  rct2: 0x006AF300
  */
-static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideMainDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     switch (widgetIndex)
     {
@@ -2235,7 +2235,7 @@ static void WindowRideMainDropdown(rct_window* w, WidgetIndex widgetIndex, int32
  *
  *  rct2: 0x006AF40F
  */
-static void WindowRideMainUpdate(rct_window* w)
+static void WindowRideMainUpdate(WindowBase* w)
 {
     // Update tab animation
     w->frame_no++;
@@ -2273,7 +2273,7 @@ static void WindowRideMainUpdate(rct_window* w)
  *
  *  rct2: 0x006AF2F9
  */
-static void WindowRideMainTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowRideMainTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if (widgetIndex != WIDX_RENAME || text == nullptr)
         return;
@@ -2290,7 +2290,7 @@ static void WindowRideMainTextinput(rct_window* w, WidgetIndex widgetIndex, char
  *
  *  rct2: 0x006AF55A
  */
-static void WindowRideMainViewportRotate(rct_window* w)
+static void WindowRideMainViewportRotate(WindowBase* w)
 {
     WindowRideInitViewport(w);
 }
@@ -2299,7 +2299,7 @@ static void WindowRideMainViewportRotate(rct_window* w)
  *
  *  rct2: 0x006AECF6
  */
-static void WindowRideMainInvalidate(rct_window* w)
+static void WindowRideMainInvalidate(WindowBase* w)
 {
     Widget* widgets;
     int32_t i, height;
@@ -2444,7 +2444,7 @@ static void WindowRideMainInvalidate(rct_window* w)
  *
  *  rct2: 0x006AF10A
  */
-static StringId WindowRideGetStatusOverallView(rct_window* w, Formatter& ft)
+static StringId WindowRideGetStatusOverallView(WindowBase* w, Formatter& ft)
 {
     auto stringId = STR_NONE;
     auto ride = GetRide(w->rideId);
@@ -2464,7 +2464,7 @@ static StringId WindowRideGetStatusOverallView(rct_window* w, Formatter& ft)
  *
  *  rct2: 0x006AEFEF
  */
-static StringId WindowRideGetStatusVehicle(rct_window* w, Formatter& ft)
+static StringId WindowRideGetStatusVehicle(WindowBase* w, Formatter& ft)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -2512,7 +2512,7 @@ static StringId WindowRideGetStatusVehicle(rct_window* w, Formatter& ft)
  *
  *  rct2: 0x006AEF65
  */
-static StringId WindowRideGetStatusStation(rct_window* w, Formatter& ft)
+static StringId WindowRideGetStatusStation(WindowBase* w, Formatter& ft)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -2564,7 +2564,7 @@ static StringId WindowRideGetStatusStation(rct_window* w, Formatter& ft)
  *
  *  rct2: 0x006AEE73
  */
-static StringId WindowRideGetStatus(rct_window* w, Formatter& ft)
+static StringId WindowRideGetStatus(WindowBase* w, Formatter& ft)
 {
     auto ride = GetRide(w->rideId);
     if (w->ride.view == 0)
@@ -2580,7 +2580,7 @@ static StringId WindowRideGetStatus(rct_window* w, Formatter& ft)
  *
  *  rct2: 0x006AEE73
  */
-static void WindowRideMainPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideMainPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     Widget* widget;
 
@@ -2641,7 +2641,7 @@ static void WindowRideMainPaint(rct_window* w, DrawPixelInfo* dpi)
  *
  *  rct2: 0x006B272D
  */
-static void WindowRideVehicleMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideVehicleMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -2667,7 +2667,7 @@ static void WindowRideVehicleMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006B2ABB
  */
-static void WindowRideVehicleResize(rct_window* w)
+static void WindowRideVehicleResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 214, 316, 214);
 }
@@ -2676,7 +2676,7 @@ static void WindowRideVehicleResize(rct_window* w)
  *
  *  rct2: 0x006B2748
  */
-static void WindowRideVehicleMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideVehicleMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -2710,7 +2710,7 @@ static void WindowRideVehicleMousedown(rct_window* w, WidgetIndex widgetIndex, W
  *
  *  rct2: 0x006B2767
  */
-static void WindowRideVehicleDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideVehicleDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (dropdownIndex == -1)
         return;
@@ -2735,14 +2735,14 @@ static void WindowRideVehicleDropdown(rct_window* w, WidgetIndex widgetIndex, in
  *
  *  rct2: 0x006B2AA1
  */
-static void WindowRideVehicleUpdate(rct_window* w)
+static void WindowRideVehicleUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
     WidgetInvalidate(*w, WIDX_TAB_2);
 }
 
-static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback)
+static OpenRCT2String WindowRideVehicleTooltip(WindowBase* const w, const WidgetIndex widgetIndex, StringId fallback)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -2795,7 +2795,7 @@ static OpenRCT2String WindowRideVehicleTooltip(rct_window* const w, const Widget
  *
  *  rct2: 0x006B222C
  */
-static void WindowRideVehicleInvalidate(rct_window* w)
+static void WindowRideVehicleInvalidate(WindowBase* w)
 {
     Widget* widgets;
     RideObjectEntry* rideEntry;
@@ -2886,7 +2886,7 @@ static void WindowRideVehicleInvalidate(rct_window* w)
  *
  *  rct2: 0x006B23DC
  */
-static void WindowRideVehiclePaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideVehiclePaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowRideDrawTabImages(dpi, w);
@@ -2964,7 +2964,7 @@ struct VehicleDrawInfo
  *
  *  rct2: 0x006B2502
  */
-static void WindowRideVehicleScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowRideVehicleScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3053,7 +3053,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, DrawPixelInfo* dpi, int3
  *
  *  rct2: 0x006B11D5
  */
-static void WindowRideModeTweakIncrease(rct_window* w)
+static void WindowRideModeTweakIncrease(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3078,7 +3078,7 @@ static void WindowRideModeTweakIncrease(rct_window* w)
  *
  *  rct2: 0x006B120A
  */
-static void WindowRideModeTweakDecrease(rct_window* w)
+static void WindowRideModeTweakDecrease(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3102,7 +3102,7 @@ static void WindowRideModeTweakDecrease(rct_window* w)
  *
  *  rct2: 0x006B1631
  */
-static void WindowRideModeDropdown(rct_window* w, Widget* widget)
+static void WindowRideModeDropdown(WindowBase* w, Widget* widget)
 {
     Widget* dropdownWidget;
 
@@ -3144,7 +3144,7 @@ static void WindowRideModeDropdown(rct_window* w, Widget* widget)
  *
  *  rct2: 0x006B15C0
  */
-static void WindowRideLoadDropdown(rct_window* w, Widget* widget)
+static void WindowRideLoadDropdown(WindowBase* w, Widget* widget)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3167,7 +3167,7 @@ static void WindowRideLoadDropdown(rct_window* w, Widget* widget)
  *
  *  rct2: 0x006B10A7
  */
-static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideOperatingMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     const auto rideId = w->rideId;
     auto ride = GetRide(rideId);
@@ -3214,7 +3214,7 @@ static void WindowRideOperatingMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006B1715
  */
-static void WindowRideOperatingResize(rct_window* w)
+static void WindowRideOperatingResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 186, 316, 186);
 }
@@ -3223,7 +3223,7 @@ static void WindowRideOperatingResize(rct_window* w)
  *
  *  rct2: 0x006B10F4
  */
-static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideOperatingMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     const auto rideId = w->rideId;
     auto ride = GetRide(rideId);
@@ -3315,7 +3315,7 @@ static void WindowRideOperatingMousedown(rct_window* w, WidgetIndex widgetIndex,
     }
 }
 
-static void WindowRideOperatingLengthWindow(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideOperatingLengthWindow(WindowBase* w, WidgetIndex widgetIndex)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3333,7 +3333,7 @@ static void WindowRideOperatingLengthWindow(rct_window* w, WidgetIndex widgetInd
     WindowTextInputRawOpen(w, widgetIndex, title, STR_ENTER_VALUE, ft, buffer, 4);
 }
 
-static void WindowRideOperatingTweakTextInput(rct_window* w, const Ride& ride)
+static void WindowRideOperatingTweakTextInput(WindowBase* w, const Ride& ride)
 {
     switch (ride.mode)
     {
@@ -3368,7 +3368,7 @@ static void WindowRideOperatingTweakTextInput(rct_window* w, const Ride& ride)
  *
  *  rct2: 0x006B1165
  */
-static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideOperatingDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (dropdownIndex == -1)
         return;
@@ -3412,7 +3412,7 @@ static void WindowRideOperatingDropdown(rct_window* w, WidgetIndex widgetIndex,
  *
  *  rct2: 0x006B178E
  */
-static void WindowRideOperatingUpdate(rct_window* w)
+static void WindowRideOperatingUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -3426,7 +3426,7 @@ static void WindowRideOperatingUpdate(rct_window* w)
     }
 }
 
-static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowRideOperatingTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if (text == nullptr)
         return;
@@ -3478,7 +3478,7 @@ static void WindowRideOperatingTextinput(rct_window* w, WidgetIndex widgetIndex,
  *
  *  rct2: 0x006B0B30
  */
-static void WindowRideOperatingInvalidate(rct_window* w)
+static void WindowRideOperatingInvalidate(WindowBase* w)
 {
     Widget* widgets;
     StringId format, caption, tooltip;
@@ -3722,7 +3722,7 @@ static void WindowRideOperatingInvalidate(rct_window* w)
  *
  *  rct2: 0x006B1001
  */
-static void WindowRideOperatingPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideOperatingPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowRideDrawTabImages(dpi, w);
@@ -3757,7 +3757,7 @@ static void WindowRideOperatingPaint(rct_window* w, DrawPixelInfo* dpi)
  *
  *  rct2: 0x006B1AE4
  */
-static void WindowRideLocateMechanic(rct_window* w)
+static void WindowRideLocateMechanic(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3785,7 +3785,7 @@ static void WindowRideLocateMechanic(rct_window* w)
  *  rct2: 0x006B7D08
  */
 static void WindowRideMaintenanceDrawBar(
-    rct_window* w, DrawPixelInfo* dpi, const ScreenCoordsXY& coords, int32_t value, int32_t colour)
+    WindowBase* w, DrawPixelInfo* dpi, const ScreenCoordsXY& coords, int32_t value, int32_t colour)
 {
     GfxFillRectInset(dpi, { coords, coords + ScreenCoordsXY{ 149, 8 } }, w->colours[1], INSET_RECT_F_30);
     if (colour & BAR_BLINK)
@@ -3806,7 +3806,7 @@ static void WindowRideMaintenanceDrawBar(
  *
  *  rct2: 0x006B1AAD
  */
-static void WindowRideMaintenanceMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideMaintenanceMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -3838,7 +3838,7 @@ static void WindowRideMaintenanceMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006B1D70
  */
-static void WindowRideMaintenanceResize(rct_window* w)
+static void WindowRideMaintenanceResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 135, 316, 135);
 }
@@ -3847,7 +3847,7 @@ static void WindowRideMaintenanceResize(rct_window* w)
  *
  *  rct2: 0x006B1ACE
  */
-static void WindowRideMaintenanceMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideMaintenanceMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -3948,7 +3948,7 @@ static void WindowRideMaintenanceMousedown(rct_window* w, WidgetIndex widgetInde
  *
  *  rct2: 0x006B1AD9
  */
-static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideMaintenanceDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (dropdownIndex == -1)
         return;
@@ -4053,7 +4053,7 @@ static void WindowRideMaintenanceDropdown(rct_window* w, WidgetIndex widgetIndex
  *
  *  rct2: 0x006B1D37
  */
-static void WindowRideMaintenanceUpdate(rct_window* w)
+static void WindowRideMaintenanceUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -4071,7 +4071,7 @@ static void WindowRideMaintenanceUpdate(rct_window* w)
  *
  *  rct2: 0x006B17C8
  */
-static void WindowRideMaintenanceInvalidate(rct_window* w)
+static void WindowRideMaintenanceInvalidate(WindowBase* w)
 {
     auto widgets = window_ride_page_widgets[w->page];
     if (w->widgets != widgets)
@@ -4119,7 +4119,7 @@ static void WindowRideMaintenanceInvalidate(rct_window* w)
  *
  *  rct2: 0x006B1877
  */
-static void WindowRideMaintenancePaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideMaintenancePaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowRideDrawTabImages(dpi, w);
@@ -4265,7 +4265,7 @@ static int32_t WindowRideHasTrackColour(const Ride& ride, int32_t trackColour)
     }
 }
 
-static void WindowRideSetTrackColourScheme(rct_window* w, const ScreenCoordsXY& screenPos)
+static void WindowRideSetTrackColourScheme(WindowBase* w, const ScreenCoordsXY& screenPos)
 {
     auto newColourScheme = static_cast<uint8_t>(w->ride_colour);
     auto info = GetMapCoordinatesFromPos(screenPos, EnumsToFlags(ViewportInteractionItem::Ride));
@@ -4290,7 +4290,7 @@ static void WindowRideSetTrackColourScheme(rct_window* w, const ScreenCoordsXY&
  *
  *  rct2: 0x006B04FA
  */
-static void WindowRideColourClose(rct_window* w)
+static void WindowRideColourClose(WindowBase* w)
 {
     if (!(InputTestFlag(INPUT_FLAG_TOOL_ACTIVE)))
         return;
@@ -4308,7 +4308,7 @@ static void WindowRideColourClose(rct_window* w)
  *
  *  rct2: 0x006B02A1
  */
-static void WindowRideColourMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideColourMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -4347,7 +4347,7 @@ static void WindowRideColourMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006B0AB6
  */
-static void WindowRideColourResize(rct_window* w)
+static void WindowRideColourResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 207, 316, 207);
 }
@@ -4356,7 +4356,7 @@ static void WindowRideColourResize(rct_window* w)
  *
  *  rct2: 0x006B02C6
  */
-static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideColourMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     VehicleColour vehicleColour;
     int32_t i, numItems;
@@ -4490,7 +4490,7 @@ static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, Wi
  *
  *  rct2: 0x006B0331
  */
-static void WindowRideColourDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideColourDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (dropdownIndex == -1)
         return;
@@ -4596,7 +4596,7 @@ static void WindowRideColourDropdown(rct_window* w, WidgetIndex widgetIndex, int
  *
  *  rct2: 0x006B0A8F
  */
-static void WindowRideColourUpdate(rct_window* w)
+static void WindowRideColourUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -4608,7 +4608,7 @@ static void WindowRideColourUpdate(rct_window* w)
  *
  *  rct2: 0x006B04EC
  */
-static void WindowRideColourTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowRideColourTooldown(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
         WindowRideSetTrackColourScheme(w, screenCoords);
@@ -4618,7 +4618,7 @@ static void WindowRideColourTooldown(rct_window* w, WidgetIndex widgetIndex, con
  *
  *  rct2: 0x006B04F3
  */
-static void WindowRideColourTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowRideColourTooldrag(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
         WindowRideSetTrackColourScheme(w, screenCoords);
@@ -4628,7 +4628,7 @@ static void WindowRideColourTooldrag(rct_window* w, WidgetIndex widgetIndex, con
  *
  *  rct2: 0x006AFB36
  */
-static void WindowRideColourInvalidate(rct_window* w)
+static void WindowRideColourInvalidate(WindowBase* w)
 {
     TrackColour trackColour;
     VehicleColour vehicleColour;
@@ -4878,7 +4878,7 @@ static void WindowRideColourInvalidate(rct_window* w)
  *
  *  rct2: 0x006AFF3E
  */
-static void WindowRideColourPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideColourPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     // TODO: This should use lists and identified sprites
     DrawPixelInfo clippedDpi;
@@ -4998,7 +4998,7 @@ static void WindowRideColourPaint(rct_window* w, DrawPixelInfo* dpi)
  *
  *  rct2: 0x006B0192
  */
-static void WindowRideColourScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowRideColourScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -5045,7 +5045,7 @@ static std::vector<ObjectEntryIndex> window_ride_current_music_style_order;
  *
  *  rct2: 0x006B215D
  */
-static void WindowRideToggleMusic(rct_window* w)
+static void WindowRideToggleMusic(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride != nullptr)
@@ -5059,7 +5059,7 @@ static void WindowRideToggleMusic(rct_window* w)
  *
  *  rct2: 0x006B1ED7
  */
-static void WindowRideMusicMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideMusicMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -5088,7 +5088,7 @@ static void WindowRideMusicMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006AF4A2
  */
-static void WindowRideMusicResize(rct_window* w)
+static void WindowRideMusicResize(WindowBase* w)
 {
     w->flags |= WF_RESIZABLE;
     WindowSetResize(*w, 316, 81, 316, 81);
@@ -5107,7 +5107,7 @@ static std::string GetMusicString(ObjectEntryIndex musicObjectIndex)
  *
  *  rct2: 0x006B1EFC
  */
-static void WindowRideMusicMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideMusicMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     if (widgetIndex != WIDX_MUSIC_DROPDOWN)
         return;
@@ -5185,7 +5185,7 @@ static void WindowRideMusicMousedown(rct_window* w, WidgetIndex widgetIndex, Wid
  *
  *  rct2: 0x006B1F03
  */
-static void WindowRideMusicDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideMusicDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (widgetIndex == WIDX_MUSIC_DROPDOWN && dropdownIndex >= 0
         && static_cast<size_t>(dropdownIndex) < window_ride_current_music_style_order.size())
@@ -5199,7 +5199,7 @@ static void WindowRideMusicDropdown(rct_window* w, WidgetIndex widgetIndex, int3
  *
  *  rct2: 0x006B2198
  */
-static void WindowRideMusicUpdate(rct_window* w)
+static void WindowRideMusicUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -5210,7 +5210,7 @@ static void WindowRideMusicUpdate(rct_window* w)
  *
  *  rct2: 0x006B1DEA
  */
-static void WindowRideMusicInvalidate(rct_window* w)
+static void WindowRideMusicInvalidate(WindowBase* w)
 {
     auto widgets = window_ride_page_widgets[w->page];
     if (w->widgets != widgets)
@@ -5261,7 +5261,7 @@ static void WindowRideMusicInvalidate(rct_window* w)
  *
  *  rct2: 0x006B1ECC
  */
-static void WindowRideMusicPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideMusicPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowRideDrawTabImages(dpi, w);
@@ -5287,7 +5287,7 @@ static void CancelScenerySelection()
     gTrackDesignSaveMode = false;
     OpenRCT2::Audio::Resume();
 
-    rct_window* main_w = WindowGetMain();
+    WindowBase* main_w = WindowGetMain();
     if (main_w != nullptr)
     {
         main_w->viewport->flags &= ~(VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE);
@@ -5301,7 +5301,7 @@ static void CancelScenerySelection()
  *
  *  rct2: 0x006D27A3
  */
-static void SetupScenerySelection(rct_window* w)
+static void SetupScenerySelection(WindowBase* w)
 {
     if (gTrackDesignSaveMode)
     {
@@ -5319,7 +5319,7 @@ static void SetupScenerySelection(rct_window* w)
 
     OpenRCT2::Audio::StopAll();
 
-    rct_window* w_main = WindowGetMain();
+    WindowBase* w_main = WindowGetMain();
     if (w_main != nullptr)
     {
         w_main->viewport->flags |= (VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE);
@@ -5371,7 +5371,7 @@ static void TrackDesignCallback(int32_t result, [[maybe_unused]] const utf8* pat
  *
  *  rct2: 0x006AD4CD
  */
-static void WindowRideMeasurementsDesignSave(rct_window* w)
+static void WindowRideMeasurementsDesignSave(WindowBase* w)
 {
     TrackDesignState tds{};
 
@@ -5410,7 +5410,7 @@ static void WindowRideMeasurementsDesignSave(rct_window* w)
  *
  *  rct2: 0x006AD4DA
  */
-static void WindowRideMeasurementsClose(rct_window* w)
+static void WindowRideMeasurementsClose(WindowBase* w)
 {
     WindowRideMeasurementsDesignCancel();
 }
@@ -5419,7 +5419,7 @@ static void WindowRideMeasurementsClose(rct_window* w)
  *
  *  rct2: 0x006AD478
  */
-static void WindowRideMeasurementsMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideMeasurementsMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -5457,7 +5457,7 @@ static void WindowRideMeasurementsMouseup(rct_window* w, WidgetIndex widgetIndex
  *
  *  rct2: 0x006AD564
  */
-static void WindowRideMeasurementsResize(rct_window* w)
+static void WindowRideMeasurementsResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 234, 316, 234);
 }
@@ -5466,7 +5466,7 @@ static void WindowRideMeasurementsResize(rct_window* w)
  *
  *  rct2: 0x006AD4AB
  */
-static void WindowRideMeasurementsMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideMeasurementsMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
         return;
@@ -5494,7 +5494,7 @@ static void WindowRideMeasurementsMousedown(rct_window* w, WidgetIndex widgetInd
  *
  *  rct2: 0x006AD4B2
  */
-static void WindowRideMeasurementsDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowRideMeasurementsDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (widgetIndex != WIDX_SAVE_TRACK_DESIGN)
         return;
@@ -5514,7 +5514,7 @@ static void WindowRideMeasurementsDropdown(rct_window* w, WidgetIndex widgetInde
  *
  *  rct2: 0x006AD5DD
  */
-static void WindowRideMeasurementsUpdate(rct_window* w)
+static void WindowRideMeasurementsUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -5525,7 +5525,7 @@ static void WindowRideMeasurementsUpdate(rct_window* w)
  *
  *  rct2: 0x006D2AE7
  */
-static void WindowRideMeasurementsTooldown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowRideMeasurementsTooldown(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     _lastSceneryX = screenCoords.x;
     _lastSceneryY = screenCoords.y;
@@ -5549,7 +5549,7 @@ static void WindowRideMeasurementsTooldown(rct_window* w, WidgetIndex widgetInde
     }
 }
 
-static void WindowRideMeasurementsTooldrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowRideMeasurementsTooldrag(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (screenCoords.x == _lastSceneryX && screenCoords.y == _lastSceneryY)
         return;
@@ -5577,7 +5577,7 @@ static void WindowRideMeasurementsTooldrag(rct_window* w, WidgetIndex widgetInde
  *
  *  rct2: 0x006AD4DA
  */
-static void WindowRideMeasurementsToolabort(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideMeasurementsToolabort(WindowBase* w, WidgetIndex widgetIndex)
 {
     WindowRideMeasurementsDesignCancel();
 }
@@ -5586,7 +5586,7 @@ static void WindowRideMeasurementsToolabort(rct_window* w, WidgetIndex widgetInd
  *
  *  rct2: 0x006ACDBC
  */
-static void WindowRideMeasurementsInvalidate(rct_window* w)
+static void WindowRideMeasurementsInvalidate(WindowBase* w)
 {
     auto widgets = window_ride_page_widgets[w->page];
     if (w->widgets != widgets)
@@ -5641,7 +5641,7 @@ static void WindowRideMeasurementsInvalidate(rct_window* w)
  *
  *  rct2: 0x006ACF07
  */
-static void WindowRideMeasurementsPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideMeasurementsPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowRideDrawTabImages(dpi, w);
@@ -5894,7 +5894,7 @@ enum
  *
  *  rct2: 0x006AE8A6
  */
-static void WindowRideSetGraph(rct_window* w, int32_t type)
+static void WindowRideSetGraph(WindowBase* w, int32_t type)
 {
     if ((w->list_information_type & 0xFF) == type)
     {
@@ -5912,7 +5912,7 @@ static void WindowRideSetGraph(rct_window* w, int32_t type)
  *
  *  rct2: 0x006AE85D
  */
-static void WindowRideGraphsMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideGraphsMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -5938,7 +5938,7 @@ static void WindowRideGraphsMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006AE8DA
  */
-static void WindowRideGraphsResize(rct_window* w)
+static void WindowRideGraphsResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 182, 500, 450);
 }
@@ -5947,7 +5947,7 @@ static void WindowRideGraphsResize(rct_window* w)
  *
  *  rct2: 0x006AE878
  */
-static void WindowRideGraphsMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideGraphsMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -5970,7 +5970,7 @@ static void WindowRideGraphsMousedown(rct_window* w, WidgetIndex widgetIndex, Wi
  *
  *  rct2: 0x006AE95D
  */
-static void WindowRideGraphsUpdate(rct_window* w)
+static void WindowRideGraphsUpdate(WindowBase* w)
 {
     Widget* widget;
     int32_t x;
@@ -6002,7 +6002,7 @@ static void WindowRideGraphsUpdate(rct_window* w)
  *
  *  rct2: 0x006AEA75
  */
-static void WindowRideGraphsScrollgetheight(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+static void WindowRideGraphsScrollgetheight(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     WindowEventInvalidateCall(w);
 
@@ -6026,7 +6026,7 @@ static void WindowRideGraphsScrollgetheight(rct_window* w, int32_t scrollIndex,
  *
  *  rct2: 0x006AE953
  */
-static void WindowRideGraphs15(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType)
+static void WindowRideGraphs15(WindowBase* w, int32_t scrollIndex, int32_t scrollAreaType)
 {
     w->list_information_type |= 0x8000;
 }
@@ -6035,7 +6035,7 @@ static void WindowRideGraphs15(rct_window* w, int32_t scrollIndex, int32_t scrol
  *
  *  rct2: 0x006AEA05
  */
-static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback)
+static OpenRCT2String WindowRideGraphsTooltip(WindowBase* w, const WidgetIndex widgetIndex, const StringId fallback)
 {
     if (widgetIndex == WIDX_GRAPH)
     {
@@ -6066,7 +6066,7 @@ static OpenRCT2String WindowRideGraphsTooltip(rct_window* w, const WidgetIndex w
  *
  *  rct2: 0x006AE372
  */
-static void WindowRideGraphsInvalidate(rct_window* w)
+static void WindowRideGraphsInvalidate(WindowBase* w)
 {
     auto widgets = window_ride_page_widgets[w->page];
     if (w->widgets != widgets)
@@ -6128,7 +6128,7 @@ static void WindowRideGraphsInvalidate(rct_window* w)
  *
  *  rct2: 0x006AE4BC
  */
-static void WindowRideGraphsPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideGraphsPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
     WindowRideDrawTabImages(dpi, w);
@@ -6138,7 +6138,7 @@ static void WindowRideGraphsPaint(rct_window* w, DrawPixelInfo* dpi)
  *
  *  rct2: 0x006AE4C7
  */
-static void WindowRideGraphsScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowRideGraphsScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     GfxClear(dpi, ColourMapA[COLOUR_SATURATED_GREEN].darker);
 
@@ -6337,7 +6337,7 @@ static void UpdateSamePriceThroughoutFlags(ShopItem shop_item)
  *
  *  rct2: 0x006ADEFD
  */
-static void WindowRideIncomeTogglePrimaryPrice(rct_window* w)
+static void WindowRideIncomeTogglePrimaryPrice(WindowBase* w)
 {
     const auto rideId = w->rideId;
     auto ride = GetRide(rideId);
@@ -6375,7 +6375,7 @@ static void WindowRideIncomeTogglePrimaryPrice(rct_window* w)
  *
  *  rct2: 0x006AE06E
  */
-static void WindowRideIncomeToggleSecondaryPrice(rct_window* w)
+static void WindowRideIncomeToggleSecondaryPrice(WindowBase* w)
 {
     const auto rideId = w->rideId;
     auto ride = GetRide(rideId);
@@ -6396,7 +6396,7 @@ static void WindowRideIncomeToggleSecondaryPrice(rct_window* w)
     GameActions::Execute(&rideSetPriceAction);
 }
 
-static void WindowRideIncomeSetPrimaryPrice(rct_window* w, money16 price)
+static void WindowRideIncomeSetPrimaryPrice(WindowBase* w, money16 price)
 {
     auto rideSetPriceAction = RideSetPriceAction(w->rideId, price, true);
     GameActions::Execute(&rideSetPriceAction);
@@ -6406,7 +6406,7 @@ static void WindowRideIncomeSetPrimaryPrice(rct_window* w, money16 price)
  *
  *  rct2: 0x006AE1E4
  */
-static void WindowRideIncomeIncreasePrimaryPrice(rct_window* w)
+static void WindowRideIncomeIncreasePrimaryPrice(WindowBase* w)
 {
     if (!WindowRideIncomeCanModifyPrimaryPrice(w))
         return;
@@ -6426,7 +6426,7 @@ static void WindowRideIncomeIncreasePrimaryPrice(rct_window* w)
  *
  *  rct2: 0x006AE237
  */
-static void WindowRideIncomeDecreasePrimaryPrice(rct_window* w)
+static void WindowRideIncomeDecreasePrimaryPrice(WindowBase* w)
 {
     if (!WindowRideIncomeCanModifyPrimaryPrice(w))
         return;
@@ -6442,7 +6442,7 @@ static void WindowRideIncomeDecreasePrimaryPrice(rct_window* w)
     WindowRideIncomeSetPrimaryPrice(w, price);
 }
 
-static money64 WindowRideIncomeGetSecondaryPrice(rct_window* w)
+static money64 WindowRideIncomeGetSecondaryPrice(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -6451,13 +6451,13 @@ static money64 WindowRideIncomeGetSecondaryPrice(rct_window* w)
     return ride->price[1];
 }
 
-static void WindowRideIncomeSetSecondaryPrice(rct_window* w, money16 price)
+static void WindowRideIncomeSetSecondaryPrice(WindowBase* w, money16 price)
 {
     auto rideSetPriceAction = RideSetPriceAction(w->rideId, price, false);
     GameActions::Execute(&rideSetPriceAction);
 }
 
-static bool WindowRideIncomeCanModifyPrimaryPrice(rct_window* w)
+static bool WindowRideIncomeCanModifyPrimaryPrice(WindowBase* w)
 {
     auto ride = GetRide(w->rideId);
     if (ride == nullptr)
@@ -6473,7 +6473,7 @@ static bool WindowRideIncomeCanModifyPrimaryPrice(rct_window* w)
  *
  *  rct2: 0x006AE269
  */
-static void WindowRideIncomeIncreaseSecondaryPrice(rct_window* w)
+static void WindowRideIncomeIncreaseSecondaryPrice(WindowBase* w)
 {
     auto price = WindowRideIncomeGetSecondaryPrice(w);
 
@@ -6487,7 +6487,7 @@ static void WindowRideIncomeIncreaseSecondaryPrice(rct_window* w)
  *
  *  rct2: 0x006AE28D
  */
-static void WindowRideIncomeDecreaseSecondaryPrice(rct_window* w)
+static void WindowRideIncomeDecreaseSecondaryPrice(WindowBase* w)
 {
     auto price = WindowRideIncomeGetSecondaryPrice(w);
 
@@ -6501,7 +6501,7 @@ static void WindowRideIncomeDecreaseSecondaryPrice(rct_window* w)
  *
  *  rct2: 0x006ADEA9
  */
-static void WindowRideIncomeMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideIncomeMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -6557,7 +6557,7 @@ static void WindowRideIncomeMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006AE2F8
  */
-static void WindowRideIncomeResize(rct_window* w)
+static void WindowRideIncomeResize(WindowBase* w)
 {
     WindowSetResize(*w, 316, 194, 316, 194);
 }
@@ -6566,7 +6566,7 @@ static void WindowRideIncomeResize(rct_window* w)
  *
  *  rct2: 0x006ADED4
  */
-static void WindowRideIncomeMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowRideIncomeMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     switch (widgetIndex)
     {
@@ -6589,7 +6589,7 @@ static void WindowRideIncomeMousedown(rct_window* w, WidgetIndex widgetIndex, Wi
  *
  *  rct2: 0x006AE2BF
  */
-static void WindowRideIncomeUpdate(rct_window* w)
+static void WindowRideIncomeUpdate(WindowBase* w)
 {
     w->frame_no++;
     WindowEventInvalidateCall(w);
@@ -6603,7 +6603,7 @@ static void WindowRideIncomeUpdate(rct_window* w)
     }
 }
 
-static void WindowRideIncomeTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowRideIncomeTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if ((widgetIndex != WIDX_PRIMARY_PRICE && widgetIndex != WIDX_SECONDARY_PRICE) || text == nullptr)
         return;
@@ -6631,7 +6631,7 @@ static void WindowRideIncomeTextinput(rct_window* w, WidgetIndex widgetIndex, ch
  *
  *  rct2: 0x006ADAA3
  */
-static void WindowRideIncomeInvalidate(rct_window* w)
+static void WindowRideIncomeInvalidate(WindowBase* w)
 {
     auto widgets = window_ride_page_widgets[w->page];
     if (w->widgets != widgets)
@@ -6745,7 +6745,7 @@ static void WindowRideIncomeInvalidate(rct_window* w)
  *
  *  rct2: 0x006ADCE5
  */
-static void WindowRideIncomePaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideIncomePaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     StringId stringId;
     money64 profit;
@@ -6853,7 +6853,7 @@ static void WindowRideIncomePaint(rct_window* w, DrawPixelInfo* dpi)
  *
  *  rct2: 0x006AD986
  */
-static void WindowRideCustomerMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowRideCustomerMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -6903,7 +6903,7 @@ static void WindowRideCustomerMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x006ADA29
  */
-static void WindowRideCustomerResize(rct_window* w)
+static void WindowRideCustomerResize(WindowBase* w)
 {
     w->flags |= WF_RESIZABLE;
     WindowSetResize(*w, 316, 163, 316, 163);
@@ -6913,7 +6913,7 @@ static void WindowRideCustomerResize(rct_window* w)
  *
  *  rct2: 0x006AD9DD
  */
-static void WindowRideCustomerUpdate(rct_window* w)
+static void WindowRideCustomerUpdate(WindowBase* w)
 {
     w->picked_peep_frame++;
     if (w->picked_peep_frame >= 24)
@@ -6934,7 +6934,7 @@ static void WindowRideCustomerUpdate(rct_window* w)
  *
  *  rct2: 0x006AD5F8
  */
-static void WindowRideCustomerInvalidate(rct_window* w)
+static void WindowRideCustomerInvalidate(WindowBase* w)
 {
     auto widgets = window_ride_page_widgets[w->page];
     if (w->widgets != widgets)
@@ -6972,7 +6972,7 @@ static void WindowRideCustomerInvalidate(rct_window* w)
  *
  *  rct2: 0x006AD6CD
  */
-static void WindowRideCustomerPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowRideCustomerPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     ShopItem shopItem;
     int16_t popularity, satisfaction, queueTime;
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index c04297c8d7..0e6a213e19 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -179,7 +179,7 @@ static int32_t RideGetAlternativeType(const Ride& ride)
 /* move to ride.c */
 static void CloseRideWindowForConstruction(RideId rideId)
 {
-    rct_window* w = WindowFindByNumber(WindowClass::Ride, rideId.ToUnderlying());
+    WindowBase* w = WindowFindByNumber(WindowClass::Ride, rideId.ToUnderlying());
     if (w != nullptr && w->page == 1)
         WindowClose(*w);
 }
@@ -2192,7 +2192,7 @@ public:
             return;
         }
 
-        const rct_preview_track* trackBlock;
+        const PreviewTrack* trackBlock;
 
         const auto& ted = GetTrackElementDescriptor(trackType);
         trackBlock = ted.Block;
@@ -2363,7 +2363,7 @@ private:
             }
 
             const auto& ted = GetTrackElementDescriptor(tileElement->AsTrack()->GetTrackType());
-            const rct_preview_track* trackBlock = ted.Block;
+            const PreviewTrack* trackBlock = ted.Block;
             newCoords->z = (tileElement->GetBaseZ()) - trackBlock->z;
             _gotoStartPlacementMode = true;
 
@@ -2761,7 +2761,7 @@ static void WindowRideConstructionUpdateDisabledPieces(ObjectEntryIndex rideType
  *
  *  rct2: 0x006CB481
  */
-rct_window* WindowRideConstructionOpen()
+WindowBase* WindowRideConstructionOpen()
 {
     RideId rideIndex = _currentRideIndex;
     CloseRideWindowForConstruction(rideIndex);
@@ -3210,7 +3210,7 @@ void UpdateGhostTrackAndArrow()
 void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords)
 {
     int32_t z;
-    const rct_preview_track* trackBlock;
+    const PreviewTrack* trackBlock;
 
     MapInvalidateMapSelectionTiles();
     gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE;
@@ -3475,7 +3475,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords)
 {
     const CursorState* state = ContextGetCursorState();
 
-    rct_window* w;
+    WindowBase* w;
 
     MapInvalidateMapSelectionTiles();
     RideConstructionInvalidateCurrentTrack();
@@ -3526,7 +3526,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords)
     if (_trackPlaceZ == 0)
     {
         const auto& ted = GetTrackElementDescriptor(_currentTrackPieceType);
-        const rct_preview_track* trackBlock = ted.Block;
+        const PreviewTrack* trackBlock = ted.Block;
         int32_t bx = 0;
         do
         {
@@ -3679,7 +3679,7 @@ void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords)
 
 void WindowRideConstructionKeyboardShortcutTurnLeft()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty)
     {
         return;
@@ -3925,7 +3925,7 @@ void WindowRideConstructionKeyboardShortcutTurnLeft()
 
 void WindowRideConstructionKeyboardShortcutTurnRight()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty)
     {
         return;
@@ -4171,7 +4171,7 @@ void WindowRideConstructionKeyboardShortcutTurnRight()
 
 void WindowRideConstructionKeyboardShortcutUseTrackDefault()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty)
     {
         return;
@@ -4201,7 +4201,7 @@ void WindowRideConstructionKeyboardShortcutUseTrackDefault()
 
 void WindowRideConstructionKeyboardShortcutSlopeDown()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty)
     {
         return;
@@ -4311,7 +4311,7 @@ void WindowRideConstructionKeyboardShortcutSlopeDown()
 
 void WindowRideConstructionKeyboardShortcutSlopeUp()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WindowWidgetType::Empty)
     {
         return;
@@ -4417,7 +4417,7 @@ void WindowRideConstructionKeyboardShortcutSlopeUp()
 
 void WindowRideConstructionKeyboardShortcutChainLiftToggle()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) || w->widgets[WIDX_CHAIN_LIFT].type == WindowWidgetType::Empty)
     {
         return;
@@ -4428,7 +4428,7 @@ void WindowRideConstructionKeyboardShortcutChainLiftToggle()
 
 void WindowRideConstructionKeyboardShortcutBankLeft()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT)
         || w->widgets[WIDX_BANK_STRAIGHT].type == WindowWidgetType::Empty)
     {
@@ -4464,7 +4464,7 @@ void WindowRideConstructionKeyboardShortcutBankLeft()
 
 void WindowRideConstructionKeyboardShortcutBankRight()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT)
         || w->widgets[WIDX_BANK_STRAIGHT].type == WindowWidgetType::Empty)
     {
@@ -4500,7 +4500,7 @@ void WindowRideConstructionKeyboardShortcutBankRight()
 
 void WindowRideConstructionKeyboardShortcutPreviousTrack()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_PREVIOUS_SECTION)
         || w->widgets[WIDX_PREVIOUS_SECTION].type == WindowWidgetType::Empty)
     {
@@ -4512,7 +4512,7 @@ void WindowRideConstructionKeyboardShortcutPreviousTrack()
 
 void WindowRideConstructionKeyboardShortcutNextTrack()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_NEXT_SECTION)
         || w->widgets[WIDX_NEXT_SECTION].type == WindowWidgetType::Empty)
     {
@@ -4524,7 +4524,7 @@ void WindowRideConstructionKeyboardShortcutNextTrack()
 
 void WindowRideConstructionKeyboardShortcutBuildCurrent()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WindowWidgetType::Empty)
     {
         return;
@@ -4535,7 +4535,7 @@ void WindowRideConstructionKeyboardShortcutBuildCurrent()
 
 void WindowRideConstructionKeyboardShortcutDemolishCurrent()
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w == nullptr || WidgetIsDisabled(*w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WindowWidgetType::Empty)
     {
         return;
diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp
index cae6f74527..604f35c5fd 100644
--- a/src/openrct2-ui/windows/RideList.cpp
+++ b/src/openrct2-ui/windows/RideList.cpp
@@ -954,7 +954,7 @@ private:
  *
  *  rct2: 0x006B30BC
  */
-rct_window* WindowRideListOpen()
+WindowBase* WindowRideListOpen()
 {
     // Check if window is already open
     auto* window = WindowBringToFrontByClass(WindowClass::RideList);
@@ -965,7 +965,7 @@ rct_window* WindowRideListOpen()
     return window;
 }
 
-void WindowRideListRefreshList(rct_window* w)
+void WindowRideListRefreshList(WindowBase* w)
 {
     dynamic_cast<RideListWindow*>(w)->RefreshListWrapper();
 }
diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp
index 87a05a4db4..61797f8cfc 100644
--- a/src/openrct2-ui/windows/SavePrompt.cpp
+++ b/src/openrct2-ui/windows/SavePrompt.cpp
@@ -187,7 +187,7 @@ public:
     }
 };
 
-rct_window* WindowSavePromptOpen()
+WindowBase* WindowSavePromptOpen()
 {
     PromptMode prompt_mode = gSavePromptMode;
     if (prompt_mode == PromptMode::Quit)
@@ -218,7 +218,7 @@ rct_window* WindowSavePromptOpen()
     }
 
     // Check if window is already open
-    rct_window* window = WindowBringToFrontByClass(WindowClass::SavePrompt);
+    WindowBase* window = WindowBringToFrontByClass(WindowClass::SavePrompt);
     if (window != nullptr)
     {
         WindowClose(*window);
diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp
index e47a727209..27e8db908a 100644
--- a/src/openrct2-ui/windows/ScenarioSelect.cpp
+++ b/src/openrct2-ui/windows/ScenarioSelect.cpp
@@ -112,17 +112,17 @@ static constexpr const StringId ScenarioOriginStringIds[] = {
     STR_SCENARIO_CATEGORY_OTHER_PARKS,
 };
 
-static void WindowScenarioselectInitTabs(rct_window *w);
+static void WindowScenarioselectInitTabs(WindowBase *w);
 
-static void WindowScenarioselectClose(rct_window *w);
-static void WindowScenarioselectMouseup(rct_window *w, WidgetIndex widgetIndex);
-static void WindowScenarioselectMousedown(rct_window *w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowScenarioselectScrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
-static void WindowScenarioselectScrollmousedown(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowScenarioselectScrollmouseover(rct_window *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowScenarioselectInvalidate(rct_window *w);
-static void WindowScenarioselectPaint(rct_window *w, DrawPixelInfo *dpi);
-static void WindowScenarioselectScrollpaint(rct_window *w, DrawPixelInfo *dpi, int32_t scrollIndex);
+static void WindowScenarioselectClose(WindowBase *w);
+static void WindowScenarioselectMouseup(WindowBase *w, WidgetIndex widgetIndex);
+static void WindowScenarioselectMousedown(WindowBase *w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowScenarioselectScrollgetsize(WindowBase *w, int32_t scrollIndex, int32_t *width, int32_t *height);
+static void WindowScenarioselectScrollmousedown(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowScenarioselectScrollmouseover(WindowBase *w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowScenarioselectInvalidate(WindowBase *w);
+static void WindowScenarioselectPaint(WindowBase *w, DrawPixelInfo *dpi);
+static void WindowScenarioselectScrollpaint(WindowBase *w, DrawPixelInfo *dpi, int32_t scrollIndex);
 
 static bool ScenarioSelectUseSmallFont()
 {
@@ -143,17 +143,17 @@ static WindowEventList window_scenarioselect_events([](auto& events)
 });
 // clang-format on
 
-static void DrawCategoryHeading(rct_window* w, DrawPixelInfo* dpi, int32_t left, int32_t right, int32_t y, StringId stringId);
-static void InitialiseListItems(rct_window* w);
-static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenario);
-static bool IsLockingEnabled(rct_window* w);
+static void DrawCategoryHeading(WindowBase* w, DrawPixelInfo* dpi, int32_t left, int32_t right, int32_t y, StringId stringId);
+static void InitialiseListItems(WindowBase* w);
+static bool IsScenarioVisible(WindowBase* w, const scenario_index_entry* scenario);
+static bool IsLockingEnabled(WindowBase* w);
 
 static std::function<void(std::string_view)> _callback;
 static bool _showLockedInformation = false;
 static bool _titleEditor = false;
 static bool _disableLocking{};
 
-rct_window* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor)
+WindowBase* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor)
 {
     if (_titleEditor != titleEditor)
     {
@@ -173,9 +173,9 @@ rct_window* WindowScenarioselectOpen(scenarioselect_callback callback, bool titl
  *
  *  rct2: 0x006781B5
  */
-rct_window* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
+WindowBase* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking)
 {
-    rct_window* window;
+    WindowBase* window;
 
     _callback = callback;
     _disableLocking = disableLocking;
@@ -200,7 +200,7 @@ rct_window* WindowScenarioselectOpen(std::function<void(std::string_view)> callb
  *
  *  rct2: 0x00677C8A
  */
-static void WindowScenarioselectInitTabs(rct_window* w)
+static void WindowScenarioselectInitTabs(WindowBase* w)
 {
     int32_t showPages = 0;
     size_t numScenarios = ScenarioRepositoryGetCount();
@@ -254,13 +254,13 @@ static void WindowScenarioselectInitTabs(rct_window* w)
     }
 }
 
-static void WindowScenarioselectClose(rct_window* w)
+static void WindowScenarioselectClose(WindowBase* w)
 {
     _listItems.clear();
     _listItems.shrink_to_fit();
 }
 
-static void WindowScenarioselectMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowScenarioselectMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     if (widgetIndex == WIDX_CLOSE)
     {
@@ -268,7 +268,7 @@ static void WindowScenarioselectMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowScenarioselectMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowScenarioselectMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB10)
     {
@@ -299,7 +299,7 @@ static int32_t GetScenarioListItemSize()
     return lineHeight;
 }
 
-static void WindowScenarioselectScrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+static void WindowScenarioselectScrollgetsize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     const int32_t scenarioItemHeight = GetScenarioListItemSize();
 
@@ -323,7 +323,7 @@ static void WindowScenarioselectScrollgetsize(rct_window* w, int32_t scrollIndex
  *
  *  rct2: 0x6780FE
  */
-static void WindowScenarioselectScrollmousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowScenarioselectScrollmousedown(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     const int32_t scenarioItemHeight = GetScenarioListItemSize();
 
@@ -360,7 +360,7 @@ static void WindowScenarioselectScrollmousedown(rct_window* w, int32_t scrollInd
  *
  *  rct2: 0x678162
  */
-static void WindowScenarioselectScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowScenarioselectScrollmouseover(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     const int32_t scenarioItemHeight = GetScenarioListItemSize();
 
@@ -407,7 +407,7 @@ static void WindowScenarioselectScrollmouseover(rct_window* w, int32_t scrollInd
     }
 }
 
-static void WindowScenarioselectInvalidate(rct_window* w)
+static void WindowScenarioselectInvalidate(WindowBase* w)
 {
     w->pressed_widgets &= ~(
         (1uLL << WIDX_CLOSE) | (1uLL << WIDX_TAB1) | (1uLL << WIDX_TAB2) | (1uLL << WIDX_TAB3) | (1uLL << WIDX_TAB4)
@@ -423,7 +423,7 @@ static void WindowScenarioselectInvalidate(rct_window* w)
     window_scenarioselect_widgets[WIDX_SCENARIOLIST].bottom = w->height - bottomMargin;
 }
 
-static void WindowScenarioselectPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowScenarioselectPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     int32_t format;
     const scenario_index_entry* scenario;
@@ -552,7 +552,7 @@ static void WindowScenarioselectPaint(rct_window* w, DrawPixelInfo* dpi)
     }
 }
 
-static void WindowScenarioselectScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowScenarioselectScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
     GfxClear(dpi, paletteIndex);
@@ -645,7 +645,7 @@ static void WindowScenarioselectScrollpaint(rct_window* w, DrawPixelInfo* dpi, i
     }
 }
 
-static void DrawCategoryHeading(rct_window* w, DrawPixelInfo* dpi, int32_t left, int32_t right, int32_t y, StringId stringId)
+static void DrawCategoryHeading(WindowBase* w, DrawPixelInfo* dpi, int32_t left, int32_t right, int32_t y, StringId stringId)
 {
     colour_t baseColour = w->colours[1];
     colour_t lightColour = ColourMapA[baseColour].lighter;
@@ -684,7 +684,7 @@ static void DrawCategoryHeading(rct_window* w, DrawPixelInfo* dpi, int32_t left,
     GfxDrawLine(dpi, { darkLineLeftTop2, darkLineRightBottom2 }, darkColour);
 }
 
-static void InitialiseListItems(rct_window* w)
+static void InitialiseListItems(WindowBase* w)
 {
     size_t numScenarios = ScenarioRepositoryGetCount();
     _listItems.clear();
@@ -810,7 +810,7 @@ static void InitialiseListItems(rct_window* w)
     }
 }
 
-static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenario)
+static bool IsScenarioVisible(WindowBase* w, const scenario_index_entry* scenario)
 {
     if (gConfigGeneral.ScenarioSelectMode == SCENARIO_SELECT_MODE_ORIGIN || _titleEditor)
     {
@@ -834,7 +834,7 @@ static bool IsScenarioVisible(rct_window* w, const scenario_index_entry* scenari
     return true;
 }
 
-static bool IsLockingEnabled(rct_window* w)
+static bool IsLockingEnabled(WindowBase* w)
 {
     if (gConfigGeneral.ScenarioSelectMode != SCENARIO_SELECT_MODE_ORIGIN)
         return false;
diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index bdecd27989..9111009a95 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -341,7 +341,7 @@ public:
     void OnUpdate() override
     {
         const CursorState* state = ContextGetCursorState();
-        rct_window* other = WindowFindFromPoint(state->position);
+        WindowBase* other = WindowFindFromPoint(state->position);
         if (other == this)
         {
             ScreenCoordsXY window = state->position - ScreenCoordsXY{ windowPos.x - 26, windowPos.y };
@@ -1347,7 +1347,7 @@ private:
     }
 };
 
-rct_window* WindowSceneryOpen()
+WindowBase* WindowSceneryOpen()
 {
     auto* w = static_cast<SceneryWindow*>(WindowBringToFrontByClass(WindowClass::Scenery));
     if (w == nullptr)
diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp
index 6094a2742c..1a082e95ec 100644
--- a/src/openrct2-ui/windows/SceneryScatter.cpp
+++ b/src/openrct2-ui/windows/SceneryScatter.cpp
@@ -52,7 +52,7 @@ static Widget window_scenery_scatter_widgets[] = {
 };
 // clang-format on
 
-class SceneryScatterWindow final : public rct_window
+class SceneryScatterWindow final : public WindowBase
 {
 public:
     void OnOpen() override
@@ -192,7 +192,7 @@ public:
     }
 };
 
-rct_window* WindowSceneryScatterOpen()
+WindowBase* WindowSceneryScatterOpen()
 {
     // Check if window is already open
     auto* window = WindowFindByClass(WindowClass::SceneryScatter);
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index c029611a6a..5912539732 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -73,19 +73,19 @@ static Widget window_server_list_widgets[] = {
 };
 // clang-format on
 
-static void WindowServerListClose(rct_window* w);
-static void WindowServerListMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowServerListResize(rct_window* w);
-static void WindowServerListDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowServerListUpdate(rct_window* w);
-static void WindowServerListScrollGetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
-static void WindowServerListScrollMousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, char* text);
-static OpenRCT2String WindowServerListTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback);
-static void WindowServerListInvalidate(rct_window* w);
-static void WindowServerListPaint(rct_window* w, DrawPixelInfo* dpi);
-static void WindowServerListScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex);
+static void WindowServerListClose(WindowBase* w);
+static void WindowServerListMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowServerListResize(WindowBase* w);
+static void WindowServerListDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowServerListUpdate(WindowBase* w);
+static void WindowServerListScrollGetsize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height);
+static void WindowServerListScrollMousedown(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowServerListScrollMouseover(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+static void WindowServerListTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text);
+static OpenRCT2String WindowServerListTooltip(WindowBase* const w, const WidgetIndex widgetIndex, StringId fallback);
+static void WindowServerListInvalidate(WindowBase* w);
+static void WindowServerListPaint(WindowBase* w, DrawPixelInfo* dpi);
+static void WindowServerListScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex);
 
 static WindowEventList window_server_list_events([](auto& events) {
     events.close = &WindowServerListClose;
@@ -114,11 +114,11 @@ static std::string _version;
 
 static void JoinServer(std::string address);
 static void ServerListFetchServersBegin();
-static void ServerListFetchServersCheck(rct_window* w);
+static void ServerListFetchServersCheck(WindowBase* w);
 
-rct_window* WindowServerListOpen()
+WindowBase* WindowServerListOpen()
 {
-    rct_window* window;
+    WindowBase* window;
 
     // Check if window is already open
     window = WindowBringToFrontByClass(WindowClass::ServerList);
@@ -153,13 +153,13 @@ rct_window* WindowServerListOpen()
     return window;
 }
 
-static void WindowServerListClose(rct_window* w)
+static void WindowServerListClose(WindowBase* w)
 {
     _serverList = {};
     _fetchFuture = {};
 }
 
-static void WindowServerListMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowServerListMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -200,12 +200,12 @@ static void WindowServerListMouseup(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void WindowServerListResize(rct_window* w)
+static void WindowServerListResize(WindowBase* w)
 {
     WindowSetResize(*w, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX);
 }
 
-static void WindowServerListDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowServerListDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     auto serverIndex = w->selected_list_item;
     if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
@@ -235,7 +235,7 @@ static void WindowServerListDropdown(rct_window* w, WidgetIndex widgetIndex, int
     }
 }
 
-static void WindowServerListUpdate(rct_window* w)
+static void WindowServerListUpdate(WindowBase* w)
 {
     if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)
     {
@@ -245,13 +245,13 @@ static void WindowServerListUpdate(rct_window* w)
     ServerListFetchServersCheck(w);
 }
 
-static void WindowServerListScrollGetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+static void WindowServerListScrollGetsize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     *width = 0;
     *height = w->no_list_items * ITEM_HEIGHT;
 }
 
-static void WindowServerListScrollMousedown(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowServerListScrollMousedown(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     int32_t serverIndex = w->selected_list_item;
     if (serverIndex >= 0 && serverIndex < static_cast<int32_t>(_serverList.GetCount()))
@@ -275,7 +275,7 @@ static void WindowServerListScrollMousedown(rct_window* w, int32_t scrollIndex,
     }
 }
 
-static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+static void WindowServerListScrollMouseover(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     auto& listWidget = w->widgets[WIDX_LIST];
 
@@ -303,7 +303,7 @@ static void WindowServerListScrollMouseover(rct_window* w, int32_t scrollIndex,
     }
 }
 
-static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, char* text)
+static void WindowServerListTextinput(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if (text == nullptr || text[0] == 0)
         return;
@@ -343,14 +343,14 @@ static void WindowServerListTextinput(rct_window* w, WidgetIndex widgetIndex, ch
     }
 }
 
-static OpenRCT2String WindowServerListTooltip(rct_window* const w, const WidgetIndex widgetIndex, StringId fallback)
+static OpenRCT2String WindowServerListTooltip(WindowBase* const w, const WidgetIndex widgetIndex, StringId fallback)
 {
     auto ft = Formatter();
     ft.Add<char*>(_version.c_str());
     return { fallback, ft };
 }
 
-static void WindowServerListInvalidate(rct_window* w)
+static void WindowServerListInvalidate(WindowBase* w)
 {
     w->ResizeFrame();
 
@@ -374,7 +374,7 @@ static void WindowServerListInvalidate(rct_window* w)
     w->no_list_items = static_cast<uint16_t>(_serverList.GetCount());
 }
 
-static void WindowServerListPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowServerListPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     WindowDrawWidgets(*w, dpi);
 
@@ -394,7 +394,7 @@ static void WindowServerListPaint(rct_window* w, DrawPixelInfo* dpi)
     DrawTextBasic(dpi, w->windowPos + ScreenCoordsXY{ 8, w->height - 15 }, _statusText, ft, { COLOUR_WHITE });
 }
 
-static void WindowServerListScrollpaint(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+static void WindowServerListScrollpaint(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light;
     GfxClear(dpi, paletteIndex);
@@ -566,7 +566,7 @@ static void ServerListFetchServersBegin()
     });
 }
 
-static void ServerListFetchServersCheck(rct_window* w)
+static void ServerListFetchServersCheck(WindowBase* w)
 {
     if (_fetchFuture.valid())
     {
diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp
index c1374f34a3..fbe8bd8e3c 100644
--- a/src/openrct2-ui/windows/ServerStart.cpp
+++ b/src/openrct2-ui/windows/ServerStart.cpp
@@ -299,7 +299,7 @@ private:
     }
 };
 
-rct_window* WindowServerStartOpen()
+WindowBase* WindowServerStartOpen()
 {
     return WindowFocusOrCreate<ServerStartWindow>(WindowClass::ServerStart, WW, WH, WF_CENTRE_SCREEN);
 }
diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp
index ab6f919fd7..47e2dfa2e6 100644
--- a/src/openrct2-ui/windows/ShortcutKeys.cpp
+++ b/src/openrct2-ui/windows/ShortcutKeys.cpp
@@ -546,7 +546,7 @@ void ChangeShortcutWindow::NotifyShortcutKeysWindow()
     }
 }
 
-rct_window* WindowShortcutKeysOpen()
+WindowBase* WindowShortcutKeysOpen()
 {
     auto w = WindowBringToFrontByClass(WindowClass::KeyboardShortcutList);
     if (w == nullptr)
diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
index fee6802a96..3da1ee130a 100644
--- a/src/openrct2-ui/windows/Sign.cpp
+++ b/src/openrct2-ui/windows/Sign.cpp
@@ -316,7 +316,7 @@ public:
  *
  *  rct2: 0x006BA305
  */
-rct_window* WindowSignOpen(rct_windownumber number)
+WindowBase* WindowSignOpen(rct_windownumber number)
 {
     auto* w = static_cast<SignWindow*>(WindowBringToFrontByNumber(WindowClass::Banner, number));
 
@@ -339,7 +339,7 @@ rct_window* WindowSignOpen(rct_windownumber number)
  *
  *  rct2: 0x6E5F52
  */
-rct_window* WindowSignSmallOpen(rct_windownumber number)
+WindowBase* WindowSignSmallOpen(rct_windownumber number)
 {
     auto* w = static_cast<SignWindow*>(WindowBringToFrontByNumber(WindowClass::Banner, number));
 
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index 309d5c2e17..d2770f5ec6 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -369,7 +369,7 @@ private:
                 pickupAction.SetCallback([peepnum = number](const GameAction* ga, const GameActions::Result* result) {
                     if (result->Error != GameActions::Status::Ok)
                         return;
-                    rct_window* wind = WindowFindByNumber(WindowClass::Peep, peepnum);
+                    WindowBase* wind = WindowFindByNumber(WindowClass::Peep, peepnum);
                     if (wind != nullptr)
                     {
                         ToolSet(*wind, WC_STAFF__WIDX_PICKUP, Tool::Picker);
@@ -1189,7 +1189,7 @@ private:
 
     void FollowPeep()
     {
-        rct_window* main = WindowGetMain();
+        WindowBase* main = WindowGetMain();
         WindowFollowSprite(*main, EntityId::FromUnderlying(number));
     }
 
@@ -1233,7 +1233,7 @@ private:
     static constexpr int32_t TabAnimationFrames = 7;
 };
 
-rct_window* WindowStaffOpen(Peep* peep)
+WindowBase* WindowStaffOpen(Peep* peep)
 {
     auto w = static_cast<StaffWindow*>(WindowBringToFrontByNumber(WindowClass::Peep, peep->sprite_index.ToUnderlying()));
 
diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp
index 9729bfa72c..4136fec9f6 100644
--- a/src/openrct2-ui/windows/StaffFirePrompt.cpp
+++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp
@@ -85,7 +85,7 @@ public:
     }
 };
 
-rct_window* WindowStaffFirePromptOpen(Peep* peep)
+WindowBase* WindowStaffFirePromptOpen(Peep* peep)
 {
     // Check if the confirm window already exists
     auto* window = WindowFocusOrCreate<StaffFirePromptWindow>(
diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp
index bd3bc3cd2d..7027cbc8a4 100644
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@@ -702,7 +702,7 @@ private:
     }
 };
 
-rct_window* WindowStaffListOpen()
+WindowBase* WindowStaffListOpen()
 {
     return WindowFocusOrCreate<StaffListWindow>(WindowClass::StaffList, WW, WH, WF_10 | WF_RESIZABLE);
 }
diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp
index 10f42d789a..c45709fd9c 100644
--- a/src/openrct2-ui/windows/TextInput.cpp
+++ b/src/openrct2-ui/windows/TextInput.cpp
@@ -42,7 +42,7 @@ static Widget window_text_input_widgets[] = {
 class TextInputWindow final : public Window
 {
 private:
-    widget_identifier _parentWidget{};
+    WidgetIdentifier _parentWidget{};
 
     std::string _title;
     StringId _titleStringId = STR_NONE;
@@ -66,7 +66,7 @@ public:
         SetParentWindow(nullptr, 0);
     }
 
-    void SetParentWindow(rct_window* parentWindow, WidgetIndex widgetIndex)
+    void SetParentWindow(WindowBase* parentWindow, WidgetIndex widgetIndex)
     {
         // Save calling window details so that the information can be passed back to the correct window & widget
         if (parentWindow == nullptr)
@@ -364,7 +364,7 @@ private:
         return _parentWidget.window.classification != WindowClass::Null;
     }
 
-    rct_window* GetParentWindow() const
+    WindowBase* GetParentWindow() const
     {
         return HasParentWindow() ? WindowFindByNumber(_parentWidget.window.classification, _parentWidget.window.number)
                                  : nullptr;
@@ -372,7 +372,7 @@ private:
 };
 
 void WindowTextInputRawOpen(
-    rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
+    WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
     const_utf8string existing_text, int32_t maxLength)
 {
     WindowCloseByClass(WindowClass::Textinput);
@@ -402,14 +402,14 @@ void WindowTextInputOpen(
 }
 
 void WindowTextInputOpen(
-    rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
+    WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
     StringId existing_text, uintptr_t existing_args, int32_t maxLength)
 {
     auto existingText = FormatStringID(existing_text, &existing_args);
     WindowTextInputRawOpen(call_w, call_widget, title, description, descriptionArgs, existingText.c_str(), maxLength);
 }
 
-void WindowTextInputKey(rct_window* w, uint32_t keycode)
+void WindowTextInputKey(WindowBase* w, uint32_t keycode)
 {
     const auto wndNumber = w->number;
     const auto wndClass = w->classification;
diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp
index a2dc97f4db..4437a2a1c0 100644
--- a/src/openrct2-ui/windows/Themes.cpp
+++ b/src/openrct2-ui/windows/Themes.cpp
@@ -882,9 +882,9 @@ public:
     }
 };
 
-rct_window* WindowThemesOpen()
+WindowBase* WindowThemesOpen()
 {
-    rct_window* window;
+    WindowBase* window;
 
     // Check if window is already open
     window = WindowBringToFrontByClass(WindowClass::Themes);
diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
index 69c5f553b9..613e2c701d 100644
--- a/src/openrct2-ui/windows/TileInspector.cpp
+++ b/src/openrct2-ui/windows/TileInspector.cpp
@@ -2337,9 +2337,9 @@ private:
     }
 };
 
-rct_window* WindowTileInspectorOpen()
+WindowBase* WindowTileInspectorOpen()
 {
-    rct_window* window = WindowBringToFrontByClass(WindowClass::TileInspector);
+    WindowBase* window = WindowBringToFrontByClass(WindowClass::TileInspector);
     if (window == nullptr)
         window = WindowCreate<TileInspector>(WindowClass::TileInspector, ScreenCoordsXY(0, 29), WW, WH, WF_RESIZABLE);
     return window;
diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp
index 2979b3cc45..dad768100f 100644
--- a/src/openrct2-ui/windows/TitleExit.cpp
+++ b/src/openrct2-ui/windows/TitleExit.cpp
@@ -58,7 +58,7 @@ class TitleExitWindow final : public Window
  * Creates the window containing the exit button on the title screen.
  *  rct2: 0x0066B624 (part of 0x0066B3E8)
  */
-rct_window* WindowTitleExitOpen()
+WindowBase* WindowTitleExitOpen()
 {
     return WindowCreate<TitleExitWindow>(
         WindowClass::TitleExit, ScreenCoordsXY(ContextGetWidth() - 40, ContextGetHeight() - 64), 40, 64,
diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp
index 44cbda8c4e..d1f87e3c0f 100644
--- a/src/openrct2-ui/windows/TitleLogo.cpp
+++ b/src/openrct2-ui/windows/TitleLogo.cpp
@@ -65,7 +65,7 @@ public:
     }
 };
 
-rct_window* WindowTitleLogoOpen()
+WindowBase* WindowTitleLogoOpen()
 {
     auto* window = WindowBringToFrontByClass(WindowClass::TitleLogo);
     if (window == nullptr)
diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp
index 5498341e04..0014fd5cae 100644
--- a/src/openrct2-ui/windows/TitleMenu.cpp
+++ b/src/openrct2-ui/windows/TitleMenu.cpp
@@ -120,7 +120,7 @@ public:
 
     void OnMouseUp(WidgetIndex widgetIndex) override
     {
-        rct_window* windowToOpen = nullptr;
+        WindowBase* windowToOpen = nullptr;
 
         switch (widgetIndex)
         {
@@ -279,7 +279,7 @@ public:
 /**
  * Creates the window containing the menu buttons on the title screen.
  */
-rct_window* WindowTitleMenuOpen()
+WindowBase* WindowTitleMenuOpen()
 {
     const uint16_t windowHeight = MenuButtonDims.height + UpdateButtonDims.height;
     return WindowCreate<TitleMenuWindow>(
diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp
index cccf59561c..5a189720ff 100644
--- a/src/openrct2-ui/windows/TitleOptions.cpp
+++ b/src/openrct2-ui/windows/TitleOptions.cpp
@@ -53,7 +53,7 @@ public:
 /**
  * Creates the window containing the options button on the title screen.
  */
-rct_window* WindowTitleOptionsOpen()
+WindowBase* WindowTitleOptionsOpen()
 {
     auto* window = WindowBringToFrontByClass(WindowClass::TitleOptions);
     if (window == nullptr)
diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp
index df3f17c5d2..63b5d98991 100644
--- a/src/openrct2-ui/windows/Tooltip.cpp
+++ b/src/openrct2-ui/windows/Tooltip.cpp
@@ -146,7 +146,7 @@ void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoord
     WindowCreate(std::move(tooltipWindow), WindowClass::Tooltip, windowPos, width, height, WF_TRANSPARENT | WF_STICK_TO_FRONT);
 }
 
-void WindowTooltipOpen(rct_window* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+void WindowTooltipOpen(WindowBase* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (widgetWindow == nullptr || widgetIndex == -1)
         return;
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index c955541d3d..258ac6764a 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -278,16 +278,16 @@ static Widget window_top_toolbar_widgets[] = {
 };
 // clang-format on
 
-static void WindowTopToolbarMouseup(rct_window* w, WidgetIndex widgetIndex);
-static void WindowTopToolbarMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget);
-static void WindowTopToolbarDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-static void WindowTopToolbarToolUpdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowTopToolbarToolDown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowTopToolbarToolDrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-static void WindowTopToolbarToolUp(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoordsy);
-static void WindowTopToolbarToolAbort(rct_window* w, WidgetIndex widgetIndex);
-static void WindowTopToolbarInvalidate(rct_window* w);
-static void WindowTopToolbarPaint(rct_window* w, DrawPixelInfo* dpi);
+static void WindowTopToolbarMouseup(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowTopToolbarMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget);
+static void WindowTopToolbarDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+static void WindowTopToolbarToolUpdate(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowTopToolbarToolDown(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowTopToolbarToolDrag(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+static void WindowTopToolbarToolUp(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoordsy);
+static void WindowTopToolbarToolAbort(WindowBase* w, WidgetIndex widgetIndex);
+static void WindowTopToolbarInvalidate(WindowBase* w);
+static void WindowTopToolbarPaint(WindowBase* w, DrawPixelInfo* dpi);
 
 static WindowEventList window_top_toolbar_events([](auto& events) {
     events.mouse_up = &WindowTopToolbarMouseup;
@@ -302,25 +302,25 @@ static WindowEventList window_top_toolbar_events([](auto& events) {
     events.paint = &WindowTopToolbarPaint;
 });
 
-static void TopToolbarInitViewMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitViewMenu(WindowBase* window, Widget* widget);
 static void TopToolbarViewMenuDropdown(int16_t dropdownIndex);
-static void TopToolbarInitMapMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitMapMenu(WindowBase* window, Widget* widget);
 static void TopToolbarMapMenuDropdown(int16_t dropdownIndex);
-static void TopToolbarInitFastforwardMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitFastforwardMenu(WindowBase* window, Widget* widget);
 static void TopToolbarFastforwardMenuDropdown(int16_t dropdownIndex);
-static void TopToolbarInitRotateMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitRotateMenu(WindowBase* window, Widget* widget);
 static void TopToolbarRotateMenuDropdown(int16_t dropdownIndex);
-static void TopToolbarInitCheatsMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitCheatsMenu(WindowBase* window, Widget* widget);
 static void TopToolbarCheatsMenuDropdown(int16_t dropdownIndex);
-static void TopToolbarInitDebugMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitDebugMenu(WindowBase* window, Widget* widget);
 static void TopToolbarDebugMenuDropdown(int16_t dropdownIndex);
-static void TopToolbarInitNetworkMenu(rct_window* window, Widget* widget);
+static void TopToolbarInitNetworkMenu(WindowBase* window, Widget* widget);
 static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex);
 
 static void ToggleFootpathWindow();
-static void ToggleLandWindow(rct_window* topToolbar, WidgetIndex widgetIndex);
-static void ToggleClearSceneryWindow(rct_window* topToolbar, WidgetIndex widgetIndex);
-static void ToggleWaterWindow(rct_window* topToolbar, WidgetIndex widgetIndex);
+static void ToggleLandWindow(WindowBase* topToolbar, WidgetIndex widgetIndex);
+static void ToggleClearSceneryWindow(WindowBase* topToolbar, WidgetIndex widgetIndex);
+static void ToggleWaterWindow(WindowBase* topToolbar, WidgetIndex widgetIndex);
 
 static money64 SelectionLowerLand(uint8_t flags);
 static money64 SelectionRaiseLand(uint8_t flags);
@@ -335,9 +335,9 @@ static int16_t _unkF64F0A;
  * Creates the main game top toolbar window.
  *  rct2: 0x0066B485 (part of 0x0066B3E8)
  */
-rct_window* WindowTopToolbarOpen()
+WindowBase* WindowTopToolbarOpen()
 {
-    rct_window* window = WindowCreate(
+    WindowBase* window = WindowCreate(
         ScreenCoordsXY(0, 0), ContextGetWidth(), TOP_TOOLBAR_HEIGHT + 1, &window_top_toolbar_events, WindowClass::TopToolbar,
         WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
     window->widgets = window_top_toolbar_widgets;
@@ -351,9 +351,9 @@ rct_window* WindowTopToolbarOpen()
  *
  *  rct2: 0x0066C957
  */
-static void WindowTopToolbarMouseup(rct_window* w, WidgetIndex widgetIndex)
+static void WindowTopToolbarMouseup(WindowBase* w, WidgetIndex widgetIndex)
 {
-    rct_window* mainWindow;
+    WindowBase* mainWindow;
 
     switch (widgetIndex)
     {
@@ -435,7 +435,7 @@ static void WindowTopToolbarMouseup(rct_window* w, WidgetIndex widgetIndex)
  *
  *  rct2: 0x0066CA3B
  */
-static void WindowTopToolbarMousedown(rct_window* w, WidgetIndex widgetIndex, Widget* widget)
+static void WindowTopToolbarMousedown(WindowBase* w, WidgetIndex widgetIndex, Widget* widget)
 {
     int32_t numItems = 0;
 
@@ -536,7 +536,7 @@ static void WindowTopToolbarMousedown(rct_window* w, WidgetIndex widgetIndex, Wi
  *
  *  rct2: 0x0066C9EA
  */
-static void WindowTopToolbarDropdown(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+static void WindowTopToolbarDropdown(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     switch (widgetIndex)
     {
@@ -657,7 +657,7 @@ static void WindowTopToolbarDropdown(rct_window* w, WidgetIndex widgetIndex, int
  *
  *  rct2: 0x0066C810
  */
-static void WindowTopToolbarInvalidate(rct_window* w)
+static void WindowTopToolbarInvalidate(WindowBase* w)
 {
     int32_t x, widgetIndex, widgetWidth, firstAlignment;
     Widget* widget;
@@ -870,7 +870,7 @@ static void WindowTopToolbarInvalidate(rct_window* w)
  *
  *  rct2: 0x0066C8EC
  */
-static void WindowTopToolbarPaint(rct_window* w, DrawPixelInfo* dpi)
+static void WindowTopToolbarPaint(WindowBase* w, DrawPixelInfo* dpi)
 {
     int32_t imgId;
 
@@ -1234,7 +1234,7 @@ static void Sub6E1F34SmallScenery(
     const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, uint8_t* outQuadrant,
     Direction* outRotation)
 {
-    rct_window* w = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* w = WindowFindByClass(WindowClass::Scenery);
 
     if (w == nullptr)
     {
@@ -1430,7 +1430,7 @@ static void Sub6E1F34SmallScenery(
 static void Sub6E1F34PathItem(
     const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, int32_t* outZ)
 {
-    rct_window* w = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* w = WindowFindByClass(WindowClass::Scenery);
 
     if (w == nullptr)
     {
@@ -1463,7 +1463,7 @@ static void Sub6E1F34PathItem(
 static void Sub6E1F34Wall(
     const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, uint8_t* outEdges)
 {
-    rct_window* w = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* w = WindowFindByClass(WindowClass::Scenery);
 
     if (w == nullptr)
     {
@@ -1552,7 +1552,7 @@ static void Sub6E1F34Wall(
 static void Sub6E1F34LargeScenery(
     const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, Direction* outDirection)
 {
-    rct_window* w = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* w = WindowFindByClass(WindowClass::Scenery);
 
     if (w == nullptr)
     {
@@ -1652,7 +1652,7 @@ static void Sub6E1F34Banner(
     const ScreenCoordsXY& sourceScreenPos, ObjectEntryIndex sceneryIndex, CoordsXY& gridPos, int32_t* outZ,
     Direction* outDirection)
 {
-    rct_window* w = WindowFindByClass(WindowClass::Scenery);
+    WindowBase* w = WindowFindByClass(WindowClass::Scenery);
 
     if (w == nullptr)
     {
@@ -1701,7 +1701,7 @@ static void Sub6E1F34Banner(
  *
  *  rct2: 0x006E2CC6
  */
-static void WindowTopToolbarSceneryToolDown(const ScreenCoordsXY& windowPos, rct_window* w, WidgetIndex widgetIndex)
+static void WindowTopToolbarSceneryToolDown(const ScreenCoordsXY& windowPos, WindowBase* w, WidgetIndex widgetIndex)
 {
     SceneryRemoveGhostToolPlacement();
     if (gWindowSceneryPaintEnabled & 1)
@@ -2904,7 +2904,7 @@ static void TopToolbarToolUpdateScenery(const ScreenCoordsXY& screenPos)
  *
  *  rct2: 0x0066CB25
  */
-static void WindowTopToolbarToolUpdate(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowTopToolbarToolUpdate(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     switch (widgetIndex)
     {
@@ -2939,7 +2939,7 @@ static void WindowTopToolbarToolUpdate(rct_window* w, WidgetIndex widgetIndex, c
  *
  *  rct2: 0x0066CB73
  */
-static void WindowTopToolbarToolDown(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowTopToolbarToolDown(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     switch (widgetIndex)
     {
@@ -3060,7 +3060,7 @@ static money64 SelectionLowerLand(uint8_t flags)
  */
 static void WindowTopToolbarLandToolDrag(const ScreenCoordsXY& screenPos)
 {
-    rct_window* window = WindowFindFromPoint(screenPos);
+    WindowBase* window = WindowFindFromPoint(screenPos);
     if (window == nullptr)
         return;
     WidgetIndex widget_index = WindowFindWidgetFromPoint(*window, screenPos);
@@ -3069,7 +3069,7 @@ static void WindowTopToolbarLandToolDrag(const ScreenCoordsXY& screenPos)
     const auto& widget = window->widgets[widget_index];
     if (widget.type != WindowWidgetType::Viewport)
         return;
-    rct_viewport* viewport = window->viewport;
+    Viewport* viewport = window->viewport;
     if (viewport == nullptr)
         return;
 
@@ -3103,7 +3103,7 @@ static void WindowTopToolbarLandToolDrag(const ScreenCoordsXY& screenPos)
  */
 static void WindowTopToolbarWaterToolDrag(const ScreenCoordsXY& screenPos)
 {
-    rct_window* window = WindowFindFromPoint(screenPos);
+    WindowBase* window = WindowFindFromPoint(screenPos);
     if (!window)
         return;
     WidgetIndex widget_index = WindowFindWidgetFromPoint(*window, screenPos);
@@ -3112,7 +3112,7 @@ static void WindowTopToolbarWaterToolDrag(const ScreenCoordsXY& screenPos)
     const auto& widget = window->widgets[widget_index];
     if (widget.type != WindowWidgetType::Viewport)
         return;
-    rct_viewport* viewport = window->viewport;
+    Viewport* viewport = window->viewport;
     if (viewport == nullptr)
         return;
 
@@ -3154,7 +3154,7 @@ static void WindowTopToolbarWaterToolDrag(const ScreenCoordsXY& screenPos)
  *
  *  rct2: 0x0066CB4E
  */
-static void WindowTopToolbarToolDrag(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowTopToolbarToolDrag(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     switch (widgetIndex)
     {
@@ -3219,7 +3219,7 @@ static void WindowTopToolbarToolDrag(rct_window* w, WidgetIndex widgetIndex, con
  *
  *  rct2: 0x0066CC5B
  */
-static void WindowTopToolbarToolUp(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+static void WindowTopToolbarToolUp(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     _landToolBlocked = false;
     switch (widgetIndex)
@@ -3255,7 +3255,7 @@ static void WindowTopToolbarToolUp(rct_window* w, WidgetIndex widgetIndex, const
  *
  *  rct2: 0x0066CA58
  */
-static void WindowTopToolbarToolAbort(rct_window* w, WidgetIndex widgetIndex)
+static void WindowTopToolbarToolAbort(WindowBase* w, WidgetIndex widgetIndex)
 {
     switch (widgetIndex)
     {
@@ -3277,7 +3277,7 @@ static void WindowTopToolbarToolAbort(rct_window* w, WidgetIndex widgetIndex)
     }
 }
 
-static void TopToolbarInitMapMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitMapMenu(WindowBase* w, Widget* widget)
 {
     auto i = 0;
     gDropdownItems[i++].Format = STR_SHORTCUT_SHOW_MAP;
@@ -3355,7 +3355,7 @@ static void TopToolbarMapMenuDropdown(int16_t dropdownIndex)
     }
 }
 
-static void TopToolbarInitFastforwardMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitFastforwardMenu(WindowBase* w, Widget* widget)
 {
     int32_t num_items = 4;
     gDropdownItems[0].Format = STR_TOGGLE_OPTION;
@@ -3405,7 +3405,7 @@ static void TopToolbarInitFastforwardMenu(rct_window* w, Widget* widget)
 
 static void TopToolbarFastforwardMenuDropdown(int16_t dropdownIndex)
 {
-    rct_window* w = WindowGetMain();
+    WindowBase* w = WindowGetMain();
     if (w)
     {
         if (dropdownIndex >= 0 && dropdownIndex <= 5)
@@ -3418,7 +3418,7 @@ static void TopToolbarFastforwardMenuDropdown(int16_t dropdownIndex)
     }
 }
 
-static void TopToolbarInitRotateMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitRotateMenu(WindowBase* w, Widget* widget)
 {
     gDropdownItems[0].Format = STR_ROTATE_CLOCKWISE;
     gDropdownItems[1].Format = STR_ROTATE_ANTI_CLOCKWISE;
@@ -3431,7 +3431,7 @@ static void TopToolbarInitRotateMenu(rct_window* w, Widget* widget)
 
 static void TopToolbarRotateMenuDropdown(int16_t dropdownIndex)
 {
-    rct_window* w = WindowGetMain();
+    WindowBase* w = WindowGetMain();
     if (w)
     {
         if (dropdownIndex == 0)
@@ -3447,7 +3447,7 @@ static void TopToolbarRotateMenuDropdown(int16_t dropdownIndex)
     }
 }
 
-static void TopToolbarInitCheatsMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitCheatsMenu(WindowBase* w, Widget* widget)
 {
     using namespace Dropdown;
 
@@ -3539,7 +3539,7 @@ static void TopToolbarCheatsMenuDropdown(int16_t dropdownIndex)
     }
 }
 
-static void TopToolbarInitDebugMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitDebugMenu(WindowBase* w, Widget* widget)
 {
     gDropdownItems[DDIDX_CONSOLE].Format = STR_TOGGLE_OPTION;
     gDropdownItems[DDIDX_CONSOLE].Args = STR_DEBUG_DROPDOWN_CONSOLE;
@@ -3553,7 +3553,7 @@ static void TopToolbarInitDebugMenu(rct_window* w, Widget* widget)
     Dropdown::SetChecked(DDIDX_DEBUG_PAINT, WindowFindByClass(WindowClass::DebugPaint) != nullptr);
 }
 
-static void TopToolbarInitNetworkMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitNetworkMenu(WindowBase* w, Widget* widget)
 {
     gDropdownItems[DDIDX_MULTIPLAYER].Format = STR_MULTIPLAYER;
     gDropdownItems[DDIDX_MULTIPLAYER_RECONNECT].Format = STR_MULTIPLAYER_RECONNECT;
@@ -3569,7 +3569,7 @@ static void TopToolbarInitNetworkMenu(rct_window* w, Widget* widget)
 
 static void TopToolbarDebugMenuDropdown(int16_t dropdownIndex)
 {
-    rct_window* w = WindowGetMain();
+    WindowBase* w = WindowGetMain();
     if (w != nullptr)
     {
         switch (dropdownIndex)
@@ -3596,7 +3596,7 @@ static void TopToolbarDebugMenuDropdown(int16_t dropdownIndex)
 
 static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex)
 {
-    rct_window* w = WindowGetMain();
+    WindowBase* w = WindowGetMain();
     if (w != nullptr)
     {
         switch (dropdownIndex)
@@ -3615,7 +3615,7 @@ static void TopToolbarNetworkMenuDropdown(int16_t dropdownIndex)
  *
  *  rct2: 0x0066CDE4
  */
-static void TopToolbarInitViewMenu(rct_window* w, Widget* widget)
+static void TopToolbarInitViewMenu(WindowBase* w, Widget* widget)
 {
     using namespace Dropdown;
     constexpr ItemExt items[] = {
@@ -3652,7 +3652,7 @@ static void TopToolbarInitViewMenu(rct_window* w, Widget* widget)
         TOP_TOOLBAR_VIEW_MENU_COUNT);
 
     // Set checkmarks
-    rct_viewport* mainViewport = WindowGetMain()->viewport;
+    Viewport* mainViewport = WindowGetMain()->viewport;
     if (mainViewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
         Dropdown::SetChecked(DDIDX_UNDERGROUND_INSIDE, true);
     if (gConfigGeneral.TransparentWater)
@@ -3703,7 +3703,7 @@ static void TopToolbarInitViewMenu(rct_window* w, Widget* widget)
  */
 static void TopToolbarViewMenuDropdown(int16_t dropdownIndex)
 {
-    rct_window* w = WindowGetMain();
+    WindowBase* w = WindowGetMain();
     if (w != nullptr)
     {
         switch (dropdownIndex)
@@ -3799,7 +3799,7 @@ static void ToggleFootpathWindow()
  *
  *  rct2: 0x0066CD54
  */
-static void ToggleLandWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
+static void ToggleLandWindow(WindowBase* topToolbar, WidgetIndex widgetIndex)
 {
     if ((InputTestFlag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WindowClass::TopToolbar
         && gCurrentToolWidget.widget_index == WIDX_LAND)
@@ -3820,7 +3820,7 @@ static void ToggleLandWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
  *
  *  rct2: 0x0066CD0C
  */
-static void ToggleClearSceneryWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
+static void ToggleClearSceneryWindow(WindowBase* topToolbar, WidgetIndex widgetIndex)
 {
     if ((InputTestFlag(INPUT_FLAG_TOOL_ACTIVE) && gCurrentToolWidget.window_classification == WindowClass::TopToolbar
          && gCurrentToolWidget.widget_index == WIDX_CLEAR_SCENERY))
@@ -3840,7 +3840,7 @@ static void ToggleClearSceneryWindow(rct_window* topToolbar, WidgetIndex widgetI
  *
  *  rct2: 0x0066CD9C
  */
-static void ToggleWaterWindow(rct_window* topToolbar, WidgetIndex widgetIndex)
+static void ToggleWaterWindow(WindowBase* topToolbar, WidgetIndex widgetIndex)
 {
     if ((InputTestFlag(INPUT_FLAG_TOOL_ACTIVE)) && gCurrentToolWidget.window_classification == WindowClass::TopToolbar
         && gCurrentToolWidget.widget_index == WIDX_WATER)
diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp
index 9a1a34a9f8..1b79d0401f 100644
--- a/src/openrct2-ui/windows/TrackDesignManage.cpp
+++ b/src/openrct2-ui/windows/TrackDesignManage.cpp
@@ -89,7 +89,7 @@ static void WindowTrackDesignListReloadTracks();
  *
  *  rct2: 0x006D348F
  */
-rct_window* WindowTrackManageOpen(TrackDesignFileRef* tdFileRef)
+WindowBase* WindowTrackManageOpen(TrackDesignFileRef* tdFileRef)
 {
     WindowCloseByClass(WindowClass::ManageTrackDesign);
     auto trackDesignManageWindow = std::make_unique<TrackDesignManageWindow>(tdFileRef);
@@ -114,7 +114,7 @@ void TrackDesignManageWindow::OnOpen()
 
 void TrackDesignManageWindow::OnClose()
 {
-    rct_window* trackDesignListWindow = WindowFindByClass(WindowClass::TrackDesignList);
+    WindowBase* trackDesignListWindow = WindowFindByClass(WindowClass::TrackDesignList);
     if (trackDesignListWindow != nullptr)
     {
         trackDesignListWindow->track_list.track_list_being_updated = false;
@@ -236,7 +236,7 @@ void TrackDeletePromptWindow::OnDraw(DrawPixelInfo& dpi)
 
 static void WindowTrackDesignListReloadTracks()
 {
-    rct_window* trackListWindow = WindowFindByClass(WindowClass::TrackDesignList);
+    WindowBase* trackListWindow = WindowFindByClass(WindowClass::TrackDesignList);
     if (trackListWindow != nullptr)
     {
         trackListWindow->track_list.reload_track_designs = true;
diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp
index 64579a7fa8..28b7fd777e 100644
--- a/src/openrct2-ui/windows/TrackDesignPlace.cpp
+++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp
@@ -444,7 +444,7 @@ private:
 
             // Follow a single track piece shape
             const auto& ted = GetTrackElementDescriptor(trackType);
-            const rct_preview_track* trackBlock = ted.Block;
+            const PreviewTrack* trackBlock = ted.Block;
             while (trackBlock->index != 255)
             {
                 auto rotatedAndOffsetTrackBlock = curTrackStart
@@ -489,7 +489,7 @@ private:
             // Change rotation and next position based on track curvature
             curTrackRotation &= 3;
 
-            const rct_track_coordinates* track_coordinate = &ted.Coordinates;
+            const TrackCoordinates* track_coordinate = &ted.Coordinates;
 
             curTrackStart += CoordsXY{ track_coordinate->x, track_coordinate->y }.Rotate(curTrackRotation);
             curTrackRotation += track_coordinate->rotation_end - track_coordinate->rotation_begin;
@@ -612,7 +612,7 @@ private:
     }
 };
 
-rct_window* WindowTrackPlaceOpen(const TrackDesignFileRef* tdFileRef)
+WindowBase* WindowTrackPlaceOpen(const TrackDesignFileRef* tdFileRef)
 {
     std::unique_ptr<TrackDesign> openTrackDesign = TrackDesignImport(tdFileRef->path.c_str());
 
diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp
index fbb1783021..29f323f95f 100644
--- a/src/openrct2-ui/windows/TrackList.cpp
+++ b/src/openrct2-ui/windows/TrackList.cpp
@@ -743,7 +743,7 @@ public:
     }
 };
 
-rct_window* WindowTrackListOpen(const RideSelection item)
+WindowBase* WindowTrackListOpen(const RideSelection item)
 {
     WindowCloseConstructionWindows();
     ScreenCoordsXY screenPos{};
diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp
index f3315229a8..e3c75fe898 100644
--- a/src/openrct2-ui/windows/Transparency.cpp
+++ b/src/openrct2-ui/windows/Transparency.cpp
@@ -116,7 +116,7 @@ public:
     void OnPrepareDraw() override
     {
         uint32_t wflags = 0;
-        rct_window* w = WindowGetMain();
+        WindowBase* w = WindowGetMain();
 
         pressed_widgets = 0;
         disabled_widgets = 0;
@@ -170,7 +170,7 @@ private:
     void ToggleViewportFlag(WidgetIndex widgetIndex)
     {
         uint32_t wflags = 0;
-        rct_window* w = WindowGetMain();
+        WindowBase* w = WindowGetMain();
 
         if (w == nullptr)
             return;
@@ -244,7 +244,7 @@ private:
     }
 };
 
-rct_window* WindowTransparencyOpen()
+WindowBase* WindowTransparencyOpen()
 {
     auto* window = WindowBringToFrontByClass(WindowClass::Transparency);
     if (window == nullptr)
diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp
index 77e8471858..ed4e3fa9ac 100644
--- a/src/openrct2-ui/windows/ViewClipping.cpp
+++ b/src/openrct2-ui/windows/ViewClipping.cpp
@@ -91,7 +91,7 @@ public:
             case WIDX_CLIP_CHECKBOX_ENABLE:
             {
                 // Toggle height clipping.
-                rct_window* mainWindow = WindowGetMain();
+                WindowBase* mainWindow = WindowGetMain();
                 if (mainWindow != nullptr)
                 {
                     mainWindow->viewport->flags ^= VIEWPORT_FLAG_CLIP_VIEW;
@@ -140,7 +140,7 @@ public:
 
     void OnMouseDown(WidgetIndex widgetIndex) override
     {
-        rct_window* mainWindow;
+        WindowBase* mainWindow;
 
         switch (widgetIndex)
         {
@@ -164,7 +164,7 @@ public:
     void OnUpdate() override
     {
         const auto& widget = widgets[WIDX_CLIP_HEIGHT_SLIDER];
-        const rct_scroll* const scroll = &this->scrolls[0];
+        const ScrollBar* const scroll = &this->scrolls[0];
         const int16_t scroll_width = widget.width() - 1;
         const uint8_t clip_height = static_cast<uint8_t>(
             (static_cast<float>(scroll->h_left) / (scroll->h_right - scroll_width)) * 255);
@@ -173,7 +173,7 @@ public:
             gClipHeight = clip_height;
 
             // Update the main window accordingly.
-            rct_window* mainWindow = WindowGetMain();
+            WindowBase* mainWindow = WindowGetMain();
             if (mainWindow != nullptr)
             {
                 mainWindow->Invalidate();
@@ -256,7 +256,7 @@ public:
     {
         WidgetScrollUpdateThumbs(*this, WIDX_CLIP_HEIGHT_SLIDER);
 
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             WidgetSetCheckboxValue(*this, WIDX_CLIP_CHECKBOX_ENABLE, mainWindow->viewport->flags & VIEWPORT_FLAG_CLIP_VIEW);
@@ -355,7 +355,7 @@ public:
         WindowPushOthersBelow(*this);
 
         // Get the main viewport to set the view clipping flag.
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
 
         // Turn on view clipping when the window is opened.
         if (mainWindow != nullptr)
@@ -369,7 +369,7 @@ private:
     void OnClose() override
     {
         // Turn off view clipping when the window is closed.
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             mainWindow->viewport->flags &= ~VIEWPORT_FLAG_CLIP_VIEW;
@@ -396,7 +396,7 @@ private:
     }
 };
 
-rct_window* WindowViewClippingOpen()
+WindowBase* WindowViewClippingOpen()
 {
     auto* window = WindowBringToFrontByClass(WindowClass::ViewClipping);
     if (window == nullptr)
diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp
index fd2788a5a0..209d64a913 100644
--- a/src/openrct2-ui/windows/Viewport.cpp
+++ b/src/openrct2-ui/windows/Viewport.cpp
@@ -59,7 +59,7 @@ private:
     void GetFreeViewportNumber()
     {
         number = 1;
-        WindowVisitEach([&](rct_window* w) {
+        WindowVisitEach([&](WindowBase* w) {
             if (w != nullptr && w != this && w->classification == WindowClass::Viewport)
             {
                 if (w->number >= number)
@@ -87,7 +87,7 @@ public:
         auto* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
-            rct_viewport* mainViewport = mainWindow->viewport;
+            Viewport* mainViewport = mainWindow->viewport;
             int32_t x = mainViewport->viewPos.x + (mainViewport->view_width / 2);
             int32_t y = mainViewport->viewPos.y + (mainViewport->view_height / 2);
             savedViewPos = { x - (viewport->view_width / 2), y - (viewport->view_height / 2) };
@@ -208,7 +208,7 @@ public:
     }
 };
 
-rct_window* WindowViewportOpen()
+WindowBase* WindowViewportOpen()
 {
     int32_t screenWidth = ContextGetWidth();
     int32_t screenHeight = ContextGetHeight();
diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp
index df624ee738..a4fca2088c 100644
--- a/src/openrct2-ui/windows/Water.cpp
+++ b/src/openrct2-ui/windows/Water.cpp
@@ -185,7 +185,7 @@ private:
     }
 };
 
-rct_window* WindowWaterOpen()
+WindowBase* WindowWaterOpen()
 {
     return WindowFocusOrCreate<WaterWindow>(WindowClass::Water, ScreenCoordsXY(ContextGetWidth() - WW, 29), WW, WH, 0);
 }
diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h
index af9e8bd60b..8b0e20893d 100644
--- a/src/openrct2-ui/windows/Window.h
+++ b/src/openrct2-ui/windows/Window.h
@@ -34,147 +34,147 @@ extern colour_t gWindowScenerySecondaryColour;
 extern colour_t gWindowSceneryTertiaryColour;
 extern bool gWindowSceneryEyedropperEnabled;
 
-rct_window* WindowAboutOpen();
+WindowBase* WindowAboutOpen();
 void WindowCampaignRefreshRides();
-rct_window* WindowChangelogOpen(int personality);
-rct_window* WindowCheatsOpen();
-rct_window* WindowClearSceneryOpen();
-rct_window* CustomCurrencyWindowOpen();
-rct_window* WindowDebugPaintOpen();
-rct_window* WindowEditorInventionsListOpen();
-rct_window* WindowEditorMainOpen();
-rct_window* WindowEditorObjectiveOptionsOpen();
-rct_window* WindowEditorScenarioOptionsOpen();
-rct_window* WindowFootpathOpen();
+WindowBase* WindowChangelogOpen(int personality);
+WindowBase* WindowCheatsOpen();
+WindowBase* WindowClearSceneryOpen();
+WindowBase* CustomCurrencyWindowOpen();
+WindowBase* WindowDebugPaintOpen();
+WindowBase* WindowEditorInventionsListOpen();
+WindowBase* WindowEditorMainOpen();
+WindowBase* WindowEditorObjectiveOptionsOpen();
+WindowBase* WindowEditorScenarioOptionsOpen();
+WindowBase* WindowFootpathOpen();
 void WindowFootpathResetSelectedPath();
-rct_window* WindowGuestOpen(Peep* peep);
-rct_window* WindowLandOpen();
-rct_window* WindowLandRightsOpen();
-rct_window* WindowMainOpen();
-rct_window* WindowMapgenOpen();
-rct_window* WindowMultiplayerOpen();
-rct_window* WindowNewsOpen();
-rct_window* WindowNewsOptionsOpen();
-rct_window* WindowOptionsOpen();
-rct_window* WindowSavePromptOpen();
+WindowBase* WindowGuestOpen(Peep* peep);
+WindowBase* WindowLandOpen();
+WindowBase* WindowLandRightsOpen();
+WindowBase* WindowMainOpen();
+WindowBase* WindowMapgenOpen();
+WindowBase* WindowMultiplayerOpen();
+WindowBase* WindowNewsOpen();
+WindowBase* WindowNewsOptionsOpen();
+WindowBase* WindowOptionsOpen();
+WindowBase* WindowSavePromptOpen();
 #ifndef DISABLE_NETWORK
-rct_window* WindowServerListOpen();
-rct_window* WindowServerStartOpen();
+WindowBase* WindowServerListOpen();
+WindowBase* WindowServerStartOpen();
 #endif
-rct_window* WindowShortcutKeysOpen();
-rct_window* WindowStaffListOpen();
-rct_window* WindowStaffOpen(Peep* peep);
+WindowBase* WindowShortcutKeysOpen();
+WindowBase* WindowStaffListOpen();
+WindowBase* WindowStaffOpen(Peep* peep);
 void WindowStaffListRefresh();
-rct_window* WindowThemesOpen();
-rct_window* WindowTitleExitOpen();
-rct_window* WindowTitleLogoOpen();
-rct_window* WindowTitleMenuOpen();
-rct_window* WindowTitleOptionsOpen();
-rct_window* WindowViewportOpen();
-rct_window* WindowWaterOpen();
-rct_window* WindowViewClippingOpen();
-rct_window* WindowTransparencyOpen();
-rct_window* WindowAssetPacksOpen();
+WindowBase* WindowThemesOpen();
+WindowBase* WindowTitleExitOpen();
+WindowBase* WindowTitleLogoOpen();
+WindowBase* WindowTitleMenuOpen();
+WindowBase* WindowTitleOptionsOpen();
+WindowBase* WindowViewportOpen();
+WindowBase* WindowWaterOpen();
+WindowBase* WindowViewClippingOpen();
+WindowBase* WindowTransparencyOpen();
+WindowBase* WindowAssetPacksOpen();
 
 // WC_FINANCES
-rct_window* WindowFinancesOpen();
-rct_window* WindowFinancesResearchOpen();
-rct_window* WindowFinancesMarketingOpen();
+WindowBase* WindowFinancesOpen();
+WindowBase* WindowFinancesResearchOpen();
+WindowBase* WindowFinancesMarketingOpen();
 
 // WC_PARK_INFORMATION
-rct_window* WindowParkAwardsOpen();
-rct_window* WindowParkEntranceOpen();
-rct_window* WindowParkGuestsOpen();
-rct_window* WindowParkObjectiveOpen();
-rct_window* WindowParkRatingOpen();
+WindowBase* WindowParkAwardsOpen();
+WindowBase* WindowParkEntranceOpen();
+WindowBase* WindowParkGuestsOpen();
+WindowBase* WindowParkObjectiveOpen();
+WindowBase* WindowParkRatingOpen();
 
-rct_window* WindowBannerOpen(rct_windownumber number);
-rct_window* WindowRideDemolishPromptOpen(const Ride& ride);
-rct_window* WindowRideRefurbishPromptOpen(const Ride& ride);
-rct_window* WindowSignOpen(rct_windownumber number);
-rct_window* WindowSignSmallOpen(rct_windownumber number);
-rct_window* WindowPlayerOpen(uint8_t id);
-rct_window* WindowNewCampaignOpen(int16_t campaignType);
+WindowBase* WindowBannerOpen(rct_windownumber number);
+WindowBase* WindowRideDemolishPromptOpen(const Ride& ride);
+WindowBase* WindowRideRefurbishPromptOpen(const Ride& ride);
+WindowBase* WindowSignOpen(rct_windownumber number);
+WindowBase* WindowSignSmallOpen(rct_windownumber number);
+WindowBase* WindowPlayerOpen(uint8_t id);
+WindowBase* WindowNewCampaignOpen(int16_t campaignType);
 
-rct_window* WindowInstallTrackOpen(const utf8* path);
+WindowBase* WindowInstallTrackOpen(const utf8* path);
 void WindowGuestListRefreshList();
-rct_window* WindowGuestListOpen();
-rct_window* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index);
-rct_window* WindowStaffFirePromptOpen(Peep* peep);
-rct_window* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor);
-rct_window* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking);
+WindowBase* WindowGuestListOpen();
+WindowBase* WindowGuestListOpenWithFilter(GuestListFilterType type, int32_t index);
+WindowBase* WindowStaffFirePromptOpen(Peep* peep);
+WindowBase* WindowScenarioselectOpen(scenarioselect_callback callback, bool titleEditor);
+WindowBase* WindowScenarioselectOpen(std::function<void(std::string_view)> callback, bool titleEditor, bool disableLocking);
 
-rct_window* WindowErrorOpen(StringId title, StringId message, const class Formatter& formatter);
-rct_window* WindowErrorOpen(std::string_view title, std::string_view message);
+WindowBase* WindowErrorOpen(StringId title, StringId message, const class Formatter& formatter);
+WindowBase* WindowErrorOpen(std::string_view title, std::string_view message);
 struct TrackDesign;
-rct_window* WindowLoadsaveOpen(
+WindowBase* WindowLoadsaveOpen(
     int32_t type, std::string_view defaultPath, std::function<void(int32_t result, std::string_view)> callback,
     TrackDesign* trackDesign);
-rct_window* WindowTrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef);
-rct_window* WindowTrackManageOpen(struct TrackDesignFileRef* tdFileRef);
+WindowBase* WindowTrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef);
+WindowBase* WindowTrackManageOpen(struct TrackDesignFileRef* tdFileRef);
 
 void TrackPlaceClearProvisionalTemporarily();
 void TrackPlaceRestoreProvisional();
 
-rct_window* WindowMapOpen();
+WindowBase* WindowMapOpen();
 void WindowMapReset();
 
-rct_window* WindowResearchOpen();
-void WindowResearchDevelopmentPagePaint(rct_window* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex);
-void WindowResearchFundingPagePaint(rct_window* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex);
+WindowBase* WindowResearchOpen();
+void WindowResearchDevelopmentPagePaint(WindowBase* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex);
+void WindowResearchFundingPagePaint(WindowBase* w, DrawPixelInfo* dpi, WidgetIndex baseWidgetIndex);
 
-rct_window* WindowNewRideOpen();
-rct_window* WindowNewRideOpenResearch();
+WindowBase* WindowNewRideOpen();
+WindowBase* WindowNewRideOpenResearch();
 void WindowNewRideInitVars();
 void WindowNewRideFocus(RideSelection rideItem);
 
-rct_window* WindowRideListOpen();
-void WindowRideListRefreshList(rct_window* w);
+WindowBase* WindowRideListOpen();
+void WindowRideListRefreshList(WindowBase* w);
 
-rct_window* WindowRideMainOpen(const Ride& ride);
-rct_window* WindowRideOpenTrack(TileElement* tileElement);
-rct_window* WindowRideOpenVehicle(Vehicle* vehicle);
+WindowBase* WindowRideMainOpen(const Ride& ride);
+WindowBase* WindowRideOpenTrack(TileElement* tileElement);
+WindowBase* WindowRideOpenVehicle(Vehicle* vehicle);
 void WindowRideMeasurementsDesignCancel();
 
 // rct2: 0x00F635EE
 extern RideSelection _window_track_list_item;
-rct_window* WindowTrackListOpen(RideSelection item);
+WindowBase* WindowTrackListOpen(RideSelection item);
 
 void SetMapTooltip(Formatter& ft);
 const Formatter& GetMapTooltip();
 void WindowMapTooltipUpdateVisibility();
 
-rct_window* WindowMazeConstructionOpen();
+WindowBase* WindowMazeConstructionOpen();
 void WindowMazeConstructionUpdatePressedWidgets();
 
-rct_window* WindowNetworkStatusOpen(const std::string& text, close_callback onClose);
-rct_window* WindowNetworkStatusOpenPassword();
+WindowBase* WindowNetworkStatusOpen(const std::string& text, close_callback onClose);
+WindowBase* WindowNetworkStatusOpenPassword();
 void WindowNetworkStatusClose();
 
-void WindowTextInputKey(rct_window* w, uint32_t keycode);
+void WindowTextInputKey(WindowBase* w, uint32_t keycode);
 void WindowTextInputOpen(
-    rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
+    WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
     StringId existing_text, uintptr_t existing_args, int32_t maxLength);
 void WindowTextInputRawOpen(
-    rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
+    WindowBase* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
     const_utf8string existing_text, int32_t maxLength);
 
 void WindowTextInputOpen(
     std::string_view title, std::string_view description, std::string_view initialValue, size_t maxLength,
     std::function<void(std::string_view)> okCallback, std::function<void()> cancelCallback);
 
-rct_window* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects);
+WindowBase* WindowObjectLoadErrorOpen(utf8* path, size_t numMissingObjects, const ObjectEntryDescriptor* missingObjects);
 
-rct_window* WindowRideConstructionOpen();
+WindowBase* WindowRideConstructionOpen();
 void WindowRideConstructionUpdateActiveElementsImpl();
 void WindowRideConstructionUpdateEnabledTrackPieces();
 
-rct_window* WindowTopToolbarOpen();
+WindowBase* WindowTopToolbarOpen();
 bool LandToolIsActive();
 bool ClearSceneryToolIsActive();
 bool WaterToolIsActive();
 
-rct_window* WindowSceneryOpen();
+WindowBase* WindowSceneryOpen();
 void WindowScenerySetSelectedItem(
     const ScenerySelection& sceneryconst, std::optional<colour_t> primary, const std::optional<colour_t> secondary,
     const std::optional<colour_t> tertiary, const std::optional<colour_t> rotation);
@@ -185,23 +185,23 @@ void WindowSceneryResetSelectedSceneryItems();
 const ScenerySelection WindowSceneryGetTabSelection();
 
 extern uint8_t gToolbarDirtyFlags;
-rct_window* WindowGameBottomToolbarOpen();
+WindowBase* WindowGameBottomToolbarOpen();
 void WindowGameBottomToolbarInvalidateNewsItem();
 
-rct_window* WindowEditorBottomToolbarOpen();
+WindowBase* WindowEditorBottomToolbarOpen();
 
-rct_window* WindowTileInspectorOpen();
+WindowBase* WindowTileInspectorOpen();
 void WindowTileInspectorClearClipboard();
 
-rct_window* WindowEditorObjectSelectionOpen();
+WindowBase* WindowEditorObjectSelectionOpen();
 
 void WindowTooltipReset(const ScreenCoordsXY& screenCoords);
 void WindowTooltipShow(const OpenRCT2String& message, ScreenCoordsXY screenCoords);
-void WindowTooltipOpen(rct_window* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void WindowTooltipOpen(WindowBase* widgetWindow, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
 void WindowTooltipClose();
 
-rct_window* WindowSceneryScatterOpen();
-rct_window* WindowPatrolAreaOpen(EntityId staffId);
+WindowBase* WindowSceneryScatterOpen();
+WindowBase* WindowPatrolAreaOpen(EntityId staffId);
 EntityId WindowPatrolAreaGetCurrentStaffId();
 
 // clang-format off
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 3122f39950..d50b86bd65 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -1490,25 +1490,25 @@ void ContextSetCursorTrap(bool value)
     GetContext()->GetUiContext()->SetCursorTrap(value);
 }
 
-rct_window* ContextOpenWindow(WindowClass wc)
+WindowBase* ContextOpenWindow(WindowClass wc)
 {
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
     return windowManager->OpenWindow(wc);
 }
 
-rct_window* ContextOpenWindowView(uint8_t wc)
+WindowBase* ContextOpenWindowView(uint8_t wc)
 {
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
     return windowManager->OpenView(wc);
 }
 
-rct_window* ContextOpenDetailWindow(uint8_t type, int32_t id)
+WindowBase* ContextOpenDetailWindow(uint8_t type, int32_t id)
 {
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
     return windowManager->OpenDetails(type, id);
 }
 
-rct_window* ContextOpenIntent(Intent* intent)
+WindowBase* ContextOpenIntent(Intent* intent)
 {
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
     return windowManager->OpenIntent(intent);
@@ -1526,7 +1526,7 @@ void ContextForceCloseWindowByClass(WindowClass windowClass)
     windowManager->ForceClose(windowClass);
 }
 
-rct_window* ContextShowError(StringId title, StringId message, const Formatter& args)
+WindowBase* ContextShowError(StringId title, StringId message, const Formatter& args)
 {
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
     return windowManager->ShowError(title, message, args);
diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h
index 5bf0bb04fe..a8cdb4aaa5 100644
--- a/src/openrct2/Context.h
+++ b/src/openrct2/Context.h
@@ -31,7 +31,7 @@ struct ITrackDesignRepository;
 struct IGameStateSnapshots;
 
 class Intent;
-struct rct_window;
+struct WindowBase;
 struct NewVersionInfo;
 
 struct TTFFontDescriptor;
@@ -210,11 +210,11 @@ int32_t ContextGetWidth();
 int32_t ContextGetHeight();
 bool ContextHasFocus();
 void ContextSetCursorTrap(bool value);
-rct_window* ContextOpenWindow(WindowClass wc);
-rct_window* ContextOpenDetailWindow(uint8_t type, int32_t id);
-rct_window* ContextOpenWindowView(uint8_t view);
-rct_window* ContextShowError(StringId title, StringId message, const class Formatter& args);
-rct_window* ContextOpenIntent(Intent* intent);
+WindowBase* ContextOpenWindow(WindowClass wc);
+WindowBase* ContextOpenDetailWindow(uint8_t type, int32_t id);
+WindowBase* ContextOpenWindowView(uint8_t view);
+WindowBase* ContextShowError(StringId title, StringId message, const class Formatter& args);
+WindowBase* ContextOpenIntent(Intent* intent);
 void ContextBroadcastIntent(Intent* intent);
 void ContextForceCloseWindowByClass(WindowClass wc);
 void ContextUpdateMapTooltip();
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index f5d8905ffc..fe623cf43f 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -89,7 +89,7 @@ namespace Editor
         }
     }
 
-    static rct_window* OpenEditorWindows()
+    static WindowBase* OpenEditorWindows()
     {
         auto* main = ContextOpenWindow(WindowClass::MainWindow);
         ContextOpenWindow(WindowClass::TopToolbar);
@@ -111,7 +111,7 @@ namespace Editor
         gParkFlags |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
         gScenarioCategory = SCENARIO_CATEGORY_OTHER;
         ViewportInitAll();
-        rct_window* mainWindow = OpenEditorWindows();
+        WindowBase* mainWindow = OpenEditorWindows();
         mainWindow->SetLocation(TileCoordsXYZ{ 75, 75, 14 }.ToCoordsXYZ());
         LoadPalette();
         gScreenAge = 0;
@@ -170,7 +170,7 @@ namespace Editor
         SetAllLandOwned();
         gEditorStep = EditorStep::ObjectSelection;
         ViewportInitAll();
-        rct_window* mainWindow = OpenEditorWindows();
+        WindowBase* mainWindow = OpenEditorWindows();
         mainWindow->SetLocation(TileCoordsXYZ{ 75, 75, 14 }.ToCoordsXYZ());
         LoadPalette();
     }
@@ -191,7 +191,7 @@ namespace Editor
         SetAllLandOwned();
         gEditorStep = EditorStep::ObjectSelection;
         ViewportInitAll();
-        rct_window* mainWindow = OpenEditorWindows();
+        WindowBase* mainWindow = OpenEditorWindows();
         mainWindow->SetLocation(TileCoordsXYZ{ 75, 75, 14 }.ToCoordsXYZ());
         LoadPalette();
     }
diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp
index 19fd890c17..da2d18f184 100644
--- a/src/openrct2/Game.cpp
+++ b/src/openrct2/Game.cpp
@@ -148,7 +148,7 @@ enum
  */
 void UpdatePaletteEffects()
 {
-    auto water_type = static_cast<rct_water_type*>(ObjectEntryGetChunk(ObjectType::Water, 0));
+    auto water_type = static_cast<WaterObjectEntry*>(ObjectEntryGetChunk(ObjectType::Water, 0));
 
     if (gClimateLightningFlash == 1)
     {
diff --git a/src/openrct2/Input.h b/src/openrct2/Input.h
index cf735ab7b0..ccd5134bb4 100644
--- a/src/openrct2/Input.h
+++ b/src/openrct2/Input.h
@@ -92,7 +92,7 @@ extern InputState _inputState;
 extern uint8_t _inputFlags;
 extern uint16_t _tooltipNotShownTicks;
 
-void InputWindowPositionBegin(rct_window& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void InputWindowPositionBegin(WindowBase& w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
 
 void TitleHandleKeyboardInput();
 void GameHandleInput();
diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp
index 027478c34b..c4cda77ac6 100644
--- a/src/openrct2/actions/GameAction.cpp
+++ b/src/openrct2/actions/GameAction.cpp
@@ -240,12 +240,12 @@ namespace GameActions
         return "sp";
     }
 
-    struct ActionLogContext_t
+    struct ActionLogContext
     {
         MemoryStream output;
     };
 
-    static void LogActionBegin(ActionLogContext_t& ctx, const GameAction* action)
+    static void LogActionBegin(ActionLogContext& ctx, const GameAction* action)
     {
         MemoryStream& output = ctx.output;
 
@@ -262,7 +262,7 @@ namespace GameActions
         action->Serialise(ds);
     }
 
-    static void LogActionFinish(ActionLogContext_t& ctx, const GameAction* action, const GameActions::Result& result)
+    static void LogActionFinish(ActionLogContext& ctx, const GameAction* action, const GameActions::Result& result)
     {
         MemoryStream& output = ctx.output;
 
@@ -348,7 +348,7 @@ namespace GameActions
                 }
             }
 
-            ActionLogContext_t logContext;
+            ActionLogContext logContext;
             LogActionBegin(logContext, action);
 
             // Execute the action, changing the game state
diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp
index 0a3742e056..95d9366123 100644
--- a/src/openrct2/actions/RideSetStatusAction.cpp
+++ b/src/openrct2/actions/RideSetStatusAction.cpp
@@ -201,7 +201,7 @@ GameActions::Result RideSetStatusAction::Execute() const
 
             // Fix #3183: Make sure we close the construction window so the ride finishes any editing code before opening
             //            otherwise vehicles get added to the ride incorrectly (such as to a ghost station)
-            rct_window* constructionWindow = WindowFindByNumber(WindowClass::RideConstruction, _rideIndex.ToUnderlying());
+            WindowBase* constructionWindow = WindowFindByNumber(WindowClass::RideConstruction, _rideIndex.ToUnderlying());
             if (constructionWindow != nullptr)
             {
                 WindowClose(*constructionWindow);
diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp
index 9aef605124..64b80383a1 100644
--- a/src/openrct2/actions/TrackPlaceAction.cpp
+++ b/src/openrct2/actions/TrackPlaceAction.cpp
@@ -163,7 +163,7 @@ GameActions::Result TrackPlaceAction::Query() const
     }
 
     const auto& ted = GetTrackElementDescriptor(_trackType);
-    const rct_preview_track* trackBlock = ted.Block;
+    const PreviewTrack* trackBlock = ted.Block;
     uint32_t numElements = 0;
     // First check if any of the track pieces are outside the park
     for (; trackBlock->index != 0xFF; trackBlock++)
@@ -440,7 +440,7 @@ GameActions::Result TrackPlaceAction::Execute() const
 
     money32 costs = 0;
     money64 supportCosts = 0;
-    const rct_preview_track* trackBlock = ted.Block;
+    const PreviewTrack* trackBlock = ted.Block;
     for (int32_t blockIndex = 0; trackBlock->index != 0xFF; trackBlock++, blockIndex++)
     {
         auto rotatedTrack = CoordsXYZ{ CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(_origin.direction), trackBlock->z };
@@ -714,7 +714,7 @@ GameActions::Result TrackPlaceAction::Execute() const
 bool TrackPlaceAction::CheckMapCapacity(int16_t numTiles) const
 {
     const auto& ted = GetTrackElementDescriptor(_trackType);
-    for (const rct_preview_track* trackBlock = ted.Block; trackBlock->index != 0xFF; trackBlock++)
+    for (const PreviewTrack* trackBlock = ted.Block; trackBlock->index != 0xFF; trackBlock++)
     {
         auto rotatedTrack = CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(_origin.direction);
 
diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp
index 8eb868e457..687dc9b065 100644
--- a/src/openrct2/actions/TrackRemoveAction.cpp
+++ b/src/openrct2/actions/TrackRemoveAction.cpp
@@ -138,7 +138,7 @@ GameActions::Result TrackRemoveAction::Query() const
     }
     const auto& ted = GetTrackElementDescriptor(trackType);
     auto sequenceIndex = tileElement->AsTrack()->GetSequenceIndex();
-    const rct_preview_track* trackBlock = ted.GetBlockForSequence(sequenceIndex);
+    const PreviewTrack* trackBlock = ted.GetBlockForSequence(sequenceIndex);
     if (trackBlock == nullptr)
     {
         LOG_WARNING("Track block %d not found for track type %d.", sequenceIndex, trackType);
@@ -327,7 +327,7 @@ GameActions::Result TrackRemoveAction::Execute() const
     }
     const auto& ted = GetTrackElementDescriptor(trackType);
     auto sequenceIndex = tileElement->AsTrack()->GetSequenceIndex();
-    const rct_preview_track* trackBlock = ted.GetBlockForSequence(sequenceIndex);
+    const PreviewTrack* trackBlock = ted.GetBlockForSequence(sequenceIndex);
     if (trackBlock == nullptr)
     {
         LOG_WARNING("Track block %d not found for track type %d.", sequenceIndex, trackType);
diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp
index 8894f3bee0..c481c5ae12 100644
--- a/src/openrct2/actions/WallPlaceAction.cpp
+++ b/src/openrct2/actions/WallPlaceAction.cpp
@@ -447,7 +447,7 @@ bool WallPlaceAction::WallCheckObstructionWithTrack(
                 direction = DirectionReverse(trackElement->GetDirection());
                 if (direction == _edge)
                 {
-                    const rct_preview_track* trackBlock = ted.GetBlockForSequence(sequence);
+                    const PreviewTrack* trackBlock = ted.GetBlockForSequence(sequence);
                     z = ted.Coordinates.z_begin;
                     z = trackElement->BaseHeight + ((z - trackBlock->z) * 8);
                     if (z == z0)
@@ -459,7 +459,7 @@ bool WallPlaceAction::WallCheckObstructionWithTrack(
         }
     }
 
-    const rct_preview_track* trackBlock = &ted.Block[sequence + 1];
+    const PreviewTrack* trackBlock = &ted.Block[sequence + 1];
     if (trackBlock->index != 0xFF)
     {
         return false;
diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp
index 9aa6af4362..d6128bb01c 100644
--- a/src/openrct2/audio/Audio.cpp
+++ b/src/openrct2/audio/Audio.cpp
@@ -176,7 +176,7 @@ namespace OpenRCT2::Audio
         uint8_t rotation = GetCurrentRotation();
         auto pos2 = Translate3DTo2DWithZ(rotation, location);
 
-        rct_viewport* viewport = nullptr;
+        Viewport* viewport = nullptr;
         while ((viewport = WindowGetPreviousViewport(viewport)) != nullptr)
         {
             if (viewport->flags & VIEWPORT_FLAG_SOUND_ON)
diff --git a/src/openrct2/cmdline/BenchSpriteSort.cpp b/src/openrct2/cmdline/BenchSpriteSort.cpp
index 81125c2bbf..1596c4ca32 100644
--- a/src/openrct2/cmdline/BenchSpriteSort.cpp
+++ b/src/openrct2/cmdline/BenchSpriteSort.cpp
@@ -93,7 +93,7 @@ static std::vector<RecordedPaintSession> extract_paint_session(std::string_view
         resolutionWidth += 8;
         resolutionHeight += 128;
 
-        rct_viewport viewport;
+        Viewport viewport;
         viewport.pos = { 0, 0 };
         viewport.width = resolutionWidth;
         viewport.height = resolutionHeight;
diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp
index 7eb0746c07..20b1061a21 100644
--- a/src/openrct2/drawing/Drawing.cpp
+++ b/src/openrct2/drawing/Drawing.cpp
@@ -622,7 +622,7 @@ void LoadPalette()
         return;
     }
 
-    auto water_type = static_cast<rct_water_type*>(ObjectEntryGetChunk(ObjectType::Water, 0));
+    auto water_type = static_cast<WaterObjectEntry*>(ObjectEntryGetChunk(ObjectType::Water, 0));
 
     uint32_t palette = 0x5FC;
 
diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp
index ba8f5ce1ab..ff59e87f1e 100644
--- a/src/openrct2/drawing/LightFX.cpp
+++ b/src/openrct2/drawing/LightFX.cpp
@@ -431,10 +431,10 @@ void LightFXSwapBuffers()
 
 void LightFXUpdateViewportSettings()
 {
-    rct_window* mainWindow = WindowGetMain();
+    WindowBase* mainWindow = WindowGetMain();
     if (mainWindow != nullptr)
     {
-        rct_viewport* viewport = WindowGetViewport(mainWindow);
+        Viewport* viewport = WindowGetViewport(mainWindow);
         _current_view_x_back = viewport->viewPos.x;
         _current_view_y_back = viewport->viewPos.y;
         _current_view_rotation_back = GetCurrentRotation();
diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp
index 7d27d60847..345ff9aadb 100644
--- a/src/openrct2/entity/Guest.cpp
+++ b/src/openrct2/entity/Guest.cpp
@@ -1420,7 +1420,7 @@ void Guest::CheckCantFindRide()
         return;
 
     GuestHeadingToRideId = RideId::GetNull();
-    rct_window* w = WindowFindByNumber(WindowClass::Peep, sprite_index);
+    WindowBase* w = WindowFindByNumber(WindowClass::Peep, sprite_index);
 
     if (w != nullptr)
     {
@@ -3110,7 +3110,7 @@ static void PeepLeavePark(Guest* peep)
 
     peep->InsertNewThought(PeepThoughtType::GoHome);
 
-    rct_window* w = WindowFindByNumber(WindowClass::Peep, peep->sprite_index);
+    WindowBase* w = WindowFindByNumber(WindowClass::Peep, peep->sprite_index);
     if (w != nullptr)
         WindowEventInvalidateCall(w);
     WindowInvalidateByNumber(WindowClass::Peep, peep->sprite_index);
diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp
index bb5da4c5ff..672ffa87d2 100644
--- a/src/openrct2/entity/MoneyEffect.cpp
+++ b/src/openrct2/entity/MoneyEffect.cpp
@@ -84,11 +84,11 @@ void MoneyEffect::Create(money64 value, const CoordsXYZ& loc)
             return;
         }
 
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow == nullptr)
             return;
 
-        rct_viewport* mainViewport = WindowGetViewport(mainWindow);
+        Viewport* mainViewport = WindowGetViewport(mainWindow);
         auto mapPositionXY = ScreenGetMapXY(
             { mainViewport->pos.x + (mainViewport->width / 2), mainViewport->pos.y + (mainViewport->height / 2) }, nullptr);
         if (!mapPositionXY.has_value())
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index 73aa649521..575fe00214 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -565,7 +565,7 @@ void PeepDecrementNumRiders(Peep* peep)
  */
 void PeepWindowStateUpdate(Peep* peep)
 {
-    rct_window* w = WindowFindByNumber(WindowClass::Peep, peep->sprite_index.ToUnderlying());
+    WindowBase* w = WindowFindByNumber(WindowClass::Peep, peep->sprite_index.ToUnderlying());
     if (w != nullptr)
         WindowEventInvalidateCall(w);
 
diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp
index 4003efadc4..f9aaccff8c 100644
--- a/src/openrct2/interface/InteractiveConsole.cpp
+++ b/src/openrct2/interface/InteractiveConsole.cpp
@@ -674,10 +674,10 @@ static int32_t ConsoleCommandGet(InteractiveConsole& console, const arguments_t&
         }
         else if (argv[0] == "location")
         {
-            rct_window* w = WindowGetMain();
+            WindowBase* w = WindowGetMain();
             if (w != nullptr)
             {
-                rct_viewport* viewport = WindowGetViewport(w);
+                Viewport* viewport = WindowGetViewport(w);
                 auto info = GetMapCoordinatesFromPos(
                     { viewport->view_width / 2, viewport->view_height / 2 }, EnumsToFlags(ViewportInteractionItem::Terrain));
 
@@ -1053,7 +1053,7 @@ static int32_t ConsoleCommandSet(InteractiveConsole& console, const arguments_t&
         }
         else if (argv[0] == "location" && InvalidArguments(&invalidArgs, int_valid[0] && int_valid[1]))
         {
-            rct_window* w = WindowGetMain();
+            WindowBase* w = WindowGetMain();
             if (w != nullptr)
             {
                 auto location = TileCoordsXYZ(int_val[0], int_val[1], 0).ToCoordsXYZ().ToTileCentre();
@@ -1147,7 +1147,7 @@ static int32_t ConsoleCommandSet(InteractiveConsole& console, const arguments_t&
         else if (argv[0] == "current_rotation" && InvalidArguments(&invalidArgs, int_valid[0]))
         {
             uint8_t currentRotation = GetCurrentRotation();
-            rct_window* mainWindow = WindowGetMain();
+            WindowBase* mainWindow = WindowGetMain();
             int32_t newRotation = int_val[0];
             if (newRotation < 0 || newRotation > 3)
             {
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index 29633703b4..23385135af 100644
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/src/openrct2/interface/Screenshot.cpp
@@ -249,7 +249,7 @@ static int32_t GetTallestVisibleTileTop(
     return minViewY - 64;
 }
 
-static DrawPixelInfo CreateDPI(const rct_viewport& viewport)
+static DrawPixelInfo CreateDPI(const Viewport& viewport)
 {
     DrawPixelInfo dpi;
     dpi.width = viewport.width;
@@ -277,7 +277,7 @@ static void ReleaseDPI(DrawPixelInfo& dpi)
     dpi.height = 0;
 }
 
-static rct_viewport GetGiantViewport(int32_t rotation, ZoomLevel zoom)
+static Viewport GetGiantViewport(int32_t rotation, ZoomLevel zoom)
 {
     // Get the tile coordinates of each corner
     const TileCoordsXY cornerCoords[2][4] = {
@@ -314,7 +314,7 @@ static rct_viewport GetGiantViewport(int32_t rotation, ZoomLevel zoom)
     auto bottom = std::max({ screenCoords1.y, screenCoords2.y, screenCoords3.y, screenCoords4.y });
     auto right = std::max({ screenCoords1.x, screenCoords2.x, screenCoords3.x, screenCoords4.x }) + 32;
 
-    rct_viewport viewport{};
+    Viewport viewport{};
     viewport.viewPos = { left, top };
     viewport.view_width = right - left;
     viewport.view_height = bottom - top;
@@ -324,7 +324,7 @@ static rct_viewport GetGiantViewport(int32_t rotation, ZoomLevel zoom)
     return viewport;
 }
 
-static void RenderViewport(IDrawingEngine* drawingEngine, const rct_viewport& viewport, DrawPixelInfo& dpi)
+static void RenderViewport(IDrawingEngine* drawingEngine, const Viewport& viewport, DrawPixelInfo& dpi)
 {
     // Ensure sprites appear regardless of rotation
     ResetAllSpriteQuadrantPlacements();
@@ -415,7 +415,7 @@ static void BenchgfxRenderScreenshots(const char* inputPath, std::unique_ptr<ICo
     constexpr int32_t NUM_ROTATIONS = 4;
     constexpr auto NUM_ZOOM_LEVELS = static_cast<int8_t>(ZoomLevel::max());
     std::array<DrawPixelInfo, NUM_ROTATIONS * NUM_ZOOM_LEVELS> dpis;
-    std::array<rct_viewport, NUM_ROTATIONS * NUM_ZOOM_LEVELS> viewports;
+    std::array<Viewport, NUM_ROTATIONS * NUM_ZOOM_LEVELS> viewports;
 
     for (ZoomLevel zoom{ 0 }; zoom < ZoomLevel::max(); zoom++)
     {
@@ -514,7 +514,7 @@ int32_t CmdlineForGfxbench(const char** argv, int32_t argc)
     return 1;
 }
 
-static void ApplyOptions(const ScreenshotOptions* options, rct_viewport& viewport)
+static void ApplyOptions(const ScreenshotOptions* options, Viewport& viewport)
 {
     if (options->weather != WeatherType::Sunny && options->weather != WeatherType::Count)
     {
@@ -612,7 +612,7 @@ int32_t CmdlineForScreenshot(const char** argv, int32_t argc, ScreenshotOptions*
         gIntroState = IntroState::None;
         gScreenFlags = SCREEN_FLAGS_PLAYING;
 
-        rct_viewport viewport{};
+        Viewport viewport{};
         if (giantScreenshot)
         {
             auto customZoom = static_cast<int8_t>(std::atoi(argv[3]));
@@ -755,7 +755,7 @@ static std::string ResolveFilenameForCapture(const fs::path& filename)
 
 void CaptureImage(const CaptureOptions& options)
 {
-    rct_viewport viewport{};
+    Viewport viewport{};
     if (options.View.has_value())
     {
         viewport.width = options.View->Width;
diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index de58b026b4..bb09c347b3 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -56,8 +56,8 @@ uint8_t gShowGridLinesRefCount;
 uint8_t gShowLandRightsRefCount;
 uint8_t gShowConstructionRightsRefCount;
 
-static std::list<rct_viewport> _viewports;
-rct_viewport* g_music_tracking_viewport;
+static std::list<Viewport> _viewports;
+Viewport* g_music_tracking_viewport;
 
 static std::unique_ptr<JobPool> _paintJobs;
 static std::vector<PaintSession*> _paintColumns;
@@ -114,7 +114,7 @@ void ViewportInitAll()
  * out_x : ax
  * out_y : bx
  */
-std::optional<ScreenCoordsXY> centre_2d_coordinates(const CoordsXYZ& loc, rct_viewport* viewport)
+std::optional<ScreenCoordsXY> centre_2d_coordinates(const CoordsXYZ& loc, Viewport* viewport)
 {
     // If the start location was invalid
     // propagate the invalid location to the output.
@@ -171,16 +171,16 @@ CoordsXYZ Focus::GetPos() const
  *  flags:  edx top most 2 bits 0b_X1 for zoom clear see below for 2nd bit.
  *  w:      esi
  */
-void ViewportCreate(rct_window* w, const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, const Focus& focus)
+void ViewportCreate(WindowBase* w, const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, const Focus& focus)
 {
-    rct_viewport* viewport = nullptr;
+    Viewport* viewport = nullptr;
     if (_viewports.size() >= MAX_VIEWPORT_COUNT)
     {
         LOG_ERROR("No more viewport slots left to allocate.");
         return;
     }
 
-    auto itViewport = _viewports.insert(_viewports.end(), rct_viewport{});
+    auto itViewport = _viewports.insert(_viewports.end(), Viewport{});
 
     viewport = &*itViewport;
     viewport->pos = screenCoords;
@@ -218,7 +218,7 @@ void ViewportCreate(rct_window* w, const ScreenCoordsXY& screenCoords, int32_t w
     viewport->viewPos = *centreLoc;
 }
 
-void ViewportRemove(rct_viewport* viewport)
+void ViewportRemove(Viewport* viewport)
 {
     auto it = std::find_if(_viewports.begin(), _viewports.end(), [viewport](const auto& vp) { return &vp == viewport; });
     if (it == _viewports.end())
@@ -279,8 +279,7 @@ CoordsXYZ ViewportAdjustForMapHeight(const ScreenCoordsXY& startCoords)
 /*
  *  rct2: 0x006E7FF3
  */
-static void ViewportRedrawAfterShift(
-    DrawPixelInfo* dpi, rct_window* window, rct_viewport* viewport, const ScreenCoordsXY& coords)
+static void ViewportRedrawAfterShift(DrawPixelInfo* dpi, WindowBase* window, Viewport* viewport, const ScreenCoordsXY& coords)
 {
     // sub-divide by intersecting windows
     if (window != nullptr)
@@ -299,7 +298,7 @@ static void ViewportRedrawAfterShift(
         }
 
         // save viewport
-        rct_viewport view_copy = *viewport;
+        Viewport view_copy = *viewport;
 
         if (viewport->pos.x < window->windowPos.x)
         {
@@ -402,7 +401,7 @@ static void ViewportRedrawAfterShift(
     }
 }
 
-static void ViewportShiftPixels(DrawPixelInfo* dpi, rct_window* window, rct_viewport* viewport, int32_t x_diff, int32_t y_diff)
+static void ViewportShiftPixels(DrawPixelInfo* dpi, WindowBase* window, Viewport* viewport, int32_t x_diff, int32_t y_diff)
 {
     auto it = WindowGetIterator(window);
     for (; it != g_window_list.end(); it++)
@@ -449,7 +448,7 @@ static void ViewportShiftPixels(DrawPixelInfo* dpi, rct_window* window, rct_view
     ViewportRedrawAfterShift(dpi, window, viewport, { x_diff, y_diff });
 }
 
-static void ViewportMove(const ScreenCoordsXY& coords, rct_window* w, rct_viewport* viewport)
+static void ViewportMove(const ScreenCoordsXY& coords, WindowBase* w, Viewport* viewport)
 {
     auto zoom = viewport->zoom;
 
@@ -485,7 +484,7 @@ static void ViewportMove(const ScreenCoordsXY& coords, rct_window* w, rct_viewpo
         }
     }
 
-    rct_viewport view_copy = *viewport;
+    Viewport view_copy = *viewport;
 
     if (viewport->pos.x < 0)
     {
@@ -539,7 +538,7 @@ static void ViewportMove(const ScreenCoordsXY& coords, rct_window* w, rct_viewpo
 }
 
 // rct2: 0x006E7A15
-static void ViewportSetUndergroundFlag(int32_t underground, rct_window* window, rct_viewport* viewport)
+static void ViewportSetUndergroundFlag(int32_t underground, WindowBase* window, Viewport* viewport)
 {
     if (window->classification != WindowClass::MainWindow
         || (window->classification == WindowClass::MainWindow && !window->viewport_smart_follow_sprite.IsNull()))
@@ -566,11 +565,11 @@ static void ViewportSetUndergroundFlag(int32_t underground, rct_window* window,
  *
  *  rct2: 0x006E7A3A
  */
-void ViewportUpdatePosition(rct_window* window)
+void ViewportUpdatePosition(WindowBase* window)
 {
     WindowEventResizeCall(window);
 
-    rct_viewport* viewport = window->viewport;
+    Viewport* viewport = window->viewport;
     if (viewport == nullptr)
         return;
 
@@ -667,7 +666,7 @@ void ViewportUpdatePosition(rct_window* window)
     ViewportMove(windowCoords, window, viewport);
 }
 
-void ViewportUpdateFollowSprite(rct_window* window)
+void ViewportUpdateFollowSprite(WindowBase* window)
 {
     if (!window->viewport_target_sprite.IsNull() && window->viewport != nullptr)
     {
@@ -693,7 +692,7 @@ void ViewportUpdateFollowSprite(rct_window* window)
     }
 }
 
-void ViewportUpdateSmartFollowEntity(rct_window* window)
+void ViewportUpdateSmartFollowEntity(WindowBase* window)
 {
     auto entity = TryGetEntity(window->viewport_smart_follow_sprite);
     if (entity == nullptr || entity->Type == EntityType::Null)
@@ -724,7 +723,7 @@ void ViewportUpdateSmartFollowEntity(rct_window* window)
     }
 }
 
-void ViewportUpdateSmartFollowGuest(rct_window* window, const Guest* peep)
+void ViewportUpdateSmartFollowGuest(WindowBase* window, const Guest* peep)
 {
     Focus focus = Focus(peep->sprite_index);
     window->viewport_target_sprite = peep->sprite_index;
@@ -776,7 +775,7 @@ void ViewportUpdateSmartFollowGuest(rct_window* window, const Guest* peep)
     window->focus = focus;
 }
 
-void ViewportUpdateSmartFollowStaff(rct_window* window, const Staff* peep)
+void ViewportUpdateSmartFollowStaff(WindowBase* window, const Staff* peep)
 {
     if (peep->State == PeepState::Picked)
     {
@@ -790,7 +789,7 @@ void ViewportUpdateSmartFollowStaff(rct_window* window, const Staff* peep)
     window->viewport_target_sprite = window->viewport_smart_follow_sprite;
 }
 
-void ViewportUpdateSmartFollowVehicle(rct_window* window)
+void ViewportUpdateSmartFollowVehicle(WindowBase* window)
 {
     window->focus = Focus(window->viewport_smart_follow_sprite);
     window->viewport_target_sprite = window->viewport_smart_follow_sprite;
@@ -807,7 +806,7 @@ void ViewportUpdateSmartFollowVehicle(rct_window* window)
  *  ebp: bottom
  */
 void ViewportRender(
-    DrawPixelInfo* dpi, const rct_viewport* viewport, const ScreenRect& screenRect, std::vector<RecordedPaintSession>* sessions)
+    DrawPixelInfo* dpi, const Viewport* viewport, const ScreenRect& screenRect, std::vector<RecordedPaintSession>* sessions)
 {
     auto [topLeft, bottomRight] = screenRect;
 
@@ -960,7 +959,7 @@ static void ViewportPaintColumn(PaintSession& session)
  *  ebp: bottom
  */
 void ViewportPaint(
-    const rct_viewport* viewport, DrawPixelInfo* dpi, const ScreenRect& screenRect,
+    const Viewport* viewport, DrawPixelInfo* dpi, const ScreenRect& screenRect,
     std::vector<RecordedPaintSession>* recorded_sessions)
 {
     PROFILED_FUNCTION();
@@ -1158,7 +1157,7 @@ std::optional<CoordsXY> ScreenPosToMapPos(const ScreenCoordsXY& screenCoords, in
     return { mapCoords->ToTileStart() };
 }
 
-[[nodiscard]] ScreenCoordsXY rct_viewport::ScreenToViewportCoord(const ScreenCoordsXY& screenCoords) const
+[[nodiscard]] ScreenCoordsXY Viewport::ScreenToViewportCoord(const ScreenCoordsXY& screenCoords) const
 {
     ScreenCoordsXY ret;
     ret.x = (zoom.ApplyTo(screenCoords.x - pos.x)) + viewPos.x;
@@ -1166,7 +1165,7 @@ std::optional<CoordsXY> ScreenPosToMapPos(const ScreenCoordsXY& screenCoords, in
     return ret;
 }
 
-void rct_viewport::Invalidate() const
+void Viewport::Invalidate() const
 {
     ViewportInvalidate(this, { viewPos, viewPos + ScreenCoordsXY{ view_width, view_height } });
 }
@@ -1187,7 +1186,7 @@ void ShowGridlines()
 {
     if (gShowGridLinesRefCount == 0)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             if (!(mainWindow->viewport->flags & VIEWPORT_FLAG_GRIDLINES))
@@ -1211,7 +1210,7 @@ void HideGridlines()
 
     if (gShowGridLinesRefCount == 0)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             if (!gConfigGeneral.AlwaysShowGridlines)
@@ -1231,7 +1230,7 @@ void ShowLandRights()
 {
     if (gShowLandRightsRefCount == 0)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             if (!(mainWindow->viewport->flags & VIEWPORT_FLAG_LAND_OWNERSHIP))
@@ -1255,7 +1254,7 @@ void HideLandRights()
 
     if (gShowLandRightsRefCount == 0)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             if (mainWindow->viewport->flags & VIEWPORT_FLAG_LAND_OWNERSHIP)
@@ -1275,7 +1274,7 @@ void ShowConstructionRights()
 {
     if (gShowConstructionRightsRefCount == 0)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             if (!(mainWindow->viewport->flags & VIEWPORT_FLAG_CONSTRUCTION_RIGHTS))
@@ -1299,7 +1298,7 @@ void HideConstructionRights()
 
     if (gShowConstructionRightsRefCount == 0)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             if (mainWindow->viewport->flags & VIEWPORT_FLAG_CONSTRUCTION_RIGHTS)
@@ -1317,11 +1316,11 @@ void HideConstructionRights()
  */
 void ViewportSetVisibility(uint8_t mode)
 {
-    rct_window* window = WindowGetMain();
+    WindowBase* window = WindowGetMain();
 
     if (window != nullptr)
     {
-        rct_viewport* vp = window->viewport;
+        Viewport* vp = window->viewport;
         uint32_t invalidate = 0;
 
         switch (mode)
@@ -1888,11 +1887,11 @@ InteractionInfo SetInteractionInfoFromPaintSession(PaintSession* session, uint32
  */
 InteractionInfo GetMapCoordinatesFromPos(const ScreenCoordsXY& screenCoords, int32_t flags)
 {
-    rct_window* window = WindowFindFromPoint(screenCoords);
+    WindowBase* window = WindowFindFromPoint(screenCoords);
     return GetMapCoordinatesFromPosWindow(window, screenCoords, flags);
 }
 
-InteractionInfo GetMapCoordinatesFromPosWindow(rct_window* window, const ScreenCoordsXY& screenCoords, int32_t flags)
+InteractionInfo GetMapCoordinatesFromPosWindow(WindowBase* window, const ScreenCoordsXY& screenCoords, int32_t flags)
 {
     InteractionInfo info{};
     if (window == nullptr || window->viewport == nullptr)
@@ -1900,7 +1899,7 @@ InteractionInfo GetMapCoordinatesFromPosWindow(rct_window* window, const ScreenC
         return info;
     }
 
-    rct_viewport* myviewport = window->viewport;
+    Viewport* myviewport = window->viewport;
     auto viewLoc = screenCoords;
     viewLoc -= myviewport->pos;
     if (viewLoc.x >= 0 && viewLoc.x < static_cast<int32_t>(myviewport->width) && viewLoc.y >= 0
@@ -1933,7 +1932,7 @@ InteractionInfo GetMapCoordinatesFromPosWindow(rct_window* window, const ScreenC
 /**
  * screenRect represents 2D map coordinates at zoom 0.
  */
-void ViewportInvalidate(const rct_viewport* viewport, const ScreenRect& screenRect)
+void ViewportInvalidate(const Viewport* viewport, const ScreenRect& screenRect)
 {
     PROFILED_FUNCTION();
 
@@ -1975,13 +1974,13 @@ void ViewportInvalidate(const rct_viewport* viewport, const ScreenRect& screenRe
     }
 }
 
-static rct_viewport* ViewportFindFromPoint(const ScreenCoordsXY& screenCoords)
+static Viewport* ViewportFindFromPoint(const ScreenCoordsXY& screenCoords)
 {
-    rct_window* w = WindowFindFromPoint(screenCoords);
+    WindowBase* w = WindowFindFromPoint(screenCoords);
     if (w == nullptr)
         return nullptr;
 
-    rct_viewport* viewport = w->viewport;
+    Viewport* viewport = w->viewport;
     if (viewport == nullptr)
         return nullptr;
 
@@ -2003,10 +2002,10 @@ static rct_viewport* ViewportFindFromPoint(const ScreenCoordsXY& screenCoords)
  *      tile_element: edx ?
  *      viewport: edi
  */
-std::optional<CoordsXY> ScreenGetMapXY(const ScreenCoordsXY& screenCoords, rct_viewport** viewport)
+std::optional<CoordsXY> ScreenGetMapXY(const ScreenCoordsXY& screenCoords, Viewport** viewport)
 {
     // This will get the tile location but we will need the more accuracy
-    rct_window* window = WindowFindFromPoint(screenCoords);
+    WindowBase* window = WindowFindFromPoint(screenCoords);
     if (window == nullptr || window->viewport == nullptr)
     {
         return std::nullopt;
@@ -2042,7 +2041,7 @@ std::optional<CoordsXY> ScreenGetMapXY(const ScreenCoordsXY& screenCoords, rct_v
  */
 std::optional<CoordsXY> ScreenGetMapXYWithZ(const ScreenCoordsXY& screenCoords, int32_t z)
 {
-    rct_viewport* viewport = ViewportFindFromPoint(screenCoords);
+    Viewport* viewport = ViewportFindFromPoint(screenCoords);
     if (viewport == nullptr)
     {
         return std::nullopt;
@@ -2153,10 +2152,10 @@ int32_t GetHeightMarkerOffset()
 
 void ViewportSetSavedView()
 {
-    rct_window* w = WindowGetMain();
+    WindowBase* w = WindowGetMain();
     if (w != nullptr)
     {
-        rct_viewport* viewport = w->viewport;
+        Viewport* viewport = w->viewport;
 
         gSavedView = ScreenCoordsXY{ viewport->view_width / 2, viewport->view_height / 2 } + viewport->viewPos;
 
diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h
index 669a2beacb..ebcc25a8c3 100644
--- a/src/openrct2/interface/Viewport.h
+++ b/src/openrct2/interface/Viewport.h
@@ -21,7 +21,7 @@ struct RecordedPaintSession;
 struct PaintStruct;
 struct DrawPixelInfo;
 struct TileElement;
-struct rct_window;
+struct WindowBase;
 struct EntityBase;
 struct Guest;
 struct Staff;
@@ -112,7 +112,7 @@ extern uint8_t gShowLandRightsRefCount;
 extern uint8_t gShowConstructionRightsRefCount;
 
 // rct2: 0x014234BC
-extern rct_viewport* g_music_tracking_viewport;
+extern Viewport* g_music_tracking_viewport;
 extern ScreenCoordsXY gSavedView;
 extern ZoomLevel gSavedViewZoom;
 extern uint8_t gSavedViewRotation;
@@ -121,21 +121,21 @@ extern PaintEntry* gNextFreePaintStruct;
 extern uint8_t gCurrentRotation;
 
 void ViewportInitAll();
-std::optional<ScreenCoordsXY> centre_2d_coordinates(const CoordsXYZ& loc, rct_viewport* viewport);
-void ViewportCreate(rct_window* w, const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, const Focus& focus);
-void ViewportRemove(rct_viewport* viewport);
+std::optional<ScreenCoordsXY> centre_2d_coordinates(const CoordsXYZ& loc, Viewport* viewport);
+void ViewportCreate(WindowBase* w, const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, const Focus& focus);
+void ViewportRemove(Viewport* viewport);
 void ViewportsInvalidate(const ScreenRect& screenRect, ZoomLevel maxZoom = ZoomLevel{ -1 });
-void ViewportUpdatePosition(rct_window* window);
-void ViewportUpdateFollowSprite(rct_window* window);
-void ViewportUpdateSmartFollowEntity(rct_window* window);
-void ViewportUpdateSmartFollowGuest(rct_window* window, const Guest* peep);
-void ViewportUpdateSmartFollowStaff(rct_window* window, const Staff* peep);
-void ViewportUpdateSmartFollowVehicle(rct_window* window);
+void ViewportUpdatePosition(WindowBase* window);
+void ViewportUpdateFollowSprite(WindowBase* window);
+void ViewportUpdateSmartFollowEntity(WindowBase* window);
+void ViewportUpdateSmartFollowGuest(WindowBase* window, const Guest* peep);
+void ViewportUpdateSmartFollowStaff(WindowBase* window, const Staff* peep);
+void ViewportUpdateSmartFollowVehicle(WindowBase* window);
 void ViewportRender(
-    DrawPixelInfo* dpi, const rct_viewport* viewport, const ScreenRect& screenRect,
+    DrawPixelInfo* dpi, const Viewport* viewport, const ScreenRect& screenRect,
     std::vector<RecordedPaintSession>* sessions = nullptr);
 void ViewportPaint(
-    const rct_viewport* viewport, DrawPixelInfo* dpi, const ScreenRect& screenRect,
+    const Viewport* viewport, DrawPixelInfo* dpi, const ScreenRect& screenRect,
     std::vector<RecordedPaintSession>* sessions = nullptr);
 
 CoordsXYZ ViewportAdjustForMapHeight(const ScreenCoordsXY& startCoords);
@@ -152,7 +152,7 @@ void HideConstructionRights();
 void ViewportSetVisibility(uint8_t mode);
 
 InteractionInfo GetMapCoordinatesFromPos(const ScreenCoordsXY& screenCoords, int32_t flags);
-InteractionInfo GetMapCoordinatesFromPosWindow(rct_window* window, const ScreenCoordsXY& screenCoords, int32_t flags);
+InteractionInfo GetMapCoordinatesFromPosWindow(WindowBase* window, const ScreenCoordsXY& screenCoords, int32_t flags);
 
 InteractionInfo SetInteractionInfoFromPaintSession(PaintSession* session, uint32_t viewFlags, uint16_t filter);
 InteractionInfo ViewportInteractionGetItemLeft(const ScreenCoordsXY& screenCoords);
@@ -164,9 +164,9 @@ bool ViewportInteractionRightClick(const ScreenCoordsXY& screenCoords);
 
 CoordsXY ViewportInteractionGetTileStartAtCursor(const ScreenCoordsXY& screenCoords);
 
-void ViewportInvalidate(const rct_viewport* viewport, const ScreenRect& screenRect);
+void ViewportInvalidate(const Viewport* viewport, const ScreenRect& screenRect);
 
-std::optional<CoordsXY> ScreenGetMapXY(const ScreenCoordsXY& screenCoords, rct_viewport** viewport);
+std::optional<CoordsXY> ScreenGetMapXY(const ScreenCoordsXY& screenCoords, Viewport** viewport);
 std::optional<CoordsXY> ScreenGetMapXYWithZ(const ScreenCoordsXY& screenCoords, int32_t z);
 std::optional<CoordsXY> ScreenGetMapXYQuadrant(const ScreenCoordsXY& screenCoords, uint8_t* quadrant);
 std::optional<CoordsXY> ScreenGetMapXYQuadrantWithZ(const ScreenCoordsXY& screenCoords, int32_t z, uint8_t* quadrant);
diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h
index e0f40b33ba..f6b0544701 100644
--- a/src/openrct2/interface/Widget.h
+++ b/src/openrct2/interface/Widget.h
@@ -161,22 +161,22 @@ constexpr Widget MakeDropdownButtonWidget(
     return MakeWidget({ xPos, yPos }, { width, height }, WindowWidgetType::Button, colour, STR_DROPDOWN_GLYPH, tooltip);
 }
 
-void WidgetScrollUpdateThumbs(rct_window& w, WidgetIndex widget_index);
-void WidgetDraw(DrawPixelInfo* dpi, rct_window& w, WidgetIndex widgetIndex);
+void WidgetScrollUpdateThumbs(WindowBase& w, WidgetIndex widget_index);
+void WidgetDraw(DrawPixelInfo* dpi, WindowBase& w, WidgetIndex widgetIndex);
 
-bool WidgetIsDisabled(const rct_window& w, WidgetIndex widgetIndex);
-bool WidgetIsHoldable(const rct_window& w, WidgetIndex widgetIndex);
-bool WidgetIsVisible(const rct_window& w, WidgetIndex widgetIndex);
-bool WidgetIsPressed(const rct_window& w, WidgetIndex widgetIndex);
-bool WidgetIsHighlighted(const rct_window& w, WidgetIndex widgetIndex);
-bool WidgetIsActiveTool(const rct_window& w, WidgetIndex widgetIndex);
+bool WidgetIsDisabled(const WindowBase& w, WidgetIndex widgetIndex);
+bool WidgetIsHoldable(const WindowBase& w, WidgetIndex widgetIndex);
+bool WidgetIsVisible(const WindowBase& w, WidgetIndex widgetIndex);
+bool WidgetIsPressed(const WindowBase& w, WidgetIndex widgetIndex);
+bool WidgetIsHighlighted(const WindowBase& w, WidgetIndex widgetIndex);
+bool WidgetIsActiveTool(const WindowBase& w, WidgetIndex widgetIndex);
 void WidgetScrollGetPart(
-    rct_window& w, const Widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords,
+    WindowBase& w, const Widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords,
     int32_t* output_scroll_area, int32_t* scroll_id);
 
-void WidgetSetEnabled(rct_window& w, WidgetIndex widgetIndex, bool enabled);
-void WidgetSetDisabled(rct_window& w, WidgetIndex widgetIndex, bool value);
-void WidgetSetHoldable(rct_window& w, WidgetIndex widgetIndex, bool value);
-void WidgetSetVisible(rct_window& w, WidgetIndex widgetIndex, bool value);
-void WidgetSetPressed(rct_window& w, WidgetIndex widgetIndex, bool value);
-void WidgetSetCheckboxValue(rct_window& w, WidgetIndex widgetIndex, bool value);
+void WidgetSetEnabled(WindowBase& w, WidgetIndex widgetIndex, bool enabled);
+void WidgetSetDisabled(WindowBase& w, WidgetIndex widgetIndex, bool value);
+void WidgetSetHoldable(WindowBase& w, WidgetIndex widgetIndex, bool value);
+void WidgetSetVisible(WindowBase& w, WidgetIndex widgetIndex, bool value);
+void WidgetSetPressed(WindowBase& w, WidgetIndex widgetIndex, bool value);
+void WidgetSetCheckboxValue(WindowBase& w, WidgetIndex widgetIndex, bool value);
diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index 3191bebc73..859837daba 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -39,11 +39,11 @@
 #include <iterator>
 #include <list>
 
-std::list<std::shared_ptr<rct_window>> g_window_list;
-rct_window* gWindowAudioExclusive;
+std::list<std::shared_ptr<WindowBase>> g_window_list;
+WindowBase* gWindowAudioExclusive;
 
-widget_identifier gCurrentTextBox = { { WindowClass::Null, 0 }, 0 };
-window_close_modifier gLastCloseModifier = { { WindowClass::Null, 0 }, CloseWindowModifier::None };
+WidgetIdentifier gCurrentTextBox = { { WindowClass::Null, 0 }, 0 };
+WindowCloseModifier gLastCloseModifier = { { WindowClass::Null, 0 }, CloseWindowModifier::None };
 char gTextBoxInput[TEXT_INPUT_SIZE] = { 0 };
 int32_t gTextBoxFrameNo = 0;
 bool gUsingWidgetTextBox = false;
@@ -84,17 +84,17 @@ namespace WindowCloseFlags
     static constexpr uint32_t CloseSingle = (1 << 1);
 } // namespace WindowCloseFlags
 
-static void WindowDrawCore(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
-static void WindowDrawSingle(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
+static void WindowDrawCore(DrawPixelInfo* dpi, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
+static void WindowDrawSingle(DrawPixelInfo* dpi, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
 
-std::list<std::shared_ptr<rct_window>>::iterator WindowGetIterator(const rct_window* w)
+std::list<std::shared_ptr<WindowBase>>::iterator WindowGetIterator(const WindowBase* w)
 {
-    return std::find_if(g_window_list.begin(), g_window_list.end(), [w](const std::shared_ptr<rct_window>& w2) -> bool {
+    return std::find_if(g_window_list.begin(), g_window_list.end(), [w](const std::shared_ptr<WindowBase>& w2) -> bool {
         return w == w2.get();
     });
 }
 
-void WindowVisitEach(std::function<void(rct_window*)> func)
+void WindowVisitEach(std::function<void(WindowBase*)> func)
 {
     auto windowList = g_window_list;
     for (auto& w : windowList)
@@ -110,12 +110,12 @@ void WindowVisitEach(std::function<void(rct_window*)> func)
 void WindowDispatchUpdateAll()
 {
     // gTooltipNotShownTicks++;
-    WindowVisitEach([&](rct_window* w) { WindowEventUpdateCall(w); });
+    WindowVisitEach([&](WindowBase* w) { WindowEventUpdateCall(w); });
 }
 
 void WindowUpdateAllViewports()
 {
-    WindowVisitEach([&](rct_window* w) {
+    WindowVisitEach([&](WindowBase* w) {
         if (w->viewport != nullptr && WindowIsVisible(*w))
         {
             ViewportUpdatePosition(w);
@@ -137,11 +137,11 @@ void WindowUpdateAll()
     {
         gWindowUpdateTicks = 0;
 
-        WindowVisitEach([](rct_window* w) { WindowEventPeriodicUpdateCall(w); });
+        WindowVisitEach([](WindowBase* w) { WindowEventPeriodicUpdateCall(w); });
     }
 
     // Border flash invalidation
-    WindowVisitEach([](rct_window* w) {
+    WindowVisitEach([](WindowBase* w) {
         if (w->flags & WF_WHITE_BORDER_MASK)
         {
             w->flags -= WF_WHITE_BORDER_ONE;
@@ -165,7 +165,7 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification)
     for (auto i = 0; i < diff; i++)
     {
         // iterates through the list until it finds the newest window, or a window that can be closed
-        rct_window* foundW{};
+        WindowBase* foundW{};
         for (auto& w : g_window_list)
         {
             if (!(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT | WF_NO_AUTO_CLOSE)))
@@ -206,14 +206,14 @@ void WindowSetWindowLimit(int32_t value)
  *
  * @param window The window to close (esi).
  */
-void WindowClose(rct_window& w)
+void WindowClose(WindowBase& w)
 {
     auto itWindow = WindowGetIterator(&w);
     if (itWindow == g_window_list.end())
         return;
 
     // Explicit copy of the shared ptr to keep the memory valid.
-    std::shared_ptr<rct_window> window = *itWindow;
+    std::shared_ptr<WindowBase> window = *itWindow;
 
     WindowEventCloseCall(window.get());
 
@@ -236,7 +236,7 @@ template<typename TPred> static void WindowCloseByCondition(TPred pred, uint32_t
     {
         listUpdated = false;
 
-        auto closeSingle = [&](std::shared_ptr<rct_window> window) -> bool {
+        auto closeSingle = [&](std::shared_ptr<WindowBase> window) -> bool {
             if (!pred(window.get()))
             {
                 return false;
@@ -287,7 +287,7 @@ template<typename TPred> static void WindowCloseByCondition(TPred pred, uint32_t
  */
 void WindowCloseByClass(WindowClass cls)
 {
-    WindowCloseByCondition([&](rct_window* w) -> bool { return w->classification == cls; });
+    WindowCloseByCondition([&](WindowBase* w) -> bool { return w->classification == cls; });
 }
 
 /**
@@ -298,7 +298,7 @@ void WindowCloseByClass(WindowClass cls)
  */
 void WindowCloseByNumber(WindowClass cls, rct_windownumber number)
 {
-    WindowCloseByCondition([cls, number](rct_window* w) -> bool { return w->classification == cls && w->number == number; });
+    WindowCloseByCondition([cls, number](WindowBase* w) -> bool { return w->classification == cls && w->number == number; });
 }
 
 // TODO: Refactor this to use variant once the new window class is done.
@@ -313,7 +313,7 @@ void WindowCloseByNumber(WindowClass cls, EntityId number)
  * @param cls (cl) with bit 15 set
  * @returns the window or NULL if no window was found.
  */
-rct_window* WindowFindByClass(WindowClass cls)
+WindowBase* WindowFindByClass(WindowClass cls)
 {
     for (auto& w : g_window_list)
     {
@@ -332,7 +332,7 @@ rct_window* WindowFindByClass(WindowClass cls)
  * @param number (dx)
  * @returns the window or NULL if no window was found.
  */
-rct_window* WindowFindByNumber(WindowClass cls, rct_windownumber number)
+WindowBase* WindowFindByNumber(WindowClass cls, rct_windownumber number)
 {
     for (auto& w : g_window_list)
     {
@@ -345,7 +345,7 @@ rct_window* WindowFindByNumber(WindowClass cls, rct_windownumber number)
 }
 
 // TODO: Use variant for this once the window framework is done.
-rct_window* WindowFindByNumber(WindowClass cls, EntityId id)
+WindowBase* WindowFindByNumber(WindowClass cls, EntityId id)
 {
     return WindowFindByNumber(cls, static_cast<rct_windownumber>(id.ToUnderlying()));
 }
@@ -365,7 +365,7 @@ void WindowCloseTop()
             return;
     }
 
-    auto pred = [](rct_window* w) -> bool { return !(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)); };
+    auto pred = [](WindowBase* w) -> bool { return !(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)); };
     WindowCloseByCondition(pred, WindowCloseFlags::CloseSingle | WindowCloseFlags::IterateReverse);
 }
 
@@ -377,14 +377,14 @@ void WindowCloseTop()
 void WindowCloseAll()
 {
     WindowCloseByClass(WindowClass::Dropdown);
-    WindowCloseByCondition([](rct_window* w) -> bool { return !(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)); });
+    WindowCloseByCondition([](WindowBase* w) -> bool { return !(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)); });
 }
 
 void WindowCloseAllExceptClass(WindowClass cls)
 {
     WindowCloseByClass(WindowClass::Dropdown);
 
-    WindowCloseByCondition([cls](rct_window* w) -> bool {
+    WindowCloseByCondition([cls](WindowBase* w) -> bool {
         return w->classification != cls && !(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT));
     });
 }
@@ -394,7 +394,7 @@ void WindowCloseAllExceptClass(WindowClass cls)
  */
 void WindowCloseAllExceptFlags(uint16_t flags)
 {
-    WindowCloseByCondition([flags](rct_window* w) -> bool { return !(w->flags & flags); });
+    WindowCloseByCondition([flags](WindowBase* w) -> bool { return !(w->flags & flags); });
 }
 
 /**
@@ -405,7 +405,7 @@ void WindowCloseAllExceptFlags(uint16_t flags)
 void WindowCloseAllExceptNumberAndClass(rct_windownumber number, WindowClass cls)
 {
     WindowCloseByClass(WindowClass::Dropdown);
-    WindowCloseByCondition([cls, number](rct_window* w) -> bool {
+    WindowCloseByCondition([cls, number](WindowBase* w) -> bool {
         return (!(w->number == number && w->classification == cls) && !(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)));
     });
 }
@@ -414,7 +414,7 @@ void WindowCloseAllExceptNumberAndClass(rct_windownumber number, WindowClass cls
  *
  *  rct2: 0x006EA845
  */
-rct_window* WindowFindFromPoint(const ScreenCoordsXY& screenCoords)
+WindowBase* WindowFindFromPoint(const ScreenCoordsXY& screenCoords)
 {
     for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++)
     {
@@ -444,7 +444,7 @@ rct_window* WindowFindFromPoint(const ScreenCoordsXY& screenCoords)
  * returns widget_index (edx)
  * EDI NEEDS TO BE SET TO w->widgets[widget_index] AFTER
  */
-WidgetIndex WindowFindWidgetFromPoint(rct_window& w, const ScreenCoordsXY& screenCoords)
+WidgetIndex WindowFindWidgetFromPoint(WindowBase& w, const ScreenCoordsXY& screenCoords)
 {
     // Invalidate the window
     WindowEventInvalidateCall(&w);
@@ -489,7 +489,7 @@ WidgetIndex WindowFindWidgetFromPoint(rct_window& w, const ScreenCoordsXY& scree
  */
 template<typename TPred> static void WindowInvalidateByCondition(TPred pred)
 {
-    WindowVisitEach([pred](rct_window* w) {
+    WindowVisitEach([pred](WindowBase* w) {
         if (pred(w))
         {
             w->Invalidate();
@@ -504,7 +504,7 @@ template<typename TPred> static void WindowInvalidateByCondition(TPred pred)
  */
 void WindowInvalidateByClass(WindowClass cls)
 {
-    WindowInvalidateByCondition([cls](rct_window* w) -> bool { return w->classification == cls; });
+    WindowInvalidateByCondition([cls](WindowBase* w) -> bool { return w->classification == cls; });
 }
 
 /**
@@ -514,7 +514,7 @@ void WindowInvalidateByClass(WindowClass cls)
 void WindowInvalidateByNumber(WindowClass cls, rct_windownumber number)
 {
     WindowInvalidateByCondition(
-        [cls, number](rct_window* w) -> bool { return w->classification == cls && w->number == number; });
+        [cls, number](WindowBase* w) -> bool { return w->classification == cls && w->number == number; });
 }
 
 // TODO: Use variant for this once the window framework is done.
@@ -528,14 +528,14 @@ void WindowInvalidateByNumber(WindowClass cls, EntityId id)
  */
 void WindowInvalidateAll()
 {
-    WindowVisitEach([](rct_window* w) { w->Invalidate(); });
+    WindowVisitEach([](WindowBase* w) { w->Invalidate(); });
 }
 
 /**
  * Invalidates the specified widget of a window.
  *  rct2: 0x006EC402
  */
-void WidgetInvalidate(rct_window& w, WidgetIndex widgetIndex)
+void WidgetInvalidate(WindowBase& w, WidgetIndex widgetIndex)
 {
 #ifdef DEBUG
     for (int32_t i = 0; i <= widgetIndex; i++)
@@ -554,7 +554,7 @@ void WidgetInvalidate(rct_window& w, WidgetIndex widgetIndex)
 
 template<typename TPred> static void widget_invalidate_by_condition(TPred pred)
 {
-    WindowVisitEach([pred](rct_window* w) {
+    WindowVisitEach([pred](WindowBase* w) {
         if (pred(w))
         {
             w->Invalidate();
@@ -567,7 +567,7 @@ template<typename TPred> static void widget_invalidate_by_condition(TPred pred)
  */
 void WidgetInvalidateByClass(WindowClass cls, WidgetIndex widgetIndex)
 {
-    WindowVisitEach([cls, widgetIndex](rct_window* w) {
+    WindowVisitEach([cls, widgetIndex](WindowBase* w) {
         if (w->classification == cls)
         {
             WidgetInvalidate(*w, widgetIndex);
@@ -581,7 +581,7 @@ void WidgetInvalidateByClass(WindowClass cls, WidgetIndex widgetIndex)
  */
 void WidgetInvalidateByNumber(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex)
 {
-    WindowVisitEach([cls, number, widgetIndex](rct_window* w) {
+    WindowVisitEach([cls, number, widgetIndex](WindowBase* w) {
         if (w->classification == cls && w->number == number)
         {
             WidgetInvalidate(*w, widgetIndex);
@@ -595,7 +595,7 @@ void WidgetInvalidateByNumber(WindowClass cls, rct_windownumber number, WidgetIn
  *
  * @param w The window (esi).
  */
-void WindowUpdateScrollWidgets(rct_window& w)
+void WindowUpdateScrollWidgets(WindowBase& w)
 {
     int32_t scrollIndex, width, height, scrollPositionChanged;
     WidgetIndex widgetIndex;
@@ -645,7 +645,7 @@ void WindowUpdateScrollWidgets(rct_window& w)
     }
 }
 
-int32_t WindowGetScrollDataIndex(const rct_window& w, WidgetIndex widget_index)
+int32_t WindowGetScrollDataIndex(const WindowBase& w, WidgetIndex widget_index)
 {
     int32_t i, result;
 
@@ -663,7 +663,7 @@ int32_t WindowGetScrollDataIndex(const rct_window& w, WidgetIndex widget_index)
  *
  *  rct2: 0x006ECDA4
  */
-rct_window* WindowBringToFront(rct_window& w)
+WindowBase* WindowBringToFront(WindowBase& w)
 {
     if (!(w.flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)))
     {
@@ -698,9 +698,9 @@ rct_window* WindowBringToFront(rct_window& w)
     return &w;
 }
 
-rct_window* WindowBringToFrontByClassWithFlags(WindowClass cls, uint16_t flags)
+WindowBase* WindowBringToFrontByClassWithFlags(WindowClass cls, uint16_t flags)
 {
-    rct_window* w = WindowFindByClass(cls);
+    WindowBase* w = WindowFindByClass(cls);
     if (w != nullptr)
     {
         w->flags |= flags;
@@ -711,7 +711,7 @@ rct_window* WindowBringToFrontByClassWithFlags(WindowClass cls, uint16_t flags)
     return w;
 }
 
-rct_window* WindowBringToFrontByClass(WindowClass cls)
+WindowBase* WindowBringToFrontByClass(WindowClass cls)
 {
     return WindowBringToFrontByClassWithFlags(cls, WF_WHITE_BORDER_MASK);
 }
@@ -722,9 +722,9 @@ rct_window* WindowBringToFrontByClass(WindowClass cls)
  * cls (cl)
  * number (dx)
  */
-rct_window* WindowBringToFrontByNumber(WindowClass cls, rct_windownumber number)
+WindowBase* WindowBringToFrontByNumber(WindowClass cls, rct_windownumber number)
 {
-    rct_window* w;
+    WindowBase* w;
 
     w = WindowFindByNumber(cls, number);
     if (w != nullptr)
@@ -741,9 +741,9 @@ rct_window* WindowBringToFrontByNumber(WindowClass cls, rct_windownumber number)
  *
  *  rct2: 0x006EE65A
  */
-void WindowPushOthersRight(rct_window& window)
+void WindowPushOthersRight(WindowBase& window)
 {
-    WindowVisitEach([&window](rct_window* w) {
+    WindowVisitEach([&window](WindowBase* w) {
         if (w == &window)
             return;
         if (w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT))
@@ -772,10 +772,10 @@ void WindowPushOthersRight(rct_window& window)
  *
  *  rct2: 0x006EE6EA
  */
-void WindowPushOthersBelow(rct_window& w1)
+void WindowPushOthersBelow(WindowBase& w1)
 {
     // Enumerate through all other windows
-    WindowVisitEach([&w1](rct_window* w2) {
+    WindowVisitEach([&w1](WindowBase* w2) {
         if (&w1 == w2)
             return;
         // ?
@@ -810,7 +810,7 @@ void WindowPushOthersBelow(rct_window& w1)
  *
  *  rct2: 0x006EE2E4
  */
-rct_window* WindowGetMain()
+WindowBase* WindowGetMain()
 {
     for (auto& w : g_window_list)
     {
@@ -830,7 +830,7 @@ rct_window* WindowGetMain()
  * @param y (ecx)
  * @param z (edx)
  */
-void WindowScrollToLocation(rct_window& w, const CoordsXYZ& coords)
+void WindowScrollToLocation(WindowBase& w, const CoordsXYZ& coords)
 {
     WindowUnfollowSprite(w);
     if (w.viewport != nullptr)
@@ -912,7 +912,7 @@ void WindowScrollToLocation(rct_window& w, const CoordsXYZ& coords)
  */
 static void call_event_viewport_rotate_on_all_windows()
 {
-    WindowVisitEach([](rct_window* w) { WindowEventViewportRotateCall(w); });
+    WindowVisitEach([](WindowBase* w) { WindowEventViewportRotateCall(w); });
 }
 
 /**
@@ -922,16 +922,16 @@ static void call_event_viewport_rotate_on_all_windows()
  *      1: clockwise
  *      -1: anti-clockwise
  */
-void WindowRotateCamera(rct_window& w, int32_t direction)
+void WindowRotateCamera(WindowBase& w, int32_t direction)
 {
-    rct_viewport* viewport = w.viewport;
+    Viewport* viewport = w.viewport;
     if (viewport == nullptr)
         return;
 
     auto windowPos = ScreenCoordsXY{ (viewport->width >> 1), (viewport->height >> 1) } + viewport->pos;
 
     // has something to do with checking if middle of the viewport is obstructed
-    rct_viewport* other;
+    Viewport* other;
     auto mapXYCoords = ScreenGetMapXY(windowPos, &other);
     CoordsXYZ coords{};
 
@@ -967,7 +967,7 @@ void WindowRotateCamera(rct_window& w, int32_t direction)
 }
 
 void WindowViewportGetMapCoordsByCursor(
-    const rct_window& w, int32_t* map_x, int32_t* map_y, int32_t* offset_x, int32_t* offset_y)
+    const WindowBase& w, int32_t* map_x, int32_t* map_y, int32_t* offset_x, int32_t* offset_y)
 {
     // Get mouse position to offset against.
     auto mouseCoords = ContextGetCursorPositionScaled();
@@ -998,7 +998,7 @@ void WindowViewportGetMapCoordsByCursor(
     *offset_y = w.viewport->zoom.ApplyTo(w.savedViewPos.y - (centreLoc->y + rebased_y));
 }
 
-void WindowViewportCentreTileAroundCursor(rct_window& w, int32_t map_x, int32_t map_y, int32_t offset_x, int32_t offset_y)
+void WindowViewportCentreTileAroundCursor(WindowBase& w, int32_t map_x, int32_t map_y, int32_t offset_x, int32_t offset_y)
 {
     // Get viewport coordinates centring around the tile.
     int32_t z = TileElementHeight({ map_x, map_y });
@@ -1027,7 +1027,7 @@ void WindowViewportCentreTileAroundCursor(rct_window& w, int32_t map_x, int32_t
  */
 void WindowCheckAllValidZoom()
 {
-    WindowVisitEach([](rct_window* w) {
+    WindowVisitEach([](WindowBase* w) {
         if (w->viewport != nullptr && w->viewport->zoom < ZoomLevel::min())
         {
             WindowZoomSet(*w, ZoomLevel::min(), false);
@@ -1035,9 +1035,9 @@ void WindowCheckAllValidZoom()
     });
 }
 
-void WindowZoomSet(rct_window& w, ZoomLevel zoomLevel, bool atCursor)
+void WindowZoomSet(WindowBase& w, ZoomLevel zoomLevel, bool atCursor)
 {
-    rct_viewport* v = w.viewport;
+    Viewport* v = w.viewport;
     if (v == nullptr)
         return;
 
@@ -1091,7 +1091,7 @@ void WindowZoomSet(rct_window& w, ZoomLevel zoomLevel, bool atCursor)
  *
  *  rct2: 0x006887A6
  */
-void WindowZoomIn(rct_window& w, bool atCursor)
+void WindowZoomIn(WindowBase& w, bool atCursor)
 {
     WindowZoomSet(w, w.viewport->zoom - 1, atCursor);
 }
@@ -1100,7 +1100,7 @@ void WindowZoomIn(rct_window& w, bool atCursor)
  *
  *  rct2: 0x006887E0
  */
-void WindowZoomOut(rct_window& w, bool atCursor)
+void WindowZoomOut(WindowBase& w, bool atCursor)
 {
     WindowZoomSet(w, w.viewport->zoom + 1, atCursor);
 }
@@ -1130,7 +1130,7 @@ void MainWindowZoom(bool zoomIn, bool atCursor)
  * Splits a drawing of a window into regions that can be seen and are not hidden
  * by other opaque overlapping windows.
  */
-void WindowDraw(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, int32_t right, int32_t bottom)
+void WindowDraw(DrawPixelInfo* dpi, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom)
 {
     if (!WindowIsVisible(w))
         return;
@@ -1185,7 +1185,7 @@ void WindowDraw(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, in
 /**
  * Draws the given window and any other overlapping transparent windows.
  */
-static void WindowDrawCore(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, int32_t right, int32_t bottom)
+static void WindowDrawCore(DrawPixelInfo* dpi, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom)
 {
     // Clamp region
     left = std::max<int32_t>(left, w.windowPos.x);
@@ -1208,7 +1208,7 @@ static void WindowDrawCore(DrawPixelInfo* dpi, rct_window& w, int32_t left, int3
     }
 }
 
-static void WindowDrawSingle(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, int32_t right, int32_t bottom)
+static void WindowDrawSingle(DrawPixelInfo* dpi, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom)
 {
     // Copy dpi so we can crop it
     DrawPixelInfo copy = *dpi;
@@ -1276,17 +1276,17 @@ static void WindowDrawSingle(DrawPixelInfo* dpi, rct_window& w, int32_t left, in
  * @param dpi (edi)
  * @param w (esi)
  */
-void WindowDrawViewport(DrawPixelInfo* dpi, rct_window& w)
+void WindowDrawViewport(DrawPixelInfo* dpi, WindowBase& w)
 {
     ViewportRender(dpi, w.viewport, { { dpi->x, dpi->y }, { dpi->x + dpi->width, dpi->y + dpi->height } });
 }
 
-void WindowSetPosition(rct_window& w, const ScreenCoordsXY& screenCoords)
+void WindowSetPosition(WindowBase& w, const ScreenCoordsXY& screenCoords)
 {
     WindowMovePosition(w, screenCoords - w.windowPos);
 }
 
-void WindowMovePosition(rct_window& w, const ScreenCoordsXY& deltaCoords)
+void WindowMovePosition(WindowBase& w, const ScreenCoordsXY& deltaCoords)
 {
     if (deltaCoords.x == 0 && deltaCoords.y == 0)
         return;
@@ -1305,7 +1305,7 @@ void WindowMovePosition(rct_window& w, const ScreenCoordsXY& deltaCoords)
     w.Invalidate();
 }
 
-void WindowResize(rct_window& w, int32_t dw, int32_t dh)
+void WindowResize(WindowBase& w, int32_t dw, int32_t dh)
 {
     if (dw == 0 && dh == 0)
         return;
@@ -1332,7 +1332,7 @@ void WindowResize(rct_window& w, int32_t dw, int32_t dh)
     w.Invalidate();
 }
 
-void WindowSetResize(rct_window& w, int32_t minWidth, int32_t minHeight, int32_t maxWidth, int32_t maxHeight)
+void WindowSetResize(WindowBase& w, int32_t minWidth, int32_t minHeight, int32_t maxWidth, int32_t maxHeight)
 {
     w.min_width = minWidth;
     w.min_height = minHeight;
@@ -1361,7 +1361,7 @@ void WindowSetResize(rct_window& w, int32_t minWidth, int32_t minHeight, int32_t
  * @param widgetIndex (dx)
  * @param w (esi)
  */
-bool ToolSet(const rct_window& w, WidgetIndex widgetIndex, Tool tool)
+bool ToolSet(const WindowBase& w, WidgetIndex widgetIndex, Tool tool)
 {
     if (InputTestFlag(INPUT_FLAG_TOOL_ACTIVE))
     {
@@ -1408,14 +1408,14 @@ void ToolCancel()
                 gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number, gCurrentToolWidget.widget_index);
 
             // Abort tool event
-            rct_window* w = WindowFindByNumber(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number);
+            WindowBase* w = WindowFindByNumber(gCurrentToolWidget.window_classification, gCurrentToolWidget.window_number);
             if (w != nullptr)
                 WindowEventToolAbortCall(w, gCurrentToolWidget.widget_index);
         }
     }
 }
 
-void WindowEventCloseCall(rct_window* w)
+void WindowEventCloseCall(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
         w->OnClose();
@@ -1423,7 +1423,7 @@ void WindowEventCloseCall(rct_window* w)
         w->event_handlers->close(w);
 }
 
-void WindowEventMouseUpCall(rct_window* w, WidgetIndex widgetIndex)
+void WindowEventMouseUpCall(WindowBase* w, WidgetIndex widgetIndex)
 {
     if (w->event_handlers == nullptr)
         w->OnMouseUp(widgetIndex);
@@ -1431,7 +1431,7 @@ void WindowEventMouseUpCall(rct_window* w, WidgetIndex widgetIndex)
         w->event_handlers->mouse_up(w, widgetIndex);
 }
 
-void WindowEventResizeCall(rct_window* w)
+void WindowEventResizeCall(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
         w->OnResize();
@@ -1439,7 +1439,7 @@ void WindowEventResizeCall(rct_window* w)
         w->event_handlers->resize(w);
 }
 
-void WindowEventMouseDownCall(rct_window* w, WidgetIndex widgetIndex)
+void WindowEventMouseDownCall(WindowBase* w, WidgetIndex widgetIndex)
 {
     if (w->event_handlers == nullptr)
         w->OnMouseDown(widgetIndex);
@@ -1447,7 +1447,7 @@ void WindowEventMouseDownCall(rct_window* w, WidgetIndex widgetIndex)
         w->event_handlers->mouse_down(w, widgetIndex, &w->widgets[widgetIndex]);
 }
 
-void WindowEventDropdownCall(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
+void WindowEventDropdownCall(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex)
 {
     if (w->event_handlers == nullptr)
     {
@@ -1462,7 +1462,7 @@ void WindowEventDropdownCall(rct_window* w, WidgetIndex widgetIndex, int32_t dro
     }
 }
 
-void WindowEventUnknown05Call(rct_window* w)
+void WindowEventUnknown05Call(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
     {
@@ -1474,7 +1474,7 @@ void WindowEventUnknown05Call(rct_window* w)
     }
 }
 
-void WindowEventUpdateCall(rct_window* w)
+void WindowEventUpdateCall(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
         w->OnUpdate();
@@ -1482,7 +1482,7 @@ void WindowEventUpdateCall(rct_window* w)
         w->event_handlers->update(w);
 }
 
-void WindowEventPeriodicUpdateCall(rct_window* w)
+void WindowEventPeriodicUpdateCall(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
         w->OnPeriodicUpdate();
@@ -1490,7 +1490,7 @@ void WindowEventPeriodicUpdateCall(rct_window* w)
         w->event_handlers->periodic_update(w);
 }
 
-void WindowEventToolUpdateCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventToolUpdateCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnToolUpdate(widgetIndex, screenCoords);
@@ -1498,7 +1498,7 @@ void WindowEventToolUpdateCall(rct_window* w, WidgetIndex widgetIndex, const Scr
         w->event_handlers->tool_update(w, widgetIndex, screenCoords);
 }
 
-void WindowEventToolDownCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventToolDownCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnToolDown(widgetIndex, screenCoords);
@@ -1506,7 +1506,7 @@ void WindowEventToolDownCall(rct_window* w, WidgetIndex widgetIndex, const Scree
         w->event_handlers->tool_down(w, widgetIndex, screenCoords);
 }
 
-void WindowEventToolDragCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventToolDragCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnToolDrag(widgetIndex, screenCoords);
@@ -1514,7 +1514,7 @@ void WindowEventToolDragCall(rct_window* w, WidgetIndex widgetIndex, const Scree
         w->event_handlers->tool_drag(w, widgetIndex, screenCoords);
 }
 
-void WindowEventToolUpCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventToolUpCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnToolUp(widgetIndex, screenCoords);
@@ -1522,7 +1522,7 @@ void WindowEventToolUpCall(rct_window* w, WidgetIndex widgetIndex, const ScreenC
         w->event_handlers->tool_up(w, widgetIndex, screenCoords);
 }
 
-void WindowEventToolAbortCall(rct_window* w, WidgetIndex widgetIndex)
+void WindowEventToolAbortCall(WindowBase* w, WidgetIndex widgetIndex)
 {
     if (w->event_handlers == nullptr)
         w->OnToolAbort(widgetIndex);
@@ -1530,7 +1530,7 @@ void WindowEventToolAbortCall(rct_window* w, WidgetIndex widgetIndex)
         w->event_handlers->tool_abort(w, widgetIndex);
 }
 
-void WindowGetScrollSize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
+void WindowGetScrollSize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height)
 {
     if (w->event_handlers == nullptr)
     {
@@ -1546,7 +1546,7 @@ void WindowGetScrollSize(rct_window* w, int32_t scrollIndex, int32_t* width, int
     }
 }
 
-void WindowEventScrollMousedownCall(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventScrollMousedownCall(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnScrollMouseDown(scrollIndex, screenCoords);
@@ -1554,7 +1554,7 @@ void WindowEventScrollMousedownCall(rct_window* w, int32_t scrollIndex, const Sc
         w->event_handlers->scroll_mousedown(w, scrollIndex, screenCoords);
 }
 
-void WindowEventScrollMousedragCall(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventScrollMousedragCall(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnScrollMouseDrag(scrollIndex, screenCoords);
@@ -1562,7 +1562,7 @@ void WindowEventScrollMousedragCall(rct_window* w, int32_t scrollIndex, const Sc
         w->event_handlers->scroll_mousedrag(w, scrollIndex, screenCoords);
 }
 
-void WindowEventScrollMouseoverCall(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
+void WindowEventScrollMouseoverCall(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
         w->OnScrollMouseOver(scrollIndex, screenCoords);
@@ -1570,7 +1570,7 @@ void WindowEventScrollMouseoverCall(rct_window* w, int32_t scrollIndex, const Sc
         w->event_handlers->scroll_mouseover(w, scrollIndex, screenCoords);
 }
 
-void WindowEventTextinputCall(rct_window* w, WidgetIndex widgetIndex, char* text)
+void WindowEventTextinputCall(WindowBase* w, WidgetIndex widgetIndex, char* text)
 {
     if (w->event_handlers == nullptr)
     {
@@ -1585,7 +1585,7 @@ void WindowEventTextinputCall(rct_window* w, WidgetIndex widgetIndex, char* text
     }
 }
 
-void WindowEventViewportRotateCall(rct_window* w)
+void WindowEventViewportRotateCall(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
         w->OnViewportRotate();
@@ -1594,7 +1594,7 @@ void WindowEventViewportRotateCall(rct_window* w)
             w->event_handlers->viewport_rotate(w);
 }
 
-void WindowEventScrollSelectCall(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType)
+void WindowEventScrollSelectCall(WindowBase* w, int32_t scrollIndex, int32_t scrollAreaType)
 {
     if (w->event_handlers == nullptr)
         w->OnScrollSelect(scrollIndex, scrollAreaType);
@@ -1602,7 +1602,7 @@ void WindowEventScrollSelectCall(rct_window* w, int32_t scrollIndex, int32_t scr
         w->event_handlers->scroll_select(w, scrollIndex, scrollAreaType);
 }
 
-OpenRCT2String WindowEventTooltipCall(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback)
+OpenRCT2String WindowEventTooltipCall(WindowBase* w, const WidgetIndex widgetIndex, const StringId fallback)
 {
     if (w->event_handlers == nullptr)
     {
@@ -1617,7 +1617,7 @@ OpenRCT2String WindowEventTooltipCall(rct_window* w, const WidgetIndex widgetInd
     return { fallback, {} };
 }
 
-CursorID WindowEventCursorCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
+CursorID WindowEventCursorCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
 {
     CursorID cursorId = CursorID::Arrow;
     if (w->event_handlers == nullptr)
@@ -1629,7 +1629,7 @@ CursorID WindowEventCursorCall(rct_window* w, WidgetIndex widgetIndex, const Scr
     return cursorId;
 }
 
-void WindowEventMovedCall(rct_window* w, const ScreenCoordsXY& screenCoords)
+void WindowEventMovedCall(WindowBase* w, const ScreenCoordsXY& screenCoords)
 {
     if (w->event_handlers == nullptr)
     {
@@ -1639,7 +1639,7 @@ void WindowEventMovedCall(rct_window* w, const ScreenCoordsXY& screenCoords)
         w->event_handlers->moved(w, screenCoords);
 }
 
-void WindowEventInvalidateCall(rct_window* w)
+void WindowEventInvalidateCall(WindowBase* w)
 {
     if (w->event_handlers == nullptr)
         w->OnPrepareDraw();
@@ -1647,7 +1647,7 @@ void WindowEventInvalidateCall(rct_window* w)
         w->event_handlers->invalidate(w);
 }
 
-void WindowEventPaintCall(rct_window* w, DrawPixelInfo* dpi)
+void WindowEventPaintCall(WindowBase* w, DrawPixelInfo* dpi)
 {
     if (w->event_handlers == nullptr)
         w->OnDraw(*dpi);
@@ -1655,7 +1655,7 @@ void WindowEventPaintCall(rct_window* w, DrawPixelInfo* dpi)
         w->event_handlers->paint(w, dpi);
 }
 
-void WindowEventScrollPaintCall(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex)
+void WindowEventScrollPaintCall(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex)
 {
     if (w->event_handlers == nullptr)
         w->OnScrollDraw(scrollIndex, *dpi);
@@ -1672,7 +1672,7 @@ void WindowEventScrollPaintCall(rct_window* w, DrawPixelInfo* dpi, int32_t scrol
 void WindowRelocateWindows(int32_t width, int32_t height)
 {
     int32_t new_location = 8;
-    WindowVisitEach([width, height, &new_location](rct_window* w) {
+    WindowVisitEach([width, height, &new_location](WindowBase* w) {
         // Work out if the window requires moving
         if (w->windowPos.x + 10 < width)
         {
@@ -1713,21 +1713,21 @@ void WindowResizeGui(int32_t width, int32_t height)
     if (gScreenFlags & SCREEN_FLAGS_EDITOR)
         return;
 
-    rct_window* titleWind = WindowFindByClass(WindowClass::TitleMenu);
+    WindowBase* titleWind = WindowFindByClass(WindowClass::TitleMenu);
     if (titleWind != nullptr)
     {
         titleWind->windowPos.x = (width - titleWind->width) / 2;
         titleWind->windowPos.y = height - 182;
     }
 
-    rct_window* exitWind = WindowFindByClass(WindowClass::TitleExit);
+    WindowBase* exitWind = WindowFindByClass(WindowClass::TitleExit);
     if (exitWind != nullptr)
     {
         exitWind->windowPos.x = width - 40;
         exitWind->windowPos.y = height - 64;
     }
 
-    rct_window* optionsWind = WindowFindByClass(WindowClass::TitleOptions);
+    WindowBase* optionsWind = WindowFindByClass(WindowClass::TitleOptions);
     if (optionsWind != nullptr)
     {
         optionsWind->windowPos.x = width - 80;
@@ -1744,7 +1744,7 @@ void WindowResizeGuiScenarioEditor(int32_t width, int32_t height)
     auto* mainWind = WindowGetMain();
     if (mainWind != nullptr)
     {
-        rct_viewport* viewport = mainWind->viewport;
+        Viewport* viewport = mainWind->viewport;
         mainWind->width = width;
         mainWind->height = height;
         viewport->width = width;
@@ -1758,13 +1758,13 @@ void WindowResizeGuiScenarioEditor(int32_t width, int32_t height)
         }
     }
 
-    rct_window* topWind = WindowFindByClass(WindowClass::TopToolbar);
+    WindowBase* topWind = WindowFindByClass(WindowClass::TopToolbar);
     if (topWind != nullptr)
     {
         topWind->width = std::max(640, width);
     }
 
-    rct_window* bottomWind = WindowFindByClass(WindowClass::BottomToolbar);
+    WindowBase* bottomWind = WindowFindByClass(WindowClass::BottomToolbar);
     if (bottomWind != nullptr)
     {
         bottomWind->windowPos.y = height - 32;
@@ -1813,7 +1813,7 @@ void WindowUpdateViewportRideMusic()
     }
 }
 
-static void window_snap_left(rct_window& w, int32_t proximity)
+static void window_snap_left(WindowBase& w, int32_t proximity)
 {
     const auto* mainWindow = WindowGetMain();
     auto wBottom = w.windowPos.y + w.height;
@@ -1821,7 +1821,7 @@ static void window_snap_left(rct_window& w, int32_t proximity)
     auto wRightProximity = w.windowPos.x + (proximity * 2);
     auto rightMost = INT32_MIN;
 
-    WindowVisitEach([&](rct_window* w2) {
+    WindowVisitEach([&](WindowBase* w2) {
         if (w2 == &w || w2 == mainWindow)
             return;
 
@@ -1843,7 +1843,7 @@ static void window_snap_left(rct_window& w, int32_t proximity)
         w.windowPos.x = rightMost;
 }
 
-static void window_snap_top(rct_window& w, int32_t proximity)
+static void window_snap_top(WindowBase& w, int32_t proximity)
 {
     const auto* mainWindow = WindowGetMain();
     auto wRight = w.windowPos.x + w.width;
@@ -1851,7 +1851,7 @@ static void window_snap_top(rct_window& w, int32_t proximity)
     auto wBottomProximity = w.windowPos.y + (proximity * 2);
     auto bottomMost = INT32_MIN;
 
-    WindowVisitEach([&](rct_window* w2) {
+    WindowVisitEach([&](WindowBase* w2) {
         if (w2 == &w || w2 == mainWindow)
             return;
 
@@ -1873,7 +1873,7 @@ static void window_snap_top(rct_window& w, int32_t proximity)
         w.windowPos.y = bottomMost;
 }
 
-static void window_snap_right(rct_window& w, int32_t proximity)
+static void window_snap_right(WindowBase& w, int32_t proximity)
 {
     const auto* mainWindow = WindowGetMain();
     auto wRight = w.windowPos.x + w.width;
@@ -1882,7 +1882,7 @@ static void window_snap_right(rct_window& w, int32_t proximity)
     auto wRightProximity = wRight + (proximity * 2);
     auto leftMost = INT32_MAX;
 
-    WindowVisitEach([&](rct_window* w2) {
+    WindowVisitEach([&](WindowBase* w2) {
         if (w2 == &w || w2 == mainWindow)
             return;
 
@@ -1903,7 +1903,7 @@ static void window_snap_right(rct_window& w, int32_t proximity)
         w.windowPos.x = leftMost - w.width;
 }
 
-static void window_snap_bottom(rct_window& w, int32_t proximity)
+static void window_snap_bottom(WindowBase& w, int32_t proximity)
 {
     const auto* mainWindow = WindowGetMain();
     auto wRight = w.windowPos.x + w.width;
@@ -1912,7 +1912,7 @@ static void window_snap_bottom(rct_window& w, int32_t proximity)
     auto wBottomProximity = wBottom + (proximity * 2);
     auto topMost = INT32_MAX;
 
-    WindowVisitEach([&](rct_window* w2) {
+    WindowVisitEach([&](WindowBase* w2) {
         if (w2 == &w || w2 == mainWindow)
             return;
 
@@ -1933,7 +1933,7 @@ static void window_snap_bottom(rct_window& w, int32_t proximity)
         w.windowPos.y = topMost - w.height;
 }
 
-void WindowMoveAndSnap(rct_window& w, ScreenCoordsXY newWindowCoords, int32_t snapProximity)
+void WindowMoveAndSnap(WindowBase& w, ScreenCoordsXY newWindowCoords, int32_t snapProximity)
 {
     auto originalPos = w.windowPos;
     int32_t minY = (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) ? 1 : TOP_TOOLBAR_HEIGHT + 2;
@@ -1959,7 +1959,7 @@ void WindowMoveAndSnap(rct_window& w, ScreenCoordsXY newWindowCoords, int32_t sn
     WindowSetPosition(w, newWindowCoords);
 }
 
-int32_t WindowCanResize(const rct_window& w)
+int32_t WindowCanResize(const WindowBase& w)
 {
     return (w.flags & WF_RESIZABLE) && (w.min_width != w.max_width || w.min_height != w.max_height);
 }
@@ -1974,7 +1974,7 @@ void TextinputCancel()
 }
 
 void WindowStartTextbox(
-    rct_window& call_w, WidgetIndex call_widget, StringId existing_text, char* existing_args, int32_t maxLength)
+    WindowBase& call_w, WidgetIndex call_widget, StringId existing_text, char* existing_args, int32_t maxLength)
 {
     if (gUsingWidgetTextBox)
         WindowCancelTextbox();
@@ -2006,7 +2006,7 @@ void WindowCancelTextbox()
 {
     if (gUsingWidgetTextBox)
     {
-        rct_window* w = WindowFindByNumber(gCurrentTextBox.window.classification, gCurrentTextBox.window.number);
+        WindowBase* w = WindowFindByNumber(gCurrentTextBox.window.classification, gCurrentTextBox.window.number);
         if (w != nullptr)
         {
             WindowEventTextinputCall(w, gCurrentTextBox.widget_index, nullptr);
@@ -2035,13 +2035,13 @@ void WindowUpdateTextbox()
     if (gUsingWidgetTextBox)
     {
         gTextBoxFrameNo = 0;
-        rct_window* w = WindowFindByNumber(gCurrentTextBox.window.classification, gCurrentTextBox.window.number);
+        WindowBase* w = WindowFindByNumber(gCurrentTextBox.window.classification, gCurrentTextBox.window.number);
         WidgetInvalidate(*w, gCurrentTextBox.widget_index);
         WindowEventTextinputCall(w, gCurrentTextBox.widget_index, gTextBoxInput);
     }
 }
 
-bool WindowIsVisible(rct_window& w)
+bool WindowIsVisible(WindowBase& w)
 {
     // w->visibility is used to prevent repeat calculations within an iteration by caching the result
 
@@ -2092,7 +2092,7 @@ bool WindowIsVisible(rct_window& w)
 void WindowDrawAll(DrawPixelInfo* dpi, int32_t left, int32_t top, int32_t right, int32_t bottom)
 {
     auto windowDPI = dpi->Crop({ left, top }, { right - left, bottom - top });
-    WindowVisitEach([&windowDPI, left, top, right, bottom](rct_window* w) {
+    WindowVisitEach([&windowDPI, left, top, right, bottom](WindowBase* w) {
         if (w->flags & WF_TRANSPARENT)
             return;
         if (right <= w->windowPos.x || bottom <= w->windowPos.y)
@@ -2103,7 +2103,7 @@ void WindowDrawAll(DrawPixelInfo* dpi, int32_t left, int32_t top, int32_t right,
     });
 }
 
-rct_viewport* WindowGetPreviousViewport(rct_viewport* current)
+Viewport* WindowGetPreviousViewport(Viewport* current)
 {
     bool foundPrevious = (current == nullptr);
     for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++)
@@ -2127,7 +2127,7 @@ rct_viewport* WindowGetPreviousViewport(rct_viewport* current)
 void WindowResetVisibilities()
 {
     // reset window visibility status to unknown
-    WindowVisitEach([](rct_window* w) {
+    WindowVisitEach([](WindowBase* w) {
         w->visibility = VisibilityCache::Unknown;
         if (w->viewport != nullptr)
         {
@@ -2141,7 +2141,7 @@ void WindowInitAll()
     WindowCloseAllExceptFlags(0);
 }
 
-void WindowFollowSprite(rct_window& w, EntityId spriteIndex)
+void WindowFollowSprite(WindowBase& w, EntityId spriteIndex)
 {
     if (spriteIndex.ToUnderlying() < MAX_ENTITIES || spriteIndex.IsNull())
     {
@@ -2149,13 +2149,13 @@ void WindowFollowSprite(rct_window& w, EntityId spriteIndex)
     }
 }
 
-void WindowUnfollowSprite(rct_window& w)
+void WindowUnfollowSprite(WindowBase& w)
 {
     w.viewport_smart_follow_sprite = EntityId::GetNull();
     w.viewport_target_sprite = EntityId::GetNull();
 }
 
-rct_viewport* WindowGetViewport(rct_window* w)
+Viewport* WindowGetViewport(WindowBase* w)
 {
     if (w == nullptr)
     {
@@ -2165,7 +2165,7 @@ rct_viewport* WindowGetViewport(rct_window* w)
     return w->viewport;
 }
 
-rct_window* WindowGetListening()
+WindowBase* WindowGetListening()
 {
     for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++)
     {
@@ -2182,7 +2182,7 @@ rct_window* WindowGetListening()
     return nullptr;
 }
 
-WindowClass WindowGetClassification(const rct_window& window)
+WindowClass WindowGetClassification(const WindowBase& window)
 {
     return window.classification;
 }
@@ -2191,7 +2191,7 @@ WindowClass WindowGetClassification(const rct_window& window)
  *
  *  rct2: 0x006EAF26
  */
-void WidgetScrollUpdateThumbs(rct_window& w, WidgetIndex widget_index)
+void WidgetScrollUpdateThumbs(WindowBase& w, WidgetIndex widget_index)
 {
     const auto& widget = w.widgets[widget_index];
     auto& scroll = w.scrolls[WindowGetScrollDataIndex(w, widget_index)];
@@ -2255,7 +2255,7 @@ void WidgetScrollUpdateThumbs(rct_window& w, WidgetIndex widget_index)
     }
 }
 
-void rct_window::ResizeFrame()
+void WindowBase::ResizeFrame()
 {
     // Frame
     widgets[0].right = width - 1;
@@ -2267,7 +2267,7 @@ void rct_window::ResizeFrame()
     widgets[2].right = width - 3;
 }
 
-void rct_window::ResizeFrameWithPage()
+void WindowBase::ResizeFrameWithPage()
 {
     ResizeFrame();
     // Page background
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index 2c49d933f2..fd9f050b86 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -26,11 +26,11 @@
 #include <variant>
 
 struct DrawPixelInfo;
-struct rct_window;
+struct WindowBase;
 struct TrackDesignFileRef;
 struct TextInputSession;
 struct scenario_index_entry;
-struct window_close_modifier;
+struct WindowCloseModifier;
 
 enum class VisibilityCache : uint8_t;
 enum class CursorID : uint8_t;
@@ -53,20 +53,20 @@ extern struct TextInputSession* gTextInput;
 using rct_windownumber = uint16_t;
 using WidgetIndex = int16_t;
 
-struct window_identifier
+struct WindowIdentifier
 {
     WindowClass classification;
     rct_windownumber number;
 };
 
-struct widget_identifier
+struct WidgetIdentifier
 {
-    window_identifier window;
+    WindowIdentifier window;
     WidgetIndex widget_index;
 };
 
-extern widget_identifier gCurrentTextBox;
-extern window_close_modifier gLastCloseModifier;
+extern WidgetIdentifier gCurrentTextBox;
+extern WindowCloseModifier gLastCloseModifier;
 
 using WidgetFlags = uint32_t;
 namespace WIDGET_FLAGS
@@ -139,7 +139,7 @@ struct Widget
 /**
  * Viewport structure
  */
-struct rct_viewport
+struct Viewport
 {
     int32_t width;
     int32_t height;
@@ -175,7 +175,7 @@ struct rct_viewport
  * Scroll structure
  * size: 0x12
  */
-struct rct_scroll
+struct ScrollBar
 {
     uint16_t flags{};          // 0x00
     uint16_t h_left{};         // 0x02
@@ -222,32 +222,32 @@ struct Focus
 
 struct WindowEventList
 {
-    void (*close)(struct rct_window*){};
-    void (*mouse_up)(struct rct_window*, WidgetIndex){};
-    void (*resize)(struct rct_window*){};
-    void (*mouse_down)(struct rct_window*, WidgetIndex, Widget*){};
-    void (*dropdown)(struct rct_window*, WidgetIndex, int32_t){};
-    void (*unknown_05)(struct rct_window*){};
-    void (*update)(struct rct_window*){};
-    void (*periodic_update)(struct rct_window*){};
-    void (*tool_update)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
-    void (*tool_down)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
-    void (*tool_drag)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
-    void (*tool_up)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){};
-    void (*tool_abort)(struct rct_window*, WidgetIndex){};
-    void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*){};
-    void (*scroll_mousedown)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
-    void (*scroll_mousedrag)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
-    void (*scroll_mouseover)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
-    void (*text_input)(struct rct_window*, WidgetIndex, char*){};
-    void (*viewport_rotate)(struct rct_window*){};
-    void (*scroll_select)(struct rct_window*, int32_t, int32_t){};
-    OpenRCT2String (*tooltip)(struct rct_window*, const WidgetIndex, const StringId){};
-    void (*cursor)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&, CursorID*){};
-    void (*moved)(struct rct_window*, const ScreenCoordsXY&){};
-    void (*invalidate)(struct rct_window*){};
-    void (*paint)(struct rct_window*, DrawPixelInfo*){};
-    void (*scroll_paint)(struct rct_window*, DrawPixelInfo*, int32_t){};
+    void (*close)(struct WindowBase*){};
+    void (*mouse_up)(struct WindowBase*, WidgetIndex){};
+    void (*resize)(struct WindowBase*){};
+    void (*mouse_down)(struct WindowBase*, WidgetIndex, Widget*){};
+    void (*dropdown)(struct WindowBase*, WidgetIndex, int32_t){};
+    void (*unknown_05)(struct WindowBase*){};
+    void (*update)(struct WindowBase*){};
+    void (*periodic_update)(struct WindowBase*){};
+    void (*tool_update)(struct WindowBase*, WidgetIndex, const ScreenCoordsXY&){};
+    void (*tool_down)(struct WindowBase*, WidgetIndex, const ScreenCoordsXY&){};
+    void (*tool_drag)(struct WindowBase*, WidgetIndex, const ScreenCoordsXY&){};
+    void (*tool_up)(struct WindowBase*, WidgetIndex, const ScreenCoordsXY&){};
+    void (*tool_abort)(struct WindowBase*, WidgetIndex){};
+    void (*get_scroll_size)(struct WindowBase*, int32_t, int32_t*, int32_t*){};
+    void (*scroll_mousedown)(struct WindowBase*, int32_t, const ScreenCoordsXY&){};
+    void (*scroll_mousedrag)(struct WindowBase*, int32_t, const ScreenCoordsXY&){};
+    void (*scroll_mouseover)(struct WindowBase*, int32_t, const ScreenCoordsXY&){};
+    void (*text_input)(struct WindowBase*, WidgetIndex, char*){};
+    void (*viewport_rotate)(struct WindowBase*){};
+    void (*scroll_select)(struct WindowBase*, int32_t, int32_t){};
+    OpenRCT2String (*tooltip)(struct WindowBase*, const WidgetIndex, const StringId){};
+    void (*cursor)(struct WindowBase*, WidgetIndex, const ScreenCoordsXY&, CursorID*){};
+    void (*moved)(struct WindowBase*, const ScreenCoordsXY&){};
+    void (*invalidate)(struct WindowBase*){};
+    void (*paint)(struct WindowBase*, DrawPixelInfo*){};
+    void (*scroll_paint)(struct WindowBase*, DrawPixelInfo*, int32_t){};
 
     typedef void (*fnEventInitializer)(WindowEventList&);
     WindowEventList(fnEventInitializer fn)
@@ -256,7 +256,7 @@ struct WindowEventList
     }
 };
 
-struct campaign_variables
+struct CampaignVariables
 {
     int16_t campaign_type;
     int16_t no_weeks; // 0x482
@@ -268,7 +268,7 @@ struct campaign_variables
     uint32_t pad_486;
 };
 
-struct new_ride_variables
+struct NewRideVariables
 {
     RideSelection SelectedRide;    // 0x480
     RideSelection HighlightedRide; // 0x482
@@ -277,31 +277,31 @@ struct new_ride_variables
     uint16_t selected_ride_countdown; // 488
 };
 
-struct ride_variables
+struct RideVariables
 {
     int16_t view;
     int32_t var_482;
     int32_t var_486;
 };
 
-struct track_list_variables
+struct TrackListVariables
 {
     bool track_list_being_updated;
     bool reload_track_designs;
 };
 
-struct error_variables
+struct ErrorVariables
 {
     uint16_t var_480;
 };
 
-struct window_close_modifier
+struct WindowCloseModifier
 {
-    window_identifier window;
+    WindowIdentifier window;
     CloseWindowModifier modifier;
 };
 
-struct rct_window;
+struct WindowBase;
 
 #define RCT_WINDOW_RIGHT(w) ((w)->windowPos.x + (w)->width)
 #define RCT_WINDOW_BOTTOM(w) ((w)->windowPos.y + (w)->height)
@@ -547,7 +547,7 @@ using close_callback = void (*)();
 #define WINDOW_LIMIT_MAX 64
 #define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc.
 
-extern rct_window* gWindowAudioExclusive;
+extern WindowBase* gWindowAudioExclusive;
 
 extern uint16_t gWindowUpdateTicks;
 namespace MapFlashingFlags
@@ -564,8 +564,8 @@ extern colour_t gCurrentWindowColours[4];
 
 extern bool gDisableErrorWindowSound;
 
-std::list<std::shared_ptr<rct_window>>::iterator WindowGetIterator(const rct_window* w);
-void WindowVisitEach(std::function<void(rct_window*)> func);
+std::list<std::shared_ptr<WindowBase>>::iterator WindowGetIterator(const WindowBase* w);
+void WindowVisitEach(std::function<void(WindowBase*)> func);
 
 void WindowDispatchUpdateAll();
 void WindowUpdateAllViewports();
@@ -573,25 +573,25 @@ void WindowUpdateAll();
 
 void WindowSetWindowLimit(int32_t value);
 
-rct_window* WindowBringToFront(rct_window& w);
-rct_window* WindowBringToFrontByClass(WindowClass cls);
-rct_window* WindowBringToFrontByClassWithFlags(WindowClass cls, uint16_t flags);
-rct_window* WindowBringToFrontByNumber(WindowClass cls, rct_windownumber number);
+WindowBase* WindowBringToFront(WindowBase& w);
+WindowBase* WindowBringToFrontByClass(WindowClass cls);
+WindowBase* WindowBringToFrontByClassWithFlags(WindowClass cls, uint16_t flags);
+WindowBase* WindowBringToFrontByNumber(WindowClass cls, rct_windownumber number);
 
-rct_window* WindowCreate(
-    std::unique_ptr<rct_window>&& w, WindowClass cls, ScreenCoordsXY pos, int32_t width, int32_t height, uint32_t flags);
-template<typename T, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
+WindowBase* WindowCreate(
+    std::unique_ptr<WindowBase>&& w, WindowClass cls, ScreenCoordsXY pos, int32_t width, int32_t height, uint32_t flags);
+template<typename T, typename std::enable_if<std::is_base_of<WindowBase, T>::value>::type* = nullptr>
 T* WindowCreate(WindowClass cls, const ScreenCoordsXY& pos = {}, int32_t width = 0, int32_t height = 0, uint32_t flags = 0)
 {
     return static_cast<T*>(WindowCreate(std::make_unique<T>(), cls, pos, width, height, flags));
 }
-template<typename T, typename... TArgs, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
+template<typename T, typename... TArgs, typename std::enable_if<std::is_base_of<WindowBase, T>::value>::type* = nullptr>
 T* WindowCreate(WindowClass cls, int32_t width, int32_t height, uint32_t flags = 0, TArgs&&... args)
 {
     return static_cast<T*>(
         WindowCreate(std::make_unique<T>(std::forward<TArgs>(args)...), cls, {}, width, height, flags | WF_AUTO_POSITION));
 }
-template<typename T, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
+template<typename T, typename std::enable_if<std::is_base_of<WindowBase, T>::value>::type* = nullptr>
 T* WindowFocusOrCreate(WindowClass cls, const ScreenCoordsXY& pos, int32_t width, int32_t height, uint32_t flags = 0)
 {
     auto* w = WindowBringToFrontByClass(cls);
@@ -601,7 +601,7 @@ T* WindowFocusOrCreate(WindowClass cls, const ScreenCoordsXY& pos, int32_t width
     }
     return static_cast<T*>(w);
 }
-template<typename T, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
+template<typename T, typename std::enable_if<std::is_base_of<WindowBase, T>::value>::type* = nullptr>
 T* WindowFocusOrCreate(WindowClass cls, int32_t width, int32_t height, uint32_t flags = 0)
 {
     auto* w = WindowBringToFrontByClass(cls);
@@ -612,14 +612,14 @@ T* WindowFocusOrCreate(WindowClass cls, int32_t width, int32_t height, uint32_t
     return static_cast<T*>(w);
 }
 
-rct_window* WindowCreate(
+WindowBase* WindowCreate(
     const ScreenCoordsXY& pos, int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags);
-rct_window* WindowCreateAutoPos(
+WindowBase* WindowCreateAutoPos(
     int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags);
-rct_window* WindowCreateCentred(
+WindowBase* WindowCreateCentred(
     int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags);
 
-void WindowClose(rct_window& window);
+void WindowClose(WindowBase& window);
 void WindowCloseByClass(WindowClass cls);
 void WindowCloseByNumber(WindowClass cls, rct_windownumber number);
 void WindowCloseByNumber(WindowClass cls, EntityId number);
@@ -628,56 +628,56 @@ void WindowCloseAll();
 void WindowCloseAllExceptClass(WindowClass cls);
 void WindowCloseAllExceptFlags(uint16_t flags);
 void WindowCloseAllExceptNumberAndClass(rct_windownumber number, WindowClass cls);
-rct_window* WindowFindByClass(WindowClass cls);
-rct_window* WindowFindByNumber(WindowClass cls, rct_windownumber number);
-rct_window* WindowFindByNumber(WindowClass cls, EntityId id);
-rct_window* WindowFindFromPoint(const ScreenCoordsXY& screenCoords);
-WidgetIndex WindowFindWidgetFromPoint(rct_window& w, const ScreenCoordsXY& screenCoords);
+WindowBase* WindowFindByClass(WindowClass cls);
+WindowBase* WindowFindByNumber(WindowClass cls, rct_windownumber number);
+WindowBase* WindowFindByNumber(WindowClass cls, EntityId id);
+WindowBase* WindowFindFromPoint(const ScreenCoordsXY& screenCoords);
+WidgetIndex WindowFindWidgetFromPoint(WindowBase& w, const ScreenCoordsXY& screenCoords);
 void WindowInvalidateByClass(WindowClass cls);
 void WindowInvalidateByNumber(WindowClass cls, rct_windownumber number);
 void WindowInvalidateByNumber(WindowClass cls, EntityId id);
 void WindowInvalidateAll();
-void WidgetInvalidate(rct_window& w, WidgetIndex widgetIndex);
+void WidgetInvalidate(WindowBase& w, WidgetIndex widgetIndex);
 void WidgetInvalidateByClass(WindowClass cls, WidgetIndex widgetIndex);
 void WidgetInvalidateByNumber(WindowClass cls, rct_windownumber number, WidgetIndex widgetIndex);
-void WindowInitScrollWidgets(rct_window& w);
-void WindowUpdateScrollWidgets(rct_window& w);
-int32_t WindowGetScrollDataIndex(const rct_window& w, WidgetIndex widget_index);
+void WindowInitScrollWidgets(WindowBase& w);
+void WindowUpdateScrollWidgets(WindowBase& w);
+int32_t WindowGetScrollDataIndex(const WindowBase& w, WidgetIndex widget_index);
 
-void WindowPushOthersRight(rct_window& w);
-void WindowPushOthersBelow(rct_window& w1);
+void WindowPushOthersRight(WindowBase& w);
+void WindowPushOthersBelow(WindowBase& w1);
 
-rct_window* WindowGetMain();
+WindowBase* WindowGetMain();
 
-void WindowScrollToLocation(rct_window& w, const CoordsXYZ& coords);
-void WindowRotateCamera(rct_window& w, int32_t direction);
+void WindowScrollToLocation(WindowBase& w, const CoordsXYZ& coords);
+void WindowRotateCamera(WindowBase& w, int32_t direction);
 void WindowViewportGetMapCoordsByCursor(
-    const rct_window& w, int32_t* map_x, int32_t* map_y, int32_t* offset_x, int32_t* offset_y);
-void WindowViewportCentreTileAroundCursor(rct_window& w, int32_t map_x, int32_t map_y, int32_t offset_x, int32_t offset_y);
+    const WindowBase& w, int32_t* map_x, int32_t* map_y, int32_t* offset_x, int32_t* offset_y);
+void WindowViewportCentreTileAroundCursor(WindowBase& w, int32_t map_x, int32_t map_y, int32_t offset_x, int32_t offset_y);
 void WindowCheckAllValidZoom();
-void WindowZoomSet(rct_window& w, ZoomLevel zoomLevel, bool atCursor);
-void WindowZoomIn(rct_window& w, bool atCursor);
-void WindowZoomOut(rct_window& w, bool atCursor);
+void WindowZoomSet(WindowBase& w, ZoomLevel zoomLevel, bool atCursor);
+void WindowZoomIn(WindowBase& w, bool atCursor);
+void WindowZoomOut(WindowBase& w, bool atCursor);
 void MainWindowZoom(bool zoomIn, bool atCursor);
 
 void WindowDrawAll(DrawPixelInfo* dpi, int32_t left, int32_t top, int32_t right, int32_t bottom);
-void WindowDraw(DrawPixelInfo* dpi, rct_window& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
-void WindowDrawWidgets(rct_window& w, DrawPixelInfo* dpi);
-void WindowDrawViewport(DrawPixelInfo* dpi, rct_window& w);
+void WindowDraw(DrawPixelInfo* dpi, WindowBase& w, int32_t left, int32_t top, int32_t right, int32_t bottom);
+void WindowDrawWidgets(WindowBase& w, DrawPixelInfo* dpi);
+void WindowDrawViewport(DrawPixelInfo* dpi, WindowBase& w);
 
-void WindowSetPosition(rct_window& w, const ScreenCoordsXY& screenCoords);
-void WindowMovePosition(rct_window& w, const ScreenCoordsXY& screenCoords);
-void WindowResize(rct_window& w, int32_t dw, int32_t dh);
-void WindowSetResize(rct_window& w, int32_t minWidth, int32_t minHeight, int32_t maxWidth, int32_t maxHeight);
+void WindowSetPosition(WindowBase& w, const ScreenCoordsXY& screenCoords);
+void WindowMovePosition(WindowBase& w, const ScreenCoordsXY& screenCoords);
+void WindowResize(WindowBase& w, int32_t dw, int32_t dh);
+void WindowSetResize(WindowBase& w, int32_t minWidth, int32_t minHeight, int32_t maxWidth, int32_t maxHeight);
 
-bool ToolSet(const rct_window& w, WidgetIndex widgetIndex, Tool tool);
+bool ToolSet(const WindowBase& w, WidgetIndex widgetIndex, Tool tool);
 void ToolCancel();
 
 void WindowCloseConstructionWindows();
 
 void WindowUpdateViewportRideMusic();
 
-rct_viewport* WindowGetViewport(rct_window* window);
+Viewport* WindowGetViewport(WindowBase* window);
 
 // Open window functions
 void WindowRelocateWindows(int32_t width, int32_t height);
@@ -687,50 +687,50 @@ void RideConstructionToolupdateEntranceExit(const ScreenCoordsXY& screenCoords);
 void RideConstructionToolupdateConstruct(const ScreenCoordsXY& screenCoords);
 void RideConstructionTooldownConstruct(const ScreenCoordsXY& screenCoords);
 
-void WindowEventCloseCall(rct_window* w);
-void WindowEventMouseUpCall(rct_window* w, WidgetIndex widgetIndex);
-void WindowEventResizeCall(rct_window* w);
-void WindowEventMouseDownCall(rct_window* w, WidgetIndex widgetIndex);
-void WindowEventDropdownCall(rct_window* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
-void WindowEventUnknown05Call(rct_window* w);
-void WindowEventUpdateCall(rct_window* w);
-void WindowEventPeriodicUpdateCall(rct_window* w);
-void WindowEventToolUpdateCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventToolDownCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventToolDragCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventToolUpCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventToolAbortCall(rct_window* w, WidgetIndex widgetIndex);
-void WindowGetScrollSize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height);
-void WindowEventScrollMousedownCall(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventScrollMousedragCall(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventScrollMouseoverCall(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventTextinputCall(rct_window* w, WidgetIndex widgetIndex, char* text);
-void WindowEventViewportRotateCall(rct_window* w);
-void WindowEventScrollSelectCall(rct_window* w, int32_t scrollIndex, int32_t scrollAreaType);
-OpenRCT2String WindowEventTooltipCall(rct_window* w, const WidgetIndex widgetIndex, const StringId fallback);
-CursorID WindowEventCursorCall(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
-void WindowEventMovedCall(rct_window* w, const ScreenCoordsXY& screenCoords);
-void WindowEventInvalidateCall(rct_window* w);
-void WindowEventPaintCall(rct_window* w, DrawPixelInfo* dpi);
-void WindowEventScrollPaintCall(rct_window* w, DrawPixelInfo* dpi, int32_t scrollIndex);
+void WindowEventCloseCall(WindowBase* w);
+void WindowEventMouseUpCall(WindowBase* w, WidgetIndex widgetIndex);
+void WindowEventResizeCall(WindowBase* w);
+void WindowEventMouseDownCall(WindowBase* w, WidgetIndex widgetIndex);
+void WindowEventDropdownCall(WindowBase* w, WidgetIndex widgetIndex, int32_t dropdownIndex);
+void WindowEventUnknown05Call(WindowBase* w);
+void WindowEventUpdateCall(WindowBase* w);
+void WindowEventPeriodicUpdateCall(WindowBase* w);
+void WindowEventToolUpdateCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventToolDownCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventToolDragCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventToolUpCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventToolAbortCall(WindowBase* w, WidgetIndex widgetIndex);
+void WindowGetScrollSize(WindowBase* w, int32_t scrollIndex, int32_t* width, int32_t* height);
+void WindowEventScrollMousedownCall(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventScrollMousedragCall(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventScrollMouseoverCall(WindowBase* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventTextinputCall(WindowBase* w, WidgetIndex widgetIndex, char* text);
+void WindowEventViewportRotateCall(WindowBase* w);
+void WindowEventScrollSelectCall(WindowBase* w, int32_t scrollIndex, int32_t scrollAreaType);
+OpenRCT2String WindowEventTooltipCall(WindowBase* w, const WidgetIndex widgetIndex, const StringId fallback);
+CursorID WindowEventCursorCall(WindowBase* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords);
+void WindowEventMovedCall(WindowBase* w, const ScreenCoordsXY& screenCoords);
+void WindowEventInvalidateCall(WindowBase* w);
+void WindowEventPaintCall(WindowBase* w, DrawPixelInfo* dpi);
+void WindowEventScrollPaintCall(WindowBase* w, DrawPixelInfo* dpi, int32_t scrollIndex);
 
 void InvalidateAllWindowsAfterInput();
 void TextinputCancel();
 
-void WindowMoveAndSnap(rct_window& w, ScreenCoordsXY newWindowCoords, int32_t snapProximity);
-int32_t WindowCanResize(const rct_window& w);
+void WindowMoveAndSnap(WindowBase& w, ScreenCoordsXY newWindowCoords, int32_t snapProximity);
+int32_t WindowCanResize(const WindowBase& w);
 
 void WindowStartTextbox(
-    rct_window& call_w, WidgetIndex call_widget, StringId existing_text, char* existing_args, int32_t maxLength);
+    WindowBase& call_w, WidgetIndex call_widget, StringId existing_text, char* existing_args, int32_t maxLength);
 void WindowCancelTextbox();
 void WindowUpdateTextboxCaret();
 void WindowUpdateTextbox();
 
-bool WindowIsVisible(rct_window& w);
+bool WindowIsVisible(WindowBase& w);
 
 bool SceneryToolIsActive();
 
-rct_viewport* WindowGetPreviousViewport(rct_viewport* current);
+Viewport* WindowGetPreviousViewport(Viewport* current);
 void WindowResetVisibilities();
 void WindowInitAll();
 
@@ -754,8 +754,8 @@ void WindowFootpathKeyboardShortcutSlopeUp();
 void WindowFootpathKeyboardShortcutBuildCurrent();
 void WindowFootpathKeyboardShortcutDemolishCurrent();
 
-void WindowFollowSprite(rct_window& w, EntityId spriteIndex);
-void WindowUnfollowSprite(rct_window& w);
+void WindowFollowSprite(WindowBase& w, EntityId spriteIndex);
+void WindowUnfollowSprite(WindowBase& w);
 
 bool WindowRideConstructionUpdateState(
     int32_t* trackType, int32_t* trackDirection, RideId* rideIndex, int32_t* _liftHillAndAlternativeState, CoordsXYZ* trackPos,
@@ -766,5 +766,5 @@ money32 PlaceProvisionalTrackPiece(
 
 extern RideConstructionState _rideConstructionState2;
 
-rct_window* WindowGetListening();
-WindowClass WindowGetClassification(const rct_window& window);
+WindowBase* WindowGetListening();
+WindowClass WindowGetClassification(const WindowBase& window);
diff --git a/src/openrct2/interface/Window_internal.cpp b/src/openrct2/interface/Window_internal.cpp
index 375597e9ee..d5fb3d3888 100644
--- a/src/openrct2/interface/Window_internal.cpp
+++ b/src/openrct2/interface/Window_internal.cpp
@@ -5,13 +5,13 @@
 #include "Cursors.h"
 #include "Viewport.h"
 
-void rct_window::SetLocation(const CoordsXYZ& coords)
+void WindowBase::SetLocation(const CoordsXYZ& coords)
 {
     WindowScrollToLocation(*this, coords);
     flags &= ~WF_SCROLLING_TO_LOCATION;
 }
 
-void rct_window::ScrollToViewport()
+void WindowBase::ScrollToViewport()
 {
     if (viewport == nullptr || !focus.has_value())
         return;
@@ -23,12 +23,12 @@ void rct_window::ScrollToViewport()
         WindowScrollToLocation(*mainWindow, newCoords);
 }
 
-void rct_window::Invalidate()
+void WindowBase::Invalidate()
 {
     GfxSetDirtyBlocks({ windowPos, windowPos + ScreenCoordsXY{ width, height } });
 }
 
-void rct_window::RemoveViewport()
+void WindowBase::RemoveViewport()
 {
     if (viewport == nullptr)
         return;
@@ -37,7 +37,7 @@ void rct_window::RemoveViewport()
     viewport = nullptr;
 }
 
-CursorID rct_window::OnCursor(WidgetIndex, const ScreenCoordsXY&, CursorID)
+CursorID WindowBase::OnCursor(WidgetIndex, const ScreenCoordsXY&, CursorID)
 {
     return CursorID::Arrow;
 }
diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h
index fd8b7039fd..e17e1b2019 100644
--- a/src/openrct2/interface/Window_internal.h
+++ b/src/openrct2/interface/Window_internal.h
@@ -29,10 +29,10 @@ struct RCTObjectEntry;
  * Window structure
  * size: 0x4C0
  */
-struct rct_window
+struct WindowBase
 {
     WindowEventList* event_handlers{};
-    rct_viewport* viewport{};
+    Viewport* viewport{};
     uint64_t disabled_widgets{};
     uint64_t pressed_widgets{};
     uint64_t hold_down_widgets{};
@@ -50,18 +50,18 @@ struct rct_window
         RideId rideId;
     };
     uint16_t flags{};
-    rct_scroll scrolls[3];
+    ScrollBar scrolls[3];
     uint32_t list_item_positions[1024]{};
     uint16_t no_list_items{};     // 0 for no items
     int16_t selected_list_item{}; // -1 for none selected
     std::optional<Focus> focus;
     union
     {
-        campaign_variables campaign;
-        new_ride_variables new_ride;
-        ride_variables ride;
-        track_list_variables track_list;
-        error_variables error;
+        CampaignVariables campaign;
+        NewRideVariables new_ride;
+        RideVariables ride;
+        TrackListVariables track_list;
+        ErrorVariables error;
         void* custom_info;
     };
     union
@@ -101,11 +101,11 @@ struct rct_window
     void Invalidate();
     void RemoveViewport();
 
-    rct_window() = default;
-    rct_window(rct_window&) = delete;
-    virtual ~rct_window() = default;
+    WindowBase() = default;
+    WindowBase(WindowBase&) = delete;
+    virtual ~WindowBase() = default;
 
-    rct_window& operator=(const rct_window&) = delete;
+    WindowBase& operator=(const WindowBase&) = delete;
 
     virtual bool IsLegacy()
     {
@@ -207,4 +207,4 @@ struct rct_window
 #endif
 
 // rct2: 0x01420078
-extern std::list<std::shared_ptr<rct_window>> g_window_list;
+extern std::list<std::shared_ptr<WindowBase>> g_window_list;
diff --git a/src/openrct2/object/WaterObject.h b/src/openrct2/object/WaterObject.h
index caf4debf95..2d36c5803b 100644
--- a/src/openrct2/object/WaterObject.h
+++ b/src/openrct2/object/WaterObject.h
@@ -17,7 +17,7 @@
 class WaterObject final : public Object
 {
 private:
-    rct_water_type _legacyType = {};
+    WaterObjectEntry _legacyType = {};
 
 public:
     void* GetLegacyData() override
diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
index 44cfc19a0a..b33b5904bd 100644
--- a/src/openrct2/paint/tile_element/Paint.Surface.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp
@@ -79,7 +79,7 @@ enum
     CORNER_LEFT
 };
 
-struct corner_height
+struct CornerHeight
 {
     uint8_t top;
     uint8_t right;
@@ -91,7 +91,7 @@ struct corner_height
 /**
 *  rct2: 0x0097B4A4 (R), 0x0097B4C4 (T), 0x0097B4E4 (L), 0x0097B504 (B)
 */
-static constexpr const corner_height corner_heights[] = {
+static constexpr const CornerHeight corner_heights[] = {
     // T  R  B  L
     { 0, 0, 0, 0 },
     { 0, 0, 1, 0 },
@@ -213,16 +213,16 @@ static constexpr const uint8_t byte_97B740[] = {
     0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 3, 0, 1, 4, 0,
 };
 
-struct tile_descriptor
+struct TileDescriptor
 {
     TileCoordsXY tile_coords;
     const TileElement* tile_element;
     uint8_t terrain;
     uint8_t slope;
-    corner_height corner_heights;
+    CornerHeight corner_heights;
 };
 
-struct tile_surface_boundary_data
+struct TileSurfaceBoundaryData
 {
     int32_t bit_1;
     int32_t bit_8;
@@ -233,7 +233,7 @@ struct tile_surface_boundary_data
     BoundBoxXY Boundbox;
 };
 
-static constexpr const tile_surface_boundary_data _tileSurfaceBoundaries[4] = {
+static constexpr const TileSurfaceBoundaryData _tileSurfaceBoundaries[4] = {
     {
         // Bottom right
         1,
@@ -445,7 +445,7 @@ static uint8_t ViewportSurfacePaintSetupGetRelativeSlope(const SurfaceElement& s
  *  rct2: 0x0065E890, 0x0065E946, 0x0065E9FC, 0x0065EAB2
  */
 static void ViewportSurfaceSmoothenEdge(
-    PaintSession& session, enum edge_t edge, struct tile_descriptor self, struct tile_descriptor neighbour)
+    PaintSession& session, enum edge_t edge, struct TileDescriptor self, struct TileDescriptor neighbour)
 {
     PROFILED_FUNCTION();
 
@@ -547,7 +547,7 @@ static void ViewportSurfaceSmoothenEdge(
     }
 }
 
-static bool TileIsInsideClipView(const tile_descriptor& tile)
+static bool TileIsInsideClipView(const TileDescriptor& tile)
 {
     if (tile.tile_element == nullptr)
         return false;
@@ -565,8 +565,8 @@ static bool TileIsInsideClipView(const tile_descriptor& tile)
 }
 
 static void ViewportSurfaceDrawTileSideBottom(
-    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t edgeStyle, struct tile_descriptor self,
-    struct tile_descriptor neighbour, bool isWater)
+    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t edgeStyle, struct TileDescriptor self,
+    struct TileDescriptor neighbour, bool isWater)
 {
     PROFILED_FUNCTION();
 
@@ -764,8 +764,8 @@ static void ViewportSurfaceDrawTileSideBottom(
  *  rct2: 0x0065EB7D, 0x0065F0D8
  */
 static void ViewportSurfaceDrawLandSideBottom(
-    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t edgeStyle, struct tile_descriptor self,
-    struct tile_descriptor neighbour)
+    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t edgeStyle, struct TileDescriptor self,
+    struct TileDescriptor neighbour)
 {
     ViewportSurfaceDrawTileSideBottom(session, edge, height, edgeStyle, self, neighbour, false);
 }
@@ -774,15 +774,15 @@ static void ViewportSurfaceDrawLandSideBottom(
  *  rct2: 0x0065F8B9, 0x0065FE26
  */
 static void ViewportSurfaceDrawWaterSideBottom(
-    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t edgeStyle, struct tile_descriptor self,
-    struct tile_descriptor neighbour)
+    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t edgeStyle, struct TileDescriptor self,
+    struct TileDescriptor neighbour)
 {
     ViewportSurfaceDrawTileSideBottom(session, edge, height, edgeStyle, self, neighbour, true);
 }
 
 static void ViewportSurfaceDrawTileSideTop(
-    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t terrain, struct tile_descriptor self,
-    struct tile_descriptor neighbour, bool isWater)
+    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t terrain, struct TileDescriptor self,
+    struct TileDescriptor neighbour, bool isWater)
 {
     PROFILED_FUNCTION();
 
@@ -923,8 +923,8 @@ static void ViewportSurfaceDrawTileSideTop(
  *  rct2: 0x0065F63B, 0x0065F77D
  */
 static void ViewportSurfaceDrawLandSideTop(
-    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t terrain, struct tile_descriptor self,
-    struct tile_descriptor neighbour)
+    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t terrain, struct TileDescriptor self,
+    struct TileDescriptor neighbour)
 {
     ViewportSurfaceDrawTileSideTop(session, edge, height, terrain, self, neighbour, false);
 }
@@ -933,8 +933,8 @@ static void ViewportSurfaceDrawLandSideTop(
  *  rct2: 0x0066039B, 0x006604F1
  */
 static void ViewportSurfaceDrawWaterSideTop(
-    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t terrain, struct tile_descriptor self,
-    struct tile_descriptor neighbour)
+    PaintSession& session, enum edge_t edge, uint16_t height, uint8_t terrain, struct TileDescriptor self,
+    struct TileDescriptor neighbour)
 {
     ViewportSurfaceDrawTileSideTop(session, edge, height, terrain, self, neighbour, true);
 }
@@ -1029,10 +1029,10 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
     const auto terrain_type = tileElement.GetSurfaceStyle();
     const uint8_t surfaceShape = ViewportSurfacePaintSetupGetRelativeSlope(tileElement, rotation);
     const CoordsXY& base = session.SpritePosition;
-    const corner_height& cornerHeights = corner_heights[surfaceShape];
+    const CornerHeight& cornerHeights = corner_heights[surfaceShape];
     const TileElement* elementPtr = &reinterpret_cast<const TileElement&>(tileElement);
 
-    tile_descriptor selfDescriptor = {
+    TileDescriptor selfDescriptor = {
         TileCoordsXY(base),
         elementPtr,
         static_cast<uint8_t>(terrain_type),
@@ -1045,7 +1045,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
         },
     };
 
-    tile_descriptor tileDescriptors[5];
+    TileDescriptor tileDescriptors[5];
     tileDescriptors[0] = selfDescriptor;
 
     for (std::size_t i = 0; i < std::size(viewport_surface_paint_data); i++)
@@ -1053,7 +1053,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
         const CoordsXY& offset = viewport_surface_paint_data[i][rotation];
         const CoordsXY position = base + offset;
 
-        tile_descriptor& descriptor = tileDescriptors[i + 1];
+        TileDescriptor& descriptor = tileDescriptors[i + 1];
 
         descriptor.tile_element = nullptr;
         if (!MapIsLocationValid(position))
@@ -1069,7 +1069,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
 
         const uint32_t surfaceSlope = ViewportSurfacePaintSetupGetRelativeSlope(*surfaceElement, rotation);
         const uint8_t baseHeight = surfaceElement->GetBaseZ() / 16;
-        const corner_height& ch = corner_heights[surfaceSlope];
+        const CornerHeight& ch = corner_heights[surfaceSlope];
 
         descriptor.tile_coords = TileCoordsXY{ position };
         descriptor.tile_element = reinterpret_cast<TileElement*>(surfaceElement);
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 961b96cf72..5be8ed509f 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -742,16 +742,16 @@ bool Ride::FindTrackGap(const CoordsXYE& input, CoordsXYE* output) const
     if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_MAZE))
         return false;
 
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == id)
     {
         RideConstructionInvalidateCurrentTrack();
     }
 
     bool moveSlowIt = true;
-    track_circuit_iterator it = {};
+    TrackCircuitIterator it = {};
     TrackCircuitIteratorBegin(&it, input);
-    track_circuit_iterator slowIt = it;
+    TrackCircuitIterator slowIt = it;
     while (TrackCircuitIteratorNext(&it))
     {
         if (!TrackIsConnectedByShape(it.last.element, it.current.element))
@@ -2666,11 +2666,11 @@ static ResultWithMessage RideCheckBlockBrakes(const CoordsXYE& input, CoordsXYE*
         return { false };
 
     RideId rideIndex = input.element->AsTrack()->GetRideIndex();
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == rideIndex)
         RideConstructionInvalidateCurrentTrack();
 
-    track_circuit_iterator it;
+    TrackCircuitIterator it;
     TrackCircuitIteratorBegin(&it, input);
     while (TrackCircuitIteratorNext(&it))
     {
@@ -2730,14 +2730,14 @@ static bool ride_check_track_contains_inversions(const CoordsXYE& input, CoordsX
             return true;
     }
 
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && rideIndex == _currentRideIndex)
     {
         RideConstructionInvalidateCurrentTrack();
     }
 
     bool moveSlowIt = true;
-    track_circuit_iterator it, slowIt;
+    TrackCircuitIterator it, slowIt;
     TrackCircuitIteratorBegin(&it, input);
     slowIt = it;
 
@@ -2790,14 +2790,14 @@ static bool ride_check_track_contains_banked(const CoordsXYE& input, CoordsXYE*
     if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_MAZE))
         return true;
 
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && rideIndex == _currentRideIndex)
     {
         RideConstructionInvalidateCurrentTrack();
     }
 
     bool moveSlowIt = true;
-    track_circuit_iterator it, slowIt;
+    TrackCircuitIterator it, slowIt;
     TrackCircuitIteratorBegin(&it, input);
     slowIt = it;
 
@@ -2831,7 +2831,7 @@ static bool ride_check_track_contains_banked(const CoordsXYE& input, CoordsXYE*
  */
 static int32_t ride_check_station_length(const CoordsXYE& input, CoordsXYE* output)
 {
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w != nullptr && _rideConstructionState != RideConstructionState::State0
         && _currentRideIndex == input.element->AsTrack()->GetRideIndex())
     {
@@ -3293,10 +3293,10 @@ static Vehicle* vehicle_create_car(
  *
  *  rct2: 0x006DD84C
  */
-static train_ref vehicle_create_train(
+static TrainReference vehicle_create_train(
     RideId rideIndex, const CoordsXYZ& trainPos, int32_t vehicleIndex, int32_t* remainingDistance, TrackElement* trackElement)
 {
-    train_ref train = { nullptr, nullptr };
+    TrainReference train = { nullptr, nullptr };
     auto ride = GetRide(rideIndex);
     if (ride != nullptr)
     {
@@ -3331,8 +3331,8 @@ static bool vehicle_create_trains(RideId rideIndex, const CoordsXYZ& trainsPos,
     if (ride == nullptr)
         return false;
 
-    train_ref firstTrain = {};
-    train_ref lastTrain = {};
+    TrainReference firstTrain = {};
+    TrainReference lastTrain = {};
     int32_t remainingDistance = 0;
     bool allTrainsCreated = true;
 
@@ -3342,7 +3342,7 @@ static bool vehicle_create_trains(RideId rideIndex, const CoordsXYZ& trainsPos,
         {
             remainingDistance = 0;
         }
-        train_ref train = vehicle_create_train(rideIndex, trainsPos, vehicleIndex, &remainingDistance, trackElement);
+        TrainReference train = vehicle_create_train(rideIndex, trainsPos, vehicleIndex, &remainingDistance, trackElement);
         if (train.head == nullptr || train.tail == nullptr)
         {
             allTrainsCreated = false;
@@ -3648,7 +3648,7 @@ static ResultWithMessage ride_initialise_cable_lift_track(const Ride& ride, bool
     };
     int32_t state = STATE_FIND_CABLE_LIFT;
 
-    track_circuit_iterator it;
+    TrackCircuitIterator it;
     TrackCircuitIteratorBegin(&it, { location, tileElement });
     while (TrackCircuitIteratorPrevious(&it))
     {
@@ -4837,7 +4837,7 @@ static int32_t ride_get_track_length(const Ride& ride)
 
     RideId rideIndex = tileElement->AsTrack()->GetRideIndex();
 
-    rct_window* w = WindowFindByClass(WindowClass::RideConstruction);
+    WindowBase* w = WindowFindByClass(WindowClass::RideConstruction);
     if (w != nullptr && _rideConstructionState != RideConstructionState::State0 && _currentRideIndex == rideIndex)
     {
         RideConstructionInvalidateCurrentTrack();
@@ -4846,10 +4846,10 @@ static int32_t ride_get_track_length(const Ride& ride)
     bool moveSlowIt = true;
     int32_t result = 0;
 
-    track_circuit_iterator it;
+    TrackCircuitIterator it;
     TrackCircuitIteratorBegin(&it, { trackStart.x, trackStart.y, tileElement });
 
-    track_circuit_iterator slowIt = it;
+    TrackCircuitIterator slowIt = it;
     while (TrackCircuitIteratorNext(&it))
     {
         trackType = it.current.element->AsTrack()->GetTrackType();
@@ -5077,9 +5077,9 @@ void Ride::Crash(uint8_t vehicleIndex)
         // Open ride window for crashed vehicle
         auto intent = Intent(WD_VEHICLE);
         intent.PutExtra(INTENT_EXTRA_VEHICLE, vehicle);
-        rct_window* w = ContextOpenIntent(&intent);
+        WindowBase* w = ContextOpenIntent(&intent);
 
-        rct_viewport* viewport = WindowGetViewport(w);
+        Viewport* viewport = WindowGetViewport(w);
         if (w != nullptr && viewport != nullptr)
         {
             viewport->flags |= VIEWPORT_FLAG_SOUND_ON;
diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp
index c447521821..3266d32e1f 100644
--- a/src/openrct2/ride/RideConstruction.cpp
+++ b/src/openrct2/ride/RideConstruction.cpp
@@ -117,7 +117,7 @@ static int32_t ride_check_if_construction_allowed(Ride& ride)
     return 1;
 }
 
-static rct_window* ride_create_or_find_construction_window(RideId rideIndex)
+static WindowBase* ride_create_or_find_construction_window(RideId rideIndex)
 {
     auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
     auto intent = Intent(INTENT_ACTION_RIDE_CONSTRUCTION_FOCUS);
@@ -137,7 +137,7 @@ void RideConstructionStart(Ride& ride)
     {
         ride.FindTrackGap(trackElement, &trackElement);
 
-        rct_window* w = WindowGetMain();
+        WindowBase* w = WindowGetMain();
         if (w != nullptr && RideModify(trackElement))
             WindowScrollToLocation(*w, { trackElement, trackElement.element->GetBaseZ() });
     }
@@ -1095,7 +1095,7 @@ bool RideModify(const CoordsXYE& input)
  */
 int32_t RideInitialiseConstructionWindow(Ride& ride)
 {
-    rct_window* w;
+    WindowBase* w;
 
     ToolCancel();
 
@@ -1412,7 +1412,7 @@ void Ride::ValidateStations()
             }
             // update all the blocks with StationIndex
             ted = &GetTrackElementDescriptor(tileElement->AsTrack()->GetTrackType());
-            const rct_preview_track* trackBlock = ted->Block;
+            const PreviewTrack* trackBlock = ted->Block;
             while ((++trackBlock)->index != 0xFF)
             {
                 CoordsXYZ blockLocation = location + CoordsXYZ{ CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(direction), 0 };
diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp
index 8cc576dc15..a4d45d249e 100644
--- a/src/openrct2/ride/RideRatings.cpp
+++ b/src/openrct2/ride/RideRatings.cpp
@@ -797,11 +797,11 @@ static void RideRatingsCalculate(RideRatingUpdateState& state, Ride& ride)
 
 static void RideRatingsCalculateValue(Ride& ride)
 {
-    struct row
+    struct Row
     {
         int32_t months, multiplier, divisor, summand;
     };
-    static const row ageTableNew[] = {
+    static const Row ageTableNew[] = {
         { 5, 3, 2, 0 },       // 1.5x
         { 13, 6, 5, 0 },      // 1.2x
         { 40, 1, 1, 0 },      // 1x
@@ -815,7 +815,7 @@ static void RideRatingsCalculateValue(Ride& ride)
     };
 
 #ifdef ORIGINAL_RATINGS
-    static const row ageTableOld[] = {
+    static const Row ageTableOld[] = {
         { 5, 1, 1, 30 },      // +30
         { 13, 1, 1, 10 },     // +10
         { 40, 1, 1, 0 },      // 1x
@@ -846,7 +846,7 @@ static void RideRatingsCalculateValue(Ride& ride)
         monthsOld = ride.GetAge();
     }
 
-    const row* ageTable = ageTableNew;
+    const Row* ageTable = ageTableNew;
     size_t tableSize = std::size(ageTableNew);
 
 #ifdef ORIGINAL_RATINGS
@@ -854,7 +854,7 @@ static void RideRatingsCalculateValue(Ride& ride)
     tableSize = std::size(ageTableOld);
 #endif
 
-    row lastRow = ageTable[tableSize - 1];
+    Row lastRow = ageTable[tableSize - 1];
 
     // Ride is older than oldest age in the table?
     if (monthsOld >= lastRow.months)
@@ -866,7 +866,7 @@ static void RideRatingsCalculateValue(Ride& ride)
         // Find the first hit in the table that matches this ride's age
         for (size_t it = 0; it < tableSize; it++)
         {
-            row curr = ageTable[it];
+            Row curr = ageTable[it];
 
             if (monthsOld < curr.months)
             {
diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp
index 570e5a89dd..7c59410fff 100644
--- a/src/openrct2/ride/Track.cpp
+++ b/src/openrct2/ride/Track.cpp
@@ -404,7 +404,7 @@ ResultWithMessage TrackRemoveStationElement(const CoordsXYZD& loc, RideId rideIn
     return { true };
 }
 
-void TrackCircuitIteratorBegin(track_circuit_iterator* it, CoordsXYE first)
+void TrackCircuitIteratorBegin(TrackCircuitIterator* it, CoordsXYE first)
 {
     it->last = first;
     it->first = nullptr;
@@ -412,7 +412,7 @@ void TrackCircuitIteratorBegin(track_circuit_iterator* it, CoordsXYE first)
     it->looped = false;
 }
 
-bool TrackCircuitIteratorPrevious(track_circuit_iterator* it)
+bool TrackCircuitIteratorPrevious(TrackCircuitIterator* it)
 {
     TrackBeginEnd trackBeginEnd;
 
@@ -453,7 +453,7 @@ bool TrackCircuitIteratorPrevious(track_circuit_iterator* it)
     return false;
 }
 
-bool TrackCircuitIteratorNext(track_circuit_iterator* it)
+bool TrackCircuitIteratorNext(TrackCircuitIterator* it)
 {
     if (it->first == nullptr)
     {
@@ -475,7 +475,7 @@ bool TrackCircuitIteratorNext(track_circuit_iterator* it)
     return TrackBlockGetNext(&it->last, &it->current, &it->currentZ, &it->currentDirection);
 }
 
-bool TrackCircuitIteratorsMatch(const track_circuit_iterator* firstIt, const track_circuit_iterator* secondIt)
+bool TrackCircuitIteratorsMatch(const TrackCircuitIterator* firstIt, const TrackCircuitIterator* secondIt)
 {
     return (
         firstIt->currentZ == secondIt->currentZ && firstIt->currentDirection == secondIt->currentDirection
diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h
index 60e8106492..9fec34a7db 100644
--- a/src/openrct2/ride/Track.h
+++ b/src/openrct2/ride/Track.h
@@ -26,7 +26,7 @@ using pitch_type_t = uint8_t;
 
 struct ResultWithMessage;
 
-struct rct_trackdefinition
+struct TrackDefinition
 {
     track_type_t type;
     pitch_type_t vangle_end;
@@ -51,7 +51,7 @@ constexpr bool operator!=(const PitchAndRoll& vb1, const PitchAndRoll& vb2)
 }
 
 /* size 0x0A */
-struct rct_preview_track
+struct PreviewTrack
 {
     uint8_t index; // 0x00
     int16_t x;     // 0x01
@@ -63,7 +63,7 @@ struct rct_preview_track
 };
 
 /* size 0x0A */
-struct rct_track_coordinates
+struct TrackCoordinates
 {
     int8_t rotation_begin; // 0x00
     int8_t rotation_end;   // 0x01
@@ -598,7 +598,7 @@ enum
     GC_SET_MAZE_TRACK_FILL = 2,
 };
 
-struct track_circuit_iterator
+struct TrackCircuitIterator
 {
     CoordsXYE last;
     CoordsXYE current;
@@ -614,10 +614,10 @@ PitchAndRoll TrackPitchAndRollEnd(track_type_t trackType);
 
 int32_t TrackIsConnectedByShape(TileElement* a, TileElement* b);
 
-void TrackCircuitIteratorBegin(track_circuit_iterator* it, CoordsXYE first);
-bool TrackCircuitIteratorPrevious(track_circuit_iterator* it);
-bool TrackCircuitIteratorNext(track_circuit_iterator* it);
-bool TrackCircuitIteratorsMatch(const track_circuit_iterator* firstIt, const track_circuit_iterator* secondIt);
+void TrackCircuitIteratorBegin(TrackCircuitIterator* it, CoordsXYE first);
+bool TrackCircuitIteratorPrevious(TrackCircuitIterator* it);
+bool TrackCircuitIteratorNext(TrackCircuitIterator* it);
+bool TrackCircuitIteratorsMatch(const TrackCircuitIterator* firstIt, const TrackCircuitIterator* secondIt);
 
 void TrackGetBack(const CoordsXYE& input, CoordsXYE* output);
 void TrackGetFront(const CoordsXYE& input, CoordsXYE* output);
diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp
index f309b6c9d1..1743f1fc86 100644
--- a/src/openrct2/ride/TrackData.cpp
+++ b/src/openrct2/ride/TrackData.cpp
@@ -17,7 +17,7 @@
 #include <iterator>
 
 // clang-format off
-static constexpr rct_track_coordinates TrackCoordinates[TrackElemType::Count] = {
+static constexpr TrackCoordinates _trackCoordinates[TrackElemType::Count] = {
         { 0, 0, 0, 0, 0, 0 },       // ELEM_FLAT
         { 0, 0, 0, 0, 0, 0 },       // ELEM_END_STATION
         { 0, 0, 0, 0, 0, 0 },       // ELEM_BEGIN_STATION
@@ -613,87 +613,87 @@ static constexpr uint8_t TrackSequenceProperties[][MaxSequencesPerPiece] = {
 
 #define TRACK_BLOCK_END { 255, 255, 255, 255, 255, {255, 255}, 255 }
 
-static constexpr rct_preview_track TrackBlocks000[] = {
+static constexpr PreviewTrack TrackBlocks000[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks001[] = {
+static constexpr const PreviewTrack TrackBlocks001[] = {
     { 0, 0, 0, 0, 0,{ 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks002[] = {
+static constexpr const PreviewTrack TrackBlocks002[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks003[] = {
+static constexpr const PreviewTrack TrackBlocks003[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks004[] = {
+static constexpr const PreviewTrack TrackBlocks004[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks005[] = {
+static constexpr const PreviewTrack TrackBlocks005[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks006[] = {
+static constexpr const PreviewTrack TrackBlocks006[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks007[] = {
+static constexpr const PreviewTrack TrackBlocks007[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks008[] = {
+static constexpr const PreviewTrack TrackBlocks008[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks009[] = {
+static constexpr const PreviewTrack TrackBlocks009[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks010[] = {
+static constexpr const PreviewTrack TrackBlocks010[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks011[] = {
+static constexpr const PreviewTrack TrackBlocks011[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks012[] = {
+static constexpr const PreviewTrack TrackBlocks012[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks013[] = {
+static constexpr const PreviewTrack TrackBlocks013[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks014[] = {
+static constexpr const PreviewTrack TrackBlocks014[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks015[] = {
+static constexpr const PreviewTrack TrackBlocks015[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks016[] = {
+static constexpr const PreviewTrack TrackBlocks016[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
@@ -704,7 +704,7 @@ static constexpr const rct_preview_track TrackBlocks016[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks017[] = {
+static constexpr const PreviewTrack TrackBlocks017[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
@@ -715,27 +715,27 @@ static constexpr const rct_preview_track TrackBlocks017[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks018[] = {
+static constexpr const PreviewTrack TrackBlocks018[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks019[] = {
+static constexpr const PreviewTrack TrackBlocks019[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks020[] = {
+static constexpr const PreviewTrack TrackBlocks020[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks021[] = {
+static constexpr const PreviewTrack TrackBlocks021[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks022[] = {
+static constexpr const PreviewTrack TrackBlocks022[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
@@ -746,7 +746,7 @@ static constexpr const rct_preview_track TrackBlocks022[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks023[] = {
+static constexpr const PreviewTrack TrackBlocks023[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
@@ -757,57 +757,57 @@ static constexpr const rct_preview_track TrackBlocks023[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks024[] = {
+static constexpr const PreviewTrack TrackBlocks024[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks025[] = {
+static constexpr const PreviewTrack TrackBlocks025[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks026[] = {
+static constexpr const PreviewTrack TrackBlocks026[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks027[] = {
+static constexpr const PreviewTrack TrackBlocks027[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks028[] = {
+static constexpr const PreviewTrack TrackBlocks028[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks029[] = {
+static constexpr const PreviewTrack TrackBlocks029[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks030[] = {
+static constexpr const PreviewTrack TrackBlocks030[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks031[] = {
+static constexpr const PreviewTrack TrackBlocks031[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks032[] = {
+static constexpr const PreviewTrack TrackBlocks032[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks033[] = {
+static constexpr const PreviewTrack TrackBlocks033[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks034[] = {
+static constexpr const PreviewTrack TrackBlocks034[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     { 1, 0, -32, 16, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 16, { 0b0111, 0b0100 }, 0 },
@@ -818,7 +818,7 @@ static constexpr const rct_preview_track TrackBlocks034[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks035[] = {
+static constexpr const PreviewTrack TrackBlocks035[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     { 1, 0, 32, 16, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 16, { 0b1011, 0b1000 }, 0 },
@@ -829,7 +829,7 @@ static constexpr const rct_preview_track TrackBlocks035[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks036[] = {
+static constexpr const PreviewTrack TrackBlocks036[] = {
     { 0, 0, 0, 48, 16, { 0b1111, 0b0011 }, 0 },
     { 1, 0, -32, 48, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 32, 16, { 0b0111, 0b0001 }, 0 },
@@ -840,7 +840,7 @@ static constexpr const rct_preview_track TrackBlocks036[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks037[] = {
+static constexpr const PreviewTrack TrackBlocks037[] = {
     { 0, 0, 0, 48, 16, { 0b1111, 0b0011 }, 0 },
     { 1, 0, 32, 48, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 32, 16, { 0b1011, 0b0010 }, 0 },
@@ -851,7 +851,7 @@ static constexpr const rct_preview_track TrackBlocks037[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks038[] = {
+static constexpr const PreviewTrack TrackBlocks038[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 2, -32, -32, 0, 0, { 0b1101, 0 }, 0 },
@@ -859,7 +859,7 @@ static constexpr const rct_preview_track TrackBlocks038[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks039[] = {
+static constexpr const PreviewTrack TrackBlocks039[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 2, -32, 32, 0, 0, { 0b1110, 0 }, 0 },
@@ -867,7 +867,7 @@ static constexpr const rct_preview_track TrackBlocks039[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks040[] = {
+static constexpr const PreviewTrack TrackBlocks040[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 96, { 0b0010, 0 }, 0 },
@@ -881,7 +881,7 @@ static constexpr const rct_preview_track TrackBlocks040[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks041[] = {
+static constexpr const PreviewTrack TrackBlocks041[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 96, { 0b0001, 0 }, 0 },
@@ -895,7 +895,7 @@ static constexpr const rct_preview_track TrackBlocks041[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks042[] = {
+static constexpr const PreviewTrack TrackBlocks042[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0010, 0 }, 0 },
@@ -903,7 +903,7 @@ static constexpr const rct_preview_track TrackBlocks042[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks043[] = {
+static constexpr const PreviewTrack TrackBlocks043[] = {
     { 0, 0, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, 0 },
@@ -911,7 +911,7 @@ static constexpr const rct_preview_track TrackBlocks043[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks044[] = {
+static constexpr const PreviewTrack TrackBlocks044[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0010, 0 }, 0 },
@@ -919,7 +919,7 @@ static constexpr const rct_preview_track TrackBlocks044[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks045[] = {
+static constexpr const PreviewTrack TrackBlocks045[] = {
     { 0, 0, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, 0 },
@@ -927,7 +927,7 @@ static constexpr const rct_preview_track TrackBlocks045[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks046[] = {
+static constexpr const PreviewTrack TrackBlocks046[] = {
     { 0, 0, 0, 0, 16, { 0b0111, 0b0100 }, 0 },
     { 1, 0, -32, 16, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0010, 0 }, 0 },
@@ -935,7 +935,7 @@ static constexpr const rct_preview_track TrackBlocks046[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks047[] = {
+static constexpr const PreviewTrack TrackBlocks047[] = {
     { 0, 0, 0, 0, 16, { 0b1011, 0b1000 }, 0 },
     { 1, 0, 32, 16, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0001, 0 }, 0 },
@@ -943,7 +943,7 @@ static constexpr const rct_preview_track TrackBlocks047[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks048[] = {
+static constexpr const PreviewTrack TrackBlocks048[] = {
     { 0, 0, 0, 16, 16,{ 0b0111, 0b0011 }, 0 },
     { 1, 0, -32, 16, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0010, 0 }, 0 },
@@ -951,7 +951,7 @@ static constexpr const rct_preview_track TrackBlocks048[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks049[] = {
+static constexpr const PreviewTrack TrackBlocks049[] = {
     { 0, 0, 0, 16, 16, { 0b1011, 0b0011 }, 0 },
     { 1, 0, 32, 16, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0001, 0 }, 0 },
@@ -959,45 +959,45 @@ static constexpr const rct_preview_track TrackBlocks049[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks050[] = {
+static constexpr const PreviewTrack TrackBlocks050[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks051[] = {
+static constexpr const PreviewTrack TrackBlocks051[] = {
     { 0, 0, 0, 0, 0, { 0b1011, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks052[] = {
+static constexpr const PreviewTrack TrackBlocks052[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 16, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks053[] = {
+static constexpr const PreviewTrack TrackBlocks053[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 16, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks054[] = {
+static constexpr const PreviewTrack TrackBlocks054[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -16, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -16, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks055[] = {
+static constexpr const PreviewTrack TrackBlocks055[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -16, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -16, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks056[] = {
+static constexpr const PreviewTrack TrackBlocks056[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 96,{ 0b0011, 0 }, 0 },
@@ -1005,7 +1005,7 @@ static constexpr const rct_preview_track TrackBlocks056[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks057[] = {
+static constexpr const PreviewTrack TrackBlocks057[] = {
     { 0, 0, 0, -32, 32, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -120, 96,{ 0b0011, 0 }, 0 },
     { 2, 0, 0, -136, 16, { 0b1111, 0b1100 }, 0 },
@@ -1013,55 +1013,55 @@ static constexpr const rct_preview_track TrackBlocks057[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks058[] = {
+static constexpr const PreviewTrack TrackBlocks058[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 24, 32, { 0b0111, 0 }, 0 },
     { 2, -32, -32, 48, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks059[] = {
+static constexpr const PreviewTrack TrackBlocks059[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 24, 32, { 0b1011, 0 }, 0 },
     { 2, -32, 32, 48, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks060[] = {
+static constexpr const PreviewTrack TrackBlocks060[] = {
     { 0, 0, 0, -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -56, 32, { 0b0111, 0 }, 0 },
     { 2, -32, -32, -80, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks061[] = {
+static constexpr const PreviewTrack TrackBlocks061[] = {
     { 0, 0, 0, -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -56, 32, { 0b1011, 0 }, 0 },
     { 2, -32, 32, -80, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks062[] = {
+static constexpr const PreviewTrack TrackBlocks062[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks063[] = {
+static constexpr const PreviewTrack TrackBlocks063[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks064[] = {
+static constexpr const PreviewTrack TrackBlocks064[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks065[] = {
+static constexpr const PreviewTrack TrackBlocks065[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks066[] = {
+static constexpr const PreviewTrack TrackBlocks066[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0 }, 0 },
     { 1, -32, -32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -1074,78 +1074,78 @@ static constexpr const rct_preview_track TrackBlocks066[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks067[] = {
+static constexpr const PreviewTrack TrackBlocks067[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 32, 0, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_1 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks068[] = {
+static constexpr const PreviewTrack TrackBlocks068[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks069[] = {
+static constexpr const PreviewTrack TrackBlocks069[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks070[] = {
+static constexpr const PreviewTrack TrackBlocks070[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks071[] = {
+static constexpr const PreviewTrack TrackBlocks071[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks072[] = {
+static constexpr const PreviewTrack TrackBlocks072[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks073[] = {
+static constexpr const PreviewTrack TrackBlocks073[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks074[] = {
+static constexpr const PreviewTrack TrackBlocks074[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks075[] = {
+static constexpr const PreviewTrack TrackBlocks075[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks076[] = {
+static constexpr const PreviewTrack TrackBlocks076[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks077[] = {
+static constexpr const PreviewTrack TrackBlocks077[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks078[] = {
+static constexpr const PreviewTrack TrackBlocks078[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks079[] = {
+static constexpr const PreviewTrack TrackBlocks079[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks080[] = {
+static constexpr const PreviewTrack TrackBlocks080[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks081[] = {
+static constexpr const PreviewTrack TrackBlocks081[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
@@ -1156,7 +1156,7 @@ static constexpr const rct_preview_track TrackBlocks081[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks082[] = {
+static constexpr const PreviewTrack TrackBlocks082[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
@@ -1167,7 +1167,7 @@ static constexpr const rct_preview_track TrackBlocks082[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks083[] = {
+static constexpr const PreviewTrack TrackBlocks083[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 2, -32, -32, 0, 0, { 0b1101, 0 }, 0 },
@@ -1175,7 +1175,7 @@ static constexpr const rct_preview_track TrackBlocks083[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks084[] = {
+static constexpr const PreviewTrack TrackBlocks084[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 2, -32, 32, 0, 0, { 0b1110, 0 }, 0 },
@@ -1183,7 +1183,7 @@ static constexpr const rct_preview_track TrackBlocks084[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks085[] = {
+static constexpr const PreviewTrack TrackBlocks085[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0010, 0 }, 0 },
@@ -1191,7 +1191,7 @@ static constexpr const rct_preview_track TrackBlocks085[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks086[] = {
+static constexpr const PreviewTrack TrackBlocks086[] = {
     { 0, 0, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, 0 },
@@ -1199,7 +1199,7 @@ static constexpr const rct_preview_track TrackBlocks086[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks087[] = {
+static constexpr const PreviewTrack TrackBlocks087[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 4, { 0b0010, 0 }, 0 },
@@ -1211,7 +1211,7 @@ static constexpr const rct_preview_track TrackBlocks087[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks088[] = {
+static constexpr const PreviewTrack TrackBlocks088[] = {
     { 0, 0, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0b0000 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 4, { 0b0001, 0 }, 0 },
@@ -1223,7 +1223,7 @@ static constexpr const rct_preview_track TrackBlocks088[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks089[] = {
+static constexpr const PreviewTrack TrackBlocks089[] = {
     { 0, 0, 0, 8, 4, { 0b0111, 0 }, 0 },
     { 1, 0, -32, 8, 4, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 8, 0, { 0b0010, 0 }, 0 },
@@ -1235,7 +1235,7 @@ static constexpr const rct_preview_track TrackBlocks089[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks090[] = {
+static constexpr const PreviewTrack TrackBlocks090[] = {
     { 0, 0, 0, 8, 4, { 0b1011, 0 }, 0 },
     { 1, 0, 32, 8, 4, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 8, 0, { 0b0001, 0 }, 0 },
@@ -1247,7 +1247,7 @@ static constexpr const rct_preview_track TrackBlocks090[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks091[] = {
+static constexpr const PreviewTrack TrackBlocks091[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
@@ -1265,7 +1265,7 @@ static constexpr const rct_preview_track TrackBlocks091[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks092[] = {
+static constexpr const PreviewTrack TrackBlocks092[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
@@ -1283,7 +1283,7 @@ static constexpr const rct_preview_track TrackBlocks092[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks093[] = {
+static constexpr const PreviewTrack TrackBlocks093[] = {
     { 0, 0, 0, 8, 4, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 8, 4, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 8, 4, { 0b0111, 0 }, 0 },
@@ -1301,7 +1301,7 @@ static constexpr const rct_preview_track TrackBlocks093[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks094[] = {
+static constexpr const PreviewTrack TrackBlocks094[] = {
     { 0, 0, 0, 8, 4, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 8, 4, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 8, 4, { 0b1011, 0 }, 0 },
@@ -1319,42 +1319,42 @@ static constexpr const rct_preview_track TrackBlocks094[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks095[] = {
+static constexpr const PreviewTrack TrackBlocks095[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks096[] = {
+static constexpr const PreviewTrack TrackBlocks096[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks097[] = {
+static constexpr const PreviewTrack TrackBlocks097[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks098[] = {
+static constexpr const PreviewTrack TrackBlocks098[] = {
     { 0, 0, 0, 0, 64, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks099[] = {
+static constexpr const PreviewTrack TrackBlocks099[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks100[] = {
+static constexpr const PreviewTrack TrackBlocks100[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks101[] = {
+static constexpr const PreviewTrack TrackBlocks101[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks102[] = {
+static constexpr const PreviewTrack TrackBlocks102[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
@@ -1365,7 +1365,7 @@ static constexpr const rct_preview_track TrackBlocks102[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks103[] = {
+static constexpr const PreviewTrack TrackBlocks103[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
@@ -1376,7 +1376,7 @@ static constexpr const rct_preview_track TrackBlocks103[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks104[] = {
+static constexpr const PreviewTrack TrackBlocks104[] = {
     { 0, 0, 0, 0, 12, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 12, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 12, { 0b0111, 0 }, 0 },
@@ -1387,7 +1387,7 @@ static constexpr const rct_preview_track TrackBlocks104[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks105[] = {
+static constexpr const PreviewTrack TrackBlocks105[] = {
     { 0, 0, 0, 0, 12, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 12, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 12, { 0b1011, 0 }, 0 },
@@ -1398,7 +1398,7 @@ static constexpr const rct_preview_track TrackBlocks105[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks106[] = {
+static constexpr const PreviewTrack TrackBlocks106[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0111, 0 }, 0 },
@@ -1409,7 +1409,7 @@ static constexpr const rct_preview_track TrackBlocks106[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks107[] = {
+static constexpr const PreviewTrack TrackBlocks107[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b1011, 0 }, 0 },
@@ -1420,7 +1420,7 @@ static constexpr const rct_preview_track TrackBlocks107[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks108[] = {
+static constexpr const PreviewTrack TrackBlocks108[] = {
     { 0, 0, 0, 0, 12, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 12, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 12, { 0b0111, 0 }, 0 },
@@ -1431,7 +1431,7 @@ static constexpr const rct_preview_track TrackBlocks108[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks109[] = {
+static constexpr const PreviewTrack TrackBlocks109[] = {
     { 0, 0, 0, 0, 12, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 12, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 12, { 0b1011, 0 }, 0 },
@@ -1442,42 +1442,42 @@ static constexpr const rct_preview_track TrackBlocks109[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks110[] = {
+static constexpr const PreviewTrack TrackBlocks110[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks111[] = {
+static constexpr const PreviewTrack TrackBlocks111[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks112[] = {
+static constexpr const PreviewTrack TrackBlocks112[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks113[] = {
+static constexpr const PreviewTrack TrackBlocks113[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks114[] = {
+static constexpr const PreviewTrack TrackBlocks114[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks115[] = {
+static constexpr const PreviewTrack TrackBlocks115[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks116[] = {
+static constexpr const PreviewTrack TrackBlocks116[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks117[] = {
+static constexpr const PreviewTrack TrackBlocks117[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 16, { 0b1111, 0 }, 0 },
@@ -1486,7 +1486,7 @@ static constexpr const rct_preview_track TrackBlocks117[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks118[] = {
+static constexpr const PreviewTrack TrackBlocks118[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 16, 24, { 0b1111, 0 }, 0 },
@@ -1494,7 +1494,7 @@ static constexpr const rct_preview_track TrackBlocks118[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks119[] = {
+static constexpr const PreviewTrack TrackBlocks119[] = {
     { 0, 0, 0, 0, 48, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 40, 48, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 64, 24, { 0b1111, 0 }, 0 },
@@ -1502,12 +1502,12 @@ static constexpr const rct_preview_track TrackBlocks119[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks120[] = {
+static constexpr const PreviewTrack TrackBlocks120[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks121[] = {
+static constexpr const PreviewTrack TrackBlocks121[] = {
     { 0, 0, 0, 40, 48, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 16, 24, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 16, { 0b1111, 0 }, 0 },
@@ -1515,7 +1515,7 @@ static constexpr const rct_preview_track TrackBlocks121[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks122[] = {
+static constexpr const PreviewTrack TrackBlocks122[] = {
     { 0, 0, 0, 80, 8, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 64, 24, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 40, 48, { 0b1111, 0 }, 0 },
@@ -1523,7 +1523,7 @@ static constexpr const rct_preview_track TrackBlocks122[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks123[] = {
+static constexpr const PreviewTrack TrackBlocks123[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     { 2, -64, 0, -32, 32, { 0b1111, 0b0011 }, 0 },
@@ -1531,7 +1531,7 @@ static constexpr const rct_preview_track TrackBlocks123[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks124[] = {
+static constexpr const PreviewTrack TrackBlocks124[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 32, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 48, { 0b1111, 0 }, 0 },
@@ -1542,52 +1542,52 @@ static constexpr const rct_preview_track TrackBlocks124[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks125[] = {
+static constexpr const PreviewTrack TrackBlocks125[] = {
     { 0, 0, 0, 0, 48, { 0b1111, 0 }, 0 },
     { 1, 32, 0, 0, 48, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks126[] = {
+static constexpr const PreviewTrack TrackBlocks126[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks127[] = {
+static constexpr const PreviewTrack TrackBlocks127[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks128[] = {
+static constexpr const PreviewTrack TrackBlocks128[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks129[] = {
+static constexpr const PreviewTrack TrackBlocks129[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b0011 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks130[] = {
+static constexpr const PreviewTrack TrackBlocks130[] = {
     { 0, 0, 0, 0, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks131[] = {
+static constexpr const PreviewTrack TrackBlocks131[] = {
     { 0, 0, 0, 0, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks132[] = {
+static constexpr const PreviewTrack TrackBlocks132[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks133[] = {
+static constexpr const PreviewTrack TrackBlocks133[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, -32, 0, 0, { 0b1000, 0 }, 0 },
@@ -1596,7 +1596,7 @@ static constexpr const rct_preview_track TrackBlocks133[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks134[] = {
+static constexpr const PreviewTrack TrackBlocks134[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 32, 0, 0, { 0b0100, 0 }, 0 },
@@ -1605,7 +1605,7 @@ static constexpr const rct_preview_track TrackBlocks134[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks135[] = {
+static constexpr const PreviewTrack TrackBlocks135[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b0001, 0 }, 0 },
     { 2, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1614,7 +1614,7 @@ static constexpr const rct_preview_track TrackBlocks135[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks136[] = {
+static constexpr const PreviewTrack TrackBlocks136[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1623,7 +1623,7 @@ static constexpr const rct_preview_track TrackBlocks136[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks137[] = {
+static constexpr const PreviewTrack TrackBlocks137[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, -32, 0, 0, { 0b1000, 0 }, 0 },
@@ -1632,7 +1632,7 @@ static constexpr const rct_preview_track TrackBlocks137[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks138[] = {
+static constexpr const PreviewTrack TrackBlocks138[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 32, 0, 0, { 0b0100, 0 }, 0 },
@@ -1641,7 +1641,7 @@ static constexpr const rct_preview_track TrackBlocks138[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks139[] = {
+static constexpr const PreviewTrack TrackBlocks139[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b0001, 0 }, 0 },
     { 2, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1650,7 +1650,7 @@ static constexpr const rct_preview_track TrackBlocks139[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks140[] = {
+static constexpr const PreviewTrack TrackBlocks140[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1659,7 +1659,7 @@ static constexpr const rct_preview_track TrackBlocks140[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks141[] = {
+static constexpr const PreviewTrack TrackBlocks141[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1667,7 +1667,7 @@ static constexpr const rct_preview_track TrackBlocks141[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks142[] = {
+static constexpr const PreviewTrack TrackBlocks142[] = {
     { 0, 0, 0, 0, 16, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 16, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 16, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1675,7 +1675,7 @@ static constexpr const rct_preview_track TrackBlocks142[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks143[] = {
+static constexpr const PreviewTrack TrackBlocks143[] = {
     { 0, 0, 0, 0, 64, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 64, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 64, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1683,7 +1683,7 @@ static constexpr const rct_preview_track TrackBlocks143[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks144[] = {
+static constexpr const PreviewTrack TrackBlocks144[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1691,7 +1691,7 @@ static constexpr const rct_preview_track TrackBlocks144[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks145[] = {
+static constexpr const PreviewTrack TrackBlocks145[] = {
     { 0, 0, 0, 0, 32, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 32, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 32, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1699,7 +1699,7 @@ static constexpr const rct_preview_track TrackBlocks145[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks146[] = {
+static constexpr const PreviewTrack TrackBlocks146[] = {
     { 0, 0, 0, 0, 32, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 32, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 32, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1707,7 +1707,7 @@ static constexpr const rct_preview_track TrackBlocks146[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks147[] = {
+static constexpr const PreviewTrack TrackBlocks147[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1715,7 +1715,7 @@ static constexpr const rct_preview_track TrackBlocks147[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks148[] = {
+static constexpr const PreviewTrack TrackBlocks148[] = {
     { 0, 0, 0, 0, 16, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 16, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 16, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1723,7 +1723,7 @@ static constexpr const rct_preview_track TrackBlocks148[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks149[] = {
+static constexpr const PreviewTrack TrackBlocks149[] = {
     { 0, 0, 0, 0, 64, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 64, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 64, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1731,7 +1731,7 @@ static constexpr const rct_preview_track TrackBlocks149[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks150[] = {
+static constexpr const PreviewTrack TrackBlocks150[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1739,7 +1739,7 @@ static constexpr const rct_preview_track TrackBlocks150[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks151[] = {
+static constexpr const PreviewTrack TrackBlocks151[] = {
     { 0, 0, 0, 0, 32, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 32, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 32, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1747,7 +1747,7 @@ static constexpr const rct_preview_track TrackBlocks151[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks152[] = {
+static constexpr const PreviewTrack TrackBlocks152[] = {
     { 0, 0, 0, 0, 32, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 32, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 32, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1755,7 +1755,7 @@ static constexpr const rct_preview_track TrackBlocks152[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks153[] = {
+static constexpr const PreviewTrack TrackBlocks153[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1763,7 +1763,7 @@ static constexpr const rct_preview_track TrackBlocks153[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks154[] = {
+static constexpr const PreviewTrack TrackBlocks154[] = {
     { 0, 0, 0, 0, 24, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 24, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 24, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1771,7 +1771,7 @@ static constexpr const rct_preview_track TrackBlocks154[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks155[] = {
+static constexpr const PreviewTrack TrackBlocks155[] = {
     { 0, 0, 0, 0, 24, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 24, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 24, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1779,7 +1779,7 @@ static constexpr const rct_preview_track TrackBlocks155[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks156[] = {
+static constexpr const PreviewTrack TrackBlocks156[] = {
     { 0, 0, 0, 0, 24, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 24, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 24, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1787,7 +1787,7 @@ static constexpr const rct_preview_track TrackBlocks156[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks157[] = {
+static constexpr const PreviewTrack TrackBlocks157[] = {
     { 0, 0, 0, 0, 24, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 24, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 24, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1795,7 +1795,7 @@ static constexpr const rct_preview_track TrackBlocks157[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks158[] = {
+static constexpr const PreviewTrack TrackBlocks158[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1803,7 +1803,7 @@ static constexpr const rct_preview_track TrackBlocks158[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks159[] = {
+static constexpr const PreviewTrack TrackBlocks159[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1811,7 +1811,7 @@ static constexpr const rct_preview_track TrackBlocks159[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks160[] = {
+static constexpr const PreviewTrack TrackBlocks160[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1819,7 +1819,7 @@ static constexpr const rct_preview_track TrackBlocks160[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks161[] = {
+static constexpr const PreviewTrack TrackBlocks161[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1827,7 +1827,7 @@ static constexpr const rct_preview_track TrackBlocks161[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks162[] = {
+static constexpr const PreviewTrack TrackBlocks162[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1835,7 +1835,7 @@ static constexpr const rct_preview_track TrackBlocks162[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks163[] = {
+static constexpr const PreviewTrack TrackBlocks163[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1843,7 +1843,7 @@ static constexpr const rct_preview_track TrackBlocks163[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks164[] = {
+static constexpr const PreviewTrack TrackBlocks164[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1851,7 +1851,7 @@ static constexpr const rct_preview_track TrackBlocks164[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks165[] = {
+static constexpr const PreviewTrack TrackBlocks165[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1859,7 +1859,7 @@ static constexpr const rct_preview_track TrackBlocks165[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks166[] = {
+static constexpr const PreviewTrack TrackBlocks166[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1867,7 +1867,7 @@ static constexpr const rct_preview_track TrackBlocks166[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks167[] = {
+static constexpr const PreviewTrack TrackBlocks167[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1875,7 +1875,7 @@ static constexpr const rct_preview_track TrackBlocks167[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks168[] = {
+static constexpr const PreviewTrack TrackBlocks168[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1883,7 +1883,7 @@ static constexpr const rct_preview_track TrackBlocks168[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks169[] = {
+static constexpr const PreviewTrack TrackBlocks169[] = {
     { 0, 0, 0, 0, 8, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 8, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1891,7 +1891,7 @@ static constexpr const rct_preview_track TrackBlocks169[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks170[] = {
+static constexpr const PreviewTrack TrackBlocks170[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1899,7 +1899,7 @@ static constexpr const rct_preview_track TrackBlocks170[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks171[] = {
+static constexpr const PreviewTrack TrackBlocks171[] = {
     { 0, 0, 0, 0, 0, { 0b1101, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 0, { 0b0001, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
@@ -1907,45 +1907,45 @@ static constexpr const rct_preview_track TrackBlocks171[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks172[] = {
+static constexpr const PreviewTrack TrackBlocks172[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks173[] = {
+static constexpr const PreviewTrack TrackBlocks173[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks174[] = {
+static constexpr const PreviewTrack TrackBlocks174[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks175[] = {
+static constexpr const PreviewTrack TrackBlocks175[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks176[] = {
+static constexpr const PreviewTrack TrackBlocks176[] = {
     { 0, 0, 0, -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -32, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -32, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks177[] = {
+static constexpr const PreviewTrack TrackBlocks177[] = {
     { 0, 0, 0, -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -32, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -32, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks178[] = {
+static constexpr const PreviewTrack TrackBlocks178[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0b0100 }, 0 },
     { 1, 0, -32, 0, 16, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 16, { 0b0010, 0 }, 0 },
@@ -1953,7 +1953,7 @@ static constexpr const rct_preview_track TrackBlocks178[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks179[] = {
+static constexpr const PreviewTrack TrackBlocks179[] = {
     { 0, 0, 0, 0, 16, { 0b1011, 0b1000 }, 0 },
     { 1, 0, 32, 0, 16, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 16, { 0b0001, 0 }, 0 },
@@ -1961,7 +1961,7 @@ static constexpr const rct_preview_track TrackBlocks179[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks180[] = {
+static constexpr const PreviewTrack TrackBlocks180[] = {
     { 0, 0, 0, 16, 16,{ 0b0111, 0b0011 }, 0 },
     { 1, 0, -32, 0, 16, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 16, { 0b0010, 0 }, 0 },
@@ -1969,7 +1969,7 @@ static constexpr const rct_preview_track TrackBlocks180[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks181[] = {
+static constexpr const PreviewTrack TrackBlocks181[] = {
     { 0, 0, 0, 16, 16, { 0b1011, 0b0011 }, 0 },
     { 1, 0, 32, 0, 16, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 16, { 0b0001, 0 }, 0 },
@@ -1977,12 +1977,12 @@ static constexpr const rct_preview_track TrackBlocks181[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks182[] = {
+static constexpr const PreviewTrack TrackBlocks182[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks183[] = {
+static constexpr const PreviewTrack TrackBlocks183[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 40, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 56, { 0b1111, 0 }, 0 },
@@ -1993,7 +1993,7 @@ static constexpr const rct_preview_track TrackBlocks183[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks184[] = {
+static constexpr const PreviewTrack TrackBlocks184[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 40, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 56, { 0b1111, 0 }, 0 },
@@ -2004,7 +2004,7 @@ static constexpr const rct_preview_track TrackBlocks184[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks185[] = {
+static constexpr const PreviewTrack TrackBlocks185[] = {
     { 0, 0, 0, -32, 24, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -216, 192, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -160, 96, { 0b1111, 0 }, 0 },
@@ -2015,7 +2015,7 @@ static constexpr const rct_preview_track TrackBlocks185[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks186[] = {
+static constexpr const PreviewTrack TrackBlocks186[] = {
     { 0, 0, 0, -32, 24, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -216, 192, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -160, 96, { 0b1111, 0 }, 0 },
@@ -2026,35 +2026,35 @@ static constexpr const rct_preview_track TrackBlocks186[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks187[] = {
+static constexpr const PreviewTrack TrackBlocks187[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -16, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -16, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks188[] = {
+static constexpr const PreviewTrack TrackBlocks188[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -16, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -16, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks189[] = {
+static constexpr const PreviewTrack TrackBlocks189[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 16, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks190[] = {
+static constexpr const PreviewTrack TrackBlocks190[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 16, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks191[] = {
+static constexpr const PreviewTrack TrackBlocks191[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 96,{ 0b0011, 0 }, 0 },
@@ -2062,7 +2062,7 @@ static constexpr const rct_preview_track TrackBlocks191[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks192[] = {
+static constexpr const PreviewTrack TrackBlocks192[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -88, 96,{ 0b0011, 0 }, 0 },
     { 2, 0, 0, -104, 16, { 0b1111, 0b1100 }, 0 },
@@ -2070,35 +2070,35 @@ static constexpr const rct_preview_track TrackBlocks192[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks193[] = {
+static constexpr const PreviewTrack TrackBlocks193[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 24, 32, { 0b0111, 0 }, 0 },
     { 2, -32, -32, 48, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks194[] = {
+static constexpr const PreviewTrack TrackBlocks194[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 24, 32, { 0b1011, 0 }, 0 },
     { 2, -32, 32, 48, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks195[] = {
+static constexpr const PreviewTrack TrackBlocks195[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -24, 32, { 0b0111, 0 }, 0 },
     { 2, -32, -32, -48, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks196[] = {
+static constexpr const PreviewTrack TrackBlocks196[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -24, 32, { 0b1011, 0 }, 0 },
     { 2, -32, 32, -48, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks197[] = {
+static constexpr const PreviewTrack TrackBlocks197[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 32, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 16, 0, { 0b1111, 0 }, 0 },
@@ -2106,7 +2106,7 @@ static constexpr const rct_preview_track TrackBlocks197[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks198[] = {
+static constexpr const PreviewTrack TrackBlocks198[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -32, 32, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -16, 0, { 0b1111, 0 }, 0 },
@@ -2114,7 +2114,7 @@ static constexpr const rct_preview_track TrackBlocks198[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks199[] = {
+static constexpr const PreviewTrack TrackBlocks199[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2124,7 +2124,7 @@ static constexpr const rct_preview_track TrackBlocks199[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks200[] = {
+static constexpr const PreviewTrack TrackBlocks200[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2134,39 +2134,39 @@ static constexpr const rct_preview_track TrackBlocks200[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks201[] = {
+static constexpr const PreviewTrack TrackBlocks201[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks202[] = {
+static constexpr const PreviewTrack TrackBlocks202[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks203[] = {
+static constexpr const PreviewTrack TrackBlocks203[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks204[] = {
+static constexpr const PreviewTrack TrackBlocks204[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 32, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks205[] = {
+static constexpr const PreviewTrack TrackBlocks205[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, -32, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks206[] = {
+static constexpr const PreviewTrack TrackBlocks206[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, -32, 0, -40, 32, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 2, -64, 0, -96, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
@@ -2174,14 +2174,14 @@ static constexpr const rct_preview_track TrackBlocks206[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks207[] = {
+static constexpr const PreviewTrack TrackBlocks207[] = {
     { 0, 0, 0, 0, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 56, 32, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 2, 64, 0, 96, 16, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks208[] = {
+static constexpr const PreviewTrack TrackBlocks208[] = {
     { 0, 0, 0, -32, 16, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, -32, 0, -72, 32, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 2, -64, 0, -128, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
@@ -2189,7 +2189,7 @@ static constexpr const rct_preview_track TrackBlocks208[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks209[] = {
+static constexpr const PreviewTrack TrackBlocks209[] = {
     { 0, 0, 0, 0, 0, { 0b0111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0010, 0 }, 0 },
@@ -2197,7 +2197,7 @@ static constexpr const rct_preview_track TrackBlocks209[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks210[] = {
+static constexpr const PreviewTrack TrackBlocks210[] = {
     { 0, 0, 0, 0, 0, { 0b1011, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 0, 8, { 0b0001, 0 }, 0 },
@@ -2205,7 +2205,7 @@ static constexpr const rct_preview_track TrackBlocks210[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks211[] = {
+static constexpr const PreviewTrack TrackBlocks211[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, -32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, -32, 0, 0, { 0b1111, 0 }, 0 },
@@ -2215,7 +2215,7 @@ static constexpr const rct_preview_track TrackBlocks211[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks212[] = {
+static constexpr const PreviewTrack TrackBlocks212[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 32, 0, 0, { 0b1111, 0 }, 0 },
@@ -2225,7 +2225,7 @@ static constexpr const rct_preview_track TrackBlocks212[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks213[] = {
+static constexpr const PreviewTrack TrackBlocks213[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0 }, 0 },
     { 1, 32, 0, 0, 32, { 0b1111, 0 }, 0 },
     { 2, -64, 0, 0, 32, { 0b1111, 0 }, 0 },
@@ -2233,13 +2233,13 @@ static constexpr const rct_preview_track TrackBlocks213[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks214[] = {
+static constexpr const PreviewTrack TrackBlocks214[] = {
     { 0, 0, 0, 0, 48, { 0b1111, 0 }, 0 },
     { 1, 32, 0, 0, 48, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks215[] = {
+static constexpr const PreviewTrack TrackBlocks215[] = {
     { 0, 0, 0, 0, 208, { 0b1111, 0 }, 0 },
     { 1, 32, 0, 0, 208, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 160, { 0b1111, 0 }, 0 },
@@ -2250,12 +2250,12 @@ static constexpr const rct_preview_track TrackBlocks215[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks216[] = {
+static constexpr const PreviewTrack TrackBlocks216[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks217[] = {
+static constexpr const PreviewTrack TrackBlocks217[] = {
     { 0, 0, 0, 0, 16, { 0b0111, 0b0100 }, 0 },
     { 1, 0, -32, 16, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0010, 0 }, 0 },
@@ -2263,7 +2263,7 @@ static constexpr const rct_preview_track TrackBlocks217[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks218[] = {
+static constexpr const PreviewTrack TrackBlocks218[] = {
     { 0, 0, 0, 0, 16, { 0b1011, 0b1000 }, 0 },
     { 1, 0, 32, 16, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0001, 0 }, 0 },
@@ -2271,7 +2271,7 @@ static constexpr const rct_preview_track TrackBlocks218[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks219[] = {
+static constexpr const PreviewTrack TrackBlocks219[] = {
     { 0, 0, 0, 16, 16,{ 0b0111, 0b0011 }, 0 },
     { 1, 0, -32, 16, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0010, 0 }, 0 },
@@ -2279,7 +2279,7 @@ static constexpr const rct_preview_track TrackBlocks219[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks220[] = {
+static constexpr const PreviewTrack TrackBlocks220[] = {
     { 0, 0, 0, 16, 16, { 0b1011, 0b0011 }, 0 },
     { 1, 0, 32, 16, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 0, { 0b0001, 0 }, 0 },
@@ -2287,7 +2287,7 @@ static constexpr const rct_preview_track TrackBlocks220[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks221[] = {
+static constexpr const PreviewTrack TrackBlocks221[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     { 1, 0, -32, 16, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 16, { 0b0111, 0b0100 }, 0 },
@@ -2298,7 +2298,7 @@ static constexpr const rct_preview_track TrackBlocks221[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks222[] = {
+static constexpr const PreviewTrack TrackBlocks222[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     { 1, 0, 32, 16, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 16, 16, { 0b1011, 0b1000 }, 0 },
@@ -2309,7 +2309,7 @@ static constexpr const rct_preview_track TrackBlocks222[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks223[] = {
+static constexpr const PreviewTrack TrackBlocks223[] = {
     { 0, 0, 0, 48, 16, { 0b1111, 0b0011 }, 0 },
     { 1, 0, -32, 48, 0, { 0b1000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 32, 16, { 0b0111, 0b0001 }, 0 },
@@ -2320,7 +2320,7 @@ static constexpr const rct_preview_track TrackBlocks223[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks224[] = {
+static constexpr const PreviewTrack TrackBlocks224[] = {
     { 0, 0, 0, 48, 16, { 0b1111, 0b0011 }, 0 },
     { 1, 0, 32, 48, 0, { 0b0100, 0 }, RCT_PREVIEW_TRACK_FLAG_0 },
     { 2, -32, 0, 32, 16, { 0b1011, 0b0010 }, 0 },
@@ -2331,158 +2331,158 @@ static constexpr const rct_preview_track TrackBlocks224[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks225[] = {
+static constexpr const PreviewTrack TrackBlocks225[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks226[] = {
+static constexpr const PreviewTrack TrackBlocks226[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks227[] = {
+static constexpr const PreviewTrack TrackBlocks227[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks228[] = {
+static constexpr const PreviewTrack TrackBlocks228[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks229[] = {
+static constexpr const PreviewTrack TrackBlocks229[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks230[] = {
+static constexpr const PreviewTrack TrackBlocks230[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks231[] = {
+static constexpr const PreviewTrack TrackBlocks231[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks232[] = {
+static constexpr const PreviewTrack TrackBlocks232[] = {
     { 0, 0, 0, 0, 16, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks233[] = {
+static constexpr const PreviewTrack TrackBlocks233[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks234[] = {
+static constexpr const PreviewTrack TrackBlocks234[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks235[] = {
+static constexpr const PreviewTrack TrackBlocks235[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks236[] = {
+static constexpr const PreviewTrack TrackBlocks236[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks237[] = {
+static constexpr const PreviewTrack TrackBlocks237[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks238[] = {
+static constexpr const PreviewTrack TrackBlocks238[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks239[] = {
+static constexpr const PreviewTrack TrackBlocks239[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks240[] = {
+static constexpr const PreviewTrack TrackBlocks240[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks241[] = {
+static constexpr const PreviewTrack TrackBlocks241[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks242[] = {
+static constexpr const PreviewTrack TrackBlocks242[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks243[] = {
+static constexpr const PreviewTrack TrackBlocks243[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks244[] = {
+static constexpr const PreviewTrack TrackBlocks244[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks245[] = {
+static constexpr const PreviewTrack TrackBlocks245[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks246[] = {
+static constexpr const PreviewTrack TrackBlocks246[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0b0011 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks247[] = {
+static constexpr const PreviewTrack TrackBlocks247[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks248[] = {
+static constexpr const PreviewTrack TrackBlocks248[] = {
     { 0, 0, 0, 0, 8, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks249[] = {
+static constexpr const PreviewTrack TrackBlocks249[] = {
     { 0, 0, 0, 0, 72, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 0, 32, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks250[] = {
+static constexpr const PreviewTrack TrackBlocks250[] = {
     { 0, 0, 0, 0, 72, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 0, -32, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks251[] = {
+static constexpr const PreviewTrack TrackBlocks251[] = {
     { 0, 0, 0, 0, 72, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 0, 32, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks252[] = {
+static constexpr const PreviewTrack TrackBlocks252[] = {
     { 0, 0, 0, 0, 72, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 0, -32, 0, 0, { 0b0000, 0 }, RCT_PREVIEW_TRACK_FLAG_0 | RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks253[] = {
+static constexpr const PreviewTrack TrackBlocks253[] = {
     { 0, 0, 0, 0, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 56, 32, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 2, 64, 0, 96, 16, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks254[] = {
+static constexpr const PreviewTrack TrackBlocks254[] = {
     { 0, 0, 0, -32, 16, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, -32, 0, -72, 32, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 2, -64, 0, -128, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
@@ -2490,19 +2490,19 @@ static constexpr const rct_preview_track TrackBlocks254[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocks255[] = {
+static constexpr const PreviewTrack TrackBlocks255[] = {
     { 0, 0, 0, 32, 56, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 1, 32, 0, 88, 32, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     { 2, 64, 0, 128, 16, { 0b1111, 0 }, RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRotationControlToggle[] = {
+static constexpr const PreviewTrack TrackBlocksRotationControlToggle[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0b1100 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack1x4A[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack1x4A[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -64, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2510,7 +2510,7 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack1x4A[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack2x2[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack2x2[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, 32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2518,7 +2518,7 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack2x2[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack4x4[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack4x4[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, 0, 64, 0, 0, { 0b1111, 0 }, 0 },
@@ -2538,7 +2538,7 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack4x4[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack2x4[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack2x4[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, 0, 32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, 0, 64, 0, 0, { 0b1111, 0 }, 0 },
@@ -2550,7 +2550,7 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack2x4[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack1x5[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack1x5[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -64, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2559,12 +2559,12 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack1x5[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack1x1A[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack1x1A[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack1x4B[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack1x4B[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -64, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2572,12 +2572,12 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack1x4B[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack1x1B[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack1x1B[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack1x4C[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack1x4C[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -64, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2585,7 +2585,7 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack1x4C[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlatTrack3x3[] = {
+static constexpr const PreviewTrack TrackBlocksFlatTrack3x3[] = {
     { 0, 0, 0, 0, 0, { 0b1111, 0 }, 0 },
     { 1, -32, -32, 0, 0, { 0b1111, 0 }, 0 },
     { 2, -32, 0, 0, 0, { 0b1111, 0 }, 0 },
@@ -2599,7 +2599,7 @@ static constexpr const rct_preview_track TrackBlocksFlatTrack3x3[] = {
 };
 
 
-static constexpr const rct_preview_track TrackBlocksLeftLargeCorkscrewUp[] = {
+static constexpr const PreviewTrack TrackBlocksLeftLargeCorkscrewUp[] = {
     { 0,   0,   0,  0, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  8, 32, { 0b1111, 0 }, 0 },
     { 2, -64,   0, 32, 24, { 0b0111, 0 }, 0 },
@@ -2609,7 +2609,7 @@ static constexpr const rct_preview_track TrackBlocksLeftLargeCorkscrewUp[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightLargeCorkscrewUp[] = {
+static constexpr const PreviewTrack TrackBlocksRightLargeCorkscrewUp[] = {
     { 0,   0,   0 ,  0, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0,   8, 32, { 0b1111, 0 }, 0 },
     { 2, -64,   0,  32, 24, { 0b1011, 0 }, 0 },
@@ -2619,7 +2619,7 @@ static constexpr const rct_preview_track TrackBlocksRightLargeCorkscrewUp[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftLargeCorkscrewDown[] = {
+static constexpr const PreviewTrack TrackBlocksLeftLargeCorkscrewDown[] = {
     { 0,   0,   0 ,  -40, 24, { 0b1111, 0 }, 0 },
     { 1, -32,   0,   -64, 40, { 0b1111, 0 }, 0 },
     { 2, -32, -32,   -80, 24, { 0b1000, 0 }, 0 },
@@ -2629,7 +2629,7 @@ static constexpr const rct_preview_track TrackBlocksLeftLargeCorkscrewDown[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightLargeCorkscrewDown[] = {
+static constexpr const PreviewTrack TrackBlocksRightLargeCorkscrewDown[] = {
     { 0,   0,   0 ,  -40, 24, { 0b1111, 0 }, 0 },
     { 1, -32,   0,   -64, 40, { 0b1111, 0 }, 0 },
     { 2, -32,  32,   -80, 24, { 0b0100, 0 }, 0 },
@@ -2639,7 +2639,7 @@ static constexpr const rct_preview_track TrackBlocksRightLargeCorkscrewDown[] =
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftMediumHalfLoopUp[] = {
+static constexpr const PreviewTrack TrackBlocksLeftMediumHalfLoopUp[] = {
     { 0,   0,   0,  0, 24, { 0b1111, 0 }, 0 },
     { 1, -32,   0, 16, 48, { 0b1111, 0 }, 0 },
     { 2, -64,   0, 56,120, { 0b1111, 0 }, 0 },
@@ -2648,7 +2648,7 @@ static constexpr const rct_preview_track TrackBlocksLeftMediumHalfLoopUp[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightMediumHalfLoopUp[] = {
+static constexpr const PreviewTrack TrackBlocksRightMediumHalfLoopUp[] = {
     { 0,   0,   0,  0, 24, { 0b1111, 0 }, 0 },
     { 1, -32,   0, 16, 48, { 0b1111, 0 }, 0 },
     { 2, -64,   0, 56,120, { 0b1111, 0 }, 0 },
@@ -2657,7 +2657,7 @@ static constexpr const rct_preview_track TrackBlocksRightMediumHalfLoopUp[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftMediumHalfLoopDown[] = {
+static constexpr const PreviewTrack TrackBlocksLeftMediumHalfLoopDown[] = {
     { 0,   0,   0,  -48, 24, { 0b1111, 0 }, 0 },
     { 1, -32,   0, -160,120, { 0b1111, 0 }, 0 },
     { 2, -32, -32, -160,120, { 0b1111, 0 }, 0 },
@@ -2666,7 +2666,7 @@ static constexpr const rct_preview_track TrackBlocksLeftMediumHalfLoopDown[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightMediumHalfLoopDown[] = {
+static constexpr const PreviewTrack TrackBlocksRightMediumHalfLoopDown[] = {
     { 0,   0,   0 ,  -48,  24, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  -160, 120, { 0b1111, 0 }, 0 },
     { 2, -32,  32,  -160, 120, { 0b1111, 0 }, 0 },
@@ -2675,28 +2675,28 @@ static constexpr const rct_preview_track TrackBlocksRightMediumHalfLoopDown[] =
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftZeroGRollUp[] = {
+static constexpr const PreviewTrack TrackBlocksLeftZeroGRollUp[] = {
     { 0,   0,   0,  0, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  8, 24, { 0b1111, 0 }, 0 },
     { 2, -64,   0,  24, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightZeroGRollUp[] = {
+static constexpr const PreviewTrack TrackBlocksRightZeroGRollUp[] = {
     { 0,   0,   0,  0, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  8, 24, { 0b1111, 0 }, 0 },
     { 2, -64,   0,  24, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftZeroGRollDown[] = {
+static constexpr const PreviewTrack TrackBlocksLeftZeroGRollDown[] = {
     { 0,   0,   0, -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0, -48, 24, { 0b1111, 0 }, 0 },
     { 2, -64,   0, -56, 16, { 0b1111, 0 }, 0 },
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightZeroGRollDown[] = {
+static constexpr const PreviewTrack TrackBlocksRightZeroGRollDown[] = {
     { 0,   0,   0 ,-32, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0, -48, 24, { 0b1111, 0 }, 0 },
     { 2, -64,   0, -56, 16, { 0b1111, 0 }, 0 },
@@ -2704,7 +2704,7 @@ static constexpr const rct_preview_track TrackBlocksRightZeroGRollDown[] = {
 };
 
 
-static constexpr const rct_preview_track TrackBlocksLeftLargeZeroGRollUp[] = {
+static constexpr const PreviewTrack TrackBlocksLeftLargeZeroGRollUp[] = {
     { 0,   0,   0,  0, 64, { 0b1111, 0 }, 0 },
     { 1, -32,   0, 56, 48, { 0b1111, 0 }, 0 },
     { 2, -64,   0, 96, 40, { 0b1111, 0 }, 0 },
@@ -2712,7 +2712,7 @@ static constexpr const rct_preview_track TrackBlocksLeftLargeZeroGRollUp[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightLargeZeroGRollUp[] = {
+static constexpr const PreviewTrack TrackBlocksRightLargeZeroGRollUp[] = {
     { 0,   0,   0,   0, 64, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  56, 48, { 0b1111, 0 }, 0 },
     { 2, -64,   0,  96, 40, { 0b1111, 0 }, 0 },
@@ -2720,7 +2720,7 @@ static constexpr const rct_preview_track TrackBlocksRightLargeZeroGRollUp[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftLargeZeroGRollDown[] = {
+static constexpr const PreviewTrack TrackBlocksLeftLargeZeroGRollDown[] = {
     { 0,   0,   0,  -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  -56, 40, { 0b1111, 0 }, 0 },
     { 2, -64,   0,  -96, 48, { 0b1111, 0 }, 0 },
@@ -2728,7 +2728,7 @@ static constexpr const rct_preview_track TrackBlocksLeftLargeZeroGRollDown[] = {
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightLargeZeroGRollDown[] = {
+static constexpr const PreviewTrack TrackBlocksRightLargeZeroGRollDown[] = {
     { 0,   0,   0 , -32, 16, { 0b1111, 0 }, 0 },
     { 1, -32,   0,  -56, 40, { 0b1111, 0 }, 0 },
     { 2, -64,   0,  -96, 48, { 0b1111, 0 }, 0 },
@@ -2736,7 +2736,7 @@ static constexpr const rct_preview_track TrackBlocksRightLargeZeroGRollDown[] =
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopUninvertedUp[] = {
+static constexpr const PreviewTrack TrackBlocksLeftFlyerLargeHalfLoopUninvertedUp[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 40, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 56, { 0b1111, 0 }, 0 },
@@ -2747,7 +2747,7 @@ static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopUninve
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopUninvertedUp[] = {
+static constexpr const PreviewTrack TrackBlocksRightFlyerLargeHalfLoopUninvertedUp[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 40, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 56, { 0b1111, 0 }, 0 },
@@ -2759,7 +2759,7 @@ static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopUninv
 };
 
 
-static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopInvertedUp[] = {
+static constexpr const PreviewTrack TrackBlocksLeftFlyerLargeHalfLoopInvertedUp[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 40, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 56, { 0b1111, 0 }, 0 },
@@ -2770,7 +2770,7 @@ static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopInvert
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopInvertedUp[] = {
+static constexpr const PreviewTrack TrackBlocksRightFlyerLargeHalfLoopInvertedUp[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 40, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 56, { 0b1111, 0 }, 0 },
@@ -2781,7 +2781,7 @@ static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopInver
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopInvertedDown[] = {
+static constexpr const PreviewTrack TrackBlocksRightFlyerLargeHalfLoopInvertedDown[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -184, 192, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -128, 96, { 0b1111, 0 }, 0 },
@@ -2792,7 +2792,7 @@ static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopInver
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopInvertedDown[] = {
+static constexpr const PreviewTrack TrackBlocksLeftFlyerLargeHalfLoopInvertedDown[] = {
     { 0, 0, 0, 0, 24, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -184, 192, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -128, 96, { 0b1111, 0 }, 0 },
@@ -2803,7 +2803,7 @@ static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopInvert
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopUninvertedDown[] = {
+static constexpr const PreviewTrack TrackBlocksRightFlyerLargeHalfLoopUninvertedDown[] = {
     { 0, 0, 0, -32, 40, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -216, 192, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -160, 96, { 0b1111, 0 }, 0 },
@@ -2814,7 +2814,7 @@ static constexpr const rct_preview_track TrackBlocksRightFlyerLargeHalfLoopUninv
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopUninvertedDown[] = {
+static constexpr const PreviewTrack TrackBlocksLeftFlyerLargeHalfLoopUninvertedDown[] = {
     { 0, 0, 0, -32, 40, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -216, 192, { 0b1111, 0 }, 0 },
     { 2, -64, 0, -160, 96, { 0b1111, 0 }, 0 },
@@ -2825,7 +2825,7 @@ static constexpr const rct_preview_track TrackBlocksLeftFlyerLargeHalfLoopUninve
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlyerHalfLoopUpInverted[] = {
+static constexpr const PreviewTrack TrackBlocksFlyerHalfLoopUpInverted[] = {
     { 0, 0, 0, 0, 32, { 0b1111, 0b1100 }, 0 },
     { 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
     { 2, -64, 0, 32, 96,{ 0b0011, 0 }, 0 },
@@ -2833,7 +2833,7 @@ static constexpr const rct_preview_track TrackBlocksFlyerHalfLoopUpInverted[] =
     TRACK_BLOCK_END
 };
 
-static constexpr const rct_preview_track TrackBlocksFlyerHalfLoopDownUpright[] = {
+static constexpr const PreviewTrack TrackBlocksFlyerHalfLoopDownUpright[] = {
     { 0, 0, 0, -32, 32, { 0b1111, 0 }, 0 },
     { 1, -32, 0, -120, 96,{ 0b0011, 0 }, 0 },
     { 2, 0, 0, -136, 16, { 0b1111, 0b1100 }, 0 },
@@ -2842,7 +2842,7 @@ static constexpr const rct_preview_track TrackBlocksFlyerHalfLoopDownUpright[] =
 };
 
 // rct2: 0x00994638
-static constexpr std::array<const rct_preview_track*, TrackElemType::Count> TrackBlocks = {
+static constexpr std::array<const PreviewTrack*, TrackElemType::Count> TrackBlocks = {
     TrackBlocks000,
     TrackBlocks001,
     TrackBlocks002,
@@ -3437,7 +3437,7 @@ static constexpr uint8_t TrackPieceLengths[TrackElemType::Count] = {
 };
 
 // rct2: 0x00998C95
-static constexpr track_curve_chain gTrackCurveChain[TrackElemType::Count] = {
+static constexpr TrackCurveChain gTrackCurveChain[TrackElemType::Count] = {
     { TRACK_CURVE_NONE, TRACK_CURVE_NONE },
     { RideConstructionSpecialPieceSelected | TrackElemType::EndStation, RideConstructionSpecialPieceSelected | TrackElemType::EndStation },
     { RideConstructionSpecialPieceSelected | TrackElemType::EndStation, RideConstructionSpecialPieceSelected | TrackElemType::EndStation },
@@ -3733,7 +3733,7 @@ static constexpr track_curve_chain gTrackCurveChain[TrackElemType::Count] = {
     { TRACK_CURVE_NONE, TRACK_CURVE_NONE }, // FlyerHalfLoopUninvertedUp
 };
 
-const track_descriptor gTrackDescriptors[142] = {
+const TrackDescriptor gTrackDescriptors[142] = {
     {   true,   TRACK_SLOPE_DOWN_60,    TRACK_BANK_NONE,    TRACK_CURVE_NONE,               TRACK_SLOPE_DOWN_60,    TRACK_BANK_NONE,    TrackElemType::DiagDown60                                     },
     {   true,   TRACK_SLOPE_DOWN_60,    TRACK_BANK_NONE,    TRACK_CURVE_NONE,               TRACK_SLOPE_DOWN_25,    TRACK_BANK_NONE,    TrackElemType::DiagDown60ToDown25                      },
     {   true,   TRACK_SLOPE_DOWN_60,    TRACK_BANK_NONE,    TRACK_CURVE_NONE,               TRACK_SLOPE_NONE,       TRACK_BANK_NONE,    TrackElemType::DiagDown60ToFlat                             },
@@ -5660,7 +5660,7 @@ static constexpr uint16_t TrackFlags[TrackElemType::Count] = {
 
 /**  rct2: 0x00997C9D */
 // clang-format off
-static constexpr rct_trackdefinition TrackDefinitions[TrackElemType::Count] =
+static constexpr TrackDefinition TrackDefinitions[TrackElemType::Count] =
 {
     // TYPE                         VANGLE END                  VANGLE START                BANK END                BANK START              PREVIEW Z OFFSET
     { TRACK_FLAT,                   TRACK_SLOPE_NONE,           TRACK_SLOPE_NONE,           TRACK_BANK_NONE,        TRACK_BANK_NONE,        0                  },  // ELEM_FLAT
@@ -7156,8 +7156,8 @@ namespace OpenRCT2
                 TrackElementDescriptor& desc = res[i];
                 desc.Description = RideConfigurationStringIds[i];
                 desc.AlternativeType = AlternativeTrackTypes[i];
-                desc.Block = const_cast<rct_preview_track*>(TrackBlocks[i]);
-                desc.Coordinates = TrackCoordinates[i];
+                desc.Block = const_cast<PreviewTrack*>(TrackBlocks[i]);
+                desc.Coordinates = _trackCoordinates[i];
                 desc.CurveChain = gTrackCurveChain[i];
                 desc.Flags = TrackFlags[i];
                 desc.HeightMarkerPositions = TrackHeightMarkerPositions[i];
@@ -7191,7 +7191,7 @@ namespace OpenRCT2
     } // namespace TrackMetaData
 } // namespace OpenRCT2
 
-const rct_preview_track* TrackElementDescriptor::GetBlockForSequence(uint8_t sequenceIndex) const
+const PreviewTrack* TrackElementDescriptor::GetBlockForSequence(uint8_t sequenceIndex) const
 {
     const auto* trackBlock = Block;
     if (trackBlock == nullptr)
diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h
index b9503ae9da..6c50546d03 100644
--- a/src/openrct2/ride/TrackData.h
+++ b/src/openrct2/ride/TrackData.h
@@ -17,13 +17,13 @@ constexpr const uint8_t MaxSequencesPerPiece = 16;
 
 // 0x009968BB, 0x009968BC, 0x009968BD, 0x009968BF, 0x009968C1, 0x009968C3
 
-struct track_curve_chain
+struct TrackCurveChain
 {
     int32_t next;
     int32_t previous;
 };
 
-struct track_descriptor
+struct TrackDescriptor
 {
     bool starts_diagonal;
     uint8_t slope_start;
@@ -51,9 +51,9 @@ enum
     R9_SPIN
 };
 
-extern const track_descriptor gTrackDescriptors[142];
+extern const TrackDescriptor gTrackDescriptors[142];
 
-struct dodgems_track_size
+struct DodgemsTrackSize
 {
     uint8_t left;
     uint8_t top;
@@ -61,7 +61,7 @@ struct dodgems_track_size
     uint8_t bottom;
 };
 
-constexpr const dodgems_track_size DodgemsTrackSize(track_type_t type)
+constexpr const DodgemsTrackSize GetDodgemsTrackSize(track_type_t type)
 {
     if (type == TrackElemType::FlatTrack2x2)
         return { 4, 4, 59, 59 };
@@ -76,11 +76,11 @@ using TrackComputeFunction = int32_t (*)(const int16_t);
 struct TrackElementDescriptor
 {
     StringId Description;
-    rct_track_coordinates Coordinates;
+    TrackCoordinates Coordinates;
 
-    rct_preview_track* Block;
+    PreviewTrack* Block;
     uint8_t PieceLength;
-    track_curve_chain CurveChain;
+    TrackCurveChain CurveChain;
     track_type_t AlternativeType;
     // Price Modifier should be used as in the following calculation:
     // (RideTrackPrice * TED::PriceModifier) / 65536
@@ -92,7 +92,7 @@ struct TrackElementDescriptor
     std::array<uint8_t, MaxSequencesPerPiece> SequenceElementAllowedWallEdges;
     std::array<uint8_t, MaxSequencesPerPiece> SequenceProperties;
 
-    rct_trackdefinition Definition;
+    TrackDefinition Definition;
     uint8_t SpinFunction;
 
     TrackComputeFunction VerticalFactor;
@@ -105,7 +105,7 @@ struct TrackElementDescriptor
      * @param sequenceIndex
      * @return The track block, or nullptr if it doesn’t exist.
      */
-    const rct_preview_track* GetBlockForSequence(uint8_t sequenceIndex) const;
+    const PreviewTrack* GetBlockForSequence(uint8_t sequenceIndex) const;
 };
 
 namespace OpenRCT2
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 06d6ade2ed..b29fe70798 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -198,7 +198,7 @@ ResultWithMessage TrackDesign::CreateTrackDesignTrack(TrackDesignState& tds, con
     z = newCoords->z;
 
     const auto& ted = GetTrackElementDescriptor(trackElement.element->AsTrack()->GetTrackType());
-    const rct_track_coordinates* trackCoordinates = &ted.Coordinates;
+    const TrackCoordinates* trackCoordinates = &ted.Coordinates;
     const auto* trackBlock = ted.Block;
     // Used in the following loop to know when we have
     // completed all of the elements and are back at the
@@ -1588,7 +1588,7 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
         switch (tds.PlaceOperation)
         {
             case PTD_OPERATION_DRAW_OUTLINES:
-                for (const rct_preview_track* trackBlock = ted.Block; trackBlock->index != 0xFF; trackBlock++)
+                for (const PreviewTrack* trackBlock = ted.Block; trackBlock->index != 0xFF; trackBlock++)
                 {
                     auto tile = CoordsXY{ newCoords } + CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(rotation);
                     TrackDesignUpdatePreviewBounds(tds, { tile, newCoords.z });
@@ -1597,8 +1597,8 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
                 break;
             case PTD_OPERATION_REMOVE_GHOST:
             {
-                const rct_track_coordinates* trackCoordinates = &ted.Coordinates;
-                const rct_preview_track* trackBlock = ted.Block;
+                const TrackCoordinates* trackCoordinates = &ted.Coordinates;
+                const PreviewTrack* trackBlock = ted.Block;
                 int32_t tempZ = newCoords.z - trackCoordinates->z_begin + trackBlock->z;
                 auto trackRemoveAction = TrackRemoveAction(
                     trackType, 0, { newCoords, tempZ, static_cast<Direction>(rotation & 3) });
@@ -1612,7 +1612,7 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
             case PTD_OPERATION_PLACE_GHOST:
             case PTD_OPERATION_PLACE_TRACK_PREVIEW:
             {
-                const rct_track_coordinates* trackCoordinates = &ted.Coordinates;
+                const TrackCoordinates* trackCoordinates = &ted.Coordinates;
 
                 // di
                 int16_t tempZ = newCoords.z - trackCoordinates->z_begin;
@@ -1669,7 +1669,7 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
             case PTD_OPERATION_GET_PLACE_Z:
             {
                 int32_t tempZ = newCoords.z - ted.Coordinates.z_begin;
-                for (const rct_preview_track* trackBlock = ted.Block; trackBlock->index != 0xFF; trackBlock++)
+                for (const PreviewTrack* trackBlock = ted.Block; trackBlock->index != 0xFF; trackBlock++)
                 {
                     auto tile = CoordsXY{ newCoords } + CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(rotation);
                     if (!MapIsLocationValid(tile))
@@ -1708,7 +1708,7 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
             }
         }
 
-        const rct_track_coordinates& track_coordinates = ted.Coordinates;
+        const TrackCoordinates& track_coordinates = ted.Coordinates;
         auto offsetAndRotatedTrack = CoordsXY{ newCoords }
             + CoordsXY{ track_coordinates.x, track_coordinates.y }.Rotate(rotation);
 
@@ -2145,7 +2145,7 @@ void TrackDesignDrawPreview(TrackDesign* td6, uint8_t* pixels)
     size_x = zoom_level.ApplyTo(370);
     size_y = zoom_level.ApplyTo(217);
 
-    rct_viewport view;
+    Viewport view;
     view.width = 370;
     view.height = 217;
     view.view_width = size_x;
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index e2b4e555ed..8ac45057b9 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -360,7 +360,7 @@ static constexpr const int8_t* SwingingTimeToSpriteMaps[] = {
     SwingingTimeToSpriteMap_8, SwingingTimeToSpriteMap_9, SwingingTimeToSpriteMap_10, SwingingTimeToSpriteMap_11,
 };
 
-struct unk_9a36c4
+struct Unk9A36C4Struct
 {
     int16_t x;
     int16_t y;
@@ -368,7 +368,7 @@ struct unk_9a36c4
 };
 
 /** rct2: 0x009A36C4 */
-static constexpr const unk_9a36c4 Unk9A36C4[] = {
+static constexpr const Unk9A36C4Struct Unk9A36C4[] = {
     { -1, 0, 8716 }, { -1, 0, 8716 },   { -1, 0, 8716 },  { -1, 1, 12327 },  { -1, 1, 12327 },  { -1, 1, 12327 },
     { 0, 1, 8716 },  { -1, 1, 12327 },  { 0, 1, 8716 },   { 0, 1, 8716 },    { 0, 1, 8716 },    { 1, 1, 12327 },
     { 1, 1, 12327 }, { 1, 1, 12327 },   { 1, 0, 8716 },   { 1, 1, 12327 },   { 1, 0, 8716 },    { 1, 0, 8716 },
@@ -580,20 +580,20 @@ static bool vehicle_move_info_valid(
     return true;
 }
 
-static const rct_vehicle_info* vehicle_get_move_info(
+static const VehicleInfo* vehicle_get_move_info(
     VehicleTrackSubposition trackSubposition, track_type_t type, uint8_t direction, int32_t offset)
 {
     uint16_t typeAndDirection = (type << 2) | (direction & 3);
 
     if (!vehicle_move_info_valid(trackSubposition, type, direction, offset))
     {
-        static constexpr const rct_vehicle_info zero = {};
+        static constexpr const VehicleInfo zero = {};
         return &zero;
     }
     return &gTrackVehicleInfo[static_cast<uint8_t>(trackSubposition)][typeAndDirection]->info[offset];
 }
 
-const rct_vehicle_info* Vehicle::GetMoveInfo() const
+const VehicleInfo* Vehicle::GetMoveInfo() const
 {
     return vehicle_get_move_info(TrackSubposition, GetTrackType(), GetTrackDirection(), track_progress);
 }
@@ -883,13 +883,13 @@ static void vehicle_sounds_update_window_setup()
 {
     g_music_tracking_viewport = nullptr;
 
-    rct_window* window = WindowGetListening();
+    WindowBase* window = WindowGetListening();
     if (window == nullptr)
     {
         return;
     }
 
-    rct_viewport* viewport = WindowGetViewport(window);
+    Viewport* viewport = WindowGetViewport(window);
     if (viewport == nullptr)
     {
         return;
@@ -2588,7 +2588,7 @@ void Vehicle::UpdateWaitingToDepart()
     }
 }
 
-struct rct_synchronised_vehicle
+struct SynchronisedVehicle
 {
     RideId ride_id;
     StationIndex stationIndex;
@@ -2598,9 +2598,9 @@ struct rct_synchronised_vehicle
 constexpr int32_t SYNCHRONISED_VEHICLE_COUNT = 16;
 
 // Synchronised vehicle info
-static rct_synchronised_vehicle _synchronisedVehicles[SYNCHRONISED_VEHICLE_COUNT] = {};
+static SynchronisedVehicle _synchronisedVehicles[SYNCHRONISED_VEHICLE_COUNT] = {};
 
-static rct_synchronised_vehicle* _lastSynchronisedVehicle = nullptr;
+static SynchronisedVehicle* _lastSynchronisedVehicle = nullptr;
 
 /**
  * Checks if a map position contains a synchronised ride station and adds the vehicle
@@ -2637,7 +2637,7 @@ static bool try_add_synchronised_station(const CoordsXYZ& coords)
 
     auto stationIndex = tileElement->AsTrack()->GetStationIndex();
 
-    rct_synchronised_vehicle* sv = _lastSynchronisedVehicle;
+    SynchronisedVehicle* sv = _lastSynchronisedVehicle;
     sv->ride_id = rideIndex;
     sv->stationIndex = stationIndex;
     sv->vehicle_id = EntityId::GetNull();
@@ -2766,7 +2766,7 @@ static bool ride_station_can_depart_synchronised(const Ride& ride, StationIndex
         return true;
     }
 
-    for (rct_synchronised_vehicle* sv = _synchronisedVehicles; sv < _lastSynchronisedVehicle; sv++)
+    for (SynchronisedVehicle* sv = _synchronisedVehicles; sv < _lastSynchronisedVehicle; sv++)
     {
         Ride* sv_ride = GetRide(sv->ride_id);
 
@@ -2880,7 +2880,7 @@ static bool ride_station_can_depart_synchronised(const Ride& ride, StationIndex
     }
 
     // At this point all vehicles in _snychronisedVehicles can depart.
-    for (rct_synchronised_vehicle* sv = _synchronisedVehicles; sv < _lastSynchronisedVehicle; sv++)
+    for (SynchronisedVehicle* sv = _synchronisedVehicles; sv < _lastSynchronisedVehicle; sv++)
     {
         auto v = GetEntity<Vehicle>(sv->vehicle_id);
         if (v != nullptr)
@@ -5038,7 +5038,7 @@ void Vehicle::UpdateTopSpinOperating()
     if (_vehicleBreakdown == 0)
         return;
 
-    const top_spin_time_to_sprite_map* sprite_map = TopSpinTimeToSpriteMaps[sub_state];
+    const TopSpinTimeToSpriteMap* sprite_map = TopSpinTimeToSpriteMaps[sub_state];
     uint8_t rotation = sprite_map[current_time + 1].arm_rotation;
     if (rotation != 0xFF)
     {
@@ -5924,10 +5924,10 @@ int32_t Vehicle::UpdateMotionDodgems()
 static bool wouldCollideWithDodgemsTrackEdge(
     const CoordsXY& coords, const CoordsXY& trackLocation, uint32_t trackType, uint16_t dodgemsCarRadius)
 {
-    int16_t rideLeft = trackLocation.x + DodgemsTrackSize(trackType).left;
-    int16_t rideRight = trackLocation.x + DodgemsTrackSize(trackType).right;
-    int16_t rideTop = trackLocation.y + DodgemsTrackSize(trackType).top;
-    int16_t rideBottom = trackLocation.y + DodgemsTrackSize(trackType).bottom;
+    int16_t rideLeft = trackLocation.x + GetDodgemsTrackSize(trackType).left;
+    int16_t rideRight = trackLocation.x + GetDodgemsTrackSize(trackType).right;
+    int16_t rideTop = trackLocation.y + GetDodgemsTrackSize(trackType).top;
+    int16_t rideBottom = trackLocation.y + GetDodgemsTrackSize(trackType).bottom;
 
     return coords.x - dodgemsCarRadius < rideLeft || coords.y - dodgemsCarRadius < rideTop
         || coords.x + dodgemsCarRadius > rideRight || coords.y + dodgemsCarRadius > rideBottom;
@@ -6867,12 +6867,12 @@ void Vehicle::UpdateSceneryDoor() const
 {
     auto trackType = GetTrackType();
     const auto& ted = GetTrackElementDescriptor(trackType);
-    const rct_preview_track* trackBlock = ted.Block;
+    const PreviewTrack* trackBlock = ted.Block;
     while ((trackBlock + 1)->index != 255)
     {
         trackBlock++;
     }
-    const rct_track_coordinates* trackCoordinates = &ted.Coordinates;
+    const TrackCoordinates* trackCoordinates = &ted.Coordinates;
     auto wallCoords = CoordsXYZ{ x, y, TrackLocation.z - trackBlock->z + trackCoordinates->z_end }.ToTileStart();
     int32_t direction = (GetTrackDirection() + trackCoordinates->rotation_end) & 3;
 
@@ -6965,8 +6965,8 @@ void Vehicle::UpdateSceneryDoorBackwards() const
 {
     auto trackType = GetTrackType();
     const auto& ted = GetTrackElementDescriptor(trackType);
-    const rct_preview_track* trackBlock = ted.Block;
-    const rct_track_coordinates* trackCoordinates = &ted.Coordinates;
+    const PreviewTrack* trackBlock = ted.Block;
+    const TrackCoordinates* trackCoordinates = &ted.Coordinates;
     auto wallCoords = CoordsXYZ{ TrackLocation, TrackLocation.z - trackBlock->z + trackCoordinates->z_begin };
     int32_t direction = (GetTrackDirection() + trackCoordinates->rotation_begin) & 3;
     direction = DirectionReverse(direction);
@@ -7723,7 +7723,7 @@ Loc6DAEB9:
         {
             ReverseReverserCar();
 
-            const rct_vehicle_info* moveInfo2 = GetMoveInfo();
+            const VehicleInfo* moveInfo2 = GetMoveInfo();
             nextVehiclePosition.x = x + moveInfo2->x;
             nextVehiclePosition.y = y + moveInfo2->y;
         }
@@ -8023,7 +8023,7 @@ bool Vehicle::UpdateTrackMotionBackwards(CarEntry* carEntry, const Ride& curRide
         track_progress = newTrackProgress;
         uint8_t moveInfoVehicleSpriteType;
         {
-            const rct_vehicle_info* moveInfo = GetMoveInfo();
+            const VehicleInfo* moveInfo = GetMoveInfo();
             auto nextVehiclePosition = TrackLocation
                 + CoordsXYZ{ moveInfo->x, moveInfo->y,
                              moveInfo->z + GetRideTypeDescriptor(curRide.type).Heights.VehicleZOffset };
@@ -8302,7 +8302,7 @@ Loc6DC743:
             animation_frame = 0;
         }
     }
-    const rct_vehicle_info* moveInfo;
+    const VehicleInfo* moveInfo;
     for (;;)
     {
         moveInfo = GetMoveInfo();
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index c2c5060b6c..c1cd7e749e 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -39,7 +39,7 @@ struct GForces
 };
 
 // Size: 0x09
-struct rct_vehicle_info
+struct VehicleInfo
 {
     int16_t x;             // 0x00
     int16_t y;             // 0x02
@@ -279,7 +279,7 @@ struct Vehicle : EntityBase
 private:
     bool SoundCanPlay() const;
     uint16_t GetSoundPriority() const;
-    const rct_vehicle_info* GetMoveInfo() const;
+    const VehicleInfo* GetMoveInfo() const;
     uint16_t GetTrackProgress() const;
     OpenRCT2::Audio::VehicleSoundParams CreateSoundParam(uint16_t priority) const;
     void CableLiftUpdate();
@@ -382,7 +382,7 @@ static_assert(sizeof(Vehicle) <= 512);
 void UpdateRotatingDefault(Vehicle& vehicle);
 void UpdateRotatingEnterprise(Vehicle& vehicle);
 
-struct train_ref
+struct TrainReference
 {
     Vehicle* head;
     Vehicle* tail;
diff --git a/src/openrct2/ride/VehicleData.cpp b/src/openrct2/ride/VehicleData.cpp
index 1f7e833c95..34371aea4f 100644
--- a/src/openrct2/ride/VehicleData.cpp
+++ b/src/openrct2/ride/VehicleData.cpp
@@ -372,7 +372,7 @@ const uint8_t * Rotation3TimeToSpriteMaps[] = {
 };
 
 /** rct2: 0x009A12EC */
-static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_0[] = {
+static constexpr const TopSpinTimeToSpriteMap TopSpinTimeToSpriteMap_0[] = {
     {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 },
     {  0,  0 }, {  0,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 },
     {  1,  0 }, {  1,  0 }, {  1,  0 }, {  2,  0 }, {  2,  0 }, {  2,  0 }, {  2,  0 },
@@ -458,7 +458,7 @@ static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_0[] =
 };
 
 /** rct2: 0x009A1751 */
-static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_1[] = {
+static constexpr const TopSpinTimeToSpriteMap TopSpinTimeToSpriteMap_1[] = {
     {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 },
     {  0,  0 }, {  0,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 },
     {  1,  0 }, {  1,  0 }, {  1,  0 }, {  2,  0 }, {  2,  0 }, {  2,  0 }, {  2,  0 },
@@ -563,7 +563,7 @@ static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_1[] =
 };
 
 /** rct2: 0x009A1CC6 */
-static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_2[] = {
+static constexpr const TopSpinTimeToSpriteMap TopSpinTimeToSpriteMap_2[] = {
     {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 }, {  0,  0 },
     {  0,  0 }, {  0,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 }, {  1,  0 },
     {  1,  0 }, {  1,  0 }, {  1,  0 }, {  2,  0 }, {  2,  0 }, {  2,  0 }, {  2,  0 },
@@ -703,7 +703,7 @@ static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_2[] =
 };
 
 /** rct2: 0x009A12E0 */
-const top_spin_time_to_sprite_map * TopSpinTimeToSpriteMaps[] = {
+const TopSpinTimeToSpriteMap * TopSpinTimeToSpriteMaps[] = {
     TopSpinTimeToSpriteMap_0,
     TopSpinTimeToSpriteMap_1,
     TopSpinTimeToSpriteMap_2,
diff --git a/src/openrct2/ride/VehicleData.h b/src/openrct2/ride/VehicleData.h
index 410cbe2e05..32927465fe 100644
--- a/src/openrct2/ride/VehicleData.h
+++ b/src/openrct2/ride/VehicleData.h
@@ -15,13 +15,13 @@ extern const uint8_t* Rotation1TimeToSpriteMaps[];
 extern const uint8_t* Rotation2TimeToSpriteMaps[];
 extern const uint8_t* Rotation3TimeToSpriteMaps[];
 
-struct top_spin_time_to_sprite_map
+struct TopSpinTimeToSpriteMap
 {
     uint8_t arm_rotation;
     uint8_t bank_rotation;
 };
 
-extern const top_spin_time_to_sprite_map* TopSpinTimeToSpriteMaps[];
+extern const TopSpinTimeToSpriteMap* TopSpinTimeToSpriteMaps[];
 
 extern const uint8_t MotionSimulatorTimeToSpriteMap[];
 extern const int32_t MotionSimulatorTimeToSpriteMapCount;
diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp
index 30663ab222..fd8da61f1c 100644
--- a/src/openrct2/ride/VehiclePaint.cpp
+++ b/src/openrct2/ride/VehiclePaint.cpp
@@ -28,7 +28,7 @@ using namespace OpenRCT2::Entity::Yaw;
 #pragma region VehicleBoundboxes
 
 // 0x0098E52C:
-const vehicle_boundbox VehicleBoundboxes[16][224] = {
+const VehicleBoundBox VehicleBoundboxes[16][224] = {
     {
         // 0x0099123C:
         { -5, -2, -22, 10, 4, 14 },   { -3, -3, -22, 6, 6, 14 },    { -3, -3, -22, 6, 6, 14 },    { -3, -3, -22, 6, 6, 14 },
@@ -941,7 +941,7 @@ const vehicle_boundbox VehicleBoundboxes[16][224] = {
 
 static void PaintVehicleRiders(
     PaintSession& session, const Vehicle* vehicle, const CarEntry* carEntry, uint32_t baseImageId, int32_t z,
-    const vehicle_boundbox& bb)
+    const VehicleBoundBox& bb)
 {
     baseImageId += carEntry->NumCarImages;
     for (auto i = 0; i < 8; i++)
@@ -972,7 +972,7 @@ static void PaintVehicleRiders(
 
 // 6D5214
 static void vehicle_sprite_paint(
-    PaintSession& session, const Vehicle* vehicle, int32_t spriteNum, const vehicle_boundbox& bb, int32_t z,
+    PaintSession& session, const Vehicle* vehicle, int32_t spriteNum, const VehicleBoundBox& bb, int32_t z,
     const CarEntry* carEntry)
 {
     if (carEntry->draw_order >= std::size(VehicleBoundboxes))
diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h
index afe2687e2e..9ed6dc936c 100644
--- a/src/openrct2/ride/VehiclePaint.h
+++ b/src/openrct2/ride/VehiclePaint.h
@@ -15,7 +15,7 @@ struct PaintSession;
 struct CarEntry;
 struct Vehicle;
 
-struct vehicle_boundbox
+struct VehicleBoundBox
 {
     int8_t offset_x;
     int8_t offset_y;
@@ -25,7 +25,7 @@ struct vehicle_boundbox
     uint8_t length_z;
 };
 
-extern const vehicle_boundbox VehicleBoundboxes[16][224];
+extern const VehicleBoundBox VehicleBoundboxes[16][224];
 
 void VehicleVisualDefault(
     PaintSession& session, int32_t imageDirection, int32_t z, const Vehicle* vehicle, const CarEntry* carEntry);
diff --git a/src/openrct2/ride/VehicleSubpositionData.cpp b/src/openrct2/ride/VehicleSubpositionData.cpp
index 678c317a4f..64f0d1676f 100644
--- a/src/openrct2/ride/VehicleSubpositionData.cpp
+++ b/src/openrct2/ride/VehicleSubpositionData.cpp
@@ -12,8 +12,8 @@
 #include "Vehicle.h"
 
 #define CREATE_VEHICLE_INFO(VAR, ...)                                                                                          \
-    static constexpr const rct_vehicle_info VAR##_data[] = __VA_ARGS__;                                                        \
-    static constexpr const rct_vehicle_info_list VAR = { static_cast<uint16_t>(std::size(VAR##_data)), VAR##_data };
+    static constexpr const VehicleInfo VAR##_data[] = __VA_ARGS__;                                                             \
+    static constexpr const VehicleInfoList VAR = { static_cast<uint16_t>(std::size(VAR##_data)), VAR##_data };
 
 #define MINI_GOLF_STATE(STATE)                                                                                                 \
     {                                                                                                                          \
@@ -27508,7 +27508,7 @@ namespace RightLane
 
 CREATE_VEHICLE_INFO(TrackVehicleInfo_000000, { { 0, 0, 0, 0, 0, 0 } })
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListDefault[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListDefault[] = {
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0,  // Flat
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0,  // EndStation
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0,  // BeginStation
@@ -27805,7 +27805,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListDefault[] = {
 };
 static_assert(std::size(TrackVehicleInfoListDefault) == VehicleTrackSubpositionSizeDefault);
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftGoingOut[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListChairliftGoingOut[] = {
     &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04, &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48, &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04,
     &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48, &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04, &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48,
     &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04, &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48, &TrackVehicleInfo_8CFB6E, &TrackVehicleInfo_8CFC90,
@@ -27924,7 +27924,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftGoing
     &TrackVehicleInfo_91C1BC, &TrackVehicleInfo_91C377,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftGoingBack[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListChairliftGoingBack[] = {
     &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48, &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04, &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48,
     &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04, &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48, &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04,
     &TrackVehicleInfo_8CDE26, &TrackVehicleInfo_8CDF48, &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04, &TrackVehicleInfo_8D023A, &TrackVehicleInfo_8D035C,
@@ -27995,7 +27995,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftGoing
     &TrackVehicleInfo_8CDBE2, &TrackVehicleInfo_8CDD04,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftEndBullwheel[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListChairliftEndBullwheel[] = {
     &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291, &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF, &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291,
     &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF, &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291, &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF,
     &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291, &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF, &TrackVehicleInfo_8C232A, &TrackVehicleInfo_8C244C,
@@ -28066,7 +28066,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftEndBu
     &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftStartBullwheel[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListChairliftStartBullwheel[] = {
     &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF, &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291, &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF,
     &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291, &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF, &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291,
     &TrackVehicleInfo_8CE4B8, &TrackVehicleInfo_8CE6DF, &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291, &TrackVehicleInfo_8C232A, &TrackVehicleInfo_8C244C,
@@ -28137,7 +28137,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListChairliftStart
     &TrackVehicleInfo_8CE06A, &TrackVehicleInfo_8CE291,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsLeftLane[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListGoKartsLeftLane[] = {
     &TrackVehicleInfo_8FF2DA, &TrackVehicleInfo_8FF3FC, &TrackVehicleInfo_8FF51E, &TrackVehicleInfo_8FF640, // TrackElemType::Flat
     &TrackVehicleInfo_8FF2DA, &TrackVehicleInfo_8FF3FC, &TrackVehicleInfo_8FF51E, &TrackVehicleInfo_8FF640, // TrackElemType::EndStation
     &TrackVehicleInfo_8FF2DA, &TrackVehicleInfo_8FF3FC, &TrackVehicleInfo_8FF51E, &TrackVehicleInfo_8FF640, // TrackElemType::BeginStation
@@ -28192,7 +28192,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsLeftLan
     &TrackVehicleInfo_901762, &TrackVehicleInfo_901884, &TrackVehicleInfo_9019AF, &TrackVehicleInfo_901AE3, // TrackElemType::RightQuarterTurn1Tile
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsRightLane[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListGoKartsRightLane[] = {
     &TrackVehicleInfo_901DE1, &TrackVehicleInfo_901F03, &TrackVehicleInfo_902025, &TrackVehicleInfo_902147, // TrackElemType::Flat
     &TrackVehicleInfo_901DE1, &TrackVehicleInfo_901F03, &TrackVehicleInfo_902025, &TrackVehicleInfo_902147, // TrackElemType::EndStation
     &TrackVehicleInfo_901DE1, &TrackVehicleInfo_901F03, &TrackVehicleInfo_902025, &TrackVehicleInfo_902147, // TrackElemType::BeginStation
@@ -28247,7 +28247,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsRightLa
     &TrackVehicleInfo_904284, &TrackVehicleInfo_9042F2, &TrackVehicleInfo_904369, &TrackVehicleInfo_9043E9, // TrackElemType::RightQuarterTurn1Tile
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsMovingToRightLane[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListGoKartsMovingToRightLane[] = {
     &TrackVehicleInfo_8FF762, &TrackVehicleInfo_8FF884, &TrackVehicleInfo_8FF9A6, &TrackVehicleInfo_8FFAC8, &TrackVehicleInfo_8FF762, &TrackVehicleInfo_8FF884,
     &TrackVehicleInfo_8FF9A6, &TrackVehicleInfo_8FFAC8, &TrackVehicleInfo_8FF762, &TrackVehicleInfo_8FF884, &TrackVehicleInfo_8FF9A6, &TrackVehicleInfo_8FFAC8,
     &TrackVehicleInfo_8FF762, &TrackVehicleInfo_8FF884, &TrackVehicleInfo_8FF9A6, &TrackVehicleInfo_8FFAC8, &TrackVehicleInfo_900E52, &TrackVehicleInfo_900F74,
@@ -28285,7 +28285,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsMovingT
     &TrackVehicleInfo_901762, &TrackVehicleInfo_901884, &TrackVehicleInfo_9019AF, &TrackVehicleInfo_901AE3,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsMovingToLeftLane[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListGoKartsMovingToLeftLane[] = {
     &TrackVehicleInfo_904460, &TrackVehicleInfo_904582, &TrackVehicleInfo_9046A4, &TrackVehicleInfo_9047C6, &TrackVehicleInfo_904460, &TrackVehicleInfo_904582,
     &TrackVehicleInfo_9046A4, &TrackVehicleInfo_9047C6, &TrackVehicleInfo_904460, &TrackVehicleInfo_904582, &TrackVehicleInfo_9046A4, &TrackVehicleInfo_9047C6,
     &TrackVehicleInfo_904460, &TrackVehicleInfo_904582, &TrackVehicleInfo_9046A4, &TrackVehicleInfo_9047C6, &TrackVehicleInfo_9034D1, &TrackVehicleInfo_9035F3,
@@ -28323,7 +28323,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListGoKartsMovingT
     &TrackVehicleInfo_904284, &TrackVehicleInfo_9042F2, &TrackVehicleInfo_904369, &TrackVehicleInfo_9043E9,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfStartPathA9[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListMiniGolfStartPathA9[] = {
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4,
     &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8,
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938D7A, &TrackVehicleInfo_938E0C,
@@ -28464,7 +28464,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfStartP
     &TrackVehicleInfo_94AE31, &TrackVehicleInfo_94DAEF,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfBallPathA10[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListMiniGolfBallPathA10[] = {
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4,
     &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8,
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938D7A, &TrackVehicleInfo_938E0C,
@@ -28605,7 +28605,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfBallPa
     &TrackVehicleInfo_94B0DF, &TrackVehicleInfo_94DD9D,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfPathB11[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListMiniGolfPathB11[] = {
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4,
     &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8,
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938D7A, &TrackVehicleInfo_938E0C,
@@ -28746,7 +28746,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfPathB1
     &TrackVehicleInfo_94B37B, &TrackVehicleInfo_94E039,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfBallPathB12[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListMiniGolfBallPathB12[] = {
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4,
     &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8,
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938D7A, &TrackVehicleInfo_938E0C,
@@ -28887,7 +28887,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfBallPa
     &TrackVehicleInfo_94B6B9, &TrackVehicleInfo_94E377,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfPathC13[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListMiniGolfPathC13[] = {
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4,
     &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8,
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938D7A, &TrackVehicleInfo_938E0C,
@@ -29028,7 +29028,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfPathC1
     &TrackVehicleInfo_94BA7E, &TrackVehicleInfo_94E73C,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfPathC14[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListMiniGolfPathC14[] = {
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4,
     &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8,
     &TrackVehicleInfo_938212, &TrackVehicleInfo_9382A4, &TrackVehicleInfo_938336, &TrackVehicleInfo_9383C8, &TrackVehicleInfo_938D7A, &TrackVehicleInfo_938E0C,
@@ -29169,7 +29169,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListMiniGolfPathC1
     &TrackVehicleInfo_94BE16, &TrackVehicleInfo_94EAD4,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListReverserRCFrontBogie[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListReverserRCFrontBogie[] = {
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0, &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C,
     &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0, &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0,
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0, &TrackVehicleInfo_8C232A, &TrackVehicleInfo_8C244C,
@@ -29317,7 +29317,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListReverserRCFron
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0,
 };
 
-static constexpr const rct_vehicle_info_list *TrackVehicleInfoListReverserRCRearBogie[] = {
+static constexpr const VehicleInfoList *TrackVehicleInfoListReverserRCRearBogie[] = {
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0, &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C,
     &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0, &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0,
     &TrackVehicleInfo_8BE57A, &TrackVehicleInfo_8BE69C, &TrackVehicleInfo_8BE7BE, &TrackVehicleInfo_8BE8E0, &TrackVehicleInfo_8C232A, &TrackVehicleInfo_8C244C,
@@ -29466,7 +29466,7 @@ static constexpr const rct_vehicle_info_list *TrackVehicleInfoListReverserRCRear
 };
 
 // rct2: 0x008B8F30
-constexpr const rct_vehicle_info_list * const * gTrackVehicleInfo[static_cast<uint8_t>(VehicleTrackSubposition::Count)] = {
+constexpr const VehicleInfoList * const * gTrackVehicleInfo[static_cast<uint8_t>(VehicleTrackSubposition::Count)] = {
     TrackVehicleInfoListDefault,                  // VehicleTrackSubposition::Default
     TrackVehicleInfoListChairliftGoingOut,        // VehicleTrackSubposition::ChairliftGoingOut
     TrackVehicleInfoListChairliftGoingBack,       // VehicleTrackSubposition::ChairliftGoingBack
diff --git a/src/openrct2/ride/VehicleSubpositionData.h b/src/openrct2/ride/VehicleSubpositionData.h
index 77b51e0365..768b9a3bd8 100644
--- a/src/openrct2/ride/VehicleSubpositionData.h
+++ b/src/openrct2/ride/VehicleSubpositionData.h
@@ -15,7 +15,7 @@
 
 constexpr const size_t VehicleTrackSubpositionSizeDefault = TrackElemType::Count * NumOrthogonalDirections;
 
-struct rct_vehicle_info;
+struct VehicleInfo;
 
 enum class VehicleTrackSubposition : uint8_t
 {
@@ -43,10 +43,10 @@ enum class VehicleTrackSubposition : uint8_t
     Count,
 };
 
-struct rct_vehicle_info_list
+struct VehicleInfoList
 {
     uint16_t size;
-    const rct_vehicle_info* info;
+    const VehicleInfo* info;
 };
 
-extern const rct_vehicle_info_list* const* const gTrackVehicleInfo[EnumValue(VehicleTrackSubposition::Count)];
+extern const VehicleInfoList* const* const gTrackVehicleInfo[EnumValue(VehicleTrackSubposition::Count)];
diff --git a/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp
index ff31adbfb8..b102c878ce 100644
--- a/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp
@@ -232,7 +232,7 @@ static void ClassicWoodenRCTrackFlatToLeftBank(
     const TrackElement& trackElement)
 
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -262,7 +262,7 @@ static void ClassicWoodenRCTrackFlatToRightBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -309,7 +309,7 @@ static void ClassicWoodenRCTrackLeftBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_LEFT_BANK_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -348,7 +348,7 @@ static void ClassicWoodenRCTrackLeftBankTo25DegUp(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_LEFT_BANK_TO_25_UP_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -388,7 +388,7 @@ static void ClassicWoodenRCTrackRightBankTo25DegUp(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_RIGHT_BANK_TO_25_UP_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -429,7 +429,7 @@ static void ClassicWoodenRCTrack25DegUpToLeftBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_25_UP_TO_LEFT_BANK_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -470,7 +470,7 @@ static void ClassicWoodenRCTrack25DegUpToRightBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][1][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][1][2] = {
         { {
             { SPR_CLASSIC_WOODEN_RC_25_UP_TO_RIGHT_BANK_SW_NE, 0, { 0, 0, 0 }, { 0, 3, 0 }, { 32, 25, 2 } },
             {},
@@ -539,7 +539,7 @@ static void ClassicWoodenRCTrackBankedRightQuarterTurn5(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][7][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][7][2] = {
         {
             {
                 { SPR_CLASSIC_WOODEN_RC_BANKED_QUARTER_TURN_5_SW_SE_SEQ_0, 0, { 0, 2, 0 }, { 0, 2, 0 }, { 32, 32, 2 } },
@@ -715,7 +715,7 @@ static void ClassicWoodenRCTrackRightQuarterTurn3Bank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 { SPR_CLASSIC_WOODEN_RC_BANKED_QUARTER_TURN_3_SW_SE_SEQ_0, 0, { 0, 6, 0 }, { 0, 6, 0 }, { 32, 20, 2 } },
@@ -834,7 +834,7 @@ static void ClassicWoodenRCTrackLeftEighthBankToDiag(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][5][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][5][2] = {
         {
             {
                 { SPR_CLASSIC_WOODEN_RC_ORTHO_TO_DIAG_LEFT_BANKED_0_SEQ_0, 0, { 0, 0, 0 }, { 0, 0, 0 }, { 32, 32, 2 } },
@@ -965,7 +965,7 @@ static void ClassicWoodenRCTrackRightEighthBankToDiag(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][5][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][5][2] = {
         {
             {
                 { SPR_CLASSIC_WOODEN_RC_ORTHO_TO_DIAG_RIGHT_BANKED_0_SEQ_0, 0, { 0, 0, 0 }, { 0, 0, 0 }, { 32, 32, 2 } },
@@ -1120,7 +1120,7 @@ static void ClassicWoodenRCTrackDiagFlatToLeftBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
@@ -1218,7 +1218,7 @@ static void ClassicWoodenRCTrackDiagFlatToRightBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
@@ -1330,7 +1330,7 @@ static void ClassicWoodenRCTrackDiagLeftBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
@@ -1435,7 +1435,7 @@ static void ClassicWoodenRCTrackDiagLeftBankTo25DegUp(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
@@ -1533,7 +1533,7 @@ static void ClassicWoodenRCTrackDiagRightBankTo25DegUp(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
@@ -1631,7 +1631,7 @@ static void ClassicWoodenRCTrackDiag25DegUpToLeftBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
@@ -1729,7 +1729,7 @@ static void ClassicWoodenRCTrackDiag25DegUpToRightBank(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, Direction direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[4][4][2] = {
+    static constexpr const SpriteBoundBox2 imageIds[4][4][2] = {
         {
             {
                 {},
diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp
index d8269a9431..668c353123 100644
--- a/src/openrct2/ride/coaster/VirginiaReel.cpp
+++ b/src/openrct2/ride/coaster/VirginiaReel.cpp
@@ -17,7 +17,7 @@
 #include "../VehiclePaint.h"
 
 // 0x009927E6:
-static constexpr const vehicle_boundbox _virginiaReelBoundbox[] = {
+static constexpr const VehicleBoundBox _virginiaReelBoundbox[] = {
     { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 },
     { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 },
     { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 },
diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
index ae346f802b..5a5741b40d 100644
--- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
@@ -1114,7 +1114,7 @@ static void WoodenRCTrackRightQuarterTurn5(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[2][4][7] = {
+    static constexpr const SpriteBoundBox2 imageIds[2][4][7] = {
         {
             {
                 {
@@ -1616,7 +1616,7 @@ static void WoodenRCTrackBankedRightQuarterTurn5(
     PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height,
     const TrackElement& trackElement)
 {
-    static constexpr const sprite_bb_2 imageIds[2][4][7] = {
+    static constexpr const SpriteBoundBox2 imageIds[2][4][7] = {
         {
             {
                 {
diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/WoodenRollerCoaster.h
index a1342386c0..e5f0e9758d 100644
--- a/src/openrct2/ride/coaster/WoodenRollerCoaster.h
+++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.h
@@ -15,7 +15,7 @@
 
 #include <cstdint>
 
-struct sprite_bb_2
+struct SpriteBoundBox2
 {
     uint32_t sprite_id_a;
     uint32_t sprite_id_b;
@@ -55,7 +55,7 @@ PaintStruct* WoodenRCTrackPaint(
         { bound_box_offset_x, bound_box_offset_y, bound_box_offset_z });
 }
 
-template<bool isClassic> void WoodenRCTrackPaintBb(PaintSession& session, const sprite_bb_2* bb, int16_t height)
+template<bool isClassic> void WoodenRCTrackPaintBb(PaintSession& session, const SpriteBoundBox2* bb, int16_t height)
 {
     if (bb->sprite_id_a == 0)
         return;
diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp
index b8d79a0411..70246d9c8e 100644
--- a/src/openrct2/ride/water/RiverRapids.cpp
+++ b/src/openrct2/ride/water/RiverRapids.cpp
@@ -21,7 +21,7 @@
 
 #ifndef NO_VEHICLES
 // 0x0099279E:
-static constexpr const vehicle_boundbox _riverRapidsBoundbox[] = {
+static constexpr const VehicleBoundBox _riverRapidsBoundbox[] = {
     { -13, -13, 1, 26, 26, 13 }, { -13, -13, 1, 26, 26, 13 }, { -13, -13, 1, 26, 26, 13 },
     { -13, -13, 1, 26, 26, 13 }, { -13, -13, 1, 26, 26, 13 }, { -13, -13, 1, 26, 26, 13 },
     { -13, -13, 1, 26, 26, 13 }, { -13, -13, 1, 26, 26, 13 }, { -13, -13, 1, 26, 26, 13 },
diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp
index 16b4105c47..62009281a2 100644
--- a/src/openrct2/scenario/Scenario.cpp
+++ b/src/openrct2/scenario/Scenario.cpp
@@ -335,7 +335,7 @@ static void ScenarioWeekUpdate()
     RideCheckAllReachable();
     RideUpdateFavouritedStat();
 
-    auto water_type = static_cast<rct_water_type*>(ObjectEntryGetChunk(ObjectType::Water, 0));
+    auto water_type = static_cast<WaterObjectEntry*>(ObjectEntryGetChunk(ObjectType::Water, 0));
 
     if (month <= MONTH_APRIL && water_type != nullptr && water_type->flags & WATER_FLAGS_ALLOW_DUCKS)
     {
diff --git a/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp b/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp
index 2c3f626685..180313a390 100644
--- a/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp
+++ b/src/openrct2/scripting/bindings/ride/ScTrackSegment.cpp
@@ -159,8 +159,8 @@ std::vector<DukValue> ScTrackSegment::getSubpositions(uint8_t trackSubposition,
 
     for (auto idx = 0; idx < size; idx++)
     {
-        result.push_back(ToDuk<rct_vehicle_info>(
-            ctx, gTrackVehicleInfo[static_cast<uint8_t>(trackSubposition)][typeAndDirection]->info[idx]));
+        result.push_back(
+            ToDuk<VehicleInfo>(ctx, gTrackVehicleInfo[static_cast<uint8_t>(trackSubposition)][typeAndDirection]->info[idx]));
     }
     return result;
 }
diff --git a/src/openrct2/scripting/bindings/ride/ScTrackSegment.h b/src/openrct2/scripting/bindings/ride/ScTrackSegment.h
index d5791ecce6..f5d24c9ccc 100644
--- a/src/openrct2/scripting/bindings/ride/ScTrackSegment.h
+++ b/src/openrct2/scripting/bindings/ride/ScTrackSegment.h
@@ -19,7 +19,7 @@
 
 namespace OpenRCT2::Scripting
 {
-    template<> inline DukValue ToDuk(duk_context* ctx, const rct_vehicle_info& value)
+    template<> inline DukValue ToDuk(duk_context* ctx, const VehicleInfo& value)
     {
         DukObject dukSubposition(ctx);
         dukSubposition.Set("x", value.x);
diff --git a/src/openrct2/title/Command/RotateView.cpp b/src/openrct2/title/Command/RotateView.cpp
index 3eec7568eb..463cadc1c0 100644
--- a/src/openrct2/title/Command/RotateView.cpp
+++ b/src/openrct2/title/Command/RotateView.cpp
@@ -15,7 +15,7 @@ namespace OpenRCT2::Title
 {
     int16_t RotateViewCommand::operator()(int16_t timer)
     {
-        rct_window* w = WindowGetMain();
+        WindowBase* w = WindowGetMain();
         if (w != nullptr)
         {
             for (uint_fast8_t i = 0; i < Rotations; i++)
diff --git a/src/openrct2/title/Command/SetLocation.cpp b/src/openrct2/title/Command/SetLocation.cpp
index 3934f60af6..517d17d1a9 100644
--- a/src/openrct2/title/Command/SetLocation.cpp
+++ b/src/openrct2/title/Command/SetLocation.cpp
@@ -18,7 +18,7 @@ namespace OpenRCT2::Title
 {
     int16_t SetLocationCommand::operator()(int16_t timer)
     {
-        rct_window* w = WindowGetMain();
+        WindowBase* w = WindowGetMain();
         if (w != nullptr)
         {
             auto loc = TileCoordsXY(Location.X, Location.Y).ToCoordsXY().ToTileCentre();
diff --git a/src/openrct2/title/Command/SetZoom.cpp b/src/openrct2/title/Command/SetZoom.cpp
index 273bd43b9c..7c28ee2b69 100644
--- a/src/openrct2/title/Command/SetZoom.cpp
+++ b/src/openrct2/title/Command/SetZoom.cpp
@@ -16,7 +16,7 @@ namespace OpenRCT2::Title
 {
     int16_t SetZoomCommand::operator()(int16_t timer)
     {
-        rct_window* w = WindowGetMain();
+        WindowBase* w = WindowGetMain();
         if (w != nullptr)
         {
             WindowZoomSet(*w, ZoomLevel{ static_cast<int8_t>(Zoom) }, false);
diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp
index 8a6edbd45a..52e8d14f9e 100644
--- a/src/openrct2/title/TitleScreen.cpp
+++ b/src/openrct2/title/TitleScreen.cpp
@@ -86,7 +86,7 @@ void TitleScreen::StopPreviewingSequence()
 {
     if (_previewingSequence)
     {
-        rct_window* mainWindow = WindowGetMain();
+        WindowBase* mainWindow = WindowGetMain();
         if (mainWindow != nullptr)
         {
             WindowUnfollowSprite(*mainWindow);
diff --git a/src/openrct2/ui/DummyWindowManager.cpp b/src/openrct2/ui/DummyWindowManager.cpp
index 5947ea93e1..952b3f9b1f 100644
--- a/src/openrct2/ui/DummyWindowManager.cpp
+++ b/src/openrct2/ui/DummyWindowManager.cpp
@@ -15,27 +15,27 @@ namespace OpenRCT2::Ui
     class DummyWindowManager final : public IWindowManager
     {
         void Init() override{};
-        rct_window* OpenWindow(WindowClass /*wc*/) override
+        WindowBase* OpenWindow(WindowClass /*wc*/) override
         {
             return nullptr;
         }
-        rct_window* OpenView(uint8_t /*view*/) override
+        WindowBase* OpenView(uint8_t /*view*/) override
         {
             return nullptr;
         }
-        rct_window* OpenDetails(uint8_t /*type*/, int32_t /*id*/) override
+        WindowBase* OpenDetails(uint8_t /*type*/, int32_t /*id*/) override
         {
             return nullptr;
         }
-        rct_window* ShowError(StringId /*title*/, StringId /*message*/, const Formatter& /*formatter*/) override
+        WindowBase* ShowError(StringId /*title*/, StringId /*message*/, const Formatter& /*formatter*/) override
         {
             return nullptr;
         }
-        rct_window* ShowError(std::string_view /*title*/, std::string_view /*message*/) override
+        WindowBase* ShowError(std::string_view /*title*/, std::string_view /*message*/) override
         {
             return nullptr;
         }
-        rct_window* OpenIntent(Intent* /*intent*/) override
+        WindowBase* OpenIntent(Intent* /*intent*/) override
         {
             return nullptr;
         };
@@ -64,7 +64,7 @@ namespace OpenRCT2::Ui
         void UpdateMouseWheel() override
         {
         }
-        rct_window* GetOwner(const rct_viewport* viewport) override
+        WindowBase* GetOwner(const Viewport* viewport) override
         {
             return nullptr;
         }
diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h
index e623ba7614..1801a29454 100644
--- a/src/openrct2/ui/WindowManager.h
+++ b/src/openrct2/ui/WindowManager.h
@@ -28,13 +28,13 @@ namespace OpenRCT2::Ui
     {
         virtual ~IWindowManager() = default;
         virtual void Init() abstract;
-        virtual rct_window* OpenWindow(WindowClass wc) abstract;
-        virtual rct_window* OpenView(uint8_t view) abstract;
-        virtual rct_window* OpenDetails(uint8_t type, int32_t id) abstract;
-        virtual rct_window* OpenIntent(Intent* intent) abstract;
+        virtual WindowBase* OpenWindow(WindowClass wc) abstract;
+        virtual WindowBase* OpenView(uint8_t view) abstract;
+        virtual WindowBase* OpenDetails(uint8_t type, int32_t id) abstract;
+        virtual WindowBase* OpenIntent(Intent* intent) abstract;
         virtual void BroadcastIntent(const Intent& intent) abstract;
-        virtual rct_window* ShowError(StringId title, StringId message, const Formatter& formatter) abstract;
-        virtual rct_window* ShowError(std::string_view title, std::string_view message) abstract;
+        virtual WindowBase* ShowError(StringId title, StringId message, const Formatter& formatter) abstract;
+        virtual WindowBase* ShowError(std::string_view title, std::string_view message) abstract;
         virtual void ForceClose(WindowClass windowClass) abstract;
         virtual void UpdateMapTooltip() abstract;
         virtual void HandleInput() abstract;
@@ -42,7 +42,7 @@ namespace OpenRCT2::Ui
         virtual std::string GetKeyboardShortcutString(std::string_view shortcutId) abstract;
         virtual void SetMainView(const ScreenCoordsXY& viewPos, ZoomLevel zoom, int32_t rotation) abstract;
         virtual void UpdateMouseWheel() abstract;
-        virtual rct_window* GetOwner(const rct_viewport* viewport) abstract;
+        virtual WindowBase* GetOwner(const Viewport* viewport) abstract;
     };
 
     std::unique_ptr<IWindowManager> CreateDummyWindowManager();
diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp
index f294187a7c..cb79db58e6 100644
--- a/src/openrct2/windows/_legacy.cpp
+++ b/src/openrct2/windows/_legacy.cpp
@@ -87,7 +87,7 @@ money32 PlaceProvisionalTrackPiece(
 
     int16_t z_begin, z_end;
     const auto& ted = GetTrackElementDescriptor(trackType);
-    const rct_track_coordinates& coords = ted.Coordinates;
+    const TrackCoordinates& coords = ted.Coordinates;
     if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_NO_TRACK))
     {
         z_begin = coords.z_begin;
@@ -155,7 +155,7 @@ static std::tuple<bool, track_type_t> window_ride_construction_update_state_get_
     {
         for (uint32_t i = 0; i < std::size(gTrackDescriptors); i++)
         {
-            const track_descriptor* trackDescriptor = &gTrackDescriptors[i];
+            const TrackDescriptor* trackDescriptor = &gTrackDescriptors[i];
 
             if (trackDescriptor->track_curve != curve)
                 continue;
@@ -311,7 +311,7 @@ bool WindowRideConstructionUpdateState(
     }
 
     const auto& ted = GetTrackElementDescriptor(trackType);
-    const rct_track_coordinates& trackCoordinates = ted.Coordinates;
+    const TrackCoordinates& trackCoordinates = ted.Coordinates;
 
     x = _currentTrackBegin.x;
     y = _currentTrackBegin.y;
diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp
index 94c63dc7c3..e15d368ff9 100644
--- a/src/openrct2/world/Footpath.cpp
+++ b/src/openrct2/world/Footpath.cpp
@@ -241,7 +241,7 @@ void FootpathProvisionalUpdate()
  */
 CoordsXY FootpathGetCoordinatesFromPos(const ScreenCoordsXY& screenCoords, int32_t* direction, TileElement** tileElement)
 {
-    rct_window* window = WindowFindFromPoint(screenCoords);
+    WindowBase* window = WindowFindFromPoint(screenCoords);
     if (window == nullptr || window->viewport == nullptr)
     {
         CoordsXY position{};
@@ -339,7 +339,7 @@ CoordsXY FootpathGetCoordinatesFromPos(const ScreenCoordsXY& screenCoords, int32
 CoordsXY FootpathBridgeGetInfoFromPos(const ScreenCoordsXY& screenCoords, int32_t* direction, TileElement** tileElement)
 {
     // First check if we point at an entrance or exit. In that case, we would want the path coming from the entrance/exit.
-    rct_window* window = WindowFindFromPoint(screenCoords);
+    WindowBase* window = WindowFindFromPoint(screenCoords);
     if (window == nullptr || window->viewport == nullptr)
     {
         CoordsXY ret{};
diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index 68ee08992d..7f43ba5061 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -75,7 +75,7 @@ namespace OpenRCT2::TileInspector
         return true;
     }
 
-    static rct_window* GetTileInspectorWithPos(const CoordsXY& loc)
+    static WindowBase* GetTileInspectorWithPos(const CoordsXY& loc)
     {
         // Return the tile inspector window for everyone who has the tile selected
         auto* window = WindowFindByClass(WindowClass::TileInspector);
diff --git a/src/openrct2/world/Water.h b/src/openrct2/world/Water.h
index 4f7a934313..a07cc01107 100644
--- a/src/openrct2/world/Water.h
+++ b/src/openrct2/world/Water.h
@@ -17,7 +17,7 @@ enum
 };
 
 #pragma pack(push, 1)
-struct rct_water_type
+struct WaterObjectEntry
 {
     StringId string_idx;      // 0x00
     uint32_t image_id;        // 0x02
@@ -25,5 +25,5 @@ struct rct_water_type
     uint32_t palette_index_2; // 0x0A
     uint16_t flags;           // 0x0E
 };
-assert_struct_size(rct_water_type, 16);
+assert_struct_size(WaterObjectEntry, 16);
 #pragma pack(pop)