diff --git a/rcl/src/rcl/init_options_impl.h b/rcl/src/rcl/init_options_impl.h
index e03a8e88a8..b1d4401e2c 100644
--- a/rcl/src/rcl/init_options_impl.h
+++ b/rcl/src/rcl/init_options_impl.h
@@ -17,7 +17,7 @@
 
 #include "rcl/init_options.h"
 
-#include "rmw/init.h"
+#include "rmw/init_options.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
index 5522c790ff..e57398d940 100644
--- a/rcl/src/rcl/node.c
+++ b/rcl/src/rcl/node.c
@@ -42,7 +42,7 @@ extern "C"
 #include "rcutils/snprintf.h"
 #include "rcutils/strdup.h"
 #include "rmw/error_handling.h"
-#include "rmw/node_security_options.h"
+#include "rmw/security_options.h"
 #include "rmw/rmw.h"
 #include "rmw/validate_namespace.h"
 #include "rmw/validate_node_name.h"
@@ -308,8 +308,8 @@ rcl_node_init(
     goto fail;
   }
 
-  rmw_node_security_options_t node_security_options =
-    rmw_get_zero_initialized_node_security_options();
+  rmw_security_options_t node_security_options =
+    rmw_get_zero_initialized_security_options();
   node_security_options.enforce_security = (0 == strcmp(ros_enforce_security, "Enforce")) ?
     RMW_SECURITY_ENFORCEMENT_ENFORCE : RMW_SECURITY_ENFORCEMENT_PERMISSIVE;