diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index f9513ef1ee7006509cce0faaca8d6212b32801d9..f02029c188cb916c1233669cee395953c4a02654 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -6,26 +6,8 @@
         "limitSymbolsToIncludedHeaders": false
       },
       "includePath": [
-        "/home/matteo/ccf_sim_workspace/devel/include/**",
         "/opt/ros/noetic/include/**",
-        "/home/matteo/ccf_sim_workspace/src/BehaviorTree.CPP/include/**",
-        "/home/matteo/ccf_sim_workspace/src/ccf/include/**",
-        "/home/matteo/ccf_sim_workspace/src/ccf_immersive_sorting/include/**",
-        "/home/matteo/ccf_sim_workspace/src/gazebo_pkgs/gazebo_grasp_plugin/include/**",
-        "/home/matteo/ccf_sim_workspace/src/gazebo_pkgs/gazebo_state_plugins/include/**",
-        "/home/matteo/ccf_sim_workspace/src/gazebo_pkgs/gazebo_test_tools/include/**",
-        "/home/matteo/ccf_sim_workspace/src/gazebo_pkgs/gazebo_version_helpers/include/**",
-        "/home/matteo/ccf_sim_workspace/src/gazebo_pkgs/gazebo_world_plugin_loader/include/**",
-        "/home/matteo/ccf_sim_workspace/src/gb-grasp-auerswald/include/**",
-        "/home/matteo/ccf_sim_workspace/src/moveit-grasps-reduced/include/**",
-        "/home/matteo/ccf_sim_workspace/src/moveit_task_constructor/core/include/**",
-        "/home/matteo/ccf_sim_workspace/src/moveit_task_constructor/demo/include/**",
-        "/home/matteo/ccf_sim_workspace/src/multi_cell_builder/include/**",
-        "/home/matteo/ccf_sim_workspace/src/general_message_packages/object_msgs_tools/include/**",
-        "/home/matteo/ccf_sim_workspace/src/panda_grasping/include/**",
-        "/home/matteo/ccf_sim_workspace/src/panda_util/include/**",
-        "/home/matteo/ccf_sim_workspace/src/moveit_task_constructor/rviz_marker_tools/include/**",
-        "/home/matteo/ccf_sim_workspace/src/simulation_util/include/**",
+        "/home/matteo/ccf_sim_workspace/**",
         "/usr/include/**"
       ],
       "name": "ROS",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3b5e761a83812a653f8ddec23279ee9bf2f6671f..8cd90b9b69d6c912c29e3759fd26beb95341d691 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -80,5 +80,6 @@
     "python.analysis.extraPaths": [
         "/home/matteo/ccf_sim_workspace/devel/lib/python3/dist-packages",
         "/opt/ros/noetic/lib/python3/dist-packages"
-    ]
+    ],
+    "ros.distro": "noetic"
 }
\ No newline at end of file