diff --git a/docs/build_mingw_windows.txt b/docs/build_mingw_windows.txt
index e6fd79b1..dc241c03 100644
--- a/docs/build_mingw_windows.txt
+++ b/docs/build_mingw_windows.txt
@@ -12,7 +12,7 @@ on your Linux system.
 
 3. Within /opt/mingw, run
 make gcc
-make qt
+make qt5
 make boost
 make curl
 make libgsasl
diff --git a/src/config/configfile.h b/src/config/configfile.h
index e7df2cae..7f771911 100644
--- a/src/config/configfile.h
+++ b/src/config/configfile.h
@@ -35,7 +35,9 @@
 #include <vector>
 #include <string>
 
+#ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
+#endif
 
 enum ConfigState { NONEXISTING, OLD, OK };
 enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST };
diff --git a/src/gamedata.h b/src/gamedata.h
index e1bf502b..a5e3e0d5 100644
--- a/src/gamedata.h
+++ b/src/gamedata.h
@@ -35,8 +35,9 @@
 
 #include <list>
 #include <string>
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
-
+#endif
 
 typedef std::list<unsigned> PlayerIdList;
 
diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h
index bea8e5f9..71b6338e 100755
--- a/src/gui/qt/gametable/gametableimpl.h
+++ b/src/gui/qt/gametable/gametableimpl.h
@@ -40,7 +40,10 @@
 #include "game_defs.h"
 
 #include <string>
+
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 
 #include <QtGui>
 #include <QtCore>
diff --git a/src/gui/qt/gametable/mytimeoutlabel.h b/src/gui/qt/gametable/mytimeoutlabel.h
index 05f29596..8ceb9a14 100644
--- a/src/gui/qt/gametable/mytimeoutlabel.h
+++ b/src/gui/qt/gametable/mytimeoutlabel.h
@@ -35,7 +35,9 @@
 
 #include <QtGui>
 #include <QtCore>
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #if QT_VERSION >= 0x050000
 	#include <QtWidgets>
 #endif
diff --git a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
index c296cb07..50f2d66c 100644
--- a/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
+++ b/src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h
@@ -37,7 +37,9 @@
 #if QT_VERSION >= 0x050000
 	#include <QtWidgets>
 #endif
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #include "game_defs.h"
 
 /**