diff --git a/src/ifcparse/Ifc2x3.h b/src/ifcparse/Ifc2x3.h
index 36fca4068c..78ef08c18c 100644
--- a/src/ifcparse/Ifc2x3.h
+++ b/src/ifcparse/Ifc2x3.h
@@ -6872,7 +6872,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -6886,7 +6886,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcMeasureValue, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -7505,7 +7505,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -7519,7 +7519,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcMeasureValue, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4.h b/src/ifcparse/Ifc4.h
index bbc71a92d2..6264d2a8f3 100644
--- a/src/ifcparse/Ifc4.h
+++ b/src/ifcparse/Ifc4.h
@@ -8603,7 +8603,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8684,7 +8684,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8698,7 +8698,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8712,7 +8712,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9384,7 +9384,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9398,7 +9398,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4x1.h b/src/ifcparse/Ifc4x1.h
index 6dbbffadbc..eaeb73521c 100644
--- a/src/ifcparse/Ifc4x1.h
+++ b/src/ifcparse/Ifc4x1.h
@@ -8645,7 +8645,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8726,7 +8726,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8740,7 +8740,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8754,7 +8754,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9426,7 +9426,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9440,7 +9440,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4x2.h b/src/ifcparse/Ifc4x2.h
index b1e94ec3fe..b1c11a170e 100644
--- a/src/ifcparse/Ifc4x2.h
+++ b/src/ifcparse/Ifc4x2.h
@@ -8743,7 +8743,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8824,7 +8824,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8838,7 +8838,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -8852,7 +8852,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9524,7 +9524,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9538,7 +9538,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4x3_rc1.h b/src/ifcparse/Ifc4x3_rc1.h
index a796993d8d..69df4d4b15 100644
--- a/src/ifcparse/Ifc4x3_rc1.h
+++ b/src/ifcparse/Ifc4x3_rc1.h
@@ -9082,7 +9082,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9163,7 +9163,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9177,7 +9177,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9191,7 +9191,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9863,7 +9863,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9877,7 +9877,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4x3_rc2.h b/src/ifcparse/Ifc4x3_rc2.h
index fce3a1dcac..d0fa99b727 100644
--- a/src/ifcparse/Ifc4x3_rc2.h
+++ b/src/ifcparse/Ifc4x3_rc2.h
@@ -9126,7 +9126,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcCurveMeasureSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcCurveMeasureSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9207,7 +9207,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9221,7 +9221,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9235,7 +9235,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9907,7 +9907,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9921,7 +9921,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4x3_rc3.h b/src/ifcparse/Ifc4x3_rc3.h
index b721b3060a..611567ce7c 100644
--- a/src/ifcparse/Ifc4x3_rc3.h
+++ b/src/ifcparse/Ifc4x3_rc3.h
@@ -9111,7 +9111,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcCurveMeasureSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcCurveMeasureSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9192,7 +9192,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9206,7 +9206,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9220,7 +9220,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9892,7 +9892,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9906,7 +9906,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
diff --git a/src/ifcparse/Ifc4x3_rc4.h b/src/ifcparse/Ifc4x3_rc4.h
index 0e7c1d7b8e..01ced945f8 100644
--- a/src/ifcparse/Ifc4x3_rc4.h
+++ b/src/ifcparse/Ifc4x3_rc4.h
@@ -9111,7 +9111,7 @@ public:
 /// Type: IfcLengthMeasure
 /// 
 /// HISTORY New type in IFC Release 2x4.
-class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcCurveMeasureSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcNonNegativeLengthMeasure : public  IfcLengthMeasure, public  IfcCurveMeasureSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9192,7 +9192,7 @@ public:
     operator double() const;
 };
 
-class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger, public  IfcAppliedValueSelect, public  IfcMetricValueSelect, public  IfcSimpleValue, public  IfcValue {
+class IFC_PARSE_API IfcPositiveInteger : public  IfcInteger {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9206,7 +9206,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcAppliedValueSelect, public  IfcHatchLineDistanceSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveLengthMeasure : public  IfcLengthMeasure, public  IfcHatchLineDistanceSelect {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9220,7 +9220,7 @@ public:
 /// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositivePlaneAngleMeasure : public  IfcPlaneAngleMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9892,7 +9892,7 @@ public:
 /// Type: REAL
 /// 
 /// HISTORY New type in IFC Release 2x.
-class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcColourOrFactor, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcNormalisedRatioMeasure : public  IfcRatioMeasure, public  IfcColourOrFactor {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();
@@ -9906,7 +9906,7 @@ public:
 /// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure, public  IfcAppliedValueSelect, public  IfcMeasureValue, public  IfcMetricValueSelect, public  IfcSizeSelect, public  IfcValue {
+class IFC_PARSE_API IfcPositiveRatioMeasure : public  IfcRatioMeasure {
 public:
     virtual const IfcParse::type_declaration& declaration() const;
     static const IfcParse::type_declaration& Class();