diff --git a/src/App/Annotation.h b/src/App/Annotation.h
index 475e71a046..4595ae0b58 100644
--- a/src/App/Annotation.h
+++ b/src/App/Annotation.h
@@ -34,7 +34,7 @@ namespace App
 
 class AppExport Annotation : public DocumentObject
 {
-    PROPERTY_HEADER(App::Annotation);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::Annotation);
 
 public:
     /// Constructor
@@ -52,7 +52,7 @@ public:
 
 class AppExport AnnotationLabel : public DocumentObject
 {
-    PROPERTY_HEADER(App::AnnotationLabel);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::AnnotationLabel);
 
 public:
     /// Constructor
diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h
index 35ab710562..5aeefe5cb9 100644
--- a/src/App/ComplexGeoData.h
+++ b/src/App/ComplexGeoData.h
@@ -50,7 +50,7 @@ namespace Data
  */
 class AppExport Segment: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     ~Segment() override = default;
@@ -62,7 +62,7 @@ public:
  */
 class AppExport ComplexGeoData: public Base::Persistence, public Base::Handled
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     struct Line  {uint32_t I1; uint32_t I2;};
diff --git a/src/App/DocumentObjectFileIncluded.h b/src/App/DocumentObjectFileIncluded.h
index 88cb807d31..eb338fedea 100644
--- a/src/App/DocumentObjectFileIncluded.h
+++ b/src/App/DocumentObjectFileIncluded.h
@@ -33,7 +33,7 @@ namespace App
 
 class AppExport DocumentObjectFileIncluded : public DocumentObject
 {
-    PROPERTY_HEADER(App::DocumentObjectFileIncluded);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::DocumentObjectFileIncluded);
 
 public:
     /// Constructor
