diff --git a/common/goos/Object.h b/common/goos/Object.h
index 7527dfdbd3..1b834e5cd3 100644
--- a/common/goos/Object.h
+++ b/common/goos/Object.h
@@ -41,7 +41,7 @@
  */
 
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/common/goos/PrettyPrinter.cpp b/common/goos/PrettyPrinter.cpp
index 090626921b..a6d5acb3e8 100644
--- a/common/goos/PrettyPrinter.cpp
+++ b/common/goos/PrettyPrinter.cpp
@@ -4,7 +4,7 @@
  * It is not very good, but significantly better than putting everything on one line
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include <utility>
 #include <cstring>
diff --git a/common/goos/Reader.h b/common/goos/Reader.h
index 357a106748..09dcc734a1 100644
--- a/common/goos/Reader.h
+++ b/common/goos/Reader.h
@@ -12,7 +12,7 @@
  */
 
 #include <memory>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <unordered_map>
 #include <optional>
diff --git a/common/log/log.cpp b/common/log/log.cpp
index c5508a057e..0ef99fcd74 100644
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -1,6 +1,6 @@
 #include <cstdio>
 #include <cstdlib>
-#include <cassert>
+#include "common/util/assert.h"
 #include <mutex>
 #include "third-party/fmt/color.h"
 #include "log.h"
diff --git a/common/type_system/Type.cpp b/common/type_system/Type.cpp
index 6369d599bb..6c813611ec 100644
--- a/common/type_system/Type.cpp
+++ b/common/type_system/Type.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include <third-party/fmt/core.h>
 #include "Type.h"
 
@@ -707,4 +707,4 @@ bool EnumType::operator==(const Type& other) const {
   auto* p_other = dynamic_cast<const EnumType*>(&other);
   return other.is_equal(*this) && (m_entries == p_other->m_entries) &&
          (m_is_bitfield == p_other->m_is_bitfield);
-}
\ No newline at end of file
+}
diff --git a/common/type_system/Type.h b/common/type_system/Type.h
index 74d0979a70..2a747d1664 100644
--- a/common/type_system/Type.h
+++ b/common/type_system/Type.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 #include <unordered_map>
 #include "common/goal_constants.h"
 #include "TypeSpec.h"
diff --git a/common/type_system/TypeSpec.h b/common/type_system/TypeSpec.h
index 885ebe5771..d5880d199a 100644
--- a/common/type_system/TypeSpec.h
+++ b/common/type_system/TypeSpec.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 
 class Type;
 
diff --git a/common/type_system/TypeSystem.cpp b/common/type_system/TypeSystem.cpp
index c3c391c230..a18bdbca3d 100644
--- a/common/type_system/TypeSystem.cpp
+++ b/common/type_system/TypeSystem.cpp
@@ -5,7 +5,7 @@
  * access types, and reverse type lookups.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include <third-party/fmt/core.h>
 #include "TypeSystem.h"
