diff --git a/src/backend_x64/interface_x64.cpp b/src/backend_x64/interface_x64.cpp
index a6a2f6c4..cab0a342 100644
--- a/src/backend_x64/interface_x64.cpp
+++ b/src/backend_x64/interface_x64.cpp
@@ -69,7 +69,7 @@ struct Jit::Impl {
         for (CodePtr pos = block.code_ptr; pos < end;) {
             char buffer[80];
             size_t inst_size = LLVMDisasmInstruction(llvm_ctx, const_cast<u8*>(pos), remaining, (u64)pos, buffer, sizeof(buffer));
-            assert(inst_size);
+            ASSERT(inst_size);
             for (CodePtr i = pos; i < pos + inst_size; i++)
                 result.append(Common::StringFromFormat("%02x ", *i));
             for (size_t i = inst_size; i < 10; i++)
diff --git a/src/frontend/decoder/arm.h b/src/frontend/decoder/arm.h
index 5e242f79..a0a171c4 100644
--- a/src/frontend/decoder/arm.h
+++ b/src/frontend/decoder/arm.h
@@ -47,7 +47,7 @@ struct ArmMatcher {
      * @param instruction The instruction to decode.
      */
     CallRetT call(Visitor& v, u32 instruction) const {
-        assert(Matches(instruction));
+        ASSERT(Matches(instruction));
         return fn(v, instruction);
     }
 
diff --git a/src/frontend/decoder/decoder_detail.h b/src/frontend/decoder/decoder_detail.h
index d5f4d0ca..dfd22e32 100644
--- a/src/frontend/decoder/decoder_detail.h
+++ b/src/frontend/decoder/decoder_detail.h
@@ -8,7 +8,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cassert>
 #include <tuple>
 
 #include "common/assert.h"
diff --git a/src/frontend/decoder/thumb16.h b/src/frontend/decoder/thumb16.h
index 4c32c24b..18863ed7 100644
--- a/src/frontend/decoder/thumb16.h
+++ b/src/frontend/decoder/thumb16.h
@@ -45,7 +45,7 @@ struct Thumb16Matcher {
      * @param instruction The instruction to decode.
      */
     CallRetT call(Visitor& v, u16 instruction) const {
-        assert(Matches(instruction));
+        ASSERT(Matches(instruction));
         return fn(v, instruction);
     }
 
diff --git a/src/frontend/decoder/thumb32.h b/src/frontend/decoder/thumb32.h
index 381d5c64..cb2552d8 100644
--- a/src/frontend/decoder/thumb32.h
+++ b/src/frontend/decoder/thumb32.h
@@ -45,7 +45,7 @@ struct Thumb32Matcher {
      * @param instruction The instruction to decode.
      */
     CallRetT call(Visitor& v, u32 instruction) const {
-        assert(Matches(instruction));
+        ASSERT(Matches(instruction));
         return fn(v, instruction);
     }
 
diff --git a/src/frontend/disassembler/disassembler_arm.cpp b/src/frontend/disassembler/disassembler_arm.cpp
index 26fe0e7b..06fa97a9 100644
--- a/src/frontend/disassembler/disassembler_arm.cpp
+++ b/src/frontend/disassembler/disassembler_arm.cpp
@@ -48,7 +48,7 @@ public:
                 if (imm5 == 0) return ", rrx";
                 return Common::StringFromFormat(", ror #%hhu", imm5);
         }
-        assert(false);
+        ASSERT(false);
         return "<internal error>";
     }
 
@@ -63,7 +63,7 @@ public:
             case ShiftType::ROR:
                 return Common::StringFromFormat("%s, ror %s", RegToString(m), RegToString(s));
         }
-        assert(false);
+        ASSERT(false);
         return "<internal error>";
     }
 
@@ -78,7 +78,7 @@ public:
             case SignExtendRotation::ROR_24:
                 return Common::StringFromFormat("%s, ror #24", RegToString(m));
         }
-        assert(false);
+        ASSERT(false);
         return "<internal error>";
     }