diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index d65d8c18..87c47c7c 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include "websock-w32.h"
+#include "../win32port/win32helpers/websock-w32.h"
 
 #include "gettimeofday.h"
 
diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
index b4779e68..788856ab 100644
--- a/lib/private-libwebsockets.h
+++ b/lib/private-libwebsockets.h
@@ -28,14 +28,25 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
+#ifdef  __MINGW64__
+#else
+#ifdef  __MINGW32__
+#else
 #include <netdb.h>
+#endif
+#endif
 #include <stdarg.h>
 
 #include <sys/stat.h>
 
 #ifdef WIN32
-
+#ifdef  __MINGW64__                                                             
+#else                                                                           
+#ifdef  __MINGW32__                                                             
+#else
 #include <time.h >
+#endif
+#endif
 #include <winsock2.h>
 #include <ws2ipdef.h>
 #include <windows.h>