diff --git a/include/bits.c b/include/bits.c
index d87c5ca95..447e4d977 100644
--- a/include/bits.c
+++ b/include/bits.c
@@ -42,6 +42,7 @@ RCSID("$Id$");
 #include <stdlib.h>
 #include <ctype.h>
 #ifdef WIN32
+#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
@@ -165,6 +166,7 @@ int main(int argc, char **argv)
 #ifndef WIN32
     fprintf(f, "#include <sys/socket.h>\n");
 #else
+    fprintf(f, "#include <winsock2.h>\n");
     fprintf(f, "#include <ws2tcpip.h>\n");
 #endif
 #endif
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 5a849d316..69fd64e33 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -249,10 +249,6 @@ struct sockaddr_dl;
 #include <time.h>
 #endif
 
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif