Index: src/OFList.m
==================================================================
--- src/OFList.m
+++ src/OFList.m
@@ -19,10 +19,11 @@
 #include "assert.h"
 
 #import "OFList.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
+#import "OFArray.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFEnumerationMutationException.h"
 #import "OFInvalidArgumentException.h"
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -34,10 +34,11 @@
 #import "OFArray.h"
 #import "OFDictionary.h"
 #import "OFFile.h"
 #import "OFURL.h"
 #import "OFHTTPRequest.h"
+#import "OFDataArray.h"
 #import "OFXMLElement.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFHTTPRequestFailedException.h"
 #import "OFInitializationFailedException.h"

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -14,17 +14,17 @@
  * file.
  */
 
 #import "OFObject.h"
 #import "OFSerialization.h"
+#import "OFXMLAttribute.h"
 
 @class OFString;
 @class OFArray;
 @class OFMutableString;
 @class OFMutableArray;
 @class OFMutableDictionary;
-@class OFXMLAttribute;
 
 /**
  * \brief A class which stores an XML element.
  */
 @interface OFXMLElement: OFObject <OFSerialization>

Index: src/exceptions/OFAcceptFailedException.m
==================================================================
--- src/exceptions/OFAcceptFailedException.m
+++ src/exceptions/OFAcceptFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFAcceptFailedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "OFNotImplementedException.h"
 
 #import "common.h"
 

Index: src/exceptions/OFAddressTranslationFailedException.m
==================================================================
--- src/exceptions/OFAddressTranslationFailedException.m
+++ src/exceptions/OFAddressTranslationFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFAddressTranslationFailedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "common.h"
 
 @implementation OFAddressTranslationFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFAlreadyConnectedException.m
==================================================================
--- src/exceptions/OFAlreadyConnectedException.m
+++ src/exceptions/OFAlreadyConnectedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFAlreadyConnectedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFAlreadyConnectedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFBindFailedException.m
==================================================================
--- src/exceptions/OFBindFailedException.m
+++ src/exceptions/OFBindFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFBindFailedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "OFNotImplementedException.h"
 
 #import "common.h"
 

Index: src/exceptions/OFConditionBroadcastFailedException.m
==================================================================
--- src/exceptions/OFConditionBroadcastFailedException.m
+++ src/exceptions/OFConditionBroadcastFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFConditionBroadcastFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFConditionBroadcastFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFConditionSignalFailedException.m
==================================================================
--- src/exceptions/OFConditionSignalFailedException.m
+++ src/exceptions/OFConditionSignalFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFConditionSignalFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFConditionSignalFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFConditionStillWaitingException.m
==================================================================
--- src/exceptions/OFConditionStillWaitingException.m
+++ src/exceptions/OFConditionStillWaitingException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFConditionStillWaitingException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFConditionStillWaitingException
 + newWithClass: (Class)class_

Index: src/exceptions/OFConditionWaitFailedException.m
==================================================================
--- src/exceptions/OFConditionWaitFailedException.m
+++ src/exceptions/OFConditionWaitFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFConditionWaitFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFConditionWaitFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFConnectionFailedException.m
==================================================================
--- src/exceptions/OFConnectionFailedException.m
+++ src/exceptions/OFConnectionFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFConnectionFailedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "OFNotImplementedException.h"
 
 #import "common.h"
 

Index: src/exceptions/OFHashAlreadyCalculatedException.m
==================================================================
--- src/exceptions/OFHashAlreadyCalculatedException.m
+++ src/exceptions/OFHashAlreadyCalculatedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFHashAlreadyCalculatedException.h"
 #import "OFString.h"
+#import "OFHash.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFHashAlreadyCalculatedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFListenFailedException.m
==================================================================
--- src/exceptions/OFListenFailedException.m
+++ src/exceptions/OFListenFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFListenFailedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "OFNotImplementedException.h"
 
 #import "common.h"
 

Index: src/exceptions/OFMalformedXMLException.m
==================================================================
--- src/exceptions/OFMalformedXMLException.m
+++ src/exceptions/OFMalformedXMLException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFMalformedXMLException.h"
 #import "OFString.h"
+#import "OFXMLParser.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFMalformedXMLException
 + newWithClass: (Class)class_

Index: src/exceptions/OFMutexLockFailedException.m
==================================================================
--- src/exceptions/OFMutexLockFailedException.m
+++ src/exceptions/OFMutexLockFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFMutexLockFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFMutexLockFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFMutexStillLockedException.m
==================================================================
--- src/exceptions/OFMutexStillLockedException.m
+++ src/exceptions/OFMutexStillLockedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFMutexStillLockedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFMutexStillLockedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFMutexUnlockFailedException.m
==================================================================
--- src/exceptions/OFMutexUnlockFailedException.m
+++ src/exceptions/OFMutexUnlockFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFMutexUnlockFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFMutexUnlockFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFNotConnectedException.m
==================================================================
--- src/exceptions/OFNotConnectedException.m
+++ src/exceptions/OFNotConnectedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFNotConnectedException.h"
 #import "OFString.h"
+#import "OFTCPSocket.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFNotConnectedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFSeekFailedException.m
==================================================================
--- src/exceptions/OFSeekFailedException.m
+++ src/exceptions/OFSeekFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFSeekFailedException.h"
 #import "OFString.h"
+#import "OFSeekableStream.h"
 
 #import "OFNotImplementedException.h"
 
 #import "common.h"
 

Index: src/exceptions/OFSetOptionFailedException.m
==================================================================
--- src/exceptions/OFSetOptionFailedException.m
+++ src/exceptions/OFSetOptionFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFSetOptionFailedException.h"
 #import "OFString.h"
+#import "OFStream.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFSetOptionFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFThreadJoinFailedException.m
==================================================================
--- src/exceptions/OFThreadJoinFailedException.m
+++ src/exceptions/OFThreadJoinFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFThreadJoinFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFThreadJoinFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFThreadStartFailedException.m
==================================================================
--- src/exceptions/OFThreadStartFailedException.m
+++ src/exceptions/OFThreadStartFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFThreadStartFailedException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFThreadStartFailedException
 + newWithClass: (Class)class_

Index: src/exceptions/OFThreadStillRunningException.m
==================================================================
--- src/exceptions/OFThreadStillRunningException.m
+++ src/exceptions/OFThreadStillRunningException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFThreadStillRunningException.h"
 #import "OFString.h"
+#import "OFThread.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFThreadStillRunningException
 + newWithClass: (Class)class_