diff --git a/ast.cpp b/ast.cpp
index 40503219..f260c0b5 100644
--- a/ast.cpp
+++ b/ast.cpp
@@ -155,7 +155,7 @@ WalkAST(ASTNode *node, ASTPreCallBackFunc preFunc, ASTPostCallBackFunc postFunc,
     else {
         ///////////////////////////////////////////////////////////////////////////
         // Handle expressions
-        assert(dynamic_cast<Expr *>(node) != NULL);
+        Assert(dynamic_cast<Expr *>(node) != NULL);
         UnaryExpr *ue;
         BinaryExpr *be;
         AssignExpr *ae;
diff --git a/llvmutil.cpp b/llvmutil.cpp
index 4a50e337..804b13e0 100644
--- a/llvmutil.cpp
+++ b/llvmutil.cpp
@@ -109,7 +109,7 @@ InitLLVMUtil(llvm::LLVMContext *ctx, Target target) {
         LLVMTypes::MaskType = LLVMTypes::BoolVectorType =
             llvm::VectorType::get(llvm::Type::getInt1Ty(*ctx), target.vectorWidth);
     else {
-        assert(target.maskBitCount == 32);
+        Assert(target.maskBitCount == 32);
         LLVMTypes::MaskType = LLVMTypes::BoolVectorType =
             llvm::VectorType::get(llvm::Type::getInt32Ty(*ctx), target.vectorWidth);
     }
diff --git a/opt.cpp b/opt.cpp
index b30efd10..3510fbb2 100644
--- a/opt.cpp
+++ b/opt.cpp
@@ -550,7 +550,7 @@ lGetMask(llvm::Value *factor) {
     /* FIXME: This will break if we ever do 32-wide compilation, in which case
        it don't be possible to distinguish between -1 for "don't know" and
        "known and all bits on". */
-    assert(g->target.vectorWidth < 32);
+    Assert(g->target.vectorWidth < 32);
 
     llvm::ConstantVector *cv = llvm::dyn_cast<llvm::ConstantVector>(factor);
     if (cv) {
@@ -2266,7 +2266,7 @@ GSImprovementsPass::runOnBasicBlock(llvm::BasicBlock &bb) {
 
         llvm::ConstantInt *offsetScaleInt = 
             llvm::dyn_cast<llvm::ConstantInt>(offsetScale);
-        assert(offsetScaleInt != NULL);
+        Assert(offsetScaleInt != NULL);
 
         if (offsets->getType() == LLVMTypes::Int64VectorType)
             // offsetScale is an i32, so sext it so that if we use it in a
diff --git a/stmt.cpp b/stmt.cpp
index 5a803366..043f6fa2 100644
--- a/stmt.cpp
+++ b/stmt.cpp
@@ -1989,7 +1989,7 @@ LabeledStmt::LabeledStmt(const char *n, Stmt *s, SourcePos p)
 void
 LabeledStmt::EmitCode(FunctionEmitContext *ctx) const {
     llvm::BasicBlock *bblock = ctx->GetLabeledBasicBlock(name);
-    assert(bblock != NULL);
+    Assert(bblock != NULL);
 
     // End the current basic block with a jump to our basic block and then
     // set things up for emission to continue there.  Note that the current
diff --git a/test_static.cpp b/test_static.cpp
index 48a0021f..a8ec4a79 100644
--- a/test_static.cpp
+++ b/test_static.cpp
@@ -46,7 +46,6 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include <assert.h>
 #include <stdint.h>
 #ifdef ISPC_IS_LINUX
 #include <malloc.h>