Index: src/IRCChannel.h
==================================================================
--- src/IRCChannel.h
+++ src/IRCChannel.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFObject.h>
 
 @class OFString;
 
 @interface IRCChannel: OFObject
 {

Index: src/IRCConnection.h
==================================================================
--- src/IRCConnection.h
+++ src/IRCConnection.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFObject.h>
 
 @class OFString;
 @class OFMutableDictionary;
 @class OFTCPSocket;
 @class IRCConnection;

Index: src/IRCConnection.m
==================================================================
--- src/IRCConnection.m
+++ src/IRCConnection.m
@@ -25,12 +25,12 @@
 #import <ObjFW/OFString.h>
 #import <ObjFW/OFArray.h>
 #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"
 #import "IRCChannel.h"
 

Index: src/IRCUser.h
==================================================================
--- src/IRCUser.h
+++ src/IRCUser.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+#import <ObjFW/OFObject.h>
 
 @interface IRCUser: OFObject <OFCopying>
 {
 	OFString *nickname;
 	OFString *username;

Index: src/IRCUser.m
==================================================================
--- src/IRCUser.m
+++ src/IRCUser.m
@@ -18,12 +18,18 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * 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
 @synthesize username, nickname, hostname;
 + IRCUserWithString: (OFString*)str

Index: tests/test.m
==================================================================
--- tests/test.m
+++ tests/test.m
@@ -18,11 +18,13 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * 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"
 #import "IRCChannel.h"