diff --git a/common/util/BinaryReader.h b/common/util/BinaryReader.h
index 5b123d9a4c..b548c3366f 100644
--- a/common/util/BinaryReader.h
+++ b/common/util/BinaryReader.h
@@ -6,7 +6,7 @@
  */
 
 #include <cstdint>
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 
 class BinaryReader {
diff --git a/common/util/BinaryWriter.h b/common/util/BinaryWriter.h
index 032222909c..7ab17d7106 100644
--- a/common/util/BinaryWriter.h
+++ b/common/util/BinaryWriter.h
@@ -5,7 +5,7 @@
  * Write raw data like a stream.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include <vector>
 #include <cstdint>
diff --git a/common/util/FileUtil.cpp b/common/util/FileUtil.cpp
index be132c1316..5721b39a41 100644
--- a/common/util/FileUtil.cpp
+++ b/common/util/FileUtil.cpp
@@ -9,7 +9,7 @@
 #include <cstdio> /* defines FILENAME_MAX */
 #include <fstream>
 #include <sstream>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdlib>
 #include "common/util/BinaryReader.h"
 #include "BinaryWriter.h"
diff --git a/common/util/Timer.h b/common/util/Timer.h
index b2f3b1dc71..3df3830fd3 100644
--- a/common/util/Timer.h
+++ b/common/util/Timer.h
@@ -3,7 +3,7 @@
 #ifndef JAK_V2_TIMER_H
 #define JAK_V2_TIMER_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdint>
 #include <ctime>
 
diff --git a/common/util/Trie.h b/common/util/Trie.h
index 5cc8e67550..aa81216430 100644
--- a/common/util/Trie.h
+++ b/common/util/Trie.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 #include <string>
 
diff --git a/common/util/assert.h b/common/util/assert.h
new file mode 100644
index 0000000000..9369507b2b
--- /dev/null
+++ b/common/util/assert.h
@@ -0,0 +1,22 @@
+#pragma once
+
+/*!
+ * @file assert.h
+ * Wrapper around <cassert>.
+ */
+
+#if defined NDEBUG && defined _WIN32
+
+#define _OLD_NDEBUG NDEBUG
+
+#undef NDEBUG
+#include <cassert>
+#define NDEBUG _OLD_NDEBUG
+
+#undef _OLD_NDEBUG
+
+#else
+
+#include <cassert>
+
+#endif
diff --git a/common/util/dgo_util.cpp b/common/util/dgo_util.cpp
index 6cda9dce91..b9f73be792 100644
--- a/common/util/dgo_util.cpp
+++ b/common/util/dgo_util.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "dgo_util.h"
 #include "common/versions.h"
diff --git a/common/util/json_util.cpp b/common/util/json_util.cpp
index 95d098ecef..08661fb076 100644
--- a/common/util/json_util.cpp
+++ b/common/util/json_util.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "json_util.h"
 
 /*!
diff --git a/decompiler/Disasm/Instruction.cpp b/decompiler/Disasm/Instruction.cpp
index 1b43fc2d64..2d0f7891ad 100644
--- a/decompiler/Disasm/Instruction.cpp
+++ b/decompiler/Disasm/Instruction.cpp
@@ -7,7 +7,7 @@
 #include "Instruction.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "third-party/fmt/core.h"
-#include <cassert>
+#include "common/util/assert.h"
 
 namespace decompiler {
 /*!
diff --git a/decompiler/Disasm/InstructionDecode.cpp b/decompiler/Disasm/InstructionDecode.cpp
index 87f7f12a94..34f933aff9 100644
--- a/decompiler/Disasm/InstructionDecode.cpp
+++ b/decompiler/Disasm/InstructionDecode.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "InstructionDecode.h"
-#include <cassert>
+#include "common/util/assert.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
 namespace decompiler {
diff --git a/decompiler/Disasm/InstructionMatching.cpp b/decompiler/Disasm/InstructionMatching.cpp
index 4cb66a4fd4..c5de4583be 100644
--- a/decompiler/Disasm/InstructionMatching.cpp
+++ b/decompiler/Disasm/InstructionMatching.cpp
@@ -3,7 +3,7 @@
  * Utilities for checking if an instruction matches some criteria.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "InstructionMatching.h"
 
 namespace decompiler {
diff --git a/decompiler/Disasm/InstructionParser.cpp b/decompiler/Disasm/InstructionParser.cpp
index 5859c17ead..4c6fd2d548 100644
--- a/decompiler/Disasm/InstructionParser.cpp
+++ b/decompiler/Disasm/InstructionParser.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <algorithm>
 #include <stdexcept>
 #include "common/common_types.h"
diff --git a/decompiler/Disasm/OpcodeInfo.cpp b/decompiler/Disasm/OpcodeInfo.cpp
index a75b1f9f99..0e12baf2a1 100644
--- a/decompiler/Disasm/OpcodeInfo.cpp
+++ b/decompiler/Disasm/OpcodeInfo.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "OpcodeInfo.h"
-#include <cassert>
+#include "common/util/assert.h"
 
 namespace decompiler {
 OpcodeInfo gOpcodeInfo[(uint32_t)InstructionKind::EE_OP_MAX];
@@ -518,4 +518,4 @@ OpcodeInfo& OpcodeInfo::dst_vf(FieldType field) {
 OpcodeInfo& OpcodeInfo::dst_vi(FieldType field) {
   return dst(field, DT::VI);
 }
-}  // namespace decompiler
\ No newline at end of file
+}  // namespace decompiler
diff --git a/decompiler/Disasm/Register.cpp b/decompiler/Disasm/Register.cpp
index c4df14f07c..94ad2de418 100644
--- a/decompiler/Disasm/Register.cpp
+++ b/decompiler/Disasm/Register.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "Register.h"
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 
 namespace decompiler {
diff --git a/decompiler/Disasm/Register.h b/decompiler/Disasm/Register.h
index 8f08bb895b..d44dd68967 100644
--- a/decompiler/Disasm/Register.h
+++ b/decompiler/Disasm/Register.h
@@ -6,7 +6,7 @@
  */
 
 #include <cstdint>
-#include <cassert>
+#include "common/util/assert.h"
 #include <string>
 
 namespace decompiler {
diff --git a/decompiler/Function/BasicBlocks.cpp b/decompiler/Function/BasicBlocks.cpp
index ecc51a7dcd..afb107ccbb 100644
--- a/decompiler/Function/BasicBlocks.cpp
+++ b/decompiler/Function/BasicBlocks.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <cassert>
+#include "common/util/assert.h"
 #include "BasicBlocks.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/Disasm/InstructionMatching.h"
@@ -68,4 +68,4 @@ std::vector<BasicBlock> find_blocks_in_function(const LinkedObjectFile& file,
 
   return basic_blocks;
 }
-}  // namespace decompiler
\ No newline at end of file
+}  // namespace decompiler
diff --git a/decompiler/Function/CfgVtx.cpp b/decompiler/Function/CfgVtx.cpp
index 0657c38bb0..812ba132c0 100644
--- a/decompiler/Function/CfgVtx.cpp
+++ b/decompiler/Function/CfgVtx.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/goos/PrettyPrinter.h"
 #include "decompiler/Disasm/InstructionMatching.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
