diff --git a/lib/roken/NTMakefile b/lib/roken/NTMakefile
index 0e0f4ccfc..2ae2aa0f8 100644
--- a/lib/roken/NTMakefile
+++ b/lib/roken/NTMakefile
@@ -89,6 +89,7 @@ libroken_la_OBJS =			\
 	$(OBJ)\socket.obj		\
 	$(OBJ)\sockstartup_w32.obj	\
 	$(OBJ)\strcollect.obj		\
+	$(OBJ)\strerror_r.obj		\
 	$(OBJ)\strlcat.obj		\
 	$(OBJ)\strlcpy.obj		\
 	$(OBJ)\strpool.obj		\
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 8694db53f..be0a187bb 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -63,6 +63,8 @@
 
 typedef SOCKET rk_socket_t;
 
+#define rk_closesocket(x) closesocket(x)
+#define rk_INVALID_SOCKET INVALID_SOCKET
 #define rk_IS_BAD_SOCKET(s) ((s) == INVALID_SOCKET)
 #define rk_IS_SOCKET_ERROR(rv) ((rv) == SOCKET_ERROR)
 #define rk_SOCK_ERRNO WSAGetLastError()
@@ -220,6 +222,10 @@ struct sockaddr_dl;
 #include <paths.h>
 #endif
 
+#ifdef BACKSLASH_PATH_DELIM
+#define rk_PATH_DELIM '\\'
+#endif
+
 #ifndef HAVE_SSIZE_T
 #ifdef _WIN64
 typedef __int64 ssize_t;
@@ -303,7 +309,7 @@ rk_vsnprintf (char *str, size_t sz, const char *format, va_list args);
  S_ISBLK(m)
 */
 
-#endif
+#endif  /* _MSC_VER */
 
 #ifndef HAVE_PUTENV
 #define putenv rk_putenv
@@ -827,8 +833,10 @@ struct msghdr {
     int             msg_flags;
 };
 
+#define sendmsg sendmsg_w32
+
 ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-sendmsg(rk_socket_t s, const struct msghdr * msg, int flags);
+sendmsg_w32(rk_socket_t s, const struct msghdr * msg, int flags);
 
 #endif
 
diff --git a/lib/roken/sendmsg.c b/lib/roken/sendmsg.c
index bbe5c303f..6e2eecd49 100644
--- a/lib/roken/sendmsg.c
+++ b/lib/roken/sendmsg.c
@@ -100,7 +100,7 @@ sendmsg(rk_socket_t s, const struct msghdr *msg, int flags)
  * 
  **********************************************************************/
 
-/*
+/**
  * Implementation of sendmsg() for WIN32
  *
  * We are using a contrived definition of msghdr which actually uses