diff --git a/rcl/src/rcl/domain_id.c b/rcl/src/rcl/domain_id.c
index 6435e6618..b3d08a6fb 100644
--- a/rcl/src/rcl/domain_id.c
+++ b/rcl/src/rcl/domain_id.c
@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "rcutils/get_env.h"
+#include "rcutils/env.h"
 
 #include "rcl/error_handling.h"
 #include "rcl/types.h"
diff --git a/rcl/src/rcl/localhost.c b/rcl/src/rcl/localhost.c
index 7730b56cf..74adf3e68 100644
--- a/rcl/src/rcl/localhost.c
+++ b/rcl/src/rcl/localhost.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "rcutils/get_env.h"
+#include "rcutils/env.h"
 
 #include "rcl/error_handling.h"
 #include "rcl/types.h"
diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
index fe8a947fb..98761ce0c 100644
--- a/rcl/src/rcl/node.c
+++ b/rcl/src/rcl/node.c
@@ -37,7 +37,6 @@ extern "C"
 #include "rcutils/filesystem.h"
 #include "rcutils/find.h"
 #include "rcutils/format_string.h"
-#include "rcutils/get_env.h"
 #include "rcutils/logging_macros.h"
 #include "rcutils/macros.h"
 #include "rcutils/repl_str.h"
diff --git a/rcl/src/rcl/rmw_implementation_identifier_check.c b/rcl/src/rcl/rmw_implementation_identifier_check.c
index cc2414418..235e3a4fb 100644
--- a/rcl/src/rcl/rmw_implementation_identifier_check.c
+++ b/rcl/src/rcl/rmw_implementation_identifier_check.c
@@ -23,7 +23,7 @@ extern "C"
 
 #include "rcl/allocator.h"
 #include "rcl/error_handling.h"
-#include "rcutils/get_env.h"
+#include "rcutils/env.h"
 #include "rcutils/logging_macros.h"
 #include "rcutils/strdup.h"
 #include "rmw/rmw.h"
diff --git a/rcl/src/rcl/security.c b/rcl/src/rcl/security.c
index bc688398d..256a345b2 100644
--- a/rcl/src/rcl/security.c
+++ b/rcl/src/rcl/security.c
@@ -18,9 +18,9 @@
 
 #include "rcl/error_handling.h"
 
-#include "rcutils/logging_macros.h"
+#include "rcutils/env.h"
 #include "rcutils/filesystem.h"
-#include "rcutils/get_env.h"
+#include "rcutils/logging_macros.h"
 #include "rcutils/strdup.h"
 
 #include "rmw/security_options.h"
diff --git a/rcl/test/rcl/test_security.cpp b/rcl/test/rcl/test_security.cpp
index 688e37cdd..7eca4c56a 100644
--- a/rcl/test/rcl/test_security.cpp
+++ b/rcl/test/rcl/test_security.cpp
@@ -22,8 +22,8 @@
 #include "rcl/security.h"
 #include "rcl/error_handling.h"
 
+#include "rcutils/env.h"
 #include "rcutils/filesystem.h"
-#include "rcutils/get_env.h"
 
 #include "rmw/error_handling.h"
 #include "rmw/rmw.h"