Don't add core to INCLUDEPATH.

src/webui/abstractwebapplication.cpp

@@ -35,7 +35,7 @@
 #include <QTemporaryFile>
 #include <QTimer>
 
-#include "preferences.h"
+#include "core/preferences.h"
 #include "websessiondata.h"
 #include "abstractwebapplication.h"
 

src/webui/abstractwebapplication.h

@@ -32,9 +32,9 @@
 #include <QObject>
 #include <QMap>
 #include <QHash>
-#include "http/types.h"
-#include "http/responsebuilder.h"
-#include "http/irequesthandler.h"
+#include "core/http/types.h"
+#include "core/http/responsebuilder.h"
+#include "core/http/irequesthandler.h"
 
 struct WebSession;
 struct WebSessionData;

src/webui/btjson.cpp

@@ -29,9 +29,9 @@
  */
 
 #include "btjson.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include "qbtsession.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "qtorrentfilter.h"
 #include "jsonutils.h"
 

src/webui/prefjson.cpp

@@ -29,10 +29,10 @@
  */
 
 #include "prefjson.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "qbtsession.h"
-#include "scannedfoldersmodel.h"
-#include "fs_utils.h"
+#include "core/scannedfoldersmodel.h"
+#include "core/fs_utils.h"
 
 #include <libtorrent/version.hpp>
 #ifndef QT_NO_OPENSSL

src/webui/qtorrentfilter.cpp

@@ -26,7 +26,7 @@
  * exception statement from your version.
  */
 
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "qtorrentfilter.h"
 
 QTorrentFilter::QTorrentFilter(QString filter, QString label)

src/webui/webapplication.cpp

@@ -37,9 +37,9 @@
 // TODO: Drop GUI dependency!
 #include "iconprovider.h"
 #endif
-#include "misc.h"
-#include "fs_utils.h"
-#include "preferences.h"
+#include "core/misc.h"
+#include "core/fs_utils.h"
+#include "core/preferences.h"
 #include "btjson.h"
 #include "prefjson.h"
 #include "qbtsession.h"

src/webui/webui.cpp

@@ -27,11 +27,11 @@
  */
 
 #include "webui.h"
-#include "http/server.h"
+#include "core/http/server.h"
 #include "webapplication.h"
 #include "core/net/dnsupdater.h"
-#include "preferences.h"
-#include "logger.h"
+#include "core/preferences.h"
+#include "core/logger.h"
 
 WebUI::WebUI(QObject *parent) : QObject(parent)
 {