diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf46ae8..1352e621 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(laser_geometry)
 
-set(CMAKE_CXX_STANDARD 11)
-
 find_package(catkin REQUIRED
     COMPONENTS
         angles
diff --git a/package.xml b/package.xml
index c14a0c94..a2ec946b 100644
--- a/package.xml
+++ b/package.xml
@@ -34,6 +34,13 @@
   <build_depend>libboost-thread-dev</build_depend>
   <build_depend>tf2_geometry_msgs</build_depend>
 
+  <build_export_depend>eigen</build_export_depend>
+  <build_export_depend>libboost-dev</build_export_depend>
+  <build_export_depend>libboost-thread-dev</build_export_depend>
+  <build_export_depend>tf2_geometry_msgs</build_export_depend>
+
+  <build_depend>rostest</build_depend>
+
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
   <exec_depend>libboost-thread</exec_depend>
diff --git a/setup.py b/setup.py
index 44edf6d0..40a9fdb4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(