diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index 0ae278a9ed..78f70f2e89 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -303,11 +303,13 @@
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <GeomFill.hxx>
 #include <GeomFill_AppSurf.hxx>
-#include <GeomFill_Generator.hxx>
 #include <GeomFill_ApproxStyle.hxx>
+#include <GeomFill_BezierCurves.hxx>
+#include <GeomFill_BSplineCurves.hxx>
 #include <GeomFill_CorrectedFrenet.hxx>
 #include <GeomFill_CurveAndTrihedron.hxx>
 #include <GeomFill_EvolvedSection.hxx>
+#include <GeomFill_Generator.hxx>
 #include <GeomFill_Line.hxx>
 #include <GeomFill_LocationLaw.hxx>
 #include <GeomFill_NSections.hxx>
diff --git a/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp b/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp
index b3c63c53a5..0a6f4a18a9 100644
--- a/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp
+++ b/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp
@@ -25,17 +25,18 @@
 #ifndef _PreComp_
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
-#include <Base/Tools.h>
-#include <Geom_Curve.hxx>
-#include <Precision.hxx>
 #include <Standard_Version.hxx>
 #include <TopoDS.hxx>
 #include <gp_Pnt.hxx>
 #endif
-#include "FeatureBlendCurve.h"
+
+#include <Base/Tools.h>
 #include "Mod/Surface/App/Blending/BlendCurve.h"
 #include "Mod/Surface/App/Blending/BlendPoint.h"
 
+#include "FeatureBlendCurve.h"
+
+
 using namespace Surface;
 
 const App::PropertyFloatConstraint::Constraints StartParameterConstraint = {0.0, 1.0, 0.05};
diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt
index 02010eaffe..0fb3e53a95 100644
--- a/src/Mod/Surface/App/CMakeLists.txt
+++ b/src/Mod/Surface/App/CMakeLists.txt
@@ -48,23 +48,6 @@ SET(Blending_SRCS
   Blending/BlendCurve.h
 )
 
-SET(BlendingPy_SRCS
-  Blending/BlendPointPy.xml
-  Blending/BlendPointPyImp.cpp
-  Blending/BlendCurvePy.xml
-  Blending/BlendCurvePyImp.cpp
-)
-SOURCE_GROUP("Blending" FILES ${BlendingPy_SRCS})
-
-SET(Blending_SRCS
-  Blending/FeatureBlendCurve.cpp
-  Blending/FeatureBlendCurve.h
-  Blending/BlendPoint.cpp
-  Blending/BlendPoint.h
-  Blending/BlendCurve.cpp
-  Blending/BlendCurve.h
-)
-
 SET(Surface_SRCS
   ${Blending_SRCS}
   ${BlendingPy_SRCS}
@@ -85,6 +68,12 @@ SET(Surface_SRCS
   FeatureCut.h
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Surface_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(Surface PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 link_directories(${OCC_LIBRARY_DIR})
 add_library(Surface SHARED ${Surface_SRCS})
 target_link_libraries(Surface ${Surface_LIBS})
diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt
index aed56fd113..41e239017b 100644
--- a/src/Mod/Surface/Gui/CMakeLists.txt
+++ b/src/Mod/Surface/Gui/CMakeLists.txt
@@ -69,6 +69,12 @@ SET(SurfaceGuiIcon_SVG
     Resources/icons/Surface_Workbench.svg
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${SurfaceGui_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(SurfaceGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 link_directories(${OCC_LIBRARY_DIR})
 add_library(SurfaceGui SHARED ${SurfaceGui_SRCS} ${SurfaceGuiIcon_SVG})
 target_link_libraries(SurfaceGui ${SurfaceGui_LIBS})
diff --git a/src/Mod/Surface/Gui/PreCompiled.h b/src/Mod/Surface/Gui/PreCompiled.h
index 423211b18f..0f51743ecf 100644
--- a/src/Mod/Surface/Gui/PreCompiled.h
+++ b/src/Mod/Surface/Gui/PreCompiled.h
@@ -30,10 +30,6 @@
 // STL
 #include <sstream>
 
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
-
 // Qt
 #include <QAction>
 #include <QApplication>