diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43ff9a0..05cabfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(virtual_cam)
 
-## Compile as C++11, supported in ROS Kinetic and newer
-add_compile_options(-std=c++11)
-
-find_package(catkin REQUIRED COMPONENTS roscpp message_generation rosbag cv_bridge tf rgbd)
+find_package(catkin REQUIRED COMPONENTS cv_bridge roscpp message_generation rgbd rosbag tf)
 find_package(OpenCV REQUIRED)
 
 ################################################
@@ -19,7 +16,6 @@ add_service_files(
 
 generate_messages(
   DEPENDENCIES
-  std_msgs
 )
 
 ###################################
diff --git a/package.xml b/package.xml
index ce00140..c1b8f3d 100644
--- a/package.xml
+++ b/package.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<package>
+<?xml-model
+  href="http://download.ros.org/schema/package_format3.xsd"
+  schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>virtual_cam</name>
   <version>0.0.0</version>
   <description>The virtual_cam package</description>
@@ -10,24 +13,20 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>roscpp</build_depend>
-  <build_depend>sensor_msgs</build_depend>
-  <build_depend>tf</build_depend>
-  <build_depend>std_msgs</build_depend>
-  <build_depend>message_filters</build_depend>
-  <build_depend>cv_bridge</build_depend>
-  <build_depend>stereo_msgs</build_depend>
-  <build_depend>image_geometry</build_depend>
-  <build_depend>rosbag</build_depend>
-  <build_depend>cv_bridge</build_depend>
-  <build_depend>yaml-cpp</build_depend>
-  <build_depend>rgbd</build_depend>
-
-  <run_depend>yaml-cpp</run_depend>
-  <run_depend>rgbd</run_depend>
+  <depend>cv_bridge</depend>
+  <depend>image_geometry</depend>
+  <depend>message_filters</depend>
+  <depend>rgbd</depend>
+  <depend>rosbag</depend>
+  <depend>roscpp</depend>
+  <depend>sensor_msgs</depend>
+  <depend>stereo_msgs</depend>
+  <depend>tf</depend>
+  <depend>yaml-cpp</depend>
 
   <build_depend>message_generation</build_depend>
 
-  <run_depend>message_runtime</run_depend>
+  <build_export_depend>message_runtime</build_export_depend>
+  <exec_depend>message_runtime</exec_depend>
 
 </package>