Don't add core to INCLUDEPATH.

2025-02-05 11:24:15 +00:00 · 2015-04-13 19:19:53 +03:00 · 2015-04-13 19:19:53 +03:00 · d32bb52390
commit d32bb52390
parent 4b5e7e6168
67 changed files with 145 additions and 147 deletions
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@ -55,10 +55,10 @@
 #endif

 #include "application.h"
-#include "logger.h"
-#include "preferences.h"
+#include "core/logger.h"
+#include "core/preferences.h"
 #include "qbtsession.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"

 static const char PARAMS_SEPARATOR[] = "|";

--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@ -66,9 +66,9 @@ Q_IMPORT_PLUGIN(qico)
 #include <cstdlib>
 #include <iostream>
 #include "application.h"
-#include "misc.h"
-#include "preferences.h"
-#include "logger.h"
+#include "core/misc.h"
+#include "core/preferences.h"
+#include "core/logger.h"

 // Signal handlers
 #if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
--- a/src/core/core.pri
+++ b/src/core/core.pri
@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 include(qtlibtorrent/qtlibtorrent.pri)

 HEADERS += \
--- a/src/core/net/dnsupdater.cpp
+++ b/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;

--- a/src/core/net/dnsupdater.h
+++ b/src/core/net/dnsupdater.h
@ -36,7 +36,7 @@
 #include <QNetworkReply>
 #include <QDateTime>
 #include <QTimer>
