diff --git a/experiments/rocon_unreliable_experiments/CMakeLists.txt b/experiments/rocon_unreliable_experiments/CMakeLists.txt
index f8156db5..1f297875 100644
--- a/experiments/rocon_unreliable_experiments/CMakeLists.txt
+++ b/experiments/rocon_unreliable_experiments/CMakeLists.txt
@@ -10,7 +10,7 @@ project(rocon_unreliable_experiments)
 ##############################################################################
 
 find_package(catkin REQUIRED COMPONENTS roscpp std_msgs)
-include_directories(SYSTEM include ${catkin_INCLUDE_DIRS})
+include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
 catkin_package(CATKIN_DEPENDS roscpp std_msgs)
 
 ##############################################################################
diff --git a/rocon_gateway_tests/CMakeLists.txt b/rocon_gateway_tests/CMakeLists.txt
index ea66337b..aa13cc20 100644
--- a/rocon_gateway_tests/CMakeLists.txt
+++ b/rocon_gateway_tests/CMakeLists.txt
@@ -9,7 +9,7 @@ project(rocon_gateway_tests)
 # Catkin
 ##############################################################################
 
-find_package(catkin REQUIRED rocon_test)
+find_package(catkin REQUIRED COMPONENTS rocon_test)
 catkin_package()
 
 catkin_python_setup()
diff --git a/rocon_gateway_utils/CMakeLists.txt b/rocon_gateway_utils/CMakeLists.txt
index 7e2c7c30..5328cb78 100644
--- a/rocon_gateway_utils/CMakeLists.txt
+++ b/rocon_gateway_utils/CMakeLists.txt
@@ -19,7 +19,7 @@ catkin_python_setup()
 ##############################################################################
 
 if (CATKIN_ENABLE_TESTING)
-  find_package(catkin REQUIRED rosunit rostest)
+  find_package(catkin REQUIRED COMPONENTS rosunit rostest)
   add_subdirectory(tests)
 endif()
 
diff --git a/rocon_test/package.xml b/rocon_test/package.xml
index ed51367e..1a3bece5 100644
--- a/rocon_test/package.xml
+++ b/rocon_test/package.xml
@@ -12,7 +12,6 @@
   <author>Daniel Stonier</author>
 
   <buildtool_depend>catkin</buildtool_depend>
-
   <build_depend>rostest</build_depend>
 
   <run_depend>rospy</run_depend>
@@ -22,4 +21,4 @@
   <run_depend>rocon_python_utils</run_depend>
   <run_depend>roslaunch</run_depend>
   <run_depend>rocon_launch</run_depend>
-</package>
\ No newline at end of file
+</package>