diff --git a/Makefile b/Makefile
index e71960d..2e21a83 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ run:
 wm: $(TARGET_NAME)
 	DISPLAY=:3 $(TARGET)
 
+debug: $(TARGET_NAME)
+	DISPLAY=:3 valgrind $(TARGET)
+
 prepare:
 	@cmake -S $(SRC_DIR) -B $(BUILD_DIR)
 	@cp $(BUILD_DIR)/compile_commands.json $(MAKEFILE_DIR)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 523a18c..4b94df3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,8 +20,6 @@ add_executable(${APP_NAME} main.c utils.c config.c)
 # use C17
 set_property(TARGET ${APP_NAME} PROPERTY C_STANDARD 17)
 
-target_include_directories(${APP_NAME} PRIVATE "${SOURCE_DIR}/include")
-
 find_package(PkgConfig REQUIRED)
 
 pkg_check_modules(GLIB REQUIRED glib-2.0)
@@ -37,21 +35,23 @@ pkg_check_modules(XCB REQUIRED
     xcb-xrm
 )
 
-target_include_directories(${APP_NAME} SYSTEM PUBLIC
-    ${GLIB_INCLUDE_DIRS}
-    ${XCB_INCLUDE_DIRS}
-)
-
 add_subdirectory(xcb)
 
-target_link_libraries(${APP_NAME}
-    ${GLIB_LIBRARIES}
-    ${LIB_XCB_NAME}
-)
-
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/app.h.in"
     "${CMAKE_BINARY_DIR}/app.h"
     @ONLY
 )
-target_include_directories(${APP_NAME} PRIVATE ${CMAKE_BINARY_DIR})
+
+target_include_directories(${APP_NAME} SYSTEM
+    PRIVATE ${GLIB_INCLUDE_DIRS}
+)
+target_include_directories(${APP_NAME}
+    PRIVATE "${SOURCE_DIR}/include"
+    PRIVATE ${CMAKE_BINARY_DIR}
+)
+
+target_link_libraries(${APP_NAME}
+    PRIVATE ${GLIB_LIBRARIES}
+    PRIVATE ${LIB_XCB_NAME}
+)
diff --git a/src/xcb/CMakeLists.txt b/src/xcb/CMakeLists.txt
index da83114..415cb0f 100644
--- a/src/xcb/CMakeLists.txt
+++ b/src/xcb/CMakeLists.txt
@@ -3,10 +3,14 @@ set(LIB_XCB_NAME ${LIB_XCB} PARENT_SCOPE)
 
 add_library(${LIB_XCB} STATIC xcb.c window.c)
 
-target_include_directories(${LIB_XCB} SYSTEM PUBLIC ${XCB_INCLUDE_DIRS})
-target_include_directories(${LIB_XCB} PUBLIC
-    "${CMAKE_SOURCE_DIR}/include"
-    "${CMAKE_BINARY_DIR}"
+target_include_directories(${LIB_XCB} SYSTEM
+    PRIVATE ${XCB_INCLUDE_DIRS}
+)
+target_include_directories(${LIB_XCB}
+    PRIVATE "${CMAKE_SOURCE_DIR}/include"
+    PRIVATE "${CMAKE_BINARY_DIR}"
 )
 
-target_link_libraries(${LIB_XCB} ${XCB_LIBRARIES})
+target_link_libraries(${LIB_XCB}
+    PRIVATE ${XCB_LIBRARIES}
+)