diff --git a/src/openrct2-ui/audio/OggAudioSource.cpp b/src/openrct2-ui/audio/OggAudioSource.cpp
index eecf887db8..214767dd04 100644
--- a/src/openrct2-ui/audio/OggAudioSource.cpp
+++ b/src/openrct2-ui/audio/OggAudioSource.cpp
@@ -9,6 +9,7 @@
 
 #include "SDLAudioSource.h"
 
+#include <cassert>
 #include <openrct2/Diagnostic.h>
 #include <stdexcept>
 
diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
index a1ae93d834..88745adf7e 100644
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
@@ -23,6 +23,7 @@
 
 #    include <SDL.h>
 #    include <algorithm>
+#    include <cassert>
 #    include <cmath>
 #    include <openrct2-ui/interface/Window.h>
 #    include <openrct2/config/Config.h>
diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
index f1845cbdfa..eba9a3fbb0 100644
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp
@@ -13,6 +13,7 @@
 
 #    include <SDL_video.h>
 #    include <algorithm>
+#    include <cassert>
 #    include <memory>
 #    include <openrct2/common.h>
 
diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
index d4aba16a76..8b8e087e40 100644
--- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
+++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h
@@ -13,6 +13,7 @@
 
 #include <SDL_pixels.h>
 #include <array>
+#include <cassert>
 #include <openrct2/common.h>
 #include <openrct2/drawing/Drawing.h>
 #include <openrct2/drawing/DrawingLock.hpp>
diff --git a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp
index bd113014b2..04b40f59d3 100644
--- a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.cpp
@@ -12,6 +12,7 @@
 #    include "TransparencyDepth.h"
 
 #    include <algorithm>
+#    include <cassert>
 #    include <map>
 #    include <vector>
 
diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp
index 83c13be951..9c5ded8472 100644
--- a/src/openrct2-ui/input/MouseInput.cpp
+++ b/src/openrct2-ui/input/MouseInput.cpp
@@ -9,6 +9,7 @@
 
 #include "../UiStringIds.h"
 
+#include <cassert>
 #include <cmath>
 #include <iterator>
 #include <openrct2-ui/interface/Dropdown.h>
diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp
index 7380b1448a..5b05dc43cb 100644
--- a/src/openrct2-ui/ride/VehicleSounds.cpp
+++ b/src/openrct2-ui/ride/VehicleSounds.cpp
@@ -3,6 +3,7 @@
 #include "../interface/Viewport.h"
 #include "../interface/Window.h"
 
+#include <cassert>
 #include <numeric>
 #include <openrct2/Context.h>
 #include <openrct2/GameState.h>
diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp
index 22fc14d829..efbd287d4b 100644
--- a/src/openrct2-ui/windows/Multiplayer.cpp
+++ b/src/openrct2-ui/windows/Multiplayer.cpp
@@ -7,6 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include <cassert>
 #include <openrct2-ui/interface/Dropdown.h>
 #include <openrct2-ui/interface/Widget.h>
 #include <openrct2-ui/windows/Window.h>
diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp
index 2922e09710..ee00b61c6c 100644
--- a/src/openrct2-ui/windows/NewRide.cpp
+++ b/src/openrct2-ui/windows/NewRide.cpp
@@ -7,6 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include <cassert>
 #include <iterator>
 #include <limits>
 #include <openrct2-ui/interface/Widget.h>
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 2f821dfc1f..6a40dc2011 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -10,6 +10,7 @@
 #include "../UiStringIds.h"
 #include "../interface/Theme.h"
 
+#include <cassert>
 #include <cmath>
 #include <iterator>
 #include <limits>
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index de94ae65d4..9b3509a96e 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -9,6 +9,7 @@
 
 #ifndef DISABLE_NETWORK
 
+#    include <cassert>
 #    include <chrono>
 #    include <openrct2-ui/interface/Dropdown.h>
 #    include <openrct2-ui/interface/Widget.h>
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index be0f913ba1..b5e827e00f 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -8,6 +8,7 @@
  *****************************************************************************/
 
 #ifdef __EMSCRIPTEN__
+#    include <cassert>
 #    include <emscripten.h>
 #endif // __EMSCRIPTEN__
 
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index b1ee1b7b8b..35ed0f9ae5 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -49,6 +49,7 @@
 #include "world/Scenery.h"
 
 #include <array>