@@ -2091,4 +2091,4 @@ std::shared_ptr<ControlFlowGraph> build_cfg(const LinkedObjectFile& file, int se
 
   return cfg;
 }
-}  // namespace decompiler
\ No newline at end of file
+}  // namespace decompiler
diff --git a/decompiler/Function/CfgVtx.h b/decompiler/Function/CfgVtx.h
index 7b97a3bd2d..e7350bd6c9 100644
--- a/decompiler/Function/CfgVtx.h
+++ b/decompiler/Function/CfgVtx.h
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 
 namespace goos {
 class Object;
diff --git a/decompiler/Function/Function.cpp b/decompiler/Function/Function.cpp
index 8bdb114e2f..81e327db6c 100644
--- a/decompiler/Function/Function.cpp
+++ b/decompiler/Function/Function.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 #include "Function.h"
 #include "common/log/log.h"
diff --git a/decompiler/Function/Warnings.h b/decompiler/Function/Warnings.h
index d7cdf51402..40023ad787 100644
--- a/decompiler/Function/Warnings.h
+++ b/decompiler/Function/Warnings.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "third-party/fmt/core.h"
 
diff --git a/decompiler/IR/IR.h b/decompiler/IR/IR.h
index 07955c6c70..bfee70afb2 100644
--- a/decompiler/IR/IR.h
+++ b/decompiler/IR/IR.h
@@ -1,7 +1,7 @@
 #ifndef JAK_IR_H
 #define JAK_IR_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <memory>
 #include <unordered_map>
diff --git a/decompiler/IR2/AtomicOp.cpp b/decompiler/IR2/AtomicOp.cpp
index ba7c56bd23..86b6374397 100644
--- a/decompiler/IR2/AtomicOp.cpp
+++ b/decompiler/IR2/AtomicOp.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <stdexcept>
 #include "common/goal_constants.h"
diff --git a/decompiler/IR2/AtomicOp.h b/decompiler/IR2/AtomicOp.h
index f0a60a358e..f0669ce499 100644
--- a/decompiler/IR2/AtomicOp.h
+++ b/decompiler/IR2/AtomicOp.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <optional>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include "common/goos/Object.h"
 #include "decompiler/Disasm/Register.h"
diff --git a/decompiler/IR2/Env.h b/decompiler/IR2/Env.h
index dc68b28d85..832d3c331a 100644
--- a/decompiler/IR2/Env.h
+++ b/decompiler/IR2/Env.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 #include <common/goos/Object.h>
 #include "decompiler/util/TP_Type.h"
 #include "decompiler/util/StackSpillMap.h"
diff --git a/decompiler/IR2/OpenGoalMapping.h b/decompiler/IR2/OpenGoalMapping.h
index 88a117a2f3..9f2a671020 100644
--- a/decompiler/IR2/OpenGoalMapping.h
+++ b/decompiler/IR2/OpenGoalMapping.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <optional>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <map>
 #include "common/goos/Object.h"
diff --git a/decompiler/IR2/bitfields.h b/decompiler/IR2/bitfields.h
index ce0a322cd9..fd0011afc8 100644
--- a/decompiler/IR2/bitfields.h
+++ b/decompiler/IR2/bitfields.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "common/common_types.h"
 #include "decompiler/IR2/Form.h"
diff --git a/decompiler/ObjectFile/LinkedObjectFile.cpp b/decompiler/ObjectFile/LinkedObjectFile.cpp
index 39ad8b9110..9a0d0344f7 100644
--- a/decompiler/ObjectFile/LinkedObjectFile.cpp
+++ b/decompiler/ObjectFile/LinkedObjectFile.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <algorithm>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <numeric>
 #include "decompiler/IR/IR.h"
diff --git a/decompiler/ObjectFile/LinkedObjectFileCreation.cpp b/decompiler/ObjectFile/LinkedObjectFileCreation.cpp
index a5f4d15364..dcb83716ef 100644
--- a/decompiler/ObjectFile/LinkedObjectFileCreation.cpp
+++ b/decompiler/ObjectFile/LinkedObjectFileCreation.cpp
@@ -4,7 +4,7 @@
  * This implements a decoder for the GOAL linking format.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "LinkedObjectFileCreation.h"
 #include "decompiler/config.h"
diff --git a/decompiler/ObjectFile/LinkedWord.h b/decompiler/ObjectFile/LinkedWord.h
index 33b5a97480..3fb8dbc538 100644
--- a/decompiler/ObjectFile/LinkedWord.h
+++ b/decompiler/ObjectFile/LinkedWord.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "common/common_types.h"
 
diff --git a/decompiler/ObjectFile/ObjectFileDB.h b/decompiler/ObjectFile/ObjectFileDB.h
index c824c293b1..befcd36cb7 100644
--- a/decompiler/ObjectFile/ObjectFileDB.h
+++ b/decompiler/ObjectFile/ObjectFileDB.h
@@ -10,7 +10,7 @@
 #ifndef JAK2_DISASSEMBLER_OBJECTFILEDB_H
 #define JAK2_DISASSEMBLER_OBJECTFILEDB_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/decompiler/analysis/variable_naming.h b/decompiler/analysis/variable_naming.h
index 1e791bc119..c9f24af3d4 100644
--- a/decompiler/analysis/variable_naming.h
+++ b/decompiler/analysis/variable_naming.h
@@ -19,7 +19,7 @@
 #include <vector>
 #include <optional>
 #include <unordered_map>
-#include <cassert>
+#include "common/util/assert.h"
 #include "decompiler/Disasm/Register.h"
 #include "decompiler/util/TP_Type.h"
 #include "decompiler/IR2/IR2_common.h"
diff --git a/decompiler/data/LinkedWordReader.h b/decompiler/data/LinkedWordReader.h
index 161757048e..9096fe9f7e 100644
--- a/decompiler/data/LinkedWordReader.h
+++ b/decompiler/data/LinkedWordReader.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <vector>
 #include <string>
diff --git a/decompiler/data/StrFileReader.cpp b/decompiler/data/StrFileReader.cpp
index 75a2cd6f8d..e90c5beb05 100644
--- a/decompiler/data/StrFileReader.cpp
+++ b/decompiler/data/StrFileReader.cpp
@@ -3,7 +3,7 @@
  * Utility class to read a .STR file and extract the full file name.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "common/util/FileUtil.h"
 #include "game/common/overlord_common.h"
diff --git a/decompiler/util/DataParser.cpp b/decompiler/util/DataParser.cpp
index 035d225551..c89de4995a 100644
--- a/decompiler/util/DataParser.cpp
+++ b/decompiler/util/DataParser.cpp
@@ -1,5 +1,5 @@
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include "DataParser.h"
 #include "third-party/fmt/core.h"
 
diff --git a/decompiler/util/TP_Type.h b/decompiler/util/TP_Type.h
index 2b9feedfb0..7c893fbf1b 100644
--- a/decompiler/util/TP_Type.h
+++ b/decompiler/util/TP_Type.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include "common/log/log.h"
 #include "common/type_system/TypeSpec.h"
@@ -319,4 +319,4 @@ struct TypeState {
 };
 
 u32 regs_to_gpr_mask(const std::vector<Register>& regs);
-}  // namespace decompiler
\ No newline at end of file
+}  // namespace decompiler
diff --git a/game/kernel/Ptr.h b/game/kernel/Ptr.h
index 50d327aa89..69ec0b7d4f 100644
--- a/game/kernel/Ptr.h
+++ b/game/kernel/Ptr.h
@@ -8,7 +8,7 @@
 #ifndef JAK_PTR_H
 #define JAK_PTR_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "game/runtime.h"
 #include "common/common_types.h"
 
