diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp
index 0182ea1ccc..3abcf1d6b4 100644
--- a/src/Gui/DocumentModel.cpp
+++ b/src/Gui/DocumentModel.cpp
@@ -48,7 +48,7 @@ namespace Gui {
     // Base class
     class DocumentModelIndex : public Base::BaseClass
     {
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
     public:
         ~DocumentModelIndex() override
@@ -113,7 +113,7 @@ namespace Gui {
     // Root node
     class ApplicationIndex : public DocumentModelIndex
     {
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
     public:
         ApplicationIndex(){}
@@ -128,7 +128,7 @@ namespace Gui {
     class DocumentIndex : public DocumentModelIndex
     {
         friend class ViewProviderIndex;
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
         static QIcon* documentIcon;
         typedef boost::unordered_set<ViewProviderIndex*> IndexSet;
         std::map<const ViewProviderDocumentObject*, IndexSet> vp_nodes;
@@ -157,7 +157,7 @@ namespace Gui {
     // Object nodes
     class ViewProviderIndex : public DocumentModelIndex
     {
-        TYPESYSTEM_HEADER();
+        TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
     public:
         const Gui::ViewProviderDocumentObject& v;
diff --git a/src/Gui/EditorView.h b/src/Gui/EditorView.h
index eba3adc554..c57fb7554b 100644
--- a/src/Gui/EditorView.h
+++ b/src/Gui/EditorView.h
@@ -50,7 +50,7 @@ class GuiExport EditorView : public MDIView, public WindowParameter
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum DisplayName {
@@ -121,7 +121,7 @@ class GuiExport PythonEditorView : public EditorView
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonEditorView(PythonEditor* editor, QWidget* parent);
diff --git a/src/Gui/Flag.h b/src/Gui/Flag.h
index a93ebaef10..240eaf2409 100644
--- a/src/Gui/Flag.h
+++ b/src/Gui/Flag.h
@@ -112,7 +112,7 @@ private:
 
 class GuiExport GLFlagWindow : public Gui::GLGraphicsItem
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     GLFlagWindow(View3DInventorViewer*);
diff --git a/src/Gui/GLPainter.h b/src/Gui/GLPainter.h
index cc6c47b6e9..7abdffedff 100644
--- a/src/Gui/GLPainter.h
+++ b/src/Gui/GLPainter.h
@@ -37,6 +37,7 @@
 #endif
 
 #include <Base/BaseClass.h>
+#include <FCGlobal.h>
 #include <QtOpenGL.h>
 #include <QPoint>
 
@@ -84,7 +85,7 @@ private:
 
 class GuiExport GLGraphicsItem : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     GLGraphicsItem()
diff --git a/src/Gui/MDIView.h b/src/Gui/MDIView.h
index de1fa0701c..a37c93642d 100644
--- a/src/Gui/MDIView.h
+++ b/src/Gui/MDIView.h
@@ -56,7 +56,7 @@ class GuiExport MDIView : public QMainWindow, public BaseView
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** View constructor
diff --git a/src/Gui/NavigationStyle.h b/src/Gui/NavigationStyle.h
index f17b010513..862acb397f 100644
--- a/src/Gui/NavigationStyle.h
+++ b/src/Gui/NavigationStyle.h
@@ -73,7 +73,7 @@ private:
  */
 class GuiExport NavigationStyle : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum ViewerMode {
@@ -278,7 +278,7 @@ private:
  * @author Werner Mayer
  */
 class GuiExport UserNavigationStyle : public NavigationStyle {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     UserNavigationStyle(){}
@@ -291,7 +291,7 @@ public:
 class GuiExport InventorNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     InventorNavigationStyle();
@@ -306,7 +306,7 @@ protected:
 class GuiExport CADNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     CADNavigationStyle();
@@ -323,7 +323,7 @@ private:
 class GuiExport RevitNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     RevitNavigationStyle();
@@ -340,7 +340,7 @@ private:
 class GuiExport BlenderNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     BlenderNavigationStyle();
@@ -357,7 +357,7 @@ private:
 class GuiExport MayaGestureNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     MayaGestureNavigationStyle();
@@ -381,7 +381,7 @@ protected:
 class GuiExport TouchpadNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TouchpadNavigationStyle();
@@ -395,7 +395,7 @@ protected:
 class GuiExport OpenCascadeNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     OpenCascadeNavigationStyle();
@@ -409,7 +409,7 @@ protected:
 class GuiExport OpenSCADNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     OpenSCADNavigationStyle();
@@ -423,7 +423,7 @@ protected:
 class GuiExport TinkerCADNavigationStyle : public UserNavigationStyle {
     typedef UserNavigationStyle inherited;
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TinkerCADNavigationStyle();
diff --git a/src/Gui/PythonConsole.h b/src/Gui/PythonConsole.h
index a71d16411d..e0980b39a0 100644
--- a/src/Gui/PythonConsole.h
+++ b/src/Gui/PythonConsole.h
@@ -177,10 +177,10 @@ public:
     PythonConsoleHighlighter(QObject* parent);
     ~PythonConsoleHighlighter() override;
 
-    void highlightBlock (const QString & text);
+    void highlightBlock (const QString & text) override;
 
 protected:
-    void colorChanged(const QString& type, const QColor& col);
+    void colorChanged(const QString& type, const QColor& col) override;
 };
 
 } // namespace Gui
diff --git a/src/Gui/SelectionObject.h b/src/Gui/SelectionObject.h
index c80fe0bbc7..5e64004dc1 100644
--- a/src/Gui/SelectionObject.h
+++ b/src/Gui/SelectionObject.h
@@ -26,6 +26,7 @@
 
 #include <Base/BaseClass.h>
 #include <Base/Vector3D.h>
+#include <FCGlobal.h>
 #include <string>
 
 namespace App {
@@ -41,7 +42,7 @@ class SelectionChanges;
  */
 class GuiExport SelectionObject : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** Constructs a SelectionObject object. */
diff --git a/src/Gui/SplitView3DInventor.h b/src/Gui/SplitView3DInventor.h
index 09e5f89e45..f0c4e7d0e5 100644
--- a/src/Gui/SplitView3DInventor.h
+++ b/src/Gui/SplitView3DInventor.h
@@ -41,7 +41,7 @@ class GuiExport AbstractSplitView : public MDIView, public ParameterGrp::Observe
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=Qt::WindowFlags());
@@ -111,7 +111,7 @@ private:
  */
 class GuiExport SplitView3DInventor : public AbstractSplitView
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags=Qt::WindowFlags());
diff --git a/src/Gui/TransactionObject.h b/src/Gui/TransactionObject.h
index f79b6c40f0..c5a00c6859 100644
--- a/src/Gui/TransactionObject.h
+++ b/src/Gui/TransactionObject.h
@@ -30,7 +30,7 @@ namespace Gui
 {
 class TransactionViewProvider : public App::TransactionObject
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TransactionViewProvider();
diff --git a/src/Gui/View.h b/src/Gui/View.h
index 737251ad49..fd588e6145 100644
--- a/src/Gui/View.h
+++ b/src/Gui/View.h
@@ -25,6 +25,7 @@
 #define GUI_VIEW_H
 
 #include <Base/BaseClass.h>
+#include <FCGlobal.h>
 
 namespace App
 {
@@ -49,7 +50,7 @@ class ViewProvider;
  */
 class GuiExport BaseView : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** View constructor
diff --git a/src/Gui/View3DInventor.h b/src/Gui/View3DInventor.h
index a4e830df5a..ce755cf464 100644
--- a/src/Gui/View3DInventor.h
+++ b/src/Gui/View3DInventor.h
@@ -65,7 +65,7 @@ class GuiExport View3DInventor : public MDIView, public ParameterGrp::ObserverTy
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     View3DInventor(Gui::Document* pcDocument, QWidget* parent, const QtGLWidget* sharewidget = nullptr, Qt::WindowFlags wflags=Qt::WindowFlags());
diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h
index 8f9c488710..331619bc7a 100644
--- a/src/Gui/ViewProvider.h
+++ b/src/Gui/ViewProvider.h
@@ -118,7 +118,7 @@ void GuiExport coinRemoveAllChildren(SoGroup *node);
   */
 class GuiExport ViewProvider : public App::TransactionalObject
 {
-    PROPERTY_HEADER(Gui::ViewProvider);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProvider);
 
 public:
     /// constructor.
diff --git a/src/Gui/ViewProviderAnnotation.h b/src/Gui/ViewProviderAnnotation.h
index 7fa8aa265d..1d2d5e7923 100644
--- a/src/Gui/ViewProviderAnnotation.h
+++ b/src/Gui/ViewProviderAnnotation.h
@@ -42,7 +42,7 @@ namespace Gui
 
 class GuiExport ViewProviderAnnotation : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderAnnotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderAnnotation);
 
 public:
     /// Constructor
@@ -86,7 +86,7 @@ private:
  */
 class GuiExport ViewProviderAnnotationLabel : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderAnnotationLabel);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderAnnotationLabel);
 
 public:
     /// Constructor
diff --git a/src/Gui/ViewProviderExtension.h b/src/Gui/ViewProviderExtension.h
index 559ec7a993..2b68a6e8f5 100644
--- a/src/Gui/ViewProviderExtension.h
+++ b/src/Gui/ViewProviderExtension.h
@@ -51,7 +51,7 @@ class GuiExport ViewProviderExtension : public App::Extension
 
     //The cass does not have properties itself, but it is important to provide the property access
     //functions.
-    EXTENSION_PROPERTY_HEADER(Gui::ViewProviderExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderExtension);
 
 public:
 
diff --git a/src/Gui/ViewProviderExtern.h b/src/Gui/ViewProviderExtern.h
index 8a89e57170..0cbc917d03 100644
--- a/src/Gui/ViewProviderExtern.h
+++ b/src/Gui/ViewProviderExtern.h
@@ -35,7 +35,7 @@ namespace Gui {
 
 class GuiExport ViewProviderExtern:public ViewProvider
 {
-    PROPERTY_HEADER(Gui::ViewProviderExtern);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderExtern);
 
 public:
     /// constructor.
diff --git a/src/Gui/ViewProviderFeature.h b/src/Gui/ViewProviderFeature.h
index 5d01f95c56..cc9968215e 100644
--- a/src/Gui/ViewProviderFeature.h
+++ b/src/Gui/ViewProviderFeature.h
@@ -34,7 +34,7 @@ class View3DInventorViewer;
 
 class GuiExport ViewProviderFeature:public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderFeature);
 
 public:
     /// constructor.
diff --git a/src/Gui/ViewProviderGeometryObject.h b/src/Gui/ViewProviderGeometryObject.h
index 5fc680608a..0b16849284 100644
--- a/src/Gui/ViewProviderGeometryObject.h
+++ b/src/Gui/ViewProviderGeometryObject.h
@@ -45,7 +45,7 @@ class View3DInventorViewer;
  */
 class GuiExport ViewProviderGeometryObject : public ViewProviderDragger
 {
-    PROPERTY_HEADER(Gui::ViewProviderGeometryObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderGeometryObject);
 
 public:
     /// constructor.
diff --git a/src/Gui/ViewProviderInventorObject.h b/src/Gui/ViewProviderInventorObject.h
index cbf21f8636..57b7c3356d 100644
--- a/src/Gui/ViewProviderInventorObject.h
+++ b/src/Gui/ViewProviderInventorObject.h
@@ -32,7 +32,7 @@ namespace Gui
 
 class GuiExport ViewProviderInventorObject : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderInventorObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderInventorObject);
 
 public:
     /// constructor.
diff --git a/src/Gui/ViewProviderLine.h b/src/Gui/ViewProviderLine.h
index cd52e077e0..95fa60f3d0 100644
--- a/src/Gui/ViewProviderLine.h
+++ b/src/Gui/ViewProviderLine.h
@@ -31,7 +31,7 @@ namespace Gui
 {
 
 class GuiExport ViewProviderLine : public ViewProviderOriginFeature {
-    PROPERTY_HEADER(Gui::ViewProviderLine);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderLine);
 public:
     /// Constructor
     ViewProviderLine();
diff --git a/src/Gui/ViewProviderMaterialObject.h b/src/Gui/ViewProviderMaterialObject.h
index 607b727579..7562727bb0 100644
--- a/src/Gui/ViewProviderMaterialObject.h
+++ b/src/Gui/ViewProviderMaterialObject.h
@@ -32,7 +32,7 @@ namespace Gui {
 
 class GuiExport ViewProviderMaterialObject : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderMaterialObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderMaterialObject);
 
 public:
     /// constructor.
diff --git a/src/Gui/ViewProviderMeasureDistance.h b/src/Gui/ViewProviderMeasureDistance.h
index cc6e2ccb9d..ac94efe4cf 100644
--- a/src/Gui/ViewProviderMeasureDistance.h
+++ b/src/Gui/ViewProviderMeasureDistance.h
@@ -61,7 +61,7 @@ private:
 
 class GuiExport ViewProviderPointMarker : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderPointMarker);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPointMarker);
 
 public:
     ViewProviderPointMarker();
@@ -75,7 +75,7 @@ protected:
 
 class GuiExport ViewProviderMeasureDistance : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderMeasureDistance);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderMeasureDistance);
 
 public:
     /// Constructor
diff --git a/src/Gui/ViewProviderOrigin.h b/src/Gui/ViewProviderOrigin.h
index 8b689f1a70..9400f4c0e7 100644
--- a/src/Gui/ViewProviderOrigin.h
+++ b/src/Gui/ViewProviderOrigin.h
@@ -35,7 +35,7 @@ class Document;
 
 class GuiExport ViewProviderOrigin : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderOrigin);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOrigin);
 
 public:
     /// Size of the origin as set by the part.
@@ -51,7 +51,7 @@ public:
     std::vector<App::DocumentObject*> claimChildren() const override;
     std::vector<App::DocumentObject*> claimChildren3D() const override;
 
-    SoGroup* getChildRoot() const override {return pcGroupChildren;};
+    SoGroup* getChildRoot() const override {return pcGroupChildren;}
 
     void attach(App::DocumentObject* pcObject) override;
     std::vector<std::string> getDisplayModes() const override;
diff --git a/src/Gui/ViewProviderOriginFeature.h b/src/Gui/ViewProviderOriginFeature.h
index efc5823857..525496541d 100644
--- a/src/Gui/ViewProviderOriginFeature.h
+++ b/src/Gui/ViewProviderOriginFeature.h
@@ -35,7 +35,7 @@ namespace Gui
  * View provider associated with an App::OriginFeature.
  */
 class GuiExport ViewProviderOriginFeature: public ViewProviderGeometryObject {
-    PROPERTY_HEADER(Gui::ViewProviderOriginFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOriginFeature);
 
 public:
     /// The display size of the feature
diff --git a/src/Gui/ViewProviderPlane.h b/src/Gui/ViewProviderPlane.h
index 12a9f4f547..68a809955c 100644
--- a/src/Gui/ViewProviderPlane.h
+++ b/src/Gui/ViewProviderPlane.h
@@ -32,7 +32,7 @@ namespace Gui
 
 class GuiExport ViewProviderPlane : public ViewProviderOriginFeature
 {
-    PROPERTY_HEADER(Gui::ViewProviderPlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPlane);
 public:
     /// Constructor
     ViewProviderPlane();
diff --git a/src/Gui/ViewProviderTextDocument.h b/src/Gui/ViewProviderTextDocument.h
index c5c885803e..61505dbed6 100644
--- a/src/Gui/ViewProviderTextDocument.h
+++ b/src/Gui/ViewProviderTextDocument.h
@@ -32,7 +32,7 @@ class QPlainTextEdit;
 namespace Gui {
 
 class GuiExport ViewProviderTextDocument : public ViewProviderDocumentObject {
-    PROPERTY_HEADER(Gui::ViewProviderTextDocument);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderTextDocument);
 public:
     ViewProviderTextDocument();
     ~ViewProviderTextDocument() override {}
diff --git a/src/Gui/ViewProviderVRMLObject.h b/src/Gui/ViewProviderVRMLObject.h
index d759f53404..944e429b1a 100644
--- a/src/Gui/ViewProviderVRMLObject.h
+++ b/src/Gui/ViewProviderVRMLObject.h
@@ -34,7 +34,7 @@ namespace Gui
 class SoFCSelection;
 class GuiExport ViewProviderVRMLObject : public ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(Gui::ViewProviderVRMLObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderVRMLObject);
 
 public:
     /// constructor.
diff --git a/src/Gui/Workbench.h b/src/Gui/Workbench.h
index cf1b8d3e38..6e40ae6abd 100644
--- a/src/Gui/Workbench.h
+++ b/src/Gui/Workbench.h
@@ -51,7 +51,7 @@ class WorkbenchManager;
  */
 class GuiExport Workbench : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** Constructs a workbench object. */
@@ -146,7 +146,7 @@ private:
  */
 class GuiExport StdWorkbench : public Workbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     StdWorkbench();
@@ -176,7 +176,7 @@ protected:
  */
 class GuiExport BlankWorkbench : public Workbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     BlankWorkbench();
@@ -206,7 +206,7 @@ protected:
  */
 class GuiExport NoneWorkbench : public StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     NoneWorkbench();
@@ -228,7 +228,7 @@ protected:
 
 class GuiExport TestWorkbench : public StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TestWorkbench();
@@ -247,7 +247,7 @@ protected:
  */
 class GuiExport PythonBaseWorkbench : public Workbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonBaseWorkbench();
@@ -298,7 +298,7 @@ protected:
 
 class GuiExport PythonBlankWorkbench : public PythonBaseWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonBlankWorkbench();
@@ -312,7 +312,7 @@ public:
  */
 class GuiExport PythonWorkbench : public PythonBaseWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PythonWorkbench();
diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h
index 87a0a97bd8..36418bede7 100644
--- a/src/Mod/Fem/App/FemAnalysis.h
+++ b/src/Mod/Fem/App/FemAnalysis.h
@@ -50,7 +50,7 @@ namespace Fem {
  *  Analysis.
  */
 class FemExport FemAnalysis : public App::DocumentObjectGroup {
-    PROPERTY_HEADER(Fem::FemAnalysis);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemAnalysis);
 
 public:
     /**
@@ -88,7 +88,7 @@ protected:
 
 class FemExport DocumentObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::DocumentObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::DocumentObject);
 };
 
 typedef App::FeaturePythonT<FemAnalysis> FemAnalysisPython;
diff --git a/src/Mod/Fem/App/FemConstraint.h b/src/Mod/Fem/App/FemConstraint.h
index 7531ee3dec..c0903a65f2 100644
--- a/src/Mod/Fem/App/FemConstraint.h
+++ b/src/Mod/Fem/App/FemConstraint.h
@@ -57,7 +57,7 @@ namespace Fem {
  *  scale&).
  */
 class FemExport Constraint : public App::DocumentObject {
-    PROPERTY_HEADER(Fem::Constraint);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::Constraint);
 
 public:
     Constraint();
diff --git a/src/Mod/Fem/App/FemConstraintBearing.h b/src/Mod/Fem/App/FemConstraintBearing.h
index 2a3bf71d8e..62a3ef8d3d 100644
--- a/src/Mod/Fem/App/FemConstraintBearing.h
+++ b/src/Mod/Fem/App/FemConstraintBearing.h
@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport ConstraintBearing : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintBearing);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintBearing);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintContact.h b/src/Mod/Fem/App/FemConstraintContact.h
index fb6a775345..1c48949f64 100644
--- a/src/Mod/Fem/App/FemConstraintContact.h
+++ b/src/Mod/Fem/App/FemConstraintContact.h
@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport ConstraintContact : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintContact);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintContact);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintDisplacement.h b/src/Mod/Fem/App/FemConstraintDisplacement.h
index ec9b147e13..9e6958ebd8 100644
--- a/src/Mod/Fem/App/FemConstraintDisplacement.h
+++ b/src/Mod/Fem/App/FemConstraintDisplacement.h
@@ -34,7 +34,7 @@ namespace Fem
 
 class FemExport ConstraintDisplacement : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintDisplacement);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintDisplacement);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintFixed.h b/src/Mod/Fem/App/FemConstraintFixed.h
index 48bcd3308d..40fdb31c46 100644
--- a/src/Mod/Fem/App/FemConstraintFixed.h
+++ b/src/Mod/Fem/App/FemConstraintFixed.h
@@ -35,7 +35,7 @@ namespace Fem
 
 class FemExport ConstraintFixed : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintFixed);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintFixed);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintFluidBoundary.h b/src/Mod/Fem/App/FemConstraintFluidBoundary.h
index 50946ef3a3..4ffcb85ff1 100644
--- a/src/Mod/Fem/App/FemConstraintFluidBoundary.h
+++ b/src/Mod/Fem/App/FemConstraintFluidBoundary.h
@@ -37,7 +37,7 @@ namespace Fem
 
 class FemExport ConstraintFluidBoundary: public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintFluidBoundary);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintFluidBoundary);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintForce.h b/src/Mod/Fem/App/FemConstraintForce.h
