diff --git a/c/os_windows.c b/c/os_windows.c
index 49b4ffc..c378350 100644
--- a/c/os_windows.c
+++ b/c/os_windows.c
@@ -2,6 +2,8 @@
 
 #include <sys/stat.h>
 
+#include <windows.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -13,13 +15,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "dtypes.h"
 #include "utils.h"
 #include "utf8.h"
 #include "ios.h"
-#include "socket.h"
 #include "timefuncs.h"
 #include "hashing.h"
 #include "htable.h"
diff --git a/c/socket.c b/c/socket.c
index f438fe0..59626c8 100644
--- a/c/socket.c
+++ b/c/socket.c
@@ -1,10 +1,15 @@
 #include <sys/types.h>
 
 #include <sys/select.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 
+#include <netinet/in.h>
+
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/c/socket.h b/c/socket.h
index 58631d5..8f4118c 100644
--- a/c/socket.h
+++ b/c/socket.h
@@ -1,13 +1,3 @@
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#endif
-
 #ifndef _WIN32
 void closesocket(int fd);
 #endif