diff --git a/j2735_v2x_msgs/CMakeLists.txt b/j2735_v2x_msgs/CMakeLists.txt
index 58e9791..2fe8b13 100644
--- a/j2735_v2x_msgs/CMakeLists.txt
+++ b/j2735_v2x_msgs/CMakeLists.txt
@@ -85,10 +85,9 @@ else() # ROS 2
     DESTINATION include/${PROJECT_NAME}
   )
 
-  set(INCLUDE_DESTINATION include/${PROJECT_NAME})
+  set(INCLUDE_DESTINATION include/${PROJECT_NAME}/${PROJECT_NAME})
 
   ament_export_dependencies(rosidl_default_runtime)
-  ament_export_include_directories(include)
   ament_package()
 
   if (BUILD_TESTING)
@@ -107,6 +106,6 @@ endif()
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.h"
+  FILES_MATCHING PATTERN "*.hpp"
   PATTERN ".svn" EXCLUDE
 )
diff --git a/j3224_v2x_msgs/CMakeLists.txt b/j3224_v2x_msgs/CMakeLists.txt
index 878be5e..36f247d 100644
--- a/j3224_v2x_msgs/CMakeLists.txt
+++ b/j3224_v2x_msgs/CMakeLists.txt
@@ -88,7 +88,7 @@ else() # ROS 2
           j2735_v2x_msgs
   )
 
-  set(INCLUDE_DESTINATION include/${PROJECT_NAME})
+  set(INCLUDE_DESTINATION include/${PROJECT_NAME}/${PROJECT_NAME})
 
   ament_export_dependencies(rosidl_default_runtime)
   ament_package()
@@ -97,6 +97,6 @@ endif()
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.h"
+  FILES_MATCHING PATTERN "*.hpp"
   PATTERN ".svn" EXCLUDE
 )