index bf4ce385c0..cc3ee43818 100644
--- a/src/Mod/Fem/App/FemConstraintForce.h
+++ b/src/Mod/Fem/App/FemConstraintForce.h
@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport ConstraintForce : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintForce);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintForce);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintGear.h b/src/Mod/Fem/App/FemConstraintGear.h
index 684f87f20d..59b03497c6 100644
--- a/src/Mod/Fem/App/FemConstraintGear.h
+++ b/src/Mod/Fem/App/FemConstraintGear.h
@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport ConstraintGear : public Fem::ConstraintBearing
 {
-    PROPERTY_HEADER(Fem::ConstraintGear);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintGear);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintHeatflux.h b/src/Mod/Fem/App/FemConstraintHeatflux.h
index ff8bce1032..1031bd94c0 100644
--- a/src/Mod/Fem/App/FemConstraintHeatflux.h
+++ b/src/Mod/Fem/App/FemConstraintHeatflux.h
@@ -33,7 +33,7 @@ namespace Fem {
 
 class FemExport ConstraintHeatflux : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintHeatflux);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintHeatflux);
 
 public:
     ConstraintHeatflux();
diff --git a/src/Mod/Fem/App/FemConstraintInitialTemperature.h b/src/Mod/Fem/App/FemConstraintInitialTemperature.h
index c0a43c4c82..6cd0414b67 100644
--- a/src/Mod/Fem/App/FemConstraintInitialTemperature.h
+++ b/src/Mod/Fem/App/FemConstraintInitialTemperature.h
@@ -34,7 +34,7 @@ namespace Fem
 
 class FemExport ConstraintInitialTemperature : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintInitialTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintInitialTemperature);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintPlaneRotation.h b/src/Mod/Fem/App/FemConstraintPlaneRotation.h
index 7e9fffb422..04be57401f 100644
--- a/src/Mod/Fem/App/FemConstraintPlaneRotation.h
+++ b/src/Mod/Fem/App/FemConstraintPlaneRotation.h
@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport ConstraintPlaneRotation : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintPlaneRotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintPlaneRotation);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintPressure.h b/src/Mod/Fem/App/FemConstraintPressure.h
index 3fbd271def..e0773f072b 100644
--- a/src/Mod/Fem/App/FemConstraintPressure.h
+++ b/src/Mod/Fem/App/FemConstraintPressure.h
@@ -31,7 +31,7 @@ namespace Fem {
 
 class FemExport ConstraintPressure : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintPressure);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintPressure);
 
 public:
     ConstraintPressure();
diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h
index d9a6c4e914..8ae2f331f1 100644
--- a/src/Mod/Fem/App/FemConstraintPulley.h
+++ b/src/Mod/Fem/App/FemConstraintPulley.h
@@ -35,7 +35,7 @@ namespace Fem
 
 class FemExport ConstraintPulley : public Fem::ConstraintGear
 {
-    PROPERTY_HEADER(Fem::ConstraintPulley);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintPulley);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintSpring.h b/src/Mod/Fem/App/FemConstraintSpring.h
index 80433316ec..36d0fd8344 100644
--- a/src/Mod/Fem/App/FemConstraintSpring.h
+++ b/src/Mod/Fem/App/FemConstraintSpring.h
@@ -31,7 +31,7 @@ namespace Fem {
 
 class FemExport ConstraintSpring : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintSpring);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintSpring);
 
 public:
     ConstraintSpring();
diff --git a/src/Mod/Fem/App/FemConstraintTemperature.h b/src/Mod/Fem/App/FemConstraintTemperature.h
index d443451cf6..38d58c0a37 100644
--- a/src/Mod/Fem/App/FemConstraintTemperature.h
+++ b/src/Mod/Fem/App/FemConstraintTemperature.h
@@ -34,7 +34,7 @@ namespace Fem
 
 class FemExport ConstraintTemperature : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintTemperature);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemConstraintTransform.h b/src/Mod/Fem/App/FemConstraintTransform.h
index e0a8814133..2449b7624a 100644
--- a/src/Mod/Fem/App/FemConstraintTransform.h
+++ b/src/Mod/Fem/App/FemConstraintTransform.h
@@ -31,7 +31,7 @@ namespace Fem
 
 class FemExport ConstraintTransform : public Fem::Constraint
 {
-    PROPERTY_HEADER(Fem::ConstraintTransform);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::ConstraintTransform);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h
index 1278b91a23..c430e9cf25 100644
--- a/src/Mod/Fem/App/FemMesh.h
+++ b/src/Mod/Fem/App/FemMesh.h
@@ -51,7 +51,7 @@ typedef std::shared_ptr<SMESH_Hypothesis> SMESH_HypothesisPtr;
  */
 class FemExport FemMesh : public Data::ComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     FemMesh();
diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h
index 0badd20d95..1850c7a2a4 100644
--- a/src/Mod/Fem/App/FemMeshObject.h
+++ b/src/Mod/Fem/App/FemMeshObject.h
@@ -35,7 +35,7 @@ namespace Fem
 
 class FemExport FemMeshObject : public App::GeoFeature
 {
-    PROPERTY_HEADER(Fem::FemMeshObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemMeshObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h
index e4c9faea8f..a6d1af5138 100644
--- a/src/Mod/Fem/App/FemMeshProperty.h
+++ b/src/Mod/Fem/App/FemMeshProperty.h
@@ -37,7 +37,7 @@ namespace Fem
  */
 class FemExport PropertyFemMesh : public App::PropertyComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFemMesh();
diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h
index 7bc6d3a6b6..14666927d3 100644
--- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h
+++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h
@@ -31,7 +31,7 @@ namespace Fem
 
 class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
 {
-    PROPERTY_HEADER(Fem::FemMeshShapeNetgenObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemMeshShapeNetgenObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h
index 3aed3f0a66..7f38c76d36 100644
--- a/src/Mod/Fem/App/FemMeshShapeObject.h
+++ b/src/Mod/Fem/App/FemMeshShapeObject.h
@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemMeshShapeObject : public FemMeshObject
 {
-    PROPERTY_HEADER(Fem::FemMeshShapeObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemMeshShapeObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h
index 96d970ce07..553e7198c9 100644
--- a/src/Mod/Fem/App/FemPostFilter.h
+++ b/src/Mod/Fem/App/FemPostFilter.h
@@ -42,7 +42,7 @@ namespace Fem
 
 class FemExport FemPostFilter : public Fem::FemPostObject
 {
-    PROPERTY_HEADER(Fem::FemPostFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostFilter);
 
 public:
     /// Constructor
@@ -74,7 +74,7 @@ private:
 
 class FemExport FemPostClipFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostClipFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostClipFilter);
 
 public:
     FemPostClipFilter();
@@ -100,7 +100,7 @@ private:
 
 class FemExport FemPostDataAlongLineFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostDataAlongLineFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostDataAlongLineFilter);
 
 public:
     FemPostDataAlongLineFilter();
@@ -133,7 +133,7 @@ private:
 
 class FemExport FemPostDataAtPointFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostDataAtPointFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostDataAtPointFilter);
 
 public:
     FemPostDataAtPointFilter();
@@ -164,7 +164,7 @@ private:
 
 class FemExport FemPostScalarClipFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostScalarClipFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostScalarClipFilter);
 
 public:
     FemPostScalarClipFilter();
@@ -192,7 +192,7 @@ private:
 
 class FemExport FemPostWarpVectorFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostWarpVectorFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostWarpVectorFilter);
 
 public:
     FemPostWarpVectorFilter();
@@ -217,7 +217,7 @@ private:
 
 class FemExport FemPostCutFilter : public FemPostFilter {
 
-    PROPERTY_HEADER(Fem::FemPostCutFilter);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostCutFilter);
 
 public:
     FemPostCutFilter();
diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h
index 41d16d3927..294e9f3637 100644
--- a/src/Mod/Fem/App/FemPostFunction.h
+++ b/src/Mod/Fem/App/FemPostFunction.h
@@ -39,7 +39,7 @@ namespace Fem
 
 class FemExport FemPostFunction : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostFunction);
 
 public:
     /// Constructor
@@ -65,7 +65,7 @@ protected:
 
 class FemExport FemPostFunctionProvider : public App::DocumentObject {
 
-    PROPERTY_HEADER(Fem::FemPostFunctionProvider);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostFunctionProvider);
 
 public:
     FemPostFunctionProvider();
@@ -86,7 +86,7 @@ protected:
 
 class FemExport FemPostPlaneFunction : public FemPostFunction
 {
-    PROPERTY_HEADER(Fem::FemPostPlaneFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostPlaneFunction);
 
 public:
 
@@ -112,7 +112,7 @@ protected:
 
 class FemExport FemPostSphereFunction : public FemPostFunction
 {
-    PROPERTY_HEADER(Fem::FemPostSphereFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostSphereFunction);
 
 public:
 
diff --git a/src/Mod/Fem/App/FemPostObject.h b/src/Mod/Fem/App/FemPostObject.h
index 895af13da6..9ab784a25f 100644
--- a/src/Mod/Fem/App/FemPostObject.h
+++ b/src/Mod/Fem/App/FemPostObject.h
@@ -35,7 +35,7 @@ namespace Fem
 //poly data is the only data we can visualize, hence every post processing object needs to expose it
 class FemExport FemPostObject : public App::GeoFeature
 {
-    PROPERTY_HEADER(Fem::FemPostObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h
index 5d0529a54c..0022a6f7c7 100644
--- a/src/Mod/Fem/App/FemPostPipeline.h
+++ b/src/Mod/Fem/App/FemPostPipeline.h
@@ -36,7 +36,7 @@ namespace Fem
 
 class FemExport FemPostPipeline : public Fem::FemPostFilter
 {
-    PROPERTY_HEADER(Fem::FemPostPipeline);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemPostPipeline);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h
index 769cda780d..707d78668b 100644
--- a/src/Mod/Fem/App/FemResultObject.h
+++ b/src/Mod/Fem/App/FemResultObject.h
@@ -34,7 +34,7 @@ namespace Fem
 /// Father of all result data in a Fem Analysis
 class FemExport FemResultObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemResultObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemResultObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h
index 2cc968e756..4889a892df 100644
--- a/src/Mod/Fem/App/FemSetElementsObject.h
+++ b/src/Mod/Fem/App/FemSetElementsObject.h
@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemSetElementsObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetElementsObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetElementsObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h
index e2bc4a7c12..834e8fa310 100644
--- a/src/Mod/Fem/App/FemSetFacesObject.h
+++ b/src/Mod/Fem/App/FemSetFacesObject.h
@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemSetFacesObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetFacesObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetFacesObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h
index 03f2d871e0..4135786826 100644
--- a/src/Mod/Fem/App/FemSetGeometryObject.h
+++ b/src/Mod/Fem/App/FemSetGeometryObject.h
@@ -32,7 +32,7 @@ namespace Fem
 
 class FemExport FemSetGeometryObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetGeometryObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetGeometryObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemSetNodesObject.h b/src/Mod/Fem/App/FemSetNodesObject.h
index aeb8fee888..f33f780675 100644
--- a/src/Mod/Fem/App/FemSetNodesObject.h
+++ b/src/Mod/Fem/App/FemSetNodesObject.h
@@ -33,7 +33,7 @@ namespace Fem
 
 class FemExport FemSetNodesObject : public FemSetObject
 {
-    PROPERTY_HEADER(Fem::FemSetNodesObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetNodesObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemSetObject.h b/src/Mod/Fem/App/FemSetObject.h
index cd54e166e0..2d25a059bf 100644
--- a/src/Mod/Fem/App/FemSetObject.h
+++ b/src/Mod/Fem/App/FemSetObject.h
@@ -33,7 +33,7 @@ namespace Fem
 
 class FemExport FemSetObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemSetObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSetObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/FemSolverObject.h b/src/Mod/Fem/App/FemSolverObject.h
index d858ec73be..1f66432509 100644
--- a/src/Mod/Fem/App/FemSolverObject.h
+++ b/src/Mod/Fem/App/FemSolverObject.h
@@ -33,7 +33,7 @@ namespace Fem
 /// Father of all result data in a Fem Analysis
 class FemExport FemSolverObject : public App::DocumentObject
 {
-    PROPERTY_HEADER(Fem::FemSolverObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Fem::FemSolverObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/App/PropertyPostDataObject.h b/src/Mod/Fem/App/PropertyPostDataObject.h
index dd9e5014f8..4ae6b23bd6 100644
--- a/src/Mod/Fem/App/PropertyPostDataObject.h
+++ b/src/Mod/Fem/App/PropertyPostDataObject.h
@@ -39,7 +39,7 @@ namespace Fem
  */
 class FemExport PropertyPostDataObject : public App::Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyPostDataObject();
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h
index 04cc2dd7b2..5f7b259082 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.h
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.h
@@ -81,7 +81,7 @@ private:
 
 class FemGuiExport ViewProviderPointMarker : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderPointMarker);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderPointMarker);
 
 public:
     ViewProviderPointMarker();
@@ -121,7 +121,7 @@ private:
 
 class FemGuiExport ViewProviderDataMarker : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderDataMarker);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderDataMarker);
 
 public:
     ViewProviderDataMarker();
diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
index b5bca05ede..80a99110a9 100644
--- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h
+++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
@@ -49,7 +49,7 @@ private:
 class FemGuiExport ViewProviderFemAnalysis : public Gui::ViewProviderDocumentObjectGroup
 {
     Q_DECLARE_TR_FUNCTIONS(FemGui::ViewProviderFemAnalysis)
-    PROPERTY_HEADER(FemGui::ViewProviderAnalysis);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderAnalysis);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
index 6cc75be547..03cb068eef 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
@@ -44,7 +44,7 @@ class TaskFemConstraint;
 
 class FemGuiExport ViewProviderFemConstraint : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraint);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraint);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h
index 76b4164752..345bc114b5 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h
@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintBearing : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintBearing);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintBearing);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h
index 32dcd152b4..b64ebba804 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintContact : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintContact);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintContact);
 
 public:
     ViewProviderFemConstraintContact();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h
index 184bf71476..f2935093c6 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintDisplacement : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintDisplacement);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintDisplacement);
 
 public:
     ViewProviderFemConstraintDisplacement();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h
index 67c4611bf6..ad32899fc3 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h
@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintFixed : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintFixed);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintFixed);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h
index ae26437a12..b33f3439bf 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h
@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintFluidBoundary : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintFluidBoundary);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintFluidBoundary);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h
index 6b4b56bd4e..da72e2c6c5 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h
@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintForce : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintForce);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintForce);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h
index a5bf86ddb0..1656034bcd 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h
@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintGear : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintGear);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintGear);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h
index a830599f1a..cf8bb01742 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintHeatflux : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintHeatflux);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintHeatflux);
 
 public:
     ViewProviderFemConstraintHeatflux();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h
index b979caecf1..b80a2b3097 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintInitialTemperature : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintInitialTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintInitialTemperature);
 
 public:
     ViewProviderFemConstraintInitialTemperature();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h
index 73bad828a4..f4ac82f8c5 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintOnBoundary : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintOnBoundary);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintOnBoundary);
 
 public:
     ViewProviderFemConstraintOnBoundary();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h
index 427c71c4b9..9a6579c537 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintPlaneRotation : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPlaneRotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintPlaneRotation);
 
 public:
     ViewProviderFemConstraintPlaneRotation();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h
index db19936b87..870b45eebf 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h
@@ -30,7 +30,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPressure);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintPressure);
 
 public:
     ViewProviderFemConstraintPressure();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h
index 12e81e1e26..9749eafb56 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h
@@ -32,7 +32,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemConstraintPulley : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPulley);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintPulley);
 
 public:
     /// Constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h
index a1887f6e33..4b72d705d4 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h
@@ -30,7 +30,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintSpring : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintSpring);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintSpring);
 
 public:
     ViewProviderFemConstraintSpring();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h
index 3c8c55e597..1dea8d6668 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h
@@ -32,7 +32,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintTemperature : public FemGui::ViewProviderFemConstraintOnBoundary
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintTemperature);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintTemperature);
 
 public:
     ViewProviderFemConstraintTemperature();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h
index 948d33cf0a..5a66fc91ed 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h
@@ -33,7 +33,7 @@ namespace FemGui {
 
 class FemGuiExport ViewProviderFemConstraintTransform : public FemGui::ViewProviderFemConstraint
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemConstraintTransform);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemConstraintTransform);
 
 public:
     ViewProviderFemConstraintTransform();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h
index 728835054d..96232fbcdb 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h
@@ -58,7 +58,7 @@ public:
 
 class FemGuiExport ViewProviderFemMesh : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemMesh);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemMesh);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h
index 7dc58409d4..90905295f1 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemMeshShape : public ViewProviderFemMesh
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemMeshShape);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemMeshShape);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h
index 93661072c1..8bdf0a90ed 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h
@@ -30,7 +30,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemMeshShapeNetgen : public ViewProviderFemMeshShape
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemMeshShapeNetgen);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemMeshShapeNetgen);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h
index 10b818d3aa..7681bded57 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemPostClip : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostClip);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostClip);
 
 public:
     /// constructor.
@@ -44,7 +44,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostDataAlongLine : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostDataAlongLine);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostDataAlongLine);
 
 public:
     /// constructor.
@@ -57,7 +57,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostDataAtPoint: public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostDataAtPoint);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostDataAtPoint);
 
 public:
     /// constructor.
@@ -71,7 +71,7 @@ protected:
 };
 class FemGuiExport ViewProviderFemPostScalarClip : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostScalarClip);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostScalarClip);
 
 public:
     /// constructor.
@@ -84,7 +84,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostWarpVector : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostWarpVector);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostWarpVector);
 
 public:
     /// constructor.
@@ -97,7 +97,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostCut : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostCut);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostCut);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
index a9a8d65e4b..c9e68f6d1b 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
@@ -74,7 +74,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostFunctionProvider : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostFunction);
 
 public:
     ViewProviderFemPostFunctionProvider();
@@ -100,7 +100,7 @@ protected:
 
 class FemGuiExport ViewProviderFemPostFunction : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostFunction);
 
 public:
     /// constructor.
@@ -173,7 +173,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostPlaneFunction : public ViewProviderFemPostFunction {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostPlaneFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostPlaneFunction);
 
 public:
     ViewProviderFemPostPlaneFunction();
@@ -216,7 +216,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostSphereFunction : public ViewProviderFemPostFunction {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostSphereFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostSphereFunction);
 
 public:
     ViewProviderFemPostSphereFunction();
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
index 5a99e14a48..b25b2ab361 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
@@ -66,7 +66,7 @@ class TaskDlgPost;
 class FemGuiExport ViewProviderFemPostObject : public Gui::ViewProviderDocumentObject,
                                                public Base::Observer<int>
 {
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostObject);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h
index 0007af7810..f068306e68 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h
@@ -33,7 +33,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderFemPostPipeline : public ViewProviderFemPostObject {
 
-    PROPERTY_HEADER(FemGui::ViewProviderFemPostPipeline);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostPipeline);
 
 public:
     /// constructor.
diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h
index 0dddd42fb4..6d8d371d81 100644
--- a/src/Mod/Fem/Gui/ViewProviderResult.h
+++ b/src/Mod/Fem/Gui/ViewProviderResult.h
@@ -33,7 +33,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderResult : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderResult);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderResult);
 
 public:
     /// constructor
diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h
index a0e3ea4aba..0264130c7f 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetElements.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetElements : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderSetElements);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetElements);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h
index 855030d8e4..bb3accf2b3 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetFaces : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderSetFaces);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetFaces);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h
index f58ce73540..388c268a51 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetGeometry : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderSetGeometry);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetGeometry);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.h b/src/Mod/Fem/Gui/ViewProviderSetNodes.h
index 0f5bf3d159..697e55d32b 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetNodes.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetNodes : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderSetNodes);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSetNodes);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h
index 19bdca8f4f..f75361670f 100644
--- a/src/Mod/Fem/Gui/ViewProviderSolver.h
+++ b/src/Mod/Fem/Gui/ViewProviderSolver.h
@@ -43,7 +43,7 @@ namespace FemGui
 
 class FemGuiExport ViewProviderSolver : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(FemGui::ViewProviderSolver);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSolver);
 
 public:
     /// constructor
