@@ -14,20 +14,19 @@
  * file.
  */
 
 #include "config.h"
 
-#include <stdlib.h>
-
 #import "OFNull.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
 #import "OFDataArray.h"
 
 #import "OFInvalidArgumentException.h"
 
 #import "autorelease.h"
+#import "macros.h"
 
 static OFNull *null = nil;
 
 @implementation OFNull
 + (void)initialize
@@ -117,12 +116,11 @@
 	return OF_RETAIN_COUNT_MAX;
 }
 
 - (void)dealloc
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 
 	/* Get rid of a stupid warning */
 	[super dealloc];
 }
 @end