diff --git a/lib/agent/CMakeLists.txt b/lib/agent/CMakeLists.txt
index 5927d8d..cf83e37 100644
--- a/lib/agent/CMakeLists.txt
+++ b/lib/agent/CMakeLists.txt
@@ -1,7 +1,13 @@
+set(LIB_INCLUDE_DIR ${ROSA_MAIN_INCLUDE_DIR}/rosa/agent)
+
 add_library(ROSAAgent
+  ${LIB_INCLUDE_DIR}/Module.h
   Module.cpp
+  ${LIB_INCLUDE_DIR}/Abstraction.hpp
   Abstraction.cpp
+  ${LIB_INCLUDE_DIR}/History.hpp
   History.cpp
+  ${LIB_INCLUDE_DIR}/Confidence.hpp
   Confidence.cpp
   )
 
diff --git a/lib/config/CMakeLists.txt b/lib/config/CMakeLists.txt
index 3e83c4b..eb85058 100644
--- a/lib/config/CMakeLists.txt
+++ b/lib/config/CMakeLists.txt
@@ -1,7 +1,15 @@
+set(LIB_INCLUDE_DIR ${ROSA_MAIN_INCLUDE_DIR}/rosa/config)
+set(LIB_GEN_INCLUDE_DIR ${ROSA_INCLUDE_DIR}/rosa/config)
+
 add_library(ROSAConfig
+  ${LIB_GEN_INCLUDE_DIR}/rosa_config.h
+  ${LIB_INCLUDE_DIR}/namespaces.h
   namespaces.cpp
+  ${LIB_INCLUDE_DIR}/project_path.hpp
   project_path.cpp
+  ${LIB_INCLUDE_DIR}/config.h
   config.cpp
+  ${LIB_INCLUDE_DIR}/version.h
   version.cpp
   )
 
diff --git a/lib/core/CMakeLists.txt b/lib/core/CMakeLists.txt
index edad57f..0bf9858 100644
--- a/lib/core/CMakeLists.txt
+++ b/lib/core/CMakeLists.txt
@@ -1,18 +1,34 @@
+set(LIB_INCLUDE_DIR ${ROSA_MAIN_INCLUDE_DIR}/rosa/core)
+
 add_library(ROSACore
+  ${LIB_INCLUDE_DIR}/forward_declarations.h
+  ${LIB_INCLUDE_DIR}/Unit.h
   Unit.cpp
+  ${LIB_INCLUDE_DIR}/System.hpp
   System.cpp
+  ${LIB_INCLUDE_DIR}/SystemBase.hpp
   SystemBase.cpp
+  SystemImpl.hpp
   SystemImpl.cpp
+  ${LIB_INCLUDE_DIR}/Message.hpp
   Message.cpp
+  ${LIB_INCLUDE_DIR}/MessageMatcher.hpp
   MessageMatcher.cpp
+  ${LIB_INCLUDE_DIR}/Invoker.hpp
   Invoker.cpp
+  ${LIB_INCLUDE_DIR}/MessageHandler.hpp
   MessageHandler.cpp
+  ${LIB_INCLUDE_DIR}/AbstractAgent.hpp
   AbstractAgent.cpp
+  ${LIB_INCLUDE_DIR}/Agent.hpp
   Agent.cpp
+  ${LIB_INCLUDE_DIR}/AgentHandle.hpp
   AgentHandle.cpp
+  ${LIB_INCLUDE_DIR}/MessagingSystem.hpp
   MessagingSystem.cpp
+  MessagingSystemImpl.hpp
   MessagingSystemImpl.cpp
   )
 
 ROSA_add_library_dependencies(ROSACore ROSASupport)
 
diff --git a/lib/support/CMakeLists.txt b/lib/support/CMakeLists.txt
index ee43733..113d2ab 100644
--- a/lib/support/CMakeLists.txt
+++ b/lib/support/CMakeLists.txt
@@ -1,15 +1,29 @@
+set(LIB_INCLUDE_DIR ${ROSA_MAIN_INCLUDE_DIR}/rosa/support)
+
 add_library(ROSASupport
+  ${LIB_INCLUDE_DIR}/debug.hpp
   debug.cpp
+  ${LIB_INCLUDE_DIR}/terminal_colors.h
   terminal_colors.cpp
+  ${LIB_INCLUDE_DIR}/log.h
   log.cpp
+  ${LIB_INCLUDE_DIR}/math.hpp
   math.cpp
+  ${LIB_INCLUDE_DIR}/type_helper.hpp
   type_helper.cpp
+  ${LIB_INCLUDE_DIR}/types.hpp
   types.cpp
+  ${LIB_INCLUDE_DIR}/atom.hpp
   atom.cpp
+  ${LIB_INCLUDE_DIR}/type_pair.hpp
   type_pair.cpp
+  ${LIB_INCLUDE_DIR}/type_list.hpp
   type_list.cpp
+  ${LIB_INCLUDE_DIR}/squashed_int.hpp
   squashed_int.cpp
+  ${LIB_INCLUDE_DIR}/type_numbers.hpp
   type_numbers.cpp
+  ${LIB_INCLUDE_DIR}/type_token.hpp
   type_token.cpp
   )