diff --git a/app/osd/horizonladder.h b/app/osd/horizonladder.h
index 23551e42f..4d1045d61 100644
--- a/app/osd/horizonladder.h
+++ b/app/osd/horizonladder.h
@@ -4,7 +4,7 @@
 #include <QQuickItem>
 #include <QQuickPaintedItem>
 #include <QPainter>
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
 
 class HorizonLadder : public QQuickPaintedItem {
     Q_OBJECT
diff --git a/app/telemetry/MavlinkTelemetry.h b/app/telemetry/MavlinkTelemetry.h
index a84600355..1a6dc4ae7 100644
--- a/app/telemetry/MavlinkTelemetry.h
+++ b/app/telemetry/MavlinkTelemetry.h
@@ -8,8 +8,8 @@
 #include <thread>
 
 #include "tutil/mavlink_include.h"
-#include "lib/lqtutils_master/lqtutils_prop.h"
-#include "common/TimeHelper.hpp"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
+#include "../common/TimeHelper.hpp"
 
 #include "connection/udp_connection.h"
 #include "connection/tcp_connection.h"
diff --git a/app/telemetry/action/create_cmd_helper.hpp b/app/telemetry/action/create_cmd_helper.hpp
index 2b94ae5ce..85dbd2687 100644
--- a/app/telemetry/action/create_cmd_helper.hpp
+++ b/app/telemetry/action/create_cmd_helper.hpp
@@ -1,7 +1,7 @@
 #ifndef CMD_HELPER_H
 #define CMD_HELPER_H
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 // Here we have various util methods to create mavlink_command_long_t commands
 namespace cmd::helper{
diff --git a/app/telemetry/action/fcaction.cpp b/app/telemetry/action/fcaction.cpp
index b5ef7ffb0..3f9df715c 100644
--- a/app/telemetry/action/fcaction.cpp
+++ b/app/telemetry/action/fcaction.cpp
@@ -1,12 +1,12 @@
 #include "fcaction.h"
 #include "qdebug.h"
 
-#include "logging/hudlogmessagesmodel.h"
-#include "MavlinkTelemetry.h"
+#include "../../logging/hudlogmessagesmodel.h"
+#include "../MavlinkTelemetry.h"
 #include "impl/cmdsender.h"
 
 #include "create_cmd_helper.hpp"
-#include "models/fcmavlinksystem.h"
+#include "../models/fcmavlinksystem.h"
 #include "tutil/mavlink_enum_to_string.h"
 
 FCAction::FCAction(QObject *parent)
diff --git a/app/telemetry/action/fcaction.h b/app/telemetry/action/fcaction.h
index f1ba172ad..35137e9de 100644
--- a/app/telemetry/action/fcaction.h
+++ b/app/telemetry/action/fcaction.h
@@ -4,8 +4,8 @@
 #include <QObject>
 #include <mutex>
 
-#include "tutil/mavlink_include.h"
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../tutil/mavlink_include.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
 
 /**
  * This is the one and only class from which messages / actions can be sent to the FC.
diff --git a/app/telemetry/action/fcmissionhandler.cpp b/app/telemetry/action/fcmissionhandler.cpp
index c63e4bea1..a12868d1e 100644
--- a/app/telemetry/action/fcmissionhandler.cpp
+++ b/app/telemetry/action/fcmissionhandler.cpp
@@ -1,9 +1,9 @@
 #include "fcmissionhandler.h"
-#include "tutil/qopenhdmavlinkhelper.hpp"
-#include "tutil/telemetryutil.hpp"
-#include "MavlinkTelemetry.h"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
+#include "../tutil/telemetryutil.hpp"
+#include "../MavlinkTelemetry.h"
 
-#include "models/fcmavlinkmissionitemsmodel.h"
+#include "../models/fcmavlinkmissionitemsmodel.h"
 
 FCMissionHandler::FCMissionHandler(QObject *parent): QObject(parent)
 {
diff --git a/app/telemetry/action/fcmissionhandler.h b/app/telemetry/action/fcmissionhandler.h
index 9b9e875a9..9dfce7316 100644
--- a/app/telemetry/action/fcmissionhandler.h
+++ b/app/telemetry/action/fcmissionhandler.h
@@ -11,9 +11,9 @@
 #include <mutex>
 #include <optional>
 
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 /**
  * Simple class to (semi-reliably) get all the mission waypoints from the FC and more.
diff --git a/app/telemetry/action/fcmsgintervalhandler.cpp b/app/telemetry/action/fcmsgintervalhandler.cpp
index 03ad24a37..33df6b72e 100644
--- a/app/telemetry/action/fcmsgintervalhandler.cpp
+++ b/app/telemetry/action/fcmsgintervalhandler.cpp
@@ -2,9 +2,9 @@
 
 #include "create_cmd_helper.hpp"
 
-#include "logging/hudlogmessagesmodel.h"
+#include "../../logging/hudlogmessagesmodel.h"
 #include "impl/cmdsender.h"
-#include "MavlinkTelemetry.h"
+#include "../MavlinkTelemetry.h"
 
 FCMsgIntervalHandler &FCMsgIntervalHandler::instance()
 {
diff --git a/app/telemetry/action/fcmsgintervalhandler.h b/app/telemetry/action/fcmsgintervalhandler.h
index 67383758f..dbb42e9eb 100644
--- a/app/telemetry/action/fcmsgintervalhandler.h
+++ b/app/telemetry/action/fcmsgintervalhandler.h
@@ -7,7 +7,7 @@
 #include <optional>
 #include <qsettings.h>
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 /**
  * We need to manually request / set the message interval(s) for specific messages on ardupilot
diff --git a/app/telemetry/action/impl/cmdsender.cpp b/app/telemetry/action/impl/cmdsender.cpp
index e4a0dbd73..55f0a61a8 100644
--- a/app/telemetry/action/impl/cmdsender.cpp
+++ b/app/telemetry/action/impl/cmdsender.cpp
@@ -2,8 +2,8 @@
 
 #include <qdebug.h>
 
-#include "tutil/qopenhdmavlinkhelper.hpp"
-#include "MavlinkTelemetry.h"
+#include "../../tutil/qopenhdmavlinkhelper.hpp"
+#include "../../MavlinkTelemetry.h"
 #include "tutil/mavlink_enum_to_string.h"
 #include <future>
 
diff --git a/app/telemetry/action/impl/cmdsender.h b/app/telemetry/action/impl/cmdsender.h
index c4c8db658..9e8c6adea 100644
--- a/app/telemetry/action/impl/cmdsender.h
+++ b/app/telemetry/action/impl/cmdsender.h
@@ -1,6 +1,8 @@
 #ifndef CMDSENDER_H
 #define CMDSENDER_H
 
+#include "../../tutil/mavlink_include.h"
+
 #include <optional>
 #include <functional>
 #include <mutex>
@@ -8,8 +10,6 @@
 #include <thread>
 #include <memory>
 
-#include "tutil/mavlink_include.h"
-
 /**
  * Simple, threadsafe class for sending mavlink command (long) over a lossy link.
  */
diff --git a/app/telemetry/action/impl/xparam.cpp b/app/telemetry/action/impl/xparam.cpp
index 28941239e..fd6b19a10 100644
--- a/app/telemetry/action/impl/xparam.cpp
+++ b/app/telemetry/action/impl/xparam.cpp
@@ -6,8 +6,7 @@
 #include <future>
 
 #include <qdebug.h>
-
-#include "MavlinkTelemetry.h"
+#include "../../MavlinkTelemetry.h"
 
 XParam::XParam()
 {
diff --git a/app/telemetry/action/impl/xparam.h b/app/telemetry/action/impl/xparam.h
index 74998bca2..c384b2ab7 100644
--- a/app/telemetry/action/impl/xparam.h
+++ b/app/telemetry/action/impl/xparam.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include <vector>
 
-#include "tutil/mavlink_include.h"
+#include "../../tutil/mavlink_include.h"
 
 class XParam
 {
diff --git a/app/telemetry/action/ohdaction.cpp b/app/telemetry/action/ohdaction.cpp
index aad0544b5..3f19b90d7 100644
--- a/app/telemetry/action/ohdaction.cpp
+++ b/app/telemetry/action/ohdaction.cpp
@@ -1,7 +1,7 @@
 #include "ohdaction.h"
 
-#include "tutil/openhd_defines.hpp"
 #include "create_cmd_helper.hpp"
+#include "../tutil/openhd_defines.hpp"
 #include "impl/cmdsender.h"
 
 //#include "../models/aohdsystem.h"
diff --git a/app/telemetry/connection/tcp_connection.h b/app/telemetry/connection/tcp_connection.h
index 3c6e690a8..219433803 100644
--- a/app/telemetry/connection/tcp_connection.h
+++ b/app/telemetry/connection/tcp_connection.h
@@ -1,6 +1,8 @@
 #ifndef TCPCONNECTION2_H
 #define TCPCONNECTION2_H
 
+#include "../tutil/mavlink_include.h"
+
 #include <thread>
 #include <memory.h>
 #include <atomic>
@@ -9,8 +11,6 @@
 #include <mutex>
 #include <functional>
 
-#include "tutil/mavlink_include.h"
-
 // TCP client connection that handles the following edge-case:
 // If the server becomes unavailable (no message for more than X seconds)
 // disconnect, then continously try re-connecting.
diff --git a/app/telemetry/models/aohdsystem.cpp b/app/telemetry/models/aohdsystem.cpp
index 984c2f740..6869e8e1c 100644
--- a/app/telemetry/models/aohdsystem.cpp
+++ b/app/telemetry/models/aohdsystem.cpp
@@ -1,5 +1,13 @@
 #include "aohdsystem.h"
 
+#include "../../common/StringHelper.hpp"
+#include "../../common/TimeHelper.hpp"
+#include "QOpenHDVideoHelper.hpp"
+#include "tutil/telemetryutil.hpp"
+#include "wificard.h"
+#include "rcchannelsmodel.h"
+#include "camerastreammodel.h"
+
 #include <string>
 #include <sstream>
 #include <MavlinkTelemetry.h>
@@ -7,20 +15,12 @@
 #include <logging/logmessagesmodel.h>
 #include <logging/hudlogmessagesmodel.h>
 
-#include "common/StringHelper.hpp"
-#include "common/TimeHelper.hpp"
-#include "QOpenHDVideoHelper.hpp"
-#include "tutil/telemetryutil.hpp"
-#include "wificard.h"
-#include "rcchannelsmodel.h"
-#include "camerastreammodel.h"
-
 #include "util/qopenhd.h"
-#include "tutil/qopenhdmavlinkhelper.hpp"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
 
-#include "util/WorkaroundMessageBox.h"
-#include "settings/wblinksettingshelper.h"
-#include "settings/mavlinksettingsmodel.h"
+#include <../util/WorkaroundMessageBox.h>
+#include "../settings/wblinksettingshelper.h"
+#include "../settings/mavlinksettingsmodel.h"
 
 #include "openhd_core/platform.hpp"
 
diff --git a/app/telemetry/models/aohdsystem.h b/app/telemetry/models/aohdsystem.h
index cd849dcbc..c1dd0ea1d 100644
--- a/app/telemetry/models/aohdsystem.h
+++ b/app/telemetry/models/aohdsystem.h
@@ -8,8 +8,9 @@
 #include <QQmlContext>
 #include <atomic>
 
+#include "../tutil/mavlink_include.h"
+
 #include "util/lqutils_include.h"
-#include "tutil/mavlink_include.h"
 #include "tutil/openhd_defines.hpp"
 
 /**
diff --git a/app/telemetry/models/camerastreammodel.cpp b/app/telemetry/models/camerastreammodel.cpp
index 0d1f40189..e27e28556 100644
--- a/app/telemetry/models/camerastreammodel.cpp
+++ b/app/telemetry/models/camerastreammodel.cpp
@@ -1,13 +1,14 @@
 #include "camerastreammodel.h"
+#include "qdebug.h"
+#include "../tutil/telemetryutil.hpp"
+#include "../videostreaming/vscommon/QOpenHDVideoHelper.hpp"
 
-#include <regex>
 #include <qsettings.h>
-#include <qdebug.h>
+#include <regex>
+
+#include <logging/hudlogmessagesmodel.h>
+#include <logging/logmessagesmodel.h>
 
-#include "tutil/telemetryutil.hpp"
-#include "videostreaming/vscommon/QOpenHDVideoHelper.hpp"
-#include "logging/hudlogmessagesmodel.h"
-#include "logging/logmessagesmodel.h"
 #include "openhd_core/camera.hpp"
 
 static std::string video_codec_to_string(int value){
diff --git a/app/telemetry/models/camerastreammodel.h b/app/telemetry/models/camerastreammodel.h
index e50dcfdab..8ee61f83f 100644
--- a/app/telemetry/models/camerastreammodel.h
+++ b/app/telemetry/models/camerastreammodel.h
@@ -3,7 +3,8 @@
 
 #include <QObject>
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
+
 #include "util/lqutils_include.h"
 
 // NOTE1: This class exists to avoid duplicated code for primary and secondary camera(stream)-stats displayed in the HUD
diff --git a/app/telemetry/models/fcmavlinksystem.cpp b/app/telemetry/models/fcmavlinksystem.cpp
index 7e82db31e..d921669ed 100644
--- a/app/telemetry/models/fcmavlinksystem.cpp
+++ b/app/telemetry/models/fcmavlinksystem.cpp
@@ -1,17 +1,22 @@
 #include "fcmavlinksystem.h"
+#include "rcchannelsmodel.h"
 
 #include <QDebug>
+#include "util/qopenhd.h"
+
+#include "../tutil/geodesi_helper.h"
+
 #include <QDateTime>
 
-#include "util/qopenhd.h"
-#include "tutil/geodesi_helper.h"
-#include "logging/logmessagesmodel.h"
-#include "logging/hudlogmessagesmodel.h"
+#include <logging/logmessagesmodel.h>
+#include <logging/hudlogmessagesmodel.h>
+
 #include "tutil/qopenhdmavlinkhelper.hpp"
 #include "tutil/telemetryutil.hpp"
-#include "action/fcaction.h"
-#include "rcchannelsmodel.h"
 
+#include "../action/fcaction.h"
+
+#include <QDateTime>
 
 FCMavlinkSystem::FCMavlinkSystem(QObject *parent): QObject(parent) {
     m_flight_time_timer = std::make_unique<QTimer>(this);
diff --git a/app/telemetry/models/fcmavlinksystem.h b/app/telemetry/models/fcmavlinksystem.h
index 8af87d6b5..32ab5d2d3 100644
--- a/app/telemetry/models/fcmavlinksystem.h
+++ b/app/telemetry/models/fcmavlinksystem.h
@@ -1,16 +1,17 @@
 #ifndef FC_MAVLINK_SYSTEM_H
 #define FC_MAVLINK_SYSTEM_H
 
-#include <atomic>
-#include <optional>
-#include <memory>
-
 #include <QElapsedTimer>
 #include <QObject>
 #include <QTimer>
 #include <QQmlContext>
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
+
+#include <atomic>
+#include <optional>
+#include <memory>
+
 #include "util/lqutils_include.h"
 
 /**
diff --git a/app/telemetry/models/rcchannelsmodel.cpp b/app/telemetry/models/rcchannelsmodel.cpp
index 0edf534ca..1dbbe7c75 100644
--- a/app/telemetry/models/rcchannelsmodel.cpp
+++ b/app/telemetry/models/rcchannelsmodel.cpp
@@ -1,6 +1,6 @@
 #include "rcchannelsmodel.h"
-#include <qdebug.h>
-#include "tutil/qopenhdmavlinkhelper.hpp"
+#include "qdebug.h"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
 
 
 
diff --git a/app/telemetry/models/wificard.cpp b/app/telemetry/models/wificard.cpp
index c1e14f003..5ebb11c5e 100644
--- a/app/telemetry/models/wificard.cpp
+++ b/app/telemetry/models/wificard.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "logging/hudlogmessagesmodel.h"
+#include "../../logging/hudlogmessagesmodel.h"
 #include "tutil/qopenhdmavlinkhelper.hpp"
 
 
diff --git a/app/telemetry/models/wificard.h b/app/telemetry/models/wificard.h
index 90e64eaf4..5054edfbe 100644
--- a/app/telemetry/models/wificard.h
+++ b/app/telemetry/models/wificard.h
@@ -2,12 +2,10 @@
 #define WIFICARD_H
 
 #include <memory>
-
 #include <qobject.h>
 #include <qtimer.h>
-
 #include "util/lqutils_include.h"
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 // Stats unique per each connected (wifibroadcast) wfi card
 // Air has only one card, ground can have one or more card(s)
diff --git a/app/telemetry/settings/mavlinksettingsmodel.cpp b/app/telemetry/settings/mavlinksettingsmodel.cpp
index d25c0fd10..043569796 100644
--- a/app/telemetry/settings/mavlinksettingsmodel.cpp
+++ b/app/telemetry/settings/mavlinksettingsmodel.cpp
@@ -1,20 +1,20 @@
 #include "mavlinksettingsmodel.h"
-
-#include <qdebug.h>
-#include <QSettings>
-#include <QVariant>
-
+#include "qdebug.h"
 #include "documentedparam.h"
 
-#include "util/qopenhd.h"
+#include "../../util/qopenhd.h"
 #include "improvedintsetting.h"
 #include "improvedstringsetting.h"
 #include "tutil/openhd_defines.hpp"
-#include "action/impl/xparam.h"
+
+#include <QSettings>
+#include <QVariant>
+
+#include "../action/impl/xparam.h"
 // Dirty
-#include "models/openhd_core/camera.hpp"
-#include "models/aohdsystem.h"
-#include "util/WorkaroundMessageBox.h"
+#include "../models/openhd_core/camera.hpp"
+#include "../models/aohdsystem.h"
+#include "../util/WorkaroundMessageBox.h"
 
 MavlinkSettingsModel &MavlinkSettingsModel::instanceAirCamera()
 {
diff --git a/app/telemetry/settings/mavlinksettingsmodel.h b/app/telemetry/settings/mavlinksettingsmodel.h
index 90698a03a..82220b777 100644
--- a/app/telemetry/settings/mavlinksettingsmodel.h
+++ b/app/telemetry/settings/mavlinksettingsmodel.h
@@ -9,9 +9,9 @@
 #include <mutex>
 #include <QJSValue>
 
-#include "tutil/mavlink_include.h"
-#include "lib/lqtutils_master/lqtutils_prop.h"
-#include "action/impl/xparam.h"
+#include "../tutil/mavlink_include.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+#include "../action/impl/xparam.h"
 
 // A QT wrapper around the mavlink extended / non-extended parameters protocoll on the client
 // (the side that changes parameter(s) provided by a specific system & component).
diff --git a/app/telemetry/settings/wblinksettingshelper.cpp b/app/telemetry/settings/wblinksettingshelper.cpp
index 9a9600a8e..afd9c1bba 100644
--- a/app/telemetry/settings/wblinksettingshelper.cpp
+++ b/app/telemetry/settings/wblinksettingshelper.cpp
@@ -1,14 +1,13 @@
 #include "wblinksettingshelper.h"
+#include "../action/impl/xparam.h"
 
-#include <sstream>
+#include "../models/aohdsystem.h"
 
+#include "../logging/hudlogmessagesmodel.h"
 #include <qsettings.h>
-
-#include "models/aohdsystem.h"
-#include "logging/hudlogmessagesmodel.h"
-#include "action/impl/xparam.h"
-#include "action/ohdaction.h"
-#include "util/qopenhd.h"
+#include <sstream>
+#include "../action/ohdaction.h"
+#include "../../util/qopenhd.h"
 
 #include "pollutionhelper.h"
 #include "frequencyhelper.h"
diff --git a/app/telemetry/settings/wblinksettingshelper.h b/app/telemetry/settings/wblinksettingshelper.h
index 721f1f410..19f0a9b28 100644
--- a/app/telemetry/settings/wblinksettingshelper.h
+++ b/app/telemetry/settings/wblinksettingshelper.h
@@ -1,15 +1,15 @@
 #ifndef SynchronizedSettings_H
 #define SynchronizedSettings_H
 
-#include <mutex>
-#include <optional>
-
 #include <QObject>
 #include <qsettings.h>
-
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
 #include "param_names.h"
-#include "tutil/mavlink_include.h"
+
+#include <mutex>
+#include <optional>
+
+#include "../tutil/mavlink_include.h"
 #include "tutil/openhd_defines.hpp"
 
 
diff --git a/app/telemetry/tutil/mavlink_include.h b/app/telemetry/tutil/mavlink_include.h
index 30570d60b..0b525a409 100644
--- a/app/telemetry/tutil/mavlink_include.h
+++ b/app/telemetry/tutil/mavlink_include.h
@@ -2,6 +2,6 @@
 #define MAVLINK_INCLUDE_H
 
 
-#include "lib/mavlink-headers/mavlink/v2.0/openhd/mavlink.h"
+#include "../../../lib/mavlink-headers/mavlink/v2.0/openhd/mavlink.h"
 
 #endif // MAVLINK_INCLUDE_H
diff --git a/app/telemetry/tutil/telemetryutil.hpp b/app/telemetry/tutil/telemetryutil.hpp
index 387aa9883..3166a1de4 100644
--- a/app/telemetry/tutil/telemetryutil.hpp
+++ b/app/telemetry/tutil/telemetryutil.hpp
@@ -1,18 +1,16 @@
 #ifndef TELEMETRYUTIL_H
 #define TELEMETRYUTIL_H
 
-#include <cstring>
-#include <optional>
-#include <array>
-
 #include <QString>
 #include <QDebug>
 
 #include "mavlink_include.h"
-#include "common/TimeHelper.hpp"
-#include "common/StringHelper.hpp"
+#include "../../common/TimeHelper.hpp"
+#include "../../common/StringHelper.hpp"
 #include "mavlink_enum_to_string.h"
-
+#include <cstring>
+#include <optional>
+#include <array>
 
 // Various utility methods for telemetry that are static and take simple imputs.
 namespace Telemetryutil{
diff --git a/app/util/WorkaroundMessageBox.h b/app/util/WorkaroundMessageBox.h
index 4118477cd..d75a9e136 100644
--- a/app/util/WorkaroundMessageBox.h
+++ b/app/util/WorkaroundMessageBox.h
@@ -8,7 +8,7 @@
 #include <mutex>
 #include <QTimer>
 
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
 
 // QT Message popup's (their default ones) don't work in kms, since they are opened in a new window.
 // This exposes the following functionality:
diff --git a/app/util/lqutils_include.h b/app/util/lqutils_include.h
index 14de60eff..08856e186 100644
--- a/app/util/lqutils_include.h
+++ b/app/util/lqutils_include.h
@@ -2,7 +2,7 @@
 #define LQUTILS_INCLUDE_H
 
 // Really nice, this way we don't have to write all the setters / getters / signals ourselves !
-#include "lib/lqtutils_master/lqtutils_prop.h"
-//#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+//#include "../lib/lqtutils_master/lqtutils_prop.h"
 
 #endif // LQUTILS_INCLUDE_H
diff --git a/app/util/qopenhd.h b/app/util/qopenhd.h
index 7a3a22a74..ad4c0901b 100644
--- a/app/util/qopenhd.h
+++ b/app/util/qopenhd.h
@@ -10,7 +10,7 @@
 #include <QTextToSpeech>
 #endif
 
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
 
 /**
  * Dirty, but for some reason stephen made translation(s) and a bit more work this way.
diff --git a/app/util/qrenderstats.h b/app/util/qrenderstats.h
index 8932eba19..478208884 100644
--- a/app/util/qrenderstats.h
+++ b/app/util/qrenderstats.h
@@ -5,7 +5,7 @@
 #include <qqmlapplicationengine.h>
 #include <qquickwindow.h>
 
-#include "common/TimeHelper.hpp"
+#include "../common/TimeHelper.hpp"
 #include "util/lqutils_include.h"
 
 // Stats about the QT (QOpenHD) OpenGL rendering.
diff --git a/app/util/restartqopenhdmessagebox.h b/app/util/restartqopenhdmessagebox.h
index 48e56bc59..9738e99dd 100644
--- a/app/util/restartqopenhdmessagebox.h
+++ b/app/util/restartqopenhdmessagebox.h
@@ -2,8 +2,7 @@
 #define RESTARTQOPENHDMESSAGEBOX_H
 
 #include <QObject>
-
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
 
 // Also Quite dirty
 // There are a couple of places in QOpenHD where we need to prompt the user to restart QOpenHD.
diff --git a/app/videostreaming/android/lowlagdecoder.h b/app/videostreaming/android/lowlagdecoder.h
index ed1edc94a..9aa296c44 100644
--- a/app/videostreaming/android/lowlagdecoder.h
+++ b/app/videostreaming/android/lowlagdecoder.h
@@ -1,19 +1,19 @@
 #ifndef LOWLAGDECODER_H
 #define LOWLAGDECODER_H
 
-#include <iostream>
-#include <thread>
-#include <atomic>
 
 #include <android/native_window.h>
 #include <media/NdkMediaCodec.h>
 #include <android/log.h>
 #include <jni.h>
+#include <iostream>
+#include <thread>
+#include <atomic>
 
+#include <nalu/NALU.hpp>
+#include <nalu/CodecConfigFinder.hpp>
 
-#include "nalu/NALU.hpp"
-#include "nalu/CodecConfigFinder.hpp"
-#include "common/TimeHelper.hpp"
+#include "../../common/TimeHelper.hpp"
 
 struct DecodingInfo{
     std::chrono::steady_clock::time_point lastCalculation=std::chrono::steady_clock::now();
diff --git a/app/videostreaming/android/qandroidmediaplayer.h b/app/videostreaming/android/qandroidmediaplayer.h
index 52850a56a..4dfceff3d 100644
--- a/app/videostreaming/android/qandroidmediaplayer.h
+++ b/app/videostreaming/android/qandroidmediaplayer.h
@@ -6,7 +6,7 @@
 #include <QPointer>
 
 #include "lowlagdecoder.h"
-#include "gstreamer/gstrtpreceiver.h"
+#include "../gstreamer/gstrtpreceiver.h"
 
 class QSurfaceTexture;
 class QAndroidMediaPlayer : public QObject
diff --git a/app/videostreaming/android/qsurfacetexture.cpp b/app/videostreaming/android/qsurfacetexture.cpp
index 1062f26ab..738f5d5c8 100644
--- a/app/videostreaming/android/qsurfacetexture.cpp
+++ b/app/videostreaming/android/qsurfacetexture.cpp
@@ -4,8 +4,8 @@
 #include <QSGGeometryNode>
 #include <QSGSimpleMaterialShader>
 
-#include "vscommon/QOpenHDVideoHelper.hpp"
-#include "vscommon/video_ratio_helper.hpp"
+#include "../vscommon/QOpenHDVideoHelper.hpp"
+#include "../vscommon/video_ratio_helper.hpp"
 
 struct State {
     // the texture transform matrix
diff --git a/app/videostreaming/avcodec/avcodec_decoder.h b/app/videostreaming/avcodec/avcodec_decoder.h
index 66ecb459d..b7d603369 100644
--- a/app/videostreaming/avcodec/avcodec_decoder.h
+++ b/app/videostreaming/avcodec/avcodec_decoder.h
@@ -1,21 +1,23 @@
 #ifndef AVCODEC_DECODER_H
 #define AVCODEC_DECODER_H
 
-#include <mutex>
-#include <deque>
-#include <optional>
-#include <queue>
-#include <atomic>
-
 #include <qtimer.h>
 #include <thread>
 #include <memory>
 
 #include "avcodec_helper.hpp"
 #include "QOpenHDVideoHelper.hpp"
-#include "common/TimeHelper.hpp"
+#include "../../common/TimeHelper.hpp"
+
 #include "rtp/rtpreceiver.h"
-#include "custom/rawreceiver.h"
+
+#include <mutex>
+#include <deque>
+#include <optional>
+#include <queue>
+#include <atomic>
+
+#include <custom/rawreceiver.h>
 
 //exp
 //#include "drm_kms/drmprime_out.h"
diff --git a/app/videostreaming/avcodec/gl/gl_videorenderer.cpp b/app/videostreaming/avcodec/gl/gl_videorenderer.cpp
index 038225afe..9aaf5c9af 100644
--- a/app/videostreaming/avcodec/gl/gl_videorenderer.cpp
+++ b/app/videostreaming/avcodec/gl/gl_videorenderer.cpp
@@ -3,12 +3,10 @@
 //
 
 #include "gl_videorenderer.h"
+#include "../color_helper.h"
 #include <GL/gl.h>
 #include <chrono>
 
-#include "color_helper.h"
-
-
 static EGLint texgen_attrs[] = {
 	EGL_DMA_BUF_PLANE0_FD_EXT,
 	EGL_DMA_BUF_PLANE0_OFFSET_EXT,
diff --git a/app/videostreaming/avcodec/texturerenderer.cpp b/app/videostreaming/avcodec/texturerenderer.cpp
index 86c0ec9eb..398f3ec8d 100644
--- a/app/videostreaming/avcodec/texturerenderer.cpp
+++ b/app/videostreaming/avcodec/texturerenderer.cpp
@@ -6,8 +6,8 @@
 #include <algorithm>
 
 #include "decodingstatistcs.h"
-#include "vscommon/QOpenHDVideoHelper.hpp"
-#include "vscommon/video_ratio_helper.hpp"
+#include "../vscommon/QOpenHDVideoHelper.hpp"
+#include "../vscommon/video_ratio_helper.hpp"
 
 static bool get_dev_draw_alternating_rgb_dummy_frames(){
     QSettings settings;
diff --git a/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp b/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp
index 3ec1fcdd0..06db190bc 100644
--- a/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp
+++ b/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp
@@ -1,14 +1,13 @@
 #include "gstrtpaudioplayer.h"
+#include "gst/gstparse.h"
+#include "gst/gstpipeline.h"
 
 #include <assert.h>
-#include <sstream>
 #include <qdebug.h>
+#include <sstream>
 
-#include "gst/gstparse.h"
-#include "gst/gstpipeline.h"
-
-#include "logging/logmessagesmodel.h"
-#include "util/qopenhd.h"
+#include <logging/logmessagesmodel.h>
+#include "../util/qopenhd.h"
 
 G_BEGIN_DECLS
 // The static plugins we use
diff --git a/app/videostreaming/vscommon/audio_playback.cpp b/app/videostreaming/vscommon/audio_playback.cpp
index 003424cbc..240694824 100644
--- a/app/videostreaming/vscommon/audio_playback.cpp
+++ b/app/videostreaming/vscommon/audio_playback.cpp
@@ -1,13 +1,15 @@
 #include "audio_playback.h"
-#include <qdebug.h>
+#include "qdebug.h"
+
 #include <qsettings.h>
 
+
 #ifdef QOPENHD_ENABLE_GSTREAMER_QMLGLSINK
-#include "gstreamer/gstrtpaudioplayer.h"
+#include "../gstreamer/gstrtpaudioplayer.h"
 #endif
 
-#include "util/qopenhd.h"
-#include "logging/logmessagesmodel.h"
+#include <util/qopenhd.h>
+#include <logging/logmessagesmodel.h>
 
 void platform_start_audio_streaming_if_enabled()
 {
diff --git a/app/videostreaming/vscommon/custom/rawreceiver.h b/app/videostreaming/vscommon/custom/rawreceiver.h
index 3f9a8bf6e..17b0c5a19 100644
--- a/app/videostreaming/vscommon/custom/rawreceiver.h
+++ b/app/videostreaming/vscommon/custom/rawreceiver.h
@@ -1,15 +1,17 @@
 #ifndef RAWRECEIVER_H
 #define RAWRECEIVER_H
 
-#include <mutex>
-
 #include <udp/UDPReceiver.h>
 
-#include "nalu/NALU.hpp"
-#include "nalu/CodecConfigFinder.hpp"
+#include "../nalu/NALU.hpp"
+#include <nalu/CodecConfigFinder.hpp>
+
+#include <mutex>
+
 #include "common/TimeHelper.hpp"
 #include "common/ThreadsafeQueue.hpp"
 
+
 class RawReceiver
 {
 public:
diff --git a/app/videostreaming/vscommon/rtp/rtpreceiver.cpp b/app/videostreaming/vscommon/rtp/rtpreceiver.cpp
index 8634dc077..25dc06c72 100644
--- a/app/videostreaming/vscommon/rtp/rtpreceiver.cpp
+++ b/app/videostreaming/vscommon/rtp/rtpreceiver.cpp
@@ -4,12 +4,11 @@
 
 #include "common/StringHelper.hpp"
 #include "common/openhd-util.hpp"
-#include "common/openhd-util.hpp"
 
 #include "QOpenHDVideoHelper.hpp"
 #include "decodingstatistcs.h"
-
-#include "logging/hudlogmessagesmodel.h"
+#include "common/openhd-util.hpp"
+#include "../../logging/hudlogmessagesmodel.h"
 
 
 #ifdef OPENHD_USE_LIB_UVGRTP
diff --git a/app/videostreaming/vscommon/rtp/rtpreceiver.h b/app/videostreaming/vscommon/rtp/rtpreceiver.h
index 85daa72b4..42e976e0c 100644
--- a/app/videostreaming/vscommon/rtp/rtpreceiver.h
+++ b/app/videostreaming/vscommon/rtp/rtpreceiver.h
@@ -1,15 +1,17 @@
 #ifndef RTPRECEIVER_H
 #define RTPRECEIVER_H
 
+
+#include "ParseRTP.h"
 #include <memory>
+#include "../udp/UDPReceiver.h"
+
 #include <fstream>
 #include <mutex>
 #include <functional>
 
-#include "ParseRTP.h"
-#include "udp/UDPReceiver.h"
-#include "nalu/NALU.hpp"
-#include "nalu/CodecConfigFinder.hpp"
+#include "../nalu/NALU.hpp"
+#include "../nalu/CodecConfigFinder.hpp"
 
 #include "common/TimeHelper.hpp"
 #include "common/ThreadsafeQueue.hpp"