diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fa4b89067..ae3ca2c00 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,8 +3,6 @@
 # SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib")
-
 add_subdirectory(lib)
 add_subdirectory(apps)
 
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index 3b389a5b8..431f70c50 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -26,3 +26,9 @@ add_library(common STATIC
 )
 
 target_link_libraries(common PUBLIC Qt6::Core)
+
+target_include_directories(common
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/lib>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src/lib>
+)