diff --git a/ros_babel_fish/CMakeLists.txt b/ros_babel_fish/CMakeLists.txt
index 5ef0b75..2e2ef88 100644
--- a/ros_babel_fish/CMakeLists.txt
+++ b/ros_babel_fish/CMakeLists.txt
@@ -102,9 +102,6 @@ target_include_directories(action_client PRIVATE
 ## Install ##
 #############
 
-ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
-ament_export_dependencies(rclcpp rclcpp_action rosidl_runtime_cpp rosidl_typesupport_cpp rosidl_typesupport_introspection_cpp)
-
 ## Mark libraries for installation
 install(
   TARGETS ${PROJECT_NAME}
@@ -122,6 +119,14 @@ install(
 install(DIRECTORY include/ DESTINATION include/)
 
 
+# Export old style CMake variables
+ament_export_include_directories(include)
+ament_export_libraries(${PROJECT_NAME})
+
+# Export modern CMake targets
+ament_export_targets(export_${PROJECT_NAME} HAS_LIBRARY_TARGET)
+ament_export_dependencies(rclcpp rclcpp_action rosidl_runtime_cpp rosidl_typesupport_cpp rosidl_typesupport_introspection_cpp)
+
 #############
 ## Testing ##
 #############