diff --git a/features/include/pcl/features/gasd.h b/features/include/pcl/features/gasd.h
index 779ba43b9ab..0f4247f17f6 100644
--- a/features/include/pcl/features/gasd.h
+++ b/features/include/pcl/features/gasd.h
@@ -94,8 +94,8 @@ namespace pcl
           color_half_grid_size_ (2),
           color_hists_size_ (12),
           use_color_ (true),
-          shape_interp_ (HistogramInterpolationMethod::INTERP_NONE),
-          color_interp_ (HistogramInterpolationMethod::INTERP_NONE)
+          shape_interp_ (INTERP_NONE),
+          color_interp_ (INTERP_NONE)
       {
         search_radius_ = 0;
         k_ = 1;
diff --git a/features/include/pcl/features/impl/gasd.hpp b/features/include/pcl/features/impl/gasd.hpp
index ceb5d8c9d89..955442046ee 100644
--- a/features/include/pcl/features/impl/gasd.hpp
+++ b/features/include/pcl/features/impl/gasd.hpp
@@ -135,7 +135,7 @@ namespace pcl
     float zbin = z_scaled + half_grid_size;
 
     // if using histogram interpolation, subtract 0.5 so samples with the central value of the bin have full weight in it
-    if (interp != HistogramInterpolationMethod::INTERP_NONE)
+    if (interp != INTERP_NONE)
     {
       xbin -= 0.5f;
       ybin -= 0.5f;
@@ -152,7 +152,7 @@ namespace pcl
     float v_xyz111, v_xyz110, v_xyz101, v_xyz100, v_xyz011, v_xyz010, v_xyz001, v_xyz000;
 
     // if using histogram interpolation, compute trilinear interpolation
-    if (interp != HistogramInterpolationMethod::INTERP_NONE)
+    if (interp != INTERP_NONE)
     {
       xbin -= x0;
       ybin -= y0;
@@ -183,14 +183,14 @@ namespace pcl
     switch (interp)
     {
       default:
-      case HistogramInterpolationMethod::INTERP_NONE:
+      case INTERP_NONE:
       {
         // no interpolation
         hists[grid_idx][h_idx] += hist_incr;
         break;
       }
 
-      case HistogramInterpolationMethod::INTERP_TRILINEAR:
+      case INTERP_TRILINEAR:
       {
         // trilinear interpolation
         hists[grid_idx][h_idx] += v_xyz000;
@@ -204,7 +204,7 @@ namespace pcl
         break;
       }
 
-      case HistogramInterpolationMethod::INTERP_QUADRILINEAR:
+      case INTERP_QUADRILINEAR:
       {
         // quadrilinear interpolation
         hbin -= h0;
@@ -280,7 +280,7 @@ namespace pcl
     // compute alignment transform using reference frame
     computeAlignmentTransform ();
 
-    pcl::PointCloud<PointInT>::Ptr shape_samples (new pcl::PointCloud<PointInT>);
+    PointInTPtr shape_samples (new pcl::PointCloud<PointInT>);
     pcl::PointCloud<pcl::PointXYZHSV>::Ptr color_samples;
 
     // align point cloud