diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
@@ -5,7 +5,6 @@
 #include "DiscIO/VolumeVerifier.h"
 
 #include <algorithm>
-#include <cassert>
 #include <future>
 #include <limits>
 #include <memory>
@@ -696,7 +695,7 @@ bool VolumeVerifier::ShouldHaveChannelPartition() const
       "RFNE01", "RFNJ01", "RFNK01", "RFNP01", "RFNW01", "RFPE01", "RFPJ01", "RFPK01", "RFPP01",
       "RFPW01", "RGWE41", "RGWJ41", "RGWP41", "RGWX41", "RMCE01", "RMCJ01", "RMCK01", "RMCP01",
   };
-  assert(std::is_sorted(channel_discs.cbegin(), channel_discs.cend()));
+  DEBUG_ASSERT(std::is_sorted(channel_discs.cbegin(), channel_discs.cend()));
 
   return std::binary_search(channel_discs.cbegin(), channel_discs.cend(),
                             std::string_view(m_volume.GetGameID()));
@@ -729,7 +728,7 @@ bool VolumeVerifier::ShouldBeDualLayer() const
       "SLSEXJ", "SLSP01", "SQIE4Q", "SQIP4Q", "SQIY4Q", "SR5E41", "SR5P41", "SUOE41", "SUOP41",
       "SVXX52", "SVXY52", "SX4E01", "SX4P01", "SZ3EGT", "SZ3PGT",
   };
-  assert(std::is_sorted(dual_layer_discs.cbegin(), dual_layer_discs.cend()));
+  DEBUG_ASSERT(std::is_sorted(dual_layer_discs.cbegin(), dual_layer_discs.cend()));
 
   return std::binary_search(dual_layer_discs.cbegin(), dual_layer_discs.cend(),
                             std::string_view(m_volume.GetGameID()));

diff --git a/Source/Core/DolphinQt/GCMemcardManager.cpp b/Source/Core/DolphinQt/GCMemcardManager.cpp
@@ -5,7 +5,6 @@
 #include "DolphinQt/GCMemcardManager.h"
 
 #include <algorithm>
-#include <cassert>
 #include <string>
 #include <vector>
 
@@ -29,6 +28,7 @@
 #include <QTimer>
 #include <QToolButton>
 
+#include "Common/Assert.h"
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
@@ -387,7 +387,7 @@ static QString GetFormatDescription(Memcard::SavefileFormat format)
   case Memcard::SavefileFormat::SAV:
     return QObject::tr("Datel MaxDrive/Pro files");
   default:
-    assert(0);
+    ASSERT(0);
     return QObject::tr("Native GCI File");
   }
 }

diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
@@ -2,8 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "InputCommon/ControlReference/ExpressionParser.h"
+
 #include <algorithm>
-#include <cassert>
 #include <cmath>
 #include <functional>
 #include <iostream>
@@ -14,10 +15,10 @@
 #include <utility>
 #include <vector>
 
+#include "Common/Assert.h"
 #include "Common/Common.h"
 #include "Common/StringUtil.h"
 
-#include "InputCommon/ControlReference/ExpressionParser.h"
 #include "InputCommon/ControlReference/FunctionExpression.h"
 
 namespace ciface::ExpressionParser
@@ -384,7 +385,7 @@ class BinaryExpression : public Expression
       return std::max(std::min(1 - lval, rval), std::min(lval, 1 - rval));
     }
     default:
-      assert(false);
+      ASSERT(false);
       return 0;
     }
   }
@@ -823,7 +824,7 @@ class Parser
     case TOK_COMMA:
       return 8;
     default:
-      assert(false);
+      ASSERT(false);
       return 0;
     }
   }

diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@@ -6,6 +6,10 @@
 #include <cmath>
 #include <cstring>
 
+#ifdef CHECK
+#include "Common/Assert.h"
+#endif
+
 #include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"
@@ -1362,8 +1366,8 @@ static void TexDecoder_DecodeImpl_CMPR(u32* dst, const u8* src, int width, int h
         dst32[(width * 0) + 6] = colors1[(dxt1sel >> ((0 * 8) + 2)) & 3];
         dst32[(width * 0) + 7] = colors1[(dxt1sel >> ((0 * 8) + 0)) & 3];
 #ifdef CHECK
-        assert(memcmp(&(tmp0[0]), &dst32[(width * 0)], 16) == 0);
-        assert(memcmp(&(tmp1[0]), &dst32[(width * 0) + 4], 16) == 0);
+        ASSERT(memcmp(&(tmp0[0]), &dst32[(width * 0)], 16) == 0);
+        ASSERT(memcmp(&(tmp1[0]), &dst32[(width * 0) + 4], 16) == 0);
 #endif
         // Row 1:
         dst32[(width * 1) + 0] = colors0[(dxt0sel >> ((1 * 8) + 6)) & 3];
@@ -1375,8 +1379,8 @@ static void TexDecoder_DecodeImpl_CMPR(u32* dst, const u8* src, int width, int h
         dst32[(width * 1) + 6] = colors1[(dxt1sel >> ((1 * 8) + 2)) & 3];
         dst32[(width * 1) + 7] = colors1[(dxt1sel >> ((1 * 8) + 0)) & 3];
 #ifdef CHECK
-        assert(memcmp(&(tmp0[1]), &dst32[(width * 1)], 16) == 0);
-        assert(memcmp(&(tmp1[1]), &dst32[(width * 1) + 4], 16) == 0);
+        ASSERT(memcmp(&(tmp0[1]), &dst32[(width * 1)], 16) == 0);
+        ASSERT(memcmp(&(tmp1[1]), &dst32[(width * 1) + 4], 16) == 0);
 #endif
         // Row 2:
         dst32[(width * 2) + 0] = colors0[(dxt0sel >> ((2 * 8) + 6)) & 3];
@@ -1388,8 +1392,8 @@ static void TexDecoder_DecodeImpl_CMPR(u32* dst, const u8* src, int width, int h
         dst32[(width * 2) + 6] = colors1[(dxt1sel >> ((2 * 8) + 2)) & 3];
         dst32[(width * 2) + 7] = colors1[(dxt1sel >> ((2 * 8) + 0)) & 3];
 #ifdef CHECK
-        assert(memcmp(&(tmp0[2]), &dst32[(width * 2)], 16) == 0);
-        assert(memcmp(&(tmp1[2]), &dst32[(width * 2) + 4], 16) == 0);
+        ASSERT(memcmp(&(tmp0[2]), &dst32[(width * 2)], 16) == 0);
+        ASSERT(memcmp(&(tmp1[2]), &dst32[(width * 2) + 4], 16) == 0);
 #endif
         // Row 3:
         dst32[(width * 3) + 0] = colors0[(dxt0sel >> ((3 * 8) + 6)) & 3];
@@ -1401,8 +1405,8 @@ static void TexDecoder_DecodeImpl_CMPR(u32* dst, const u8* src, int width, int h
         dst32[(width * 3) + 6] = colors1[(dxt1sel >> ((3 * 8) + 2)) & 3];
         dst32[(width * 3) + 7] = colors1[(dxt1sel >> ((3 * 8) + 0)) & 3];
 #ifdef CHECK
-        assert(memcmp(&(tmp0[3]), &dst32[(width * 3)], 16) == 0);
-        assert(memcmp(&(tmp1[3]), &dst32[(width * 3) + 4], 16) == 0);
+        ASSERT(memcmp(&(tmp0[3]), &dst32[(width * 3)], 16) == 0);
+        ASSERT(memcmp(&(tmp1[3]), &dst32[(width * 3) + 4], 16) == 0);
 #endif
       }
     }