Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -382,11 +382,11 @@
 ])
 AC_MSG_RESULT($atomic_ops)
 
 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 AC_CHECK_LIB(network, socket, LIBS="$LIBS -lnetwork")
-AC_CHECK_LIB(ws2_32, socket, LIBS="$LIBS -lws2_32")
+AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")
 
 AC_CHECK_FUNC(gmtime_r, [
 	AC_DEFINE(HAVE_GMTIME_R, 1, [Whether we have gmtime_r])
 ])
 AC_CHECK_FUNC(localtime_r, [

Index: src/OFStreamObserver.h
==================================================================
--- src/OFStreamObserver.h
+++ src/OFStreamObserver.h
@@ -83,11 +83,15 @@
 	OFMutableDictionary *fdToStream;
 #else
 	fd_set readfds;
 	fd_set writefds;
 	fd_set exceptfds;
+# ifndef _WIN32
 	nfds_t nfds;
+# else
+	int nfds;
+# endif
 #endif
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (retain) id <OFStreamObserverDelegate> delegate;

Index: src/OFStreamSocket.m
==================================================================
--- src/OFStreamSocket.m
+++ src/OFStreamSocket.m
@@ -25,12 +25,14 @@
 # include <sys/socket.h>
 #endif
 
 #import "OFStreamSocket.h"
 
+#import "OFInitializationFailedException.h"
 #import "OFNotConnectedException.h"
 #import "OFReadFailedException.h"
+#import "OFSetOptionFailedException.h"
 #import "OFWriteFailedException.h"
 
 #ifndef INVALID_SOCKET
 # define INVALID_SOCKET -1
 #endif
@@ -136,11 +138,11 @@
 	u_long v = enable;
 	isBlocking = enable;
 
 	if (ioctlsocket(sock, FIONBIO, &v) == SOCKET_ERROR)
 		@throw [OFSetOptionFailedException newWithClass: isa
-							 stream: stream];
+							 stream: self];
 }
 #endif
 
 - (int)fileDescriptor
 {

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -1238,11 +1238,11 @@
 						    length: i];
 
 #ifndef _WIN32
 	if (string[0] == OF_PATH_DELIM)
 #else
-	if (path_c[i] == '/' || path_c[i] == '\\')
+	if (string[i] == '/' || string[i] == '\\')
 #endif
 		return [OFString stringWithCString: string
 					    length: 1];
 
 	return @".";