diff --git a/src/App/Expression.h b/src/App/Expression.h
index 1861e151c2..eb71061917 100644
--- a/src/App/Expression.h
+++ b/src/App/Expression.h
@@ -113,7 +113,7 @@ protected:
   */
 
 class AppExport Expression : public Base::BaseClass {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
diff --git a/src/App/FeatureTest.h b/src/App/FeatureTest.h
index 720c199bef..fc96f25667 100644
--- a/src/App/FeatureTest.h
+++ b/src/App/FeatureTest.h
@@ -36,7 +36,7 @@ namespace App
 /// The testing feature
 class FeatureTest : public DocumentObject
 {
-  PROPERTY_HEADER(App::FeatureTest);
+  PROPERTY_HEADER_WITH_OVERRIDE(App::FeatureTest);
 
 public:
   FeatureTest();
@@ -118,7 +118,7 @@ public:
 /// The exception testing feature
 class FeatureTestException :public FeatureTest
 {
-  PROPERTY_HEADER(App::FeatureTestException);
+  PROPERTY_HEADER_WITH_OVERRIDE(App::FeatureTestException);
 
 public:
   FeatureTestException();
diff --git a/src/App/GeoFeature.h b/src/App/GeoFeature.h
index 100ac8299d..9f71ee58c7 100644
--- a/src/App/GeoFeature.h
+++ b/src/App/GeoFeature.h
@@ -36,7 +36,7 @@ namespace App
  */
 class AppExport GeoFeature : public App::DocumentObject
 {
-    PROPERTY_HEADER(App::GeoFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::GeoFeature);
 
 public:
     PropertyPlacement Placement;
diff --git a/src/App/InventorObject.h b/src/App/InventorObject.h
index 0337ea2cd6..af0c9825ac 100644
--- a/src/App/InventorObject.h
+++ b/src/App/InventorObject.h
@@ -33,7 +33,7 @@ namespace App
 
 class AppExport InventorObject : public GeoFeature
 {
-    PROPERTY_HEADER(App::InventorObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::InventorObject);
 
 public:
     /// Constructor
diff --git a/src/App/MaterialObject.h b/src/App/MaterialObject.h
index b929e1ef48..67f15a2e1a 100644
--- a/src/App/MaterialObject.h
+++ b/src/App/MaterialObject.h
@@ -33,7 +33,7 @@ namespace App
 
 class AppExport MaterialObject : public DocumentObject
 {
-    PROPERTY_HEADER(App::MaterialObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::MaterialObject);
 
 public:
     /// Constructor
diff --git a/src/App/MeasureDistance.h b/src/App/MeasureDistance.h
index dd3316a2a6..a08668c008 100644
--- a/src/App/MeasureDistance.h
+++ b/src/App/MeasureDistance.h
@@ -34,7 +34,7 @@ namespace App
 
 class AppExport MeasureDistance : public DocumentObject
 {
-    PROPERTY_HEADER(App::MeasureDistance);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::MeasureDistance);
 
 public:
     /// Constructor
diff --git a/src/App/Origin.h b/src/App/Origin.h
index 2765d4dba2..2146a3ba3b 100644
--- a/src/App/Origin.h
+++ b/src/App/Origin.h
@@ -36,7 +36,7 @@ namespace App
  */
 class AppExport Origin : public App::DocumentObject
 {
-    PROPERTY_HEADER(App::Origin);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::Origin);
 
 public:
     /// Constructor
diff --git a/src/App/OriginFeature.h b/src/App/OriginFeature.h
index dde6c39b60..e8dc7fa22d 100644
--- a/src/App/OriginFeature.h
+++ b/src/App/OriginFeature.h
@@ -35,7 +35,7 @@ class Origin;
  */
 class AppExport OriginFeature: public App::GeoFeature
 {
-    PROPERTY_HEADER(App::OriginFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::OriginFeature);
 public:
     /// additional information about the feature usage (e.g. "BasePlane-XY" or "Axis-X" in a Origin)
     PropertyString Role;
@@ -49,7 +49,7 @@ public:
 };
 
 class AppExport Plane: public App::OriginFeature {
-    PROPERTY_HEADER(App::OriginFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::OriginFeature);
 public:
     const char* getViewProviderName() const override {
         return "Gui::ViewProviderPlane";
@@ -57,7 +57,7 @@ public:
 };
 
 class AppExport Line: public App::OriginFeature {
-    PROPERTY_HEADER(App::OriginFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::OriginFeature);
 public:
     const char* getViewProviderName() const override {
         return "Gui::ViewProviderLine";
diff --git a/src/App/Placement.h b/src/App/Placement.h
index 65db05a014..8d371515c6 100644
--- a/src/App/Placement.h
+++ b/src/App/Placement.h
@@ -34,7 +34,7 @@ namespace App
  */
 class AppExport Placement: public App::GeoFeature
 {
-    PROPERTY_HEADER(App::Placement);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::Placement);
 
 public:
   /// Constructor
diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h
index 014f4c31e1..40d1c36439 100644
--- a/src/App/PropertyContainer.h
+++ b/src/App/PropertyContainer.h
@@ -82,7 +82,7 @@ struct AppExport PropertyData
             if(pt<base || pt>base+SHRT_MAX)
                 return -1;
             return (short) (pt-base);
-      };
+      }
       char* getOffset() const {return (char*) m_container;}
 
   private:
@@ -141,7 +141,7 @@ struct AppExport PropertyData
 class AppExport PropertyContainer: public Base::Persistence
 {
 
-  TYPESYSTEM_HEADER();
+  TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
   /**
diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h
index 774503549d..3626bc3971 100644
--- a/src/App/PropertyExpressionEngine.h
+++ b/src/App/PropertyExpressionEngine.h
@@ -46,7 +46,7 @@ using ExpressionPtr = std::unique_ptr<Expression>;
 
 class AppExport PropertyExpressionContainer : public App::PropertyXLinkContainer
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     PropertyExpressionContainer();
     ~PropertyExpressionContainer() override;
diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h
index 71c9047425..e593f5cf19 100644
--- a/src/App/PropertyFile.h
+++ b/src/App/PropertyFile.h
@@ -41,7 +41,7 @@ namespace App
   */
 class AppExport PropertyFile : public PropertyString
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFile();
@@ -73,7 +73,7 @@ private:
  */
 class AppExport PropertyFileIncluded : public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFileIncluded();
diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h
index 955c764760..a9268fdea4 100644
--- a/src/App/PropertyGeo.h
+++ b/src/App/PropertyGeo.h
@@ -119,7 +119,7 @@ private:
 
 class AppExport PropertyVectorDistance: public PropertyVector
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -145,7 +145,7 @@ public:
 
 class AppExport PropertyPosition: public PropertyVector
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -171,7 +171,7 @@ public:
 
 class AppExport PropertyDirection: public PropertyVector
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -243,7 +243,7 @@ protected:
  */
 class AppExport PropertyMatrix: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -374,7 +374,7 @@ private:
  */
 class AppExport PropertyPlacementLink : public PropertyLink
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -500,7 +500,7 @@ private:
  */
 class AppExport PropertyGeometry : public App::Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyGeometry();
@@ -524,7 +524,7 @@ public:
  */
 class AppExport PropertyComplexGeoData : public App::PropertyGeometry
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyComplexGeoData();
diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h
index 73d1552d90..052ba83b2a 100644
--- a/src/App/PropertyLinks.h
+++ b/src/App/PropertyLinks.h
@@ -639,7 +639,7 @@ class AppExport PropertyLinkChild : public PropertyLink
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkChild() {_pcScope = LinkScope::Child;};
+    PropertyLinkChild() {_pcScope = LinkScope::Child;}
 };
 
 /** The general Link Property with Global scope
@@ -648,7 +648,7 @@ class AppExport PropertyLinkGlobal : public PropertyLink
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkGlobal() {_pcScope = LinkScope::Global;};
+    PropertyLinkGlobal() {_pcScope = LinkScope::Global;}
 };
 
 /** The general Link Property that are hidden from dependency checking
@@ -657,7 +657,7 @@ class AppExport PropertyLinkHidden : public PropertyLink
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkHidden() {_pcScope = LinkScope::Hidden;};
+    PropertyLinkHidden() {_pcScope = LinkScope::Hidden;}
 };
 
 
@@ -739,7 +739,7 @@ class AppExport PropertyLinkListChild : public PropertyLinkList
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkListChild() {_pcScope = LinkScope::Child;};
+    PropertyLinkListChild() {_pcScope = LinkScope::Child;}
 };
 
 /** The general Link Property with Global scope
@@ -748,7 +748,7 @@ class AppExport PropertyLinkListGlobal : public PropertyLinkList
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkListGlobal() {_pcScope = LinkScope::Global;};
+    PropertyLinkListGlobal() {_pcScope = LinkScope::Global;}
 };
 
 /** The general Link Property that are hidden from dependency checking
@@ -757,7 +757,7 @@ class AppExport PropertyLinkListHidden : public PropertyLinkList
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkListHidden() {_pcScope = LinkScope::Hidden;};
+    PropertyLinkListHidden() {_pcScope = LinkScope::Hidden;}
 };
 
 /** the Link Property with sub elements
@@ -873,7 +873,7 @@ class AppExport PropertyLinkSubChild : public PropertyLinkSub
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkSubChild() {_pcScope = LinkScope::Child;};
+    PropertyLinkSubChild() {_pcScope = LinkScope::Child;}
 };
 
 /** The general Link Property with Global scope
@@ -882,7 +882,7 @@ class AppExport PropertyLinkSubGlobal : public PropertyLinkSub
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkSubGlobal() {_pcScope = LinkScope::Global;};
+    PropertyLinkSubGlobal() {_pcScope = LinkScope::Global;}
 };
 
 /** The general Link Property that are hidden from dependency checking
@@ -891,7 +891,7 @@ class AppExport PropertyLinkSubHidden : public PropertyLinkSub
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkSubHidden() {_pcScope = LinkScope::Hidden;};
+    PropertyLinkSubHidden() {_pcScope = LinkScope::Hidden;}
 };
 
 class AppExport PropertyLinkSubList : public PropertyLinkBase
@@ -1024,7 +1024,7 @@ class AppExport PropertyLinkSubListChild : public PropertyLinkSubList
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkSubListChild() {_pcScope = LinkScope::Child;};
+    PropertyLinkSubListChild() {_pcScope = LinkScope::Child;}
 };
 
 /** The general Link Property with Global scope
@@ -1033,7 +1033,7 @@ class AppExport PropertyLinkSubListGlobal : public PropertyLinkSubList
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkSubListGlobal() {_pcScope = LinkScope::Global;};
+    PropertyLinkSubListGlobal() {_pcScope = LinkScope::Global;}
 };
 
 /** The general Link Property that are hidden from dependency checking
@@ -1042,7 +1042,7 @@ class AppExport PropertyLinkSubListHidden : public PropertyLinkSubList
 {
     TYPESYSTEM_HEADER();
 public:
-    PropertyLinkSubListHidden() {_pcScope = LinkScope::Hidden;};
+    PropertyLinkSubListHidden() {_pcScope = LinkScope::Hidden;}
 };
 
 class PropertyXLinkSubList;
diff --git a/src/App/PropertyPythonObject.h b/src/App/PropertyPythonObject.h
index a5569bcb43..cf1357a234 100644
--- a/src/App/PropertyPythonObject.h
+++ b/src/App/PropertyPythonObject.h
@@ -44,7 +44,7 @@ namespace App
  */
 class AppExport PropertyPythonObject : public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyPythonObject();
diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h
index 96d1270792..ffcea3b306 100644
--- a/src/App/PropertyStandard.h
+++ b/src/App/PropertyStandard.h
@@ -50,7 +50,7 @@ namespace App
  */
 class AppExport PropertyInteger: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyInteger();
@@ -95,7 +95,7 @@ protected:
  */
 class AppExport PropertyPath: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -141,7 +141,7 @@ protected:
 /// Property wrapper around an Enumeration object.
 class AppExport PropertyEnumeration: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /// Standard constructor
@@ -249,7 +249,7 @@ private:
  */
 class AppExport PropertyIntegerConstraint: public PropertyInteger
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /// Standard constructor
@@ -320,7 +320,7 @@ protected:
 
 class AppExport PropertyPercent: public PropertyIntegerConstraint
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /// Standard constructor
@@ -372,7 +372,7 @@ protected:
  */
 class AppExport PropertyIntegerSet: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -424,7 +424,7 @@ private:
  */
 class AppExport PropertyMap: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -490,7 +490,7 @@ private:
  */
 class AppExport PropertyFloat: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** Value Constructor
@@ -543,7 +543,7 @@ protected:
  */
 class AppExport PropertyFloatConstraint: public PropertyFloat
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -624,7 +624,7 @@ protected:
  */
 class AppExport PropertyPrecision: public PropertyFloatConstraint
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 public:
     PropertyPrecision();
     ~PropertyPrecision() override;
@@ -676,7 +676,7 @@ protected:
  */
 class AppExport PropertyString: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -729,7 +729,7 @@ protected:
  */
 class AppExport PropertyUUID: public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -779,7 +779,7 @@ private:
  */
 class AppExport PropertyFont : public PropertyString
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFont();
@@ -839,7 +839,7 @@ protected:
  */
 class AppExport PropertyBool : public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
@@ -917,7 +917,7 @@ protected:
  */
 class AppExport PropertyColor : public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /**
@@ -1005,7 +1005,7 @@ protected:
  */
 class AppExport PropertyMaterial : public Property
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
 
diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h
index 67daa40006..4e9f5cd816 100644
--- a/src/App/PropertyUnits.h
+++ b/src/App/PropertyUnits.h
@@ -42,7 +42,7 @@ namespace App
  */
 class AppExport PropertyQuantity : public PropertyFloat
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyQuantity() = default;
@@ -82,7 +82,7 @@ protected:
  */
 class AppExport PropertyQuantityConstraint : public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyQuantityConstraint():_ConstStruct(nullptr){}
@@ -125,7 +125,7 @@ protected:
  */
 class AppExport PropertyAcceleration: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyAcceleration();
@@ -138,7 +138,7 @@ public:
  */
 class AppExport PropertyAngle: public PropertyQuantityConstraint
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyAngle();
@@ -152,7 +152,7 @@ public:
  */
 class AppExport PropertyArea: public PropertyQuantityConstraint
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyArea();
@@ -165,7 +165,7 @@ public:
  */
 class AppExport PropertyDistance: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyDistance();
@@ -178,7 +178,7 @@ public:
  */
 class AppExport PropertyElectricPotential: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyElectricPotential();
@@ -191,7 +191,7 @@ public:
  */
 class AppExport PropertyFrequency: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyFrequency();
@@ -204,7 +204,7 @@ public:
  */
 class AppExport PropertyForce: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyForce();
@@ -217,7 +217,7 @@ public:
  */
 class AppExport PropertyLength: public PropertyQuantityConstraint
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyLength();
@@ -230,7 +230,7 @@ public:
  */
 class AppExport PropertyPressure: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyPressure();
@@ -243,7 +243,7 @@ public:
  */
 class AppExport PropertySpeed: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertySpeed();
@@ -256,7 +256,7 @@ public:
  */
 class AppExport PropertyStiffness: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyStiffness();
@@ -269,7 +269,7 @@ public:
  */
 class AppExport PropertyVacuumPermittivity: public PropertyQuantity
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyVacuumPermittivity();
@@ -282,7 +282,7 @@ public:
  */
 class AppExport PropertyVolume: public PropertyQuantityConstraint
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     PropertyVolume();
diff --git a/src/App/TextDocument.h b/src/App/TextDocument.h
index 1cd7a26a1f..702313eb3f 100644
--- a/src/App/TextDocument.h
+++ b/src/App/TextDocument.h
@@ -32,7 +32,7 @@ namespace App
 {
 
 class AppExport TextDocument : public App::DocumentObject {
-    PROPERTY_HEADER(App::TextDocument);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::TextDocument);
 public:
     using TextSignal = boost::signals2::signal<void ()>;
     using TextSlot = TextSignal::slot_type;
diff --git a/src/App/TransactionalObject.h b/src/App/TransactionalObject.h
index 4d31b87450..97d47be216 100644
--- a/src/App/TransactionalObject.h
+++ b/src/App/TransactionalObject.h
@@ -36,7 +36,7 @@ class TransactionObject;
  */
 class AppExport TransactionalObject : public App::ExtensionContainer
 {
-    PROPERTY_HEADER(App::TransactionalObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::TransactionalObject);
 
 public:
     /// Constructor
diff --git a/src/App/Transactions.h b/src/App/Transactions.h
index aa09863504..49bac8df4a 100644
--- a/src/App/Transactions.h
+++ b/src/App/Transactions.h
@@ -44,7 +44,7 @@ class TransactionalObject;
  */
 class AppExport Transaction : public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /** Construction
@@ -105,7 +105,7 @@ private:
  */
 class AppExport TransactionObject : public Base::Persistence
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /// Construction
@@ -143,7 +143,7 @@ protected:
  */
 class AppExport TransactionDocumentObject : public TransactionObject
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     /// Construction
diff --git a/src/App/VRMLObject.h b/src/App/VRMLObject.h
index 50b817ba49..59ea40d9bf 100644
--- a/src/App/VRMLObject.h
+++ b/src/App/VRMLObject.h
@@ -33,7 +33,7 @@ namespace App
 
 class AppExport VRMLObject : public GeoFeature
 {
-    PROPERTY_HEADER(App::VRMLObject);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::VRMLObject);
 
 public:
     /// Constructor