+#include <cassert>
 #include <vector>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/command_line/ConvertCommand.cpp b/src/openrct2/command_line/ConvertCommand.cpp
index 0adece350f..e93a5459ec 100644
--- a/src/openrct2/command_line/ConvertCommand.cpp
+++ b/src/openrct2/command_line/ConvertCommand.cpp
@@ -21,6 +21,7 @@
 #include "../scenario/Scenario.h"
 #include "CommandLine.hpp"
 
+#include <cassert>
 #include <memory>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 781150e654..2b6b7fc03a 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -14,6 +14,5 @@
 #    define _CRT_NONSTDC_NO_WARNINGS
 #endif
 
-#include <cassert>
 #include <cstddef>
 #include <cstdint>
diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp
index cf8e422eb5..844bbd03d8 100644
--- a/src/openrct2/core/Guard.cpp
+++ b/src/openrct2/core/Guard.cpp
@@ -8,6 +8,7 @@
  *****************************************************************************/
 
 #ifdef _WIN32
+#    include <cassert>
 #    include <windows.h>
 #endif
 
diff --git a/src/openrct2/drawing/Drawing.Sprite.RLE.cpp b/src/openrct2/drawing/Drawing.Sprite.RLE.cpp
index c4baf88ffa..59f862811e 100644
--- a/src/openrct2/drawing/Drawing.Sprite.RLE.cpp
+++ b/src/openrct2/drawing/Drawing.Sprite.RLE.cpp
@@ -9,6 +9,7 @@
 
 #include "Drawing.h"
 
+#include <cassert>
 #include <cstring>
 
 template<DrawBlendOp TBlendOp, size_t TZoom>
diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp
index d5aa77abd5..27106c4a03 100644
--- a/src/openrct2/drawing/Drawing.Sprite.cpp
+++ b/src/openrct2/drawing/Drawing.Sprite.cpp
@@ -23,6 +23,7 @@
 #include "../ui/UiContext.h"
 #include "ScrollingText.h"
 
+#include <cassert>
 #include <memory>
 #include <stdexcept>
 #include <vector>
diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp
index c5042a606c..206587c921 100644
--- a/src/openrct2/drawing/Drawing.cpp
+++ b/src/openrct2/drawing/Drawing.cpp
@@ -26,6 +26,7 @@
 #include "../world/Location.hpp"
 #include "LightFX.h"
 
+#include <cassert>
 #include <cstring>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h
index 4c502e57c2..fd0953a3ba 100644
--- a/src/openrct2/drawing/Drawing.h
+++ b/src/openrct2/drawing/Drawing.h
@@ -18,6 +18,7 @@
 #include "ImageId.hpp"
 #include "Text.h"
 
+#include <cassert>
 #include <memory>
 #include <optional>
 #include <vector>
diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp
index 432e1da579..9b2468e234 100644
--- a/src/openrct2/drawing/NewDrawing.cpp
+++ b/src/openrct2/drawing/NewDrawing.cpp
@@ -20,6 +20,7 @@
 #include "IDrawingContext.h"
 #include "IDrawingEngine.h"
 
+#include <cassert>
 #include <cmath>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp
index 74cbe84886..cc45fd3c69 100644
--- a/src/openrct2/drawing/ScrollingText.cpp
+++ b/src/openrct2/drawing/ScrollingText.cpp
@@ -21,6 +21,7 @@
 #include "Drawing.h"
 #include "TTF.h"
 
+#include <cassert>
 #include <mutex>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp
index bd750df6c8..4c139de5d8 100644
--- a/src/openrct2/drawing/X8DrawingEngine.cpp
+++ b/src/openrct2/drawing/X8DrawingEngine.cpp
@@ -24,6 +24,7 @@
 #include "Weather.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstring>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp
index 74ddfd02bb..fdaf368b92 100644
--- a/src/openrct2/entity/EntityRegistry.cpp
+++ b/src/openrct2/entity/EntityRegistry.cpp
@@ -32,6 +32,7 @@
 #include "MoneyEffect.h"
 #include "Particle.h"
 
+#include <cassert>
 #include <cmath>
 #include <iterator>
 #include <numeric>
diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp
index db339d2a7a..3b28323871 100644
--- a/src/openrct2/entity/Guest.cpp
+++ b/src/openrct2/entity/Guest.cpp
@@ -62,6 +62,7 @@
 #include "Peep.h"
 #include "Staff.h"
 
+#include <cassert>
 #include <functional>
 #include <iterator>
 
diff --git a/src/openrct2/entity/PatrolArea.cpp b/src/openrct2/entity/PatrolArea.cpp
index f7e73cee99..8230f1fc56 100644
--- a/src/openrct2/entity/PatrolArea.cpp
+++ b/src/openrct2/entity/PatrolArea.cpp
@@ -13,6 +13,8 @@
 #include "EntityList.h"
 #include "Staff.h"
 
+#include <cassert>
+
 static PatrolArea _consolidatedPatrolArea[EnumValue(StaffType::Count)];
 static std::variant<StaffType, EntityId> _patrolAreaToRender;
 
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index 9817a3ca95..1a796e8ea1 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -59,6 +59,7 @@
 #include "PatrolArea.h"
 #include "Staff.h"
 
+#include <cassert>
 #include <iterator>
 #include <limits>
 #include <map>
diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp
index 3d17ab5263..2f98cc5088 100644
--- a/src/openrct2/entity/Staff.cpp
+++ b/src/openrct2/entity/Staff.cpp
@@ -48,6 +48,7 @@
 #include "PatrolArea.h"
 #include "Peep.h"
 
+#include <cassert>
 #include <iterator>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/interface/Cursors.cpp b/src/openrct2/interface/Cursors.cpp
index 562fc423c2..f4018a4a84 100644
--- a/src/openrct2/interface/Cursors.cpp
+++ b/src/openrct2/interface/Cursors.cpp
@@ -11,6 +11,7 @@
 
 #include "../core/EnumMap.hpp"
 
+#include <cassert>
 #include <string>
 
 namespace Cursor
diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index 1620637b37..163a04e087 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -35,6 +35,7 @@
 #include "Widget.h"
 #include "Window_internal.h"
 
+#include <cassert>
 #include <cmath>
 #include <functional>
 #include <iterator>
diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp
index e185c30468..82f8896da4 100644
--- a/src/openrct2/management/NewsItem.cpp
+++ b/src/openrct2/management/NewsItem.cpp
@@ -31,6 +31,8 @@
 #include "../windows/Intent.h"
 #include "../world/Location.hpp"
 
+#include <cassert>
+
 using namespace OpenRCT2;
 
 News::Item& News::ItemQueues::Current()
diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp
index f46c18fe2f..edef384b05 100644
--- a/src/openrct2/network/NetworkBase.cpp
+++ b/src/openrct2/network/NetworkBase.cpp
@@ -39,6 +39,7 @@
 #include "../world/Location.hpp"
 #include "network.h"
 
+#include <cassert>
 #include <iterator>
 #include <stdexcept>
 
diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp
index 82868acaba..fbed23349a 100644
--- a/src/openrct2/object/Object.cpp
+++ b/src/openrct2/object/Object.cpp
@@ -25,6 +25,7 @@
 #include "ObjectRepository.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstring>
 #include <stdexcept>
 
diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp
index 3e1e074dc6..cfb86ea057 100644
--- a/src/openrct2/paint/Paint.Entity.cpp
+++ b/src/openrct2/paint/Paint.Entity.cpp
@@ -30,6 +30,8 @@
 #include "../world/Park.h"
 #include "Paint.h"
 
