Don't add core to INCLUDEPATH.

src/core/core.pri

@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 include(qtlibtorrent/qtlibtorrent.pri)
 
 HEADERS += \

src/core/net/dnsupdater.cpp

@@ -36,7 +36,7 @@
 #include <QUrlQuery>
 #endif
 #include "dnsupdater.h"
-#include "logger.h"
+#include "core/logger.h"
 
 using namespace Net;
 

src/core/net/dnsupdater.h

@@ -36,7 +36,7 @@
 #include <QNetworkReply>
 #include <QDateTime>
 #include <QTimer>
-#include "preferences.h"
+#include "core/preferences.h"
 
 namespace Net
 {

src/core/net/smtp.cpp

@@ -33,8 +33,8 @@
  */
 
 #include "smtp.h"
-#include "preferences.h"
-#include "logger.h"
+#include "core/preferences.h"
+#include "core/logger.h"
 
 #include <QTextStream>
 #ifndef QT_NO_OPENSSL

src/core/qtlibtorrent/bandwidthscheduler.h

@@ -4,7 +4,7 @@
 #include <QTimer>
 #include <QTime>
 #include <QDateTime>
-#include "preferences.h"
+#include "core/preferences.h"
 #include <iostream>
 
 

src/core/qtlibtorrent/qbtsession.cpp

@@ -39,24 +39,24 @@
 #include <QCoreApplication>
 
 #include "core/net/smtp.h"
-#include "filesystemwatcher.h"
+#include "core/filesystemwatcher.h"
 #include "torrentspeedmonitor.h"
 #include "torrentstatistics.h"
 #include "qbtsession.h"
 #include "alertdispatcher.h"
-#include "misc.h"
-#include "fs_utils.h"
-#include "downloadthread.h"
+#include "core/misc.h"
+#include "core/fs_utils.h"
+#include "core/downloadthread.h"
 #include "filterparserthread.h"
-#include "preferences.h"
-#include "scannedfoldersmodel.h"
-#include "qtracker.h"
-#include "logger.h"
+#include "core/preferences.h"
+#include "core/scannedfoldersmodel.h"
+#include "core/qtracker.h"
+#include "core/logger.h"
 #ifndef DISABLE_GUI
 #include "shutdownconfirm.h"
 #include "geoipmanager.h"
 #endif
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "bandwidthscheduler.h"
 #include <libtorrent/version.hpp>
 #include <libtorrent/extensions/ut_metadata.hpp>

src/core/qtlibtorrent/qbtsession.h

@@ -42,7 +42,7 @@
 
 #include "qtorrenthandle.h"
 #include "trackerinfos.h"
-#include "misc.h"
+#include "core/misc.h"
 
 #ifndef DISABLE_GUI
 #include "rssdownloadrule.h"

src/core/qtlibtorrent/qtorrenthandle.cpp

@@ -35,11 +35,11 @@
 #include <QDir>
 #include <QByteArray>
 #include <math.h>
-#include "fs_utils.h"
-#include "misc.h"
-#include "preferences.h"
+#include "core/fs_utils.h"
+#include "core/misc.h"
+#include "core/preferences.h"
 #include "qtorrenthandle.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "qbtsession.h"
 #include <libtorrent/version.hpp>
 #include <libtorrent/magnet_uri.hpp>

src/core/qtlibtorrent/torrentspeedmonitor.cpp

@@ -31,7 +31,7 @@
 #include <QList>
 
 #include "qbtsession.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "torrentspeedmonitor.h"
 
 using namespace libtorrent;

src/core/qtlibtorrent/torrentstatistics.cpp

@@ -5,8 +5,8 @@
 #include <libtorrent/session.hpp>
 
 #include "qbtsession.h"
-#include "qinisettings.h"
-#include "preferences.h"
+#include "core/qinisettings.h"
+#include "core/preferences.h"
 
 TorrentStatistics::TorrentStatistics(QBtSession* session, QObject* parent)
     : QObject(parent)
@@ -69,7 +69,7 @@ void TorrentStatistics::loadStats() {
     // Don't forget to remove:
     // 1. Preferences::getStats()
     // 2. Preferences::removeStats()
-    // 3. #include "preferences.h"
+    // 3. #include "core/preferences.h"
     Preferences* const pref = Preferences::instance();
     QIniSettings s("qBittorrent", "qBittorrent-data");
     QVariantHash v = pref->getStats();