diff --git a/outofcore/CMakeLists.txt b/outofcore/CMakeLists.txt
index fbc515d0da8..ec0d50858f9 100644
--- a/outofcore/CMakeLists.txt
+++ b/outofcore/CMakeLists.txt
@@ -63,7 +63,12 @@ set(LIB_NAME "pcl_${SUBSYS_NAME}")
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${visualization_incs})
-#PCL_ADD_SSE_FLAGS("${LIB_NAME}")
+target_include_directories(${LIB_NAME}
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
 target_link_libraries("${LIB_NAME}" pcl_common pcl_visualization ${Boost_SYSTEM_LIBRARY})
 PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS})
 
@@ -71,7 +76,3 @@ PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_
 PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
 PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
 PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/visualization" ${visualization_incs})
-
-if(BUILD_tools)
-  add_subdirectory(tools)
-endif()
diff --git a/outofcore/tools/CMakeLists.txt b/outofcore/tools/CMakeLists.txt
deleted file mode 100644
index f33e8b4475d..00000000000
--- a/outofcore/tools/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-set(SUBSYS_NAME tools)
-
-# pcl_outofcore_process
-PCL_ADD_EXECUTABLE(pcl_outofcore_process COMPONENT ${SUBSYS_NAME} SOURCES outofcore_process.cpp)
-target_link_libraries(pcl_outofcore_process pcl_common pcl_filters pcl_io pcl_octree pcl_outofcore)
-
-PCL_ADD_EXECUTABLE(pcl_outofcore_print COMPONENT ${SUBSYS_NAME} SOURCES outofcore_print.cpp)
-target_link_libraries(pcl_outofcore_print pcl_common pcl_filters pcl_io pcl_octree pcl_outofcore)
-
-if(NOT VTK_FOUND)
-  set(DEFAULT FALSE)
-  set(REASON "VTK was not found.")
-else()
-  set(DEFAULT TRUE)
-  set(REASON)
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
-
-  set(srcs outofcore_viewer.cpp
-         ../src/visualization/camera.cpp
-         ../src/visualization/common.cpp
-         ../src/visualization/object.cpp
-         ../src/visualization/grid.cpp
-         ../src/visualization/outofcore_cloud.cpp
-         ../src/visualization/scene.cpp
-         ../src/visualization/viewport.cpp)
-
-  # pcl_outofcore_viewer
-  PCL_ADD_EXECUTABLE(pcl_outofcore_viewer COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} BUNDLE)
-  target_link_libraries(pcl_outofcore_viewer pcl_common pcl_io pcl_outofcore pcl_visualization pcl_octree pcl_filters)
-endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a4151e9c2d4..20e4b9ceb38 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -200,6 +200,29 @@ if(TARGET pcl_filters)
     endif()
   endif()
 
+  if(TARGET pcl_outofcore)
+    # pcl_outofcore_process
+    PCL_ADD_EXECUTABLE(pcl_outofcore_process COMPONENT ${SUBSYS_NAME} SOURCES outofcore_process.cpp)
+    target_link_libraries(pcl_outofcore_process pcl_common pcl_io pcl_octree pcl_filters pcl_outofcore)
+
+    PCL_ADD_EXECUTABLE(pcl_outofcore_print COMPONENT ${SUBSYS_NAME} SOURCES outofcore_print.cpp)
+    target_link_libraries(pcl_outofcore_print pcl_common pcl_io pcl_octree pcl_filters pcl_outofcore)
+
+    if(TARGET pcl_visualization)
+      set(srcs outofcore_viewer.cpp
+        ../outofcore/src/visualization/camera.cpp
+        ../outofcore/src/visualization/common.cpp
+        ../outofcore/src/visualization/object.cpp
+        ../outofcore/src/visualization/grid.cpp
+        ../outofcore/src/visualization/outofcore_cloud.cpp
+        ../outofcore/src/visualization/scene.cpp
+        ../outofcore/src/visualization/viewport.cpp)
+      # pcl_outofcore_viewer
+      PCL_ADD_EXECUTABLE(pcl_outofcore_viewer COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} BUNDLE)
+      target_link_libraries(pcl_outofcore_viewer pcl_common pcl_io pcl_octree pcl_filters pcl_outofcore pcl_visualization)
+    endif()
+  endif()
+
   if(TARGET pcl_visualization)
     PCL_ADD_EXECUTABLE(pcl_octree_viewer COMPONENT ${SUBSYS_NAME} SOURCES octree_viewer.cpp)
     target_link_libraries(pcl_octree_viewer pcl_common pcl_io pcl_octree pcl_kdtree pcl_filters pcl_visualization)
diff --git a/outofcore/tools/outofcore_print.cpp b/tools/outofcore_print.cpp
similarity index 100%
rename from outofcore/tools/outofcore_print.cpp
rename to tools/outofcore_print.cpp
diff --git a/outofcore/tools/outofcore_process.cpp b/tools/outofcore_process.cpp
similarity index 100%
rename from outofcore/tools/outofcore_process.cpp
rename to tools/outofcore_process.cpp
diff --git a/outofcore/tools/outofcore_viewer.cpp b/tools/outofcore_viewer.cpp
similarity index 100%
rename from outofcore/tools/outofcore_viewer.cpp
rename to tools/outofcore_viewer.cpp