diff --git a/src/indexer/kiwix-index.cpp b/src/indexer/kiwix-index.cpp
index e797346..36442e9 100644
--- a/src/indexer/kiwix-index.cpp
+++ b/src/indexer/kiwix-index.cpp
@@ -21,7 +21,7 @@
 #include <getopt.h>
 
 #ifdef _WIN32
-#include <Windows.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #endif
diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index ad0435e..b51b18c 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -27,14 +27,14 @@
 
 #ifdef _WIN32
 
-#if (_MSC_VER < 1600)
+#if !defined(__MINGW32__) && (_MSC_VER < 1600)
 #include "stdint4win.h"
 #endif
 #include <winsock2.h>
-#include <WS2tcpip.h> // otherwise socklen_t is not a recognized type
+#include <ws2tcpip.h> // otherwise socklen_t is not a recognized type
 //#include <Windows.h> // otherwise int is not a recognized type
-typedef int off_t;
-typedef SSIZE_T ssize_t;
+//typedef int off_t;
+//typedef SSIZE_T ssize_t;
 typedef UINT64 uint64_t;
 typedef UINT16 uint16_t;
 extern "C" {
@@ -78,6 +78,10 @@ extern "C" {
 #include <ifaddrs.h>
 #endif
 
+#ifdef interface
+#undef interface
+#endif
+
 using namespace std;
 
 static bool nosearchbarFlag = false;