diff --git a/game/kernel/fileio.cpp b/game/kernel/fileio.cpp
index 21fe00961f..0b695d947a 100644
--- a/game/kernel/fileio.cpp
+++ b/game/kernel/fileio.cpp
@@ -4,7 +4,7 @@
  * DONE!
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <cstdio>
 #include "game/sce/sif_ee.h"
diff --git a/game/kernel/kdsnetm.cpp b/game/kernel/kdsnetm.cpp
index 9abcf5c1fe..bcfdc8eadc 100644
--- a/game/kernel/kdsnetm.cpp
+++ b/game/kernel/kdsnetm.cpp
@@ -6,7 +6,7 @@
 
 #include <cstring>
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 #include "game/sce/deci2.h"
 #include "game/system/deci_common.h"  // todo, reorganize to avoid this include
 #include "kdsnetm.h"
diff --git a/game/kernel/klink.cpp b/game/kernel/klink.cpp
index 14ce743fab..543815bb64 100644
--- a/game/kernel/klink.cpp
+++ b/game/kernel/klink.cpp
@@ -7,7 +7,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include <common/versions.h>
 #include "klink.h"
diff --git a/game/kernel/kmachine.cpp b/game/kernel/kmachine.cpp
index 21317bb0d0..00af109793 100644
--- a/game/kernel/kmachine.cpp
+++ b/game/kernel/kmachine.cpp
@@ -7,7 +7,7 @@
 
 #include <string>
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include "kmachine.h"
 #include "kboot.h"
 #include "kprint.h"
