diff --git a/src/unittests/arch/IArchStringTests.cpp b/src/unittests/arch/IArchStringTests.cpp
index d3c172baa..2079acd6d 100644
--- a/src/unittests/arch/IArchStringTests.cpp
+++ b/src/unittests/arch/IArchStringTests.cpp
@@ -7,7 +7,7 @@
 
 #include "IArchStringTests.h"
 
-#include "../../lib/arch/IArchString.h"
+#include "arch/IArchString.h"
 
 void IArchStringTests::initTestCase()
 {
diff --git a/src/unittests/base/PathTests.cpp b/src/unittests/base/PathTests.cpp
index a2e278de7..2049316ea 100644
--- a/src/unittests/base/PathTests.cpp
+++ b/src/unittests/base/PathTests.cpp
@@ -7,7 +7,7 @@
 
 #include "PathTests.h"
 
-#include "../../lib/base/Path.h"
+#include "base/Path.h"
 
 #include <fstream>
 
diff --git a/src/unittests/base/StringTests.cpp b/src/unittests/base/StringTests.cpp
index 7fb33738e..107202834 100644
--- a/src/unittests/base/StringTests.cpp
+++ b/src/unittests/base/StringTests.cpp
@@ -7,7 +7,7 @@
 
 #include "StringTests.h"
 
-#include "../../lib/base/String.h"
+#include "base/String.h"
 
 #include <string.h>
 
diff --git a/src/unittests/base/UnicodeTests.cpp b/src/unittests/base/UnicodeTests.cpp
index cfaea4015..41a4a1af0 100644
--- a/src/unittests/base/UnicodeTests.cpp
+++ b/src/unittests/base/UnicodeTests.cpp
@@ -7,9 +7,8 @@
 
 #include "UnicodeTests.h"
 
-#include "../../lib/base/Unicode.h"
-
 #include "arch/IArchString.h"
+#include "base/Unicode.h"
 
 void UnicodeTests::initTestCase()
 {
diff --git a/src/unittests/base/XBaseTests.cpp b/src/unittests/base/XBaseTests.cpp
index 1bc7da6a7..fa7436583 100644
--- a/src/unittests/base/XBaseTests.cpp
+++ b/src/unittests/base/XBaseTests.cpp
@@ -7,7 +7,7 @@
 
 #include "XBaseTests.h"
 
-#include "../../lib/base/XBase.h"
+#include "base/XBase.h"
 
 void XBaseTests::empty()
 {
diff --git a/src/unittests/common/SettingsTests.h b/src/unittests/common/SettingsTests.h
index 15c5a3aca..50d00a0cf 100644
--- a/src/unittests/common/SettingsTests.h
+++ b/src/unittests/common/SettingsTests.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "../../lib/common/Settings.h"
+#include "common/Settings.h"
 
 #include <QTest>
 
diff --git a/src/unittests/deskflow/ArgParserTests.cpp b/src/unittests/deskflow/ArgParserTests.cpp
index a97ff5857..96e150da3 100644
--- a/src/unittests/deskflow/ArgParserTests.cpp
+++ b/src/unittests/deskflow/ArgParserTests.cpp
@@ -7,9 +7,9 @@
 
 #include "ArgParserTests.h"
 
-#include "../../lib/deskflow/ArgsBase.h"
-#include "../../lib/deskflow/ClientArgs.h"
-#include "../../lib/deskflow/ServerArgs.h"
+#include "deskflow/ArgsBase.h"
+#include "deskflow/ClientArgs.h"
+#include "deskflow/ServerArgs.h"
 
 // This file is generated at build time
 #include <common/Constants.h>
diff --git a/src/unittests/deskflow/ArgParserTests.h b/src/unittests/deskflow/ArgParserTests.h
index 69c2544a0..975a4bbe7 100644
--- a/src/unittests/deskflow/ArgParserTests.h
+++ b/src/unittests/deskflow/ArgParserTests.h
@@ -4,9 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "../../lib/deskflow/ArgParser.h"
-
 #include "base/Log.h"
+#include "deskflow/ArgParser.h"
 
 #include <QTest>
 
diff --git a/src/unittests/deskflow/ClipboardChunksTests.cpp b/src/unittests/deskflow/ClipboardChunksTests.cpp
index dc7218c33..212ca62de 100644
--- a/src/unittests/deskflow/ClipboardChunksTests.cpp
+++ b/src/unittests/deskflow/ClipboardChunksTests.cpp
@@ -7,8 +7,7 @@
 
 #include "ClipboardChunksTests.h"
 
-#include "../../lib/deskflow/ClipboardChunk.h"
-
+#include "deskflow/ClipboardChunk.h"
 #include "deskflow/ProtocolTypes.h"
 
 void ClipboardChunksTests::startFormatData()
diff --git a/src/unittests/deskflow/ClipboardTests.cpp b/src/unittests/deskflow/ClipboardTests.cpp
index e6859bc10..0aacf04a2 100644
--- a/src/unittests/deskflow/ClipboardTests.cpp
+++ b/src/unittests/deskflow/ClipboardTests.cpp
@@ -8,7 +8,7 @@
 
 #include "ClipboardTests.h"
 
-#include "../../lib/deskflow/Clipboard.h"
+#include "deskflow/Clipboard.h"
 
 void ClipboardTests::initTestCase()
 {
diff --git a/src/unittests/deskflow/ConfigTests.cpp b/src/unittests/deskflow/ConfigTests.cpp
index d32e94864..1dd01d112 100644
--- a/src/unittests/deskflow/ConfigTests.cpp
+++ b/src/unittests/deskflow/ConfigTests.cpp
@@ -7,7 +7,7 @@
 
 #include "ConfigTests.h"
 
-#include "../../lib/deskflow/Config.h"
+#include "deskflow/Config.h"
 
 using namespace deskflow;
 const auto kTestFilename = "tmp/test/test.toml";
diff --git a/src/unittests/deskflow/IKeyStateTests.cpp b/src/unittests/deskflow/IKeyStateTests.cpp
index 2caa6b22c..d9a3e160d 100644
--- a/src/unittests/deskflow/IKeyStateTests.cpp
+++ b/src/unittests/deskflow/IKeyStateTests.cpp
@@ -7,7 +7,7 @@
 
 #include "IKeyStateTests.h"
 
-#include "../../lib/deskflow/IKeyState.h"
+#include "deskflow/IKeyState.h"
 
 void IKeyStateTests::allocDestination()
 {
diff --git a/src/unittests/deskflow/KeyMapTests.cpp b/src/unittests/deskflow/KeyMapTests.cpp
index 6062828fc..3378d1704 100644
--- a/src/unittests/deskflow/KeyMapTests.cpp
+++ b/src/unittests/deskflow/KeyMapTests.cpp
@@ -6,7 +6,7 @@
  */
 #include "KeyMapTests.h"
 
-#include "../../lib/deskflow/KeyMap.h"
+#include "deskflow/KeyMap.h"
 
 using namespace deskflow;
 using KeyItemList = KeyMap::KeyItemList;
diff --git a/src/unittests/deskflow/LanguageManagerTests.cpp b/src/unittests/deskflow/LanguageManagerTests.cpp
index 4a805a2ad..43e930533 100644
--- a/src/unittests/deskflow/LanguageManagerTests.cpp
+++ b/src/unittests/deskflow/LanguageManagerTests.cpp
@@ -7,7 +7,7 @@
 
 #include "LanguageManagerTests.h"
 
-#include "../../lib/deskflow/languages/LanguageManager.h"
+#include "deskflow/languages/LanguageManager.h"
 
 void LanguageManagerTests::initTestCase()
 {
diff --git a/src/unittests/deskflow/X11LayoutParserTests.cpp b/src/unittests/deskflow/X11LayoutParserTests.cpp
index cc66087a6..abf7f34c3 100644
--- a/src/unittests/deskflow/X11LayoutParserTests.cpp
+++ b/src/unittests/deskflow/X11LayoutParserTests.cpp
@@ -7,7 +7,7 @@
 
 #include "X11LayoutParserTests.h"
 
-#include "../../lib/deskflow/unix/X11LayoutsParser.h"
+#include "deskflow/unix/X11LayoutsParser.h"
 
 void X11LayoutParserTests::initTestCase()
 {
diff --git a/src/unittests/gui/DotEnvTests.cpp b/src/unittests/gui/DotEnvTests.cpp
index bd2ef64ef..dd0219117 100644
--- a/src/unittests/gui/DotEnvTests.cpp
+++ b/src/unittests/gui/DotEnvTests.cpp
@@ -7,7 +7,7 @@
 
 #include "DotEnvTests.h"
 
-#include "../../lib/gui/DotEnv.h"
+#include "gui/DotEnv.h"
 
 void DotEnvTests::initTestCase()
 {
diff --git a/src/unittests/gui/LoggerTests.cpp b/src/unittests/gui/LoggerTests.cpp
index 674149d1e..bd735555a 100644
--- a/src/unittests/gui/LoggerTests.cpp
+++ b/src/unittests/gui/LoggerTests.cpp
@@ -7,7 +7,7 @@
 
 #include "LoggerTests.h"
 
-#include "../../lib/gui/Logger.h"
+#include "gui/Logger.h"
 
 #include <QSignalSpy>
 
diff --git a/src/unittests/gui/config/ScreenTests.cpp b/src/unittests/gui/config/ScreenTests.cpp
index 3f1115429..66d3b1e87 100644
--- a/src/unittests/gui/config/ScreenTests.cpp
+++ b/src/unittests/gui/config/ScreenTests.cpp
@@ -7,8 +7,8 @@
 
 #include "ScreenTests.h"
 
-#include "../../../lib/common/Settings.h"
-#include "../../../lib/gui/config/Screen.h"
+#include "common/Settings.h"
+#include "gui/config/Screen.h"
 
 void ScreenTests::initTestCase()
 {
diff --git a/src/unittests/gui/core/CommandProcessTests.cpp b/src/unittests/gui/core/CommandProcessTests.cpp
index 3c6dc5bfd..2e8a7d852 100644
--- a/src/unittests/gui/core/CommandProcessTests.cpp
+++ b/src/unittests/gui/core/CommandProcessTests.cpp
@@ -7,7 +7,7 @@
 
 #include "CommandProcessTests.h"
 
-#include "../../../lib/gui/core/CommandProcess.h"
+#include "gui/core/CommandProcess.h"
 
 void CommandProcessTests::runCommand()
 {
diff --git a/src/unittests/net/FingerprintDatabaseTests.cpp b/src/unittests/net/FingerprintDatabaseTests.cpp
index 4e5be2448..7506581f1 100644
--- a/src/unittests/net/FingerprintDatabaseTests.cpp
+++ b/src/unittests/net/FingerprintDatabaseTests.cpp
@@ -7,8 +7,8 @@
 
 #include "FingerprintDatabaseTests.h"
 
-#include "../../lib/net/FingerprintData.h"
-#include "../../lib/net/FingerprintDatabase.h"
+#include "net/FingerprintData.h"
+#include "net/FingerprintDatabase.h"
 
 #include <sstream>
 
diff --git a/src/unittests/net/SecureUtilsTests.cpp b/src/unittests/net/SecureUtilsTests.cpp
index 223d8625b..cc6fce2a6 100644
--- a/src/unittests/net/SecureUtilsTests.cpp
+++ b/src/unittests/net/SecureUtilsTests.cpp
@@ -7,7 +7,7 @@
 
 #include "SecureUtilsTests.h"
 
-#include "../../lib/net/SecureUtils.h"
+#include "net/SecureUtils.h"
 
 using namespace deskflow;
 
diff --git a/src/unittests/platform/MSWindowsClipboardTests.cpp b/src/unittests/platform/MSWindowsClipboardTests.cpp
index ad685b963..c9c03b35d 100644
--- a/src/unittests/platform/MSWindowsClipboardTests.cpp
+++ b/src/unittests/platform/MSWindowsClipboardTests.cpp
@@ -8,7 +8,7 @@
 
 #include "MSWindowsClipboardTests.h"
 
-#include "../../lib/platform/MSWindowsClipboard.h"
+#include "platform/MSWindowsClipboard.h"
 
 void MSWindowsClipboardTests::initTestCase()
 {
diff --git a/src/unittests/platform/OSXClipboardTests.cpp b/src/unittests/platform/OSXClipboardTests.cpp
index 18b88f7e6..6aefad7d0 100644
--- a/src/unittests/platform/OSXClipboardTests.cpp
+++ b/src/unittests/platform/OSXClipboardTests.cpp
@@ -8,8 +8,7 @@
 
 #include "OSXClipboardTests.h"
 
-#include "../../lib/platform/OSXClipboard.h"
-
+#include "platform/OSXClipboard.h"
 #include "platform/OSXClipboardUTF8Converter.h"
 
 void OSXClipboardTests::open()
diff --git a/src/unittests/platform/OSXKeyStateTests.h b/src/unittests/platform/OSXKeyStateTests.h
index 53efacdb6..acdda8e80 100644
--- a/src/unittests/platform/OSXKeyStateTests.h
+++ b/src/unittests/platform/OSXKeyStateTests.h
@@ -5,7 +5,7 @@
  */
 #include "base/Log.h"
 
-#include "../../lib/platform/OSXKeyState.h"
+#include "platform/OSXKeyState.h"
 
 #include <QTest>
 
diff --git a/src/unittests/platform/XWindowsClipboardTests.cpp b/src/unittests/platform/XWindowsClipboardTests.cpp
index 32f13e40c..9d828c663 100644
--- a/src/unittests/platform/XWindowsClipboardTests.cpp
+++ b/src/unittests/platform/XWindowsClipboardTests.cpp
@@ -8,7 +8,7 @@
 
 #include "XWindowsClipboardTests.h"
 
-#include "../../lib/platform/XWindowsClipboard.h"
+#include "platform/XWindowsClipboard.h"
 
 class TestXWindowsClipboard : public XWindowsClipboard
 {
diff --git a/src/unittests/platform/XWindowsClipboardTests.h b/src/unittests/platform/XWindowsClipboardTests.h
index 7450c28e3..483c76632 100644
--- a/src/unittests/platform/XWindowsClipboardTests.h
+++ b/src/unittests/platform/XWindowsClipboardTests.h
@@ -7,7 +7,7 @@
 #include "base/Log.h"
 
 #if !WINAPI_LIBEI && !WINAPI_PORTAL
-#include "../../lib/platform/XWindowsClipboard.h"
+#include "platform/XWindowsClipboard.h"
 #endif
 
 #include <QTest>
diff --git a/src/unittests/server/ServerConfigTests.cpp b/src/unittests/server/ServerConfigTests.cpp
index ec53d463d..110090fc8 100644
--- a/src/unittests/server/ServerConfigTests.cpp
+++ b/src/unittests/server/ServerConfigTests.cpp
@@ -7,7 +7,7 @@
 
 #include "ServerConfigTests.h"
 
-#include "../../lib/server/Config.h"
+#include "server/Config.h"
 
 class OnlySystemFilter : public InputFilter::Condition
 {
diff --git a/src/unittests/server/ServerTests.cpp b/src/unittests/server/ServerTests.cpp
index cf46ca0dc..9076865cc 100644
--- a/src/unittests/server/ServerTests.cpp
+++ b/src/unittests/server/ServerTests.cpp
@@ -7,7 +7,7 @@
 
 #include "ServerTests.h"
 
-#include "../../lib/server/Server.h"
+#include "server/Server.h"
 
 void ServerTests::SwitchToScreenInfo_alloc_screen()
 {