diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9003c81..8d30a81 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI micro-ROS Agent
 
 on:
     pull_request:
-      branches: 
+      branches:
         - '**'
 
 jobs:
@@ -22,9 +22,9 @@ jobs:
             cd /uros_ws
             . /opt/ros/$ROS_DISTRO/setup.sh
             . install/local_setup.sh
-            rosdep update
-            ros2 run micro_ros_setup create_agent_ws.sh 
-        
+            rosdep update --rosdistro=$ROS_DISTRO
+            ros2 run micro_ros_setup create_agent_ws.sh
+
         - name: Patch branch
           run: |
             rm -rf /uros_ws/src/uros/micro-ROS-Agent/*
@@ -35,4 +35,4 @@ jobs:
             cd /uros_ws
             . /opt/ros/$ROS_DISTRO/setup.sh
             . install/local_setup.sh
-            ros2 run micro_ros_setup build_agent.sh 
\ No newline at end of file
+            ros2 run micro_ros_setup build_agent.sh
\ No newline at end of file
diff --git a/micro_ros_agent/include/agent/Agent.hpp b/micro_ros_agent/include/agent/Agent.hpp
index f5f22f3..92e4153 100644
--- a/micro_ros_agent/include/agent/Agent.hpp
+++ b/micro_ros_agent/include/agent/Agent.hpp
@@ -20,6 +20,10 @@
 #include <uxr/agent/middleware/utils/Callbacks.hpp>
 
 #include <agent/graph_manager/graph_manager.hpp>
+
+#include <map>
+#include <memory>
+
 // TODO(jamoralp): class Documentation
 namespace uros {
 namespace agent {
diff --git a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp
index 95a43e4..7ea044f 100644
--- a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp
+++ b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp
@@ -62,6 +62,9 @@
 #include <agent/utils/demangle.hpp>
 
 #include <condition_variable>
+#include <string>
+#include <memory>
+#include <map>
 
 namespace uros {
 namespace agent {
diff --git a/micro_ros_agent/src/agent/Agent.cpp b/micro_ros_agent/src/agent/Agent.cpp
index 87ef3cf..2a35e9b 100644
--- a/micro_ros_agent/src/agent/Agent.cpp
+++ b/micro_ros_agent/src/agent/Agent.cpp
@@ -17,6 +17,9 @@
 
 #include <agent/Agent.hpp>
 
+#include <utility>
+#include <memory>
+
 namespace uros {
 namespace agent {
 
diff --git a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp
index 7bf58ee..a05b3a7 100644
--- a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp
+++ b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp
@@ -17,6 +17,11 @@
 
 #include <agent/graph_manager/graph_manager.hpp>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace uros {
 namespace agent {
 namespace graph_manager {
diff --git a/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp b/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp
index 0f5d016..4f841ea 100644
--- a/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp
+++ b/micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp
@@ -17,6 +17,8 @@
 
 #include <agent/graph_manager/graph_typesupport.hpp>
 
+#include <string>
+
 namespace uros {
 namespace agent {
 namespace graph_manager {
diff --git a/micro_ros_agent/src/main.cpp b/micro_ros_agent/src/main.cpp
index d5b29bf..f397a74 100644
--- a/micro_ros_agent/src/main.cpp
+++ b/micro_ros_agent/src/main.cpp
@@ -14,6 +14,9 @@
 
 #include <agent/Agent.hpp>
 
+#include <string>
+#include <vector>
+
 int main(int argc, char** argv)
 {
     uros::agent::Agent micro_ros_agent;