@@ -28,11 +28,17 @@
 #else
 # define madvise(addr, len, advise)
 #endif
 
 #import "OFString.h"
-#import "OFExceptions.h"
+
+#import "OFInvalidArgumentException.h"
+#import "OFInvalidEncodingException.h"
+#import "OFInvalidFormatException.h"
+#import "OFOutOfMemoryException.h"
+#import "OFOutOfRangeException.h"
+
 #import "macros.h"
 
 #import "of_asprintf.h"
 #import "unicode.h"