diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
index bc569f1e18..682b4e7e56 100644
--- a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
+++ b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
@@ -22,6 +22,7 @@
 
 
 #include "PreCompiled.h"
+#if defined(HAVE_PCL_SURFACE)
 #ifndef _PreComp_
 # include <Geom_BSplineSurface.hxx>
 # include <TColgp_Array2OfPnt.hxx>
@@ -35,7 +36,6 @@
 
 #include "BSplineFitting.h"
 
-#if defined(HAVE_PCL_SURFACE)
 #include <pcl/pcl_config.h>
 #if PCL_VERSION_COMPARE(>=,1,7,0)
 # include <pcl/point_cloud.h>
@@ -44,7 +44,6 @@
 # include <pcl/surface/on_nurbs/fitting_surface_tdm.h>
 # include <pcl/surface/on_nurbs/fitting_curve_2d_asdm.h>
 #endif
-#endif
 
 using namespace Reen;
 
@@ -237,3 +236,4 @@ Handle(Geom_BSplineSurface) BSplineFitting::perform()
     return Handle_Geom_BSplineSurface();
 #endif
 }
+#endif // HAVE_PCL_SURFACE
diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.h b/src/Mod/ReverseEngineering/App/BSplineFitting.h
index b7ed8ae313..6e0559537c 100644
--- a/src/Mod/ReverseEngineering/App/BSplineFitting.h
+++ b/src/Mod/ReverseEngineering/App/BSplineFitting.h
@@ -24,6 +24,7 @@
 #ifndef REEN_BSPLINEFITTING_H
 #define REEN_BSPLINEFITTING_H
 
+#if defined(HAVE_PCL_SURFACE)
 #include <Handle_Geom_BSplineSurface.hxx>
 #include <Base/Vector3D.h>
 #include <vector>
@@ -57,4 +58,6 @@ private:
 
 }
 
+#endif // HAVE_PCL_SURFACE
+
 #endif // REEN_BSPLINEFITTING_H