diff --git a/cartographer_ros_msgs/CMakeLists.txt b/cartographer_ros_msgs/CMakeLists.txt
index 15c1fbc..dcdbc51 100644
--- a/cartographer_ros_msgs/CMakeLists.txt
+++ b/cartographer_ros_msgs/CMakeLists.txt
@@ -24,18 +24,38 @@ set(PACKAGE_DEPENDENCIES
 find_package(catkin REQUIRED COMPONENTS message_generation ${PACKAGE_DEPENDENCIES})
 
 add_message_files(
-  DIRECTORY
-    msg
+  DIRECTORY msg
+  FILES
+    LandmarkEntry.msg
+    LandmarkList.msg
+    SensorTopics.msg
+    StatusCode.msg
+    StatusResponse.msg
+    SubmapEntry.msg
+    SubmapList.msg
+    SubmapTexture.msg
+    TrajectoryOptions.msg
+    TrajectoryStates.msg
 )
 
 add_message_files(
-  DIRECTORY
-    msg/metrics
+  DIRECTORY msg/metrics
+  FILES
+    HistogramBucket.msg
+    MetricFamily.msg
+    MetricLabel.msg
+    Metric.msg
 )
 
 add_service_files(
-  DIRECTORY
-    srv
+  DIRECTORY srv
+  FILES
+    FinishTrajectory.srv
+    GetTrajectoryStates.srv
+    ReadMetrics.srv
+    StartTrajectory.srv
+    SubmapQuery.srv
+    WriteState.srv
 )
 
 generate_messages(