diff --git a/src/Mod/Fem/Gui/Workbench.h b/src/Mod/Fem/Gui/Workbench.h
index d26caf0f69..59088e8886 100755
--- a/src/Mod/Fem/Gui/Workbench.h
+++ b/src/Mod/Fem/Gui/Workbench.h
@@ -34,7 +34,7 @@ namespace FemGui {
  */
 class FemGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/Image/App/ImagePlane.h b/src/Mod/Image/App/ImagePlane.h
index 702f59a6f3..49ba554439 100644
--- a/src/Mod/Image/App/ImagePlane.h
+++ b/src/Mod/Image/App/ImagePlane.h
@@ -33,7 +33,7 @@ namespace Image
 
 class ImageExport ImagePlane : public App::GeoFeature
 {
-    PROPERTY_HEADER(Image::ImagePlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(Image::ImagePlane);
 
 public:
     /// Constructor
diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.h b/src/Mod/Image/Gui/ViewProviderImagePlane.h
index 427ad5217f..fed5a51c98 100644
--- a/src/Mod/Image/Gui/ViewProviderImagePlane.h
+++ b/src/Mod/Image/Gui/ViewProviderImagePlane.h
@@ -37,7 +37,7 @@ namespace ImageGui
 
 class ImageGuiExport ViewProviderImagePlane : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(RobotGui::ViewProviderImagePlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderImagePlane);
 
 public:
     /// constructor.
diff --git a/src/Mod/Image/Gui/Workbench.h b/src/Mod/Image/Gui/Workbench.h
index c48abc8a53..e8a67b91d3 100644
--- a/src/Mod/Image/Gui/Workbench.h
+++ b/src/Mod/Image/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace ImageGui {
  */
 class ImageGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/Import/Gui/Workbench.h b/src/Mod/Import/Gui/Workbench.h
index 6bda8cfd7e..3a8271fffc 100644
--- a/src/Mod/Import/Gui/Workbench.h
+++ b/src/Mod/Import/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace ImportGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h
index fac05ed614..f69b24cac2 100644
--- a/src/Mod/Inspection/App/InspectionFeature.h
+++ b/src/Mod/Inspection/App/InspectionFeature.h
@@ -160,7 +160,7 @@ private:
 
 class InspectionExport PropertyDistanceList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -215,7 +215,7 @@ private:
  */
 class InspectionExport Feature : public App::DocumentObject
 {
-    PROPERTY_HEADER(Inspection::Feature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Inspection::Feature);
 
 public:
     /// Constructor
@@ -245,7 +245,7 @@ public:
 
 class InspectionExport Group : public App::DocumentObjectGroup
 {
-    PROPERTY_HEADER(Inspection::Group);
+    PROPERTY_HEADER_WITH_OVERRIDE(Inspection::Group);
 
 public:
     /// Constructor
diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.h b/src/Mod/Inspection/Gui/ViewProviderInspection.h
index d70e6142ef..3d98313326 100644
--- a/src/Mod/Inspection/Gui/ViewProviderInspection.h
+++ b/src/Mod/Inspection/Gui/ViewProviderInspection.h
@@ -49,7 +49,7 @@ class ViewProviderInspection : public Gui::ViewProviderDocumentObject,
                                public Base::Observer<int>{
     typedef ViewProviderDocumentObject inherited;
 
-    PROPERTY_HEADER(InspectionGui::ViewProviderInspection);
+    PROPERTY_HEADER_WITH_OVERRIDE(InspectionGui::ViewProviderInspection);
 
 public:
     ViewProviderInspection();
@@ -100,7 +100,7 @@ private:
 
 class ViewProviderInspectionGroup : public Gui::ViewProviderDocumentObjectGroup
 {
-    PROPERTY_HEADER(InspectionGui::ViewProviderInspectionGroup);
+    PROPERTY_HEADER_WITH_OVERRIDE(InspectionGui::ViewProviderInspectionGroup);
 
 public:
     /// constructor
diff --git a/src/Mod/Inspection/Gui/Workbench.h b/src/Mod/Inspection/Gui/Workbench.h
index f2a6e48b19..3706b88e67 100644
--- a/src/Mod/Inspection/Gui/Workbench.h
+++ b/src/Mod/Inspection/Gui/Workbench.h
@@ -30,7 +30,7 @@ namespace InspectionGui {
 
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h
index b9d1a389ce..bd191c9919 100644
--- a/src/Mod/Measure/App/Measurement.h
+++ b/src/Mod/Measure/App/Measurement.h
@@ -47,7 +47,7 @@ namespace Measure
     };
 
 class MeasureExport Measurement : public Base::BaseClass {
-      TYPESYSTEM_HEADER();
+      TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
 
     App::PropertyLinkSubList References3D;
diff --git a/src/Mod/Mesh/App/Core/Visitor.h b/src/Mod/Mesh/App/Core/Visitor.h
index 4e7d7b51e9..2305c79f34 100644
--- a/src/Mod/Mesh/App/Core/Visitor.h
+++ b/src/Mod/Mesh/App/Core/Visitor.h
@@ -82,7 +82,7 @@ public:
     MeshSearchNeighbourFacetsVisitor (const MeshKernel &rclMesh, float fRadius, FacetIndex ulStartFacetIdx);
     ~MeshSearchNeighbourFacetsVisitor () override {}
     /** Checks the facet if it lies inside the search radius. */
-    inline bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel);
+    inline bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel) override;
     /** Resets the VISIT flag of already visited facets. */
     inline std::vector<FacetIndex> GetAndReset ();
 
@@ -127,7 +127,7 @@ public:
     ~MeshTopFacetVisitor () override {}
     /** Collects the facet indices. */
     virtual bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom,
-                        FacetIndex ulFInd, unsigned long)
+                        FacetIndex ulFInd, unsigned long) override
     {
         (void)rclFacet;
         (void)rclFrom;
@@ -154,9 +154,9 @@ public:
                       std::vector<FacetIndex> &indices);
     ~MeshPlaneVisitor () override;
     bool AllowVisit (const MeshFacet& face, const MeshFacet&, 
-                     FacetIndex, unsigned long, unsigned short neighbourIndex);
+                     FacetIndex, unsigned long, unsigned short neighbourIndex) override;
     bool Visit (const MeshFacet & face, const MeshFacet &,
-                FacetIndex ulFInd, unsigned long);
+                FacetIndex ulFInd, unsigned long) override;
 
 protected:
     const MeshKernel& mesh;
diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.h b/src/Mod/Mesh/App/FeatureMeshCurvature.h
index 17a7b2a7e0..16b155f479 100644
--- a/src/Mod/Mesh/App/FeatureMeshCurvature.h
+++ b/src/Mod/Mesh/App/FeatureMeshCurvature.h
@@ -40,7 +40,7 @@ namespace Mesh
  */
 class MeshExport Curvature : public App::DocumentObject
 {
-    PROPERTY_HEADER(Mesh::Curvature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Curvature);
 
 public:
     Curvature();
diff --git a/src/Mod/Mesh/App/FeatureMeshDefects.h b/src/Mod/Mesh/App/FeatureMeshDefects.h
index 572985c236..e584dd1d88 100644
--- a/src/Mod/Mesh/App/FeatureMeshDefects.h
+++ b/src/Mod/Mesh/App/FeatureMeshDefects.h
@@ -37,7 +37,7 @@ namespace Mesh
  */
 class MeshExport FixDefects : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::FixDefects);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDefects);
 
 public:
   /// Constructor
@@ -67,7 +67,7 @@ public:
  */
 class MeshExport HarmonizeNormals : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::HarmonizeNormals);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::HarmonizeNormals);
 
 public:
   /// Constructor
@@ -87,7 +87,7 @@ public:
  */
 class MeshExport FlipNormals : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FlipNormals);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FlipNormals);
 
 public:
   /// Constructor
@@ -107,7 +107,7 @@ public:
  */
 class MeshExport FixNonManifolds : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixNonManifolds);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixNonManifolds);
 
 public:
   /// Constructor
@@ -127,7 +127,7 @@ public:
  */
 class MeshExport FixDuplicatedFaces : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDuplicatedFaces);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDuplicatedFaces);
 
 public:
   /// Constructor
@@ -147,7 +147,7 @@ public:
  */
 class MeshExport FixDuplicatedPoints : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDuplicatedPoints);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDuplicatedPoints);
 
 public:
   /// Constructor
@@ -167,7 +167,7 @@ public:
  */
 class MeshExport FixDegenerations : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDegenerations);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDegenerations);
 
 public:
   /// Constructor
@@ -187,7 +187,7 @@ public:
  */
 class MeshExport FixDeformations : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixDeformations);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixDeformations);
 
 public:
   /// Constructor
@@ -211,7 +211,7 @@ public:
  */
 class MeshExport FixIndices : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FixIndices);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FixIndices);
 
 public:
   /// Constructor
@@ -231,7 +231,7 @@ public:
  */
 class MeshExport FillHoles : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::FillHoles);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::FillHoles);
 
 public:
   /// Constructor
@@ -253,7 +253,7 @@ public:
  */
 class MeshExport RemoveComponents : public Mesh::FixDefects
 {
-  PROPERTY_HEADER(Mesh::RemoveComponents);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::RemoveComponents);
 
 public:
   /// Constructor
diff --git a/src/Mod/Mesh/App/FeatureMeshExport.h b/src/Mod/Mesh/App/FeatureMeshExport.h
index 0b0f6f8be5..7aeef97ce5 100644
--- a/src/Mod/Mesh/App/FeatureMeshExport.h
+++ b/src/Mod/Mesh/App/FeatureMeshExport.h
@@ -40,7 +40,7 @@ namespace Mesh
  */
 class MeshExport Export : public App::DocumentObject
 {
-    PROPERTY_HEADER(Mesh::Export);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Export);
 
 public:
     Export();
diff --git a/src/Mod/Mesh/App/FeatureMeshImport.h b/src/Mod/Mesh/App/FeatureMeshImport.h
index f79b9dbffa..69e6b42d6e 100644
--- a/src/Mod/Mesh/App/FeatureMeshImport.h
+++ b/src/Mod/Mesh/App/FeatureMeshImport.h
@@ -39,7 +39,7 @@ namespace Mesh
  */
 class Import : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Import);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Import);
 
 public:
   Import();
diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h
index 747b558ce4..b872b70531 100644
--- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h
+++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h
@@ -42,7 +42,7 @@ namespace Mesh
  */
 class SegmentByMesh : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::SegmentByMesh);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::SegmentByMesh);
 
 public:
   SegmentByMesh();
diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.h b/src/Mod/Mesh/App/FeatureMeshSetOperations.h
index edc0694b73..37f28d65ca 100644
--- a/src/Mod/Mesh/App/FeatureMeshSetOperations.h
+++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.h
@@ -42,7 +42,7 @@ namespace Mesh
  */
 class SetOperations : public Mesh::Feature
 {
-    PROPERTY_HEADER(Mesh::SetOperations);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::SetOperations);
 
 public:
     SetOperations();
diff --git a/src/Mod/Mesh/App/FeatureMeshSolid.h b/src/Mod/Mesh/App/FeatureMeshSolid.h
index 3f6c7e975e..2895f5baff 100644
--- a/src/Mod/Mesh/App/FeatureMeshSolid.h
+++ b/src/Mod/Mesh/App/FeatureMeshSolid.h
@@ -37,7 +37,7 @@ namespace Mesh
  */
 class Sphere : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Sphere);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Sphere);
 
 public:
   Sphere();
@@ -58,7 +58,7 @@ public:
 
 class Ellipsoid : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Ellipsoid);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Ellipsoid);
 
 public:
   Ellipsoid();
@@ -80,7 +80,7 @@ public:
 
 class Cylinder : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Cylinder);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Cylinder);
 
 public:
   Cylinder();
@@ -104,7 +104,7 @@ public:
 
 class Cone : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Cone);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Cone);
 
 public:
   Cone();
@@ -129,7 +129,7 @@ public:
 
 class Torus : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Torus);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Torus);
 
 public:
   Torus();
@@ -151,7 +151,7 @@ public:
 
 class Cube : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Cube);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Cube);
 
 public:
   Cube();
diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.h b/src/Mod/Mesh/App/FeatureMeshTransform.h
index 531ed7b345..6c51ceb084 100644
--- a/src/Mod/Mesh/App/FeatureMeshTransform.h
+++ b/src/Mod/Mesh/App/FeatureMeshTransform.h
@@ -40,7 +40,7 @@ namespace Mesh
  */
 class Transform : public Mesh::Feature
 {
-  PROPERTY_HEADER(Mesh::Transform);
+  PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Transform);
 
 public:
   Transform();
diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h
index d6392802b7..eafd295e86 100644
--- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h
+++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h
@@ -39,7 +39,7 @@ namespace Mesh
  */
 class TransformDemolding : public Transform
 {
-    PROPERTY_HEADER(Mesh::TransformDemolding);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::TransformDemolding);
 
 public:
     TransformDemolding();
diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h
index 64195d24fb..9f72e2f540 100644
--- a/src/Mod/Mesh/App/Mesh.h
+++ b/src/Mod/Mesh/App/Mesh.h
@@ -63,7 +63,7 @@ namespace Mesh
 class MeshObject;
 class MeshExport MeshSegment : public Data::Segment
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     std::string getName() const override {
@@ -82,7 +82,7 @@ public:
  */
 class MeshExport MeshObject : public Data::ComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum GeometryType {PLANE, CYLINDER, SPHERE};
diff --git a/src/Mod/Mesh/App/MeshFeature.h b/src/Mod/Mesh/App/MeshFeature.h
index 8d76f82602..e3c02a0ce1 100644
--- a/src/Mod/Mesh/App/MeshFeature.h
+++ b/src/Mod/Mesh/App/MeshFeature.h
@@ -53,7 +53,7 @@ class MeshFeaturePy;
  */
 class MeshExport Feature : public App::GeoFeature
 {
-    PROPERTY_HEADER(Mesh::Feature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Mesh::Feature);
 
 public:
     /// Constructor
diff --git a/src/Mod/Mesh/App/MeshProperties.h b/src/Mod/Mesh/App/MeshProperties.h
index b780af48d4..46f9e997ad 100644
--- a/src/Mod/Mesh/App/MeshProperties.h
+++ b/src/Mod/Mesh/App/MeshProperties.h
@@ -52,7 +52,7 @@ class MeshPy;
  */
 class MeshExport PropertyNormalList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyNormalList();
@@ -110,7 +110,7 @@ struct MeshExport CurvatureInfo
  */
 class MeshExport PropertyCurvatureList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum { 
@@ -169,7 +169,7 @@ private:
  */
 class MeshExport PropertyMeshKernel : public App::PropertyComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyMeshKernel();
diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h
index 942be9b073..0b2e6b61c5 100644
--- a/src/Mod/Mesh/Gui/MeshEditor.h
+++ b/src/Mod/Mesh/Gui/MeshEditor.h
@@ -48,7 +48,7 @@ class SoFCMeshPickNode;
  */
 class MeshGuiExport ViewProviderFace : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderFace);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderFace);
 
 public:
     ViewProviderFace();
diff --git a/src/Mod/Mesh/Gui/ViewProvider.h b/src/Mod/Mesh/Gui/ViewProvider.h
index c80ec75995..3be414fa11 100644
--- a/src/Mod/Mesh/Gui/ViewProvider.h
+++ b/src/Mod/Mesh/Gui/ViewProvider.h
@@ -90,7 +90,7 @@ public:
  */
 class MeshGuiExport ViewProviderExport : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderExport);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderExport);
 
 public:
     ViewProviderExport();
@@ -109,7 +109,7 @@ public:
  */
 class MeshGuiExport ViewProviderMesh : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMesh);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMesh);
 
 public:
     ViewProviderMesh();
@@ -252,7 +252,7 @@ private:
  */
 class MeshGuiExport ViewProviderIndexedFaceSet : public ViewProviderMesh
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderIndexedFaceSet);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderIndexedFaceSet);
 
 public:
     ViewProviderIndexedFaceSet();
@@ -279,7 +279,7 @@ private:
  */
 class MeshGuiExport ViewProviderMeshObject : public ViewProviderMesh
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshObject);
 
 public:
     ViewProviderMeshObject();
diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.h b/src/Mod/Mesh/Gui/ViewProviderCurvature.h
index 6b3f780449..1e1112fc2d 100644
--- a/src/Mod/Mesh/Gui/ViewProviderCurvature.h
+++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.h
@@ -60,7 +60,7 @@ class MeshGuiExport ViewProviderMeshCurvature : public Gui::ViewProviderDocument
                                                 public Base::Observer<int> {
     typedef Gui::ViewProviderDocumentObject inherited;
 
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshCurvature);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshCurvature);
 
 public:
     ViewProviderMeshCurvature();
diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.h b/src/Mod/Mesh/Gui/ViewProviderDefects.h
index ba8f16cdf9..57bb64cca4 100644
--- a/src/Mod/Mesh/Gui/ViewProviderDefects.h
+++ b/src/Mod/Mesh/Gui/ViewProviderDefects.h
@@ -38,7 +38,7 @@ namespace MeshGui {
  */
 class MeshGuiExport ViewProviderMeshDefects : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDefects);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDefects);
 
 public:
     ViewProviderMeshDefects();
@@ -65,7 +65,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshOrientation : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshOrientation);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshOrientation);
 
 public:
     ViewProviderMeshOrientation();
@@ -83,7 +83,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshNonManifolds : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshNonManifolds);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshNonManifolds);
 
 public:
     ViewProviderMeshNonManifolds();
@@ -101,7 +101,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshNonManifoldPoints : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshNonManifoldPoints);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshNonManifoldPoints);
 
 public:
     ViewProviderMeshNonManifoldPoints();
@@ -119,7 +119,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshDuplicatedFaces : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDuplicatedFaces);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDuplicatedFaces);
 
 public:
     ViewProviderMeshDuplicatedFaces();
@@ -137,7 +137,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshDegenerations : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDegenerations);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDegenerations);
 
 public:
     ViewProviderMeshDegenerations();
@@ -152,7 +152,7 @@ protected:
 
 class MeshGuiExport ViewProviderMeshDuplicatedPoints : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshDuplicatedPoints);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshDuplicatedPoints);
 
 public:
     ViewProviderMeshDuplicatedPoints();
@@ -167,7 +167,7 @@ protected:
 
 class MeshGuiExport ViewProviderMeshIndices : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshIndices);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshIndices);
 
 public:
     ViewProviderMeshIndices();
@@ -185,7 +185,7 @@ protected:
  */
 class MeshGuiExport ViewProviderMeshSelfIntersections : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshSelfIntersections);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshSelfIntersections);
 
 public:
     ViewProviderMeshSelfIntersections();
@@ -200,7 +200,7 @@ protected:
 
 class MeshGuiExport ViewProviderMeshFolds : public ViewProviderMeshDefects
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshFolds);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshFolds);
 
 public:
     ViewProviderMeshFolds();
diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h
index 676a860b91..9bc233f949 100644
--- a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h
+++ b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.h
@@ -48,7 +48,7 @@ class SoFCIndexedFaceSet;
  */
 class MeshGuiExport ViewProviderMeshFaceSet : public ViewProviderMesh
 {
-    PROPERTY_HEADER(MeshGui::ViewProviderMeshFaceSet);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshFaceSet);
 
 public:
     ViewProviderMeshFaceSet();
diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.h b/src/Mod/Mesh/Gui/ViewProviderTransform.h
index 56237a4bfd..46808eaf70 100644
--- a/src/Mod/Mesh/Gui/ViewProviderTransform.h
+++ b/src/Mod/Mesh/Gui/ViewProviderTransform.h
@@ -47,7 +47,7 @@ namespace MeshGui {
  */
 class ViewProviderMeshTransform : public ViewProviderMesh
 {
-  PROPERTY_HEADER(MeshGui::ViewProviderMeshTransform);
+  PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshTransform);
 
 public:
   ViewProviderMeshTransform();
diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h
index 7b429d6818..a33799f226 100644
--- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h
+++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h
@@ -52,7 +52,7 @@ namespace MeshGui {
  */
 class ViewProviderMeshTransformDemolding : public ViewProviderMesh
 {
-  PROPERTY_HEADER(MeshGui::ViewProviderMeshTransformDemolding);
+  PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshTransformDemolding);
 
 public:
   ViewProviderMeshTransformDemolding();
diff --git a/src/Mod/Mesh/Gui/Workbench.h b/src/Mod/Mesh/Gui/Workbench.h
index 144cf3aca7..69aed2b132 100644
--- a/src/Mod/Mesh/Gui/Workbench.h
+++ b/src/Mod/Mesh/Gui/Workbench.h
@@ -36,7 +36,7 @@ namespace MeshGui {
  */
 class MeshGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.h b/src/Mod/MeshPart/Gui/CurveOnMesh.h
index c6b00da44b..84ef842105 100644
--- a/src/Mod/MeshPart/Gui/CurveOnMesh.h
+++ b/src/Mod/MeshPart/Gui/CurveOnMesh.h
@@ -45,7 +45,7 @@ namespace MeshPartGui
 
 class ViewProviderCurveOnMesh : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(MeshPartGui::ViewProviderCurveOnMesh);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeshPartGui::ViewProviderCurveOnMesh);
 
 public:
     ViewProviderCurveOnMesh();
diff --git a/src/Mod/MeshPart/Gui/Workbench.h b/src/Mod/MeshPart/Gui/Workbench.h
index 96e87a25f5..95687f59ef 100644
--- a/src/Mod/MeshPart/Gui/Workbench.h
+++ b/src/Mod/MeshPart/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace MeshPartGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/Part/App/AttachExtension.h b/src/Mod/Part/App/AttachExtension.h
index c6da213cc3..95066f1443 100644
--- a/src/Mod/Part/App/AttachExtension.h
+++ b/src/Mod/Part/App/AttachExtension.h
@@ -59,7 +59,7 @@ public:
  */
 class PartExport AttachExtension : public App::DocumentObjectExtension
 {
-    EXTENSION_PROPERTY_HEADER(Part::AttachableObject);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Part::AttachableObject);
 public:
     AttachExtension();
     ~AttachExtension() override;
diff --git a/src/Mod/Part/App/Attacher.h b/src/Mod/Part/App/Attacher.h
index 283a85a9e4..9d9b79acca 100644
--- a/src/Mod/Part/App/Attacher.h
+++ b/src/Mod/Part/App/Attacher.h
@@ -212,7 +212,7 @@ struct SuggestResult{
  */
 class PartExport AttachEngine : public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public: //methods
     AttachEngine();
     virtual void setUp(const App::PropertyLinkSubList &references,
@@ -417,7 +417,7 @@ protected:
 
 class PartExport AttachEngine3D : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEngine3D();
     AttachEngine3D* copy() const override;
@@ -429,7 +429,7 @@ private:
 //attacher specialized for datum planes
 class PartExport AttachEnginePlane : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEnginePlane();
     AttachEnginePlane* copy() const override;
@@ -439,7 +439,7 @@ public:
 //attacher specialized for datum lines
 class PartExport AttachEngineLine : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEngineLine();
     AttachEngineLine* copy() const override;
@@ -449,7 +449,7 @@ public:
 //attacher specialized for datum points
 class PartExport AttachEnginePoint : public AttachEngine
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     AttachEnginePoint();
     AttachEnginePoint* copy() const override;
diff --git a/src/Mod/Part/App/CustomFeature.h b/src/Mod/Part/App/CustomFeature.h
index e88b013231..389e208bc5 100644
--- a/src/Mod/Part/App/CustomFeature.h
+++ b/src/Mod/Part/App/CustomFeature.h
@@ -34,7 +34,7 @@ namespace Part
  */
 class PartExport CustomFeature : public Part::Feature
 {
-    PROPERTY_HEADER(Part::UserFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::UserFeature);
 
 public:
     /// Constructor
diff --git a/src/Mod/Part/App/FaceMaker.h b/src/Mod/Part/App/FaceMaker.h
index 68d1bea0fd..28f9278179 100644
--- a/src/Mod/Part/App/FaceMaker.h
+++ b/src/Mod/Part/App/FaceMaker.h
@@ -46,7 +46,7 @@ namespace Part
  */
 class PartExport FaceMaker: public BRepBuilderAPI_MakeShape, public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     FaceMaker() {}
@@ -110,7 +110,7 @@ protected:
  */
 class PartExport FaceMakerPublic : public FaceMaker
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     virtual std::string getUserFriendlyName() const = 0;
     virtual std::string getBriefExplanation() const = 0;
diff --git a/src/Mod/Part/App/FeatureChamfer.h b/src/Mod/Part/App/FeatureChamfer.h
index 0883eed4d4..48212d1618 100644
--- a/src/Mod/Part/App/FeatureChamfer.h
+++ b/src/Mod/Part/App/FeatureChamfer.h
@@ -31,7 +31,7 @@ namespace Part
 
 class Chamfer : public Part::FilletBase
 {
-    PROPERTY_HEADER(Part::Chamfer);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Chamfer);
 
 public:
     Chamfer();
diff --git a/src/Mod/Part/App/FeatureCompound.h b/src/Mod/Part/App/FeatureCompound.h
index b865ffbd37..8e3f8ec4b0 100644
--- a/src/Mod/Part/App/FeatureCompound.h
+++ b/src/Mod/Part/App/FeatureCompound.h
@@ -32,7 +32,7 @@ namespace Part
 
 class Compound : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Compound);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Compound);
 
 public:
     Compound();
diff --git a/src/Mod/Part/App/FeatureFillet.h b/src/Mod/Part/App/FeatureFillet.h
index a676859b69..bf3013aa85 100644
--- a/src/Mod/Part/App/FeatureFillet.h
+++ b/src/Mod/Part/App/FeatureFillet.h
@@ -31,7 +31,7 @@ namespace Part
 
 class Fillet : public Part::FilletBase
 {
-    PROPERTY_HEADER(Part::Fillet);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Fillet);
 
 public:
     Fillet();
diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h
index 5631db416f..7522e023ea 100644
--- a/src/Mod/Part/App/FeatureGeometrySet.h
+++ b/src/Mod/Part/App/FeatureGeometrySet.h
@@ -32,7 +32,7 @@ namespace Part
 
 class PartExport FeatureGeometrySet :public Part::Feature
 {
-    PROPERTY_HEADER(Part::FeatureGeometrySet);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeatureGeometrySet);
 
 public:
     FeatureGeometrySet();
diff --git a/src/Mod/Part/App/FeatureMirroring.h b/src/Mod/Part/App/FeatureMirroring.h
index 0c95d3bd36..d737acff7c 100644
--- a/src/Mod/Part/App/FeatureMirroring.h
+++ b/src/Mod/Part/App/FeatureMirroring.h
@@ -33,7 +33,7 @@ namespace Part
 
 class Mirroring : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Mirroring);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Mirroring);
 
 public:
     Mirroring();
diff --git a/src/Mod/Part/App/FeaturePartBoolean.h b/src/Mod/Part/App/FeaturePartBoolean.h
index 51377cd45f..0570fad18d 100644
--- a/src/Mod/Part/App/FeaturePartBoolean.h
+++ b/src/Mod/Part/App/FeaturePartBoolean.h
@@ -34,7 +34,7 @@ namespace Part
 
 class Boolean : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Boolean);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Boolean);
 
 public:
     Boolean();
diff --git a/src/Mod/Part/App/FeaturePartBox.h b/src/Mod/Part/App/FeaturePartBox.h
index c453bfeff2..bc3e7c4a05 100644
--- a/src/Mod/Part/App/FeaturePartBox.h
+++ b/src/Mod/Part/App/FeaturePartBox.h
@@ -33,7 +33,7 @@ namespace Part
 
 class PartExport Box :public Part::Primitive
 {
-    PROPERTY_HEADER(Part::Box);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Box);
 
 public:
     Box();
diff --git a/src/Mod/Part/App/FeaturePartCircle.h b/src/Mod/Part/App/FeaturePartCircle.h
index 17b28279e6..f880f52099 100644
--- a/src/Mod/Part/App/FeaturePartCircle.h
+++ b/src/Mod/Part/App/FeaturePartCircle.h
@@ -32,7 +32,7 @@ namespace Part
 {
 class PartExport Circle : public Part::Primitive
 {
-    PROPERTY_HEADER(Part::Circle);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Circle);
 
 public:
     Circle();
diff --git a/src/Mod/Part/App/FeaturePartCommon.h b/src/Mod/Part/App/FeaturePartCommon.h
index 3a524e0a49..37c1f8e1d7 100644
--- a/src/Mod/Part/App/FeaturePartCommon.h
+++ b/src/Mod/Part/App/FeaturePartCommon.h
@@ -31,7 +31,7 @@ namespace Part
 
 class Common : public Boolean
 {
-    PROPERTY_HEADER(Part::Common);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Common);
 
 public:
     Common();
@@ -46,7 +46,7 @@ protected:
 
 class MultiCommon : public Part::Feature
 {
-    PROPERTY_HEADER(Part::MultiCommon);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::MultiCommon);
 
 public:
     MultiCommon();
diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h
index 85e856de6c..b1b84608fe 100644
--- a/src/Mod/Part/App/FeaturePartCurveNet.h
+++ b/src/Mod/Part/App/FeaturePartCurveNet.h
@@ -31,7 +31,7 @@ namespace Part
 
 class CurveNet :public Part::Feature
 {
-    PROPERTY_HEADER(Part::FeaturePartCurveNet);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeaturePartCurveNet);
 
 public:
     CurveNet();
diff --git a/src/Mod/Part/App/FeaturePartCut.h b/src/Mod/Part/App/FeaturePartCut.h
index 8dcb3ae1e6..7b6c357cc2 100644
--- a/src/Mod/Part/App/FeaturePartCut.h
+++ b/src/Mod/Part/App/FeaturePartCut.h
@@ -31,7 +31,7 @@ namespace Part
 
 class Cut : public Boolean
 {
-    PROPERTY_HEADER(Part::Cut);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Cut);
 
 public:
     Cut();
diff --git a/src/Mod/Part/App/FeaturePartFuse.h b/src/Mod/Part/App/FeaturePartFuse.h
index 0cb1445030..fdee701b5c 100644
--- a/src/Mod/Part/App/FeaturePartFuse.h
+++ b/src/Mod/Part/App/FeaturePartFuse.h
@@ -31,7 +31,7 @@ namespace Part
 
 class Fuse : public Boolean
 {
-    PROPERTY_HEADER(Part::Fuse);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Fuse);
 
 public:
     Fuse();
@@ -46,7 +46,7 @@ protected:
 
 class MultiFuse : public Part::Feature
 {
-    PROPERTY_HEADER(Part::MultiFuse);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::MultiFuse);
 
 public:
     MultiFuse();
diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h
index 84b9de3fb4..341c0b3d16 100644
--- a/src/Mod/Part/App/FeaturePartImportBrep.h
+++ b/src/Mod/Part/App/FeaturePartImportBrep.h
@@ -31,7 +31,7 @@ namespace Part
 
 class ImportBrep :public Part::Feature
 {
-    PROPERTY_HEADER(Part::ImportBrep);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::ImportBrep);
 
 public:
     ImportBrep();
diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h
index 2e1f01d72b..695663104c 100644
--- a/src/Mod/Part/App/FeaturePartImportIges.h
+++ b/src/Mod/Part/App/FeaturePartImportIges.h
@@ -31,7 +31,7 @@ namespace Part
 
 class ImportIges :public Part::Feature
 {
-    PROPERTY_HEADER(Part::FeaturePartImportIges);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeaturePartImportIges);
 
 public:
     ImportIges();
diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h
index 0219142040..4b0475b5f4 100644
--- a/src/Mod/Part/App/FeaturePartImportStep.h
+++ b/src/Mod/Part/App/FeaturePartImportStep.h
@@ -33,7 +33,7 @@ namespace Part
 
 class ImportStep :public Part::Feature
 {
-    PROPERTY_HEADER(Part::FeaturePartImportStep);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeaturePartImportStep);
 
 public:
     ImportStep();
diff --git a/src/Mod/Part/App/FeaturePartPolygon.h b/src/Mod/Part/App/FeaturePartPolygon.h
index 1ec861e9db..65c8d334ab 100644
--- a/src/Mod/Part/App/FeaturePartPolygon.h
+++ b/src/Mod/Part/App/FeaturePartPolygon.h
@@ -33,7 +33,7 @@ namespace Part
 
 class Polygon : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Polygon);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Polygon);
 
 public:
     Polygon();
diff --git a/src/Mod/Part/App/FeaturePartSection.h b/src/Mod/Part/App/FeaturePartSection.h
index 9cd127868d..74c233e0ff 100644
--- a/src/Mod/Part/App/FeaturePartSection.h
+++ b/src/Mod/Part/App/FeaturePartSection.h
@@ -33,7 +33,7 @@ namespace Part
 
 class Section : public Boolean
 {
-    PROPERTY_HEADER(Part::Section);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Section);
 
 public:
     Section();
diff --git a/src/Mod/Part/App/FeaturePartSpline.h b/src/Mod/Part/App/FeaturePartSpline.h
index 93fd2f9340..5bdc765dab 100644
--- a/src/Mod/Part/App/FeaturePartSpline.h
+++ b/src/Mod/Part/App/FeaturePartSpline.h
@@ -31,7 +31,7 @@ namespace Part
 
 class PartExport Spline :public Part::Feature
 {
-    PROPERTY_HEADER(Part::Spline);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Spline);
 
 public:
     Spline();
diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h
index 3fab537972..51f5633356 100644
--- a/src/Mod/Part/App/Geometry.h
+++ b/src/Mod/Part/App/Geometry.h
@@ -73,7 +73,7 @@ namespace Part {
 
 class PartExport Geometry: public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     ~Geometry() override;
 
@@ -138,7 +138,7 @@ private:
 
 class PartExport GeomPoint : public Geometry
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomPoint();
     GeomPoint(const Handle(Geom_CartesianPoint)&);
@@ -167,7 +167,7 @@ private:
 class GeomBSplineCurve;
 class PartExport GeomCurve : public Geometry
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomCurve();
     ~GeomCurve() override;
@@ -215,7 +215,7 @@ protected:
 
 class PartExport GeomBoundedCurve : public GeomCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomBoundedCurve();
     ~GeomBoundedCurve() override;
@@ -227,7 +227,7 @@ public:
 
 class PartExport GeomBezierCurve : public GeomBoundedCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomBezierCurve();
     GeomBezierCurve(const Handle(Geom_BezierCurve)&);
@@ -253,7 +253,7 @@ private:
 
 class PartExport GeomBSplineCurve : public GeomBoundedCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomBSplineCurve();
     GeomBSplineCurve(const Handle(Geom_BSplineCurve)&);
@@ -344,7 +344,7 @@ private:
 
 class PartExport GeomConic : public GeomCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 protected:
     GeomConic();
@@ -379,7 +379,7 @@ public:
 
 class PartExport GeomTrimmedCurve : public GeomBoundedCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomTrimmedCurve();
     GeomTrimmedCurve(const Handle(Geom_TrimmedCurve)&);
@@ -411,7 +411,7 @@ protected:
 
 class PartExport GeomArcOfConic : public GeomTrimmedCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 protected:
     GeomArcOfConic();
@@ -461,7 +461,7 @@ public:
 
 class PartExport GeomCircle : public GeomConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomCircle();
     GeomCircle(const Handle(Geom_Circle)&);
@@ -489,7 +489,7 @@ private:
 
 class PartExport GeomArcOfCircle : public GeomArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomArcOfCircle();
     GeomArcOfCircle(const Handle(Geom_Circle)&);
@@ -518,7 +518,7 @@ public:
 
 class PartExport GeomEllipse : public GeomConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomEllipse();
     GeomEllipse(const Handle(Geom_Ellipse)&);
@@ -550,7 +550,7 @@ private:
 
 class PartExport GeomArcOfEllipse : public GeomArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomArcOfEllipse();
     GeomArcOfEllipse(const Handle(Geom_Ellipse)&);
@@ -583,7 +583,7 @@ public:
 
 class PartExport GeomHyperbola : public GeomConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomHyperbola();
     GeomHyperbola(const Handle(Geom_Hyperbola)&);
@@ -612,7 +612,7 @@ private:
 
 class PartExport GeomArcOfHyperbola : public GeomArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomArcOfHyperbola();
     GeomArcOfHyperbola(const Handle(Geom_Hyperbola)&);
@@ -644,7 +644,7 @@ public:
 
 class PartExport GeomParabola : public GeomConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomParabola();
     GeomParabola(const Handle(Geom_Parabola)&);
@@ -671,7 +671,7 @@ private:
 
 class PartExport GeomArcOfParabola : public GeomArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomArcOfParabola();
     GeomArcOfParabola(const Handle(Geom_Parabola)&);
@@ -701,7 +701,7 @@ public:
 
 class PartExport GeomLine : public GeomCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomLine();
     GeomLine(const Handle(Geom_Line)&);
@@ -729,7 +729,7 @@ private:
 
 class PartExport GeomLineSegment : public GeomTrimmedCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomLineSegment();
     GeomLineSegment(const Handle(Geom_Line)& l);
@@ -757,7 +757,7 @@ public:
 
 class PartExport GeomOffsetCurve : public GeomCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomOffsetCurve();
     GeomOffsetCurve(const Handle(Geom_Curve)&, double, const gp_Dir&);
@@ -782,7 +782,7 @@ private:
 
 class PartExport GeomSurface : public Geometry
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     enum Curvature {
         Maximum,
@@ -814,7 +814,7 @@ public:
 
 class PartExport GeomBezierSurface : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomBezierSurface();
     GeomBezierSurface(const Handle(Geom_BezierSurface)&);
@@ -837,7 +837,7 @@ private:
 
 class PartExport GeomBSplineSurface : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomBSplineSurface();
     GeomBSplineSurface(const Handle(Geom_BSplineSurface)&);
@@ -861,7 +861,7 @@ private:
 
 class PartExport GeomCylinder : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomCylinder();
     GeomCylinder(const Handle(Geom_CylindricalSurface)&);
@@ -884,7 +884,7 @@ private:
 
 class PartExport GeomCone : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomCone();
     GeomCone(const Handle(Geom_ConicalSurface)&);
@@ -910,7 +910,7 @@ private:
 
 class PartExport GeomSphere : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomSphere();
     GeomSphere(const Handle(Geom_SphericalSurface)&);
@@ -933,7 +933,7 @@ private:
 
 class PartExport GeomToroid : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomToroid();
     GeomToroid(const Handle(Geom_ToroidalSurface)&);
@@ -956,7 +956,7 @@ private:
 
 class PartExport GeomPlane : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomPlane();
     GeomPlane(const Handle(Geom_Plane)&);
@@ -979,7 +979,7 @@ private:
 
 class PartExport GeomOffsetSurface : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomOffsetSurface();
     GeomOffsetSurface(const Handle(Geom_Surface)&, double);
@@ -1003,7 +1003,7 @@ private:
 
 class PartExport GeomPlateSurface : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomPlateSurface();
     GeomPlateSurface(const Handle(Geom_Surface)&, const Plate_Plate&);
@@ -1028,7 +1028,7 @@ private:
 
 class PartExport GeomTrimmedSurface : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomTrimmedSurface();
     GeomTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)&);
@@ -1051,7 +1051,7 @@ private:
 
 class PartExport GeomSurfaceOfRevolution : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomSurfaceOfRevolution();
     GeomSurfaceOfRevolution(const Handle(Geom_Curve)&, const gp_Ax1&);
@@ -1075,7 +1075,7 @@ private:
 
 class PartExport GeomSurfaceOfExtrusion : public GeomSurface
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     GeomSurfaceOfExtrusion();
     GeomSurfaceOfExtrusion(const Handle(Geom_Curve)&, const gp_Dir&);