diff --git a/game/kernel/kprint.cpp b/game/kernel/kprint.cpp
index bdf28b7632..361dab7cbe 100644
--- a/game/kernel/kprint.cpp
+++ b/game/kernel/kprint.cpp
@@ -7,7 +7,7 @@
 #include <cmath>
 #include <cstdarg>
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "common/goal_constants.h"
 #include "common/common_types.h"
diff --git a/game/kernel/kscheme.cpp b/game/kernel/kscheme.cpp
index d5e0c1dff9..952cd9db48 100644
--- a/game/kernel/kscheme.cpp
+++ b/game/kernel/kscheme.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include "kscheme.h"
 #include "common/common_types.h"
 #include "common/goal_constants.h"
diff --git a/game/overlord/fake_iso.cpp b/game/overlord/fake_iso.cpp
index 1d4788d0eb..85c1d72aab 100644
--- a/game/overlord/fake_iso.cpp
+++ b/game/overlord/fake_iso.cpp
@@ -10,7 +10,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include "fake_iso.h"
 #include "game/sce/iop.h"
 #include "isocommon.h"
diff --git a/game/overlord/iso_queue.cpp b/game/overlord/iso_queue.cpp
index e0612f8af9..8494ebd05e 100644
--- a/game/overlord/iso_queue.cpp
+++ b/game/overlord/iso_queue.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/log/log.h"
 #include "game/sce/iop.h"
 #include "iso_queue.h"
