diff -ur qbittorrent-3.1.12/src/geoip/geoipmanager.h qbittorrent-3.1.12.fix_boost_join/src/geoip/geoipmanager.h
--- qbittorrent-3.1.12/src/geoip/geoipmanager.h	2015-02-22 23:47:46.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/geoip/geoipmanager.h	2017-01-29 14:18:49.942659366 +0100
@@ -31,9 +31,11 @@
 #ifndef GEOIPMANAGER_H
 #define GEOIPMANAGER_H
 
+#ifndef Q_MOC_RUN
 #include <libtorrent/session.hpp>
 #include <QString>
 #include <QIcon>
+#endif
 
 class GeoIPManager : public QObject {
   Q_OBJECT
diff -ur qbittorrent-3.1.12/src/main.cpp qbittorrent-3.1.12.fix_boost_join/src/main.cpp
--- qbittorrent-3.1.12/src/main.cpp	2015-02-22 23:47:47.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/main.cpp	2017-01-29 14:18:49.943659358 +0100
@@ -28,6 +28,8 @@
  * Contact : chris@qbittorrent.org
  */
 
+#ifndef Q_MOC_RUN
+
 #include <QLocale>
 #include <QTranslator>
 #include <QFile>
@@ -74,6 +76,7 @@
 #include <stdlib.h>
 #include "misc.h"
 #include "preferences.h"
+#endif
 
 #if defined(Q_OS_WIN) && !defined(QBT_HAS_GETCURRENTPID)
 #error You seem to have updated QtSingleApplication without porting our custom QtSingleApplication::getRunningPid() function. Please see previous version to understate how it works.
diff -ur qbittorrent-3.1.12/src/preferences/options_imp.h qbittorrent-3.1.12.fix_boost_join/src/preferences/options_imp.h
--- qbittorrent-3.1.12/src/preferences/options_imp.h	2015-02-22 23:47:47.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/preferences/options_imp.h	2017-01-29 14:18:49.943659358 +0100
@@ -31,8 +31,10 @@
 #ifndef OPTIONS_IMP_H
 #define OPTIONS_IMP_H
 
+#ifndef Q_MOC_RUN
 #include "ui_options.h"
 #include <libtorrent/ip_filter.hpp>
+#endif
 
 // actions on double-click on torrents
 enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};
diff -ur qbittorrent-3.1.12/src/properties/peeraddition.h qbittorrent-3.1.12.fix_boost_join/src/properties/peeraddition.h
--- qbittorrent-3.1.12/src/properties/peeraddition.h	2015-02-22 23:47:47.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/properties/peeraddition.h	2017-01-29 14:18:49.943659358 +0100
@@ -31,6 +31,7 @@
 #ifndef PEERADDITION_H
 #define PEERADDITION_H
 
+#ifndef Q_MOC_RUN
 #include <QDialog>
 #include <QRegExp>
 #include <QMessageBox>
@@ -45,6 +46,8 @@
 #include <boost/asio/ip/tcp.hpp>
 #endif
 
+#endif
+
 class PeerAdditionDlg: public QDialog, private Ui::addPeerDialog {
   Q_OBJECT
 
diff -ur qbittorrent-3.1.12/src/qtlibtorrent/filterparserthread.h qbittorrent-3.1.12.fix_boost_join/src/qtlibtorrent/filterparserthread.h
--- qbittorrent-3.1.12/src/qtlibtorrent/filterparserthread.h	2015-02-22 23:47:47.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/qtlibtorrent/filterparserthread.h	2017-01-29 14:18:49.943659358 +0100
@@ -31,6 +31,7 @@
 #ifndef FILTERPARSERTHREAD_H
 #define FILTERPARSERTHREAD_H
 
+#ifndef Q_MOC_RUN
 #include <QThread>
 #include <QFile>
 #include <QDataStream>
@@ -39,6 +40,7 @@
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
+#endif
 
 using namespace std;
 
diff -ur qbittorrent-3.1.12/src/qtlibtorrent/qbtsession.h qbittorrent-3.1.12.fix_boost_join/src/qtlibtorrent/qbtsession.h
--- qbittorrent-3.1.12/src/qtlibtorrent/qbtsession.h	2015-02-22 23:47:47.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/qtlibtorrent/qbtsession.h	2017-01-29 14:18:49.943659358 +0100
@@ -30,6 +30,7 @@
 #ifndef __BITTORRENT_H__
 #define __BITTORRENT_H__
 
+#ifndef Q_MOC_RUN
 #include <QHash>
 #include <QUrl>
 #include <QStringList>
@@ -51,6 +52,7 @@
 #include "qtorrenthandle.h"
 #include "trackerinfos.h"
 #include "misc.h"
+#endif
 
 #define MAX_SAMPLES 20
 
diff -ur qbittorrent-3.1.12/src/trackerlogin.h qbittorrent-3.1.12.fix_boost_join/src/trackerlogin.h
--- qbittorrent-3.1.12/src/trackerlogin.h	2015-02-22 23:47:47.000000000 +0100
+++ qbittorrent-3.1.12.fix_boost_join/src/trackerlogin.h	2017-01-29 14:18:49.943659358 +0100
@@ -31,11 +31,13 @@
 #ifndef TRACKERLOGIN_H
 #define TRACKERLOGIN_H
 
+#ifndef Q_MOC_RUN
 #include <QDialog>
 #include <QMessageBox>
 #include <libtorrent/session.hpp>
 #include "ui_login.h"
 #include "qtorrenthandle.h"
+#endif
 
 class trackerLogin : public QDialog, private Ui::authentication{
   Q_OBJECT