@@ -13,15 +13,15 @@
  * file.
  */
 
 #include "config.h"
 
-#include <assert.h>
 #include <ctype.h>
 
 #import "OFMethodSignature.h"
 #import "OFData.h"
+#import "OFString.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
 
@@ -34,11 +34,11 @@
 static size_t
 alignmentOfArray(const char **type, size_t *length)
 {
 	size_t alignment;
 
-	assert(*length > 0);
+	OFAssert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
 	while (*length > 0 && OFASCIIIsDigit(**type)) {
@@ -63,11 +63,11 @@
 	size_t alignment = 0;
 #if defined(OF_POWERPC) && defined(OF_MACOS)
 	bool first = true;
 #endif
 
-	assert(*length > 0);
+	OFAssert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
 	/* Skip name */
@@ -109,11 +109,11 @@
 static size_t
 alignmentOfUnion(const char **type, size_t *length)
 {
 	size_t alignment = 0;
 
-	assert(*length > 0);
+	OFAssert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
 	/* Skip name */
@@ -290,11 +290,11 @@
 sizeOfArray(const char **type, size_t *length)
 {
 	size_t count = 0;
 	size_t size;
 
-	assert(*length > 0);
+	OFAssert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
 	while (*length > 0 && OFASCIIIsDigit(**type)) {
@@ -330,11 +330,11 @@
 	size_t alignment = alignmentOfStruct(&typeCopy, &lengthCopy);
 #if defined(OF_POWERPC) && defined(OF_MACOS)
 	bool first = true;
 #endif
 
-	assert(*length > 0);
+	OFAssert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
 	/* Skip name */
@@ -403,11 +403,11 @@
 static size_t
 sizeOfUnion(const char **type, size_t *length)
 {
 	size_t size = 0;
 
-	assert(*length > 0);
+	OFAssert(*length > 0);
 
 	(*type)++;
 	(*length)--;
 
 	/* Skip name */