diff --git a/src/IRCChannel.h b/src/IRCChannel.h
index e833c8a..e95c3c0 100644
--- a/src/IRCChannel.h
+++ b/src/IRCChannel.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFObject.h>
 
 @class OFString;
 
diff --git a/src/IRCConnection.h b/src/IRCConnection.h
index b354d8c..11a1811 100644
--- a/src/IRCConnection.h
+++ b/src/IRCConnection.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFObject.h>
 
 @class OFString;
 @class OFMutableDictionary;
diff --git a/src/IRCConnection.m b/src/IRCConnection.m
index 69df2e6..111c090 100644
--- a/src/IRCConnection.m
+++ b/src/IRCConnection.m
@@ -27,8 +27,8 @@
 #import <ObjFW/OFMutableDictionary.h>
 #import <ObjFW/OFTCPSocket.h>
 #import <ObjFW/OFAutoreleasePool.h>
-#import <ObjFW/OFExceptions.h>
-#import <ObjFW/OFBlock.h>
+
+#import <ObjFW/OFInvalidEncodingException.h>
 
 #import "IRCConnection.h"
 #import "IRCUser.h"
diff --git a/src/IRCUser.h b/src/IRCUser.h
index 9170146..08c8306 100644
--- a/src/IRCUser.h
+++ b/src/IRCUser.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFObject.h>
 
 @interface IRCUser: OFObject <OFCopying>
 {
diff --git a/src/IRCUser.m b/src/IRCUser.m
index 25cd17b..557a84c 100644
--- a/src/IRCUser.m
+++ b/src/IRCUser.m
@@ -20,8 +20,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdlib.h>
 #include <string.h>
 
+#import <ObjFW/OFString.h>
+
+#import <ObjFW/OFInvalidFormatException.h>
+#import <ObjFW/OFOutOfMemoryException.h>
+
 #import "IRCUser.h"
 
 @implementation IRCUser
diff --git a/tests/test.m b/tests/test.m
index 6101963..f27e8ea 100644
--- a/tests/test.m
+++ b/tests/test.m
@@ -20,7 +20,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFString.h>
+#import <ObjFW/OFApplication.h>
+#import <ObjFW/OFFile.h>
 
 #import "IRCConnection.h"
 #import "IRCUser.h"