diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56b124b40..82ef59f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,7 @@ if(MINGW)
   set(CMAKE_RC_COMPILER_INIT windres)
   enable_language(RC)
   set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+  link_libraries(ws2_32 wsock32)
 endif()
 
 if(APPLE OR MINGW)
@@ -201,7 +202,7 @@ if(UNIX)
   endif()
 endif()
 
-include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${MHD_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 include(FeatureSummary)
 
diff --git a/src/autotype/CMakeLists.txt b/src/autotype/CMakeLists.txt
index 93447a8b3..417e7af4c 100644
--- a/src/autotype/CMakeLists.txt
+++ b/src/autotype/CMakeLists.txt
@@ -13,5 +13,8 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(WITH_TESTS)
-  add_subdirectory(test)
-endif()
+  # autotype non supported on Windows right now
+  if(UNIX)
+    add_subdirectory(test)
+  endif()
+endif()
\ No newline at end of file
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index f3d41521c..031a6bc7c 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -717,8 +717,8 @@ void MainWindow::repairDatabase()
             KeePass2Writer writer;
             writer.writeDatabase(saveFileName, dbRepairWidget->database());
             if (writer.hasError()) {
-                MessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
-                                     + writer.errorString());
+                QMessageBox::critical(this, tr("Error"),
+                    tr("Writing the database failed.").append("\n\n").append(writer.errorString()));
             }
         }
     }
diff --git a/src/http/Server.cpp b/src/http/Server.cpp
index 94559e232..16423d8cf 100644
--- a/src/http/Server.cpp
+++ b/src/http/Server.cpp
@@ -22,7 +22,12 @@
 #include <QEventLoop>
 #include <QtNetwork/QHostInfo>
 #include <QtNetwork/QHostAddress>
+
+#ifdef Q_OS_WIN
+#include <winsock2.h>
+#else
 #include <netinet/in.h>
+#endif
 
 using namespace KeepassHttpProtocol;