diff --git a/apps/add_two_ints_service/app.c b/apps/add_two_ints_service/app.c
index 64b75b71..8f0d0f86 100644
--- a/apps/add_two_ints_service/app.c
+++ b/apps/add_two_ints_service/app.c
@@ -6,7 +6,7 @@
 #include <std_msgs/msg/int32.h>
 #include "example_interfaces/srv/add_two_ints.h"
 
-#include <rmw_uros/options.h>
+#include <rmw_microros/rmw_microros.h>
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/apps/crazyflie_demo/app.c b/apps/crazyflie_demo/app.c
index 5b8b293e..9393e1ba 100644
--- a/apps/crazyflie_demo/app.c
+++ b/apps/crazyflie_demo/app.c
@@ -9,7 +9,7 @@
 #include <geometry_msgs/msg/point32.h>
 
 #include <rcutils/allocator.h>
-#include <rmw_uros/options.h>
+#include <rmw_microros/rmw_microros.h>
 
 #include "config.h"
 #include "log.h"
@@ -356,4 +356,4 @@ void microros_secondary(void * params){
     }
 
     vTaskSuspend( NULL );
-}
\ No newline at end of file
+}
diff --git a/apps/crazyflie_position_publisher/app.c b/apps/crazyflie_position_publisher/app.c
index 9c7656eb..48add27d 100644
--- a/apps/crazyflie_position_publisher/app.c
+++ b/apps/crazyflie_position_publisher/app.c
@@ -7,7 +7,7 @@
 #include <geometry_msgs/msg/point32.h>
 
 #include <rcutils/allocator.h>
-#include <rmw_uros/options.h>
+#include <rmw_microros/rmw_microros.h>
 
 #include "config.h"
 #include "log.h"
@@ -125,4 +125,4 @@ void appMain(){
 	RCCHECK(rcl_node_fini(&node))
 
     vTaskSuspend( NULL );
-}
\ No newline at end of file
+}
diff --git a/microros_esp32_extensions/main/main.c b/microros_esp32_extensions/main/main.c
index f062b715..830c3e32 100644
--- a/microros_esp32_extensions/main/main.c
+++ b/microros_esp32_extensions/main/main.c
@@ -18,7 +18,7 @@
 #include "lwip/err.h"
 #include "lwip/sys.h"
 
-#include <rmw_uros/options.h>  
+#include <rmw_microros/rmw_microros.h>  
 #include <microros_transports.h>
 
 #define ESP_WIFI_SSID      CONFIG_ESP_WIFI_SSID
diff --git a/microros_nucleo_f446re_extensions/Core/Src/freertos.c b/microros_nucleo_f446re_extensions/Core/Src/freertos.c
index ac31df6a..b389d81e 100644
--- a/microros_nucleo_f446re_extensions/Core/Src/freertos.c
+++ b/microros_nucleo_f446re_extensions/Core/Src/freertos.c
@@ -36,7 +36,8 @@
 #include <ucdr/microcdr.h>
 #include <uxr/client/client.h>
 
-#include <rmw_uros/options.h> 
+#include <rmw_microros/rmw_microros.h> 
+
 #include <microros_transports.h> 
 
 /* USER CODE END Includes */
diff --git a/microros_nucleo_f446ze_extensions/Src/main.c b/microros_nucleo_f446ze_extensions/Src/main.c
index a6d9daf9..134fa92c 100644
--- a/microros_nucleo_f446ze_extensions/Src/main.c
+++ b/microros_nucleo_f446ze_extensions/Src/main.c
@@ -31,7 +31,8 @@
 #include <ucdr/microcdr.h>
 #include <uxr/client/client.h>
 
-#include <rmw_uros/options.h>  
+#include <rmw_microros/rmw_microros.h>  
+
 #include <microros_transports.h>  
 
 #include "FreeRTOS.h"
diff --git a/microros_nucleo_f746zg_extensions/Src/main.c b/microros_nucleo_f746zg_extensions/Src/main.c
index fdd8ed71..b33ba7ad 100644
--- a/microros_nucleo_f746zg_extensions/Src/main.c
+++ b/microros_nucleo_f746zg_extensions/Src/main.c
@@ -33,7 +33,8 @@
 #include <uxr/client/client.h>
 #include <ucdr/microcdr.h>
 
-#include <rmw_uros/options.h> 
+#include <rmw_microros/rmw_microros.h> 
+
 #include <microros_transports.h> 
  
 #include <sys/socket.h>
diff --git a/microros_nucleo_f767zi_extensions/Src/main.c b/microros_nucleo_f767zi_extensions/Src/main.c
index 88a354e7..17319115 100644
--- a/microros_nucleo_f767zi_extensions/Src/main.c
+++ b/microros_nucleo_f767zi_extensions/Src/main.c
@@ -33,7 +33,8 @@
 #include <uxr/client/client.h>
 #include <ucdr/microcdr.h>
 
-#include <rmw_uros/options.h> 
+#include <rmw_microros/rmw_microros.h> 
+
 #include <microros_transports.h> 
 
 #include <sys/socket.h>
diff --git a/microros_olimex_e407_extensions/Src/main.c b/microros_olimex_e407_extensions/Src/main.c
index 9d353192..9065c669 100644
--- a/microros_olimex_e407_extensions/Src/main.c
+++ b/microros_olimex_e407_extensions/Src/main.c
@@ -32,7 +32,8 @@
 #include <uxr/client/client.h>
 #include <ucdr/microcdr.h>
 
-#include <rmw_uros/options.h>
+#include <rmw_microros/rmw_microros.h>
+
 #include <microros_transports.h>
 
 #include <sys/socket.h>