diff --git a/src/Mod/Surface/App/FeatureBSplineSurf.cpp b/src/Mod/Surface/App/FeatureBSplineSurf.cpp
index 991ec19d46..3fb295f4bc 100644
--- a/src/Mod/Surface/App/FeatureBSplineSurf.cpp
+++ b/src/Mod/Surface/App/FeatureBSplineSurf.cpp
@@ -33,12 +33,13 @@
 #include <BRep_Tool.hxx>
 #include <TopExp_Explorer.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
 #include <GeomFill_BSplineCurves.hxx>
 #include <GeomFill.hxx>
 #endif
 
+#include <Base/Tools.h>
+#include <Base/Exception.h>
+
 #include "FeatureBSplineSurf.h"
 
 
diff --git a/src/Mod/Surface/App/FeatureBSurf.cpp b/src/Mod/Surface/App/FeatureBSurf.cpp
index 6227bd44c7..497cc97aec 100644
--- a/src/Mod/Surface/App/FeatureBSurf.cpp
+++ b/src/Mod/Surface/App/FeatureBSurf.cpp
@@ -30,11 +30,14 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Wire.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
+#include <GeomFill_BezierCurves.hxx>
+#include <Geom_BoundedSurface.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #endif
 
+#include <Base/Exception.h>
+#include <Base/Tools.h>
+
 #include "FeatureBSurf.h"
 
 using namespace Surface;
diff --git a/src/Mod/Surface/App/FeatureBSurf.h b/src/Mod/Surface/App/FeatureBSurf.h
index a602e768a1..786d10f606 100644
--- a/src/Mod/Surface/App/FeatureBSurf.h
+++ b/src/Mod/Surface/App/FeatureBSurf.h
@@ -24,19 +24,19 @@
 #ifndef FEATUREBSURF_H
 #define FEATUREBSURF_H
 
+#include <GeomFill_FillingStyle.hxx>
+
 #include <App/PropertyStandard.h>
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
-#include <GeomFill_BezierCurves.hxx>
-#include <Geom_BoundedSurface.hxx>
 #include "Mod/Part/App/PartFeature.h"
-#include "../FillType.h"
+#include "Mod/Surface/FillType.h"
+
+class Handle_Geom_BoundedSurface;
 
 namespace Surface
 {
-
-
-
+  
 class BSurf : public Part::Feature
 {
   PROPERTY_HEADER(Surface::BSurf);
diff --git a/src/Mod/Surface/App/FeatureBezSurf.cpp b/src/Mod/Surface/App/FeatureBezSurf.cpp
index 703ad1e20b..de2c34df5f 100644
--- a/src/Mod/Surface/App/FeatureBezSurf.cpp
+++ b/src/Mod/Surface/App/FeatureBezSurf.cpp
@@ -33,12 +33,13 @@
 #include <BRep_Tool.hxx>
 #include <TopExp_Explorer.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
 #include <GeomFill_BezierCurves.hxx>
 #include <GeomFill.hxx>
 #endif
 
+#include <Base/Tools.h>
+#include <Base/Exception.h>
+
 #include "FeatureBezSurf.h"
 
 
diff --git a/src/Mod/Surface/App/PreCompiled.h b/src/Mod/Surface/App/PreCompiled.h
index 30eec3de93..e7e27dffff 100644
--- a/src/Mod/Surface/App/PreCompiled.h
+++ b/src/Mod/Surface/App/PreCompiled.h
@@ -59,6 +59,9 @@
 // Xerces
 #include <xercesc/util/XercesDefs.hpp>
 
+//opencascade
+#include "OpenCascadeAll.h"
+
 #endif //_PreComp_
 
 #endif
diff --git a/src/Mod/Surface/Gui/BSurf.cpp b/src/Mod/Surface/Gui/BSurf.cpp
index b6eea61c7c..11d8789c1c 100644
--- a/src/Mod/Surface/Gui/BSurf.cpp
+++ b/src/Mod/Surface/Gui/BSurf.cpp
@@ -21,22 +21,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Standard_math.hxx>
-# include <BRep_Builder.hxx>
-# include <TopoDS.hxx>
-# include <TopExp_Explorer.hxx>
-# include <gp_Pln.hxx>
-# include <cfloat>
-# include <QFuture>
-# include <QFutureWatcher>
-# include <QtConcurrentMap>
-# include <boost/bind.hpp>
-#endif
 
-#include "BSurf.h"
-#include "../App/FeatureBSurf.h"
-#include "../FillType.h"
+#include <Mod/Surface/App/FeatureBSurf.h>
+#include <Mod/Surface/FillType.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
@@ -44,6 +31,7 @@
 #include <Base/Sequencer.h>
 #include <Gui/Control.h>
 
+#include "BSurf.h"
 #include "ui_BSurf.h"
 
 
diff --git a/src/Mod/Surface/Gui/BSurf.h b/src/Mod/Surface/Gui/BSurf.h
index c953d7fcbc..f1df207ee0 100644
--- a/src/Mod/Surface/Gui/BSurf.h
+++ b/src/Mod/Surface/Gui/BSurf.h
@@ -30,11 +30,9 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Base/BoundBox.h>
-#include <QWidget>
-#include <QPointer>
-#include "../FillType.h"
+#include <Mod/Surface/FillType.h>
 #include <Mod/Part/Gui/ViewProvider.h>
-#include "../App/FeatureBSurf.h"
+#include <Mod/Surface/App/FeatureBSurf.h>
 
 namespace SurfaceGui
 {