-#include "preferences.h"
+#include "core/preferences.h"

 namespace Net
 {
--- a/src/core/net/smtp.cpp
+++ b/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
--- a/src/core/qtlibtorrent/bandwidthscheduler.h
+++ b/src/core/qtlibtorrent/bandwidthscheduler.h
@ -4,7 +4,7 @@
 #include <QTimer>
 #include <QTime>
 #include <QDateTime>
-#include "preferences.h"
+#include "core/preferences.h"
 #include <iostream>


--- a/src/core/qtlibtorrent/qbtsession.cpp
+++ b/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>
--- a/src/core/qtlibtorrent/qbtsession.h
+++ b/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"
--- a/src/core/qtlibtorrent/qtorrenthandle.cpp
+++ b/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>
--- a/src/core/qtlibtorrent/torrentspeedmonitor.cpp
+++ b/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;
--- a/src/core/qtlibtorrent/torrentstatistics.cpp
+++ b/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();
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@ -33,11 +33,11 @@
 #include "proplistdelegate.h"
 #include "torrentcontentmodel.h"
 #include "torrentcontentfiltermodel.h"
-#include "preferences.h"
-#include "torrentpersistentdata.h"
+#include "core/preferences.h"
+#include "core/torrentpersistentdata.h"
 #include "qbtsession.h"
 #include "iconprovider.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include "autoexpandabledialog.h"
 #include "messageboxraised.h"

--- a/src/gui/advancedsettings.h
+++ b/src/gui/advancedsettings.h
@ -10,7 +10,7 @@
 #include <QComboBox>
 #include <QNetworkInterface>
 #include <libtorrent/version.hpp>
-#include "preferences.h"
+#include "core/preferences.h"

 enum AdvSettingsCols {PROPERTY, VALUE};
 enum AdvSettingsRows {DISK_CACHE, DISK_CACHE_TTL, OS_CACHE, SAVE_RESUME_DATA_INTERVAL, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, NETWORK_LISTEN_IPV6, NETWORK_ADDRESS, PROGRAM_NOTIFICATIONS, TRACKER_STATUS, TRACKER_PORT,
--- a/src/gui/deletionconfirmationdlg.h
+++ b/src/gui/deletionconfirmationdlg.h
@ -34,9 +34,9 @@
 #include <QDialog>
 #include <QPushButton>
 #include "ui_confirmdeletiondlg.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "iconprovider.h"
-#include "misc.h"
+#include "core/misc.h"

 class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
  Q_OBJECT
--- a/src/gui/executionlog.cpp
+++ b/src/gui/executionlog.cpp
@ -35,7 +35,7 @@
 #include <QPalette>
 #include "executionlog.h"
 #include "ui_executionlog.h"
-#include "logger.h"
+#include "core/logger.h"
 #include "iconprovider.h"
 #include "loglistwidget.h"

--- a/src/gui/geoip/geoipmanager.cpp
+++ b/src/gui/geoip/geoipmanager.cpp
@ -64,7 +64,7 @@
 #include <QFile>
 #include <QChar>

-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include <libtorrent/session.hpp>

 using namespace libtorrent;
--- a/src/gui/iconprovider.cpp
+++ b/src/gui/iconprovider.cpp
@ -29,7 +29,7 @@
 */

 #include "iconprovider.h"
-#include "preferences.h"
+#include "core/preferences.h"

 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
 #include <QDir>
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@ -49,7 +49,7 @@

 #include "mainwindow.h"
 #include "transferlistwidget.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "torrentcreatordlg.h"
 #include "downloadfromurldlg.h"
 #include "addnewtorrentdialog.h"
@ -60,10 +60,10 @@
 #include "trackerlogin.h"
 #include "options_imp.h"
 #include "speedlimitdlg.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "trackerlist.h"
 #include "peerlistwidget.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "transferlistfilterswidget.h"
 #include "propertieswidget.h"
 #include "statusbar.h"
@ -72,7 +72,7 @@
 #include "torrentmodel.h"
 #include "executionlog.h"
 #include "iconprovider.h"
-#include "logger.h"
+#include "core/logger.h"
 #ifndef DISABLE_GUI
 #include "autoexpandabledialog.h"
 #endif
@ -86,7 +86,7 @@ void qt_mac_set_dock_menu(QMenu *menu);
 #endif
 #include "powermanagement.h"
 #ifdef Q_OS_WIN
-#include "downloadthread.h"
+#include "core/downloadthread.h"
 #endif

 #include <libtorrent/session.hpp>
--- a/src/gui/options_imp.cpp
+++ b/src/gui/options_imp.cpp
@ -42,10 +42,10 @@
 #include <libtorrent/version.hpp>

 #include "options_imp.h"
-#include "preferences.h"
-#include "fs_utils.h"
+#include "core/preferences.h"
+#include "core/fs_utils.h"
 #include "advancedsettings.h"
-#include "scannedfoldersmodel.h"
+#include "core/scannedfoldersmodel.h"
 #include "qbtsession.h"
 #include "iconprovider.h"
 #include "core/net/dnsupdater.h"
--- a/src/gui/previewlistdelegate.h
+++ b/src/gui/previewlistdelegate.h
@ -37,7 +37,7 @@
 #include <QModelIndex>
 #include <QPainter>
 #include <QApplication>
-#include "misc.h"
+#include "core/misc.h"
 #include "previewselect.h"

 #ifdef Q_OS_WIN
--- a/src/gui/previewselect.cpp
+++ b/src/gui/previewselect.cpp
@ -36,11 +36,11 @@
 #include <libtorrent/version.hpp>
 #include <libtorrent/session.hpp>

-#include "misc.h"
+#include "core/misc.h"
 #include "previewlistdelegate.h"
 #include "previewselect.h"
-#include "fs_utils.h"
-#include "preferences.h"
+#include "core/fs_utils.h"
+#include "core/preferences.h"

 PreviewSelect::PreviewSelect(QWidget* parent, QTorrentHandle h): QDialog(parent), h(h) {
  setupUi(this);
--- a/src/gui/programupdater.cpp
+++ b/src/gui/programupdater.cpp
@ -39,8 +39,8 @@
 #include <QStringList>

 #include "programupdater.h"
-#include "fs_utils.h"
-#include "preferences.h"
+#include "core/fs_utils.h"
+#include "core/preferences.h"

 #ifdef Q_OS_MAC
 const QUrl RSS_URL("http://sourceforge.net/projects/qbittorrent/rss?path=/qbittorrent-mac");
--- a/src/gui/properties/peerlistdelegate.h
+++ b/src/gui/properties/peerlistdelegate.h
@ -33,7 +33,7 @@

 #include <QItemDelegate>
 #include <QPainter>
-#include "misc.h"
+#include "core/misc.h"

 class PeerListDelegate: public QItemDelegate {
  Q_OBJECT
--- a/src/gui/properties/peerlistwidget.cpp
+++ b/src/gui/properties/peerlistwidget.cpp
@ -32,14 +32,14 @@
 #include "peerlistdelegate.h"
 #include "peerlistsortmodel.h"
 #include "core/net/reverseresolution.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "propertieswidget.h"
 #include "geoipmanager.h"
 #include "peeraddition.h"
 #include "speedlimitdlg.h"
 #include "iconprovider.h"
 #include "qtorrenthandle.h"
-#include "logger.h"
+#include "core/logger.h"
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 #include <QSet>
--- a/src/gui/properties/propertieswidget.cpp
+++ b/src/gui/properties/propertieswidget.cpp
@ -43,7 +43,7 @@
 #include <libtorrent/version.hpp>
 #include "propertieswidget.h"
 #include "transferlistwidget.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "qbtsession.h"
 #include "proplistdelegate.h"
 #include "torrentcontentfiltermodel.h"
@ -53,11 +53,11 @@
 #include "mainwindow.h"
 #include "downloadedpiecesbar.h"
 #include "pieceavailabilitybar.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "proptabbar.h"
 #include "iconprovider.h"
 #include "lineedit.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include "autoexpandabledialog.h"

 using namespace libtorrent;
--- a/src/gui/properties/proplistdelegate.h
+++ b/src/gui/properties/proplistdelegate.h
@ -40,7 +40,7 @@
 #include <QPainter>
 #include <QProgressBar>
 #include <QApplication>
-#include "misc.h"
+#include "core/misc.h"
 #include "propertieswidget.h"

 #ifdef Q_OS_WIN
--- a/src/gui/properties/trackerlist.cpp
+++ b/src/gui/properties/trackerlist.cpp
@ -43,8 +43,8 @@
 #include "trackersadditiondlg.h"
 #include "iconprovider.h"
 #include "qbtsession.h"
-#include "preferences.h"
-#include "misc.h"
+#include "core/preferences.h"
+#include "core/misc.h"
 #include "autoexpandabledialog.h"

 using namespace libtorrent;
--- a/src/gui/properties/trackersadditiondlg.h
+++ b/src/gui/properties/trackersadditiondlg.h
@ -37,11 +37,11 @@
 #include <QFile>
 #include <QUrl>
 #include "iconprovider.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "ui_trackersadditiondlg.h"
-#include "downloadthread.h"
+#include "core/downloadthread.h"
 #include "qtorrenthandle.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"

 class TrackersAdditionDlg : public QDialog, private Ui::TrackersAdditionDlg{
  Q_OBJECT
--- a/src/gui/rss/automatedrssdownloader.cpp
+++ b/src/gui/rss/automatedrssdownloader.cpp
@ -37,12 +37,12 @@
 #include "automatedrssdownloader.h"
 #include "ui_automatedrssdownloader.h"
 #include "rssdownloadrulelist.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "rssmanager.h"
 #include "rssfeed.h"
 #include "iconprovider.h"
 #include "autoexpandabledialog.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"

 AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& manager, QWidget *parent) :
  QDialog(parent),
--- a/src/gui/rss/htmlbrowser.cpp
+++ b/src/gui/rss/htmlbrowser.cpp
@ -10,7 +10,7 @@
 #include <QDateTime>
 #include <QScrollBar>

-#include "fs_utils.h"
+#include "core/fs_utils.h"

 HtmlBrowser::HtmlBrowser(QWidget* parent)
    : QTextBrowser(parent)
--- a/src/gui/rss/rss_imp.cpp
+++ b/src/gui/rss/rss_imp.cpp
@ -41,7 +41,7 @@
 #include "feedlistwidget.h"
 #include "qbtsession.h"
 #include "cookiesdlg.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "rsssettingsdlg.h"
 #include "rssmanager.h"
 #include "rssfolder.h"
--- a/src/gui/rss/rssdownloadrule.cpp
+++ b/src/gui/rss/rssdownloadrule.cpp
@ -33,10 +33,10 @@
 #include <QDir>

 #include "rssdownloadrule.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "rssfeed.h"
 #include "rssarticle.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"

 RssDownloadRule::RssDownloadRule(): m_enabled(false), m_useRegex(false), m_apstate(USE_GLOBAL)
 {
--- a/src/gui/rss/rssdownloadrulelist.cpp
+++ b/src/gui/rss/rssdownloadrulelist.cpp
@ -33,8 +33,8 @@
 #include <QDebug>

 #include "rssdownloadrulelist.h"
-#include "preferences.h"
-#include "qinisettings.h"
+#include "core/preferences.h"
+#include "core/qinisettings.h"

 RssDownloadRuleList::RssDownloadRuleList()
 {
--- a/src/gui/rss/rssfeed.cpp
+++ b/src/gui/rss/rssfeed.cpp
@ -33,15 +33,15 @@
 #include "rssmanager.h"
 #include "qbtsession.h"
 #include "rssfolder.h"
-#include "preferences.h"
-#include "qinisettings.h"
+#include "core/preferences.h"
+#include "core/qinisettings.h"
 #include "rssarticle.h"
 #include "rssparser.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "rssdownloadrulelist.h"
-#include "downloadthread.h"
-#include "fs_utils.h"
-#include "logger.h"
+#include "core/downloadthread.h"
+#include "core/fs_utils.h"
+#include "core/logger.h"

 bool rssArticleDateRecentThan(const RssArticlePtr& left, const RssArticlePtr& right)
 {
--- a/src/gui/rss/rssmanager.cpp
+++ b/src/gui/rss/rssmanager.cpp
@ -30,13 +30,13 @@

 #include <QDebug>
 #include "rssmanager.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "qbtsession.h"
 #include "rssfeed.h"
 #include "rssarticle.h"
 #include "rssdownloadrulelist.h"
 #include "rssparser.h"
-#include "downloadthread.h"
+#include "core/downloadthread.h"

 static const int MSECS_PER_MIN = 60000;

--- a/src/gui/rss/rssparser.cpp
+++ b/src/gui/rss/rssparser.cpp
@ -29,8 +29,8 @@
 */

 #include "rssparser.h"
-#include "downloadthread.h"
-#include "fs_utils.h"
+#include "core/downloadthread.h"
+#include "core/fs_utils.h"
 #include <QDebug>
 #include <QFile>
 #include <QRegExp>
--- a/src/gui/rss/rsssettingsdlg.cpp
+++ b/src/gui/rss/rsssettingsdlg.cpp
@ -30,7 +30,7 @@

 #include "rsssettingsdlg.h"
 #include "ui_rsssettingsdlg.h"
-#include "preferences.h"
+#include "core/preferences.h"

 RssSettingsDlg::RssSettingsDlg(QWidget *parent) :
  QDialog(parent),
--- a/src/gui/shutdownconfirm.h
+++ b/src/gui/shutdownconfirm.h
@ -33,7 +33,7 @@

 #include <QMessageBox>
 #include <QTimer>
-#include "misc.h"
+#include "core/misc.h"

 class ShutdownConfirmDlg : public QMessageBox
 {
--- a/src/gui/speedlimitdlg.h
+++ b/src/gui/speedlimitdlg.h
@ -34,7 +34,7 @@
 #include <QDialog>
 #include <QList>
 #include "ui_bandwidth_limit.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "qbtsession.h"

 class SpeedLimitDialog : public QDialog, private Ui_bandwidth_dlg {
--- a/src/gui/statsdialog.cpp
+++ b/src/gui/statsdialog.cpp
@ -31,7 +31,7 @@
 #include "statsdialog.h"
 #include "ui_statsdialog.h"

-#include "misc.h"
+#include "core/misc.h"
 #include <libtorrent/session.hpp>
 #include <libtorrent/disk_io_thread.hpp>

--- a/src/gui/statusbar.cpp
+++ b/src/gui/statusbar.cpp
@ -36,9 +36,9 @@
 #include "qbtsession.h"
 #include "speedlimitdlg.h"
 #include "iconprovider.h"
-#include "preferences.h"
-#include "misc.h"
-#include "logger.h"
+#include "core/preferences.h"
+#include "core/misc.h"
+#include "core/logger.h"

 #include <libtorrent/session.hpp>
 #include <libtorrent/session_status.hpp>
--- a/src/gui/torrentcontentmodel.cpp
+++ b/src/gui/torrentcontentmodel.cpp
@ -29,8 +29,8 @@
 */

 #include "iconprovider.h"
-#include "misc.h"
-#include "fs_utils.h"
+#include "core/misc.h"
+#include "core/fs_utils.h"
 #include "torrentcontentmodel.h"
 #include "torrentcontentmodelitem.h"
 #include "torrentcontentmodelfolder.h"
--- a/src/gui/torrentcontentmodelfile.cpp
+++ b/src/gui/torrentcontentmodelfile.cpp
@ -30,8 +30,8 @@

 #include "torrentcontentmodelfile.h"
 #include "torrentcontentmodelfolder.h"
-#include "fs_utils.h"
-#include "misc.h"
+#include "core/fs_utils.h"
+#include "core/misc.h"

 TorrentContentModelFile::TorrentContentModelFile(const libtorrent::file_entry& f,
                                                 TorrentContentModelFolder* parent,
--- a/src/gui/torrentcontentmodelitem.cpp
+++ b/src/gui/torrentcontentmodelitem.cpp
@ -28,8 +28,8 @@
 * Contact : chris@qbittorrent.org
 */

-#include "misc.h"
-#include "fs_utils.h"
+#include "core/misc.h"
+#include "core/fs_utils.h"
 #include "torrentcontentmodelitem.h"
 #include "torrentcontentmodelfolder.h"
 #include <QDebug>
--- a/src/gui/torrentcreator/torrentcreatordlg.cpp
+++ b/src/gui/torrentcreator/torrentcreatordlg.cpp
@ -32,11 +32,11 @@
 #include <QFileDialog>
 #include <QMessageBox>

-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "torrentcreatordlg.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 "torrentcreatorthread.h"
 #include "iconprovider.h"
 #include "qbtsession.h"
--- a/src/gui/torrentcreator/torrentcreatorthread.cpp
+++ b/src/gui/torrentcreator/torrentcreatorthread.cpp
@ -41,8 +41,8 @@
 #include <QDir>

 #include "torrentcreatorthread.h"
-#include "fs_utils.h"
-#include "misc.h"
+#include "core/fs_utils.h"
+#include "core/misc.h"

 #include <boost/bind.hpp>
 #include <iostream>
--- a/src/gui/torrentimportdlg.cpp
+++ b/src/gui/torrentimportdlg.cpp
@ -34,11 +34,11 @@

 #include "torrentimportdlg.h"
 #include "ui_torrentimportdlg.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "qbtsession.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "iconprovider.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"

 using namespace libtorrent;

--- a/src/gui/torrentmodel.cpp
+++ b/src/gui/torrentmodel.cpp
@ -33,9 +33,9 @@
 #include <QPalette>

 #include "torrentmodel.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "qbtsession.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"

 #include <libtorrent/session.hpp>

--- a/src/gui/transferlistdelegate.cpp
+++ b/src/gui/transferlistdelegate.cpp
@ -34,7 +34,7 @@
 #include <QStyleOptionViewItemV2>
 #include <QApplication>
 #include <QPainter>
-#include "misc.h"
+#include "core/misc.h"
 #include "torrentmodel.h"
 #include "qbtsession.h"

--- a/src/gui/transferlistfilterswidget.cpp
+++ b/src/gui/transferlistfilterswidget.cpp
@ -41,15 +41,15 @@

 #include "transferlistdelegate.h"
 #include "transferlistwidget.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "torrentmodel.h"
 #include "iconprovider.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include "autoexpandabledialog.h"
 #include "torrentfilterenum.h"
-#include "misc.h"
-#include "downloadthread.h"
-#include "logger.h"
+#include "core/misc.h"
+#include "core/downloadthread.h"
+#include "core/logger.h"

 FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList)
    : QListWidget(parent)
--- a/src/gui/transferlistsortmodel.cpp
+++ b/src/gui/transferlistsortmodel.cpp
@ -31,7 +31,7 @@
 #include "transferlistsortmodel.h"

 #include "torrentmodel.h"
-#include "misc.h"
+#include "core/misc.h"

 TransferListSortModel::TransferListSortModel(QObject *parent)
    : QSortFilterProxyModel(parent)
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@ -49,19 +49,19 @@

 #include "transferlistwidget.h"
 #include "qbtsession.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "transferlistdelegate.h"
 #include "previewselect.h"
 #include "speedlimitdlg.h"
 #include "updownratiodlg.h"
 #include "options_imp.h"
 #include "mainwindow.h"
-#include "preferences.h"
+#include "core/preferences.h"
 #include "torrentmodel.h"
 #include "deletionconfirmationdlg.h"
 #include "propertieswidget.h"
 #include "iconprovider.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include "autoexpandabledialog.h"
 #include "transferlistsortmodel.h"

--- a/src/gui/updownratiodlg.cpp
+++ b/src/gui/updownratiodlg.cpp
@ -31,7 +31,7 @@
 #include "updownratiodlg.h"
 #include "ui_updownratiodlg.h"

-#include "preferences.h"
+#include "core/preferences.h"

 UpDownRatioDlg::UpDownRatioDlg(bool useDefault, qreal initialValue,
    qreal maxValue, QWidget *parent)
--- a/src/searchengine/engineselectdlg.cpp
+++ b/src/searchengine/engineselectdlg.cpp
@ -29,9 +29,9 @@
 */

 #include "engineselectdlg.h"
-#include "downloadthread.h"
-#include "fs_utils.h"
-#include "misc.h"
+#include "core/downloadthread.h"
+#include "core/fs_utils.h"
+#include "core/misc.h"
 #include "ico.h"
 #include "searchengine.h"
 #include "pluginsource.h"
--- a/src/searchengine/searchengine.cpp
+++ b/src/searchengine/searchengine.cpp
@ -49,9 +49,9 @@

 #include "searchengine.h"
 #include "qbtsession.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 "searchlistdelegate.h"
 #include "mainwindow.h"
 #include "iconprovider.h"
--- a/src/searchengine/searchlistdelegate.h
+++ b/src/searchengine/searchlistdelegate.h
@ -36,7 +36,7 @@
 #include <QModelIndex>
 #include <QPainter>
 #include <QProgressBar>
-#include "misc.h"
+#include "core/misc.h"
 #include "searchengine.h"

 class SearchListDelegate: public QItemDelegate {
--- a/src/searchengine/searchsortmodel.h
+++ b/src/searchengine/searchsortmodel.h
@ -2,7 +2,7 @@
 #define SEARCHSORTMODEL_H

 #include <QSortFilterProxyModel>
-#include "misc.h"
+#include "core/misc.h"

 class SearchSortModel : public QSortFilterProxyModel {
  Q_OBJECT
--- a/src/searchengine/searchtab.cpp
+++ b/src/searchengine/searchtab.cpp
@ -36,9 +36,9 @@

 #include "searchtab.h"
 #include "searchlistdelegate.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "searchengine.h"
-#include "preferences.h"
+#include "core/preferences.h"

 SearchTab::SearchTab(SearchEngine *parent) : QWidget(), parent(parent)
 {
--- a/src/searchengine/supportedengines.h
+++ b/src/searchengine/supportedengines.h
@ -41,8 +41,8 @@
 #include <QApplication>
 #include <QDebug>

-#include "fs_utils.h"
-#include "preferences.h"
+#include "core/fs_utils.h"
+#include "core/preferences.h"

 class SearchCategories: public QObject, public QHash<QString, QString> {
  Q_OBJECT
--- a/src/webui/abstractwebapplication.cpp
+++ b/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"

--- a/src/webui/abstractwebapplication.h
+++ b/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;
--- a/src/webui/btjson.cpp
+++ b/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"

--- a/src/webui/prefjson.cpp
+++ b/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
--- a/src/webui/qtorrentfilter.cpp
+++ b/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)
--- a/src/webui/webapplication.cpp
+++ b/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"
--- a/src/webui/webui.cpp
+++ b/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)
 {