Index: src/OFConstantString.m
==================================================================
--- src/OFConstantString.m
+++ src/OFConstantString.m
@@ -223,11 +223,11 @@
 	OF_DEALLOC_UNSUPPORTED
 }
 
 /*
  * In all following methods, the constant string is converted to an
- * OFUTF8String and the message sent again.
+ * OFConstantUTF8String and the message sent again.
  */
 
 /* From protocol OFCopying */
 - (id)copy
 {

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -41,12 +41,12 @@
 #endif
 #import "OFLocale.h"
 #import "OFStream.h"
 #import "OFURL.h"
 #import "OFURLHandler.h"
-#import "OFUTF8String+Private.h"
 #import "OFUTF8String.h"
+#import "OFUTF8String+Private.h"
 #import "OFXMLElement.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidEncodingException.h"

Index: src/OFWin32ConsoleStdIOStream.m
==================================================================
--- src/OFWin32ConsoleStdIOStream.m
+++ src/OFWin32ConsoleStdIOStream.m
@@ -67,11 +67,11 @@
 
 	if (self != [OFWin32ConsoleStdIOStream class])
 		return;
 
 	if ((fd = _fileno(stdin)) >= 0)
-		of_stdin = [[OFWin32ConsoleStdIOStream_ alloc]
+		of_stdin = [[OFWin32ConsoleStdIOStream alloc]
 		    of_initWithFileDescriptor: fd];
 	if ((fd = _fileno(stdout)) >= 0)
 		of_stdout = [[OFWin32ConsoleStdIOStream alloc]
 		    of_initWithFileDescriptor: fd];
 	if ((fd = _fileno(stderr)) >= 0)