@@ -15,14 +15,13 @@
 
 #include "config.h"
 
 #include <stdlib.h>
 
-#include <assert.h>
-
 #import "OFMutableSet.h"
 #import "OFMutableMapTableSet.h"
+#import "OFString.h"
 
 static struct {
 	Class isa;
 } placeholder;
 
@@ -172,11 +171,11 @@
 	@try {
 		size_t i;
 
 		i = 0;
 		for (id object in self) {
-			assert(i < count);
+			OFAssert(i < count);
 			cArray[i++] = object;
 		}
 
 		for (i = 0; i < count; i++)
 			if (![set containsObject: cArray[i]])