diff --git a/src/remote_ctrl/CMakeLists.txt b/src/remote_ctrl/CMakeLists.txt
index a56b672..f44afb0 100644
--- a/src/remote_ctrl/CMakeLists.txt
+++ b/src/remote_ctrl/CMakeLists.txt
@@ -11,11 +11,6 @@ find_package(rclcpp REQUIRED)
 find_package(sweeper_interfaces REQUIRED)
 find_package(ament_index_cpp REQUIRED)
 
-# ======== include headers ========
-include_directories(
-  include
-)
-
 # ======== MQTT libs ========
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
   message(STATUS "[MQTT] using x86 static Paho")
@@ -35,10 +30,20 @@ add_executable(remote_ctrl_node
   src/config.cpp
 )
 
+target_include_directories(remote_ctrl_node
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
 target_link_libraries(remote_ctrl_node
   ${PAHO_LIB}
 )
 
+target_include_directories(remote_ctrl_node
+  SYSTEM PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/paho_mqtt_3c
+)
+
 ament_target_dependencies(remote_ctrl_node
   rclcpp
   sweeper_interfaces