@@ -16,11 +16,10 @@
 #include "config.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #import "OFMutableUTF8String.h"
 #import "OFASPrintF.h"
 #import "OFString.h"
 #import "OFUTF8String.h"
@@ -77,11 +76,11 @@
 
 	if (!_s->isUTF8) {
 		uint8_t t;
 		const OFUnichar *const *table;
 
-		assert(startTableSize >= 1 && middleTableSize >= 1);
+		OFAssert(startTableSize >= 1 && middleTableSize >= 1);
 
 		_s->hasHash = false;
 
 		for (i = 0; i < _s->cStringLength; i++) {
 			if (isStart)
@@ -171,11 +170,11 @@
 			@throw [OFInvalidEncodingException exception];
 		}
 		j += d;
 	}
 
-	assert(j == newCStringLength);
+	OFAssert(j == newCStringLength);
 	newCString[j] = 0;
 	OFFreeMemory(unicodeString);
 
 	OFFreeMemory(_s->cString);
 	_s->hasHash = false;