diff --git a/rclcpp/CMakeLists.txt b/rclcpp/CMakeLists.txt
index dc8f5d6..6420d7a 100644
--- a/rclcpp/CMakeLists.txt
+++ b/rclcpp/CMakeLists.txt
@@ -9,7 +9,6 @@ find_package(rcl_interfaces REQUIRED)
 find_package(rcl_yaml_param_parser REQUIRED)
 find_package(rcpputils REQUIRED)
 find_package(rmw REQUIRED)
-find_package(rmw_implementation REQUIRED)
 find_package(rosgraph_msgs REQUIRED)
 find_package(rosidl_generator_cpp REQUIRED)
 find_package(rosidl_typesupport_c REQUIRED)
diff --git a/rclcpp/package.xml b/rclcpp/package.xml
index 8b54fe7..6c268ba 100644
--- a/rclcpp/package.xml
+++ b/rclcpp/package.xml
@@ -9,8 +9,6 @@
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
-  <build_export_depend>rmw</build_export_depend>
-
   <build_depend>builtin_interfaces</build_depend>
   <build_depend>rcl_interfaces</build_depend>
   <build_depend>rosgraph_msgs</build_depend>
@@ -27,7 +25,7 @@
   <depend>rcl</depend>
   <depend>rcl_yaml_param_parser</depend>
   <depend>rcpputils</depend>
-  <depend>rmw_implementation</depend>
+  <depend>rmw</depend>
   <depend>tracetools</depend>
 
   <exec_depend>ament_cmake</exec_depend>