diff --git a/src/Mod/Fem/App/FemAnalysis.cpp b/src/Mod/Fem/App/FemAnalysis.cpp
index 1d686d2465..1d70c8afdc 100644
--- a/src/Mod/Fem/App/FemAnalysis.cpp
+++ b/src/Mod/Fem/App/FemAnalysis.cpp
@@ -87,7 +87,7 @@ template<> const char* Fem::FemAnalysisPython::getViewProviderName(void) const {
 /// @endcond
 
 // explicit template instantiation
-template class AppFemExport FeaturePythonT<Fem::FemAnalysis>;
+template class FemExport FeaturePythonT<Fem::FemAnalysis>;
 }
 
 // ---------------------------------------------------------
@@ -106,6 +106,6 @@ template<> PyObject* Fem::FeaturePython::getPyObject(void) {
     return Py::new_reference_to(PythonObject);
 }
 // explicit template instantiation
-template class AppFemExport FeaturePythonT<Fem::DocumentObject>;
+template class FemExport FeaturePythonT<Fem::DocumentObject>;
 /// @endcond
 }
diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h
index 035c88b012..3e5a034194 100644
--- a/src/Mod/Fem/App/FemAnalysis.h
+++ b/src/Mod/Fem/App/FemAnalysis.h
@@ -26,6 +26,7 @@
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyLinks.h>
 #include <App/FeaturePython.h>
+#include <Mod/Fem/FemGlobal.h>
 
 
 namespace Fem {
@@ -48,7 +49,7 @@ namespace Fem {
  *  Analysis object. Every document object of FreeCAD can be part of a
  *  Analysis.
  */
-class AppFemExport FemAnalysis : public App::DocumentObjectGroup {
+class FemExport FemAnalysis : public App::DocumentObjectGroup {
     PROPERTY_HEADER(Fem::FemAnalysis);
 
 public:
@@ -85,7 +86,7 @@ protected:
         Base::XMLReader &reader, const char * TypeName, const char *PropName);
 };
 
-class AppFemExport DocumentObject : public App::DocumentObject
+class FemExport DocumentObject : public App::DocumentObject
 {
     PROPERTY_HEADER(Fem::DocumentObject);
 };
diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp
index 8003fd6d79..75dfc989f0 100644
--- a/src/Mod/Fem/App/FemConstraint.cpp
+++ b/src/Mod/Fem/App/FemConstraint.cpp
@@ -501,7 +501,7 @@ template<> PyObject* Fem::ConstraintPython::getPyObject(void) {
 }
 
 // explicit template instantiation
-template class AppFemExport FeaturePythonT<Fem::Constraint>;
+template class FemExport FeaturePythonT<Fem::Constraint>;
 
 /// @endcond
 
diff --git a/src/Mod/Fem/App/FemConstraint.h b/src/Mod/Fem/App/FemConstraint.h
index 0598a1c450..bcbc58444b 100644
--- a/src/Mod/Fem/App/FemConstraint.h
+++ b/src/Mod/Fem/App/FemConstraint.h
@@ -30,6 +30,7 @@
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
 #include <App/PropertyGeo.h>
+#include <Mod/Fem/FemGlobal.h>
 
 namespace Fem {
 
@@ -55,7 +56,7 @@ namespace Fem {
  *  and @ref Scale and the protected method @ref getPoints(points&, normals&,
  *  scale&).
  */
-class AppFemExport Constraint : public App::DocumentObject {
+class FemExport Constraint : public App::DocumentObject {
     PROPERTY_HEADER(Fem::Constraint);
 
 public:
diff --git a/src/Mod/Fem/App/FemConstraintBearing.h b/src/Mod/Fem/App/FemConstraintBearing.h
index 1b0c3de820..ab027b9dfa 100644
--- a/src/Mod/Fem/App/FemConstraintBearing.h
+++ b/src/Mod/Fem/App/FemConstraintBearing.h
@@ -34,7 +34,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintBearing : public Fem::Constraint
+class FemExport ConstraintBearing : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintBearing);
 
diff --git a/src/Mod/Fem/App/FemConstraintContact.h b/src/Mod/Fem/App/FemConstraintContact.h
index d4a61c3ed8..a4ba7f92bd 100644
--- a/src/Mod/Fem/App/FemConstraintContact.h
+++ b/src/Mod/Fem/App/FemConstraintContact.h
@@ -30,7 +30,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintContact : public Fem::Constraint
+class FemExport ConstraintContact : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintContact);
 
diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.h b/src/Mod/Fem/App/FemConstraintDisplacement.h
index 8cb34328ff..2ebae5030f 100644
--- a/src/Mod/Fem/App/FemConstraintDisplacement.h
+++ b/src/Mod/Fem/App/FemConstraintDisplacement.h
@@ -32,7 +32,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintDisplacement : public Fem::Constraint
+class FemExport ConstraintDisplacement : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintDisplacement);
 
diff --git a/src/Mod/Fem/App/FemConstraintFixed.h b/src/Mod/Fem/App/FemConstraintFixed.h
index 92ab188020..a32ce3df7a 100644
--- a/src/Mod/Fem/App/FemConstraintFixed.h
+++ b/src/Mod/Fem/App/FemConstraintFixed.h
@@ -34,7 +34,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintFixed : public Fem::Constraint
+class FemExport ConstraintFixed : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintFixed);
 
diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.h b/src/Mod/Fem/App/FemConstraintFluidBoundary.h
index 7c6cbcab52..531c6384d5 100644
--- a/src/Mod/Fem/App/FemConstraintFluidBoundary.h
+++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.h
@@ -35,7 +35,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintFluidBoundary: public Fem::Constraint
+class FemExport ConstraintFluidBoundary: public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintFluidBoundary);
 
diff --git a/src/Mod/Fem/App/FemConstraintForce.h b/src/Mod/Fem/App/FemConstraintForce.h
index 293150ced4..b263676c11 100644
--- a/src/Mod/Fem/App/FemConstraintForce.h
+++ b/src/Mod/Fem/App/FemConstraintForce.h
@@ -34,7 +34,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintForce : public Fem::Constraint
+class FemExport ConstraintForce : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintForce);
 
