Index: generators/TableGenerator.m
==================================================================
--- generators/TableGenerator.m
+++ generators/TableGenerator.m
@@ -26,13 +26,10 @@
 #import "OFHTTPResponse.h"
 #import "OFHTTPClient.h"
 #import "OFFile.h"
 #import "OFStdIOStream.h"
 
-#import "autorelease.h"
-#import "macros.h"
-
 #import "TableGenerator.h"
 #import "copyright.h"
 
 #define UNICODE_DATA_URL \
 	@"http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"

Index: tests/ForwardingTests.m
==================================================================
--- tests/ForwardingTests.m
+++ tests/ForwardingTests.m
@@ -19,12 +19,10 @@
 #include <string.h>
 
 #import "OFString.h"
 #import "OFAutoreleasePool.h"
 
-#import "macros.h"
-
 #import "OFNotImplementedException.h"
 
 #import "TestsAppDelegate.h"
 
 #define FMT @"%@ %@ %@ %@ %@ %@ %@ %@ %@ %g %g %g %g %g %g %g %g %g"

Index: tests/OFArrayTests.m
==================================================================
--- tests/OFArrayTests.m
+++ tests/OFArrayTests.m
@@ -21,12 +21,10 @@
 #import "OFAutoreleasePool.h"
 
 #import "OFEnumerationMutationException.h"
 #import "OFOutOfRangeException.h"
 
-#import "macros.h"
-
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFArray";
 static OFString *c_ary[] = {
 	@"Foo",

Index: tests/OFDataArrayTests.m
==================================================================
--- tests/OFDataArrayTests.m
+++ tests/OFDataArrayTests.m
@@ -23,12 +23,10 @@
 #import "OFString.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFOutOfRangeException.h"
 
-#import "macros.h"
-
 #import "TestsAppDelegate.h"
 
 static OFString *module;
 const char *str = "Hello!";
 

Index: tests/OFStringTests.m
==================================================================
--- tests/OFStringTests.m
+++ tests/OFStringTests.m
@@ -30,12 +30,10 @@
 #import "OFInvalidEncodingException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
 #import "OFUnknownXMLEntityException.h"
 
-#import "macros.h"
-
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFString";
 static OFString* whitespace[] = {
 	@" \r \t\n\t \tasd  \t \t\t\r\n",

Index: tests/OFTCPSocketTests.m
==================================================================
--- tests/OFTCPSocketTests.m
+++ tests/OFTCPSocketTests.m
@@ -20,12 +20,10 @@
 
 #import "OFTCPSocket.h"
 #import "OFString.h"
 #import "OFAutoreleasePool.h"
 
-#import "macros.h"
-
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFTCPSocket";
 
 @implementation TestsAppDelegate (OFTCPSocketTests)

Index: tests/OFXMLElementBuilderTests.m
==================================================================
--- tests/OFXMLElementBuilderTests.m
+++ tests/OFXMLElementBuilderTests.m
@@ -19,12 +19,10 @@
 #import "OFXMLElement.h"
 #import "OFXMLParser.h"
 #import "OFXMLElementBuilder.h"
 #import "OFAutoreleasePool.h"
 
-#import "macros.h"
-
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFXMLElementBuilder";
 static OFXMLNode *nodes[2];
 static size_t i = 0;

Index: utils/ofzip/OFZIP.m
==================================================================
--- utils/ofzip/OFZIP.m
+++ utils/ofzip/OFZIP.m
@@ -33,13 +33,10 @@
 #import "OFInvalidFormatException.h"
 #import "OFOpenItemFailedException.h"
 #import "OFReadFailedException.h"
 #import "OFWriteFailedException.h"
 
-#import "autorelease.h"
-#import "macros.h"
-
 #define BUFFER_SIZE 4096
 
 #ifndef S_IRWXG
 # define S_IRWXG 0
 #endif