Index: src/OFCountedSet_hashtable.h
==================================================================
--- src/OFCountedSet_hashtable.h
+++ src/OFCountedSet_hashtable.h
@@ -14,13 +14,13 @@
  * file.
  */
 
 #import "OFCountedSet.h"
 
-@class OFDictionary_hashtable;
+@class OFMutableDictionary_hashtable;
 
 @interface OFCountedSet_hashtable: OFCountedSet
 {
-	OFDictionary_hashtable *dictionary;
+	OFMutableDictionary_hashtable *dictionary;
 	unsigned long mutations;
 }
 @end

Index: src/OFCountedSet_hashtable.m
==================================================================
--- src/OFCountedSet_hashtable.m
+++ src/OFCountedSet_hashtable.m
@@ -23,10 +23,11 @@
 #import "OFMutableDictionary_hashtable.h"
 #import "OFString.h"
 #import "OFNumber.h"
 #import "OFArray.h"
 #import "OFXMLElement.h"
+#import "OFXMLAttribute.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -279,12 +279,12 @@
 	WIN32_FIND_DATA fd;
 
 	pool = [[OFAutoreleasePool alloc] init];
 	path = [path stringByAppendingString: @"\\*"];
 
-	if ((handle = FindFirstFile([path cString], &fd)) ==
-	    INVALID_HANDLE_VALUE)
+	if ((handle = FindFirstFile([path cStringWithEncoding:
+	    OF_STRING_ENCODING_NATIVE], &fd)) == INVALID_HANDLE_VALUE)
 		@throw [OFOpenFileFailedException exceptionWithClass: self
 								path: path
 								mode: @"r"];
 
 	@try {
@@ -295,11 +295,13 @@
 
 			if (!strcmp(fd.cFileName, ".") ||
 			    !strcmp(fd.cFileName, ".."))
 				continue;
 
-			file = [OFString stringWithCString: fd.cFileName];
+			file = [OFString
+			    stringWithCString: fd.cFileName
+				     encoding: OF_STRING_ENCODING_NATIVE];
 			[files addObject: file];
 
 			[pool2 releaseObjects];
 		} while (FindNextFile(handle, &fd));
 
@@ -333,11 +335,12 @@
 		@throw [OFChangeFileModeFailedException
 		    exceptionWithClass: self
 				  path: path
 				  mode: mode];
 # else
-	DWORD attributes = GetFileAttributes([path cString]);
+	DWORD attributes = GetFileAttributes(
+	    [path cStringWithEncoding: OF_STRING_ENCODING_NATIVE]);
 
 	if (attributes == INVALID_FILE_ATTRIBUTES)
 		@throw [OFChangeFileModeFailedException
 		    exceptionWithClass: self
 				  path: path
@@ -346,11 +349,12 @@
 	if ((mode / 100) & 2)
 		attributes &= ~FILE_ATTRIBUTE_READONLY;
 	else
 		attributes |= FILE_ATTRIBUTE_READONLY;
 
-	if (!SetFileAttributes([path cString], attributes))
+	if (!SetFileAttributes([path cStringWithEncoding:
+	    OF_STRING_ENCODING_NATIVE], attributes))
 		@throw [OFChangeFileModeFailedException
 		    exceptionWithClass: self
 				  path: path
 				  mode: mode];
 # endif
@@ -472,10 +476,12 @@
 
 			if (fstat(sourceFile->fileDescriptor, &s) == 0)
 				fchmod(destinationFile->fileDescriptor,
 				    s.st_mode);
 		}
+#else
+		(void)override;
 #endif
 	} @finally {
 		[sourceFile close];
 		[destinationFile close];
 		free(buffer);

Index: src/OFMutableSet_hashtable.h
==================================================================
--- src/OFMutableSet_hashtable.h
+++ src/OFMutableSet_hashtable.h
@@ -14,13 +14,13 @@
  * file.
  */
 
 #import "OFMutableSet.h"
 
-@class OFDictionary_hashtable;
+@class OFMutableDictionary_hashtable;
 
 @interface OFMutableSet_hashtable: OFMutableSet
 {
-	OFDictionary_hashtable *dictionary;
+	OFMutableDictionary_hashtable *dictionary;
 	unsigned long mutations;
 }
 @end

Index: src/OFNumber.m
==================================================================
--- src/OFNumber.m
+++ src/OFNumber.m
@@ -19,10 +19,11 @@
 #include <math.h>
 
 #import "OFNumber.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
+#import "OFXMLAttribute.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFNotImplementedException.h"

Index: src/OFStreamObserver.h
==================================================================
--- src/OFStreamObserver.h
+++ src/OFStreamObserver.h
@@ -18,12 +18,12 @@
 
 #ifdef _WIN32
 # ifndef _WIN32_WINNT
 #  define _WIN32_WINNT 0x0501
 # endif
-# include <windows.h>
 # include <ws2tcpip.h>
+# include <windows.h>
 #endif
 
 @class OFStream;
 @class OFMutableArray;
 @class OFMutableDictionary;

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -1672,11 +1672,11 @@
 
 	for (i = pathCStringLength - 1; i >= 0; i--) {
 #ifndef _WIN32
 		if (s->cString[i] == OF_PATH_DELIMITER) {
 #else
-		if (s->cString[i] == '/' || s->string[i] == '\\') {
+		if (s->cString[i] == '/' || s->cString[i] == '\\') {
 #endif
 			i++;
 			break;
 		}
 	}

Index: src/OFXMLNode.m
==================================================================
--- src/OFXMLNode.m
+++ src/OFXMLNode.m
@@ -15,10 +15,11 @@
  */
 
 #include "config.h"
 
 #import "OFXMLNode.h"
+#import "OFString.h"
 
 #import "OFNotImplementedException.h"
 
 @implementation OFXMLNode
 - initWithSerialization: (OFXMLElement*)element