diff --git a/classes/ament-python.bbclass b/classes/ament-python.bbclass
index 7b8d530..ac579df 100644
--- a/classes/ament-python.bbclass
+++ b/classes/ament-python.bbclass
@@ -14,10 +14,10 @@ do_install_append() {
 
 FILES_${PN} = " \
     ${datadir}/${ROS_BPN}/package.xml \
-    ${datadir}/${ROS_BPN}/resource/* \
-    ${datadir}/ament_index/* \
-    ${libdir}/${PYTHON_DIR}/* \
-    ${libdir}/${ROS_BPN}/* \
+    ${datadir}/${ROS_BPN}/resource \
+    ${datadir}/ament_index \
+    ${libdir}/${PYTHON_DIR} \
+    ${libdir}/${ROS_BPN} \
     ${libdir}/lib*.so \
 "
 
diff --git a/classes/ament.bbclass b/classes/ament.bbclass
index ba74689..e9f8650 100644
--- a/classes/ament.bbclass
+++ b/classes/ament.bbclass
@@ -43,16 +43,16 @@ do_install_append() {
 
 FILES_${PN} = " \
     ${datadir}/${ROS_BPN}/package.xml \
-    ${datadir}/${ROS_BPN}/resource/* \
-    ${datadir}/${ROS_BPN}/msg/* \
-    ${datadir}/${ROS_BPN}/srv/* \
-    ${datadir}/ament_index/* \
-    ${libdir}/${PYTHON_DIR}/* \
-    ${libdir}/${ROS_BPN}/* \
+    ${datadir}/${ROS_BPN}/resource \
+    ${datadir}/${ROS_BPN}/msg \
+    ${datadir}/${ROS_BPN}/srv \
+    ${datadir}/ament_index \
+    ${libdir}/${PYTHON_DIR} \
+    ${libdir}/${ROS_BPN} \
     ${libdir}/lib*.so \
 "
 
 FILES_${PN}-dev = " \
-    ${datadir}/${ROS_BPN}/cmake/* \
+    ${datadir}/${ROS_BPN}/cmake \
     ${includedir} \
 "
diff --git a/classes/catkin_ros_prefix.bbclass b/classes/catkin_ros_prefix.bbclass
index 3bf6e28..d5f3483 100644
--- a/classes/catkin_ros_prefix.bbclass
+++ b/classes/catkin_ros_prefix.bbclass
@@ -27,7 +27,7 @@ export PYTHONPATH = "${STAGING_DIR_NATIVE}${PYTHON_SITEPACKAGES_DIR}"
 PYTHONPATH_class-native = "${PYTHON_SITEPACKAGES_DIR}"
 
 FILES_${PN} += "\
-    ${ros_bindir}/* ${ros_libexecdir}/* ${ros_libdir}/lib*.so \
+    ${ros_bindir} ${ros_libexecdir} ${ros_libdir}/lib*.so \
     ${PYTHON_SITEPACKAGES_DIR} \
     ${ros_datadir} \
     ${ros_sysconfdir} \