14 files changed, 29 insertions, 31 deletions
diff --git a/lib/bookmarks/meson.build b/lib/bookmarks/meson.build
index 73a52aa..e0f2a61 100644
--- a/lib/bookmarks/meson.build
+++ b/lib/bookmarks/meson.build
@@ -1,6 +1,6 @@
 bookmarks_inc = include_directories('.')
 bookmarks_moc = qt5.preprocess(
-    moc_headers: ['bookmarkswidget.h', 'model/bookmarkitem.h', 'model/bookmarkmodel.h', 'forms/editbookmarkdialog.h'],
+    moc_headers: ['bookmarkswidget.h', 'model/bookmarkmodel.h', 'forms/editbookmarkdialog.h'],
     ui_files: ['bookmarksform.ui', 'forms/editbookmarkdialog.ui'],
     dependencies: dep_qt5
 )
diff --git a/meson.build b/meson.build
index 00856c3..9348bdf 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('smolbote', 'cpp',
 
 # Qt 5
 qt5 = import('qt5')
-dep_qt5 = dependency('qt5', modules: ['Core', 'Gui', 'Network', 'Widgets', 'WebEngineWidgets'])
+dep_qt5 = dependency('qt5', modules: ['Core', 'Network', 'Widgets', 'WebEngineWidgets'])
 
 # Boost
 dep_boost = dependency('boost', modules: ['program_options'])
@@ -38,7 +38,6 @@ interfaces_moc = qt5.preprocess(
     dependencies: dep_qt5
 )
 
-lib_inc = include_directories('lib')
 subdir('lib/about')
 subdir('lib/addressbar')
 subdir('lib/bookmarks')
@@ -47,7 +46,6 @@ subdir('lib/downloads')
 subdir('lib/urlfilter')
 subdir('lib/web')
 
-thirdparty_inc = include_directories('3rd-party/SingleApplication/SingleApplication.git')
 subdir('3rd-party/SingleApplication')
 
 subdir('src')
diff --git a/src/browser.cpp b/src/browser.cpp
index cf39c4e..22302ae 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "browser.h"
-#include "addressbar/addressbar.h"
+#include "addressbar.h"
 #include "mainwindow/mainwindow.h"
 #include "subwindow/subwindow.h"
 #include "util.h"
@@ -20,13 +20,13 @@
 #include <QJsonDocument>
 #include <QPluginLoader>
 #include <QTimer>
-#include <about/aboutdialog.h>
-#include <bookmarks/bookmarkswidget.h>
-#include <configuration/configuration.h>
-#include <downloads/downloadswidget.h>
+#include "aboutdialog.h"
+#include "bookmarkswidget.h"
+#include "configuration.h"
+#include "downloadswidget.h"
 #include <version.h>
-#include <web/profilemanager.h>
-#include <web/webprofile.h>
+#include "profilemanager.h"
+#include "webprofile.h"
 #include "webengine/filter.h"
 #include <QPluginLoader>
 #include <plugininterface.h>
diff --git a/src/main.cpp b/src/main.cpp
index 5eb32fe..4d24084 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,7 @@
 #include <QFile>
 #include <QLibraryInfo>
 #include <QTranslator>
-#include <configuration/configuration.h>
+#include "configuration.h"
 #include <iostream>
 #include <memory>
 #include <QPluginLoader>
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp
index b0c5e5e..cb7fee6 100644
--- a/src/mainwindow/mainwindow.cpp
+++ b/src/mainwindow/mainwindow.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "mainwindow.h"
-#include "addressbar/addressbar.h"
+#include "addressbar.h"
 #include "browser.h"
 #include "session.h"
 #include "subwindow/subwindow.h"
@@ -34,9 +34,9 @@
 #include <QToolBar>
 #include <QUrl>
 #include <QVBoxLayout>
-#include <configuration/configuration.h>
-#include <web/profilemanager.h>
-#include <web/webprofile.h>
+#include "configuration.h"
+#include "profilemanager.h"
+#include "webprofile.h"
 #ifdef PLASMA
 #include <KWindowEffects>
 #endif
diff --git a/src/mainwindow/widgets/navigationbar.cpp b/src/mainwindow/widgets/navigationbar.cpp
index b49680d..0e5966f 100644
--- a/src/mainwindow/widgets/navigationbar.cpp
+++ b/src/mainwindow/widgets/navigationbar.cpp
@@ -7,8 +7,8 @@
  */
 
 #include "navigationbar.h"
-#include "addressbar/urllineedit.h"
-#include "configuration/configuration.h"
+#include "urllineedit.h"
+#include "configuration.h"
 #include "webengine/webview.h"
 #include <QHBoxLayout>
 #include <QMenu>
diff --git a/src/meson.build b/src/meson.build
index 52c8d42..9ce42d4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,7 +13,7 @@ poi = executable('poi', install: true,
     cpp_args: '-DQAPPLICATION_CLASS=QApplication',
     dependencies: [dep_qt5, dep_boost, dep_breakpad, dep_SingleApplication,
         dep_about, dep_addressbar, dep_bookmarks, dep_configuration, dep_downloads, dep_urlfilter, dep_web],
-    include_directories: [include, genheader_inc, lib_inc, thirdparty_inc],
+    include_directories: [include, genheader_inc],
     sources: ['main.cpp', poi_moc,
     'browser.cpp',
     'session.cpp',
diff --git a/src/session.cpp b/src/session.cpp
index 33a6173..4e1c6d6 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -12,7 +12,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include "webengine/webview.h"
-#include <web/profilemanager.h>
+#include "profilemanager.h"
 #include "browser.h"
 
 QJsonObject Session::session(QVector<MainWindow *> windows)
diff --git a/src/subwindow/subwindow.cpp b/src/subwindow/subwindow.cpp
index 44ac1b1..f718368 100644
--- a/src/subwindow/subwindow.cpp
+++ b/src/subwindow/subwindow.cpp
@@ -19,9 +19,9 @@
 #include <QStyle>
 #include <QTabBar>
 #include <QToolButton>
-#include <configuration/configuration.h>
-#include <web/profilemanager.h>
-#include <web/webprofile.h>
+#include "configuration.h"
+#include "profilemanager.h"
+#include "webprofile.h"
 
 SubWindow::SubWindow(const std::unique_ptr<Configuration> &config, QWidget *parent, Qt::WindowFlags flags)
     : QMdiSubWindow(parent, flags)
diff --git a/src/subwindow/tabwidget.cpp b/src/subwindow/tabwidget.cpp
index 25e27cf..942a364 100644
--- a/src/subwindow/tabwidget.cpp
+++ b/src/subwindow/tabwidget.cpp
@@ -13,7 +13,7 @@
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QTabBar>
-#include <web/webprofile.h>
+#include "webprofile.h"
 #include <QWebEngineHistory>
 
 inline WebView *createViewFromInfo(TabWidget::TabInformation &tab, QWidget *parent)
diff --git a/src/webengine/filter.cpp b/src/webengine/filter.cpp
index 3ff6a04..9db61cb 100644
--- a/src/webengine/filter.cpp
+++ b/src/webengine/filter.cpp
@@ -12,7 +12,7 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QTextStream>
-#include <configuration/configuration.h>
+#include "configuration.h"
 #include "util.h"
 
 /*
diff --git a/src/webengine/filter.h b/src/webengine/filter.h
index 20500f6..c49bed9 100644
--- a/src/webengine/filter.h
+++ b/src/webengine/filter.h
@@ -14,7 +14,7 @@
 #include <QVector>
 #include <optional>
 #include <memory>
-#include "urlfilter/filtertree.h"
+#include "filtertree.h"
 
 class Configuration;
 class Filter : public QObject
diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp
index e6bd523..7e5630f 100644
--- a/src/webengine/urlinterceptor.cpp
+++ b/src/webengine/urlinterceptor.cpp
@@ -7,15 +7,15 @@
  */
 
 #include "urlinterceptor.h"
-#include "urlfilter/formats/adblockrule.h"
+#include "formats/adblockrule.h"
 #include <QDir>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QTextStream>
 #include <boost/algorithm/string.hpp>
-#include <configuration/configuration.h>
+#include "configuration.h"
 #include "filter.h"
-#include <web/webprofile.h>
+#include "webprofile.h"
 
 // test DNT on https://browserleaks.com/donottrack
 
diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp
index 671b32f..2e90b23 100644
--- a/src/webengine/webview.cpp
+++ b/src/webengine/webview.cpp
@@ -20,8 +20,8 @@
 #include <QWebEngineContextMenuData>
 #include <QWebEngineHistoryItem>
 #include <QWidgetAction>
-#include <web/profilemanager.h>
-#include <web/webprofile.h>
+#include "profilemanager.h"
+#include "webprofile.h"
 #include "browser.h"
 #include "wallet/wallet.h"
 #include "config.h"