diff --git a/src/Mod/Part/App/Geometry2d.h b/src/Mod/Part/App/Geometry2d.h
index c3734ccdce..5d7fb30f77 100644
--- a/src/Mod/Part/App/Geometry2d.h
+++ b/src/Mod/Part/App/Geometry2d.h
@@ -50,7 +50,7 @@ namespace Part {
 
 class PartExport Geometry2d : public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     ~Geometry2d() override;
 
@@ -73,7 +73,7 @@ private:
 
 class PartExport Geom2dPoint : public Geometry2d
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dPoint();
     Geom2dPoint(const Handle(Geom2d_CartesianPoint)&);
@@ -100,7 +100,7 @@ private:
 
 class PartExport Geom2dCurve : public Geometry2d
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dCurve();
     ~Geom2dCurve() override;
@@ -117,7 +117,7 @@ public:
 
 class PartExport Geom2dBezierCurve : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dBezierCurve();
     Geom2dBezierCurve(const Handle(Geom2d_BezierCurve)&);
@@ -140,7 +140,7 @@ private:
 
 class PartExport Geom2dBSplineCurve : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dBSplineCurve();
     Geom2dBSplineCurve(const Handle(Geom2d_BSplineCurve)&);
@@ -196,7 +196,7 @@ private:
 
 class PartExport Geom2dConic : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 protected:
     Geom2dConic();
 
@@ -220,7 +220,7 @@ protected:
 
 class PartExport Geom2dArcOfConic : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 protected:
     Geom2dArcOfConic();
 
@@ -250,7 +250,7 @@ protected:
 
 class PartExport Geom2dCircle : public Geom2dConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dCircle();
     Geom2dCircle(const Handle(Geom2d_Circle)&);
@@ -277,7 +277,7 @@ private:
 
 class PartExport Geom2dArcOfCircle : public Geom2dArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dArcOfCircle();
     Geom2dArcOfCircle(const Handle(Geom2d_Circle)&);
@@ -303,7 +303,7 @@ private:
 
 class PartExport Geom2dEllipse : public Geom2dConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dEllipse();
     Geom2dEllipse(const Handle(Geom2d_Ellipse)&);
@@ -333,7 +333,7 @@ private:
 
 class PartExport Geom2dArcOfEllipse : public Geom2dArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dArcOfEllipse();
     Geom2dArcOfEllipse(const Handle(Geom2d_Ellipse)&);
@@ -363,7 +363,7 @@ private:
 
 class PartExport Geom2dHyperbola : public Geom2dConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dHyperbola();
     Geom2dHyperbola(const Handle(Geom2d_Hyperbola)&);
@@ -390,7 +390,7 @@ private:
 
 class PartExport Geom2dArcOfHyperbola : public Geom2dArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dArcOfHyperbola();
     Geom2dArcOfHyperbola(const Handle(Geom2d_Hyperbola)&);
@@ -418,7 +418,7 @@ private:
 
 class PartExport Geom2dParabola : public Geom2dConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dParabola();
     Geom2dParabola(const Handle(Geom2d_Parabola)&);
@@ -443,7 +443,7 @@ private:
 
 class PartExport Geom2dArcOfParabola : public Geom2dArcOfConic
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dArcOfParabola();
     Geom2dArcOfParabola(const Handle(Geom2d_Parabola)&);
@@ -469,7 +469,7 @@ private:
 
 class PartExport Geom2dLine : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dLine();
     Geom2dLine(const Handle(Geom2d_Line)&);
@@ -496,7 +496,7 @@ private:
 
 class PartExport Geom2dLineSegment : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dLineSegment();
     ~Geom2dLineSegment() override;
@@ -524,7 +524,7 @@ private:
 
 class PartExport Geom2dOffsetCurve : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dOffsetCurve();
     Geom2dOffsetCurve(const Handle(Geom2d_Curve)&, double);
@@ -548,7 +548,7 @@ private:
 
 class PartExport Geom2dTrimmedCurve : public Geom2dCurve
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     Geom2dTrimmedCurve();
     Geom2dTrimmedCurve(const Handle(Geom2d_TrimmedCurve)&);
diff --git a/src/Mod/Part/App/GeometryExtension.h b/src/Mod/Part/App/GeometryExtension.h
index 59ed679489..0626603020 100644
--- a/src/Mod/Part/App/GeometryExtension.h
+++ b/src/Mod/Part/App/GeometryExtension.h
@@ -36,7 +36,7 @@ class Geometry;
 
 class PartExport GeometryExtension: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     ~GeometryExtension() override = default;
 
@@ -67,7 +67,7 @@ private:
 
 class PartExport GeometryPersistenceExtension : public Part::GeometryExtension
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     ~GeometryPersistenceExtension() override = default;
 
diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h
index f16a2d64d1..13c5591b21 100644
--- a/src/Mod/Part/App/PartFeature.h
+++ b/src/Mod/Part/App/PartFeature.h
@@ -127,7 +127,7 @@ protected:
 
 class FilletBase : public Part::Feature
 {
-    PROPERTY_HEADER(Part::FilletBase);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FilletBase);
 
 public:
     FilletBase();
@@ -145,7 +145,7 @@ typedef App::FeaturePythonT<Feature> FeaturePython;
  */
 class PartExport FeatureExt : public Feature
 {
-    PROPERTY_HEADER(Part::FeatureExt);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeatureExt);
 
 public:
     const char* getViewProviderName() const override {
diff --git a/src/Mod/Part/App/PartFeatureReference.h b/src/Mod/Part/App/PartFeatureReference.h
index 1a733cf870..4ed2035e12 100644
--- a/src/Mod/Part/App/PartFeatureReference.h
+++ b/src/Mod/Part/App/PartFeatureReference.h
@@ -37,7 +37,7 @@ class PartFeaturePy;
  */
 class PartExport FeatureReference : public App::GeoFeature
 {
-    PROPERTY_HEADER(Part::FeatureReference);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeatureReference);
 
 public:
     /// Constructor
diff --git a/src/Mod/Part/App/PartFeatures.h b/src/Mod/Part/App/PartFeatures.h
index 8990978fff..88e2b57660 100644
--- a/src/Mod/Part/App/PartFeatures.h
+++ b/src/Mod/Part/App/PartFeatures.h
@@ -34,7 +34,7 @@ namespace Part
 
 class RuledSurface : public Part::Feature
 {
-    PROPERTY_HEADER(Part::RuledSurface);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::RuledSurface);
 
 public:
     RuledSurface();
@@ -65,7 +65,7 @@ private:
 
 class Loft : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Loft);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Loft);
 
 public:
     Loft();
@@ -95,7 +95,7 @@ private:
 
 class Sweep : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Sweep);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Sweep);
 
 public:
     Sweep();
@@ -125,7 +125,7 @@ private:
 
 class Thickness : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Thickness);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Thickness);
 
 public:
     Thickness();
@@ -157,7 +157,7 @@ private:
 
 class Refine : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Refine);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Refine);
 
 public:
     Refine();
@@ -176,7 +176,7 @@ public:
 
 class Reverse : public Part::Feature
 {
-    PROPERTY_HEADER(Part::Reverse);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Reverse);
 
 public:
     Reverse();
diff --git a/src/Mod/Part/App/PrimitiveFeature.h b/src/Mod/Part/App/PrimitiveFeature.h
index 8ab3502e5e..33c6b5a3a6 100644
--- a/src/Mod/Part/App/PrimitiveFeature.h
+++ b/src/Mod/Part/App/PrimitiveFeature.h
@@ -55,7 +55,7 @@ protected:
 
 class PartExport Vertex : public Part::Primitive
 {
-    PROPERTY_HEADER(Part::Vertex);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Vertex);
 
 public:
     Vertex();
@@ -80,7 +80,7 @@ public:
 
 class PartExport Line : public Part::Primitive
 {
-    PROPERTY_HEADER(Part::Line);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Line);
 
 public:
     Line();
@@ -108,7 +108,7 @@ public:
 
 class PartExport Plane : public Primitive
 {
-    PROPERTY_HEADER(Part::Plane);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Plane);
 
 public:
     Plane();
@@ -130,7 +130,7 @@ public:
 
 class PartExport Sphere : public Primitive
 {
-    PROPERTY_HEADER(Part::Sphere);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Sphere);
 
 public:
     Sphere();
@@ -154,7 +154,7 @@ public:
 
 class PartExport Ellipsoid : public Primitive
 {
-    PROPERTY_HEADER(Part::Ellipsoid);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Ellipsoid);
 
 public:
     Ellipsoid();
@@ -180,7 +180,7 @@ public:
 class PartExport Cylinder : public Primitive,
                             public PrismExtension
 {
-    PROPERTY_HEADER(Part::Cylinder);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Cylinder);
 
 public:
     Cylinder();
@@ -204,7 +204,7 @@ public:
 class PartExport Prism : public Primitive,
                          public PrismExtension
 {
-    PROPERTY_HEADER(Part::Prism);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Prism);
 
 public:
     Prism();
@@ -229,7 +229,7 @@ private:
 
 class PartExport RegularPolygon : public Primitive
 {
-    PROPERTY_HEADER(Part::RegularPolygon);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::RegularPolygon);
 
 public:
     RegularPolygon();
@@ -253,7 +253,7 @@ private:
 
 class PartExport Cone : public Primitive
 {
-    PROPERTY_HEADER(Part::Cone);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Cone);
 
 public:
     Cone();
@@ -277,7 +277,7 @@ public:
 
 class PartExport Torus : public Primitive
 {
-    PROPERTY_HEADER(Part::Torus);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Torus);
 
 public:
     Torus();
@@ -302,7 +302,7 @@ public:
 
 class PartExport Helix : public Primitive
 {
-    PROPERTY_HEADER(Part::Helix);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Helix);
 
 public:
     Helix();
@@ -336,7 +336,7 @@ private:
 
 class PartExport Spiral : public Primitive
 {
-    PROPERTY_HEADER(Part::Spiral);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Spiral);
 
 public:
     Spiral();
@@ -363,7 +363,7 @@ protected:
 
 class PartExport Wedge : public Primitive
 {
-    PROPERTY_HEADER(Part::Wedge);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Wedge);
 
 public:
     Wedge();
@@ -396,7 +396,7 @@ protected:
 
 class PartExport Ellipse : public Part::Primitive
 {
-    PROPERTY_HEADER(Part::Ellipse);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::Ellipse);
 
 public:
     Ellipse();
diff --git a/src/Mod/Part/App/PrismExtension.h b/src/Mod/Part/App/PrismExtension.h
index 2b6e22062a..919cf1de99 100644
--- a/src/Mod/Part/App/PrismExtension.h
+++ b/src/Mod/Part/App/PrismExtension.h
@@ -35,7 +35,7 @@ namespace Part
 
 class PartExport PrismExtension : public App::DocumentObjectExtension
 {
-    EXTENSION_PROPERTY_HEADER(Part::PrismExtension);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Part::PrismExtension);
 public:
     PrismExtension();
     ~PrismExtension() override;
diff --git a/src/Mod/Part/App/PropertyGeometryList.h b/src/Mod/Part/App/PropertyGeometryList.h
index b0331c3e40..05fae85a4b 100644
--- a/src/Mod/Part/App/PropertyGeometryList.h
+++ b/src/Mod/Part/App/PropertyGeometryList.h
@@ -40,7 +40,7 @@ class Geometry;
 
 class PartExport PropertyGeometryList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h
index 54abb9f21b..14fe472f06 100644
--- a/src/Mod/Part/App/PropertyTopoShape.h
+++ b/src/Mod/Part/App/PropertyTopoShape.h
@@ -40,7 +40,7 @@ namespace Part
  */
 class PartExport PropertyPartShape : public App::PropertyComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyPartShape();
@@ -119,7 +119,7 @@ struct PartExport ShapeHistory {
 
 class PartExport PropertyShapeHistory : public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyShapeHistory();
@@ -172,7 +172,7 @@ struct PartExport FilletElement {
 
 class PartExport PropertyFilletEdges : public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFilletEdges();
diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h
index 7110a30e10..c9749856bb 100644
--- a/src/Mod/Part/App/TopoShape.h
+++ b/src/Mod/Part/App/TopoShape.h
@@ -75,7 +75,7 @@ public:
 
 class PartExport ShapeSegment : public Data::Segment
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     ShapeSegment(const TopoDS_Shape &ShapeIn):Shape(ShapeIn){}
@@ -91,7 +91,7 @@ public:
  */
 class PartExport TopoShape : public Data::ComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     TopoShape();
diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h
index 3df7d2c71d..0490eab73c 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.h
+++ b/src/Mod/Part/Gui/DlgExtrusion.h
@@ -28,6 +28,7 @@
 #include <string>
 
 #include <Mod/Part/App/FeatureExtrusion.h>
+#include <QDialog>
 
 class TopoDS_Shape;
 
@@ -41,9 +42,9 @@ class DlgExtrusion : public QDialog, public Gui::SelectionObserver
 public:
     DlgExtrusion(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
     ~DlgExtrusion() override;
-    void accept();
+    void accept() override;
     void apply();
-    void reject();
+    void reject() override;
 
     Base::Vector3d getDir() const;
     void setDir(Base::Vector3d newDir);
@@ -64,8 +65,8 @@ public:
 protected:
     void findShapes();
     bool canExtrude(const TopoDS_Shape&) const;
-    void changeEvent(QEvent *e);
-    void keyPressEvent(QKeyEvent*);
+    void changeEvent(QEvent *e) override;
+    void keyPressEvent(QKeyEvent*) override;
 
 private Q_SLOTS:
     void on_rbDirModeCustom_toggled(bool on);
diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h
index f509da6cc5..ccb1bf7ed0 100644
--- a/src/Mod/Part/Gui/TaskCheckGeometry.h
+++ b/src/Mod/Part/Gui/TaskCheckGeometry.h
@@ -205,7 +205,7 @@ public:
     ~BOPProgressIndicator () override;
 
 #if OCC_VERSION_HEX < 0x070500
-    virtual Standard_Boolean Show (const Standard_Boolean theForce = Standard_True);
+    Standard_Boolean Show (const Standard_Boolean theForce = Standard_True) override;
 #else
     void Show (const Message_ProgressScope& theScope,
                        const Standard_Boolean isForce) override;
diff --git a/src/Mod/Part/Gui/ViewProvider.h b/src/Mod/Part/Gui/ViewProvider.h
index 64c9045320..8e224b8a3c 100644
--- a/src/Mod/Part/Gui/ViewProvider.h
+++ b/src/Mod/Part/Gui/ViewProvider.h
@@ -44,7 +44,7 @@ public:
 
 class PartGuiExport ViewProviderPart : public ViewProviderPartExt
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPart);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPart);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h
index db8050807e..4d59e81403 100644
--- a/src/Mod/Part/Gui/ViewProvider2DObject.h
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.h
@@ -39,7 +39,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProvider2DObject : public PartGui::ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProvider2DObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProvider2DObject);
 
 public:
     /// constructor
@@ -52,7 +52,7 @@ public:
 
 class PartGuiExport ViewProvider2DObjectGrid : public ViewProvider2DObject
 {
-    PROPERTY_HEADER(PartGui::ViewProvider2DObjectGrid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProvider2DObjectGrid);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderBoolean.h b/src/Mod/Part/Gui/ViewProviderBoolean.h
index ecaf74c479..996496a1e6 100644
--- a/src/Mod/Part/Gui/ViewProviderBoolean.h
+++ b/src/Mod/Part/Gui/ViewProviderBoolean.h
@@ -31,7 +31,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderBoolean : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderBoolean);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderBoolean);
 
 public:
     /// constructor
@@ -49,7 +49,7 @@ public:
 /// ViewProvider for the MultiFuse feature
 class PartGuiExport ViewProviderMultiFuse : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderMultiFuse);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderMultiFuse);
 
 public:
     /// constructor
@@ -75,7 +75,7 @@ public:
 /// ViewProvider for the MultiFuse feature
 class PartGuiExport ViewProviderMultiCommon : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderMultiCommon);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderMultiCommon);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderBox.h b/src/Mod/Part/Gui/ViewProviderBox.h
index 2b4c0cae91..39f1d1c1cd 100644
--- a/src/Mod/Part/Gui/ViewProviderBox.h
+++ b/src/Mod/Part/Gui/ViewProviderBox.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderBox : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderBox);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderBox);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.h b/src/Mod/Part/Gui/ViewProviderCircleParametric.h
index 72a86e910d..3800065666 100644
--- a/src/Mod/Part/Gui/ViewProviderCircleParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderCircleParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderCircleParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderCircleParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderCompound.h b/src/Mod/Part/Gui/ViewProviderCompound.h
index bb5193545e..642f8a7e63 100644
--- a/src/Mod/Part/Gui/ViewProviderCompound.h
+++ b/src/Mod/Part/Gui/ViewProviderCompound.h
@@ -31,7 +31,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderCompound : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderCompound);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderCompound);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.h b/src/Mod/Part/Gui/ViewProviderConeParametric.h
index 6ac21d771e..aaee45992f 100644
--- a/src/Mod/Part/Gui/ViewProviderConeParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderConeParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderConeParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderConeParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderConeParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.h b/src/Mod/Part/Gui/ViewProviderCurveNet.h
index feeafad483..09b708a509 100644
--- a/src/Mod/Part/Gui/ViewProviderCurveNet.h
+++ b/src/Mod/Part/Gui/ViewProviderCurveNet.h
@@ -43,7 +43,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderCurveNet:public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPart);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPart);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h
index d3fa062da8..1070cd2f75 100644
--- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderCylinderParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderCylinderParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderCylinderParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h
index 4aae4455fa..f33ca2bb23 100644
--- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderEllipseParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderEllipseParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderEllipseParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderExtrusion.h b/src/Mod/Part/Gui/ViewProviderExtrusion.h
index 83af6e4b4a..0468c357e1 100644
--- a/src/Mod/Part/Gui/ViewProviderExtrusion.h
+++ b/src/Mod/Part/Gui/ViewProviderExtrusion.h
@@ -31,7 +31,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderExtrusion : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderExtrusion);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderExtrusion);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.h b/src/Mod/Part/Gui/ViewProviderHelixParametric.h
index 7f6f06a07a..368c954be7 100644
--- a/src/Mod/Part/Gui/ViewProviderHelixParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.h
@@ -32,7 +32,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderHelixParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderHelixParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderHelixParametric);
 
 public:
     /// constructor
@@ -48,7 +48,7 @@ private:
 
 class PartGuiExport ViewProviderSpiralParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderSpiralParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderSpiralParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderImport.h b/src/Mod/Part/Gui/ViewProviderImport.h
index 2b01c74df2..448767872d 100644
--- a/src/Mod/Part/Gui/ViewProviderImport.h
+++ b/src/Mod/Part/Gui/ViewProviderImport.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderImport : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderImport);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderImport);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.h b/src/Mod/Part/Gui/ViewProviderLineParametric.h
index ef87863b1a..2c1b8406fb 100644
--- a/src/Mod/Part/Gui/ViewProviderLineParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderLineParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderLineParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderLineParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderLineParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderMirror.h b/src/Mod/Part/Gui/ViewProviderMirror.h
index 4f747fcf01..11ad437455 100644
--- a/src/Mod/Part/Gui/ViewProviderMirror.h
+++ b/src/Mod/Part/Gui/ViewProviderMirror.h
@@ -31,7 +31,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderMirror : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderMirror);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderMirror);
 
 public:
     ViewProviderMirror();
@@ -58,7 +58,7 @@ private:
 
 class PartGuiExport ViewProviderFillet : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderFillet);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderFillet);
 
 public:
     ViewProviderFillet();
@@ -78,7 +78,7 @@ protected:
 
 class ViewProviderChamfer : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderChamfer);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderChamfer);
 
 public:
     /// constructor
@@ -100,7 +100,7 @@ protected:
 
 class ViewProviderRevolution : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderRevolution);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderRevolution);
 
 public:
     /// constructor
@@ -115,7 +115,7 @@ public:
 
 class ViewProviderLoft : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderLoft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderLoft);
 
 public:
     /// constructor
@@ -130,7 +130,7 @@ public:
 
 class ViewProviderSweep : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderSweep);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderSweep);
 
 public:
     /// constructor
@@ -145,7 +145,7 @@ public:
 
 class ViewProviderOffset : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderOffset);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderOffset);
 
 public:
     /// constructor
@@ -165,7 +165,7 @@ protected:
 
 class ViewProviderOffset2D : public ViewProviderOffset
 {
-    PROPERTY_HEADER(PartGui::ViewProviderOffset2D);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderOffset2D);
 
 public:
     ViewProviderOffset2D(){
@@ -175,7 +175,7 @@ public:
 
 class ViewProviderThickness : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderThickness);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderThickness);
 
 public:
     /// constructor
@@ -195,7 +195,7 @@ protected:
 
 class ViewProviderRefine : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderRefine);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderRefine);
 
 public:
     /// constructor
@@ -206,7 +206,7 @@ public:
 
 class ViewProviderReverse : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderReverse);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderReverse);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h
index 80ad3bbd08..91414db8d6 100644
--- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderPlaneParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPlaneParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPlaneParametric);
 
 public:
     /// constructor
@@ -54,7 +54,7 @@ protected:
 
 class PartGuiExport ViewProviderFace : public ViewProviderPlaneParametric
 {
-    PROPERTY_HEADER(PartGui::ViewProviderFace);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderFace);
 
 public:
     ViewProviderFace();
diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.h b/src/Mod/Part/Gui/ViewProviderPointParametric.h
index ac660fbe8f..32ff1f6d0b 100644
--- a/src/Mod/Part/Gui/ViewProviderPointParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderPointParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderPointParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPointParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPointParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderPrimitive.h b/src/Mod/Part/Gui/ViewProviderPrimitive.h
index 58e3fcfa67..cefacdf979 100644
--- a/src/Mod/Part/Gui/ViewProviderPrimitive.h
+++ b/src/Mod/Part/Gui/ViewProviderPrimitive.h
@@ -32,7 +32,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderPrimitive : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPrimitive);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPrimitive);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderPrism.h b/src/Mod/Part/Gui/ViewProviderPrism.h
index c220bcf706..e829215b87 100644
--- a/src/Mod/Part/Gui/ViewProviderPrism.h
+++ b/src/Mod/Part/Gui/ViewProviderPrism.h
@@ -32,7 +32,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderPrism : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPrism);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderPrism);
 
 public:
     /// constructor
@@ -48,7 +48,7 @@ protected:
 
 class PartGuiExport ViewProviderWedge : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderWedge);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderWedge);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderPython.h b/src/Mod/Part/Gui/ViewProviderPython.h
