Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -213,13 +213,11 @@
 {
 	void *pool;
 	OFXMLParser *parser;
 	OFXMLElementBuilder *builder;
 	OFXMLElement_OFXMLElementBuilderDelegate *delegate;
-	Class c;
 
-	c = [self class];
 	[self release];
 
 	if (string == nil)
 		@throw [OFInvalidArgumentException exception];
 
@@ -249,13 +247,11 @@
 {
 	void *pool;
 	OFXMLParser *parser;
 	OFXMLElementBuilder *builder;
 	OFXMLElement_OFXMLElementBuilderDelegate *delegate;
-	Class c;
 
-	c = [self class];
 	[self release];
 
 	pool = objc_autoreleasePoolPush();
 
 	parser = [OFXMLParser parser];

Index: src/exceptions/OFChangeDirectoryFailedException.m
==================================================================
--- src/exceptions/OFChangeDirectoryFailedException.m
+++ src/exceptions/OFChangeDirectoryFailedException.m
@@ -24,11 +24,12 @@
 #import "common.h"
 
 @implementation OFChangeDirectoryFailedException
 + (instancetype)exceptionWithPath: (OFString*)path
 {
-	return [[[self alloc] initWithPath: path] autorelease];
+	return [[(OFChangeDirectoryFailedException*)[self alloc]
+	    initWithPath: path] autorelease];
 }
 
 - init
 {
 	@try {

Index: src/exceptions/OFCreateDirectoryFailedException.m
==================================================================
--- src/exceptions/OFCreateDirectoryFailedException.m
+++ src/exceptions/OFCreateDirectoryFailedException.m
@@ -24,11 +24,12 @@
 #import "common.h"
 
 @implementation OFCreateDirectoryFailedException
 + (instancetype)exceptionWithPath: (OFString*)path
 {
-	return [[[self alloc] initWithPath: path] autorelease];
+	return [[(OFCreateDirectoryFailedException*)[self alloc]
+	    initWithPath: path] autorelease];
 }
 
 - init
 {
 	@try {

Index: src/exceptions/OFDeleteDirectoryFailedException.m
==================================================================
--- src/exceptions/OFDeleteDirectoryFailedException.m
+++ src/exceptions/OFDeleteDirectoryFailedException.m
@@ -22,13 +22,14 @@
 #import "OFString.h"
 
 #import "common.h"
 
 @implementation OFDeleteDirectoryFailedException
-+ (instancetype)exceptionWithPath: (OFString*)path_
++ (instancetype)exceptionWithPath: (OFString*)path
 {
-	return [[[self alloc] initWithPath: path_] autorelease];
+	return [[(OFDeleteDirectoryFailedException*)[self alloc]
+	    initWithPath: path] autorelease];
 }
 
 - init
 {
 	@try {

Index: src/exceptions/OFDeleteFileFailedException.m
==================================================================
--- src/exceptions/OFDeleteFileFailedException.m
+++ src/exceptions/OFDeleteFileFailedException.m
@@ -24,11 +24,12 @@
 #import "common.h"
 
 @implementation OFDeleteFileFailedException
 + (instancetype)exceptionWithPath: (OFString*)path
 {
-	return [[[self alloc] initWithPath: path] autorelease];
+	return [[(OFDeleteFileFailedException*)[self alloc]
+	    initWithPath: path] autorelease];
 }
 
 - init
 {
 	@try {

Index: src/exceptions/OFReadFailedException.m
==================================================================
--- src/exceptions/OFReadFailedException.m
+++ src/exceptions/OFReadFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFReadFailedException.h"
 #import "OFString.h"
+#import "OFStream.h"
 
 #import "common.h"
 
 @implementation OFReadFailedException
 - (OFString*)description

Index: src/exceptions/OFReadOrWriteFailedException.m
==================================================================
--- src/exceptions/OFReadOrWriteFailedException.m
+++ src/exceptions/OFReadOrWriteFailedException.m
@@ -18,10 +18,11 @@
 
 #include <stdlib.h>
 
 #import "OFReadOrWriteFailedException.h"
 #import "OFString.h"
+#import "OFStream.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFStreamSocket.h"
 #endif
 
 #import "common.h"

Index: src/exceptions/OFWriteFailedException.m
==================================================================
--- src/exceptions/OFWriteFailedException.m
+++ src/exceptions/OFWriteFailedException.m
@@ -16,10 +16,11 @@
 
 #include "config.h"
 
 #import "OFWriteFailedException.h"
 #import "OFString.h"
+#import "OFStream.h"
 
 #import "common.h"
 
 @implementation OFWriteFailedException
 - (OFString*)description