Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

src/server/kiwix-serve.cpp

@@ -41,10 +41,6 @@ extern "C" {
 #include <microhttpd.h>
 }
 
-#else
-#include <stdint.h>
-#include <unistd.h>
-#include <microhttpd.h>
 #endif
 
 #include <stdlib.h>
@@ -72,6 +68,12 @@ extern "C" {
 #include <otherTools.h>
 #include <resourceTools.h>
 
+#ifndef _WIN32
+#include <stdint.h>
+#include <unistd.h>
+#include <microhttpd.h>
+#endif
+
 using namespace std;
 
 static bool nosearchbarFlag = false;