index a1e4c45dff..945c123b07 100644
--- a/src/Mod/Part/Gui/ViewProviderPython.h
+++ b/src/Mod/Part/Gui/ViewProviderPython.h
@@ -31,7 +31,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderCustom : public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderCustom);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderCustom);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h
index c7e90cfaa1..0052fb993d 100644
--- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.h
+++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.h
@@ -32,7 +32,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderRegularPolygon : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderRegularPolygon);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderRegularPolygon);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.h b/src/Mod/Part/Gui/ViewProviderRuledSurface.h
index a676b1712d..c8ce24edf4 100644
--- a/src/Mod/Part/Gui/ViewProviderRuledSurface.h
+++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.h
@@ -31,7 +31,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderRuledSurface:public ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderRuledSurface);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderRuledSurface);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.h b/src/Mod/Part/Gui/ViewProviderSphereParametric.h
index e2001f5cbb..fd4968bec9 100644
--- a/src/Mod/Part/Gui/ViewProviderSphereParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.h
@@ -30,7 +30,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderSphereParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderSphereParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderSphereParametric);
 
 public:
     /// constructor
@@ -46,7 +46,7 @@ protected:
 
 class PartGuiExport ViewProviderEllipsoid : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderEllipsoid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderEllipsoid);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderSpline.h b/src/Mod/Part/Gui/ViewProviderSpline.h
index 859b9e9f0a..93a069951b 100644
--- a/src/Mod/Part/Gui/ViewProviderSpline.h
+++ b/src/Mod/Part/Gui/ViewProviderSpline.h
@@ -55,7 +55,7 @@ protected:
 
 class PartGuiExport ViewProviderSpline : public ViewProviderPartExt
 {
-    PROPERTY_HEADER(PartGui::ViewProviderSpline);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderSpline);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.h b/src/Mod/Part/Gui/ViewProviderTorusParametric.h
index 325826cc32..836b8c0f7b 100644
--- a/src/Mod/Part/Gui/ViewProviderTorusParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.h
@@ -38,7 +38,7 @@ namespace PartGui {
 
 class PartGuiExport ViewProviderTorusParametric : public ViewProviderPrimitive
 {
-    PROPERTY_HEADER(PartGui::ViewProviderTorusParametric);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartGui::ViewProviderTorusParametric);
 
 public:
     /// constructor
diff --git a/src/Mod/Part/Gui/Workbench.h b/src/Mod/Part/Gui/Workbench.h
index 8564b8e596..22723bb99e 100644
--- a/src/Mod/Part/Gui/Workbench.h
+++ b/src/Mod/Part/Gui/Workbench.h
@@ -34,7 +34,7 @@ namespace PartGui {
  */
 class PartGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/PartDesign/App/DatumLine.h b/src/Mod/PartDesign/App/DatumLine.h
index 3b14d1403c..8faa330fb9 100644
--- a/src/Mod/PartDesign/App/DatumLine.h
+++ b/src/Mod/PartDesign/App/DatumLine.h
@@ -34,7 +34,7 @@ namespace PartDesign
 
 class PartDesignExport Line : public Part::Datum
 {
-    PROPERTY_HEADER(PartDesign::Line);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Line);
 
 public:
     Line();
diff --git a/src/Mod/PartDesign/App/DatumPlane.h b/src/Mod/PartDesign/App/DatumPlane.h
index a3847179ea..0b6e83f35f 100644
--- a/src/Mod/PartDesign/App/DatumPlane.h
+++ b/src/Mod/PartDesign/App/DatumPlane.h
@@ -34,7 +34,7 @@ namespace PartDesign
 
 class PartDesignExport Plane : public Part::Datum
 {
-    PROPERTY_HEADER(PartDesign::Plane);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Plane);
 
 public:
     Plane();
diff --git a/src/Mod/PartDesign/App/Feature.h b/src/Mod/PartDesign/App/Feature.h
index b3d5448d46..3c3df3075b 100644
--- a/src/Mod/PartDesign/App/Feature.h
+++ b/src/Mod/PartDesign/App/Feature.h
@@ -46,7 +46,7 @@ class Body;
  */
 class PartDesignExport Feature : public Part::Feature
 {
-    PROPERTY_HEADER(PartDesign::Feature);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Feature);
 
 public:
     Feature();
diff --git a/src/Mod/PartDesign/App/FeatureAddSub.h b/src/Mod/PartDesign/App/FeatureAddSub.h
index 5d0fbc4691..d6c09aabab 100644
--- a/src/Mod/PartDesign/App/FeatureAddSub.h
+++ b/src/Mod/PartDesign/App/FeatureAddSub.h
@@ -61,7 +61,7 @@ typedef App::FeaturePythonT<FeatureAddSub> FeatureAddSubPython;
 
 class FeatureAdditivePython : public FeatureAddSubPython
 {
-    PROPERTY_HEADER(PartDesign::FeatureAdditivePython);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::FeatureAdditivePython);
 
 public:
     FeatureAdditivePython();
@@ -70,7 +70,7 @@ public:
 
 class FeatureSubtractivePython : public FeatureAddSubPython
 {
-    PROPERTY_HEADER(PartDesign::FeatureSubtractivePython);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::FeatureSubtractivePython);
 
 public:
     FeatureSubtractivePython();
diff --git a/src/Mod/PartDesign/App/FeatureBase.h b/src/Mod/PartDesign/App/FeatureBase.h
index 376a845396..d68559a8b0 100644
--- a/src/Mod/PartDesign/App/FeatureBase.h
+++ b/src/Mod/PartDesign/App/FeatureBase.h
@@ -32,7 +32,7 @@ namespace PartDesign
 
 class PartDesignExport FeatureBase : public PartDesign::Feature
 {
-    PROPERTY_HEADER(PartDesign::FeatureBase);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::FeatureBase);
 
 public:
     FeatureBase();
diff --git a/src/Mod/PartDesign/App/FeatureDraft.h b/src/Mod/PartDesign/App/FeatureDraft.h
index 84a6250461..d55a420e91 100644
--- a/src/Mod/PartDesign/App/FeatureDraft.h
+++ b/src/Mod/PartDesign/App/FeatureDraft.h
@@ -35,7 +35,7 @@ namespace PartDesign
 
 class PartDesignExport Draft : public DressUp
 {
-    PROPERTY_HEADER(PartDesign::Draft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Draft);
 
 public:
     Draft();
diff --git a/src/Mod/PartDesign/App/FeatureDressUp.h b/src/Mod/PartDesign/App/FeatureDressUp.h
index 05d17f6428..c01f1fadb2 100644
--- a/src/Mod/PartDesign/App/FeatureDressUp.h
+++ b/src/Mod/PartDesign/App/FeatureDressUp.h
@@ -31,7 +31,7 @@ namespace PartDesign
 
 class PartDesignExport DressUp : public PartDesign::FeatureAddSub
 {
-    PROPERTY_HEADER(PartDesign::DressUp);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::DressUp);
 
 public:
     DressUp();
diff --git a/src/Mod/PartDesign/App/FeatureExtrude.h b/src/Mod/PartDesign/App/FeatureExtrude.h
index 1b361a111c..0cfd0acc7a 100644
--- a/src/Mod/PartDesign/App/FeatureExtrude.h
+++ b/src/Mod/PartDesign/App/FeatureExtrude.h
@@ -37,7 +37,7 @@ namespace PartDesign
 
 class PartDesignExport FeatureExtrude : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::FeatureExtrude);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::FeatureExtrude);
 
 public:
     FeatureExtrude();
diff --git a/src/Mod/PartDesign/App/FeatureFillet.h b/src/Mod/PartDesign/App/FeatureFillet.h
index b39c72530e..a1f37d0eea 100644
--- a/src/Mod/PartDesign/App/FeatureFillet.h
+++ b/src/Mod/PartDesign/App/FeatureFillet.h
@@ -33,7 +33,7 @@ namespace PartDesign
 
 class PartDesignExport Fillet : public DressUp
 {
-    PROPERTY_HEADER(PartDesign::Fillet);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Fillet);
 
 public:
     Fillet();
diff --git a/src/Mod/PartDesign/App/FeatureGroove.h b/src/Mod/PartDesign/App/FeatureGroove.h
index 7264f21429..0ddd3f4960 100644
--- a/src/Mod/PartDesign/App/FeatureGroove.h
+++ b/src/Mod/PartDesign/App/FeatureGroove.h
@@ -32,7 +32,7 @@ namespace PartDesign
 
 class PartDesignExport Groove : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::Groove);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Groove);
 
 public:
     Groove();
diff --git a/src/Mod/PartDesign/App/FeatureHelix.h b/src/Mod/PartDesign/App/FeatureHelix.h
index eddddf3475..531ded92d6 100644
--- a/src/Mod/PartDesign/App/FeatureHelix.h
+++ b/src/Mod/PartDesign/App/FeatureHelix.h
@@ -40,7 +40,7 @@ enum class HelixMode {
 
 class PartDesignExport Helix : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::Helix);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Helix);
 
 public:
     Helix();
@@ -106,7 +106,7 @@ private:
 
 class PartDesignExport AdditiveHelix : public Helix {
 
-    PROPERTY_HEADER(PartDesign::AdditiveHelix);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveHelix);
 public:
     AdditiveHelix();
 };
@@ -114,7 +114,7 @@ public:
 
 class PartDesignExport SubtractiveHelix : public Helix {
 
-    PROPERTY_HEADER(PartDesign::SubtractiveHelix);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveHelix);
 public:
     SubtractiveHelix();
 };
diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h
index f90a7b6ab6..acf56a7e31 100644
--- a/src/Mod/PartDesign/App/FeatureHole.h
+++ b/src/Mod/PartDesign/App/FeatureHole.h
@@ -43,7 +43,7 @@ static constexpr size_t ThreadRunout_size = 24;
 
 class PartDesignExport Hole : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::Hole);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Hole);
 
 public:
     Hole();
diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.h b/src/Mod/PartDesign/App/FeatureLinearPattern.h
index ba785ae522..19e6d860be 100644
--- a/src/Mod/PartDesign/App/FeatureLinearPattern.h
+++ b/src/Mod/PartDesign/App/FeatureLinearPattern.h
@@ -32,7 +32,7 @@ namespace PartDesign
 
 class PartDesignExport LinearPattern : public PartDesign::Transformed
 {
-    PROPERTY_HEADER(PartDesign::LinearPattern);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::LinearPattern);
 
 public:
     LinearPattern();
diff --git a/src/Mod/PartDesign/App/FeatureLoft.h b/src/Mod/PartDesign/App/FeatureLoft.h
index 99d4fdc6a7..dc6fd321f8 100644
--- a/src/Mod/PartDesign/App/FeatureLoft.h
+++ b/src/Mod/PartDesign/App/FeatureLoft.h
@@ -31,7 +31,7 @@ namespace PartDesign
 
 class PartDesignExport Loft : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::Loft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Loft);
 
 public:
     Loft();
@@ -61,14 +61,14 @@ private:
 
 class PartDesignExport AdditiveLoft : public Loft {
 
-    PROPERTY_HEADER(PartDesign::AdditiveLoft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveLoft);
 public:
     AdditiveLoft();
 };
 
 class PartDesignExport SubtractiveLoft : public Loft {
 
-    PROPERTY_HEADER(PartDesign::SubtractiveLoft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveLoft);
 public:
     SubtractiveLoft();
 };
diff --git a/src/Mod/PartDesign/App/FeatureMultiTransform.h b/src/Mod/PartDesign/App/FeatureMultiTransform.h
index b4012d6b18..b2ceb85693 100644
--- a/src/Mod/PartDesign/App/FeatureMultiTransform.h
+++ b/src/Mod/PartDesign/App/FeatureMultiTransform.h
@@ -32,7 +32,7 @@ namespace PartDesign
 
 class PartDesignExport MultiTransform : public PartDesign::Transformed
 {
-    PROPERTY_HEADER(PartDesign::MultiTransform);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::MultiTransform);
 
 public:
     MultiTransform();
diff --git a/src/Mod/PartDesign/App/FeaturePad.h b/src/Mod/PartDesign/App/FeaturePad.h
index 4de1d88f3e..f9933c1621 100644
--- a/src/Mod/PartDesign/App/FeaturePad.h
+++ b/src/Mod/PartDesign/App/FeaturePad.h
@@ -31,7 +31,7 @@ namespace PartDesign
 
 class PartDesignExport Pad : public FeatureExtrude
 {
-    PROPERTY_HEADER(PartDesign::Pad);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Pad);
 
 public:
     Pad();
diff --git a/src/Mod/PartDesign/App/FeaturePipe.h b/src/Mod/PartDesign/App/FeaturePipe.h
index 2ba8b282a6..b71890eabb 100644
--- a/src/Mod/PartDesign/App/FeaturePipe.h
+++ b/src/Mod/PartDesign/App/FeaturePipe.h
@@ -32,7 +32,7 @@ namespace PartDesign
 
 class PartDesignExport Pipe : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::Pipe);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Pipe);
 
 public:
     Pipe();
@@ -72,14 +72,14 @@ private:
 
 class PartDesignExport AdditivePipe : public Pipe {
 
-    PROPERTY_HEADER(PartDesign::AdditivePipe);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditivePipe);
 public:
     AdditivePipe();
 };
 
 class PartDesignExport SubtractivePipe : public Pipe {
 
-    PROPERTY_HEADER(PartDesign::SubtractivePipe);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractivePipe);
 public:
     SubtractivePipe();
 };
diff --git a/src/Mod/PartDesign/App/FeaturePocket.h b/src/Mod/PartDesign/App/FeaturePocket.h
index 078b465591..8d5f1e6102 100644
--- a/src/Mod/PartDesign/App/FeaturePocket.h
+++ b/src/Mod/PartDesign/App/FeaturePocket.h
@@ -31,7 +31,7 @@ namespace PartDesign
 
 class PartDesignExport Pocket : public FeatureExtrude
 {
-    PROPERTY_HEADER(PartDesign::Pocket);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Pocket);
 
 public:
     Pocket();
diff --git a/src/Mod/PartDesign/App/FeaturePolarPattern.h b/src/Mod/PartDesign/App/FeaturePolarPattern.h
index 152d0a2de7..7362f311a5 100644
--- a/src/Mod/PartDesign/App/FeaturePolarPattern.h
+++ b/src/Mod/PartDesign/App/FeaturePolarPattern.h
@@ -34,7 +34,7 @@ namespace PartDesign
 
 class PartDesignExport PolarPattern : public PartDesign::Transformed
 {
-    PROPERTY_HEADER(PartDesign::PolarPattern);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::PolarPattern);
 
 public:
     PolarPattern();
diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h
index 661e96ca9c..e656912c6e 100644
--- a/src/Mod/PartDesign/App/FeaturePrimitive.h
+++ b/src/Mod/PartDesign/App/FeaturePrimitive.h
@@ -69,7 +69,7 @@ protected:
 
 class PartDesignExport Box : public PartDesign::FeaturePrimitive {
 
-    PROPERTY_HEADER(PartDesign::Box);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Box);
 
 public:
     
