diff --git a/gazebo_grasp_plugin/CHANGELOG.rst b/gazebo_grasp_plugin/CHANGELOG.rst
index ed79a9f63a80fe70f94b237e28d7ce71a55a53e1..5b6d5d5507105dd99f8a3108da583139d1cbb018 100644
--- a/gazebo_grasp_plugin/CHANGELOG.rst
+++ b/gazebo_grasp_plugin/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package gazebo_grasp_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+
 1.0.0 (2016-06-07)
 ------------------
 * Initial release
diff --git a/gazebo_state_plugins/CHANGELOG.rst b/gazebo_state_plugins/CHANGELOG.rst
index 31d922e645b13ea575b89167760696929e255de3..2e31a6cc54c52305587c80a33ae014345d905047 100644
--- a/gazebo_state_plugins/CHANGELOG.rst
+++ b/gazebo_state_plugins/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package gazebo_state_plugins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+
 1.0.0 (2016-06-07)
 ------------------
 * Initial release
diff --git a/gazebo_state_plugins/CMakeLists.txt b/gazebo_state_plugins/CMakeLists.txt
index 6add98deb860a32524fa3e3d92f1e6669c913973..93a7ac3668fb450f6fa51cd1207863de237fa447 100644
--- a/gazebo_state_plugins/CMakeLists.txt
+++ b/gazebo_state_plugins/CMakeLists.txt
@@ -12,6 +12,7 @@ find_package(
   roscpp
   shape_msgs
   std_msgs
+  nav_msgs
   gazebo_ros
   object_msgs
   object_msgs_tools
@@ -37,7 +38,7 @@ find_package(gazebo REQUIRED)
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES gazebo_state_plugins gazebo_map_publisher
-  CATKIN_DEPENDS geometry_msgs roscpp shape_msgs std_msgs gazebo_world_plugin_loader
+  CATKIN_DEPENDS geometry_msgs roscpp shape_msgs std_msgs nav_msgs gazebo_world_plugin_loader
         gazebo_ros object_msgs object_msgs_tools eigen_conversions
   DEPENDS gazebo
 )
diff --git a/gazebo_state_plugins/package.xml b/gazebo_state_plugins/package.xml
index 87ae51f46097b7167a5c2c41b6ce093b8d9405e3..4b6bc43bd05992976daaf3b2dea4e70eaa1f6f8e 100644
--- a/gazebo_state_plugins/package.xml
+++ b/gazebo_state_plugins/package.xml
@@ -31,6 +31,7 @@
   <build_depend>gazebo_world_plugin_loader</build_depend>
   <build_depend>shape_msgs</build_depend>
   <build_depend>std_msgs</build_depend>
+  <build_depend>nav_msgs</build_depend>
   <build_depend>object_msgs</build_depend>
   <build_depend>object_msgs_tools</build_depend>
   <build_depend>eigen_conversions</build_depend>
@@ -42,6 +43,7 @@
   <run_depend>roscpp</run_depend>
   <run_depend>shape_msgs</run_depend>
   <run_depend>std_msgs</run_depend>
+  <run_depend>nav_msgs</run_depend>
 
   <run_depend>gazebo</run_depend>
   <run_depend>gazebo_ros</run_depend>
diff --git a/gazebo_test_tools/CHANGELOG.rst b/gazebo_test_tools/CHANGELOG.rst
index c5ee7cf672d904d6972c76c73ace71aac62a4391..4a268944daf12fd4a8ac32fc6f727b9de06ff3d2 100644
--- a/gazebo_test_tools/CHANGELOG.rst
+++ b/gazebo_test_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package gazebo_test_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+
 1.0.0 (2016-06-07)
 ------------------
 * Initial release
diff --git a/gazebo_world_plugin_loader/CHANGELOG.rst b/gazebo_world_plugin_loader/CHANGELOG.rst
index ea879dbb7dc1fc06539017a3597cd558828583d7..39bfd624f88b235dd7ac63647aad78f359a27c70 100644
--- a/gazebo_world_plugin_loader/CHANGELOG.rst
+++ b/gazebo_world_plugin_loader/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package gazebo_world_plugin_loader
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+
 1.0.0 (2016-06-07)
 ------------------
 * Initial release
diff --git a/gazebo_world_plugin_loader/package.xml b/gazebo_world_plugin_loader/package.xml
index 0e16928164b6d140911abbcf89b5e89b18299094..e2ba802bea85005fbb3f090a3957e1e5471c702e 100644
--- a/gazebo_world_plugin_loader/package.xml
+++ b/gazebo_world_plugin_loader/package.xml
@@ -29,10 +29,10 @@
   <!-- Dependencies can be catkin packages or system dependencies -->
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>roscpp</build_depend>
-  <run_depend>roscpp</run_depend>
-
   <build_depend>gazebo_ros</build_depend>
   <build_depend>gazebo</build_depend>
+  
+  <run_depend>roscpp</run_depend>
   <run_depend>gazebo_ros</run_depend>
   <run_depend>gazebo</run_depend>
 
diff --git a/gazebo_world_plugin_loader/src/GazeboPluginLoader.cpp b/gazebo_world_plugin_loader/src/GazeboPluginLoader.cpp
index 3017be708985a89085d3df4004987eb65158f48a..a6c717e44c9d4a2d0924edfa8769b7c67f5a9cfd 100644
--- a/gazebo_world_plugin_loader/src/GazeboPluginLoader.cpp
+++ b/gazebo_world_plugin_loader/src/GazeboPluginLoader.cpp
@@ -3,8 +3,6 @@
 #include <gazebo/physics/World.hh>
 #include <gazebo/physics/PhysicsIface.hh>
 
-#include <pluginlib/class_list_macros.h>
-
 using gazebo::GazeboPluginLoader;
 
 GZ_REGISTER_SYSTEM_PLUGIN(GazeboPluginLoader)
@@ -18,7 +16,6 @@ GazeboPluginLoader::GazeboPluginLoader() :
 void GazeboPluginLoader::Load(int argc, char ** argv){
 }
 
-
 void GazeboPluginLoader::onWorldCreate(){
     ROS_INFO("On-World-Create: Reading list of Gazebo world plugins to be loaded from parameters...");