diff --git a/rosidl_default_generators/CMakeLists.txt b/rosidl_default_generators/CMakeLists.txt

index d6fda02..e616910 100644

--- a/rosidl_default_generators/CMakeLists.txt

+++ b/rosidl_default_generators/CMakeLists.txt

@@ -7,8 +7,7 @@ find_package(ament_cmake REQUIRED)

ament_export_dependencies(rosidl_cmake)

ament_export_dependencies(rosidl_generator_c)

-ament_export_dependencies(rosidl_generator_cpp)

-ament_export_dependencies(rosidl_generator_py)

+ament_export_dependencies(rosidl_generator_java)

if(BUILD_TESTING)

find_package(ament_lint_auto REQUIRED)

diff --git a/rosidl_default_generators/package.xml b/rosidl_default_generators/package.xml

index b6769dc..0e88ce3 100644

--- a/rosidl_default_generators/package.xml

+++ b/rosidl_default_generators/package.xml

@@ -12,19 +12,15 @@

<buildtool_export_depend>rosidl_cmake</buildtool_export_depend>

<buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>

- <buildtool_export_depend>rosidl_generator_cpp</buildtool_export_depend>

- <buildtool_export_depend>rosidl_generator_py</buildtool_export_depend>

+ <buildtool_export_depend>rosidl_generator_java</buildtool_export_depend>

<buildtool_export_depend>rosidl_typesupport_c</buildtool_export_depend>

<buildtool_export_depend>rosidl_typesupport_cpp</buildtool_export_depend>

<buildtool_export_depend>rosidl_typesupport_introspection_c</buildtool_export_depend>

- <buildtool_export_depend>rosidl_typesupport_introspection_cpp</buildtool_export_depend>

<buildtool_export_depend>rosidl_typesupport_connext_c</buildtool_export_depend>

- <buildtool_export_depend>rosidl_typesupport_connext_cpp</buildtool_export_depend>

<buildtool_export_depend>rosidl_typesupport_opensplice_c</buildtool_export_depend>

- <buildtool_export_depend>rosidl_typesupport_opensplice_cpp</buildtool_export_depend>

<test_depend>ament_lint_auto</test_depend>

<test_depend>ament_lint_common</test_depend>