diff --git a/game/overlord/ramdisk.cpp b/game/overlord/ramdisk.cpp
index 5cdbca0b6a..faa9ece3b4 100644
--- a/game/overlord/ramdisk.cpp
+++ b/game/overlord/ramdisk.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include "common/common_types.h"
 #include "game/common/ramdisk_rpc_types.h"
diff --git a/game/overlord/stream.cpp b/game/overlord/stream.cpp
index 3a677da24e..78c463686e 100644
--- a/game/overlord/stream.cpp
+++ b/game/overlord/stream.cpp
@@ -4,7 +4,7 @@
  * Supports loading a file directly to the EE, or loading chunks of a chunked file.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "stream.h"
 #include "game/sce/iop.h"
diff --git a/game/sce/deci2.cpp b/game/sce/deci2.cpp
index 97f37aa717..ac34e9dd0f 100644
--- a/game/sce/deci2.cpp
+++ b/game/sce/deci2.cpp
@@ -3,7 +3,7 @@
  * Implementation of SCE DECI2 library.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include <cstring>
 #include "common/log/log.h"
diff --git a/game/sce/iop.cpp b/game/sce/iop.cpp
index 4546eec398..fa9d46724f 100644
--- a/game/sce/iop.cpp
+++ b/game/sce/iop.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "iop.h"
 #include "game/system/iop_thread.h"
