diff -up ./libs/maps/CMakeLists.txt.octomap ./libs/maps/CMakeLists.txt
--- ./libs/maps/CMakeLists.txt.octomap	2015-08-28 19:13:32.695672908 -0700
+++ ./libs/maps/CMakeLists.txt	2015-08-28 19:13:43.049084903 -0700
@@ -35,7 +35,7 @@ define_mrpt_lib(
 
 IF(BUILD_mrpt-maps) 
 	IF (CMAKE_MRPT_HAS_PCL)
-		target_link_libraries(mrpt-maps ${PCL_LIBRARIES})
+		target_link_libraries(mrpt-maps octomap ${PCL_LIBRARIES})
 	ENDIF(CMAKE_MRPT_HAS_PCL)
 
 	IF(CMAKE_MRPT_HAS_LIBLAS)
diff -up ./libs/maps/include/mrpt/maps/CColouredOctoMap.h.octomap ./libs/maps/include/mrpt/maps/CColouredOctoMap.h
--- ./libs/maps/include/mrpt/maps/CColouredOctoMap.h.octomap	2015-01-11 14:20:49.000000000 -0800
+++ ./libs/maps/include/mrpt/maps/CColouredOctoMap.h	2015-08-28 18:18:10.425404305 -0700
@@ -11,8 +11,8 @@
 #define MRPT_CColouredOctoMap_H
 
 #include <mrpt/maps/COctoMapBase.h>
-#include <mrpt/otherlibs/octomap/octomap.h>
-#include <mrpt/otherlibs/octomap/ColorOcTree.h>
+#include <octomap/octomap.h>
+#include <octomap/ColorOcTree.h>
 #include <mrpt/obs/obs_frwds.h>
 
 #include <mrpt/maps/link_pragmas.h>
diff -up ./libs/maps/include/mrpt/maps/COctoMapBase.h.octomap ./libs/maps/include/mrpt/maps/COctoMapBase.h
--- ./libs/maps/include/mrpt/maps/COctoMapBase.h.octomap	2015-01-11 14:20:49.000000000 -0800
+++ ./libs/maps/include/mrpt/maps/COctoMapBase.h	2015-08-28 18:18:10.425404305 -0700
@@ -13,7 +13,7 @@
 #include <mrpt/maps/CMetricMap.h>
 #include <mrpt/utils/CLoadableOptions.h>
 #include <mrpt/utils/safe_pointers.h>
-#include <mrpt/otherlibs/octomap/octomap.h>
+#include <octomap/octomap.h>
 #include <mrpt/opengl/COctoMapVoxels.h>
 #include <mrpt/opengl/COpenGLScene.h>
 #include <mrpt/obs/obs_frwds.h>
diff -up ./libs/maps/include/mrpt/maps/COctoMap.h.octomap ./libs/maps/include/mrpt/maps/COctoMap.h
--- ./libs/maps/include/mrpt/maps/COctoMap.h.octomap	2015-01-11 14:20:49.000000000 -0800
+++ ./libs/maps/include/mrpt/maps/COctoMap.h	2015-08-28 18:18:10.426404344 -0700
@@ -15,7 +15,7 @@
 #include <mrpt/maps/CMetricMap.h>
 #include <mrpt/utils/CLoadableOptions.h>
 #include <mrpt/utils/safe_pointers.h>
-#include <mrpt/otherlibs/octomap/octomap.h>
+#include <octomap/octomap.h>
 #include <mrpt/obs/obs_frwds.h>
 
 #include <mrpt/maps/link_pragmas.h>