@@ -30,13 +30,17 @@
 #endif
 
 #import "OFStream.h"
 #import "OFString.h"
 #import "OFDataArray.h"
-#import "OFExceptions.h"
+
+#import "OFInvalidArgumentException.h"
+#import "OFInvalidFormatException.h"
+#import "OFNotImplementedException.h"
+#import "OFSetOptionFailedException.h"
+
 #import "macros.h"
-
 #import "of_asprintf.h"
 
 @implementation OFStream
 #ifndef _WIN32
 + (void)initialize