diff --git a/src/Mod/Fem/App/FemConstraintGear.h b/src/Mod/Fem/App/FemConstraintGear.h
index ba0b78aa08..27f186bf1a 100644
--- a/src/Mod/Fem/App/FemConstraintGear.h
+++ b/src/Mod/Fem/App/FemConstraintGear.h
@@ -34,7 +34,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintGear : public Fem::ConstraintBearing
+class FemExport ConstraintGear : public Fem::ConstraintBearing
 {
     PROPERTY_HEADER(Fem::ConstraintGear);
 
diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.h b/src/Mod/Fem/App/FemConstraintHeatflux.h
index 035cc84c08..33f1a4485c 100644
--- a/src/Mod/Fem/App/FemConstraintHeatflux.h
+++ b/src/Mod/Fem/App/FemConstraintHeatflux.h
@@ -31,7 +31,7 @@
 
 namespace Fem {
 
-class AppFemExport ConstraintHeatflux : public Fem::Constraint
+class FemExport ConstraintHeatflux : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintHeatflux);
 
diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.h b/src/Mod/Fem/App/FemConstraintInitialTemperature.h
index bcaf73c424..c594490c24 100644
--- a/src/Mod/Fem/App/FemConstraintInitialTemperature.h
+++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.h
@@ -32,7 +32,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintInitialTemperature : public Fem::Constraint
+class FemExport ConstraintInitialTemperature : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintInitialTemperature);
 
diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.h b/src/Mod/Fem/App/FemConstraintPlaneRotation.h
index b41a317ec6..15c8e851a1 100644
--- a/src/Mod/Fem/App/FemConstraintPlaneRotation.h
+++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.h
@@ -30,7 +30,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintPlaneRotation : public Fem::Constraint
+class FemExport ConstraintPlaneRotation : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintPlaneRotation);
 
diff --git a/src/Mod/Fem/App/FemConstraintPressure.h b/src/Mod/Fem/App/FemConstraintPressure.h
index 5d02ffa551..e25b36cf54 100644
--- a/src/Mod/Fem/App/FemConstraintPressure.h
+++ b/src/Mod/Fem/App/FemConstraintPressure.h
@@ -29,7 +29,7 @@
 
 namespace Fem {
 
-class AppFemExport ConstraintPressure : public Fem::Constraint
+class FemExport ConstraintPressure : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintPressure);
 
diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h
index a38fb86da2..f7a689a585 100644
--- a/src/Mod/Fem/App/FemConstraintPulley.h
+++ b/src/Mod/Fem/App/FemConstraintPulley.h
@@ -34,7 +34,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintPulley : public Fem::ConstraintGear
+class FemExport ConstraintPulley : public Fem::ConstraintGear
 {
     PROPERTY_HEADER(Fem::ConstraintPulley);
 
diff --git a/src/Mod/Fem/App/FemConstraintSpring.h b/src/Mod/Fem/App/FemConstraintSpring.h
index 585564b6de..0a743091bb 100644
--- a/src/Mod/Fem/App/FemConstraintSpring.h
+++ b/src/Mod/Fem/App/FemConstraintSpring.h
@@ -29,7 +29,7 @@
 
 namespace Fem {
 
-class AppFemExport ConstraintSpring : public Fem::Constraint
+class FemExport ConstraintSpring : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintSpring);
 
diff --git a/src/Mod/Fem/App/FemConstraintTemperature.h b/src/Mod/Fem/App/FemConstraintTemperature.h
index f7c2a6dc9e..078d514490 100644
--- a/src/Mod/Fem/App/FemConstraintTemperature.h
+++ b/src/Mod/Fem/App/FemConstraintTemperature.h
@@ -32,7 +32,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintTemperature : public Fem::Constraint
+class FemExport ConstraintTemperature : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintTemperature);
 
