diff --git a/apps/src/openni_change_viewer.cpp b/apps/src/openni_change_viewer.cpp
index 4fda64ba2c4..95b69d652fb 100644
--- a/apps/src/openni_change_viewer.cpp
+++ b/apps/src/openni_change_viewer.cpp
@@ -39,7 +39,7 @@
 #include <pcl/io/openni_grabber.h>
 #include <pcl/io/openni_grabber.h>
 #include <pcl/visualization/cloud_viewer.h>
-#include <pcl/octree/octree.h>
+#include <pcl/octree/octree_pointcloud_changedetector.h>
 #include <pcl/filters/extract_indices.h>
 
 #include <pcl/console/parse.h>
diff --git a/doc/tutorials/content/sources/octree_change_detection/octree_change_detection.cpp b/doc/tutorials/content/sources/octree_change_detection/octree_change_detection.cpp
index 93dba4a2d16..a15f3d92600 100644
--- a/doc/tutorials/content/sources/octree_change_detection/octree_change_detection.cpp
+++ b/doc/tutorials/content/sources/octree_change_detection/octree_change_detection.cpp
@@ -1,5 +1,5 @@
 #include <pcl/point_cloud.h>
-#include <pcl/octree/octree.h>
+#include <pcl/octree/octree_pointcloud_changedetector.h>
 
 #include <iostream>
 #include <vector>
diff --git a/doc/tutorials/content/sources/octree_search/octree_search.cpp b/doc/tutorials/content/sources/octree_search/octree_search.cpp
index 85c5db2ef1b..f8b139c26de 100644
--- a/doc/tutorials/content/sources/octree_search/octree_search.cpp
+++ b/doc/tutorials/content/sources/octree_search/octree_search.cpp
@@ -1,5 +1,5 @@
 #include <pcl/point_cloud.h>
-#include <pcl/octree/octree.h>
+#include <pcl/octree/octree_search.h>
 
 #include <iostream>
 #include <vector>
diff --git a/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/world_model.h b/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/world_model.h
index 9f3f396623c..4ccd1b77529 100644
--- a/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/world_model.h
+++ b/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/world_model.h
@@ -40,8 +40,6 @@
 #define PCL_WORLD_MODEL_H_
 
 #include <pcl/common/impl/common.hpp>
-#include <pcl/octree/octree.h>
-#include <pcl/octree/octree_impl.h>
 #include <pcl/filters/extract_indices.h>
 #include <pcl/filters/filter_indices.h>
 #include <pcl/filters/crop_box.h>
diff --git a/gpu/octree/test/test_approx_nearest.cpp b/gpu/octree/test/test_approx_nearest.cpp
index bd4e1245e25..cfab9d4a413 100644
--- a/gpu/octree/test/test_approx_nearest.cpp
+++ b/gpu/octree/test/test_approx_nearest.cpp
@@ -48,7 +48,7 @@
     #pragma warning (disable: 4521)
 #endif
 #include <pcl/point_cloud.h>
-#include <pcl/octree/octree.h>
+#include <pcl/octree/octree_search.h>
 #if defined _MSC_VER
     #pragma warning (default: 4521)
 #endif
@@ -146,4 +146,4 @@ TEST(PCL_OctreeGPU, approxNearesSearch)
     cout << "count_pcl_better: " << count_pcl_better << endl;
     cout << "avg_diff_pcl_better: " << diff_pcl_better << endl;    
 
-}
\ No newline at end of file
+}
diff --git a/gpu/octree/test/test_bfrs_gpu.cpp b/gpu/octree/test/test_bfrs_gpu.cpp
index f366807f8d8..991281fa9ba 100644
--- a/gpu/octree/test/test_bfrs_gpu.cpp
+++ b/gpu/octree/test/test_bfrs_gpu.cpp
@@ -44,7 +44,6 @@
 #endif
 
 #include <pcl/point_cloud.h>
-#include <pcl/octree/octree.h>
 
 #if defined _MSC_VER
     #pragma warning (default: 4521)
diff --git a/gpu/octree/test/test_host_radius_search.cpp b/gpu/octree/test/test_host_radius_search.cpp
index 63451094bac..f38ee275a04 100644
--- a/gpu/octree/test/test_host_radius_search.cpp
+++ b/gpu/octree/test/test_host_radius_search.cpp
@@ -46,7 +46,7 @@
     
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
-#include <pcl/octree/octree.h>
+#include <pcl/octree/octree_search.h>
 
 #if defined _MSC_VER
     #pragma warning (default: 4521)
diff --git a/gpu/octree/test/test_knn_search.cpp b/gpu/octree/test/test_knn_search.cpp
index 6eee6b6b59b..4bef613d199 100644
--- a/gpu/octree/test/test_knn_search.cpp
+++ b/gpu/octree/test/test_knn_search.cpp
@@ -48,7 +48,7 @@
     #pragma warning (disable: 4521)
 #endif
 #include <pcl/point_cloud.h>
-#include <pcl/octree/octree.h>
+#include <pcl/octree/octree_search.h>
 #if defined _MSC_VER
     #pragma warning (default: 4521)
 #endif
@@ -182,4 +182,4 @@ TEST(PCL_OctreeGPU, exactNeighbourSearch)
             pairs_gpu.pop_back();
         }             
     }     
-}
\ No newline at end of file
+}
diff --git a/gpu/octree/test/test_radius_search.cpp b/gpu/octree/test/test_radius_search.cpp
index 491ac6d2cd9..cdd0296ff72 100644
--- a/gpu/octree/test/test_radius_search.cpp
+++ b/gpu/octree/test/test_radius_search.cpp
@@ -45,7 +45,6 @@
 #endif
 
 #include <pcl/point_cloud.h>
-#include <pcl/octree/octree.h>
 
 #if defined _MSC_VER
     #pragma warning (default: 4521)
diff --git a/io/include/pcl/compression/impl/octree_pointcloud_compression.hpp b/io/include/pcl/compression/impl/octree_pointcloud_compression.hpp
index 8dff290ca40..0faa1e55196 100644
--- a/io/include/pcl/compression/impl/octree_pointcloud_compression.hpp
+++ b/io/include/pcl/compression/impl/octree_pointcloud_compression.hpp
@@ -38,7 +38,6 @@
 #ifndef OCTREE_COMPRESSION_HPP
 #define OCTREE_COMPRESSION_HPP
 
-#include <pcl/octree/octree_pointcloud.h>
 #include <pcl/compression/entropy_range_coder.h>
 
 #include <iterator>
@@ -48,8 +47,6 @@
 #include <iostream>
 #include <stdio.h>
 
-using namespace pcl::octree;
-
 namespace pcl
 {
   namespace io
diff --git a/tools/octree_viewer.cpp b/tools/octree_viewer.cpp
index 37d2e98ccf3..f5ae26be84d 100644
--- a/tools/octree_viewer.cpp
+++ b/tools/octree_viewer.cpp
@@ -41,8 +41,7 @@
 #include <pcl/visualization/point_cloud_handlers.h>
 #include <pcl/visualization/common/common.h>
 
-#include <pcl/octree/octree.h>
-#include <pcl/octree/octree_impl.h>
+#include <pcl/octree/octree_pointcloud_voxelcentroid.h>
 
 #include <pcl/filters/filter.h>
 #include "boost.h"