@@ -21,11 +21,15 @@
 
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFURL.h"
 #import "OFAutoreleasePool.h"
-#import "OFExceptions.h"
+
+#import "OFInvalidArgumentException.h"
+#import "OFInvalidEncodingException.h"
+#import "OFInvalidFormatException.h"
+#import "OFOutOfRangeException.h"
 
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFString";
 static OFString* whitespace[] = {