diff --git a/include/opendht/infohash.h b/include/opendht/infohash.h
index d1df7698..e0964830 100644
--- a/include/opendht/infohash.h
+++ b/include/opendht/infohash.h
@@ -22,16 +22,11 @@
 #include <msgpack.hpp>
 
 #ifndef _WIN32
-#include <netinet/in.h>
-#include <netdb.h>
-#ifdef __ANDROID__
-typedef uint16_t in_port_t;
-#endif
+#include <sys/socket.h>
 #else
 #include <iso646.h>
 #include <ws2tcpip.h>
-typedef uint16_t sa_family_t;
-typedef uint16_t in_port_t;
+#include <ws2def.h>
 #endif
 
 #include <iostream>
diff --git a/include/opendht/utils.h b/include/opendht/utils.h
index ae634d9a..ef6de45d 100644
--- a/include/opendht/utils.h
+++ b/include/opendht/utils.h
@@ -26,9 +26,16 @@
 
 #ifndef _WIN32
 #include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#ifdef __ANDROID__
+typedef uint16_t in_port_t;
+#endif
 #else
-#include <ws2def.h>
 #include <ws2tcpip.h>
+#include <ws2def.h>
+typedef uint16_t sa_family_t;
+typedef uint16_t in_port_t;
 #endif
 
 #include <chrono>