diff --git a/game/sce/libcdvd_ee.cpp b/game/sce/libcdvd_ee.cpp
index 18fcd01f99..a38e57b990 100644
--- a/game/sce/libcdvd_ee.cpp
+++ b/game/sce/libcdvd_ee.cpp
@@ -3,7 +3,7 @@
  * Stub implementation of the EE CD/DVD library
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "libcdvd_ee.h"
 
 namespace ee {
diff --git a/game/sce/libpad.cpp b/game/sce/libpad.cpp
index a95e7c5ecd..a263bb7028 100644
--- a/game/sce/libpad.cpp
+++ b/game/sce/libpad.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "libpad.h"
 
 namespace ee {
diff --git a/game/sce/sif_ee.cpp b/game/sce/sif_ee.cpp
index b78b46ac30..c14075d7d8 100644
--- a/game/sce/sif_ee.cpp
+++ b/game/sce/sif_ee.cpp
@@ -1,5 +1,5 @@
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include <unordered_map>
 #include "common/util/FileUtil.h"
diff --git a/game/sce/stubs.cpp b/game/sce/stubs.cpp
index 4871e78688..105ef5e602 100644
--- a/game/sce/stubs.cpp
+++ b/game/sce/stubs.cpp
@@ -1,5 +1,5 @@
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include "stubs.h"
 
 namespace ee {
diff --git a/game/system/Deci2Server.cpp b/game/system/Deci2Server.cpp
index fdf6093592..4e7b8c2e52 100644
--- a/game/system/Deci2Server.cpp
+++ b/game/system/Deci2Server.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 
 // TODO - i think im not including the dependency right..?
diff --git a/game/system/IOP_Kernel.cpp b/game/system/IOP_Kernel.cpp
index 65db7d6a10..521b2fd304 100644
--- a/game/system/IOP_Kernel.cpp
+++ b/game/system/IOP_Kernel.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "IOP_Kernel.h"
 #include "game/sce/iop.h"
diff --git a/game/system/IOP_Kernel.h b/game/system/IOP_Kernel.h
index ed74e55fb1..7613684531 100644
--- a/game/system/IOP_Kernel.h
+++ b/game/system/IOP_Kernel.h
@@ -10,7 +10,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <atomic>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 
 class IOP_Kernel;
diff --git a/goalc/compiler/SymbolInfo.h b/goalc/compiler/SymbolInfo.h
index 567ab0d50a..91d96769c5 100644
--- a/goalc/compiler/SymbolInfo.h
+++ b/goalc/compiler/SymbolInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 #include <string>
 #include <set>
diff --git a/goalc/data_compiler/DataObjectGenerator.cpp b/goalc/data_compiler/DataObjectGenerator.cpp
index 2fa5f3f1d3..6c463dd956 100644
--- a/goalc/data_compiler/DataObjectGenerator.cpp
+++ b/goalc/data_compiler/DataObjectGenerator.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
 #include <algorithm>
-#include <cassert>
+#include "common/util/assert.h"
 #include "DataObjectGenerator.h"
 #include "common/link_types.h"
 
diff --git a/goalc/debugger/DebugInfo.h b/goalc/debugger/DebugInfo.h
index 9a81c92b4c..1ff97d83de 100644
--- a/goalc/debugger/DebugInfo.h
+++ b/goalc/debugger/DebugInfo.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 #include "goalc/emitter/Instruction.h"
 #include "goalc/debugger/disassemble.h"
diff --git a/goalc/debugger/Debugger.cpp b/goalc/debugger/Debugger.cpp
index 8cb56be02b..81fb0b3b85 100644
--- a/goalc/debugger/Debugger.cpp
+++ b/goalc/debugger/Debugger.cpp
@@ -4,7 +4,7 @@
  * Uses xdbg functions to debug an OpenGOAL target.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "Debugger.h"
 #include "common/util/Timer.h"
 #include "common/goal_constants.h"
diff --git a/goalc/emitter/IGen.h b/goalc/emitter/IGen.h
index 6a231743b3..e25284f69f 100644
--- a/goalc/emitter/IGen.h
+++ b/goalc/emitter/IGen.h
@@ -3,7 +3,7 @@
 #ifndef JAK_IGEN_H
 #define JAK_IGEN_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "Register.h"
 #include "Instruction.h"
 #include <stdexcept>
diff --git a/goalc/emitter/Instruction.h b/goalc/emitter/Instruction.h
index 9688d8ad4d..d6f12811f7 100644
--- a/goalc/emitter/Instruction.h
+++ b/goalc/emitter/Instruction.h
@@ -3,7 +3,7 @@
 #ifndef JAK_INSTRUCTION_H
 #define JAK_INSTRUCTION_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 
 namespace emitter {
diff --git a/goalc/emitter/Register.h b/goalc/emitter/Register.h
index 71150dab6c..6c33eb2dfa 100644
--- a/goalc/emitter/Register.h
+++ b/goalc/emitter/Register.h
@@ -8,7 +8,7 @@
 #ifndef JAK_REGISTER_H
 #define JAK_REGISTER_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <array>
 #include <vector>
 #include <string>
diff --git a/goalc/listener/Listener.cpp b/goalc/listener/Listener.cpp
index ce5761a502..2b3263c9b4 100644
--- a/goalc/listener/Listener.cpp
+++ b/goalc/listener/Listener.cpp
@@ -21,7 +21,7 @@
 #include "common/cross_sockets/xsocket.h"
 
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <chrono>
 #include <thread>
diff --git a/goalc/listener/MemoryMap.cpp b/goalc/listener/MemoryMap.cpp
index 4ca79bf789..544f390faf 100644
--- a/goalc/listener/MemoryMap.cpp
+++ b/goalc/listener/MemoryMap.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <algorithm>
 #include <stdexcept>
 #include "MemoryMap.h"
diff --git a/goalc/regalloc/IRegSet.h b/goalc/regalloc/IRegSet.h
index a82f45a765..f7fd61a40b 100644
--- a/goalc/regalloc/IRegSet.h
+++ b/goalc/regalloc/IRegSet.h
@@ -14,7 +14,7 @@
  * The space used is (highest_set_reg + 63) / 64 + constant overhead (vector + int)
  */
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 
 class IRegSet {
diff --git a/goalc/regalloc/IRegister.cpp b/goalc/regalloc/IRegister.cpp
index a0990d996f..54cdd1ccbe 100644
--- a/goalc/regalloc/IRegister.cpp
+++ b/goalc/regalloc/IRegister.cpp
@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "third-party/fmt/core.h"
 #include "IRegister.h"