diff --git a/ros-comm/depend.mk b/ros-comm/depend.mk
index 0059075b2f359abdc4e0fa238c854faf2b18a042..8f7709294b7534e23c283ba208415b9c4f69d908 100644
--- a/ros-comm/depend.mk
+++ b/ros-comm/depend.mk
@@ -19,12 +19,22 @@ DEPEND_ABI.ros-comm?=	ros-comm>=1.8.15<1.9
 DEPEND_DIR.ros-comm?=	../../wip/ros-comm
 
 SYSTEM_SEARCH.ros-comm=\
-	bin/roscore						\
-	include/ros/common.h					\
-	lib/libroscpp.so					\
-	'share/ros_comm/stack.xml:/<version>/s/[^0-9.]//gp'	\
+	bin/roscore							\
+	include/ros/common.h						\
+	lib/libroscpp.so						\
+	share/rosbag/cmake/rosbag-config.cmake				\
+	share/rosconsole/cmake/rosconsole-config.cmake			\
+	share/roscpp/cmake/roscpp-config.cmake				\
+	share/rosgraph_msgs/cmake/rosgraph_msgs-config.cmake		\
+	share/roslisp/cmake/roslisp-config.cmake			\
+	share/rosout/cmake/rosout-config.cmake				\
+	share/rostest/cmake/rostest-config.cmake			\
+	share/xmlrpcpp/cmake/xmlrpcpp-config.cmake			\
+	'share/ros_comm/stack.xml:/<version>/s/[^0-9.]//gp'		\
 	'lib/pkgconfig/std_srvs.pc:/Version/s/[^0-9.]//gp'
 
+include ../../wip/roscpp-core/depend.mk
+
 endif # ROS_COMM_DEPEND_MK -------------------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}