diff --git a/src/Mod/Surface/App/FeatureCut.h b/src/Mod/Surface/App/FeatureCut.h
index 83ee9de87b..eba82cbfa1 100644
--- a/src/Mod/Surface/App/FeatureCut.h
+++ b/src/Mod/Surface/App/FeatureCut.h
@@ -27,6 +27,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/PartFeature.h>
+#include <Mod/Surface/SurfaceGlobal.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/FeatureExtend.h b/src/Mod/Surface/App/FeatureExtend.h
index 774d106837..e23917ae35 100644
--- a/src/Mod/Surface/App/FeatureExtend.h
+++ b/src/Mod/Surface/App/FeatureExtend.h
@@ -27,6 +27,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
+#include <Mod/Surface/SurfaceGlobal.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/FeatureFilling.h b/src/Mod/Surface/App/FeatureFilling.h
index 26ccc85d3d..b5173e9832 100644
--- a/src/Mod/Surface/App/FeatureFilling.h
+++ b/src/Mod/Surface/App/FeatureFilling.h
@@ -27,6 +27,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
+#include <Mod/Surface/SurfaceGlobal.h>
 
 class BRepFill_Filling;
 
diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h
index 501d98e9d9..781b66257d 100644
--- a/src/Mod/Surface/App/FeatureGeomFillSurface.h
+++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h
@@ -32,6 +32,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
+#include <Mod/Surface/SurfaceGlobal.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/FeatureSections.h b/src/Mod/Surface/App/FeatureSections.h
index 065d693e0c..e9e42f9213 100644
--- a/src/Mod/Surface/App/FeatureSections.h
+++ b/src/Mod/Surface/App/FeatureSections.h
@@ -27,6 +27,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/FeaturePartSpline.h>
+#include <Mod/Surface/SurfaceGlobal.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h
index c12978403a..239c2ee054 100644
--- a/src/Mod/Surface/App/FeatureSewing.h
+++ b/src/Mod/Surface/App/FeatureSewing.h
@@ -27,6 +27,7 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Part/App/PartFeature.h>
+#include <Mod/Surface/SurfaceGlobal.h>
 
 namespace Surface
 {
diff --git a/src/Mod/Surface/App/PreCompiled.h b/src/Mod/Surface/App/PreCompiled.h
index a61233ff8d..edc8ffc830 100644
--- a/src/Mod/Surface/App/PreCompiled.h
+++ b/src/Mod/Surface/App/PreCompiled.h
@@ -21,22 +21,11 @@
  ***************************************************************************/
 
 
-//#ifndef APP_PRECOMPILED_H
-//#define APP_PRECOMPILED_H
 #ifndef PRECOMPILED_H
 #define PRECOMPILED_H
 
 #include <FCConfig.h>
 
-// Exporting of App classes
-#ifdef FC_OS_WIN32
-# define SurfaceExport __declspec(dllexport)
-# define PartExport     __declspec(dllimport)
-#else // for Linux
-# define SurfaceExport
-# define PartExport
-#endif
-
 #ifdef _PreComp_
 
 // standard
diff --git a/src/Mod/Surface/Gui/PreCompiled.h b/src/Mod/Surface/Gui/PreCompiled.h
index f850cb5e78..16d8beb03a 100644
--- a/src/Mod/Surface/Gui/PreCompiled.h
+++ b/src/Mod/Surface/Gui/PreCompiled.h
@@ -26,19 +26,6 @@
 
 #include <FCConfig.h>
 
-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define PartExport           __declspec(dllimport)
-# define PartGuiExport        __declspec(dllimport)
-# define SurfaceExport        __declspec(dllimport)
-# define SurfaceGuiExport     __declspec(dllexport)
-#else // for Linux
-# define PartExport
-# define PartGuiExport
-# define SurfaceExport
-# define SurfaceGuiExport
-#endif
-
 #ifdef _PreComp_
 
 // standard