diff --git a/src/Mod/Fem/App/FemConstraintTransform.h b/src/Mod/Fem/App/FemConstraintTransform.h
index b846c5bd74..a93dc363d2 100644
--- a/src/Mod/Fem/App/FemConstraintTransform.h
+++ b/src/Mod/Fem/App/FemConstraintTransform.h
@@ -29,7 +29,7 @@
 namespace Fem
 {
 
-class AppFemExport ConstraintTransform : public Fem::Constraint
+class FemExport ConstraintTransform : public Fem::Constraint
 {
     PROPERTY_HEADER(Fem::ConstraintTransform);
 
diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h
index b34a7acf85..1519fdccb6 100644
--- a/src/Mod/Fem/App/FemMesh.h
+++ b/src/Mod/Fem/App/FemMesh.h
@@ -27,6 +27,7 @@
 #include <App/ComplexGeoData.h>
 #include <Base/Placement.h>
 #include <Base/Quantity.h>
+#include <Mod/Fem/FemGlobal.h>
 
 #include <vector>
 #include <list>
@@ -50,7 +51,7 @@ typedef std::shared_ptr<SMESH_Hypothesis> SMESH_HypothesisPtr;
 
 /** The representation of a FemMesh
  */
-class AppFemExport FemMesh : public Data::ComplexGeoData
+class FemExport FemMesh : public Data::ComplexGeoData
 {
     TYPESYSTEM_HEADER();
 
diff --git a/src/Mod/Fem/App/FemMeshObject.cpp b/src/Mod/Fem/App/FemMeshObject.cpp
index df5bf828be..8c056e9bb8 100644
--- a/src/Mod/Fem/App/FemMeshObject.cpp
+++ b/src/Mod/Fem/App/FemMeshObject.cpp
@@ -91,7 +91,7 @@ template<> PyObject* Fem::FemMeshObjectPython::getPyObject(void) {
 }
 
 // explicit template instantiation
-template class AppFemExport FeaturePythonT<Fem::FemMeshObject>;
+template class FemExport FeaturePythonT<Fem::FemMeshObject>;
 
 /// @endcond
 
diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h
index c0c0b4712d..718324b778 100644
--- a/src/Mod/Fem/App/FemMeshObject.h
+++ b/src/Mod/Fem/App/FemMeshObject.h
@@ -35,7 +35,7 @@
 namespace Fem
 {
 
-class AppFemExport FemMeshObject : public App::GeoFeature
+class FemExport FemMeshObject : public App::GeoFeature
 {
     PROPERTY_HEADER(Fem::FemMeshObject);
 
diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h
index 20df9652f7..857f3cb881 100644
--- a/src/Mod/Fem/App/FemMeshProperty.h
+++ b/src/Mod/Fem/App/FemMeshProperty.h
@@ -35,7 +35,7 @@ namespace Fem
 /** The part shape property class.
  * @author Werner Mayer
  */
-class AppFemExport PropertyFemMesh : public App::PropertyComplexGeoData
+class FemExport PropertyFemMesh : public App::PropertyComplexGeoData
 {
     TYPESYSTEM_HEADER();
 
diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h
index 66577f80aa..01ecb36f49 100644
--- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h
+++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h
@@ -32,7 +32,7 @@
 namespace Fem
 {
 
-class AppFemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
+class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
 {
     PROPERTY_HEADER(Fem::FemMeshShapeNetgenObject);
 
diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h
index 73619fee86..e3ecfe5c29 100644
--- a/src/Mod/Fem/App/FemMeshShapeObject.h
+++ b/src/Mod/Fem/App/FemMeshShapeObject.h
@@ -30,7 +30,7 @@
 namespace Fem
 {
 
-class AppFemExport FemMeshShapeObject : public FemMeshObject
+class FemExport FemMeshShapeObject : public FemMeshObject
 {
     PROPERTY_HEADER(Fem::FemMeshShapeObject);
 
diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h
index 578f098b82..90811160ef 100644
--- a/src/Mod/Fem/App/FemPostFilter.h
+++ b/src/Mod/Fem/App/FemPostFilter.h
@@ -43,7 +43,7 @@
 namespace Fem
 {
 
-class AppFemExport FemPostFilter : public Fem::FemPostObject
+class FemExport FemPostFilter : public Fem::FemPostObject
 {
     PROPERTY_HEADER(Fem::FemPostFilter);
 
@@ -75,7 +75,7 @@ private:
     std::string m_activePipeline;
 };
 
-class AppFemExport FemPostClipFilter : public FemPostFilter {
+class FemExport FemPostClipFilter : public FemPostFilter {
 
     PROPERTY_HEADER(Fem::FemPostClipFilter);
 
@@ -101,7 +101,7 @@ private:
     vtkSmartPointer<vtkExtractGeometry>         m_extractor;
 };
 
-class AppFemExport FemPostDataAlongLineFilter : public FemPostFilter {
+class FemExport FemPostDataAlongLineFilter : public FemPostFilter {
 
     PROPERTY_HEADER(Fem::FemPostDataAlongLineFilter);
 
@@ -133,7 +133,7 @@ private:
 
 };
 
-class AppFemExport FemPostDataAtPointFilter : public FemPostFilter {
+class FemExport FemPostDataAtPointFilter : public FemPostFilter {
 
     PROPERTY_HEADER(Fem::FemPostDataAtPointFilter);
 
@@ -164,7 +164,7 @@ private:
 
 };
 
-class AppFemExport FemPostScalarClipFilter : public FemPostFilter {
+class FemExport FemPostScalarClipFilter : public FemPostFilter {
 
     PROPERTY_HEADER(Fem::FemPostScalarClipFilter);
 
@@ -192,7 +192,7 @@ private:
     App::PropertyFloatConstraint::Constraints   m_constraints;
 };
 
-class AppFemExport FemPostWarpVectorFilter : public FemPostFilter {
+class FemExport FemPostWarpVectorFilter : public FemPostFilter {
 
     PROPERTY_HEADER(Fem::FemPostWarpVectorFilter);
 
@@ -217,7 +217,7 @@ private:
     App::Enumeration                 m_vectorFields;
 };
 
-class AppFemExport FemPostCutFilter : public FemPostFilter {
+class FemExport FemPostCutFilter : public FemPostFilter {
 
     PROPERTY_HEADER(Fem::FemPostCutFilter);
 
diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h
index a2ca7c404a..3e74812a79 100644
--- a/src/Mod/Fem/App/FemPostFunction.h
+++ b/src/Mod/Fem/App/FemPostFunction.h
@@ -36,7 +36,7 @@
 namespace Fem
 {
 
-class AppFemExport FemPostFunction : public App::DocumentObject
+class FemExport FemPostFunction : public App::DocumentObject
 {
     PROPERTY_HEADER(Fem::FemPostFunction);
 
@@ -62,7 +62,7 @@ protected:
     vtkBoundingBox                        m_boundingBox;
 };
 
-class AppFemExport FemPostFunctionProvider : public App::DocumentObject {
+class FemExport FemPostFunctionProvider : public App::DocumentObject {
 
     PROPERTY_HEADER(Fem::FemPostFunctionProvider);
 
@@ -83,7 +83,7 @@ protected:
 
 // ---------------------------------------------------------------------------
 
-class AppFemExport FemPostPlaneFunction : public FemPostFunction
+class FemExport FemPostPlaneFunction : public FemPostFunction
 {
     PROPERTY_HEADER(Fem::FemPostPlaneFunction);
 
@@ -107,7 +107,7 @@ protected:
 
 // ---------------------------------------------------------------------------
 
-class AppFemExport FemPostSphereFunction : public FemPostFunction
+class FemExport FemPostSphereFunction : public FemPostFunction
 {
     PROPERTY_HEADER(Fem::FemPostSphereFunction);
 
diff --git a/src/Mod/Fem/App/FemPostObject.h b/src/Mod/Fem/App/FemPostObject.h
index d80b649d66..5744c1e56f 100644
--- a/src/Mod/Fem/App/FemPostObject.h
+++ b/src/Mod/Fem/App/FemPostObject.h
@@ -33,7 +33,7 @@ namespace Fem
 {
 
 //poly data is the only data we can visualize, hence every post processing object needs to expose it
-class AppFemExport FemPostObject : public App::GeoFeature
+class FemExport FemPostObject : public App::GeoFeature
 {
     PROPERTY_HEADER(Fem::FemPostObject);
 
diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h
index 959b1b52a8..b1446263f5 100644
--- a/src/Mod/Fem/App/FemPostPipeline.h
+++ b/src/Mod/Fem/App/FemPostPipeline.h
@@ -35,7 +35,7 @@
 namespace Fem
 {
 
-class AppFemExport FemPostPipeline : public Fem::FemPostFilter
+class FemExport FemPostPipeline : public Fem::FemPostFilter
 {
     PROPERTY_HEADER(Fem::FemPostPipeline);
 
diff --git a/src/Mod/Fem/App/FemResultObject.cpp b/src/Mod/Fem/App/FemResultObject.cpp
index 5f96d237ff..e1750b7311 100644
--- a/src/Mod/Fem/App/FemResultObject.cpp
+++ b/src/Mod/Fem/App/FemResultObject.cpp
@@ -86,6 +86,6 @@ template<> PyObject* Fem::FemResultObjectPython::getPyObject(void) {
 }
 
 // explicit template instantiation
-template class AppFemExport FeaturePythonT<Fem::FemResultObject>;
+template class FemExport FeaturePythonT<Fem::FemResultObject>;
 
 }
diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h
index f05e5a4fc6..b3f778b665 100644
--- a/src/Mod/Fem/App/FemResultObject.h
+++ b/src/Mod/Fem/App/FemResultObject.h
@@ -28,12 +28,12 @@
 #include <App/PropertyUnits.h>
 #include <App/PropertyStandard.h>
 #include <App/FeaturePython.h>
-#include "FemResultObject.h"
+#include <Mod/Fem/FemGlobal.h>
 
 namespace Fem
 {
 /// Father of all result data in a Fem Analysis
-class AppFemExport FemResultObject : public App::DocumentObject
+class FemExport FemResultObject : public App::DocumentObject
 {
     PROPERTY_HEADER(Fem::FemResultObject);
 
diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h
index e7f16dd167..87881187a5 100644
--- a/src/Mod/Fem/App/FemSetElementsObject.h
+++ b/src/Mod/Fem/App/FemSetElementsObject.h
@@ -31,7 +31,7 @@
 namespace Fem
 {
 
-class AppFemExport FemSetElementsObject : public FemSetObject
+class FemExport FemSetElementsObject : public FemSetObject
 {
     PROPERTY_HEADER(Fem::FemSetElementsObject);
 
diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h
index 526ce6c4f6..1b5dc6a387 100644
--- a/src/Mod/Fem/App/FemSetFacesObject.h
+++ b/src/Mod/Fem/App/FemSetFacesObject.h
@@ -31,7 +31,7 @@
 namespace Fem
 {
 
-class AppFemExport FemSetFacesObject : public FemSetObject
+class FemExport FemSetFacesObject : public FemSetObject
 {
     PROPERTY_HEADER(Fem::FemSetFacesObject);
 
diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h
index 735003cc04..3ace740d57 100644
--- a/src/Mod/Fem/App/FemSetGeometryObject.h
+++ b/src/Mod/Fem/App/FemSetGeometryObject.h
@@ -31,7 +31,7 @@
 namespace Fem
 {
 
-class AppFemExport FemSetGeometryObject : public FemSetObject
+class FemExport FemSetGeometryObject : public FemSetObject
 {
     PROPERTY_HEADER(Fem::FemSetGeometryObject);
 
diff --git a/src/Mod/Fem/App/FemSetNodesObject.h b/src/Mod/Fem/App/FemSetNodesObject.h
index 100133ac41..9b59a37706 100644
--- a/src/Mod/Fem/App/FemSetNodesObject.h
+++ b/src/Mod/Fem/App/FemSetNodesObject.h
@@ -31,7 +31,7 @@
 namespace Fem
 {
 
-class AppFemExport FemSetNodesObject : public FemSetObject
+class FemExport FemSetNodesObject : public FemSetObject
 {
     PROPERTY_HEADER(Fem::FemSetNodesObject);
 
diff --git a/src/Mod/Fem/App/FemSetObject.h b/src/Mod/Fem/App/FemSetObject.h
index 064ac58857..3b79ae7408 100644
--- a/src/Mod/Fem/App/FemSetObject.h
+++ b/src/Mod/Fem/App/FemSetObject.h
@@ -26,12 +26,12 @@
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include "FemSetObject.h"
+#include <Mod/Fem/FemGlobal.h>
 
 namespace Fem
 {
 
-class AppFemExport FemSetObject : public App::DocumentObject
+class FemExport FemSetObject : public App::DocumentObject
 {
     PROPERTY_HEADER(Fem::FemSetObject);
 
diff --git a/src/Mod/Fem/App/FemSolverObject.cpp b/src/Mod/Fem/App/FemSolverObject.cpp
index ea609e91cf..e8dca06337 100644
--- a/src/Mod/Fem/App/FemSolverObject.cpp
+++ b/src/Mod/Fem/App/FemSolverObject.cpp
@@ -79,6 +79,6 @@ template<> PyObject* Fem::FemSolverObjectPython::getPyObject(void) {
 }
 /// @endcond
 // explicit template instantiation
-template class AppFemExport FeaturePythonT<Fem::FemSolverObject>;
+template class FemExport FeaturePythonT<Fem::FemSolverObject>;
 
 }
diff --git a/src/Mod/Fem/App/FemSolverObject.h b/src/Mod/Fem/App/FemSolverObject.h
index f9a624c3e1..83045ec785 100644
--- a/src/Mod/Fem/App/FemSolverObject.h
+++ b/src/Mod/Fem/App/FemSolverObject.h
@@ -26,11 +26,12 @@
 #define Fem_FemSolverObject_H
 
 #include <App/FeaturePython.h>
+#include <Mod/Fem/FemGlobal.h>
 
 namespace Fem
 {
 /// Father of all result data in a Fem Analysis
-class AppFemExport FemSolverObject : public App::DocumentObject
+class FemExport FemSolverObject : public App::DocumentObject
 {
     PROPERTY_HEADER(Fem::FemSolverObject);
 
diff --git a/src/Mod/Fem/App/FemTools.h b/src/Mod/Fem/App/FemTools.h
index f57498c040..ebfa3e9a1f 100644
--- a/src/Mod/Fem/App/FemTools.h
+++ b/src/Mod/Fem/App/FemTools.h
@@ -26,6 +26,7 @@
 
 #include <Base/Vector3D.h>
 #include <gp_XYZ.hxx>
+#include <Mod/Fem/FemGlobal.h>
 
 class TopoDS_Shape;
 class TopoDS_Edge;
@@ -34,7 +35,7 @@ class TopoDS_Face;
 namespace Fem
 {
 
-class AppFemExport Tools
+class FemExport Tools
 {
 public:
     /*!
diff --git a/src/Mod/Fem/App/FemVTKTools.h b/src/Mod/Fem/App/FemVTKTools.h
index 42702f11d2..d9bed761f2 100644
--- a/src/Mod/Fem/App/FemVTKTools.h
+++ b/src/Mod/Fem/App/FemVTKTools.h
@@ -39,7 +39,7 @@ namespace Fem
 {
 
     // utility class to import/export read/write vtk mesh and result
-    class AppFemExport FemVTKTools
+    class FemExport FemVTKTools
     {
     public:
         // extract data from vtkUnstructuredGrid instance and fill a FreeCAD FEM mesh object with that data
diff --git a/src/Mod/Fem/App/PropertyPostDataObject.h b/src/Mod/Fem/App/PropertyPostDataObject.h
index e4235ed6da..93c4347785 100644
--- a/src/Mod/Fem/App/PropertyPostDataObject.h
+++ b/src/Mod/Fem/App/PropertyPostDataObject.h
@@ -28,6 +28,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkDataObject.h>
 #include <vtkDataSet.h>
+#include <Mod/Fem/FemGlobal.h>
 
 namespace Fem
 {
diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
index 3d4c540c89..f0ec8ffa62 100644
--- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h
+++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
@@ -26,6 +26,7 @@
 
 #include <Gui/ViewProviderDocumentObjectGroup.h>
 #include <Gui/ViewProviderPythonFeature.h>
+#include <Mod/Fem/FemGlobal.h>
 #include <QCoreApplication>
 
 namespace FemGui
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
index 4eb076dd48..e3433c7001 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
@@ -27,6 +27,7 @@
 
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/ViewProviderPythonFeature.h>
+#include <Mod/Fem/FemGlobal.h>
 #include <QObject>
 #include <QVBoxLayout>
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h
index f58516fd88..46f2b6a9c2 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h
@@ -27,6 +27,7 @@
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/ViewProviderBuilder.h>
 #include <Gui/ViewProviderPythonFeature.h>
+#include <Mod/Fem/FemGlobal.h>
 
 #include <CXX/Objects.hxx>
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
index cad1f3bd2a..24a8867cff 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
@@ -28,6 +28,7 @@
 
 #include <CXX/Objects.hxx>
 #include <Base/Observer.h>
+#include <Mod/Fem/FemGlobal.h>
 #include <vtkSmartPointer.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkOutlineFilter.h>
diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h
index 594ef91dbe..46454ce214 100644
--- a/src/Mod/Fem/Gui/ViewProviderResult.h
+++ b/src/Mod/Fem/Gui/ViewProviderResult.h
@@ -26,6 +26,7 @@
 
 #include <Gui/ViewProviderDocumentObject.h>
 #include <Gui/ViewProviderPythonFeature.h>
+#include <Mod/Fem/FemGlobal.h>
 
 namespace FemGui
 {
diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h
index 063789c2e6..1e892893e2 100644
--- a/src/Mod/Fem/Gui/ViewProviderSolver.h
+++ b/src/Mod/Fem/Gui/ViewProviderSolver.h
@@ -27,6 +27,7 @@
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/ViewProviderBuilder.h>
 #include <Gui/ViewProviderPythonFeature.h>
+#include <Mod/Fem/FemGlobal.h>
 
 class SoCoordinate3;
 class SoDrawStyle;
diff --git a/src/Mod/Fem/Gui/Workbench.h b/src/Mod/Fem/Gui/Workbench.h
index acc43fb2de..e26748f50f 100755
--- a/src/Mod/Fem/Gui/Workbench.h
+++ b/src/Mod/Fem/Gui/Workbench.h
@@ -25,6 +25,7 @@
 #define FEM_WORKBENCH_H
 
 #include <Gui/Workbench.h>
+#include <Mod/Fem/FemGlobal.h>
 
 namespace FemGui {