@@ -88,7 +88,7 @@ protected:
 };
 
 class PartDesignExport AdditiveBox : public Box {
-    PROPERTY_HEADER(PartDesign::AdditiveBox);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveBox);
     
     AdditiveBox() {
         addSubType = FeatureAddSub::Additive;
@@ -96,7 +96,7 @@ class PartDesignExport AdditiveBox : public Box {
 };
 
 class PartDesignExport SubtractiveBox : public Box {
-    PROPERTY_HEADER(PartDesign::SubtractiveBox);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveBox);
     
     SubtractiveBox() {
         addSubType = FeatureAddSub::Subtractive;
@@ -106,7 +106,7 @@ class PartDesignExport SubtractiveBox : public Box {
 
 class PartDesignExport Cylinder : public PartDesign::FeaturePrimitive, public Part::PrismExtension {
 
-    PROPERTY_HEADER(PartDesign::Cylinder);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Cylinder);
 
 public:
     
@@ -124,7 +124,7 @@ public:
 };
 
 class PartDesignExport AdditiveCylinder : public Cylinder {
-    PROPERTY_HEADER(PartDesign::AdditiveCylinder);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveCylinder);
     
     AdditiveCylinder() {
         addSubType = FeatureAddSub::Additive;
@@ -132,7 +132,7 @@ class PartDesignExport AdditiveCylinder : public Cylinder {
 };
 
 class PartDesignExport SubtractiveCylinder : public Cylinder {
-    PROPERTY_HEADER(PartDesign::SubtractiveCylinder);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveCylinder);
     
     SubtractiveCylinder() {
         addSubType = FeatureAddSub::Subtractive;
@@ -142,7 +142,7 @@ class PartDesignExport SubtractiveCylinder : public Cylinder {
 
 class PartDesignExport Sphere : public PartDesign::FeaturePrimitive {
 
-    PROPERTY_HEADER(PartDesign::Sphere);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Sphere);
 
 public:
     
@@ -164,7 +164,7 @@ protected:
 };
 
 class PartDesignExport AdditiveSphere : public Sphere {
-    PROPERTY_HEADER(PartDesign::AdditiveSphere);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveSphere);
     
     AdditiveSphere() {
         addSubType = FeatureAddSub::Additive;
@@ -172,7 +172,7 @@ class PartDesignExport AdditiveSphere : public Sphere {
 };
 
 class PartDesignExport SubtractiveSphere : public Sphere {
-    PROPERTY_HEADER(PartDesign::SubtractiveSphere);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveSphere);
     
     SubtractiveSphere() {
         addSubType = FeatureAddSub::Subtractive;
@@ -181,7 +181,7 @@ class PartDesignExport SubtractiveSphere : public Sphere {
 
 class PartDesignExport Cone : public PartDesign::FeaturePrimitive {
 
-    PROPERTY_HEADER(PartDesign::Cone);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Cone);
 
 public:
     
@@ -203,7 +203,7 @@ protected:
 };
 
 class PartDesignExport AdditiveCone : public Cone {
-    PROPERTY_HEADER(PartDesign::AdditiveCone);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveCone);
     
     AdditiveCone() {
         addSubType = FeatureAddSub::Additive;
@@ -211,7 +211,7 @@ class PartDesignExport AdditiveCone : public Cone {
 };
 
 class PartDesignExport SubtractiveCone : public Cone {
-    PROPERTY_HEADER(PartDesign::SubtractiveCone);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveCone);
     
     SubtractiveCone() {
         addSubType = FeatureAddSub::Subtractive;
@@ -221,7 +221,7 @@ class PartDesignExport SubtractiveCone : public Cone {
 
 class PartDesignExport Ellipsoid : public PartDesign::FeaturePrimitive {
 
-    PROPERTY_HEADER(PartDesign::Ellipsoid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Ellipsoid);
 
 public:
     
@@ -245,7 +245,7 @@ protected:
 };
 
 class PartDesignExport AdditiveEllipsoid : public Ellipsoid {
-    PROPERTY_HEADER(PartDesign::AdditiveEllipsoid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveEllipsoid);
     
     AdditiveEllipsoid() {
         addSubType = FeatureAddSub::Additive;
@@ -253,7 +253,7 @@ class PartDesignExport AdditiveEllipsoid : public Ellipsoid {
 };
 
 class PartDesignExport SubtractiveEllipsoid : public Ellipsoid {
-    PROPERTY_HEADER(PartDesign::SubtractiveEllipsoid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveEllipsoid);
     
     SubtractiveEllipsoid() {
         addSubType = FeatureAddSub::Subtractive;
@@ -263,7 +263,7 @@ class PartDesignExport SubtractiveEllipsoid : public Ellipsoid {
 
 class PartDesignExport Torus : public PartDesign::FeaturePrimitive {
 
-    PROPERTY_HEADER(PartDesign::Torus);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Torus);
 
 public:
     
@@ -286,7 +286,7 @@ protected:
 };
 
 class PartDesignExport AdditiveTorus : public Torus {
-    PROPERTY_HEADER(PartDesign::AdditiveTorus);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveTorus);
     
     AdditiveTorus() {
         addSubType = FeatureAddSub::Additive;
@@ -294,7 +294,7 @@ class PartDesignExport AdditiveTorus : public Torus {
 };
 
 class PartDesignExport SubtractiveTorus : public Torus {
-    PROPERTY_HEADER(PartDesign::SubtractiveTorus);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveTorus);
     
     SubtractiveTorus() {
         addSubType = FeatureAddSub::Subtractive;
@@ -304,7 +304,7 @@ class PartDesignExport SubtractiveTorus : public Torus {
 
 class PartDesignExport Prism : public PartDesign::FeaturePrimitive, public Part::PrismExtension {
 
-    PROPERTY_HEADER(PartDesign::Prism);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Prism);
 
 public:
     Prism();
@@ -321,7 +321,7 @@ public:
 };
 
 class PartDesignExport AdditivePrism : public Prism {
-    PROPERTY_HEADER(PartDesign::AdditivePrism);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditivePrism);
     
     AdditivePrism() {
         addSubType = FeatureAddSub::Additive;
@@ -329,7 +329,7 @@ class PartDesignExport AdditivePrism : public Prism {
 };
 
 class PartDesignExport SubtractivePrism : public Prism {
-    PROPERTY_HEADER(PartDesign::SubtractivePrism);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractivePrism);
     
     SubtractivePrism() {
         addSubType = FeatureAddSub::Subtractive;
@@ -339,7 +339,7 @@ class PartDesignExport SubtractivePrism : public Prism {
 
 class PartDesignExport Wedge : public PartDesign::FeaturePrimitive {
 
-    PROPERTY_HEADER(PartDesign::Wedge);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Wedge);
 
 public:
     
@@ -367,7 +367,7 @@ protected:
 };
 
 class PartDesignExport AdditiveWedge : public Wedge {
-    PROPERTY_HEADER(PartDesign::AdditiveWedge);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::AdditiveWedge);
     
     AdditiveWedge() {
         addSubType = FeatureAddSub::Additive;
@@ -375,7 +375,7 @@ class PartDesignExport AdditiveWedge : public Wedge {
 };
 
 class PartDesignExport SubtractiveWedge : public Wedge {
-    PROPERTY_HEADER(PartDesign::SubtractiveWedge);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SubtractiveWedge);
     
     SubtractiveWedge() {
         addSubType = FeatureAddSub::Subtractive;
diff --git a/src/Mod/PartDesign/App/FeatureRevolution.h b/src/Mod/PartDesign/App/FeatureRevolution.h
index 9b8a2794ac..23478f46c2 100644
--- a/src/Mod/PartDesign/App/FeatureRevolution.h
+++ b/src/Mod/PartDesign/App/FeatureRevolution.h
@@ -32,7 +32,7 @@ namespace PartDesign
 
 class PartDesignExport Revolution : public ProfileBased
 {
-    PROPERTY_HEADER(PartDesign::Revolution);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Revolution);
 
 public:
     Revolution();
diff --git a/src/Mod/PartDesign/App/FeatureScaled.h b/src/Mod/PartDesign/App/FeatureScaled.h
index 789c16fa05..90123fad79 100644
--- a/src/Mod/PartDesign/App/FeatureScaled.h
+++ b/src/Mod/PartDesign/App/FeatureScaled.h
@@ -33,7 +33,7 @@ namespace PartDesign
 
 class PartDesignExport Scaled : public PartDesign::Transformed
 {
-    PROPERTY_HEADER(PartDesign::Scaled);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Scaled);
 
 public:
     Scaled();
diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h
index 6dfe62cf67..3a729dc49b 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.h
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.h
@@ -38,7 +38,7 @@ namespace PartDesign
 
 class PartDesignExport ProfileBased : public PartDesign::FeatureAddSub
 {
-    PROPERTY_HEADER(PartDesign::SketchBased);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SketchBased);
 
 public:
     enum class ForbiddenAxis {
diff --git a/src/Mod/PartDesign/App/FeatureSolid.h b/src/Mod/PartDesign/App/FeatureSolid.h
index 2ca4aac5ec..020a3c300e 100644
--- a/src/Mod/PartDesign/App/FeatureSolid.h
+++ b/src/Mod/PartDesign/App/FeatureSolid.h
@@ -37,7 +37,7 @@ namespace PartDesign
  */
 class PartDesignExport Solid : public Feature
 {
-    PROPERTY_HEADER(PartDesign::FeatureSolid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::FeatureSolid);
 
 public:
     Solid();
diff --git a/src/Mod/PartDesign/App/FeatureThickness.h b/src/Mod/PartDesign/App/FeatureThickness.h
index 9b123806fa..0ac89fbf9a 100644
--- a/src/Mod/PartDesign/App/FeatureThickness.h
+++ b/src/Mod/PartDesign/App/FeatureThickness.h
@@ -33,7 +33,7 @@ namespace PartDesign
 
 class PartDesignExport Thickness : public DressUp
 {
-    PROPERTY_HEADER(PartDesign::Thickness);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Thickness);
 
 public:
     Thickness();
diff --git a/src/Mod/PartDesign/App/FeatureTransformed.h b/src/Mod/PartDesign/App/FeatureTransformed.h
index a494878ba9..3e8e50104a 100644
--- a/src/Mod/PartDesign/App/FeatureTransformed.h
+++ b/src/Mod/PartDesign/App/FeatureTransformed.h
@@ -39,7 +39,7 @@ namespace PartDesign
  */
 class PartDesignExport Transformed : public PartDesign::Feature
 {
-    PROPERTY_HEADER(PartDesign::Transformed);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Transformed);
 
 public:
     Transformed();
diff --git a/src/Mod/PartDesign/Gui/ViewProviderAddSub.h b/src/Mod/PartDesign/Gui/ViewProviderAddSub.h
index 541479cd9d..800180733f 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderAddSub.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderAddSub.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderAddSub : public ViewProvider
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderAddSub);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderAddSub);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBase.h b/src/Mod/PartDesign/Gui/ViewProviderBase.h
index d18f6d1a4e..e2b79c823c 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBase.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderBase.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderBase : public ViewProvider
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderBase);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderBase);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h
index 0918fcccd9..6abcd4cc9c 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h
@@ -32,7 +32,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderChamfer : public ViewProviderDressUp
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderChamfer)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderChamfer);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderChamfer);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h b/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h
index 9690e0ec55..0441a9db9a 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatumCS.h
@@ -38,7 +38,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderDatumCoordinateSystem : public PartDesignGui::ViewProviderDatum
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderDatumCoordinateSystem);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderDatumCoordinateSystem);
 
 public:
     App::PropertyFloatConstraint Zoom;
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h
index 9f26c4b541..c43a428dbb 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatumLine.h
@@ -33,7 +33,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderDatumLine : public PartDesignGui::ViewProviderDatum
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderDatumLine);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderDatumLine);
 
 public:
     /// Constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h
index 88210ed9b7..2540ff8645 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderDatumPlane : public PartDesignGui::ViewProviderDatum
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderDatumPlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderDatumPlane);
 
 public:
     /// Constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h b/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h
index 162755ec81..910dc64b56 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPoint.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderDatumPoint : public PartDesignGui::ViewProviderDatum
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderDatumPoint);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderDatumPoint);
 
 public:
     /// Constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h
index bf3a84b146..eacf1a4a07 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h
@@ -33,7 +33,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderDraft : public ViewProviderDressUp
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderDraft)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderDraft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderDraft);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDressUp.h b/src/Mod/PartDesign/Gui/ViewProviderDressUp.h
index 7434d4d05d..b004537874 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.h
@@ -34,7 +34,7 @@ class TaskDlgDressUpParameters;
 
 class PartDesignGuiExport ViewProviderDressUp : public ViewProvider
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderDressUp);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderDressUp);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h
index 7ac9e610b8..1a8940ad6c 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h
@@ -32,7 +32,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderFillet : public ViewProviderDressUp
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderFillet)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderFillet);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderFillet);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.h b/src/Mod/PartDesign/Gui/ViewProviderGroove.h
index feb15e8fc7..3412b232f8 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderGroove.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderGroove : public ViewProviderSketchBased
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderGroove);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderGroove);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.h b/src/Mod/PartDesign/Gui/ViewProviderHelix.h
index 1aca557bb7..716fdfc6ed 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderHelix.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderHelix : public ViewProviderAddSub
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderHelix);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderHelix);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.h b/src/Mod/PartDesign/Gui/ViewProviderHole.h
index 23d84df167..c0c7c47086 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderHole.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderHole.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderHole : public ViewProvider
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderHole);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderHole);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
index 89f1babbed..2cc3537607 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderLinearPattern : public ViewProviderTransformed
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderLinearPattern)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderLinearPattern);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderLinearPattern);
 public:
     ViewProviderLinearPattern()
         { featureName = std::string("LinearPattern");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.h b/src/Mod/PartDesign/Gui/ViewProviderLoft.h
index 25a0210ecb..910a485dfa 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLoft.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderLoft : public ViewProviderAddSub
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderLoft);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderLoft);
 
 public:
     enum Reference {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h
index f854bedcd5..8657eb7f5d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderMirrored : public ViewProviderTransformed
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGuii::ViewProviderMirrored)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderMirrored);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMirrored);
 public:
     ViewProviderMirrored() {
         featureName = std::string("Mirrored");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
index 27767ec4b0..18fccfbe58 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderMultiTransform : public ViewProviderTransformed
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderMultiTransform)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderMultiTransform);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMultiTransform);
 public:
     ViewProviderMultiTransform() {
         featureName = std::string("MultiTransform");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.h b/src/Mod/PartDesign/Gui/ViewProviderPad.h
index a772e20cc1..cdc3a8a2b6 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPad.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPad.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderPad : public ViewProviderSketchBased
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderPad);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPad);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.h b/src/Mod/PartDesign/Gui/ViewProviderPipe.h
index b6351b3d8f..70b69ba707 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPipe.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderPipe : public ViewProviderAddSub
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderPipe);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPipe);
 
 public:
     enum Reference {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.h b/src/Mod/PartDesign/Gui/ViewProviderPocket.h
index abf3eab605..d51381e933 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPocket.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderPocket : public ViewProviderSketchBased
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderPocket);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPocket);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
index c339f3e827..e00b4d32fb 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderPolarPattern : public ViewProviderTransformed
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderPolarPattern)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderPolarPattern);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPolarPattern);
 public:
     ViewProviderPolarPattern() {
         featureName = std::string("PolarPattern");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
index b5dcc8d983..f3fbb2944f 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderPrimitive : public ViewProviderAddSub
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderPrimitive);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPrimitive);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
index 999f8d5293..23e2c2f548 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderRevolution : public ViewProviderSketchBased
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderRevolution);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderRevolution);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h
index cad5f1182d..b14d5f38a8 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderScaled : public ViewProviderTransformed
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderScaled)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderScaled);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderScaled);
 public:
     ViewProviderScaled() {
         featureName = std::string("Scaled");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h
index fadf9ea374..5f4fb54c01 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.h
@@ -32,7 +32,7 @@ namespace PartDesignGui {
  */
 class PartDesignGuiExport ViewProviderSketchBased : public ViewProvider
 {
-    PROPERTY_HEADER(PartDesignGui::ViewProviderSketchBased);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderSketchBased);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.h b/src/Mod/PartDesign/Gui/ViewProviderThickness.h
index 3e629ab22b..339f10c793 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderThickness.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.h
@@ -32,7 +32,7 @@ namespace PartDesignGui {
 class PartDesignGuiExport ViewProviderThickness : public ViewProviderDressUp
 {
     Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderThickness)
-    PROPERTY_HEADER(PartDesignGui::ViewProviderThickness);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderThickness);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/Workbench.h b/src/Mod/PartDesign/Gui/Workbench.h
index f09e012dd8..5138f78e02 100644
--- a/src/Mod/PartDesign/Gui/Workbench.h
+++ b/src/Mod/PartDesign/Gui/Workbench.h
@@ -42,7 +42,7 @@ namespace PartDesignGui {
  */
 class PartDesignGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/Path/App/Area.h b/src/Mod/Path/App/Area.h
index 564a3b1b56..07248537ea 100644
--- a/src/Mod/Path/App/Area.h
+++ b/src/Mod/Path/App/Area.h
@@ -105,7 +105,7 @@ struct PathExport CAreaConfig {
 /** Base class for FreeCAD wrapping of libarea */
 class PathExport Area: public Base::BaseClass {
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     struct Shape {
diff --git a/src/Mod/Path/App/FeatureArea.h b/src/Mod/Path/App/FeatureArea.h
index 6bef2544fb..a4fd904f07 100644
--- a/src/Mod/Path/App/FeatureArea.h
+++ b/src/Mod/Path/App/FeatureArea.h
@@ -36,7 +36,7 @@ namespace Path
 
 class PathExport FeatureArea : public Part::Feature
 {
-    PROPERTY_HEADER(Path::FeatureArea);
+    PROPERTY_HEADER_WITH_OVERRIDE(Path::FeatureArea);
 
 public:
     /// Constructor
@@ -74,7 +74,7 @@ typedef App::FeaturePythonT<FeatureArea> FeatureAreaPython;
 
 class PathExport FeatureAreaView : public Part::Feature
 {
-    PROPERTY_HEADER(Path::FeatureAreaView);
+    PROPERTY_HEADER_WITH_OVERRIDE(Path::FeatureAreaView);
 
 public:
     /// Constructor
diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h
index fe729a37c3..6280cafc18 100644
--- a/src/Mod/Points/App/Points.h
+++ b/src/Mod/Points/App/Points.h
@@ -45,7 +45,7 @@ namespace Points
  */
 class PointsExport PointKernel : public Data::ComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     typedef float float_type;
diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h
index dc2c3c0f8b..667ffed87a 100644
--- a/src/Mod/Points/App/PointsFeature.h
+++ b/src/Mod/Points/App/PointsFeature.h
@@ -51,7 +51,7 @@ class PointsFeaturePy;
  */
 class PointsExport Feature : public App::GeoFeature
 {
-    PROPERTY_HEADER(Points::Feature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Points::Feature);
 
 public:
     /// Constructor
diff --git a/src/Mod/Points/App/Properties.h b/src/Mod/Points/App/Properties.h
index 4909011799..f9e5da902a 100644
--- a/src/Mod/Points/App/Properties.h
+++ b/src/Mod/Points/App/Properties.h
@@ -44,7 +44,7 @@ namespace Points
  */
 class PointsExport PropertyGreyValue : public App::PropertyFloat
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyGreyValue()
@@ -57,7 +57,7 @@ public:
 
 class PointsExport PropertyGreyValueList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyGreyValueList();
@@ -108,7 +108,7 @@ private:
 
 class PointsExport PropertyNormalList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyNormalList();
@@ -169,7 +169,7 @@ struct PointsExport CurvatureInfo
  */
 class PointsExport PropertyCurvatureList: public App::PropertyLists
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum { 
diff --git a/src/Mod/Points/App/PropertyPointKernel.h b/src/Mod/Points/App/PropertyPointKernel.h
index 89ff5c076a..415c3af34a 100644
--- a/src/Mod/Points/App/PropertyPointKernel.h
+++ b/src/Mod/Points/App/PropertyPointKernel.h
@@ -33,7 +33,7 @@ namespace Points
  */
 class PointsExport PropertyPointKernel : public App::PropertyComplexGeoData
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyPointKernel();
diff --git a/src/Mod/Points/App/Structured.h b/src/Mod/Points/App/Structured.h
index 6a00418d9c..fb67f5bb93 100644
--- a/src/Mod/Points/App/Structured.h
+++ b/src/Mod/Points/App/Structured.h
@@ -36,7 +36,7 @@ namespace Points
  */
 class PointsExport Structured : public Feature
 {
-    PROPERTY_HEADER(Points::Structured);
+    PROPERTY_HEADER_WITH_OVERRIDE(Points::Structured);
 
 public:
     /// Constructor
diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h
index f114d3639c..c473d21b70 100644
--- a/src/Mod/Points/Gui/ViewProvider.h
+++ b/src/Mod/Points/Gui/ViewProvider.h
@@ -73,7 +73,7 @@ public:
  */
 class PointsGuiExport ViewProviderPoints : public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER(PointsGui::ViewProviderPoints);
+    PROPERTY_HEADER_WITH_OVERRIDE(PointsGui::ViewProviderPoints);
 
 public:
     ViewProviderPoints();
@@ -120,7 +120,7 @@ private:
  */
 class PointsGuiExport ViewProviderScattered : public ViewProviderPoints
 {
-    PROPERTY_HEADER(PointsGui::ViewProviderScattered);
+    PROPERTY_HEADER_WITH_OVERRIDE(PointsGui::ViewProviderScattered);
 
 public:
     ViewProviderScattered();
@@ -148,7 +148,7 @@ protected:
  */
 class PointsGuiExport ViewProviderStructured : public ViewProviderPoints
 {
-    PROPERTY_HEADER(PointsGui::ViewProviderStructured);
+    PROPERTY_HEADER_WITH_OVERRIDE(PointsGui::ViewProviderStructured);
 
 public:
     ViewProviderStructured();
diff --git a/src/Mod/Points/Gui/Workbench.h b/src/Mod/Points/Gui/Workbench.h
index 9e204ab39b..79628e5142 100644
--- a/src/Mod/Points/Gui/Workbench.h
+++ b/src/Mod/Points/Gui/Workbench.h
@@ -34,7 +34,7 @@ namespace PointsGui {
  */
 class PointsGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/Raytracing/App/LuxFeature.h b/src/Mod/Raytracing/App/LuxFeature.h
index 2ae94e7950..e69248844a 100644
--- a/src/Mod/Raytracing/App/LuxFeature.h
+++ b/src/Mod/Raytracing/App/LuxFeature.h
@@ -41,7 +41,7 @@ class Property;
  */
 class RaytracingExport LuxFeature: public Raytracing::RaySegment
 {
-    PROPERTY_HEADER(Raytracing::LuxFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Raytracing::LuxFeature);
 public:
     /// Constructor
     LuxFeature(void);
diff --git a/src/Mod/Raytracing/App/LuxProject.h b/src/Mod/Raytracing/App/LuxProject.h
index 3dabc08226..cf850972c2 100644
--- a/src/Mod/Raytracing/App/LuxProject.h
+++ b/src/Mod/Raytracing/App/LuxProject.h
@@ -41,7 +41,7 @@ class Property;
 //class RayFeature: public Part::PartFeature
 class RaytracingExport LuxProject: public App::DocumentObjectGroup
 {
-    PROPERTY_HEADER(Raytracing::LuxProject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Raytracing::LuxProject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h
index 5be4372d33..8d1d757835 100644
--- a/src/Mod/Raytracing/App/RayFeature.h
+++ b/src/Mod/Raytracing/App/RayFeature.h
@@ -41,7 +41,7 @@ class Property;
  */
 class RaytracingExport RayFeature: public Raytracing::RaySegment
 {
-    PROPERTY_HEADER(Raytracing::RayFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Raytracing::RayFeature);
 public:
     /// Constructor
     RayFeature(void);
diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h
index f383da90ec..f1f58432e0 100644
--- a/src/Mod/Raytracing/App/RayProject.h
+++ b/src/Mod/Raytracing/App/RayProject.h
@@ -40,7 +40,7 @@ class Property;
  */
 class RaytracingExport RayProject: public App::DocumentObjectGroup
 {
-    PROPERTY_HEADER(Raytracing::RayProject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Raytracing::RayProject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h
index 96789ca2cb..eac0df6c0f 100644
--- a/src/Mod/Raytracing/App/RaySegment.h
+++ b/src/Mod/Raytracing/App/RaySegment.h
@@ -41,7 +41,7 @@ namespace Raytracing
  */
 class RaytracingExport RaySegment: public App::DocumentObject
 {
-  PROPERTY_HEADER(Raytracing::RaySegment);
+  PROPERTY_HEADER_WITH_OVERRIDE(Raytracing::RaySegment);
 
 public:
     /// Constructor
diff --git a/src/Mod/Raytracing/Gui/ViewProvider.h b/src/Mod/Raytracing/Gui/ViewProvider.h
index bd8199ee05..fdf84eaf30 100644
--- a/src/Mod/Raytracing/Gui/ViewProvider.h
+++ b/src/Mod/Raytracing/Gui/ViewProvider.h
@@ -32,7 +32,7 @@ namespace RaytracingGui {
 
 class ViewProviderLux : public Gui::ViewProviderDocumentObjectGroup
 {
-    PROPERTY_HEADER(RaytracingGui::ViewProviderLux);
+    PROPERTY_HEADER_WITH_OVERRIDE(RaytracingGui::ViewProviderLux);
     Q_DECLARE_TR_FUNCTIONS(RaytracingGui::ViewProviderLux)
 
 public:
@@ -49,7 +49,7 @@ protected:
 
 class ViewProviderPovray : public Gui::ViewProviderDocumentObjectGroup
 {
-    PROPERTY_HEADER(RaytracingGui::ViewProviderPovray);
+    PROPERTY_HEADER_WITH_OVERRIDE(RaytracingGui::ViewProviderPovray);
     Q_DECLARE_TR_FUNCTIONS(RaytracingGui::ViewProviderPovray)
 
 public:
diff --git a/src/Mod/Raytracing/Gui/Workbench.h b/src/Mod/Raytracing/Gui/Workbench.h
index 3dec94b4b4..3ba09ec6c4 100644
--- a/src/Mod/Raytracing/Gui/Workbench.h
+++ b/src/Mod/Raytracing/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace RaytracingGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/ReverseEngineering/Gui/Workbench.h b/src/Mod/ReverseEngineering/Gui/Workbench.h
index 047cff7e48..5c04fcca9d 100644
--- a/src/Mod/ReverseEngineering/Gui/Workbench.h
+++ b/src/Mod/ReverseEngineering/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace ReverseEngineeringGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/Robot/App/Robot6Axis.h b/src/Mod/Robot/App/Robot6Axis.h
index bf476e5ff8..c1a76f1c02 100644
--- a/src/Mod/Robot/App/Robot6Axis.h
+++ b/src/Mod/Robot/App/Robot6Axis.h
@@ -51,7 +51,7 @@ struct AxisDefinition {
  */
 class RobotExport Robot6Axis : public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Robot6Axis();
diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h
index 80873c20b2..c92eaa6c7b 100644
--- a/src/Mod/Robot/App/RobotObject.h
+++ b/src/Mod/Robot/App/RobotObject.h
@@ -36,7 +36,7 @@ namespace Robot
 
 class RobotExport RobotObject : public App::GeoFeature
 {
-    PROPERTY_HEADER(Robot::RobotObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(Robot::RobotObject);
 
 public:
     /// Constructor
diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h
index 9f973197e2..5819ae18d4 100644
--- a/src/Mod/Sketcher/App/Sketch.h
+++ b/src/Mod/Sketcher/App/Sketch.h
@@ -41,7 +41,7 @@ namespace Sketcher
 
 class SketcherExport Sketch :public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Sketch();
diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h
index e01b6a1b56..a25fbc1ff5 100644
--- a/src/Mod/Sketcher/App/SketchObjectSF.h
+++ b/src/Mod/Sketcher/App/SketchObjectSF.h
@@ -37,7 +37,7 @@ namespace Sketcher
 
 class SketchObjectSF :public Part::Part2DObject
 {
-    PROPERTY_HEADER(Sketcher::SketchObjectSF);
+    PROPERTY_HEADER_WITH_OVERRIDE(Sketcher::SketchObjectSF);
 
 public:
     SketchObjectSF();
diff --git a/src/Mod/Sketcher/Gui/ViewProviderPython.h b/src/Mod/Sketcher/Gui/ViewProviderPython.h
index 4ab1b21dc0..32ace07776 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderPython.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderPython.h
@@ -31,7 +31,7 @@ namespace SketcherGui {
 
 class SketcherGuiExport ViewProviderCustom : public ViewProviderSketch
 {
-    PROPERTY_HEADER(SketcherGui::ViewProviderCustom);
+    PROPERTY_HEADER_WITH_OVERRIDE(SketcherGui::ViewProviderCustom);
 
 public:
     /// constructor
diff --git a/src/Mod/Sketcher/Gui/Workbench.h b/src/Mod/Sketcher/Gui/Workbench.h
index a49178875f..a8f9fd00be 100644
--- a/src/Mod/Sketcher/Gui/Workbench.h
+++ b/src/Mod/Sketcher/Gui/Workbench.h
@@ -36,7 +36,7 @@ namespace SketcherGui {
  */
 class SketcherGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h
index c224e4100e..7426fcc05c 100644
--- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.h
+++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.h
@@ -32,7 +32,7 @@ namespace Spreadsheet {
 
 class SpreadsheetExport PropertyColumnWidths : public App::Property, std::map<int, int>
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     PropertyColumnWidths();
 
diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.h b/src/Mod/Spreadsheet/App/PropertyRowHeights.h
index 911dfc8317..005ca185f4 100644
--- a/src/Mod/Spreadsheet/App/PropertyRowHeights.h
+++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.h
@@ -32,7 +32,7 @@ namespace Spreadsheet {
 
 class SpreadsheetExport PropertyRowHeights : public App::Property, std::map<int, int>
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     PropertyRowHeights();
 
diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h
index bed6b2d31e..a13e64f8f8 100644
--- a/src/Mod/Spreadsheet/App/Sheet.h
+++ b/src/Mod/Spreadsheet/App/Sheet.h
@@ -60,7 +60,7 @@ class SheetObserver;
  */
 class SpreadsheetExport PropertySpreadsheetQuantity : public App::PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     PropertySpreadsheetQuantity(void){}
     ~PropertySpreadsheetQuantity() override{}
@@ -71,7 +71,7 @@ public:
 
 class SpreadsheetExport Sheet : public App::DocumentObject
 {
-    PROPERTY_HEADER(Spreadsheet::Sheet);
+    PROPERTY_HEADER_WITH_OVERRIDE(Spreadsheet::Sheet);
 
 public:
 
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
index b3d6916022..f67cb65720 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
@@ -55,7 +55,7 @@ class SpreadsheetGuiExport SheetView : public Gui::MDIView
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     SheetView(Gui::Document* pcDocument, App::DocumentObject* docObj, QWidget* parent);
diff --git a/src/Mod/Spreadsheet/Gui/Workbench.h b/src/Mod/Spreadsheet/Gui/Workbench.h
index ba2f662d03..67d9807bb9 100644
--- a/src/Mod/Spreadsheet/Gui/Workbench.h
+++ b/src/Mod/Spreadsheet/Gui/Workbench.h
@@ -47,7 +47,7 @@ protected Q_SLOTS:
 
 class SpreadsheetGuiExport Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();
diff --git a/src/Mod/Start/Gui/Workbench.h b/src/Mod/Start/Gui/Workbench.h
index 42930d3277..8b545f3a9d 100644
--- a/src/Mod/Start/Gui/Workbench.h
+++ b/src/Mod/Start/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace StartGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/Surface/App/FeatureCut.h b/src/Mod/Surface/App/FeatureCut.h
index 324dfc2e94..12dfc1fe4a 100644
--- a/src/Mod/Surface/App/FeatureCut.h
+++ b/src/Mod/Surface/App/FeatureCut.h
@@ -34,7 +34,7 @@ namespace Surface
 
 class SurfaceExport Cut :  public Part::Feature
 {
-    PROPERTY_HEADER(Surface::Cut);
+    PROPERTY_HEADER_WITH_OVERRIDE(Surface::Cut);
 
 public:
     Cut();
diff --git a/src/Mod/Surface/App/FeatureFilling.h b/src/Mod/Surface/App/FeatureFilling.h
index 1c6d58d929..f757918d9a 100644
--- a/src/Mod/Surface/App/FeatureFilling.h
+++ b/src/Mod/Surface/App/FeatureFilling.h
@@ -36,7 +36,7 @@ namespace Surface
 
 class SurfaceExport Filling :  public Part::Spline
 {
-    PROPERTY_HEADER(Surface::Filling);
+    PROPERTY_HEADER_WITH_OVERRIDE(Surface::Filling);
 
 public:
     Filling();
diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h
index e4dd706278..908ef9413c 100644
--- a/src/Mod/Surface/App/FeatureGeomFillSurface.h
+++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h
@@ -60,7 +60,7 @@ public:
 
 class GeomFillSurface : public Part::Spline
 {
-  PROPERTY_HEADER(Surface::GeomFillSurface);
+  PROPERTY_HEADER_WITH_OVERRIDE(Surface::GeomFillSurface);
 
 public:
     GeomFillSurface();
diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h
index b9e7b33c7b..1f0b7a0f92 100644
--- a/src/Mod/Surface/App/FeatureSewing.h
+++ b/src/Mod/Surface/App/FeatureSewing.h
@@ -34,7 +34,7 @@ namespace Surface
 
 class SurfaceExport Sewing :  public Part::Feature
 {
-    PROPERTY_HEADER(Surface::Sewing);
+    PROPERTY_HEADER_WITH_OVERRIDE(Surface::Sewing);
 
 public:
     Sewing();
diff --git a/src/Mod/Surface/Gui/TaskFilling.h b/src/Mod/Surface/Gui/TaskFilling.h
index 07a532c435..9ac5a02530 100644
--- a/src/Mod/Surface/Gui/TaskFilling.h
+++ b/src/Mod/Surface/Gui/TaskFilling.h
@@ -42,7 +42,7 @@ class Ui_TaskFilling;
 
 class ViewProviderFilling : public PartGui::ViewProviderSpline
 {
-    PROPERTY_HEADER(SurfaceGui::ViewProviderFilling);
+    PROPERTY_HEADER_WITH_OVERRIDE(SurfaceGui::ViewProviderFilling);
     typedef std::vector<App::PropertyLinkSubList::SubSet> References;
 
 public:
diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.h b/src/Mod/Surface/Gui/TaskGeomFillSurface.h
index a58142364c..ba83cd2835 100644
--- a/src/Mod/Surface/Gui/TaskGeomFillSurface.h
+++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.h
@@ -41,7 +41,7 @@ class Ui_GeomFillSurface;
 
 class ViewProviderGeomFillSurface : public PartGui::ViewProviderSpline
 {
-    PROPERTY_HEADER(SurfaceGui::ViewProviderGeomFillSurface);
+    PROPERTY_HEADER_WITH_OVERRIDE(SurfaceGui::ViewProviderGeomFillSurface);
 public:
     void setupContextMenu(QMenu*, QObject*, const char*) override;
     bool setEdit(int ModNum) override;
diff --git a/src/Mod/Surface/Gui/TaskSections.h b/src/Mod/Surface/Gui/TaskSections.h
index 7c64caef52..afb97bbca6 100644
--- a/src/Mod/Surface/Gui/TaskSections.h
+++ b/src/Mod/Surface/Gui/TaskSections.h
@@ -41,7 +41,7 @@ class Ui_Sections;
 
 class ViewProviderSections : public PartGui::ViewProviderSpline
 {
-    PROPERTY_HEADER(SurfaceGui::ViewProviderSections);
+    PROPERTY_HEADER_WITH_OVERRIDE(SurfaceGui::ViewProviderSections);
     typedef std::vector<App::PropertyLinkSubList::SubSet> References;
 
 public:
diff --git a/src/Mod/Surface/Gui/ViewProviderExtend.h b/src/Mod/Surface/Gui/ViewProviderExtend.h
index 8c9812a2ae..7f5f18c415 100644
--- a/src/Mod/Surface/Gui/ViewProviderExtend.h
+++ b/src/Mod/Surface/Gui/ViewProviderExtend.h
@@ -31,7 +31,7 @@ namespace SurfaceGui
 
 class ViewProviderExtend : public PartGui::ViewProviderSpline
 {
-    PROPERTY_HEADER(SurfaceGui::ViewProviderExtend);
+    PROPERTY_HEADER_WITH_OVERRIDE(SurfaceGui::ViewProviderExtend);
 
 public:
     QIcon getIcon() const override;
diff --git a/src/Mod/Surface/Gui/Workbench.h b/src/Mod/Surface/Gui/Workbench.h
index e9b2d29059..6f384806a4 100644
--- a/src/Mod/Surface/Gui/Workbench.h
+++ b/src/Mod/Surface/Gui/Workbench.h
@@ -30,7 +30,7 @@ namespace SurfaceGui {
 
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     Workbench();
diff --git a/src/Mod/TechDraw/App/Cosmetic.h b/src/Mod/TechDraw/App/Cosmetic.h
index 1a297be59f..c53667dfdb 100644
--- a/src/Mod/TechDraw/App/Cosmetic.h
+++ b/src/Mod/TechDraw/App/Cosmetic.h
@@ -64,7 +64,7 @@ public:
 //********** Cosmetic Vertex ***************************************************
 class TechDrawExport CosmeticVertex: public Base::Persistence, public TechDraw::Vertex
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     CosmeticVertex();
@@ -120,7 +120,7 @@ protected:
 
 class TechDrawExport CosmeticEdge : public Base::Persistence, public TechDraw::BaseGeom
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     CosmeticEdge();
     CosmeticEdge(TechDraw::BaseGeomPtr* geometry);
@@ -170,7 +170,7 @@ protected:
 
 class TechDrawExport CenterLine: public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum CLMODE
@@ -302,7 +302,7 @@ protected:
 // format specifier for geometric edges (Edge5)
 class TechDrawExport GeomFormat: public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     GeomFormat();
diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h
index c11ae54fc2..fd67ec379e 100644
--- a/src/Mod/TechDraw/App/CosmeticExtension.h
+++ b/src/Mod/TechDraw/App/CosmeticExtension.h
@@ -40,7 +40,7 @@ class DrawViewPart;
 class GeometryObject;
 
 class TechDrawExport CosmeticExtension : public App::DocumentObjectExtension {
-    EXTENSION_PROPERTY_HEADER(TechDraw::CosmeticObject);
+    EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::CosmeticObject);
 
 public:
     CosmeticExtension();
diff --git a/src/Mod/TechDraw/App/DrawRichAnno.h b/src/Mod/TechDraw/App/DrawRichAnno.h
index 4b13488126..9857a528f2 100644
--- a/src/Mod/TechDraw/App/DrawRichAnno.h
+++ b/src/Mod/TechDraw/App/DrawRichAnno.h
@@ -34,7 +34,7 @@ namespace TechDraw
 
 class TechDrawExport DrawRichAnno : public TechDraw::DrawView
 {
-    PROPERTY_HEADER(TechDraw::DrawRichAnno);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawRichAnno);
 
 public:
     DrawRichAnno();
diff --git a/src/Mod/TechDraw/App/DrawTile.h b/src/Mod/TechDraw/App/DrawTile.h
index a523d064ec..7583e2598b 100644
--- a/src/Mod/TechDraw/App/DrawTile.h
+++ b/src/Mod/TechDraw/App/DrawTile.h
@@ -33,7 +33,7 @@ namespace TechDraw
 
 class TechDrawExport DrawTile : public App::DocumentObject
 {
-    PROPERTY_HEADER(TechDraw::DrawTile);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawTile);
 
 public:
     DrawTile();
diff --git a/src/Mod/TechDraw/App/DrawTileWeld.h b/src/Mod/TechDraw/App/DrawTileWeld.h
index 1a52551dde..2eb5e6cac2 100644
--- a/src/Mod/TechDraw/App/DrawTileWeld.h
+++ b/src/Mod/TechDraw/App/DrawTileWeld.h
@@ -36,7 +36,7 @@ namespace TechDraw
 
 class TechDrawExport DrawTileWeld : public TechDraw::DrawTile
 {
-    PROPERTY_HEADER(TechDraw::DrawTileWeld);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawTileWeld);
 
 public:
     DrawTileWeld();
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h
index fbfe1bc357..9659956134 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotation.h
+++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h
@@ -37,7 +37,7 @@ namespace TechDraw
 
 class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView
 {
-    PROPERTY_HEADER(TechDraw::DrawViewAnnotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewAnnotation);
 
 public:
     /// Constructor
diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h
index bc3b15e515..aaf84b95e2 100644
--- a/src/Mod/TechDraw/App/DrawViewClip.h
+++ b/src/Mod/TechDraw/App/DrawViewClip.h
@@ -37,7 +37,7 @@ namespace TechDraw
 
 class TechDrawExport DrawViewClip: public TechDraw::DrawView
 {
-    PROPERTY_HEADER(TechDraw::DrawViewClip);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewClip);
 
 public:
     /// Constructor
diff --git a/src/Mod/TechDraw/App/DrawViewCollection.h b/src/Mod/TechDraw/App/DrawViewCollection.h
index 02d67f13e3..db18979a93 100644
--- a/src/Mod/TechDraw/App/DrawViewCollection.h
+++ b/src/Mod/TechDraw/App/DrawViewCollection.h
@@ -36,7 +36,7 @@ namespace TechDraw
  */
 class TechDrawExport DrawViewCollection : public DrawView
 {
-    PROPERTY_HEADER(TechDraw::DrawViewCollection);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewCollection);
 
 public:
     App::PropertyLinkList Views;
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.h b/src/Mod/TechDraw/App/DrawViewDimExtent.h
index 4a0850ab65..50e20d4bdf 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtent.h
+++ b/src/Mod/TechDraw/App/DrawViewDimExtent.h
@@ -35,7 +35,7 @@ namespace TechDraw {
 
 class TechDrawExport DrawViewDimExtent : public TechDraw::DrawViewDimension
 {
-    PROPERTY_HEADER(TechDraw::DrawViewDimExtent);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewDimExtent);
 
 public:
     /// Constructor
diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h
index 5d9b5b6ada..d1cd053d03 100644
--- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.h
+++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.h
@@ -35,7 +35,7 @@ namespace TechDraw
 
 class TechDrawExport DrawViewSpreadsheet : public TechDraw::DrawViewSymbol
 {
-    PROPERTY_HEADER(TechDraw::DrawViewSpreadsheet);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewSpreadsheet);
 
 public:
     DrawViewSpreadsheet();
diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.h b/src/Mod/TechDraw/App/DrawWeldSymbol.h
index 86e1e72c8f..392c392961 100644
--- a/src/Mod/TechDraw/App/DrawWeldSymbol.h
+++ b/src/Mod/TechDraw/App/DrawWeldSymbol.h
@@ -36,7 +36,7 @@ class DrawTileWeld;
 
 class TechDrawExport DrawWeldSymbol : public TechDraw::DrawView
 {
-    PROPERTY_HEADER(TechDraw::DrawWeldSymbol);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawWeldSymbol);
 
 public:
     DrawWeldSymbol();
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index 842a78de29..36b7750443 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -57,7 +57,7 @@ class QGIView;
 class TechDrawGuiExport MDIViewPage : public Gui::MDIView, public Gui::SelectionObserver
 {
     Q_OBJECT
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = nullptr);
diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h
index cbf26a3377..4e8c4b1e6d 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h
@@ -34,7 +34,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderAnnotation : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderAnnotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderAnnotation);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h
index d17bed895c..f60a04d7c9 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h
@@ -36,7 +36,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderBalloon : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderBalloon);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderBalloon);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h
index c9a9e56fae..85862752e1 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h
@@ -35,7 +35,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderDimension : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderDimension);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderDimension);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.h b/src/Mod/TechDraw/Gui/ViewProviderImage.h
index b4cfbfacb3..46c28bb523 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderImage.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderImage.h
@@ -33,7 +33,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderImage : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderImage);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderImage);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.h b/src/Mod/TechDraw/Gui/ViewProviderLeader.h
index 1717b765f9..99f2e1b4c4 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderLeader.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.h
@@ -40,7 +40,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderLeader : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderLeader);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderLeader);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h
index fb47177150..1a6bd87675 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h
@@ -32,7 +32,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderProjGroup : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderProjGroup);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderProjGroup);
 
 public:
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h
index eef2983b9b..2f43e1cba1 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h
@@ -33,7 +33,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderProjGroupItem: public ViewProviderViewPart
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderProjGroupItem);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderProjGroupItem);
 
 public:
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h
index a1a10b0b80..c8825b2765 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h
@@ -38,7 +38,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderRichAnno : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderRichAnno);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderRichAnno);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h
index e7c9c929a1..4ee4c0ea39 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h
@@ -33,7 +33,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderSpreadsheet : public ViewProviderSymbol
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderSpreadsheet);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderSpreadsheet);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h
index fc4ff48387..23053c601f 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h
@@ -35,7 +35,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderSymbol : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderSymbol);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderSymbol);
 
 public:
     /// constructor
@@ -51,7 +51,7 @@ public:
 
 class TechDrawGuiExport ViewProviderDraft : public ViewProviderSymbol
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderDraft);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderDraft);
 
 public:
     /// constructor
@@ -62,7 +62,7 @@ public:
 
 class TechDrawGuiExport ViewProviderArch : public ViewProviderSymbol
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderArch);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderArch);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.h b/src/Mod/TechDraw/Gui/ViewProviderTile.h
index 1afaa4965e..b0213769a2 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTile.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderTile.h
@@ -30,7 +30,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderTile : public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderTile);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderTile);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h
index 53dc8f9771..b49c1dbc25 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h
@@ -33,7 +33,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderViewClip : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderViewClip);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderViewClip);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h
index 5b5ebb4bf6..c9c4f06e4c 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h
@@ -34,7 +34,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderViewPart : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderViewPart);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderViewPart);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h
index 899d1b8281..731eb167b6 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h
@@ -33,7 +33,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderViewSection : public ViewProviderViewPart
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderViewSection);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderViewSection);
 
 public:
     /// constructor
diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.h b/src/Mod/TechDraw/Gui/ViewProviderWeld.h
index 765b3fcd53..4fd483b28d 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderWeld.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.h
@@ -34,7 +34,7 @@ namespace TechDrawGui {
 
 class TechDrawGuiExport ViewProviderWeld : public ViewProviderDrawingView
 {
-    PROPERTY_HEADER(TechDrawGui::ViewProviderWeld);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDrawGui::ViewProviderWeld);
 
 public:
     /// constructor
diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h
index 5cb3cb024e..e1a9c139c7 100644
--- a/src/Mod/Web/Gui/BrowserView.h
+++ b/src/Mod/Web/Gui/BrowserView.h
@@ -81,7 +81,7 @@ class WebGuiExport BrowserView : public Gui::MDIView,
 {
     Q_OBJECT
 
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     BrowserView(QWidget* parent);
diff --git a/src/Mod/Web/Gui/Workbench.h b/src/Mod/Web/Gui/Workbench.h
index 3033c9e574..fd8be1669e 100644
--- a/src/Mod/Web/Gui/Workbench.h
+++ b/src/Mod/Web/Gui/Workbench.h
@@ -33,7 +33,7 @@ namespace WebGui {
  */
 class Workbench : public Gui::StdWorkbench
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   Workbench();