diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08ac914..0e6f054 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,9 @@ else()
     set(PLASMOID_DISABLED_BY_DEFAULT OFF)
 endif()
 
+# set the include directory used when building so the headers of the different backend libraries can be found at build time
+set(TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
 # add options for partial build
 option(NO_LIBSYNCTHING "whether building Syncthing itself as a library should be skipped" ON)
 option(NO_CLI "whether building CLI should be skipped" OFF)
diff --git a/cli/application.cpp b/cli/application.cpp
index f751f28..e3f21ea 100644
--- a/cli/application.cpp
+++ b/cli/application.cpp
@@ -4,8 +4,8 @@
 #include "./jsdefs.h"
 #include "./jsincludes.h"
 
-#include "../connector/syncthingconfig.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconfig.h>
+#include <syncthingconnector/utils.h>
 
 // use header-only functions waitForSignals() and signalInfo() from test utilities; disable assertions via macro
 #define SYNCTHINGTESTHELPER_FOR_CLI
diff --git a/cli/application.h b/cli/application.h
index ea96dbf..bcaed6f 100644
--- a/cli/application.h
+++ b/cli/application.h
@@ -3,8 +3,8 @@
 
 #include "./args.h"
 
-#include "../connector/syncthingconnection.h"
-#include "../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingconnectionsettings.h>
 
 #include <QObject>
 
diff --git a/fileitemactionplugin/syncthingdiractions.cpp b/fileitemactionplugin/syncthingdiractions.cpp
index 47d1d9c..8e44a14 100644
--- a/fileitemactionplugin/syncthingdiractions.cpp
+++ b/fileitemactionplugin/syncthingdiractions.cpp
@@ -1,10 +1,10 @@
 #include "./syncthingdiractions.h"
 #include "./syncthingfileitemactionstaticdata.h"
 
-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
-#include "../connector/syncthingdir.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingdir.h>
+#include <syncthingconnector/utils.h>
 
 using namespace Data;
 
diff --git a/fileitemactionplugin/syncthingdiractions.h b/fileitemactionplugin/syncthingdiractions.h
index f976073..6232325 100644
--- a/fileitemactionplugin/syncthingdiractions.h
+++ b/fileitemactionplugin/syncthingdiractions.h
@@ -1,7 +1,7 @@
 #ifndef SYNCTHINGDIRACTIONS_H
 #define SYNCTHINGDIRACTIONS_H
 
-#include "../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingdir.h>
 
 #include "./syncthinginfoaction.h"
 
diff --git a/fileitemactionplugin/syncthingfileitemaction.cpp b/fileitemactionplugin/syncthingfileitemaction.cpp
index f6d9200..258486a 100644
--- a/fileitemactionplugin/syncthingfileitemaction.cpp
+++ b/fileitemactionplugin/syncthingfileitemaction.cpp
@@ -3,7 +3,7 @@
 #include "./syncthinginfoaction.h"
 #include "./syncthingmenuaction.h"
 
-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
 #include <KFileItem>
 #include <KPluginFactory>
diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp
index 66f68b0..277cf0f 100644
--- a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp
+++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp
@@ -1,10 +1,10 @@
 #include "./syncthingfileitemactionstaticdata.h"
 
-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
-#include "../connector/syncthingconfig.h"
-#include "../connector/syncthingconnection.h"
-#include "../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconfig.h>
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingconnectionsettings.h>
 
 #include <c++utilities/application/argumentparser.h>
 #include <c++utilities/io/ansiescapecodes.h>
diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.h b/fileitemactionplugin/syncthingfileitemactionstaticdata.h
index b466a3f..f240450 100644
--- a/fileitemactionplugin/syncthingfileitemactionstaticdata.h
+++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.h
@@ -1,7 +1,7 @@
 #ifndef SYNCTHINGFILEITEMACTIONSTATICDATA_H
 #define SYNCTHINGFILEITEMACTIONSTATICDATA_H
 
-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 
 /*!
  * \brief The SyncthingFileItemActionStaticData class holds objects required during the whole application's live time.
diff --git a/fileitemactionplugin/syncthingmenuaction.cpp b/fileitemactionplugin/syncthingmenuaction.cpp
index de545d1..fcf4a02 100644
--- a/fileitemactionplugin/syncthingmenuaction.cpp
+++ b/fileitemactionplugin/syncthingmenuaction.cpp
@@ -1,9 +1,9 @@
 #include "./syncthingmenuaction.h"
 #include "./syncthingfileitemaction.h"
 
-#include "../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 
 #ifdef CPP_UTILITIES_DEBUG_BUILD
 #include <c++utilities/io/ansiescapecodes.h>
diff --git a/fileitemactionplugin/syncthingmenuaction.h b/fileitemactionplugin/syncthingmenuaction.h
index d474561..4c8a88f 100644
--- a/fileitemactionplugin/syncthingmenuaction.h
+++ b/fileitemactionplugin/syncthingmenuaction.h
@@ -1,7 +1,7 @@
 #ifndef SYNCTHINGMENUACTION_H
 #define SYNCTHINGMENUACTION_H
 
-#include "../connector/syncthingnotifier.h"
+#include <syncthingconnector/syncthingnotifier.h>
 
 #include <KFileItemListProperties>
 
diff --git a/include/syncthingconnector b/include/syncthingconnector
new file mode 120000
index 0000000..005369a
--- /dev/null
+++ b/include/syncthingconnector
@@ -0,0 +1 @@
+../connector
\ No newline at end of file
diff --git a/include/syncthingmodel b/include/syncthingmodel
new file mode 120000
index 0000000..fe0e728
--- /dev/null
+++ b/include/syncthingmodel
@@ -0,0 +1 @@
+../model
\ No newline at end of file
diff --git a/include/syncthingwidgets b/include/syncthingwidgets
new file mode 120000
index 0000000..7722edc
--- /dev/null
+++ b/include/syncthingwidgets
@@ -0,0 +1 @@
+../widgets
\ No newline at end of file
diff --git a/model/syncthingdevicemodel.cpp b/model/syncthingdevicemodel.cpp
index 2933894..f8c8733 100644
--- a/model/syncthingdevicemodel.cpp
+++ b/model/syncthingdevicemodel.cpp
@@ -2,8 +2,8 @@
 #include "./colors.h"
 #include "./syncthingicons.h"
 
-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>
 
 #include <c++utilities/conversion/stringconversion.h>
 
diff --git a/model/syncthingdirectorymodel.cpp b/model/syncthingdirectorymodel.cpp
index 8c6ea5e..4610206 100644
--- a/model/syncthingdirectorymodel.cpp
+++ b/model/syncthingdirectorymodel.cpp
@@ -2,8 +2,8 @@
 #include "./colors.h"
 #include "./syncthingicons.h"
 
-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>
 
 #include <c++utilities/conversion/stringconversion.h>
 
diff --git a/model/syncthingdownloadmodel.cpp b/model/syncthingdownloadmodel.cpp
index 202cb99..199b6c3 100644
--- a/model/syncthingdownloadmodel.cpp
+++ b/model/syncthingdownloadmodel.cpp
@@ -1,7 +1,7 @@
 #include "./syncthingdownloadmodel.h"
 
-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>
 
 #include <QStringBuilder>
 
diff --git a/model/syncthingmodel.cpp b/model/syncthingmodel.cpp
index d7df68d..aa1f701 100644
--- a/model/syncthingmodel.cpp
+++ b/model/syncthingmodel.cpp
@@ -1,7 +1,7 @@
 #include "./syncthingmodel.h"
 #include "./syncthingicons.h"
 
-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 
 namespace Data {
 
diff --git a/model/syncthingrecentchangesmodel.cpp b/model/syncthingrecentchangesmodel.cpp
index f056657..9692739 100644
--- a/model/syncthingrecentchangesmodel.cpp
+++ b/model/syncthingrecentchangesmodel.cpp
@@ -2,8 +2,8 @@
 #include "./colors.h"
 #include "./syncthingicons.h"
 
-#include "../connector/syncthingconnection.h"
-#include "../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/utils.h>
 
 #include <c++utilities/conversion/stringconversion.h>
 
diff --git a/model/syncthingrecentchangesmodel.h b/model/syncthingrecentchangesmodel.h
index 4b0bda8..2eb0355 100644
--- a/model/syncthingrecentchangesmodel.h
+++ b/model/syncthingrecentchangesmodel.h
@@ -3,8 +3,8 @@
 
 #include "./syncthingmodel.h"
 
-#include "../connector/syncthingconnectionstatus.h"
-#include "../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingconnectionstatus.h>
+#include <syncthingconnector/syncthingdir.h>
 
 #include <deque>
 
diff --git a/model/syncthingstatuscomputionmodel.cpp b/model/syncthingstatuscomputionmodel.cpp
index 4dfb4a7..10f3713 100644
--- a/model/syncthingstatuscomputionmodel.cpp
+++ b/model/syncthingstatuscomputionmodel.cpp
@@ -1,6 +1,6 @@
 #include "./syncthingstatuscomputionmodel.h"
 
-#include "../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnectionsettings.h>
 
 #include <type_traits>
 
diff --git a/model/syncthingstatusselectionmodel.cpp b/model/syncthingstatusselectionmodel.cpp
index b252efd..82e2c60 100644
--- a/model/syncthingstatusselectionmodel.cpp
+++ b/model/syncthingstatusselectionmodel.cpp
@@ -1,6 +1,6 @@
 #include "./syncthingstatusselectionmodel.h"
 
-#include "../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 
 using namespace QtUtilities;
 
diff --git a/plasmoid/lib/settingsdialog.cpp b/plasmoid/lib/settingsdialog.cpp
index 191dfcb..637b247 100644
--- a/plasmoid/lib/settingsdialog.cpp
+++ b/plasmoid/lib/settingsdialog.cpp
@@ -3,7 +3,7 @@
 
 #include "ui_appearanceoptionpage.h"
 
-#include "../../widgets/settings/settingsdialog.h"
+#include <syncthingwidgets/settings/settingsdialog.h>
 
 #include <qtutilities/settingsdialog/optioncategory.h>
 #include <qtutilities/settingsdialog/optioncategorymodel.h>
diff --git a/plasmoid/lib/settingsdialog.h b/plasmoid/lib/settingsdialog.h
index 4811c8c..c3c8e26 100644
--- a/plasmoid/lib/settingsdialog.h
+++ b/plasmoid/lib/settingsdialog.h
@@ -1,9 +1,9 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
-#include "../../model/syncthingstatusselectionmodel.h"
+#include <syncthingmodel/syncthingstatusselectionmodel.h>
 
-#include "../../widgets/settings/settingsdialog.h"
+#include <syncthingwidgets/settings/settingsdialog.h>
 
 #include <qtutilities/settingsdialog/optionpage.h>
 
diff --git a/plasmoid/lib/syncthingapplet.cpp b/plasmoid/lib/syncthingapplet.cpp
index 80917a9..aa94751 100644
--- a/plasmoid/lib/syncthingapplet.cpp
+++ b/plasmoid/lib/syncthingapplet.cpp
@@ -1,20 +1,20 @@
 #include "./syncthingapplet.h"
 #include "./settingsdialog.h"
 
-#include "../../connector/syncthingservice.h"
-#include "../../connector/utils.h"
+#include <syncthingconnector/syncthingservice.h>
+#include <syncthingconnector/utils.h>
 
-#include "../../widgets/misc/direrrorsdialog.h"
-#include "../../widgets/misc/internalerrorsdialog.h"
-#include "../../widgets/misc/otherdialogs.h"
-#include "../../widgets/misc/textviewdialog.h"
-#include "../../widgets/settings/settings.h"
-#include "../../widgets/settings/settingsdialog.h"
-#include "../../widgets/webview/webviewdialog.h"
+#include <syncthingwidgets/misc/direrrorsdialog.h>
+#include <syncthingwidgets/misc/internalerrorsdialog.h>
+#include <syncthingwidgets/misc/otherdialogs.h>
+#include <syncthingwidgets/misc/textviewdialog.h>
+#include <syncthingwidgets/settings/settings.h>
+#include <syncthingwidgets/settings/settingsdialog.h>
+#include <syncthingwidgets/webview/webviewdialog.h>
 
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
-#include "../../connector/utils.h"
+#include <syncthingconnector/utils.h>
 
 #include "resources/config.h"
 #include "resources/qtconfig.h"
diff --git a/plasmoid/lib/syncthingapplet.h b/plasmoid/lib/syncthingapplet.h
index 34ab20e..5e1b8f8 100644
--- a/plasmoid/lib/syncthingapplet.h
+++ b/plasmoid/lib/syncthingapplet.h
@@ -1,20 +1,20 @@
 #ifndef SYNCTHINGAPPLET_H
 #define SYNCTHINGAPPLET_H
 
-#include "../../widgets/misc/dbusstatusnotifier.h"
-#include "../../widgets/misc/statusinfo.h"
-#include "../../widgets/webview/webviewdefs.h"
+#include <syncthingwidgets/misc/dbusstatusnotifier.h>
+#include <syncthingwidgets/misc/statusinfo.h>
+#include <syncthingwidgets/webview/webviewdefs.h>
 
-#include "../../model/syncthingdevicemodel.h"
-#include "../../model/syncthingdirectorymodel.h"
-#include "../../model/syncthingdownloadmodel.h"
-#include "../../model/syncthingrecentchangesmodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
-#include "../../model/syncthingstatusselectionmodel.h"
+#include <syncthingmodel/syncthingdevicemodel.h>
+#include <syncthingmodel/syncthingdirectorymodel.h>
+#include <syncthingmodel/syncthingdownloadmodel.h>
+#include <syncthingmodel/syncthingrecentchangesmodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>
+#include <syncthingmodel/syncthingstatusselectionmodel.h>
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingnotifier.h"
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingnotifier.h>
+#include <syncthingconnector/syncthingservice.h>
 
 #include <qtutilities/aboutdialog/aboutdialog.h>
 #include <qtutilities/models/checklistmodel.h>
diff --git a/testhelper/syncthingtestinstance.h b/testhelper/syncthingtestinstance.h
index ddfae6c..66c47ea 100644
--- a/testhelper/syncthingtestinstance.h
+++ b/testhelper/syncthingtestinstance.h
@@ -4,7 +4,7 @@
 #include "./global.h"
 #include "./helper.h"
 
-#include "../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 
 #include <QCoreApplication>
 #include <QProcess>
diff --git a/tray/application/main.cpp b/tray/application/main.cpp
index 1c39430..7c256a4 100644
--- a/tray/application/main.cpp
+++ b/tray/application/main.cpp
@@ -3,12 +3,12 @@
 #include "../gui/trayicon.h"
 #include "../gui/traywidget.h"
 
-#include "../../widgets/misc/syncthinglauncher.h"
-#include "../../widgets/settings/settings.h"
+#include <syncthingwidgets/misc/syncthinglauncher.h>
+#include <syncthingwidgets/settings/settings.h>
 
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif
 
 #include "resources/config.h"
diff --git a/tray/gui/devbuttonsitemdelegate.cpp b/tray/gui/devbuttonsitemdelegate.cpp
index 9bd8da2..471692c 100644
--- a/tray/gui/devbuttonsitemdelegate.cpp
+++ b/tray/gui/devbuttonsitemdelegate.cpp
@@ -1,7 +1,7 @@
 #include "./devbuttonsitemdelegate.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../model/syncthingdevicemodel.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingmodel/syncthingdevicemodel.h>
 
 #include <QApplication>
 #include <QBrush>
diff --git a/tray/gui/devview.cpp b/tray/gui/devview.cpp
index d908078..d4daaa1 100644
--- a/tray/gui/devview.cpp
+++ b/tray/gui/devview.cpp
@@ -2,9 +2,9 @@
 #include "./devbuttonsitemdelegate.h"
 #include "./helper.h"
 
-#include "../../connector/syncthingdev.h"
-#include "../../model/syncthingdevicemodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
+#include <syncthingconnector/syncthingdev.h>
+#include <syncthingmodel/syncthingdevicemodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>
 
 #include <QClipboard>
 #include <QGuiApplication>
diff --git a/tray/gui/dirbuttonsitemdelegate.cpp b/tray/gui/dirbuttonsitemdelegate.cpp
index 66d2583..3e264fd 100644
--- a/tray/gui/dirbuttonsitemdelegate.cpp
+++ b/tray/gui/dirbuttonsitemdelegate.cpp
@@ -1,6 +1,6 @@
 #include "./dirbuttonsitemdelegate.h"
 
-#include "../model/syncthingdirectorymodel.h"
+#include <syncthingmodel/syncthingdirectorymodel.h>
 
 #include <QApplication>
 #include <QBrush>
diff --git a/tray/gui/dirview.cpp b/tray/gui/dirview.cpp
index de82108..3ff71b3 100644
--- a/tray/gui/dirview.cpp
+++ b/tray/gui/dirview.cpp
@@ -2,10 +2,10 @@
 #include "./dirbuttonsitemdelegate.h"
 #include "./helper.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../model/syncthingdirectorymodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
-#include "../../widgets/misc/direrrorsdialog.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingmodel/syncthingdirectorymodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>
+#include <syncthingwidgets/misc/direrrorsdialog.h>
 
 #include <QClipboard>
 #include <QGuiApplication>
diff --git a/tray/gui/downloaditemdelegate.cpp b/tray/gui/downloaditemdelegate.cpp
index 778ba3b..5471b1e 100644
--- a/tray/gui/downloaditemdelegate.cpp
+++ b/tray/gui/downloaditemdelegate.cpp
@@ -1,6 +1,6 @@
 #include "./downloaditemdelegate.h"
 
-#include "../../model/syncthingdownloadmodel.h"
+#include <syncthingmodel/syncthingdownloadmodel.h>
 
 #include <QApplication>
 #include <QBrush>
diff --git a/tray/gui/downloadview.cpp b/tray/gui/downloadview.cpp
index 01d884a..a705515 100644
--- a/tray/gui/downloadview.cpp
+++ b/tray/gui/downloadview.cpp
@@ -2,8 +2,8 @@
 #include "./downloaditemdelegate.h"
 #include "./helper.h"
 
-#include "../../connector/syncthingdir.h"
-#include "../../model/syncthingdownloadmodel.h"
+#include <syncthingconnector/syncthingdir.h>
+#include <syncthingmodel/syncthingdownloadmodel.h>
 
 #include <QClipboard>
 #include <QGuiApplication>
diff --git a/tray/gui/trayicon.cpp b/tray/gui/trayicon.cpp
index eb349ce..9b66c09 100644
--- a/tray/gui/trayicon.cpp
+++ b/tray/gui/trayicon.cpp
@@ -1,18 +1,18 @@
 #include "./trayicon.h"
 #include "./traywidget.h"
 
-#include "../../widgets/misc/internalerrorsdialog.h"
-#include "../../widgets/misc/statusinfo.h"
-#include "../../widgets/misc/textviewdialog.h"
-#include "../../widgets/settings/settings.h"
+#include <syncthingwidgets/misc/internalerrorsdialog.h>
+#include <syncthingwidgets/misc/statusinfo.h>
+#include <syncthingwidgets/misc/textviewdialog.h>
+#include <syncthingwidgets/settings/settings.h>
 
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
-#include "../../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif
-#include "../../connector/utils.h"
+#include <syncthingconnector/utils.h>
 
 #include <qtutilities/misc/dialogutils.h>
 
diff --git a/tray/gui/trayicon.h b/tray/gui/trayicon.h
index 10ded30..94375d6 100644
--- a/tray/gui/trayicon.h
+++ b/tray/gui/trayicon.h
@@ -3,7 +3,7 @@
 
 #include "./traymenu.h"
 
-#include "../../widgets/misc/dbusstatusnotifier.h"
+#include <syncthingwidgets/misc/dbusstatusnotifier.h>
 
 #include <c++utilities/chrono/datetime.h>
 
diff --git a/tray/gui/traymenu.cpp b/tray/gui/traymenu.cpp
index efd7aad..99604cc 100644
--- a/tray/gui/traymenu.cpp
+++ b/tray/gui/traymenu.cpp
@@ -2,7 +2,7 @@
 #include "./trayicon.h"
 #include "./traywidget.h"
 
-#include "../../widgets/settings/settings.h"
+#include <syncthingwidgets/settings/settings.h>
 
 #include <qtutilities/misc/dialogutils.h>
 
diff --git a/tray/gui/traywidget.cpp b/tray/gui/traywidget.cpp
index 867ea8c..9b3fa16 100644
--- a/tray/gui/traywidget.cpp
+++ b/tray/gui/traywidget.cpp
@@ -3,22 +3,22 @@
 #include "./trayicon.h"
 #include "./traymenu.h"
 
-#include "../../widgets/misc/otherdialogs.h"
-#include "../../widgets/misc/syncthinglauncher.h"
-#include "../../widgets/misc/textviewdialog.h"
-#include "../../widgets/settings/settingsdialog.h"
-#include "../../widgets/webview/webviewdialog.h"
+#include <syncthingwidgets/misc/otherdialogs.h>
+#include <syncthingwidgets/misc/syncthinglauncher.h>
+#include <syncthingwidgets/misc/textviewdialog.h>
+#include <syncthingwidgets/settings/settingsdialog.h>
+#include <syncthingwidgets/webview/webviewdialog.h>
 
 #ifdef SYNCTHINGTRAY_UNIFY_TRAY_MENUS
-#include "../../widgets/misc/internalerrorsdialog.h"
+#include <syncthingwidgets/misc/internalerrorsdialog.h>
 #endif
 
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif
-#include "../../connector/utils.h"
+#include <syncthingconnector/utils.h>
 
 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
diff --git a/tray/gui/traywidget.h b/tray/gui/traywidget.h
index 836e83b..b2a67e7 100644
--- a/tray/gui/traywidget.h
+++ b/tray/gui/traywidget.h
@@ -1,18 +1,18 @@
 #ifndef TRAY_WIDGET_H
 #define TRAY_WIDGET_H
 
-#include "../../widgets/settings/settings.h"
-#include "../../widgets/webview/webviewdefs.h"
+#include <syncthingwidgets/settings/settings.h>
+#include <syncthingwidgets/webview/webviewdefs.h>
 
-#include "../../model/syncthingdevicemodel.h"
-#include "../../model/syncthingdirectorymodel.h"
-#include "../../model/syncthingdownloadmodel.h"
-#include "../../model/syncthingrecentchangesmodel.h"
-#include "../../model/syncthingsortfiltermodel.h"
+#include <syncthingmodel/syncthingdevicemodel.h>
+#include <syncthingmodel/syncthingdirectorymodel.h>
+#include <syncthingmodel/syncthingdownloadmodel.h>
+#include <syncthingmodel/syncthingrecentchangesmodel.h>
+#include <syncthingmodel/syncthingsortfiltermodel.h>
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingnotifier.h"
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingnotifier.h>
+#include <syncthingconnector/syncthingprocess.h>
 
 #include <QWidget>
 
diff --git a/widgets/misc/dbusstatusnotifier.cpp b/widgets/misc/dbusstatusnotifier.cpp
index 053ccc6..eae0803 100644
--- a/widgets/misc/dbusstatusnotifier.cpp
+++ b/widgets/misc/dbusstatusnotifier.cpp
@@ -1,7 +1,7 @@
 #ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
 #include "./dbusstatusnotifier.h"
 
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
diff --git a/widgets/misc/direrrorsdialog.cpp b/widgets/misc/direrrorsdialog.cpp
index 3b0dcdc..d058af3 100644
--- a/widgets/misc/direrrorsdialog.cpp
+++ b/widgets/misc/direrrorsdialog.cpp
@@ -1,8 +1,8 @@
 #include "./direrrorsdialog.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdir.h"
-#include "../../connector/utils.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdir.h>
+#include <syncthingconnector/utils.h>
 
 #include <QDir>
 #include <QHBoxLayout>
diff --git a/widgets/misc/internalerror.cpp b/widgets/misc/internalerror.cpp
index a261a8b..c098ca0 100644
--- a/widgets/misc/internalerror.cpp
+++ b/widgets/misc/internalerror.cpp
@@ -3,8 +3,8 @@
 
 #include "../settings/settings.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingservice.h>
 
 #include <QNetworkReply>
 
diff --git a/widgets/misc/otherdialogs.cpp b/widgets/misc/otherdialogs.cpp
index 9148411..1adcba1 100644
--- a/widgets/misc/otherdialogs.cpp
+++ b/widgets/misc/otherdialogs.cpp
@@ -1,7 +1,7 @@
 #include "./otherdialogs.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdir.h>
 
 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
diff --git a/widgets/misc/statusinfo.cpp b/widgets/misc/statusinfo.cpp
index cb118a1..0c34599 100644
--- a/widgets/misc/statusinfo.cpp
+++ b/widgets/misc/statusinfo.cpp
@@ -1,9 +1,9 @@
 #include "./statusinfo.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdev.h"
-#include "../../connector/utils.h"
-#include "../../model/syncthingicons.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdev.h>
+#include <syncthingconnector/utils.h>
+#include <syncthingmodel/syncthingicons.h>
 
 #include <QCoreApplication>
 #include <QIcon>
diff --git a/widgets/misc/syncthingkiller.cpp b/widgets/misc/syncthingkiller.cpp
index b4a0b75..5fb39e5 100644
--- a/widgets/misc/syncthingkiller.cpp
+++ b/widgets/misc/syncthingkiller.cpp
@@ -1,6 +1,6 @@
 #include "./syncthingkiller.h"
 
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 #define SYNCTHINGTESTHELPER_FOR_CLI
 #include "../../testhelper/helper.h"
 
diff --git a/widgets/misc/syncthinglauncher.h b/widgets/misc/syncthinglauncher.h
index 1715bbf..2e2a5a3 100644
--- a/widgets/misc/syncthinglauncher.h
+++ b/widgets/misc/syncthinglauncher.h
@@ -3,7 +3,7 @@
 
 #include "../global.h"
 
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/syncthingprocess.h>
 #include "../../libsyncthing/interface.h"
 
 #include <QByteArray>
diff --git a/widgets/misc/textviewdialog.cpp b/widgets/misc/textviewdialog.cpp
index b6c5601..df91d02 100644
--- a/widgets/misc/textviewdialog.cpp
+++ b/widgets/misc/textviewdialog.cpp
@@ -1,7 +1,7 @@
 #include "./textviewdialog.h"
 
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingdir.h"
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingdir.h>
 
 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
diff --git a/widgets/settings/settings.cpp b/widgets/settings/settings.cpp
index f69bf66..2ccf28a 100644
--- a/widgets/settings/settings.cpp
+++ b/widgets/settings/settings.cpp
@@ -3,13 +3,13 @@
 #include "../misc/syncthingkiller.h"
 #include "../misc/syncthinglauncher.h"
 
-#include "../../connector/qstringhash.h"
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingconnectionsettings.h"
-#include "../../connector/syncthingnotifier.h"
-#include "../../connector/syncthingprocess.h"
+#include <syncthingconnector/qstringhash.h>
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingconnectionsettings.h>
+#include <syncthingconnector/syncthingnotifier.h>
+#include <syncthingconnector/syncthingprocess.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
+#include <syncthingconnector/syncthingservice.h>
 #endif
 
 // use meta-data of syncthingtray application here
diff --git a/widgets/settings/settings.h b/widgets/settings/settings.h
index bfb234e..335529d 100644
--- a/widgets/settings/settings.h
+++ b/widgets/settings/settings.h
@@ -1,9 +1,9 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include "../../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnectionsettings.h>
 #include "../../libsyncthing/interface.h"
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 #include "../global.h"
 
 #include <qtutilities/settingsdialog/qtsettings.h>
diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp
index af81bd5..961b6e6 100644
--- a/widgets/settings/settingsdialog.cpp
+++ b/widgets/settings/settingsdialog.cpp
@@ -2,15 +2,15 @@
 
 #include "../misc/syncthinglauncher.h"
 
-#include "../../connector/syncthingconfig.h"
-#include "../../connector/syncthingconnection.h"
-#include "../../connector/syncthingprocess.h"
-#include "../../connector/utils.h"
-#include "../../model/syncthingstatuscomputionmodel.h"
+#include <syncthingconnector/syncthingconfig.h>
+#include <syncthingconnector/syncthingconnection.h>
+#include <syncthingconnector/syncthingprocess.h>
+#include <syncthingconnector/utils.h>
+#include <syncthingmodel/syncthingstatuscomputionmodel.h>
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
-#include "../../connector/syncthingservice.h"
-#include "../../model/colors.h"
-#include "../../model/syncthingicons.h"
+#include <syncthingconnector/syncthingservice.h>
+#include <syncthingmodel/colors.h>
+#include <syncthingmodel/syncthingicons.h>
 #endif
 
 #include "ui_appearanceoptionpage.h"
diff --git a/widgets/settings/settingsdialog.h b/widgets/settings/settingsdialog.h
index 520c3ab..6a2a1af 100644
--- a/widgets/settings/settingsdialog.h
+++ b/widgets/settings/settingsdialog.h
@@ -5,7 +5,7 @@
 
 #include "../webview/webviewdefs.h"
 
-#include "../../model/syncthingicons.h"
+#include <syncthingmodel/syncthingicons.h>
 
 #include <qtutilities/settingsdialog/optionpage.h>
 #include <qtutilities/settingsdialog/qtsettings.h>
diff --git a/widgets/webview/webpage.cpp b/widgets/webview/webpage.cpp
index 62fb69a..e8985ad 100644
--- a/widgets/webview/webpage.cpp
+++ b/widgets/webview/webpage.cpp
@@ -4,7 +4,7 @@
 
 #include "../settings/settings.h"
 
-#include "../../connector/syncthingconnection.h"
+#include <syncthingconnector/syncthingconnection.h>
 
 #include "resources/config.h"
 
diff --git a/widgets/webview/webviewinterceptor.cpp b/widgets/webview/webviewinterceptor.cpp
index 775aa00..378ba71 100644
--- a/widgets/webview/webviewinterceptor.cpp
+++ b/widgets/webview/webviewinterceptor.cpp
@@ -1,7 +1,7 @@
 #ifdef SYNCTHINGWIDGETS_USE_WEBENGINE
 #include "./webviewinterceptor.h"
 
-#include "../../connector/syncthingconnectionsettings.h"
+#include <syncthingconnector/syncthingconnectionsettings.h>
 
 #include <QWebEngineProfile>
 #include <QWebEngineUrlRequestInterceptor>