+#include <cassert>
+
 /**
  * Paint Quadrant
  *  rct2: 0x0069E8B0
diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp
index 546aff8c52..890dc9009b 100644
--- a/src/openrct2/paint/Paint.cpp
+++ b/src/openrct2/paint/Paint.cpp
@@ -28,6 +28,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 
 using namespace OpenRCT2;
 
diff --git a/src/openrct2/paint/support/WoodenSupports.cpp b/src/openrct2/paint/support/WoodenSupports.cpp
index e51f34a974..73aebb070b 100644
--- a/src/openrct2/paint/support/WoodenSupports.cpp
+++ b/src/openrct2/paint/support/WoodenSupports.cpp
@@ -17,6 +17,8 @@
 #include "../Paint.SessionFlags.h"
 #include "../Paint.h"
 
+#include <cassert>
+
 constexpr auto kNumWoodenSupportTypes = 2;
 constexpr auto kNumWoodenSupportSubTypes = 6;
 
diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
index 7908dcdf75..fb796e897f 100644
--- a/src/openrct2/paint/tile_element/Paint.Surface.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp
@@ -34,6 +34,7 @@
 #include "Paint.TileElement.h"
 #include "Segment.h"
 
+#include <cassert>
 #include <cstring>
 #include <iterator>
 
diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp
index c98e8e17a5..14050f231f 100644
--- a/src/openrct2/park/ParkFile.cpp
+++ b/src/openrct2/park/ParkFile.cpp
@@ -58,6 +58,7 @@
 #include "../world/Scenery.h"
 #include "Legacy.h"
 
+#include <cassert>
 #include <cstdint>
 #include <ctime>
 #include <numeric>
diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp
index f8a9edd127..93df66f3b2 100644
--- a/src/openrct2/peep/GuestPathfinding.cpp
+++ b/src/openrct2/peep/GuestPathfinding.cpp
@@ -25,6 +25,7 @@
 
 #include <bit>
 #include <bitset>
+#include <cassert>
 #include <cstring>
 
 bool gPeepPathFindIgnoreForeignQueues;
diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp
index eb18553a38..6fb8390306 100644
--- a/src/openrct2/platform/Platform.Win32.cpp
+++ b/src/openrct2/platform/Platform.Win32.cpp
@@ -15,6 +15,7 @@
 #    endif
 #    include "../Diagnostic.h"
 
+#    include <cassert>
 #    include <windows.h>
 
 // Then the rest
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 49eeb0ff76..cabdb9ec21 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -72,6 +72,7 @@
 #include "RCT1.h"
 #include "Tables.h"
 
+#include <cassert>
 #include <iterator>
 #include <memory>
 #include <vector>
diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp
index ed18e02e54..abd286a930 100644
--- a/src/openrct2/rct1/T4Importer.cpp
+++ b/src/openrct2/rct1/T4Importer.cpp
@@ -21,6 +21,8 @@
 #include "../ride/TrackDesign.h"
 #include "../ride/TrackDesignRepository.h"
 
+#include <cassert>
+
 namespace RCT1
 {
     /**
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 5115d05874..7b00114641 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -74,6 +74,8 @@
 #include "../world/Surface.h"
 #include "../world/TilePointerIndex.hpp"
 
+#include <cassert>
+
 using namespace OpenRCT2;
 
 namespace RCT2
diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp
index bebcb1b3ec..a8cc31c680 100644
--- a/src/openrct2/ride/RideConstruction.cpp
+++ b/src/openrct2/ride/RideConstruction.cpp
@@ -50,6 +50,8 @@
 #include "TrainManager.h"
 #include "Vehicle.h"
 
+#include <cassert>
+
 using namespace OpenRCT2::TrackMetaData;
 
 money64 _currentTrackPrice;
diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp
index 37ec9be0dd..8f7553b5ca 100644
--- a/src/openrct2/ride/Track.cpp
+++ b/src/openrct2/ride/Track.cpp
@@ -37,6 +37,8 @@
 #include "TrackData.h"
 #include "TrackDesign.h"
 
+#include <cassert>
+
 using namespace OpenRCT2;
 using namespace OpenRCT2::TrackMetaData;
 
diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp
index a38cbf4603..c96fa2221a 100644
--- a/src/openrct2/ride/TrackDesignSave.cpp
+++ b/src/openrct2/ride/TrackDesignSave.cpp
@@ -34,6 +34,8 @@
 #include "TrackDesign.h"
 #include "TrackDesignRepository.h"
 
+#include <cassert>
+
 constexpr size_t TRACK_MAX_SAVED_TILE_ELEMENTS = 1500;
 constexpr int32_t TRACK_NEARBY_SCENERY_DISTANCE = 1;
 
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 3d7af639e2..b3d05214da 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -58,6 +58,7 @@
 #include "VehicleData.h"
 #include "VehicleSubpositionData.h"
 
+#include <cassert>
 #include <iterator>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp
index 2450a4a67d..9030a469aa 100644
--- a/src/openrct2/ride/coaster/VirginiaReel.cpp
+++ b/src/openrct2/ride/coaster/VirginiaReel.cpp
@@ -19,6 +19,8 @@
 #include "../Vehicle.h"
 #include "../VehiclePaint.h"
 
+#include <cassert>
+
 static constexpr WoodenSupportType kSupportType = WoodenSupportType::Truss;
 
 // 0x009927E6:
diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp
index 9b9974e8d7..0c55e1a95c 100644
--- a/src/openrct2/ride/gentle/ObservationTower.cpp
+++ b/src/openrct2/ride/gentle/ObservationTower.cpp
@@ -21,6 +21,8 @@
 #include "../Vehicle.h"
 #include "../VehiclePaint.h"
 
+#include <cassert>
+
 enum
 {
     SprObservationTowerSegmentBase = 14986,
diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp
index 1e00aaa939..15e414dbb2 100644
--- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp
+++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp
@@ -20,6 +20,8 @@
 #include "../Vehicle.h"
 #include "../VehiclePaint.h"
 
+#include <cassert>
+
 enum
 {
     SPR_LAUNCHED_FREEFALL_TOWER_BASE = 14564,
diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp
index e200f36225..6b479fc0aa 100644
--- a/src/openrct2/ride/thrill/RotoDrop.cpp
+++ b/src/openrct2/ride/thrill/RotoDrop.cpp
@@ -20,6 +20,7 @@
 #include "../Vehicle.h"
 #include "../VehiclePaint.h"
 
+#include <cassert>
 #include <cstring>
 
 enum
diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp
index 5ef0cb3a85..1e422e2c51 100644
--- a/src/openrct2/ride/water/SubmarineRide.cpp
+++ b/src/openrct2/ride/water/SubmarineRide.cpp
@@ -19,6 +19,8 @@
 #include "../Vehicle.h"
 #include "../VehiclePaint.h"
 
+#include <cassert>
+
 static constexpr MetalSupportType kSupportType = MetalSupportType::Stick;
 
 static uint32_t SubmarineVehicleGetBaseImageId(const Vehicle* vehicle, const CarEntry* carEntry, int32_t imageDirection)
diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp
index e8d6cee198..9e9c67ccc5 100644
--- a/src/openrct2/scripting/ScriptEngine.cpp
+++ b/src/openrct2/scripting/ScriptEngine.cpp
@@ -59,6 +59,7 @@
 #    include "bindings/world/ScTile.hpp"
 #    include "bindings/world/ScTileElement.hpp"
 
+#    include <cassert>
 #    include <iostream>
 #    include <memory>
 #    include <stdexcept>
diff --git a/src/openrct2/util/SawyerCoding.cpp b/src/openrct2/util/SawyerCoding.cpp
index 014acd2a77..c4e222d9ef 100644
--- a/src/openrct2/util/SawyerCoding.cpp
+++ b/src/openrct2/util/SawyerCoding.cpp
@@ -14,6 +14,7 @@
 #include "../scenario/Scenario.h"
 #include "Util.h"
 
+#include <cassert>
 #include <cstring>
 #include <stdexcept>
 
diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp
index 7ff3b54fa8..f43d234c53 100644
--- a/src/openrct2/util/Util.cpp
+++ b/src/openrct2/util/Util.cpp
@@ -20,6 +20,7 @@
 #include "zlib.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cctype>
 #include <cmath>
 #include <ctime>
diff --git a/src/openrct2/world/LargeScenery.cpp b/src/openrct2/world/LargeScenery.cpp
index 20a3f28f32..77ba5cdc7b 100644
--- a/src/openrct2/world/LargeScenery.cpp
+++ b/src/openrct2/world/LargeScenery.cpp
@@ -17,6 +17,8 @@
 #include "../world/Banner.h"
 #include "TileElement.h"
 
+#include <cassert>
+
 colour_t LargeSceneryElement::GetPrimaryColour() const
 {
     return Colour[0];
diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp
index d154a5aacf..ffef941662 100644
--- a/src/openrct2/world/SmallScenery.cpp
+++ b/src/openrct2/world/SmallScenery.cpp
@@ -26,6 +26,8 @@
 #include "Scenery.h"
 #include "Surface.h"
 
+#include <cassert>
+
 uint8_t SmallSceneryElement::GetSceneryQuadrant() const
 {
     return (this->Type & kTileElementQuadrantMask) >> 6;