diff --git a/adm/scripts/migration_800/migrate_hcollections.py b/adm/scripts/migration_800/migrate_hcollections.py
new file mode 100644
index 0000000000..df0b4b84f0
--- /dev/null
+++ b/adm/scripts/migration_800/migrate_hcollections.py
@@ -0,0 +1,326 @@
+#!/usr/bin/env python3
+"""
+Migration script for OCCT H-collection macros to templates.
+
+This script converts files using DEFINE_HARRAY1, DEFINE_HARRAY2, and DEFINE_HSEQUENCE
+macros to use the new NCollection_HArray1, NCollection_HArray2, and NCollection_HSequence
+template classes with typedef aliases.
+
+Usage:
+    python3 migrate_hcollections.py [--dry-run] [--verbose]
+"""
+
+import os
+import re
+import sys
+import argparse
+from pathlib import Path
+from typing import Optional, Tuple, Dict, List
+
+# Root of the OCCT source tree
+OCCT_ROOT = Path(__file__).parent.parent.parent.parent
+
+# Regex patterns for macro detection (single-line)
+DEFINE_HARRAY1_PATTERN = re.compile(r'^\s*DEFINE_HARRAY1\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HARRAY2_PATTERN = re.compile(r'^\s*DEFINE_HARRAY2\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HSEQUENCE_PATTERN = re.compile(r'^\s*DEFINE_HSEQUENCE\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+
+# Regex patterns for multi-line macros
+DEFINE_HARRAY1_MULTILINE_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY1\s*\(\s*(\w+)\s*,\s*\n\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HARRAY2_MULTILINE_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY2\s*\(\s*(\w+)\s*,\s*\n\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HSEQUENCE_MULTILINE_PATTERN = re.compile(
+    r'^\s*DEFINE_HSEQUENCE\s*\(\s*(\w+)\s*,\s*\n\s*(\w+)\s*\)\s*;?\s*$', re.MULTILINE)
+
+# Regex patterns for macros with direct NCollection_Array/Sequence types
+DEFINE_HARRAY1_DIRECT_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY1\s*\(\s*(\w+)\s*,\s*NCollection_Array1\s*<\s*(.+?)\s*>\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HARRAY2_DIRECT_PATTERN = re.compile(
+    r'^\s*DEFINE_HARRAY2\s*\(\s*(\w+)\s*,\s*NCollection_Array2\s*<\s*(.+?)\s*>\s*\)\s*;?\s*$', re.MULTILINE)
+DEFINE_HSEQUENCE_DIRECT_PATTERN = re.compile(
+    r'^\s*DEFINE_HSEQUENCE\s*\(\s*(\w+)\s*,\s*NCollection_Sequence\s*<\s*(.+?)\s*>\s*\)\s*;?\s*$', re.MULTILINE)
+
+# Pattern to find element type from underlying array/sequence typedefs
+ARRAY1_TYPEDEF_PATTERN = re.compile(r'typedef\s+NCollection_Array1\s*<\s*(.+?)\s*>\s*(\w+)\s*;')
+ARRAY2_TYPEDEF_PATTERN = re.compile(r'typedef\s+NCollection_Array2\s*<\s*(.+?)\s*>\s*(\w+)\s*;')
+SEQUENCE_TYPEDEF_PATTERN = re.compile(r'typedef\s+NCollection_Sequence\s*<\s*(.+?)\s*>\s*(\w+)\s*;')
+
+# Cache for element type lookups
+element_type_cache: Dict[str, str] = {}
+
+
+def find_element_type(underlying_type: str, collection_kind: str) -> Optional[str]:
+    """
+    Find the element type for an underlying array/sequence type.
+
+    Args:
+        underlying_type: The underlying type name (e.g., 'TColStd_Array1OfReal')
+        collection_kind: 'Array1', 'Array2', or 'Sequence'
+
+    Returns:
+        The element type or None if not found
+    """
+    if underlying_type in element_type_cache:
+        return element_type_cache[underlying_type]
+
+    # Search for the typedef in the source tree
+    src_dir = OCCT_ROOT / 'src'
+
+    if collection_kind == 'Array1':
+        pattern = ARRAY1_TYPEDEF_PATTERN
+    elif collection_kind == 'Array2':
+        pattern = ARRAY2_TYPEDEF_PATTERN
+    else:
+        pattern = SEQUENCE_TYPEDEF_PATTERN
+
+    # Walk through all .hxx files
+    for root, dirs, files in os.walk(src_dir):
+        for filename in files:
+            if filename.endswith('.hxx'):
+                filepath = Path(root) / filename
+                try:
+                    content = filepath.read_text(encoding='utf-8', errors='ignore')
+                    for match in pattern.finditer(content):
+                        element_type = match.group(1).strip()
+                        type_name = match.group(2).strip()
+                        element_type_cache[type_name] = element_type
+                        if type_name == underlying_type:
+                            return element_type
+                except Exception:
+                    continue
+
+    return element_type_cache.get(underlying_type)
+
+
+def get_new_template_header(collection_kind: str) -> str:
+    """Get the new template header file name."""
+    if collection_kind == 'Array1':
+        return 'NCollection_HArray1.hxx'
+    elif collection_kind == 'Array2':
+        return 'NCollection_HArray2.hxx'
+    else:
+        return 'NCollection_HSequence.hxx'
+
+
+def get_new_template_class(collection_kind: str) -> str:
+    """Get the new template class name."""
+    if collection_kind == 'Array1':
+        return 'NCollection_HArray1'
+    elif collection_kind == 'Array2':
+        return 'NCollection_HArray2'
+    else:
+        return 'NCollection_HSequence'
+
+
+def migrate_file(filepath: Path, dry_run: bool = False, verbose: bool = False) -> bool:
+    """
+    Migrate a single file from macro-based to template-based H-collection.
+
+    Returns True if the file was modified.
+    """
+    try:
+        content = filepath.read_text(encoding='utf-8')
+    except Exception as e:
+        print(f"Error reading {filepath}: {e}", file=sys.stderr)
+        return False
+
+    original_content = content
+    modified = False
+
+    # Check for each macro type (standard single-line patterns)
+    for pattern, collection_kind, old_include in [
+        (DEFINE_HARRAY1_PATTERN, 'Array1', 'NCollection_DefineHArray1.hxx'),
+        (DEFINE_HARRAY2_PATTERN, 'Array2', 'NCollection_DefineHArray2.hxx'),
+        (DEFINE_HSEQUENCE_PATTERN, 'Sequence', 'NCollection_DefineHSequence.hxx'),
+    ]:
+        match = pattern.search(content)
+        if match:
+            class_name = match.group(1)
+            underlying_type = match.group(2)
+
+            # Find the element type
+            element_type = find_element_type(underlying_type, collection_kind)
+
+            if element_type is None:
+                print(f"Warning: Could not find element type for {underlying_type} in {filepath}",
+                      file=sys.stderr)
+                continue
+
+            new_template_header = get_new_template_header(collection_kind)
+            new_template_class = get_new_template_class(collection_kind)
+
+            # Build new typedef line
+            new_typedef = f"typedef {new_template_class}<{element_type}> {class_name};"
+
+            if verbose:
+                print(f"  {filepath.name}:")
+                print(f"    Macro: DEFINE_H{collection_kind.upper()}({class_name}, {underlying_type})")
+                print(f"    Element type: {element_type}")
+                print(f"    New typedef: {new_typedef}")
+
+            # Replace the macro with typedef
+            content = pattern.sub(new_typedef, content)
+
+            # Replace the old include with the new one
+            content = content.replace(f'#include <{old_include}>', f'#include <{new_template_header}>')
+
+            modified = True
+
+    # Check for multi-line macro patterns
+    for pattern, collection_kind, old_include in [
+        (DEFINE_HARRAY1_MULTILINE_PATTERN, 'Array1', 'NCollection_DefineHArray1.hxx'),
+        (DEFINE_HARRAY2_MULTILINE_PATTERN, 'Array2', 'NCollection_DefineHArray2.hxx'),
+        (DEFINE_HSEQUENCE_MULTILINE_PATTERN, 'Sequence', 'NCollection_DefineHSequence.hxx'),
+    ]:
+        match = pattern.search(content)
+        if match:
+            class_name = match.group(1)
+            underlying_type = match.group(2)
+
+            element_type = find_element_type(underlying_type, collection_kind)
+
+            if element_type is None:
+                print(f"Warning: Could not find element type for {underlying_type} in {filepath}",
+                      file=sys.stderr)
+                continue
+
+            new_template_header = get_new_template_header(collection_kind)
+            new_template_class = get_new_template_class(collection_kind)
+            new_typedef = f"typedef {new_template_class}<{element_type}> {class_name};"
+
+            if verbose:
+                print(f"  {filepath.name}: (multi-line)")
+                print(f"    New typedef: {new_typedef}")
+
+            content = pattern.sub(new_typedef, content)
+            content = content.replace(f'#include <{old_include}>', f'#include <{new_template_header}>')
+            modified = True
+
+    # Check for direct NCollection_Array/Sequence types in macro
+    for pattern, collection_kind, old_include in [
+        (DEFINE_HARRAY1_DIRECT_PATTERN, 'Array1', 'NCollection_DefineHArray1.hxx'),
+        (DEFINE_HARRAY2_DIRECT_PATTERN, 'Array2', 'NCollection_DefineHArray2.hxx'),
+        (DEFINE_HSEQUENCE_DIRECT_PATTERN, 'Sequence', 'NCollection_DefineHSequence.hxx'),
+    ]:
+        match = pattern.search(content)
+        if match:
+            class_name = match.group(1)
+            element_type = match.group(2).strip()
+
+            new_template_header = get_new_template_header(collection_kind)
+            new_template_class = get_new_template_class(collection_kind)
+            new_typedef = f"typedef {new_template_class}<{element_type}> {class_name};"
+
+            if verbose:
+                print(f"  {filepath.name}: (direct type)")
+                print(f"    Element type: {element_type}")
+                print(f"    New typedef: {new_typedef}")
+
+            content = pattern.sub(new_typedef, content)
+            content = content.replace(f'#include <{old_include}>', f'#include <{new_template_header}>')
+            modified = True
+
+    if modified and content != original_content:
+        if not dry_run:
+            try:
+                filepath.write_text(content, encoding='utf-8')
+                if verbose:
+                    print(f"  Modified: {filepath}")
+            except Exception as e:
+                print(f"Error writing {filepath}: {e}", file=sys.stderr)
+                return False
+        else:
+            print(f"Would modify: {filepath}")
+        return True
+
+    return False
+
+
+def find_macro_files() -> List[Path]:
+    """Find all files containing DEFINE_HARRAY1, DEFINE_HARRAY2, or DEFINE_HSEQUENCE macros."""
+    files = []
+    src_dir = OCCT_ROOT / 'src'
+
+    # All patterns to check
+    all_patterns = [
+        DEFINE_HARRAY1_PATTERN, DEFINE_HARRAY2_PATTERN, DEFINE_HSEQUENCE_PATTERN,
+        DEFINE_HARRAY1_MULTILINE_PATTERN, DEFINE_HARRAY2_MULTILINE_PATTERN, DEFINE_HSEQUENCE_MULTILINE_PATTERN,
+        DEFINE_HARRAY1_DIRECT_PATTERN, DEFINE_HARRAY2_DIRECT_PATTERN, DEFINE_HSEQUENCE_DIRECT_PATTERN,
+    ]
+
+    for root, dirs, filenames in os.walk(src_dir):
+        for filename in filenames:
+            if filename.endswith('.hxx'):
+                filepath = Path(root) / filename
+                try:
+                    content = filepath.read_text(encoding='utf-8', errors='ignore')
+                    if any(p.search(content) for p in all_patterns):
+                        files.append(filepath)
+                except Exception:
+                    continue
+
+    return sorted(files)
+
+
+def build_element_type_cache():
+    """Pre-build the element type cache by scanning all typedef files."""
+    print("Building element type cache...")
+    src_dir = OCCT_ROOT / 'src'
+
+    patterns = [
+        (ARRAY1_TYPEDEF_PATTERN, 'Array1'),
+        (ARRAY2_TYPEDEF_PATTERN, 'Array2'),
+        (SEQUENCE_TYPEDEF_PATTERN, 'Sequence'),
+    ]
+
+    for root, dirs, files in os.walk(src_dir):
+        for filename in files:
+            if filename.endswith('.hxx'):
+                filepath = Path(root) / filename
+                try:
+                    content = filepath.read_text(encoding='utf-8', errors='ignore')
+                    for pattern, kind in patterns:
+                        for match in pattern.finditer(content):
+                            element_type = match.group(1).strip()
+                            type_name = match.group(2).strip()
+                            element_type_cache[type_name] = element_type
+                except Exception:
+                    continue
+
+    print(f"  Found {len(element_type_cache)} type definitions")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Migrate OCCT H-collection macros to templates')
+    parser.add_argument('--dry-run', action='store_true',
+                        help='Show what would be done without making changes')
+    parser.add_argument('--verbose', '-v', action='store_true',
+                        help='Show detailed output')
+    parser.add_argument('--file', type=str,
+                        help='Migrate only a specific file')
+    args = parser.parse_args()
+
+    # Build the element type cache first
+    build_element_type_cache()
+
+    if args.file:
+        files = [Path(args.file)]
+    else:
+        files = find_macro_files()
+
+    print(f"Found {len(files)} files with H-collection macros")
+
+    modified_count = 0
+    for filepath in files:
+        if migrate_file(filepath, args.dry_run, args.verbose):
+            modified_count += 1
+
+    print(f"\n{'Would modify' if args.dry_run else 'Modified'} {modified_count} files")
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/ApplicationFramework/TKCAF/TDataXtd/TDataXtd_HArray1OfTrsf.hxx b/src/ApplicationFramework/TKCAF/TDataXtd/TDataXtd_HArray1OfTrsf.hxx
index b7b597a44f..8afd871f73 100644
--- a/src/ApplicationFramework/TKCAF/TDataXtd/TDataXtd_HArray1OfTrsf.hxx
+++ b/src/ApplicationFramework/TKCAF/TDataXtd/TDataXtd_HArray1OfTrsf.hxx
@@ -18,8 +18,6 @@
 
 #include <gp_Trsf.hxx>
 #include <TDataXtd_Array1OfTrsf.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TDataXtd_HArray1OfTrsf, TDataXtd_Array1OfTrsf)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Trsf> TDataXtd_HArray1OfTrsf;
 #endif
diff --git a/src/ApplicationFramework/TKLCAF/TDF/TDF_HAttributeArray1.hxx b/src/ApplicationFramework/TKLCAF/TDF/TDF_HAttributeArray1.hxx
index 4f2ea7c464..0c149c6e1a 100644
--- a/src/ApplicationFramework/TKLCAF/TDF/TDF_HAttributeArray1.hxx
+++ b/src/ApplicationFramework/TKLCAF/TDF/TDF_HAttributeArray1.hxx
@@ -18,8 +18,6 @@
 
 #include <TDF_Attribute.hxx>
 #include <TDF_AttributeArray1.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TDF_HAttributeArray1, TDF_AttributeArray1)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(TDF_Attribute)> TDF_HAttributeArray1;
 #endif
diff --git a/src/ApplicationFramework/TKLCAF/TDataStd/TDataStd_HLabelArray1.hxx b/src/ApplicationFramework/TKLCAF/TDataStd/TDataStd_HLabelArray1.hxx
index 0057c95050..4aaa97e11d 100644
--- a/src/ApplicationFramework/TKLCAF/TDataStd/TDataStd_HLabelArray1.hxx
+++ b/src/ApplicationFramework/TKLCAF/TDataStd/TDataStd_HLabelArray1.hxx
@@ -19,8 +19,6 @@
 
 #include <TDF_Label.hxx>
 #include <TDataStd_LabelArray1.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TDataStd_HLabelArray1, TDataStd_LabelArray1)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TDF_Label> TDataStd_HLabelArray1;
 #endif
diff --git a/src/ApplicationFramework/TKLCAF/TFunction/TFunction_HArray1OfDataMapOfGUIDDriver.hxx b/src/ApplicationFramework/TKLCAF/TFunction/TFunction_HArray1OfDataMapOfGUIDDriver.hxx
index ad9e421756..341cf6c644 100644
--- a/src/ApplicationFramework/TKLCAF/TFunction/TFunction_HArray1OfDataMapOfGUIDDriver.hxx
+++ b/src/ApplicationFramework/TKLCAF/TFunction/TFunction_HArray1OfDataMapOfGUIDDriver.hxx
@@ -18,8 +18,6 @@
 #define TFunction_HArray1OfDataMapOfGUIDDriver_HeaderFile
 
 #include <TFunction_Array1OfDataMapOfGUIDDriver.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TFunction_HArray1OfDataMapOfGUIDDriver, TFunction_Array1OfDataMapOfGUIDDriver)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TFunction_DataMapOfGUIDDriver> TFunction_HArray1OfDataMapOfGUIDDriver;
 #endif
diff --git a/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_HArray1.hxx b/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_HArray1.hxx
index 666af6e35b..5ea5e5ea46 100644
--- a/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_HArray1.hxx
+++ b/src/ApplicationFramework/TKStd/StdPersistent/StdPersistent_HArray1.hxx
@@ -17,9 +17,9 @@
 #include <StdLPersistent_HArray1.hxx>
 #include <StdObject_Shape.hxx>
 
-#include <NCollection_DefineHArray1.hxx>
+#include <NCollection_HArray1.hxx>
 
-DEFINE_HARRAY1(StdPersistent_HArray1OfShape1, NCollection_Array1<StdObject_Shape>)
+typedef NCollection_HArray1<StdObject_Shape> StdPersistent_HArray1OfShape1;
 
 class StdPersistent_HArray1 : private StdLPersistent_HArray1
 {
diff --git a/src/ApplicationFramework/TKStd/StdStorage/StdStorage_HSequenceOfRoots.hxx b/src/ApplicationFramework/TKStd/StdStorage/StdStorage_HSequenceOfRoots.hxx
index 9dfb752944..07a55fbcc8 100644
--- a/src/ApplicationFramework/TKStd/StdStorage/StdStorage_HSequenceOfRoots.hxx
+++ b/src/ApplicationFramework/TKStd/StdStorage/StdStorage_HSequenceOfRoots.hxx
@@ -15,8 +15,6 @@
 #define StdStorage_HSequenceOfRoots_HeaderFile
 
 #include <StdStorage_SequenceOfRoots.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StdStorage_HSequenceOfRoots, StdStorage_SequenceOfRoots)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StdStorage_Root)> StdStorage_HSequenceOfRoots;
 #endif // StdStorage_HSequenceOfRoots_HeaderFile
diff --git a/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray1.hxx b/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray1.hxx
index 4f748faa88..fb17b2ead3 100644
--- a/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray1.hxx
+++ b/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray1.hxx
@@ -21,11 +21,12 @@
 #include <StdObjMgt_ReadData.hxx>
 #include <StdObjMgt_WriteData.hxx>
 
+#include <NCollection_HArray1.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfByte.hxx>
 
-DEFINE_HARRAY1(StdLPersistent_HArray1OfPersistent, NCollection_Array1<Handle(StdObjMgt_Persistent)>)
+typedef NCollection_HArray1<Handle(StdObjMgt_Persistent)> StdLPersistent_HArray1OfPersistent;
 
 class StdLPersistent_HArray1
 {
diff --git a/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray2.hxx b/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray2.hxx
index 0a2db933c1..10a0a0815e 100644
--- a/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray2.hxx
+++ b/src/ApplicationFramework/TKStdL/StdLPersistent/StdLPersistent_HArray2.hxx
@@ -21,10 +21,11 @@
 #include <StdObjMgt_ReadData.hxx>
 #include <StdObjMgt_WriteData.hxx>
 
+#include <NCollection_HArray2.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
-DEFINE_HARRAY2(StdLPersistent_HArray2OfPersistent, NCollection_Array2<Handle(StdObjMgt_Persistent)>)
+typedef NCollection_HArray2<Handle(StdObjMgt_Persistent)> StdLPersistent_HArray2OfPersistent;
 
 class StdLPersistent_HArray2
 {
diff --git a/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx b/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx
index ddb5c418ff..2198c10217 100644
--- a/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx
+++ b/src/ApplicationFramework/TKTObj/TObj/TObj_SequenceOfObject.hxx
@@ -19,11 +19,9 @@
 #define TObj_SequenceOfObject_HeaderFile
 
 #include <NCollection_Sequence.hxx>
-#include <NCollection_DefineHSequence.hxx>
+#include <NCollection_HSequence.hxx>
 
 class TObj_Object;
-typedef NCollection_Sequence<Handle(TObj_Object)> TObj_SequenceOfObject;
-
-DEFINE_HSEQUENCE(TObj_HSequenceOfObject, TObj_SequenceOfObject)
-
+typedef NCollection_Sequence<Handle(TObj_Object)>  TObj_SequenceOfObject;
+typedef NCollection_HSequence<Handle(TObj_Object)> TObj_HSequenceOfObject;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFiniteElement.hxx b/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFiniteElement.hxx
index 958ad0422b..6c643ee16c 100644
--- a/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFiniteElement.hxx
+++ b/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFiniteElement.hxx
@@ -18,8 +18,6 @@
 #define IGESAppli_HArray1OfFiniteElement_HeaderFile
 
 #include <IGESAppli_Array1OfFiniteElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESAppli_HArray1OfFiniteElement, IGESAppli_Array1OfFiniteElement)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESAppli_FiniteElement)> IGESAppli_HArray1OfFiniteElement;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFlow.hxx b/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFlow.hxx
index 7a9bda3760..dd99712e8b 100644
--- a/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFlow.hxx
+++ b/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfFlow.hxx
@@ -19,8 +19,6 @@
 
 #include <IGESAppli_Flow.hxx>
 #include <IGESAppli_Array1OfFlow.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESAppli_HArray1OfFlow, IGESAppli_Array1OfFlow)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESAppli_Flow)> IGESAppli_HArray1OfFlow;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfNode.hxx b/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfNode.hxx
index 3bdc2ae551..2202c3ab84 100644
--- a/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfNode.hxx
+++ b/src/DataExchange/TKDEIGES/IGESAppli/IGESAppli_HArray1OfNode.hxx
@@ -18,8 +18,6 @@
 #define IGESAppli_HArray1OfNode_HeaderFile
 
 #include <IGESAppli_Array1OfNode.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESAppli_HArray1OfNode, IGESAppli_Array1OfNode)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESAppli_Node)> IGESAppli_HArray1OfNode;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray1OfLineFontEntity.hxx b/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray1OfLineFontEntity.hxx
index 88bc807dee..1cbcb0ba02 100644
--- a/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray1OfLineFontEntity.hxx
+++ b/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray1OfLineFontEntity.hxx
@@ -19,8 +19,6 @@
 
 #include <IGESData_LineFontEntity.hxx>
 #include <IGESBasic_Array1OfLineFontEntity.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESBasic_HArray1OfLineFontEntity, IGESBasic_Array1OfLineFontEntity)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESData_LineFontEntity)> IGESBasic_HArray1OfLineFontEntity;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray2OfHArray1OfReal.hxx b/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray2OfHArray1OfReal.hxx
index fc7b8d3bf1..e8025f157a 100644
--- a/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray2OfHArray1OfReal.hxx
+++ b/src/DataExchange/TKDEIGES/IGESBasic/IGESBasic_HArray2OfHArray1OfReal.hxx
@@ -18,8 +18,6 @@
 #define IGESBasic_HArray2OfHArray1OfReal_HeaderFile
 
 #include <IGESBasic_Array2OfHArray1OfReal.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(IGESBasic_HArray2OfHArray1OfReal, IGESBasic_Array2OfHArray1OfReal)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(TColStd_HArray1OfReal)> IGESBasic_HArray2OfHArray1OfReal;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESData/IGESData_HArray1OfIGESEntity.hxx b/src/DataExchange/TKDEIGES/IGESData/IGESData_HArray1OfIGESEntity.hxx
index fa7ff8826b..f255161b3a 100644
--- a/src/DataExchange/TKDEIGES/IGESData/IGESData_HArray1OfIGESEntity.hxx
+++ b/src/DataExchange/TKDEIGES/IGESData/IGESData_HArray1OfIGESEntity.hxx
@@ -18,8 +18,6 @@
 #define IGESData_HArray1OfIGESEntity_HeaderFile
 
 #include <IGESData_Array1OfIGESEntity.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESData_HArray1OfIGESEntity, IGESData_Array1OfIGESEntity)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESData_IGESEntity)> IGESData_HArray1OfIGESEntity;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESDefs/IGESDefs_HArray1OfTabularData.hxx b/src/DataExchange/TKDEIGES/IGESDefs/IGESDefs_HArray1OfTabularData.hxx
index 3f9ddec2db..4dcbdcdb7c 100644
--- a/src/DataExchange/TKDEIGES/IGESDefs/IGESDefs_HArray1OfTabularData.hxx
+++ b/src/DataExchange/TKDEIGES/IGESDefs/IGESDefs_HArray1OfTabularData.hxx
@@ -18,8 +18,6 @@
 #define IGESDefs_HArray1OfTabularData_HeaderFile
 
 #include <IGESDefs_Array1OfTabularData.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDefs_HArray1OfTabularData, IGESDefs_Array1OfTabularData)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDefs_TabularData)> IGESDefs_HArray1OfTabularData;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfGeneralNote.hxx b/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfGeneralNote.hxx
index 01dd21e458..e437bb044b 100644
--- a/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfGeneralNote.hxx
+++ b/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfGeneralNote.hxx
@@ -18,8 +18,6 @@
 #define IGESDimen_HArray1OfGeneralNote_HeaderFile
 
 #include <IGESDimen_Array1OfGeneralNote.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDimen_HArray1OfGeneralNote, IGESDimen_Array1OfGeneralNote)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDimen_GeneralNote)> IGESDimen_HArray1OfGeneralNote;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfLeaderArrow.hxx b/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfLeaderArrow.hxx
index d78a4633e9..ca9315b249 100644
--- a/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfLeaderArrow.hxx
+++ b/src/DataExchange/TKDEIGES/IGESDimen/IGESDimen_HArray1OfLeaderArrow.hxx
@@ -18,8 +18,6 @@
 #define IGESDimen_HArray1OfLeaderArrow_HeaderFile
 
 #include <IGESDimen_Array1OfLeaderArrow.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDimen_HArray1OfLeaderArrow, IGESDimen_Array1OfLeaderArrow)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDimen_LeaderArrow)> IGESDimen_HArray1OfLeaderArrow;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfConnectPoint.hxx b/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfConnectPoint.hxx
index da3b6d7526..5a00f587af 100644
--- a/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfConnectPoint.hxx
+++ b/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfConnectPoint.hxx
@@ -18,8 +18,6 @@
 #define IGESDraw_HArray1OfConnectPoint_HeaderFile
 
 #include <IGESDraw_Array1OfConnectPoint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDraw_HArray1OfConnectPoint, IGESDraw_Array1OfConnectPoint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESDraw_ConnectPoint)> IGESDraw_HArray1OfConnectPoint;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfViewKindEntity.hxx b/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfViewKindEntity.hxx
index 163c4efd96..4b227ce6a3 100644
--- a/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfViewKindEntity.hxx
+++ b/src/DataExchange/TKDEIGES/IGESDraw/IGESDraw_HArray1OfViewKindEntity.hxx
@@ -18,8 +18,6 @@
 #define IGESDraw_HArray1OfViewKindEntity_HeaderFile
 
 #include <IGESDraw_Array1OfViewKindEntity.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESDraw_HArray1OfViewKindEntity, IGESDraw_Array1OfViewKindEntity)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESData_ViewKindEntity)> IGESDraw_HArray1OfViewKindEntity;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfBoundary.hxx b/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfBoundary.hxx
index 8646c0bce8..3114eb76f6 100644
--- a/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfBoundary.hxx
+++ b/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfBoundary.hxx
@@ -18,8 +18,6 @@
 #define IGESGeom_HArray1OfBoundary_HeaderFile
 
 #include <IGESGeom_Array1OfBoundary.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGeom_HArray1OfBoundary, IGESGeom_Array1OfBoundary)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGeom_Boundary)> IGESGeom_HArray1OfBoundary;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfCurveOnSurface.hxx b/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfCurveOnSurface.hxx
index bbef4fe9af..44d45db488 100644
--- a/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfCurveOnSurface.hxx
+++ b/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfCurveOnSurface.hxx
@@ -18,8 +18,6 @@
 #define IGESGeom_HArray1OfCurveOnSurface_HeaderFile
 
 #include <IGESGeom_Array1OfCurveOnSurface.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGeom_HArray1OfCurveOnSurface, IGESGeom_Array1OfCurveOnSurface)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGeom_CurveOnSurface)> IGESGeom_HArray1OfCurveOnSurface;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfTransformationMatrix.hxx b/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfTransformationMatrix.hxx
index 8bb3c2ae2d..1db46f776c 100644
--- a/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfTransformationMatrix.hxx
+++ b/src/DataExchange/TKDEIGES/IGESGeom/IGESGeom_HArray1OfTransformationMatrix.hxx
@@ -18,8 +18,7 @@
 #define IGESGeom_HArray1OfTransformationMatrix_HeaderFile
 
 #include <IGESGeom_Array1OfTransformationMatrix.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGeom_HArray1OfTransformationMatrix, IGESGeom_Array1OfTransformationMatrix)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGeom_TransformationMatrix)>
+  IGESGeom_HArray1OfTransformationMatrix;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfColor.hxx b/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfColor.hxx
index b15284c83a..68d21761c2 100644
--- a/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfColor.hxx
+++ b/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfColor.hxx
@@ -18,8 +18,6 @@
 #define IGESGraph_HArray1OfColor_HeaderFile
 
 #include <IGESGraph_Array1OfColor.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGraph_HArray1OfColor, IGESGraph_Array1OfColor)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGraph_Color)> IGESGraph_HArray1OfColor;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextDisplayTemplate.hxx b/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextDisplayTemplate.hxx
index 292364f7dc..5782f4d165 100644
--- a/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextDisplayTemplate.hxx
+++ b/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextDisplayTemplate.hxx
@@ -18,8 +18,7 @@
 #define IGESGraph_HArray1OfTextDisplayTemplate_HeaderFile
 
 #include <IGESGraph_Array1OfTextDisplayTemplate.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGraph_HArray1OfTextDisplayTemplate, IGESGraph_Array1OfTextDisplayTemplate)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGraph_TextDisplayTemplate)>
+  IGESGraph_HArray1OfTextDisplayTemplate;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextFontDef.hxx b/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextFontDef.hxx
index 5e218ffe5d..bff8d7dc36 100644
--- a/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextFontDef.hxx
+++ b/src/DataExchange/TKDEIGES/IGESGraph/IGESGraph_HArray1OfTextFontDef.hxx
@@ -18,8 +18,6 @@
 #define IGESGraph_HArray1OfTextFontDef_HeaderFile
 
 #include <IGESGraph_Array1OfTextFontDef.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESGraph_HArray1OfTextFontDef, IGESGraph_Array1OfTextFontDef)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESGraph_TextFontDef)> IGESGraph_HArray1OfTextFontDef;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfFace.hxx b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfFace.hxx
index e78394811e..5eaf3b5ce2 100644
--- a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfFace.hxx
+++ b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfFace.hxx
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfFace_HeaderFile
 
 #include <IGESSolid_Array1OfFace.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfFace, IGESSolid_Array1OfFace)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_Face)> IGESSolid_HArray1OfFace;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfLoop.hxx b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfLoop.hxx
index e3f6d21994..5c3f5ee230 100644
--- a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfLoop.hxx
+++ b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfLoop.hxx
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfLoop_HeaderFile
 
 #include <IGESSolid_Array1OfLoop.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfLoop, IGESSolid_Array1OfLoop)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_Loop)> IGESSolid_HArray1OfLoop;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfShell.hxx b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfShell.hxx
index 85694523ff..456333ea11 100644
--- a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfShell.hxx
+++ b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfShell.hxx
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfShell_HeaderFile
 
 #include <IGESSolid_Array1OfShell.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfShell, IGESSolid_Array1OfShell)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_Shell)> IGESSolid_HArray1OfShell;
 #endif
diff --git a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfVertexList.hxx b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfVertexList.hxx
index c55d8244e1..e79a02e086 100644
--- a/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfVertexList.hxx
+++ b/src/DataExchange/TKDEIGES/IGESSolid/IGESSolid_HArray1OfVertexList.hxx
@@ -18,8 +18,6 @@
 #define IGESSolid_HArray1OfVertexList_HeaderFile
 
 #include <IGESSolid_Array1OfVertexList.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(IGESSolid_HArray1OfVertexList, IGESSolid_Array1OfVertexList)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(IGESSolid_VertexList)> IGESSolid_HArray1OfVertexList;
 #endif
diff --git a/src/DataExchange/TKDESTEP/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx b/src/DataExchange/TKDESTEP/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx
index c66ca3c50e..43418288a6 100644
--- a/src/DataExchange/TKDESTEP/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx
+++ b/src/DataExchange/TKDESTEP/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx
@@ -18,8 +18,7 @@
 #define STEPSelections_HSequenceOfAssemblyLink_HeaderFile
 
 #include <STEPSelections_SequenceOfAssemblyLink.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(STEPSelections_HSequenceOfAssemblyLink, STEPSelections_SequenceOfAssemblyLink)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(STEPSelections_AssemblyLink)>
+  STEPSelections_HSequenceOfAssemblyLink;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfApprovedItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfApprovedItem.hxx
index 55d9ffdf44..727fce9e64 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfApprovedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfApprovedItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfApprovedItem_HeaderFile
 
 #include <StepAP203_Array1OfApprovedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfApprovedItem, StepAP203_Array1OfApprovedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ApprovedItem> StepAP203_HArray1OfApprovedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx
index 7e8d049dd3..52e29ba63b 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfCertifiedItem_HeaderFile
 
 #include <StepAP203_Array1OfCertifiedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfCertifiedItem, StepAP203_Array1OfCertifiedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_CertifiedItem> StepAP203_HArray1OfCertifiedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx
index 8951dab307..163326e661 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfChangeRequestItem_HeaderFile
 
 #include <StepAP203_Array1OfChangeRequestItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfChangeRequestItem, StepAP203_Array1OfChangeRequestItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ChangeRequestItem> StepAP203_HArray1OfChangeRequestItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx
index 089e1e56f8..6847b8cceb 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfClassifiedItem_HeaderFile
 
 #include <StepAP203_Array1OfClassifiedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfClassifiedItem, StepAP203_Array1OfClassifiedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ClassifiedItem> StepAP203_HArray1OfClassifiedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfContractedItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfContractedItem.hxx
index 98c937a28f..10b4eda584 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfContractedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfContractedItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfContractedItem_HeaderFile
 
 #include <StepAP203_Array1OfContractedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfContractedItem, StepAP203_Array1OfContractedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_ContractedItem> StepAP203_HArray1OfContractedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx
index 3258859837..b4507dc6b6 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfDateTimeItem_HeaderFile
 
 #include <StepAP203_Array1OfDateTimeItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfDateTimeItem, StepAP203_Array1OfDateTimeItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_DateTimeItem> StepAP203_HArray1OfDateTimeItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx
index 7eee223ec6..875cda610e 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx
@@ -18,8 +18,7 @@
 #define StepAP203_HArray1OfPersonOrganizationItem_HeaderFile
 
 #include <StepAP203_Array1OfPersonOrganizationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfPersonOrganizationItem, StepAP203_Array1OfPersonOrganizationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_PersonOrganizationItem>
+  StepAP203_HArray1OfPersonOrganizationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx
index 74bf9af82d..f617782c1d 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfSpecifiedItem_HeaderFile
 
 #include <StepAP203_Array1OfSpecifiedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfSpecifiedItem, StepAP203_Array1OfSpecifiedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_SpecifiedItem> StepAP203_HArray1OfSpecifiedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx
index 1d76840ba4..2e5966b439 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfStartRequestItem_HeaderFile
 
 #include <StepAP203_Array1OfStartRequestItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfStartRequestItem, StepAP203_Array1OfStartRequestItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_StartRequestItem> StepAP203_HArray1OfStartRequestItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfWorkItem.hxx b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfWorkItem.hxx
index e057e8f622..dc62822335 100644
--- a/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfWorkItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP203/StepAP203_HArray1OfWorkItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP203_HArray1OfWorkItem_HeaderFile
 
 #include <StepAP203_Array1OfWorkItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP203_HArray1OfWorkItem, StepAP203_Array1OfWorkItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP203_WorkItem> StepAP203_HArray1OfWorkItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfApprovalItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfApprovalItem.hxx
index 9be64dae94..8832d6e8c8 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfApprovalItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfApprovalItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfApprovalItem_HeaderFile
 
 #include <StepAP214_Array1OfApprovalItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfApprovalItem, StepAP214_Array1OfApprovalItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_ApprovalItem> StepAP214_HArray1OfApprovalItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx
index 30de0ec404..c6a102a120 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignDateAndPersonItem_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignDateAndPersonItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignDateAndPersonItem,
-               StepAP214_Array1OfAutoDesignDateAndPersonItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignDateAndPersonItem>
+  StepAP214_HArray1OfAutoDesignDateAndPersonItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx
index 30991046b9..7b1d190c44 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignDateAndTimeItem_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignDateAndTimeItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignDateAndTimeItem,
-               StepAP214_Array1OfAutoDesignDateAndTimeItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignDateAndTimeItem>
+  StepAP214_HArray1OfAutoDesignDateAndTimeItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx
index e9350f87c3..9387287051 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfAutoDesignDatedItem_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignDatedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignDatedItem, StepAP214_Array1OfAutoDesignDatedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignDatedItem> StepAP214_HArray1OfAutoDesignDatedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx
index d69f166e74..eea8db5954 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignGeneralOrgItem_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignGeneralOrgItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignGeneralOrgItem,
-               StepAP214_Array1OfAutoDesignGeneralOrgItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignGeneralOrgItem>
+  StepAP214_HArray1OfAutoDesignGeneralOrgItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx
index b9ebd19cd9..e27a5cc03f 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx
@@ -18,8 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignGroupedItem_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignGroupedItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignGroupedItem, StepAP214_Array1OfAutoDesignGroupedItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignGroupedItem>
+  StepAP214_HArray1OfAutoDesignGroupedItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx
index 3681bb8a82..68fc2cc1b4 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignPresentedItemSelect_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignPresentedItemSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignPresentedItemSelect,
-               StepAP214_Array1OfAutoDesignPresentedItemSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignPresentedItemSelect>
+  StepAP214_HArray1OfAutoDesignPresentedItemSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx
index 26c505435c..1dd5a5c715 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfAutoDesignReferencingItem_HeaderFile
 
 #include <StepAP214_Array1OfAutoDesignReferencingItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfAutoDesignReferencingItem,
-               StepAP214_Array1OfAutoDesignReferencingItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_AutoDesignReferencingItem>
+  StepAP214_HArray1OfAutoDesignReferencingItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx
index afe394b573..6faf27a2ec 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfDateAndTimeItem_HeaderFile
 
 #include <StepAP214_Array1OfDateAndTimeItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfDateAndTimeItem, StepAP214_Array1OfDateAndTimeItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_DateAndTimeItem> StepAP214_HArray1OfDateAndTimeItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateItem.hxx
index f4417909c6..97bf876c0f 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDateItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfDateItem_HeaderFile
 
 #include <StepAP214_Array1OfDateItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfDateItem, StepAP214_Array1OfDateItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_DateItem> StepAP214_HArray1OfDateItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx
index e52a566908..72ce58c420 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx
@@ -18,8 +18,7 @@
 #define StepAP214_HArray1OfDocumentReferenceItem_HeaderFile
 
 #include <StepAP214_Array1OfDocumentReferenceItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfDocumentReferenceItem, StepAP214_Array1OfDocumentReferenceItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_DocumentReferenceItem>
+  StepAP214_HArray1OfDocumentReferenceItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx
index 2c1fa3f90e..0043495b95 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfExternalIdentificationItem_HeaderFile
 
 #include <StepAP214_Array1OfExternalIdentificationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfExternalIdentificationItem,
-               StepAP214_Array1OfExternalIdentificationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_ExternalIdentificationItem>
+  StepAP214_HArray1OfExternalIdentificationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfGroupItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfGroupItem.hxx
index c1da736282..677546e433 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfGroupItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfGroupItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfGroupItem_HeaderFile
 
 #include <StepAP214_Array1OfGroupItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfGroupItem, StepAP214_Array1OfGroupItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_GroupItem> StepAP214_HArray1OfGroupItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx
index 45f3477928..c161ad6306 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfOrganizationItem_HeaderFile
 
 #include <StepAP214_Array1OfOrganizationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfOrganizationItem, StepAP214_Array1OfOrganizationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_OrganizationItem> StepAP214_HArray1OfOrganizationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx
index 888d04ab5c..d57a644ca2 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfPersonAndOrganizationItem_HeaderFile
 
 #include <StepAP214_Array1OfPersonAndOrganizationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfPersonAndOrganizationItem,
-               StepAP214_Array1OfPersonAndOrganizationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_PersonAndOrganizationItem>
+  StepAP214_HArray1OfPersonAndOrganizationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx
index c251220a8c..04c0acd72f 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx
@@ -18,8 +18,6 @@
 #define StepAP214_HArray1OfPresentedItemSelect_HeaderFile
 
 #include <StepAP214_Array1OfPresentedItemSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfPresentedItemSelect, StepAP214_Array1OfPresentedItemSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_PresentedItemSelect> StepAP214_HArray1OfPresentedItemSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx
index 0d7540e6ae..b999c216e4 100644
--- a/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx
@@ -18,9 +18,7 @@
 #define StepAP214_HArray1OfSecurityClassificationItem_HeaderFile
 
 #include <StepAP214_Array1OfSecurityClassificationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepAP214_HArray1OfSecurityClassificationItem,
-               StepAP214_Array1OfSecurityClassificationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepAP214_SecurityClassificationItem>
+  StepAP214_HArray1OfSecurityClassificationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfApproval.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfApproval.hxx
index 867452a2f1..2d7e864872 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfApproval.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfApproval.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfApproval_HeaderFile
 
 #include <StepBasic_Array1OfApproval.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfApproval, StepBasic_Array1OfApproval)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Approval)> StepBasic_HArray1OfApproval;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx
index 8edd698a7d..cbe5a100d5 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx
@@ -18,8 +18,7 @@
 #define StepBasic_HArray1OfDerivedUnitElement_HeaderFile
 
 #include <StepBasic_Array1OfDerivedUnitElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfDerivedUnitElement, StepBasic_Array1OfDerivedUnitElement)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_DerivedUnitElement)>
+  StepBasic_HArray1OfDerivedUnitElement;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDocument.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDocument.hxx
index ad88d1f7e7..6159a5536c 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDocument.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfDocument.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfDocument_HeaderFile
 
 #include <StepBasic_Array1OfDocument.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfDocument, StepBasic_Array1OfDocument)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Document)> StepBasic_HArray1OfDocument;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfNamedUnit.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfNamedUnit.hxx
index 29e78b1ae0..c4a70da2b7 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfNamedUnit.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfNamedUnit.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfNamedUnit_HeaderFile
 
 #include <StepBasic_Array1OfNamedUnit.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfNamedUnit, StepBasic_Array1OfNamedUnit)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_NamedUnit)> StepBasic_HArray1OfNamedUnit;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfOrganization.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfOrganization.hxx
index 230684e48c..21583ba0bc 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfOrganization.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfOrganization.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfOrganization_HeaderFile
 
 #include <StepBasic_Array1OfOrganization.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfOrganization, StepBasic_Array1OfOrganization)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Organization)> StepBasic_HArray1OfOrganization;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfPerson.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfPerson.hxx
index ab671c52f8..2ddc4cde02 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfPerson.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfPerson.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfPerson_HeaderFile
 
 #include <StepBasic_Array1OfPerson.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfPerson, StepBasic_Array1OfPerson)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Person)> StepBasic_HArray1OfPerson;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProduct.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProduct.hxx
index 1f157a58ce..a450fc9026 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProduct.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProduct.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfProduct_HeaderFile
 
 #include <StepBasic_Array1OfProduct.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfProduct, StepBasic_Array1OfProduct)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_Product)> StepBasic_HArray1OfProduct;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductContext.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductContext.hxx
index 1844fcbaff..eb84ce947c 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductContext.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductContext.hxx
@@ -18,8 +18,6 @@
 #define StepBasic_HArray1OfProductContext_HeaderFile
 
 #include <StepBasic_Array1OfProductContext.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfProductContext, StepBasic_Array1OfProductContext)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_ProductContext)> StepBasic_HArray1OfProductContext;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductDefinition.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductDefinition.hxx
index fcc5bdd3a9..8fed97322e 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductDefinition.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfProductDefinition.hxx
@@ -19,8 +19,7 @@
 
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_Array1OfProductDefinition.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfProductDefinition, StepBasic_Array1OfProductDefinition)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_ProductDefinition)>
+  StepBasic_HArray1OfProductDefinition;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx
index 90c9bdbb9a..1ec01d221e 100644
--- a/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx
+++ b/src/DataExchange/TKDESTEP/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx
@@ -18,9 +18,7 @@
 #define StepBasic_HArray1OfUncertaintyMeasureWithUnit_HeaderFile
 
 #include <StepBasic_Array1OfUncertaintyMeasureWithUnit.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepBasic_HArray1OfUncertaintyMeasureWithUnit,
-               StepBasic_Array1OfUncertaintyMeasureWithUnit)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepBasic_UncertaintyMeasureWithUnit)>
+  StepBasic_HArray1OfUncertaintyMeasureWithUnit;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepData/StepData_HArray1OfField.hxx b/src/DataExchange/TKDESTEP/StepData/StepData_HArray1OfField.hxx
index 72af6fd065..c3482a37d9 100644
--- a/src/DataExchange/TKDESTEP/StepData/StepData_HArray1OfField.hxx
+++ b/src/DataExchange/TKDESTEP/StepData/StepData_HArray1OfField.hxx
@@ -18,8 +18,6 @@
 #define StepData_HArray1OfField_HeaderFile
 
 #include <StepData_Array1OfField.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepData_HArray1OfField, StepData_Array1OfField)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepData_Field> StepData_HArray1OfField;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_DatumOrCommonDatum.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_DatumOrCommonDatum.hxx
index e382935e2f..69d601a4d7 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_DatumOrCommonDatum.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_DatumOrCommonDatum.hxx
@@ -22,10 +22,13 @@
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectType.hxx>
+#include <NCollection_HArray1.hxx>
 
 class Standard_Transient;
 class StepDimTol_Datum;
-class StepDimTol_HArray1OfDatumReferenceElement;
+class StepDimTol_DatumReferenceElement;
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReferenceElement)>
+  StepDimTol_HArray1OfDatumReferenceElement;
 
 class StepDimTol_DatumOrCommonDatum : public StepData_SelectType
 {
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
index 2fd9ce26df..9e7278db76 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
@@ -20,11 +20,11 @@
 
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
+#include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 
 class TCollection_HAsciiString;
 class StepBasic_MeasureWithUnit;
 class StepDimTol_GeometricToleranceTarget;
-class StepDimTol_HArray1OfGeometricToleranceModifier;
 
 class StepDimTol_GeometricToleranceWithMaximumTolerance;
 DEFINE_STANDARD_HANDLE(StepDimTol_GeometricToleranceWithMaximumTolerance,
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx
index 17b9a0c342..2e86efb6b3 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx
@@ -17,8 +17,6 @@
 #define StepDimTol_HArray1OfDatumReference_HeaderFile
 
 #include <StepDimTol_Array1OfDatumReference.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReference, StepDimTol_Array1OfDatumReference)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReference)> StepDimTol_HArray1OfDatumReference;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx
index 40dd173b89..773165bc4d 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx
@@ -17,8 +17,7 @@
 #define _StepDimTol_HArray1OfDatumReferenceCompartment_HeaderFile
 
 #include <StepDimTol_Array1OfDatumReferenceCompartment.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReferenceCompartment,
-               StepDimTol_Array1OfDatumReferenceCompartment)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReferenceCompartment)>
+  StepDimTol_HArray1OfDatumReferenceCompartment;
 #endif // _StepDimTol_HArray1OfDatumReferenceCompartment_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx
index ab3021e348..21539c2937 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx
@@ -17,7 +17,7 @@
 #define _StepDimTol_HArray1OfDatumReferenceElement_HeaderFile
 
 #include <StepDimTol_Array1OfDatumReferenceElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReferenceElement, StepDimTol_Array1OfDatumReferenceElement)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepDimTol_DatumReferenceElement)>
+  StepDimTol_HArray1OfDatumReferenceElement;
 #endif // _StepDimTol_HArray1OfDatumReferenceElement_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceModifier.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceModifier.hxx
index 52bd8a500f..03cf3fc2a3 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceModifier.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumReferenceModifier.hxx
@@ -18,9 +18,7 @@
 
 #include <StepDimTol_DatumReferenceModifier.hxx>
 #include <StepDimTol_Array1OfDatumReferenceModifier.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumReferenceModifier,
-               StepDimTol_Array1OfDatumReferenceModifier)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_DatumReferenceModifier>
+  StepDimTol_HArray1OfDatumReferenceModifier;
 #endif // _StepDimTol_HArray1OfDatumReferenceModifier_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx
index 50b23e88e0..aafbfd23d4 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx
@@ -17,8 +17,7 @@
 #define _StepDimTol_HArray1OfDatumSystemOrReference_HeaderFile
 
 #include <StepDimTol_Array1OfDatumSystemOrReference.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfDatumSystemOrReference,
-               StepDimTol_Array1OfDatumSystemOrReference)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_DatumSystemOrReference>
+  StepDimTol_HArray1OfDatumSystemOrReference;
 #endif // _StepDimTol_HArray1OfDatumSystemOrReference_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx
index 530ef2ec2f..1760eaa860 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx
@@ -17,8 +17,7 @@
 #define _StepDimTol_HArray1OfGeometricToleranceModifier_HeaderFile
 
 #include <StepDimTol_Array1OfGeometricToleranceModifier.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfGeometricToleranceModifier,
-               StepDimTol_Array1OfGeometricToleranceModifier)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_GeometricToleranceModifier>
+  StepDimTol_HArray1OfGeometricToleranceModifier;
 #endif // _StepDimTol_HArray1OfGeometricToleranceModifier_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx
index 754cae54a6..551ecb9cdb 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_HArray1OfToleranceZoneTarget_HeaderFile
 
 #include <StepDimTol_Array1OfToleranceZoneTarget.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepDimTol_HArray1OfToleranceZoneTarget, StepDimTol_Array1OfToleranceZoneTarget)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepDimTol_ToleranceZoneTarget> StepDimTol_HArray1OfToleranceZoneTarget;
 #endif // _StepDimTol_HArray1OfToleranceZoneTarget_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
index fbb45377ab..c030948e92 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
@@ -21,8 +21,7 @@
 #include <StepDimTol_RunoutZoneOrientation.hxx>
 #include <StepDimTol_ToleranceZoneDefinition.hxx>
 #include <Standard_Integer.hxx>
-
-class StepRepr_HArray1OfShapeAspect;
+#include <StepRepr_HArray1OfShapeAspect.hxx>
 
 class StepDimTol_RunoutZoneDefinition;
 DEFINE_STANDARD_HANDLE(StepDimTol_RunoutZoneDefinition, StepDimTol_ToleranceZoneDefinition)
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx
index b542e2cc36..3ea14e250e 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfCurveElementEndReleasePacket_HeaderFile
 
 #include <StepElement_Array1OfCurveElementEndReleasePacket.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfCurveElementEndReleasePacket,
-               StepElement_Array1OfCurveElementEndReleasePacket)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_CurveElementEndReleasePacket)>
+  StepElement_HArray1OfCurveElementEndReleasePacket;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx
index 88362b2a5f..0b5d216569 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfCurveElementSectionDefinition_HeaderFile
 
 #include <StepElement_Array1OfCurveElementSectionDefinition.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfCurveElementSectionDefinition,
-               StepElement_Array1OfCurveElementSectionDefinition)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_CurveElementSectionDefinition)>
+  StepElement_HArray1OfCurveElementSectionDefinition;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfCurveElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfCurveElementPurposeMember.hxx
index f5c2874a51..f6f72e6ce9 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfCurveElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfCurveElementPurposeMember.hxx
@@ -16,9 +16,7 @@
 
 #include <StepElement_HSequenceOfCurveElementPurposeMember.hxx>
 #include <StepElement_Array1OfHSequenceOfCurveElementPurposeMember.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfHSequenceOfCurveElementPurposeMember,
-               StepElement_Array1OfHSequenceOfCurveElementPurposeMember)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_HSequenceOfCurveElementPurposeMember)>
+  StepElement_HArray1OfHSequenceOfCurveElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx
index f8d8d59d14..13120cb1e4 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember_HeaderFile
 
 #include <StepElement_Array1OfHSequenceOfSurfaceElementPurposeMember.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember,
-               StepElement_Array1OfHSequenceOfSurfaceElementPurposeMember)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_HSequenceOfSurfaceElementPurposeMember)>
+  StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx
index bbe8593366..80bd5655d6 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfMeasureOrUnspecifiedValue_HeaderFile
 
 #include <StepElement_Array1OfMeasureOrUnspecifiedValue.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfMeasureOrUnspecifiedValue,
-               StepElement_Array1OfMeasureOrUnspecifiedValue)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepElement_MeasureOrUnspecifiedValue>
+  StepElement_HArray1OfMeasureOrUnspecifiedValue;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfSurfaceSection.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfSurfaceSection.hxx
index 6a17c1720e..0dc4c04da4 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfSurfaceSection.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfSurfaceSection.hxx
@@ -15,8 +15,6 @@
 #define StepElement_HArray1OfSurfaceSection_HeaderFile
 
 #include <StepElement_Array1OfSurfaceSection.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfSurfaceSection, StepElement_Array1OfSurfaceSection)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_SurfaceSection)> StepElement_HArray1OfSurfaceSection;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurpose.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurpose.hxx
index f3acb24adb..ba611f6fc4 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurpose.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurpose.hxx
@@ -16,8 +16,7 @@
 
 #include <StepElement_VolumeElementPurpose.hxx>
 #include <StepElement_Array1OfVolumeElementPurpose.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfVolumeElementPurpose, StepElement_Array1OfVolumeElementPurpose)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepElement_VolumeElementPurpose>
+  StepElement_HArray1OfVolumeElementPurpose;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx
index c8686cd3bf..39396f5d7c 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HArray1OfVolumeElementPurposeMember_HeaderFile
 
 #include <StepElement_Array1OfVolumeElementPurposeMember.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepElement_HArray1OfVolumeElementPurposeMember,
-               StepElement_Array1OfVolumeElementPurposeMember)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepElement_VolumeElementPurposeMember)>
+  StepElement_HArray1OfVolumeElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfCurveElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfCurveElementPurposeMember.hxx
index 9992099b03..24e9ffbc3a 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfCurveElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfCurveElementPurposeMember.hxx
@@ -16,9 +16,7 @@
 
 #include <StepElement_CurveElementPurposeMember.hxx>
 #include <StepElement_Array2OfCurveElementPurposeMember.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepElement_HArray2OfCurveElementPurposeMember,
-               StepElement_Array2OfCurveElementPurposeMember)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(StepElement_CurveElementPurposeMember)>
+  StepElement_HArray2OfCurveElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurpose.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurpose.hxx
index cbd4fca2b0..b5c591cbf5 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurpose.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurpose.hxx
@@ -16,9 +16,7 @@
 
 #include <StepElement_SurfaceElementPurpose.hxx>
 #include <StepElement_Array2OfSurfaceElementPurpose.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepElement_HArray2OfSurfaceElementPurpose,
-               StepElement_Array2OfSurfaceElementPurpose)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<StepElement_SurfaceElementPurpose>
+  StepElement_HArray2OfSurfaceElementPurpose;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurposeMember.hxx
index ff6c9feb0b..35b4115011 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HArray2OfSurfaceElementPurposeMember.hxx
@@ -16,9 +16,7 @@
 
 #include <StepElement_SurfaceElementPurposeMember.hxx>
 #include <StepElement_Array2OfSurfaceElementPurposeMember.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepElement_HArray2OfSurfaceElementPurposeMember,
-               StepElement_Array2OfSurfaceElementPurposeMember)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(StepElement_SurfaceElementPurposeMember)>
+  StepElement_HArray2OfSurfaceElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementPurposeMember.hxx
index bd3f16f125..0e31ae9bc7 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementPurposeMember.hxx
@@ -16,9 +16,7 @@
 
 #include <StepElement_CurveElementPurposeMember.hxx>
 #include <StepElement_SequenceOfCurveElementPurposeMember.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfCurveElementPurposeMember,
-                 StepElement_SequenceOfCurveElementPurposeMember)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_CurveElementPurposeMember)>
+  StepElement_HSequenceOfCurveElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx
index 4c7e5cf1c2..f3ddd18b11 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HSequenceOfCurveElementSectionDefinition_HeaderFile
 
 #include <StepElement_SequenceOfCurveElementSectionDefinition.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfCurveElementSectionDefinition,
-                 StepElement_SequenceOfCurveElementSectionDefinition)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_CurveElementSectionDefinition)>
+  StepElement_HSequenceOfCurveElementSectionDefinition;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfElementMaterial.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfElementMaterial.hxx
index 9a6df88a61..76df5f5e0b 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfElementMaterial.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfElementMaterial.hxx
@@ -15,8 +15,7 @@
 #define StepElement_HSequenceOfElementMaterial_HeaderFile
 
 #include <StepElement_SequenceOfElementMaterial.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfElementMaterial, StepElement_SequenceOfElementMaterial)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_ElementMaterial)>
+  StepElement_HSequenceOfElementMaterial;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx
index da8fbd243a..d5ec7b08f8 100644
--- a/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx
+++ b/src/DataExchange/TKDESTEP/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx
@@ -15,9 +15,7 @@
 #define StepElement_HSequenceOfSurfaceElementPurposeMember_HeaderFile
 
 #include <StepElement_SequenceOfSurfaceElementPurposeMember.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepElement_HSequenceOfSurfaceElementPurposeMember,
-                 StepElement_SequenceOfSurfaceElementPurposeMember)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepElement_SurfaceElementPurposeMember)>
+  StepElement_HSequenceOfSurfaceElementPurposeMember;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx
index 9cb20c758f..787fa977d7 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx
@@ -15,8 +15,7 @@
 #define StepFEA_HArray1OfCurveElementEndOffset_HeaderFile
 
 #include <StepFEA_Array1OfCurveElementEndOffset.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfCurveElementEndOffset, StepFEA_Array1OfCurveElementEndOffset)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_CurveElementEndOffset)>
+  StepFEA_HArray1OfCurveElementEndOffset;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx
index 4fe0aa282d..0e2db4c2c7 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx
@@ -15,8 +15,7 @@
 #define StepFEA_HArray1OfCurveElementEndRelease_HeaderFile
 
 #include <StepFEA_Array1OfCurveElementEndRelease.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfCurveElementEndRelease, StepFEA_Array1OfCurveElementEndRelease)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_CurveElementEndRelease)>
+  StepFEA_HArray1OfCurveElementEndRelease;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementInterval.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementInterval.hxx
index 121f64cbf6..d4809aa8a8 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementInterval.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfCurveElementInterval.hxx
@@ -16,8 +16,7 @@
 
 #include <StepFEA_CurveElementInterval.hxx>
 #include <StepFEA_Array1OfCurveElementInterval.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfCurveElementInterval, StepFEA_Array1OfCurveElementInterval)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_CurveElementInterval)>
+  StepFEA_HArray1OfCurveElementInterval;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx
index c4513d5f10..55f435ff7a 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx
@@ -15,8 +15,6 @@
 #define StepFEA_HArray1OfDegreeOfFreedom_HeaderFile
 
 #include <StepFEA_Array1OfDegreeOfFreedom.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfDegreeOfFreedom, StepFEA_Array1OfDegreeOfFreedom)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepFEA_DegreeOfFreedom> StepFEA_HArray1OfDegreeOfFreedom;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfElementRepresentation.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfElementRepresentation.hxx
index 0d210767ce..c967f84908 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfElementRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfElementRepresentation.hxx
@@ -16,8 +16,7 @@
 
 #include <StepFEA_ElementRepresentation.hxx>
 #include <StepFEA_Array1OfElementRepresentation.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfElementRepresentation, StepFEA_Array1OfElementRepresentation)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_ElementRepresentation)>
+  StepFEA_HArray1OfElementRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx
index a16a431dd5..dbdd72c514 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx
@@ -15,8 +15,6 @@
 #define StepFEA_HArray1OfNodeRepresentation_HeaderFile
 
 #include <StepFEA_Array1OfNodeRepresentation.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepFEA_HArray1OfNodeRepresentation, StepFEA_Array1OfNodeRepresentation)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepFEA_NodeRepresentation)> StepFEA_HArray1OfNodeRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfCurve3dElementProperty.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfCurve3dElementProperty.hxx
index 0e80455939..6d49cdc550 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfCurve3dElementProperty.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfCurve3dElementProperty.hxx
@@ -16,9 +16,7 @@
 
 #include <StepFEA_Curve3dElementProperty.hxx>
 #include <StepFEA_SequenceOfCurve3dElementProperty.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepFEA_HSequenceOfCurve3dElementProperty,
-                 StepFEA_SequenceOfCurve3dElementProperty)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepFEA_Curve3dElementProperty)>
+  StepFEA_HSequenceOfCurve3dElementProperty;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx
index 9617f61647..00e25230df 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx
@@ -15,9 +15,7 @@
 #define StepFEA_HSequenceOfElementGeometricRelationship_HeaderFile
 
 #include <StepFEA_SequenceOfElementGeometricRelationship.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepFEA_HSequenceOfElementGeometricRelationship,
-                 StepFEA_SequenceOfElementGeometricRelationship)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepFEA_ElementGeometricRelationship)>
+  StepFEA_HSequenceOfElementGeometricRelationship;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx
index 547941c643..d5e2008972 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx
@@ -15,8 +15,7 @@
 #define StepFEA_HSequenceOfElementRepresentation_HeaderFile
 
 #include <StepFEA_SequenceOfElementRepresentation.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepFEA_HSequenceOfElementRepresentation, StepFEA_SequenceOfElementRepresentation)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepFEA_ElementRepresentation)>
+  StepFEA_HSequenceOfElementRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfNodeRepresentation.hxx b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfNodeRepresentation.hxx
index 81f053fd8b..7dcab07d03 100644
--- a/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfNodeRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepFEA/StepFEA_HSequenceOfNodeRepresentation.hxx
@@ -16,8 +16,7 @@
 
 #include <StepFEA_NodeRepresentation.hxx>
 #include <StepFEA_SequenceOfNodeRepresentation.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepFEA_HSequenceOfNodeRepresentation, StepFEA_SequenceOfNodeRepresentation)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepFEA_NodeRepresentation)>
+  StepFEA_HSequenceOfNodeRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfBoundaryCurve.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfBoundaryCurve.hxx
index ba4a909aa8..c5cb2e4731 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfBoundaryCurve.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfBoundaryCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <StepGeom_BoundaryCurve.hxx>
 #include <StepGeom_Array1OfBoundaryCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfBoundaryCurve, StepGeom_Array1OfBoundaryCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepGeom_BoundaryCurve)> StepGeom_HArray1OfBoundaryCurve;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx
index 05644e5b39..cd920de5a9 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx
@@ -18,8 +18,6 @@
 #define StepGeom_HArray1OfCartesianPoint_HeaderFile
 
 #include <StepGeom_Array1OfCartesianPoint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfCartesianPoint, StepGeom_Array1OfCartesianPoint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepGeom_CartesianPoint)> StepGeom_HArray1OfCartesianPoint;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx
index 8528590b2c..dd027368b6 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx
@@ -18,8 +18,7 @@
 #define StepGeom_HArray1OfCompositeCurveSegment_HeaderFile
 
 #include <StepGeom_Array1OfCompositeCurveSegment.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfCompositeCurveSegment, StepGeom_Array1OfCompositeCurveSegment)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepGeom_CompositeCurveSegment)>
+  StepGeom_HArray1OfCompositeCurveSegment;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCurve.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCurve.hxx
index 14f3979694..29d6f41548 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCurve.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_Array1OfCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfCurve, StepGeom_Array1OfCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepGeom_Curve)> StepGeom_HArray1OfCurve;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx
index 4d0b4ff74f..e3dc0403cd 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx
@@ -18,8 +18,6 @@
 #define StepGeom_HArray1OfPcurveOrSurface_HeaderFile
 
 #include <StepGeom_Array1OfPcurveOrSurface.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfPcurveOrSurface, StepGeom_Array1OfPcurveOrSurface)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepGeom_PcurveOrSurface> StepGeom_HArray1OfPcurveOrSurface;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx
index 8c66ad047c..34663707b8 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx
@@ -18,8 +18,6 @@
 #define StepGeom_HArray1OfSurfaceBoundary_HeaderFile
 
 #include <StepGeom_Array1OfSurfaceBoundary.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfSurfaceBoundary, StepGeom_Array1OfSurfaceBoundary)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepGeom_SurfaceBoundary> StepGeom_HArray1OfSurfaceBoundary;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx
index 3c588bfc6e..bb6fd6c61f 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx
@@ -18,8 +18,6 @@
 #define StepGeom_HArray1OfTrimmingSelect_HeaderFile
 
 #include <StepGeom_Array1OfTrimmingSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepGeom_HArray1OfTrimmingSelect, StepGeom_Array1OfTrimmingSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepGeom_TrimmingSelect> StepGeom_HArray1OfTrimmingSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx
index ccf230b075..999e6909ae 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx
@@ -18,8 +18,6 @@
 #define StepGeom_HArray2OfCartesianPoint_HeaderFile
 
 #include <StepGeom_Array2OfCartesianPoint.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepGeom_HArray2OfCartesianPoint, StepGeom_Array2OfCartesianPoint)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(StepGeom_CartesianPoint)> StepGeom_HArray2OfCartesianPoint;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx
index c988f205ac..d5638029c4 100644
--- a/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx
+++ b/src/DataExchange/TKDESTEP/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx
@@ -18,8 +18,6 @@
 #define StepGeom_HArray2OfSurfacePatch_HeaderFile
 
 #include <StepGeom_Array2OfSurfacePatch.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(StepGeom_HArray2OfSurfacePatch, StepGeom_Array2OfSurfacePatch)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(StepGeom_SurfacePatch)> StepGeom_HArray2OfSurfacePatch;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepKinematics/StepKinematics_SpatialRotation.hxx b/src/DataExchange/TKDESTEP/StepKinematics/StepKinematics_SpatialRotation.hxx
index 2ea12cecbc..cbba78aa68 100644
--- a/src/DataExchange/TKDESTEP/StepKinematics/StepKinematics_SpatialRotation.hxx
+++ b/src/DataExchange/TKDESTEP/StepKinematics/StepKinematics_SpatialRotation.hxx
@@ -22,10 +22,10 @@
 #include <Standard_Handle.hxx>
 #include <StepData_SelectType.hxx>
 #include <Standard_Integer.hxx>
+#include <TColStd_HArray1OfReal.hxx>
 
 class Standard_Transient;
 class StepKinematics_RotationAboutDirection;
-class TColStd_HArray1OfReal;
 
 //! Representation of STEP SELECT type SpatialRotation
 class StepKinematics_SpatialRotation : public StepData_SelectType
diff --git a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx
index bf26f4dac9..804473491f 100644
--- a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx
@@ -18,9 +18,7 @@
 #define StepRepr_HArray1OfMaterialPropertyRepresentation_HeaderFile
 
 #include <StepRepr_Array1OfMaterialPropertyRepresentation.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepRepr_HArray1OfMaterialPropertyRepresentation,
-               StepRepr_Array1OfMaterialPropertyRepresentation)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepRepr_MaterialPropertyRepresentation)>
+  StepRepr_HArray1OfMaterialPropertyRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx
index 4cd82032ac..56604af192 100644
--- a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx
@@ -18,9 +18,7 @@
 #define StepRepr_HArray1OfPropertyDefinitionRepresentation_HeaderFile
 
 #include <StepRepr_Array1OfPropertyDefinitionRepresentation.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepRepr_HArray1OfPropertyDefinitionRepresentation,
-               StepRepr_Array1OfPropertyDefinitionRepresentation)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepRepr_PropertyDefinitionRepresentation)>
+  StepRepr_HArray1OfPropertyDefinitionRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx
index 982cbf054d..8a31c6982f 100644
--- a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx
@@ -18,8 +18,7 @@
 #define StepRepr_HArray1OfRepresentationItem_HeaderFile
 
 #include <StepRepr_Array1OfRepresentationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepRepr_HArray1OfRepresentationItem, StepRepr_Array1OfRepresentationItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepRepr_RepresentationItem)>
+  StepRepr_HArray1OfRepresentationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfShapeAspect.hxx b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfShapeAspect.hxx
index 3c3ab0d604..750af8f22e 100644
--- a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfShapeAspect.hxx
+++ b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HArray1OfShapeAspect.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_HArray1OfShapeAspect_HeaderFile
 
 #include <StepRepr_Array1OfShapeAspect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepRepr_HArray1OfShapeAspect, StepRepr_Array1OfShapeAspect)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepRepr_ShapeAspect)> StepRepr_HArray1OfShapeAspect;
 #endif // _StepRepr_HArray1OfShapeAspect_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfMaterialPropertyRepresentation.hxx b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfMaterialPropertyRepresentation.hxx
index f701fad745..dbe3a59fd5 100644
--- a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfMaterialPropertyRepresentation.hxx
+++ b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfMaterialPropertyRepresentation.hxx
@@ -19,9 +19,7 @@
 
 #include <StepRepr_MaterialPropertyRepresentation.hxx>
 #include <StepRepr_SequenceOfMaterialPropertyRepresentation.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepRepr_HSequenceOfMaterialPropertyRepresentation,
-                 StepRepr_SequenceOfMaterialPropertyRepresentation)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepRepr_MaterialPropertyRepresentation)>
+  StepRepr_HSequenceOfMaterialPropertyRepresentation;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfRepresentationItem.hxx b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfRepresentationItem.hxx
index 887ebf25ee..7c92be167e 100644
--- a/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfRepresentationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepRepr/StepRepr_HSequenceOfRepresentationItem.hxx
@@ -19,8 +19,7 @@
 
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_SequenceOfRepresentationItem.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(StepRepr_HSequenceOfRepresentationItem, StepRepr_SequenceOfRepresentationItem)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(StepRepr_RepresentationItem)>
+  StepRepr_HSequenceOfRepresentationItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx
index c4ce121b14..f5ad3aabba 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfConnectedEdgeSet_HeaderFile
 
 #include <StepShape_Array1OfConnectedEdgeSet.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfConnectedEdgeSet, StepShape_Array1OfConnectedEdgeSet)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_ConnectedEdgeSet)> StepShape_HArray1OfConnectedEdgeSet;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx
index 47466aab2d..ca4a6d1bff 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfConnectedFaceSet_HeaderFile
 
 #include <StepShape_Array1OfConnectedFaceSet.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfConnectedFaceSet, StepShape_Array1OfConnectedFaceSet)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_ConnectedFaceSet)> StepShape_HArray1OfConnectedFaceSet;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfEdge.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfEdge.hxx
index 304f6715c3..83ab416c44 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfEdge.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfEdge.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfEdge_HeaderFile
 
 #include <StepShape_Array1OfEdge.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfEdge, StepShape_Array1OfEdge)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_Edge)> StepShape_HArray1OfEdge;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFace.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFace.hxx
index 2484039fee..d673348fcb 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFace.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFace.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfFace_HeaderFile
 
 #include <StepShape_Array1OfFace.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfFace, StepShape_Array1OfFace)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_Face)> StepShape_HArray1OfFace;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFaceBound.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFaceBound.hxx
index df28c5c231..25ead4196f 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFaceBound.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfFaceBound.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfFaceBound_HeaderFile
 
 #include <StepShape_Array1OfFaceBound.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfFaceBound, StepShape_Array1OfFaceBound)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_FaceBound)> StepShape_HArray1OfFaceBound;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfGeometricSetSelect.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfGeometricSetSelect.hxx
index 621f99b78a..0e04cc424c 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfGeometricSetSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfGeometricSetSelect.hxx
@@ -19,8 +19,6 @@
 
 #include <StepShape_GeometricSetSelect.hxx>
 #include <StepShape_Array1OfGeometricSetSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfGeometricSetSelect, StepShape_Array1OfGeometricSetSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepShape_GeometricSetSelect> StepShape_HArray1OfGeometricSetSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx
index ab1664deb2..4463019d26 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx
@@ -18,8 +18,7 @@
 #define StepShape_HArray1OfOrientedClosedShell_HeaderFile
 
 #include <StepShape_Array1OfOrientedClosedShell.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfOrientedClosedShell, StepShape_Array1OfOrientedClosedShell)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_OrientedClosedShell)>
+  StepShape_HArray1OfOrientedClosedShell;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedEdge.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedEdge.hxx
index bb482e2def..d08f821069 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedEdge.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfOrientedEdge.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfOrientedEdge_HeaderFile
 
 #include <StepShape_Array1OfOrientedEdge.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfOrientedEdge, StepShape_Array1OfOrientedEdge)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepShape_OrientedEdge)> StepShape_HArray1OfOrientedEdge;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx
index 60e0551d1d..8be6099105 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx
@@ -17,8 +17,7 @@
 #define _StepShape_HArray1OfShapeDimensionRepresentationItem_HeaderFile
 
 #include <StepShape_Array1OfShapeDimensionRepresentationItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfShapeDimensionRepresentationItem,
-               StepShape_Array1OfShapeDimensionRepresentationItem)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepShape_ShapeDimensionRepresentationItem>
+  StepShape_HArray1OfShapeDimensionRepresentationItem;
 #endif // _StepShape_HArray1OfShapeDimensionRepresentationItem_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShell.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShell.hxx
index 0d594ab545..dfcad4c59d 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShell.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfShell.hxx
@@ -19,8 +19,6 @@
 
 #include <StepShape_Shell.hxx>
 #include <StepShape_Array1OfShell.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfShell, StepShape_Array1OfShell)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepShape_Shell> StepShape_HArray1OfShell;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfValueQualifier.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfValueQualifier.hxx
index 11f2ec918c..764a4de58c 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfValueQualifier.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_HArray1OfValueQualifier.hxx
@@ -18,8 +18,6 @@
 #define StepShape_HArray1OfValueQualifier_HeaderFile
 
 #include <StepShape_Array1OfValueQualifier.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepShape_HArray1OfValueQualifier, StepShape_Array1OfValueQualifier)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepShape_ValueQualifier> StepShape_HArray1OfValueQualifier;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepToGeom/StepToGeom.hxx b/src/DataExchange/TKDESTEP/StepToGeom/StepToGeom.hxx
index 4f60890b08..739bbe7f51 100644
--- a/src/DataExchange/TKDESTEP/StepToGeom/StepToGeom.hxx
+++ b/src/DataExchange/TKDESTEP/StepToGeom/StepToGeom.hxx
@@ -104,7 +104,7 @@ class StepGeom_Vector;
 class StepGeom_SuParameters;
 class StepKinematics_SpatialRotation;
 class StepRepr_GlobalUnitAssignedContext;
-class TColStd_HArray1OfReal;
+#include <TColStd_HArray1OfReal.hxx>
 
 //! This class provides static methods to convert STEP geometric entities to OCCT.
 //! The methods returning handles will return null handle in case of error.
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClipping.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClipping.hxx
index a8757890be..e4fc10ae05 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClipping.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClipping.hxx
@@ -20,8 +20,8 @@
 #include <Standard_Type.hxx>
 
 #include <StepVisual_CameraModelD3.hxx>
+#include <StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx>
 class StepGeom_Axis2Placement3d;
-class StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect;
 class StepVisual_ViewVolume;
 class TCollection_HAsciiString;
 
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.hxx
index 6c94391d43..491717c8ae 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.hxx
@@ -20,7 +20,7 @@
 #include <Standard_Type.hxx>
 
 #include <StepGeom_GeometricRepresentationItem.hxx>
-class StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect;
+#include <StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx>
 class TCollection_HAsciiString;
 
 DEFINE_STANDARD_HANDLE(StepVisual_CameraModelD3MultiClippingIntersection,
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.hxx
index 962bae79c5..1bf61b822c 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.hxx
@@ -20,7 +20,7 @@
 #include <Standard_Type.hxx>
 
 #include <StepGeom_GeometricRepresentationItem.hxx>
-class StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect;
+#include <StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx>
 class TCollection_HAsciiString;
 
 DEFINE_STANDARD_HANDLE(StepVisual_CameraModelD3MultiClippingUnion,
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx
index 7069365e06..f47bbce47a 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx
@@ -17,8 +17,7 @@
 #define _StepVisual_HArray1OfAnnotationPlaneElement_HeaderFile
 
 #include <StepVisual_Array1OfAnnotationPlaneElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfAnnotationPlaneElement,
-               StepVisual_Array1OfAnnotationPlaneElement)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_AnnotationPlaneElement>
+  StepVisual_HArray1OfAnnotationPlaneElement;
 #endif // _StepVisual_HArray1OfAnnotationPlaneElement_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx
index 471a1c507c..33fc547255 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx
@@ -18,9 +18,7 @@
 #define StepVisual_HArray1OfBoxCharacteristicSelect_HeaderFile
 
 #include <StepVisual_Array1OfBoxCharacteristicSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfBoxCharacteristicSelect,
-               StepVisual_Array1OfBoxCharacteristicSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_BoxCharacteristicSelect>
+  StepVisual_HArray1OfBoxCharacteristicSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
index c72dfc6560..f4e8a35377 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
@@ -17,8 +17,7 @@
 #define _StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect_HeaderFile
 
 #include <StepVisual_Array1OfCameraModelD3MultiClippingInterectionSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect,
-               StepVisual_Array1OfCameraModelD3MultiClippingInterectionSelect)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_CameraModelD3MultiClippingInterectionSelect>
+  StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect;
 #endif // _StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
index fc589ce86b..c87e907267 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
@@ -17,8 +17,7 @@
 #define _StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect_HeaderFile
 
 #include <StepVisual_Array1OfCameraModelD3MultiClippingUnionSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect,
-               StepVisual_Array1OfCameraModelD3MultiClippingUnionSelect)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_CameraModelD3MultiClippingUnionSelect>
+  StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect;
 #endif // _StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx
index 6f41316bde..54c8396ef7 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx
@@ -18,8 +18,7 @@
 #define StepVisual_HArray1OfCurveStyleFontPattern_HeaderFile
 
 #include <StepVisual_Array1OfCurveStyleFontPattern.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfCurveStyleFontPattern, StepVisual_Array1OfCurveStyleFontPattern)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepVisual_CurveStyleFontPattern)>
+  StepVisual_HArray1OfCurveStyleFontPattern;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx
index 60cf680129..0e07ff0a73 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx
@@ -18,8 +18,7 @@
 #define StepVisual_HArray1OfDirectionCountSelect_HeaderFile
 
 #include <StepVisual_Array1OfDirectionCountSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfDirectionCountSelect, StepVisual_Array1OfDirectionCountSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_DirectionCountSelect>
+  StepVisual_HArray1OfDirectionCountSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx
index cb7d414e55..cbd3135293 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx
@@ -17,8 +17,7 @@
 #define _StepVisual_HArray1OfDraughtingCalloutElement_HeaderFile
 
 #include <StepVisual_Array1OfDraughtingCalloutElement.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfDraughtingCalloutElement,
-               StepVisual_Array1OfDraughtingCalloutElement)
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_DraughtingCalloutElement>
+  StepVisual_HArray1OfDraughtingCalloutElement;
 #endif // _StepVisual_HArray1OfDraughtingCalloutElement_HeaderFile
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx
index a2989fb028..12884f1eeb 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx
@@ -18,8 +18,6 @@
 #define StepVisual_HArray1OfFillStyleSelect_HeaderFile
 
 #include <StepVisual_Array1OfFillStyleSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfFillStyleSelect, StepVisual_Array1OfFillStyleSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_FillStyleSelect> StepVisual_HArray1OfFillStyleSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx
index 26f30c065f..de5a853af9 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx
@@ -18,8 +18,6 @@
 #define StepVisual_HArray1OfInvisibleItem_HeaderFile
 
 #include <StepVisual_Array1OfInvisibleItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfInvisibleItem, StepVisual_Array1OfInvisibleItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_InvisibleItem> StepVisual_HArray1OfInvisibleItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfLayeredItem.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfLayeredItem.hxx
index 24ce682d83..e0eb2dd580 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfLayeredItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfLayeredItem.hxx
@@ -18,8 +18,6 @@
 #define StepVisual_HArray1OfLayeredItem_HeaderFile
 
 #include <StepVisual_Array1OfLayeredItem.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfLayeredItem, StepVisual_Array1OfLayeredItem)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_LayeredItem> StepVisual_HArray1OfLayeredItem;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx
index eb64bfcd9b..bf3f28b753 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx
@@ -18,9 +18,7 @@
 #define StepVisual_HArray1OfPresentationStyleAssignment_HeaderFile
 
 #include <StepVisual_Array1OfPresentationStyleAssignment.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfPresentationStyleAssignment,
-               StepVisual_Array1OfPresentationStyleAssignment)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(StepVisual_PresentationStyleAssignment)>
+  StepVisual_HArray1OfPresentationStyleAssignment;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx
index 893a683157..6cc4d15cee 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx
@@ -18,9 +18,7 @@
 #define StepVisual_HArray1OfPresentationStyleSelect_HeaderFile
 
 #include <StepVisual_Array1OfPresentationStyleSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfPresentationStyleSelect,
-               StepVisual_Array1OfPresentationStyleSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_PresentationStyleSelect>
+  StepVisual_HArray1OfPresentationStyleSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
index ad5156ef89..915883fd2d 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
@@ -18,9 +18,7 @@
 #define StepVisual_HArray1OfRenderingPropertiesSelect_HeaderFile
 
 #include <StepVisual_Array1OfRenderingPropertiesSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfRenderingPropertiesSelect,
-               StepVisual_Array1OfRenderingPropertiesSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_RenderingPropertiesSelect>
+  StepVisual_HArray1OfRenderingPropertiesSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx
index f845bfd05d..6776ef7a9f 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx
@@ -18,8 +18,6 @@
 #define StepVisual_HArray1OfStyleContextSelect_HeaderFile
 
 #include <StepVisual_Array1OfStyleContextSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfStyleContextSelect, StepVisual_Array1OfStyleContextSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_StyleContextSelect> StepVisual_HArray1OfStyleContextSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
index fd9d753b11..c33a5f5807 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
@@ -18,9 +18,7 @@
 #define StepVisual_HArray1OfSurfaceStyleElementSelect_HeaderFile
 
 #include <StepVisual_Array1OfSurfaceStyleElementSelect.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfSurfaceStyleElementSelect,
-               StepVisual_Array1OfSurfaceStyleElementSelect)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_SurfaceStyleElementSelect>
+  StepVisual_HArray1OfSurfaceStyleElementSelect;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedEdgeOrVertex.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedEdgeOrVertex.hxx
index 181c20bde5..a6e6f9b334 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedEdgeOrVertex.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedEdgeOrVertex.hxx
@@ -17,10 +17,10 @@
 #ifndef StepVisual_HArray1OfTessellatedEdgeOrVertex_HeaderFile
 #define StepVisual_HArray1OfTessellatedEdgeOrVertex_HeaderFile
 
-#include <StepVisual_Array1OfTessellatedEdgeOrVertex.hxx>
+#include <StepVisual_TessellatedEdgeOrVertex.hxx>
 #include <NCollection_HArray1.hxx>
 
-DEFINE_HARRAY1(StepVisual_HArray1OfTessellatedEdgeOrVertex,
-               StepVisual_Array1OfTessellatedEdgeOrVertex);
+typedef NCollection_HArray1<StepVisual_TessellatedEdgeOrVertex>
+  StepVisual_HArray1OfTessellatedEdgeOrVertex;
 
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedStructuredItem.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedStructuredItem.hxx
index 7aaa647421..25bdca31dc 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedStructuredItem.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTessellatedStructuredItem.hxx
@@ -17,10 +17,10 @@
 #ifndef StepVisual_HArray1OfTessellatedStructuredItem_HeaderFile
 #define StepVisual_HArray1OfTessellatedStructuredItem_HeaderFile
 
-#include <StepVisual_Array1OfTessellatedStructuredItem.hxx>
+#include <StepVisual_TessellatedStructuredItem.hxx>
 #include <NCollection_HArray1.hxx>
 
-DEFINE_HARRAY1(StepVisual_HArray1OfTessellatedStructuredItem,
-               StepVisual_Array1OfTessellatedStructuredItem);
+typedef NCollection_HArray1<Handle(StepVisual_TessellatedStructuredItem)>
+  StepVisual_HArray1OfTessellatedStructuredItem;
 
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTextOrCharacter.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTextOrCharacter.hxx
index 9d1704cb6b..f3363d0097 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTextOrCharacter.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_HArray1OfTextOrCharacter.hxx
@@ -19,8 +19,6 @@
 
 #include <StepVisual_TextOrCharacter.hxx>
 #include <StepVisual_Array1OfTextOrCharacter.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(StepVisual_HArray1OfTextOrCharacter, StepVisual_Array1OfTextOrCharacter)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<StepVisual_TextOrCharacter> StepVisual_HArray1OfTextOrCharacter;
 #endif
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedGeometricSet.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedGeometricSet.hxx
index a7dc4d4271..0c9d0f541d 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedGeometricSet.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedGeometricSet.hxx
@@ -21,7 +21,6 @@
 
 #include <StepVisual_TessellatedItem.hxx>
 #include <NCollection_Array1.hxx>
-// #include <NCollection_DefineHArray1.hxx>
 #include <NCollection_Handle.hxx>
 
 typedef NCollection_Array1<Handle(StepVisual_TessellatedItem)> StepVisual_Array1OfTessellatedItem;
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_HSeqOfSelection.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_HSeqOfSelection.hxx
index aef0ae31ae..8d7b99fc4d 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_HSeqOfSelection.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_HSeqOfSelection.hxx
@@ -18,8 +18,6 @@
 #define IFSelect_HSeqOfSelection_HeaderFile
 
 #include <IFSelect_TSeqOfSelection.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(IFSelect_HSeqOfSelection, IFSelect_TSeqOfSelection)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(IFSelect_Selection)> IFSelect_HSeqOfSelection;
 #endif
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_HArray1OfHAsciiString.hxx b/src/DataExchange/TKXSBase/Interface/Interface_HArray1OfHAsciiString.hxx
index c84efd16b4..51d52ddc23 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_HArray1OfHAsciiString.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_HArray1OfHAsciiString.hxx
@@ -19,8 +19,6 @@
 
 #include <TCollection_HAsciiString.hxx>
 #include <Interface_Array1OfHAsciiString.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Interface_HArray1OfHAsciiString, Interface_Array1OfHAsciiString)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(TCollection_HAsciiString)> Interface_HArray1OfHAsciiString;
 #endif
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_HSequenceOfCheck.hxx b/src/DataExchange/TKXSBase/Interface/Interface_HSequenceOfCheck.hxx
index c1e0a388bd..b4fc20b720 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_HSequenceOfCheck.hxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_HSequenceOfCheck.hxx
@@ -18,8 +18,6 @@
 #define Interface_HSequenceOfCheck_HeaderFile
 
 #include <Interface_SequenceOfCheck.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Interface_HSequenceOfCheck, Interface_SequenceOfCheck)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Interface_Check)> Interface_HSequenceOfCheck;
 #endif
diff --git a/src/DataExchange/TKXSBase/MoniTool/MoniTool_HSequenceOfElement.hxx b/src/DataExchange/TKXSBase/MoniTool/MoniTool_HSequenceOfElement.hxx
index c5f0f3999e..b446e56f4d 100644
--- a/src/DataExchange/TKXSBase/MoniTool/MoniTool_HSequenceOfElement.hxx
+++ b/src/DataExchange/TKXSBase/MoniTool/MoniTool_HSequenceOfElement.hxx
@@ -19,8 +19,6 @@
 
 #include <MoniTool_Element.hxx>
 #include <MoniTool_SequenceOfElement.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(MoniTool_HSequenceOfElement, MoniTool_SequenceOfElement)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(MoniTool_Element)> MoniTool_HSequenceOfElement;
 #endif
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfBinder.hxx b/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfBinder.hxx
index d17a601b5c..b5553521e7 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfBinder.hxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfBinder.hxx
@@ -18,8 +18,6 @@
 #define Transfer_HSequenceOfBinder_HeaderFile
 
 #include <Transfer_SequenceOfBinder.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Transfer_HSequenceOfBinder, Transfer_SequenceOfBinder)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Transfer_Binder)> Transfer_HSequenceOfBinder;
 #endif
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfFinder.hxx b/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfFinder.hxx
index 491090e4fb..8eb67e2d65 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfFinder.hxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_HSequenceOfFinder.hxx
@@ -18,8 +18,6 @@
 #define Transfer_HSequenceOfFinder_HeaderFile
 
 #include <Transfer_SequenceOfFinder.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Transfer_HSequenceOfFinder, Transfer_SequenceOfFinder)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Transfer_Finder)> Transfer_HSequenceOfFinder;
 #endif
diff --git a/src/DataExchange/TKXSBase/TransferBRep/TransferBRep_HSequenceOfTransferResultInfo.hxx b/src/DataExchange/TKXSBase/TransferBRep/TransferBRep_HSequenceOfTransferResultInfo.hxx
index c06d21b53b..efe2fdf94a 100644
--- a/src/DataExchange/TKXSBase/TransferBRep/TransferBRep_HSequenceOfTransferResultInfo.hxx
+++ b/src/DataExchange/TKXSBase/TransferBRep/TransferBRep_HSequenceOfTransferResultInfo.hxx
@@ -18,9 +18,7 @@
 #define TransferBRep_HSequenceOfTransferResultInfo_HeaderFile
 
 #include <TransferBRep_SequenceOfTransferResultInfo.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TransferBRep_HSequenceOfTransferResultInfo,
-                 TransferBRep_SequenceOfTransferResultInfo)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(TransferBRep_TransferResultInfo)>
+  TransferBRep_HSequenceOfTransferResultInfo;
 #endif
diff --git a/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox.hxx b/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox.hxx
index 2f49a5b76c..e04c299144 100644
--- a/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox.hxx
+++ b/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox.hxx
@@ -19,8 +19,6 @@
 
 #include <Bnd_Box.hxx>
 #include <Bnd_Array1OfBox.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Bnd_HArray1OfBox, Bnd_Array1OfBox)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Bnd_Box> Bnd_HArray1OfBox;
 #endif
diff --git a/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox2d.hxx b/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox2d.hxx
index 4378e37e6e..9a1c6d1f24 100644
--- a/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox2d.hxx
+++ b/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfBox2d.hxx
@@ -18,8 +18,6 @@
 #define Bnd_HArray1OfBox2d_HeaderFile
 
 #include <Bnd_Array1OfBox2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Bnd_HArray1OfBox2d, Bnd_Array1OfBox2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Bnd_Box2d> Bnd_HArray1OfBox2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfSphere.hxx b/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfSphere.hxx
index 5a7ba43015..34d0cdecf5 100644
--- a/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfSphere.hxx
+++ b/src/FoundationClasses/TKMath/Bnd/Bnd_HArray1OfSphere.hxx
@@ -18,8 +18,6 @@
 #define Bnd_HArray1OfSphere_HeaderFile
 
 #include <Bnd_Array1OfSphere.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Bnd_HArray1OfSphere, Bnd_Array1OfSphere)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Bnd_Sphere> Bnd_HArray1OfSphere;
 #endif
diff --git a/src/FoundationClasses/TKMath/Poly/Poly_HArray1OfTriangle.hxx b/src/FoundationClasses/TKMath/Poly/Poly_HArray1OfTriangle.hxx
index 9719484ec1..a11b4994aa 100644
--- a/src/FoundationClasses/TKMath/Poly/Poly_HArray1OfTriangle.hxx
+++ b/src/FoundationClasses/TKMath/Poly/Poly_HArray1OfTriangle.hxx
@@ -18,8 +18,6 @@
 #define Poly_HArray1OfTriangle_HeaderFile
 
 #include <Poly_Array1OfTriangle.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Poly_HArray1OfTriangle, Poly_Array1OfTriangle)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Poly_Triangle> Poly_HArray1OfTriangle;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfCirc2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfCirc2d.hxx
index 2115dda278..edb9e89eb3 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfCirc2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfCirc2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Circ2d.hxx>
 #include <TColgp_Array1OfCirc2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfCirc2d, TColgp_Array1OfCirc2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Circ2d> TColgp_HArray1OfCirc2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir.hxx
index 86dd54fb83..a2db9ab233 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Dir.hxx>
 #include <TColgp_Array1OfDir.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfDir, TColgp_Array1OfDir)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Dir> TColgp_HArray1OfDir;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir2d.hxx
index 665f0d1e6e..ec35a2be1f 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfDir2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Dir2d.hxx>
 #include <TColgp_Array1OfDir2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfDir2d, TColgp_Array1OfDir2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Dir2d> TColgp_HArray1OfDir2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfLin2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfLin2d.hxx
index 80be18473d..cce7c7d876 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfLin2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfLin2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Lin2d.hxx>
 #include <TColgp_Array1OfLin2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfLin2d, TColgp_Array1OfLin2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Lin2d> TColgp_HArray1OfLin2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt.hxx
index 892b07c890..82bf191807 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Pnt.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfPnt, TColgp_Array1OfPnt)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Pnt> TColgp_HArray1OfPnt;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt2d.hxx
index 06d3af1afa..a25844bda4 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfPnt2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Pnt2d.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfPnt2d, TColgp_Array1OfPnt2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Pnt2d> TColgp_HArray1OfPnt2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec.hxx
index ccf0a44659..0957de3fd8 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec.hxx
@@ -18,8 +18,6 @@
 #define TColgp_HArray1OfVec_HeaderFile
 
 #include <TColgp_Array1OfVec.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfVec, TColgp_Array1OfVec)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Vec> TColgp_HArray1OfVec;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec2d.hxx
index b7d465c111..294fe31006 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfVec2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Vec2d.hxx>
 #include <TColgp_Array1OfVec2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfVec2d, TColgp_Array1OfVec2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_Vec2d> TColgp_HArray1OfVec2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXY.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXY.hxx
index 048d82a99e..beee929c6e 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXY.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXY.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_XY.hxx>
 #include <TColgp_Array1OfXY.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfXY, TColgp_Array1OfXY)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_XY> TColgp_HArray1OfXY;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXYZ.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXYZ.hxx
index 2098f5fa6e..96faa60f35 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXYZ.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray1OfXYZ.hxx
@@ -18,8 +18,6 @@
 #define TColgp_HArray1OfXYZ_HeaderFile
 
 #include <TColgp_Array1OfXYZ.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColgp_HArray1OfXYZ, TColgp_Array1OfXYZ)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_XYZ> TColgp_HArray1OfXYZ;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfCirc2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfCirc2d.hxx
index ae8d3fa5b1..0437158c8a 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfCirc2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfCirc2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Circ2d.hxx>
 #include <TColgp_Array2OfCirc2d.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfCirc2d, TColgp_Array2OfCirc2d)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Circ2d> TColgp_HArray2OfCirc2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir.hxx
index 6f1876c23f..d37807e9fb 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Dir.hxx>
 #include <TColgp_Array2OfDir.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfDir, TColgp_Array2OfDir)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Dir> TColgp_HArray2OfDir;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir2d.hxx
index 5c7216c027..1a26eda52a 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfDir2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Dir2d.hxx>
 #include <TColgp_Array2OfDir2d.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfDir2d, TColgp_Array2OfDir2d)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Dir2d> TColgp_HArray2OfDir2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfLin2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfLin2d.hxx
index 2d08735f61..85dc6b86dd 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfLin2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfLin2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Lin2d.hxx>
 #include <TColgp_Array2OfLin2d.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfLin2d, TColgp_Array2OfLin2d)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Lin2d> TColgp_HArray2OfLin2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt.hxx
index ec91278757..719a2f7287 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Pnt.hxx>
 #include <TColgp_Array2OfPnt.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfPnt, TColgp_Array2OfPnt)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Pnt> TColgp_HArray2OfPnt;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt2d.hxx
index 7851380772..2c024fb43e 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfPnt2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Pnt2d.hxx>
 #include <TColgp_Array2OfPnt2d.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfPnt2d, TColgp_Array2OfPnt2d)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Pnt2d> TColgp_HArray2OfPnt2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec.hxx
index 13a61f155d..6466babb5a 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Vec.hxx>
 #include <TColgp_Array2OfVec.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfVec, TColgp_Array2OfVec)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Vec> TColgp_HArray2OfVec;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec2d.hxx
index 09850c423e..ec194d355b 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfVec2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Vec2d.hxx>
 #include <TColgp_Array2OfVec2d.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfVec2d, TColgp_Array2OfVec2d)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_Vec2d> TColgp_HArray2OfVec2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXY.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXY.hxx
index 5190e23d2a..8290f8a492 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXY.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXY.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_XY.hxx>
 #include <TColgp_Array2OfXY.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfXY, TColgp_Array2OfXY)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_XY> TColgp_HArray2OfXY;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXYZ.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXYZ.hxx
index 57d94f2f61..d2cb82c91a 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXYZ.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HArray2OfXYZ.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_XYZ.hxx>
 #include <TColgp_Array2OfXYZ.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColgp_HArray2OfXYZ, TColgp_Array2OfXYZ)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<gp_XYZ> TColgp_HArray2OfXYZ;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir.hxx
index 1dcc7f93cb..f2eedc192c 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Dir.hxx>
 #include <TColgp_SequenceOfDir.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfDir, TColgp_SequenceOfDir)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Dir> TColgp_HSequenceOfDir;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir2d.hxx
index d0bdd1cfe6..ee7d249ce9 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfDir2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Dir2d.hxx>
 #include <TColgp_SequenceOfDir2d.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfDir2d, TColgp_SequenceOfDir2d)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Dir2d> TColgp_HSequenceOfDir2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt.hxx
index b27c9c5fbf..7104d12cc1 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Pnt.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfPnt, TColgp_SequenceOfPnt)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Pnt> TColgp_HSequenceOfPnt;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt2d.hxx
index 413760c7f8..2443a3c300 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfPnt2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Pnt2d.hxx>
 #include <TColgp_SequenceOfPnt2d.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfPnt2d, TColgp_SequenceOfPnt2d)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Pnt2d> TColgp_HSequenceOfPnt2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec.hxx
index 1c8b5a7882..d6eeb0bcd1 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Vec.hxx>
 #include <TColgp_SequenceOfVec.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfVec, TColgp_SequenceOfVec)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Vec> TColgp_HSequenceOfVec;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec2d.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec2d.hxx
index 151515a525..097b7976a3 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec2d.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfVec2d.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Vec2d.hxx>
 #include <TColgp_SequenceOfVec2d.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfVec2d, TColgp_SequenceOfVec2d)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Vec2d> TColgp_HSequenceOfVec2d;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXY.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXY.hxx
index 5bc3c37d85..d31e076723 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXY.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXY.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_XY.hxx>
 #include <TColgp_SequenceOfXY.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfXY, TColgp_SequenceOfXY)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_XY> TColgp_HSequenceOfXY;
 #endif
diff --git a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXYZ.hxx b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXYZ.hxx
index 6998d35d45..8cfdb756dc 100644
--- a/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXYZ.hxx
+++ b/src/FoundationClasses/TKMath/TColgp/TColgp_HSequenceOfXYZ.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_XYZ.hxx>
 #include <TColgp_SequenceOfXYZ.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColgp_HSequenceOfXYZ, TColgp_SequenceOfXYZ)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_XYZ> TColgp_HSequenceOfXYZ;
 #endif
diff --git a/src/FoundationClasses/TKernel/NCollection/FILES.cmake b/src/FoundationClasses/TKernel/NCollection/FILES.cmake
index 485bda5d27..a15ed1ef00 100644
--- a/src/FoundationClasses/TKernel/NCollection/FILES.cmake
+++ b/src/FoundationClasses/TKernel/NCollection/FILES.cmake
@@ -25,10 +25,7 @@ set(OCCT_NCollection_FILES
   NCollection_DataMap.hxx
   NCollection_DefaultHasher.hxx
   NCollection_DefineAlloc.hxx
-  NCollection_DefineHArray1.hxx
-  NCollection_DefineHArray2.hxx
   NCollection_DefineHasher.hxx
-  NCollection_DefineHSequence.hxx
   NCollection_DoubleMap.hxx
   NCollection_DynamicArray.hxx
   NCollection_EBTree.hxx
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHArray1.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHArray1.hxx
deleted file mode 100644
index ef187c5bb5..0000000000
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHArray1.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-// Created on: 2002-04-29
-// Created by: Alexander KARTOMIN (akm)
-// Copyright (c) 2002-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-//            Automatically created from NCollection_HArray1.hxx by GAWK
-
-#ifndef NCollection_DefineHArray1_HeaderFile
-#define NCollection_DefineHArray1_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_Transient.hxx>
-
-//      Declaration of Array1 class managed by Handle
-
-#define DEFINE_HARRAY1(HClassName, _Array1Type_)                                                   \
-  class HClassName : public _Array1Type_, public Standard_Transient                                \
-  {                                                                                                \
-  public:                                                                                          \
-    DEFINE_STANDARD_ALLOC                                                                          \
-    DEFINE_NCOLLECTION_ALLOC                                                                       \
-    HClassName()                                                                                   \
-        : _Array1Type_()                                                                           \
-    {                                                                                              \
-    }                                                                                              \
-    HClassName(const Standard_Integer theLower, const Standard_Integer theUpper)                   \
-        : _Array1Type_(theLower, theUpper)                                                         \
-    {                                                                                              \
-    }                                                                                              \
-    HClassName(const Standard_Integer          theLower,                                           \
-               const Standard_Integer          theUpper,                                           \
-               const _Array1Type_::value_type& theValue)                                           \
-        : _Array1Type_(theLower, theUpper)                                                         \
-    {                                                                                              \
-      Init(theValue);                                                                              \
-    }                                                                                              \
-    explicit HClassName(const typename _Array1Type_::value_type& theBegin,                         \
-                        const Standard_Integer                   theLower,                         \
-                        const Standard_Integer                   theUpper,                         \
-                        const bool)                                                                \
-        : _Array1Type_(theBegin, theLower, theUpper)                                               \
-    {                                                                                              \
-    }                                                                                              \
-    HClassName(const _Array1Type_& theOther)                                                       \
-        : _Array1Type_(theOther)                                                                   \
-    {                                                                                              \
-    }                                                                                              \
-    const _Array1Type_& Array1() const noexcept                                                    \
-    {                                                                                              \
-      return *this;                                                                                \
-    }                                                                                              \
-    _Array1Type_& ChangeArray1() noexcept                                                          \
-    {                                                                                              \
-      return *this;                                                                                \
-    }                                                                                              \
-    DEFINE_STANDARD_RTTI_INLINE(HClassName, Standard_Transient)                                    \
-  };                                                                                               \
-  DEFINE_STANDARD_HANDLE(HClassName, Standard_Transient)
-
-#define IMPLEMENT_HARRAY1(HClassName)
-
-#endif
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHArray2.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHArray2.hxx
deleted file mode 100644
index 4e7fd3ab21..0000000000
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHArray2.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-// Created on: 2002-04-29
-// Created by: Alexander KARTOMIN (akm)
-// Copyright (c) 2002-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-//            Automatically created from NCollection_HArray2.hxx by GAWK
-
-#ifndef NCollection_DefineHArray2_HeaderFile
-#define NCollection_DefineHArray2_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_Transient.hxx>
-
-//      Declaration of Array2 class managed by Handle
-
-#define DEFINE_HARRAY2(HClassName, _Array2Type_)                                                   \
-  class HClassName : public _Array2Type_, public Standard_Transient                                \
-  {                                                                                                \
-  public:                                                                                          \
-    DEFINE_STANDARD_ALLOC                                                                          \
-    DEFINE_NCOLLECTION_ALLOC                                                                       \
-    HClassName(const Standard_Integer theRowLow,                                                   \
-               const Standard_Integer theRowUpp,                                                   \
-               const Standard_Integer theColLow,                                                   \
-               const Standard_Integer theColUpp)                                                   \
-        : _Array2Type_(theRowLow, theRowUpp, theColLow, theColUpp)                                 \
-    {                                                                                              \
-    }                                                                                              \
-    HClassName(const Standard_Integer          theRowLow,                                          \
-               const Standard_Integer          theRowUpp,                                          \
-               const Standard_Integer          theColLow,                                          \
-               const Standard_Integer          theColUpp,                                          \
-               const _Array2Type_::value_type& theValue)                                           \
-        : _Array2Type_(theRowLow, theRowUpp, theColLow, theColUpp)                                 \
-    {                                                                                              \
-      Init(theValue);                                                                              \
-    }                                                                                              \
-    HClassName(const _Array2Type_& theOther)                                                       \
-        : _Array2Type_(theOther)                                                                   \
-    {                                                                                              \
-    }                                                                                              \
-    const _Array2Type_& Array2() const noexcept                                                    \
-    {                                                                                              \
-      return *this;                                                                                \
-    }                                                                                              \
-    _Array2Type_& ChangeArray2() noexcept                                                          \
-    {                                                                                              \
-      return *this;                                                                                \
-    }                                                                                              \
-    DEFINE_STANDARD_RTTI_INLINE(HClassName, Standard_Transient)                                    \
-  };                                                                                               \
-  DEFINE_STANDARD_HANDLE(HClassName, Standard_Transient)
-
-#define IMPLEMENT_HARRAY2(HClassName)
-
-#endif
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHSequence.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHSequence.hxx
deleted file mode 100644
index d3aeea824e..0000000000
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_DefineHSequence.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-// Created on: 2001-01-29
-// Created by: Alexander GRIGORIEV
-// Copyright (c) 2001-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-//            Automatically created from NCollection_HSequence.hxx by GAWK
-
-#ifndef NCollection_DefineHSequence_HeaderFile
-#define NCollection_DefineHSequence_HeaderFile
-
-#include <Standard_Type.hxx>
-#include <Standard_Transient.hxx>
-
-//      Declaration of Sequence class managed by Handle
-
-#define DEFINE_HSEQUENCE(HClassName, _SequenceType_)                                               \
-  class HClassName : public _SequenceType_, public Standard_Transient                              \
-  {                                                                                                \
-  public:                                                                                          \
-    DEFINE_STANDARD_ALLOC                                                                          \
-    DEFINE_NCOLLECTION_ALLOC                                                                       \
-    HClassName() {}                                                                                \
-    HClassName(const _SequenceType_& theOther)                                                     \
-        : _SequenceType_(theOther)                                                                 \
-    {                                                                                              \
-    }                                                                                              \
-    const _SequenceType_& Sequence() const noexcept                                                \
-    {                                                                                              \
-      return *this;                                                                                \
-    }                                                                                              \
-    void Append(const _SequenceType_::value_type& theItem)                                         \
-    {                                                                                              \
-      _SequenceType_::Append(theItem);                                                             \
-    }                                                                                              \
-    void Append(_SequenceType_& theSequence)                                                       \
-    {                                                                                              \
-      _SequenceType_::Append(theSequence);                                                         \
-    }                                                                                              \
-    _SequenceType_& ChangeSequence() noexcept                                                      \
-    {                                                                                              \
-      return *this;                                                                                \
-    }                                                                                              \
-    template <class T>                                                                             \
-    void Append(const Handle(T)& theOther,                                                         \
-                typename opencascade::std::enable_if<                                              \
-                  opencascade::std::is_base_of<HClassName, T>::value>::type* = 0)                  \
-    {                                                                                              \
-      _SequenceType_::Append(theOther->ChangeSequence());                                          \
-    }                                                                                              \
-    DEFINE_STANDARD_RTTI_INLINE(HClassName, Standard_Transient)                                    \
-  };                                                                                               \
-  DEFINE_STANDARD_HANDLE(HClassName, Standard_Transient)
-
-#define IMPLEMENT_HSEQUENCE(HClassName)
-
-#endif
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_HArray1.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_HArray1.hxx
index dc4710d71d..23df87e892 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_HArray1.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_HArray1.hxx
@@ -1,6 +1,4 @@
-// Created on: 2002-04-29
-// Created by: Alexander KARTOMIN (akm)
-// Copyright (c) 2002-2014 OPEN CASCADE SAS
+// Copyright (c) 2002-2024 OPEN CASCADE SAS
 //
 // This file is part of Open CASCADE Technology software library.
 //
@@ -17,10 +15,76 @@
 #define NCollection_HArray1_HeaderFile
 
 #include <NCollection_Array1.hxx>
-#include <NCollection_DefineHArray1.hxx>
+#include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
-//      Declaration of Array1 class managed by Handle
+//! Template class for Handle-managed 1D arrays.
+//! Inherits from both NCollection_Array1<TheItemType> and Standard_Transient,
+//! providing reference-counted array functionality.
+template <typename TheItemType>
+class NCollection_HArray1 : public NCollection_Array1<TheItemType>, public Standard_Transient
+{
+public:
+  DEFINE_STANDARD_ALLOC
+  DEFINE_NCOLLECTION_ALLOC
 
-#define NCOLLECTION_HARRAY1(HClassName, Type) DEFINE_HARRAY1(HClassName, NCollection_Array1<Type>)
+  typedef NCollection_Array1<TheItemType> Array1Type;
+  typedef TheItemType                     value_type;
 
-#endif
+public:
+  //! Default constructor.
+  NCollection_HArray1()
+      : Array1Type()
+  {
+  }
+
+  //! Constructor with bounds.
+  //! @param theLower lower bound of the array
+  //! @param theUpper upper bound of the array
+  NCollection_HArray1(const Standard_Integer theLower, const Standard_Integer theUpper)
+      : Array1Type(theLower, theUpper)
+  {
+  }
+
+  //! Constructor with bounds and initial value.
+  //! @param theLower lower bound of the array
+  //! @param theUpper upper bound of the array
+  //! @param theValue initial value for all elements
+  NCollection_HArray1(const Standard_Integer theLower,
+                      const Standard_Integer theUpper,
+                      const TheItemType&     theValue)
+      : Array1Type(theLower, theUpper)
+  {
+    Array1Type::Init(theValue);
+  }
+
+  //! Constructor from C array.
+  //! @param theBegin reference to the first element of a C array
+  //! @param theLower lower bound of the array
+  //! @param theUpper upper bound of the array
+  //! @param theUseBuffer flag indicating whether to use external buffer (must be explicit)
+  explicit NCollection_HArray1(const TheItemType&     theBegin,
+                               const Standard_Integer theLower,
+                               const Standard_Integer theUpper,
+                               const bool             theUseBuffer)
+      : Array1Type(theBegin, theLower, theUpper, theUseBuffer)
+  {
+  }
+
+  //! Copy constructor from array.
+  //! @param theOther the array to copy from
+  NCollection_HArray1(const Array1Type& theOther)
+      : Array1Type(theOther)
+  {
+  }
+
+  //! Returns const reference to the underlying array.
+  const Array1Type& Array1() const noexcept { return *this; }
+
+  //! Returns mutable reference to the underlying array.
+  Array1Type& ChangeArray1() noexcept { return *this; }
+
+  DEFINE_STANDARD_RTTI_INLINE(NCollection_HArray1, Standard_Transient)
+};
+
+#endif // NCollection_HArray1_HeaderFile
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_HArray2.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_HArray2.hxx
index 34d3a2c06f..fd7bfd1081 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_HArray2.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_HArray2.hxx
@@ -1,6 +1,4 @@
-// Created on: 2002-04-29
-// Created by: Alexander KARTOMIN (akm)
-// Copyright (c) 2002-2014 OPEN CASCADE SAS
+// Copyright (c) 2002-2024 OPEN CASCADE SAS
 //
 // This file is part of Open CASCADE Technology software library.
 //
@@ -17,10 +15,66 @@
 #define NCollection_HArray2_HeaderFile
 
 #include <NCollection_Array2.hxx>
-#include <NCollection_DefineHArray2.hxx>
+#include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
-//      Declaration of Array2 class managed by Handle
+//! Template class for Handle-managed 2D arrays.
+//! Inherits from both NCollection_Array2<TheItemType> and Standard_Transient,
+//! providing reference-counted 2D array functionality.
+template <typename TheItemType>
+class NCollection_HArray2 : public NCollection_Array2<TheItemType>, public Standard_Transient
+{
+public:
+  DEFINE_STANDARD_ALLOC
+  DEFINE_NCOLLECTION_ALLOC
 
-#define NCOLLECTION_HARRAY2(HClassName, Type) DEFINE_HARRAY2(HClassName, NCollection_Array2<Type>)
+  typedef NCollection_Array2<TheItemType> Array2Type;
+  typedef TheItemType                     value_type;
 
-#endif
+public:
+  //! Constructor with bounds.
+  //! @param theRowLow lower row bound
+  //! @param theRowUpp upper row bound
+  //! @param theColLow lower column bound
+  //! @param theColUpp upper column bound
+  NCollection_HArray2(const Standard_Integer theRowLow,
+                      const Standard_Integer theRowUpp,
+                      const Standard_Integer theColLow,
+                      const Standard_Integer theColUpp)
+      : Array2Type(theRowLow, theRowUpp, theColLow, theColUpp)
+  {
+  }
+
+  //! Constructor with bounds and initial value.
+  //! @param theRowLow lower row bound
+  //! @param theRowUpp upper row bound
+  //! @param theColLow lower column bound
+  //! @param theColUpp upper column bound
+  //! @param theValue initial value for all elements
+  NCollection_HArray2(const Standard_Integer theRowLow,
+                      const Standard_Integer theRowUpp,
+                      const Standard_Integer theColLow,
+                      const Standard_Integer theColUpp,
+                      const TheItemType&     theValue)
+      : Array2Type(theRowLow, theRowUpp, theColLow, theColUpp)
+  {
+    Array2Type::Init(theValue);
+  }
+
+  //! Copy constructor from array.
+  //! @param theOther the array to copy from
+  NCollection_HArray2(const Array2Type& theOther)
+      : Array2Type(theOther)
+  {
+  }
+
+  //! Returns const reference to the underlying array.
+  const Array2Type& Array2() const noexcept { return *this; }
+
+  //! Returns mutable reference to the underlying array.
+  Array2Type& ChangeArray2() noexcept { return *this; }
+
+  DEFINE_STANDARD_RTTI_INLINE(NCollection_HArray2, Standard_Transient)
+};
+
+#endif // NCollection_HArray2_HeaderFile
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_HSequence.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_HSequence.hxx
index 4cb685e59c..4d21ed508e 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_HSequence.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_HSequence.hxx
@@ -1,6 +1,4 @@
-// Created on: 2001-01-29
-// Created by: Alexander GRIGORIEV
-// Copyright (c) 2001-2014 OPEN CASCADE SAS
+// Copyright (c) 2001-2024 OPEN CASCADE SAS
 //
 // This file is part of Open CASCADE Technology software library.
 //
@@ -16,12 +14,58 @@
 #ifndef NCollection_HSequence_HeaderFile
 #define NCollection_HSequence_HeaderFile
 
-#include <NCollection_DefineHSequence.hxx>
 #include <NCollection_Sequence.hxx>
+#include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
-//      Declaration of Sequence class managed by Handle
+//! Template class for Handle-managed sequences.
+//! Inherits from both NCollection_Sequence<TheItemType> and Standard_Transient,
+//! providing reference-counted sequence functionality.
+template <typename TheItemType>
+class NCollection_HSequence : public NCollection_Sequence<TheItemType>, public Standard_Transient
+{
+public:
+  DEFINE_STANDARD_ALLOC
+  DEFINE_NCOLLECTION_ALLOC
 
-#define NCOLLECTION_HSEQUENCE(HClassName, Type)                                                    \
-  DEFINE_HSEQUENCE(HClassName, NCollection_Sequence<Type>)
+  typedef NCollection_Sequence<TheItemType> SequenceType;
+  typedef TheItemType                       value_type;
 
-#endif
+public:
+  //! Default constructor.
+  NCollection_HSequence() {}
+
+  //! Copy constructor from sequence.
+  //! @param theOther the sequence to copy from
+  NCollection_HSequence(const SequenceType& theOther)
+      : SequenceType(theOther)
+  {
+  }
+
+  //! Returns const reference to the underlying sequence.
+  const SequenceType& Sequence() const noexcept { return *this; }
+
+  //! Returns mutable reference to the underlying sequence.
+  SequenceType& ChangeSequence() noexcept { return *this; }
+
+  //! Append single item.
+  //! @param theItem the item to append
+  void Append(const TheItemType& theItem) { SequenceType::Append(theItem); }
+
+  //! Append another sequence.
+  //! @param theSequence the sequence to append
+  void Append(SequenceType& theSequence) { SequenceType::Append(theSequence); }
+
+  //! Append items from another HSequence.
+  //! @param theOther handle to another HSequence
+  template <class T>
+  void Append(const opencascade::handle<T>& theOther,
+              typename std::enable_if<std::is_base_of<NCollection_HSequence, T>::value>::type* = 0)
+  {
+    SequenceType::Append(theOther->ChangeSequence());
+  }
+
+  DEFINE_STANDARD_RTTI_INLINE(NCollection_HSequence, Standard_Transient)
+};
+
+#endif // NCollection_HSequence_HeaderFile
diff --git a/src/FoundationClasses/TKernel/Quantity/Quantity_HArray1OfColor.hxx b/src/FoundationClasses/TKernel/Quantity/Quantity_HArray1OfColor.hxx
index 798de10a0e..38d55dce41 100644
--- a/src/FoundationClasses/TKernel/Quantity/Quantity_HArray1OfColor.hxx
+++ b/src/FoundationClasses/TKernel/Quantity/Quantity_HArray1OfColor.hxx
@@ -18,8 +18,6 @@
 #define Quantity_HArray1OfColor_HeaderFile
 
 #include <Quantity_Array1OfColor.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Quantity_HArray1OfColor, Quantity_Array1OfColor)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Quantity_Color> Quantity_HArray1OfColor;
 #endif
diff --git a/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfCallBack.hxx b/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfCallBack.hxx
index 7e7f70bbc0..4ecebef611 100644
--- a/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfCallBack.hxx
+++ b/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfCallBack.hxx
@@ -18,8 +18,6 @@
 #define Storage_HArrayOfCallBack_HeaderFile
 
 #include <Storage_ArrayOfCallBack.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Storage_HArrayOfCallBack, Storage_ArrayOfCallBack)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Storage_CallBack)> Storage_HArrayOfCallBack;
 #endif
diff --git a/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfSchema.hxx b/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfSchema.hxx
index 4a9c2d0405..7cda204c77 100644
--- a/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfSchema.hxx
+++ b/src/FoundationClasses/TKernel/Storage/Storage_HArrayOfSchema.hxx
@@ -18,8 +18,6 @@
 #define Storage_HArrayOfSchema_HeaderFile
 
 #include <Storage_ArrayOfSchema.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Storage_HArrayOfSchema, Storage_ArrayOfSchema)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Storage_Schema)> Storage_HArrayOfSchema;
 #endif
diff --git a/src/FoundationClasses/TKernel/Storage/Storage_HPArray.hxx b/src/FoundationClasses/TKernel/Storage/Storage_HPArray.hxx
index e471a3c0c1..2c63871521 100644
--- a/src/FoundationClasses/TKernel/Storage/Storage_HPArray.hxx
+++ b/src/FoundationClasses/TKernel/Storage/Storage_HPArray.hxx
@@ -18,8 +18,6 @@
 #define Storage_HPArray_HeaderFile
 
 #include <Storage_PArray.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Storage_HPArray, Storage_PArray)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Standard_Persistent)> Storage_HPArray;
 #endif
diff --git a/src/FoundationClasses/TKernel/Storage/Storage_HSeqOfRoot.hxx b/src/FoundationClasses/TKernel/Storage/Storage_HSeqOfRoot.hxx
index fad3975e50..c9a23b63b1 100644
--- a/src/FoundationClasses/TKernel/Storage/Storage_HSeqOfRoot.hxx
+++ b/src/FoundationClasses/TKernel/Storage/Storage_HSeqOfRoot.hxx
@@ -18,8 +18,6 @@
 #define Storage_HSeqOfRoot_HeaderFile
 
 #include <Storage_SeqOfRoot.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Storage_HSeqOfRoot, Storage_SeqOfRoot)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Storage_Root)> Storage_HSeqOfRoot;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfAsciiString.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfAsciiString.hxx
index 3d2f9d625c..e5a7f392dd 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfAsciiString.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfAsciiString.hxx
@@ -17,8 +17,6 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfAsciiString.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfAsciiString, TColStd_Array1OfAsciiString)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TCollection_AsciiString> TColStd_HArray1OfAsciiString;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfBoolean.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfBoolean.hxx
index 0c9fbd99ed..66c5ef40a1 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfBoolean.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfBoolean.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HArray1OfBoolean_HeaderFile
 
 #include <TColStd_Array1OfBoolean.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfBoolean, TColStd_Array1OfBoolean)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Standard_Boolean> TColStd_HArray1OfBoolean;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfByte.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfByte.hxx
index 269ed8ec25..35585c83c1 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfByte.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfByte.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HArray1OfByte_HeaderFile
 
 #include <TColStd_Array1OfByte.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfByte, TColStd_Array1OfByte)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Standard_Byte> TColStd_HArray1OfByte;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfCharacter.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfCharacter.hxx
index 5861f2248b..5533768bb2 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfCharacter.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfCharacter.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Character.hxx>
 #include <TColStd_Array1OfCharacter.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfCharacter, TColStd_Array1OfCharacter)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Standard_Character> TColStd_HArray1OfCharacter;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfExtendedString.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfExtendedString.hxx
index 52c176c808..2af6f88a6b 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfExtendedString.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfExtendedString.hxx
@@ -17,8 +17,6 @@
 
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_Array1OfExtendedString.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfExtendedString, TColStd_Array1OfExtendedString)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TCollection_ExtendedString> TColStd_HArray1OfExtendedString;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfInteger.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfInteger.hxx
index cc6a3977d0..f772ce3e15 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfInteger.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfInteger.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Integer.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfInteger, TColStd_Array1OfInteger)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Standard_Integer> TColStd_HArray1OfInteger;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfListOfInteger.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfListOfInteger.hxx
index 03eb396f89..ae17f2f346 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfListOfInteger.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfListOfInteger.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HArray1OfListOfInteger_HeaderFile
 
 #include <TColStd_Array1OfListOfInteger.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfListOfInteger, TColStd_Array1OfListOfInteger)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TColStd_ListOfInteger> TColStd_HArray1OfListOfInteger;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfReal.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfReal.hxx
index 96022ec859..e838705d1f 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfReal.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfReal.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HArray1OfReal_HeaderFile
 
 #include <TColStd_Array1OfReal.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfReal, TColStd_Array1OfReal)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Standard_Real> TColStd_HArray1OfReal;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfTransient.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfTransient.hxx
index 0c7ae044df..50893bc8ef 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfTransient.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray1OfTransient.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Transient.hxx>
 #include <TColStd_Array1OfTransient.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColStd_HArray1OfTransient, TColStd_Array1OfTransient)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Standard_Transient)> TColStd_HArray1OfTransient;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfBoolean.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfBoolean.hxx
index a88bdd2993..d9f771fa29 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfBoolean.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfBoolean.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <TColStd_Array2OfBoolean.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColStd_HArray2OfBoolean, TColStd_Array2OfBoolean)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Standard_Boolean> TColStd_HArray2OfBoolean;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfCharacter.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfCharacter.hxx
index 3d2985edce..7061d6e0e4 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfCharacter.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfCharacter.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Character.hxx>
 #include <TColStd_Array2OfCharacter.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColStd_HArray2OfCharacter, TColStd_Array2OfCharacter)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Standard_Character> TColStd_HArray2OfCharacter;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfInteger.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfInteger.hxx
index 4a9f13737a..8689f6ca6c 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfInteger.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfInteger.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Integer.hxx>
 #include <TColStd_Array2OfInteger.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColStd_HArray2OfInteger, TColStd_Array2OfInteger)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Standard_Integer> TColStd_HArray2OfInteger;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfReal.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfReal.hxx
index 8b4007ffdc..9a5a45d375 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfReal.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfReal.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HArray2OfReal_HeaderFile
 
 #include <TColStd_Array2OfReal.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColStd_HArray2OfReal, TColStd_Array2OfReal)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Standard_Real> TColStd_HArray2OfReal;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfTransient.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfTransient.hxx
index 7e5ae821e8..f3d0533944 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfTransient.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HArray2OfTransient.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Transient.hxx>
 #include <TColStd_Array2OfTransient.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColStd_HArray2OfTransient, TColStd_Array2OfTransient)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(Standard_Transient)> TColStd_HArray2OfTransient;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfAsciiString.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfAsciiString.hxx
index 41b29292dd..c6e3cb887c 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfAsciiString.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfAsciiString.hxx
@@ -17,8 +17,6 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfAsciiString, TColStd_SequenceOfAsciiString)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<TCollection_AsciiString> TColStd_HSequenceOfAsciiString;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfExtendedString.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfExtendedString.hxx
index 3d1e63cf6d..c3bbd4e3e2 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfExtendedString.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfExtendedString.hxx
@@ -17,8 +17,6 @@
 
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_SequenceOfExtendedString.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfExtendedString, TColStd_SequenceOfExtendedString)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<TCollection_ExtendedString> TColStd_HSequenceOfExtendedString;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHAsciiString.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHAsciiString.hxx
index 3dee50561c..ce85233f73 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHAsciiString.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHAsciiString.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HSequenceOfHAsciiString_HeaderFile
 
 #include <TColStd_SequenceOfHAsciiString.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfHAsciiString, TColStd_SequenceOfHAsciiString)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(TCollection_HAsciiString)> TColStd_HSequenceOfHAsciiString;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHExtendedString.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHExtendedString.hxx
index 698c24520a..982f920293 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHExtendedString.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfHExtendedString.hxx
@@ -16,8 +16,7 @@
 #define TColStd_HSequenceOfHExtendedString_HeaderFile
 
 #include <TColStd_SequenceOfHExtendedString.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfHExtendedString, TColStd_SequenceOfHExtendedString)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(TCollection_HExtendedString)>
+  TColStd_HSequenceOfHExtendedString;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfInteger.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfInteger.hxx
index dd3cbbc5bb..2f2d038687 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfInteger.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfInteger.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Integer.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfInteger, TColStd_SequenceOfInteger)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Standard_Integer> TColStd_HSequenceOfInteger;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfReal.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfReal.hxx
index e03e27ba0c..f461b6f828 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfReal.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfReal.hxx
@@ -16,8 +16,6 @@
 #define TColStd_HSequenceOfReal_HeaderFile
 
 #include <TColStd_SequenceOfReal.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfReal, TColStd_SequenceOfReal)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Standard_Real> TColStd_HSequenceOfReal;
 #endif
diff --git a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfTransient.hxx b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfTransient.hxx
index 8ace3e1db5..cdbebca5d7 100644
--- a/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfTransient.hxx
+++ b/src/FoundationClasses/TKernel/TColStd/TColStd_HSequenceOfTransient.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_Transient.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColStd_HSequenceOfTransient, TColStd_SequenceOfTransient)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Standard_Transient)> TColStd_HSequenceOfTransient;
 #endif
diff --git a/src/FoundationClasses/TKernel/TKernel_pch.hxx b/src/FoundationClasses/TKernel/TKernel_pch.hxx
index 10d460ba4f..ed5ae6ce95 100644
--- a/src/FoundationClasses/TKernel/TKernel_pch.hxx
+++ b/src/FoundationClasses/TKernel/TKernel_pch.hxx
@@ -62,7 +62,7 @@
 #include <NCollection_BaseAllocator.hxx>
 #include <NCollection_Buffer.hxx>
 #include <NCollection_DataMap.hxx>
-#include <NCollection_DefineHArray1.hxx>
+#include <NCollection_HArray1.hxx>
 #include <NCollection_IndexedDataMap.hxx>
 #include <NCollection_IndexedMap.hxx>
 #include <NCollection_List.hxx>
diff --git a/src/FoundationClasses/TKernel/TShort/TShort_HArray1OfShortReal.hxx b/src/FoundationClasses/TKernel/TShort/TShort_HArray1OfShortReal.hxx
index 0919375e0d..dc5e2d98f8 100644
--- a/src/FoundationClasses/TKernel/TShort/TShort_HArray1OfShortReal.hxx
+++ b/src/FoundationClasses/TKernel/TShort/TShort_HArray1OfShortReal.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_ShortReal.hxx>
 #include <TShort_Array1OfShortReal.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TShort_HArray1OfShortReal, TShort_Array1OfShortReal)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Standard_ShortReal> TShort_HArray1OfShortReal;
 #endif
diff --git a/src/FoundationClasses/TKernel/TShort/TShort_HArray2OfShortReal.hxx b/src/FoundationClasses/TKernel/TShort/TShort_HArray2OfShortReal.hxx
index 682ab4e2bc..5ec9f311e4 100644
--- a/src/FoundationClasses/TKernel/TShort/TShort_HArray2OfShortReal.hxx
+++ b/src/FoundationClasses/TKernel/TShort/TShort_HArray2OfShortReal.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_ShortReal.hxx>
 #include <TShort_Array2OfShortReal.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TShort_HArray2OfShortReal, TShort_Array2OfShortReal)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Standard_ShortReal> TShort_HArray2OfShortReal;
 #endif
diff --git a/src/FoundationClasses/TKernel/TShort/TShort_HSequenceOfShortReal.hxx b/src/FoundationClasses/TKernel/TShort/TShort_HSequenceOfShortReal.hxx
index 12219d9ba6..3a1558d806 100644
--- a/src/FoundationClasses/TKernel/TShort/TShort_HSequenceOfShortReal.hxx
+++ b/src/FoundationClasses/TKernel/TShort/TShort_HSequenceOfShortReal.hxx
@@ -17,8 +17,6 @@
 
 #include <Standard_ShortReal.hxx>
 #include <TShort_SequenceOfShortReal.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TShort_HSequenceOfShortReal, TShort_SequenceOfShortReal)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Standard_ShortReal> TShort_HSequenceOfShortReal;
 #endif
diff --git a/src/FoundationClasses/TKernel/Units/Units_QuantitiesSequence.hxx b/src/FoundationClasses/TKernel/Units/Units_QuantitiesSequence.hxx
index 245add7a2f..e2335e8311 100644
--- a/src/FoundationClasses/TKernel/Units/Units_QuantitiesSequence.hxx
+++ b/src/FoundationClasses/TKernel/Units/Units_QuantitiesSequence.hxx
@@ -18,8 +18,6 @@
 #define Units_QuantitiesSequence_HeaderFile
 
 #include <Units_QtsSequence.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Units_QuantitiesSequence, Units_QtsSequence)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Units_Quantity)> Units_QuantitiesSequence;
 #endif
diff --git a/src/FoundationClasses/TKernel/Units/Units_TokensSequence.hxx b/src/FoundationClasses/TKernel/Units/Units_TokensSequence.hxx
index 011c97d4dd..02abe2400c 100644
--- a/src/FoundationClasses/TKernel/Units/Units_TokensSequence.hxx
+++ b/src/FoundationClasses/TKernel/Units/Units_TokensSequence.hxx
@@ -18,8 +18,6 @@
 #define Units_TokensSequence_HeaderFile
 
 #include <Units_TksSequence.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Units_TokensSequence, Units_TksSequence)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Units_Token)> Units_TokensSequence;
 #endif
diff --git a/src/FoundationClasses/TKernel/Units/Units_UnitsSequence.hxx b/src/FoundationClasses/TKernel/Units/Units_UnitsSequence.hxx
index 57ec516e58..92629942a2 100644
--- a/src/FoundationClasses/TKernel/Units/Units_UnitsSequence.hxx
+++ b/src/FoundationClasses/TKernel/Units/Units_UnitsSequence.hxx
@@ -19,8 +19,6 @@
 
 #include <Units_Unit.hxx>
 #include <Units_UtsSequence.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Units_UnitsSequence, Units_UtsSequence)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Units_Unit)> Units_UnitsSequence;
 #endif
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfLineInter.hxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfLineInter.hxx
index 88f5c9703c..4c3a4ccec7 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfLineInter.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfLineInter.hxx
@@ -18,8 +18,6 @@
 #define TopOpeBRep_HArray1OfLineInter_HeaderFile
 
 #include <TopOpeBRep_Array1OfLineInter.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopOpeBRep_HArray1OfLineInter, TopOpeBRep_Array1OfLineInter)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopOpeBRep_LineInter> TopOpeBRep_HArray1OfLineInter;
 #endif
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfVPointInter.hxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfVPointInter.hxx
index 16cd1be48a..dc24d3adda 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfVPointInter.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_HArray1OfVPointInter.hxx
@@ -18,8 +18,6 @@
 #define TopOpeBRep_HArray1OfVPointInter_HeaderFile
 
 #include <TopOpeBRep_Array1OfVPointInter.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopOpeBRep_HArray1OfVPointInter, TopOpeBRep_Array1OfVPointInter)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopOpeBRep_VPointInter> TopOpeBRep_HArray1OfVPointInter;
 #endif
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference.hxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference.hxx
index 2078324dfe..ef6dad1201 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference.hxx
@@ -18,9 +18,7 @@
 #define TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference_HeaderFile
 
 #include <TopOpeBRepDS_Array1OfDataMapOfIntegerListOfInterference.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference,
-               TopOpeBRepDS_Array1OfDataMapOfIntegerListOfInterference)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopOpeBRepDS_DataMapOfIntegerListOfInterference>
+  TopOpeBRepDS_HArray1OfDataMapOfIntegerListOfInterference;
 #endif
diff --git a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_HData.hxx b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_HData.hxx
index 7ffed73b1c..35078fbc07 100644
--- a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_HData.hxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_HData.hxx
@@ -18,8 +18,6 @@
 #define ChFiDS_HData_HeaderFile
 
 #include <ChFiDS_SequenceOfSurfData.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(ChFiDS_HData, ChFiDS_SequenceOfSurfData)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(ChFiDS_SurfData)> ChFiDS_HData;
 #endif
diff --git a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_SecHArray1.hxx b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_SecHArray1.hxx
index fd30625bfd..ea66cfb9a6 100644
--- a/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_SecHArray1.hxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFiDS/ChFiDS_SecHArray1.hxx
@@ -18,8 +18,6 @@
 #define ChFiDS_SecHArray1_HeaderFile
 
 #include <ChFiDS_SecArray1.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(ChFiDS_SecHArray1, ChFiDS_SecArray1)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<ChFiDS_CircSection> ChFiDS_SecHArray1;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfLocationLaw.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfLocationLaw.hxx
index ea486fb968..288a53e1df 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfLocationLaw.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfLocationLaw.hxx
@@ -18,8 +18,6 @@
 #define GeomFill_HArray1OfLocationLaw_HeaderFile
 
 #include <GeomFill_Array1OfLocationLaw.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomFill_HArray1OfLocationLaw, GeomFill_Array1OfLocationLaw)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(GeomFill_LocationLaw)> GeomFill_HArray1OfLocationLaw;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfSectionLaw.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfSectionLaw.hxx
index 2fd1f678bc..349cfad732 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfSectionLaw.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HArray1OfSectionLaw.hxx
@@ -18,8 +18,6 @@
 #define GeomFill_HArray1OfSectionLaw_HeaderFile
 
 #include <GeomFill_Array1OfSectionLaw.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomFill_HArray1OfSectionLaw, GeomFill_Array1OfSectionLaw)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(GeomFill_SectionLaw)> GeomFill_HArray1OfSectionLaw;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HSequenceOfAx2.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HSequenceOfAx2.hxx
index 3731eda5bf..406ab7c6ff 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HSequenceOfAx2.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_HSequenceOfAx2.hxx
@@ -19,8 +19,6 @@
 
 #include <gp_Ax2.hxx>
 #include <GeomFill_SequenceOfAx2.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(GeomFill_HSequenceOfAx2, GeomFill_SequenceOfAx2)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<gp_Ax2> GeomFill_HSequenceOfAx2;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfHCurve.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfHCurve.hxx
index c13a1ad3e5..153cdbcdbd 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfHCurve.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfHCurve.hxx
@@ -18,8 +18,6 @@
 #define GeomPlate_HArray1OfHCurve_HeaderFile
 
 #include <GeomPlate_Array1OfHCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomPlate_HArray1OfHCurve, GeomPlate_Array1OfHCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Adaptor3d_Curve)> GeomPlate_HArray1OfHCurve;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfSequenceOfReal.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfSequenceOfReal.hxx
index b441c118c4..18cba3b7c5 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfSequenceOfReal.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HArray1OfSequenceOfReal.hxx
@@ -19,8 +19,6 @@
 
 #include <TColStd_SequenceOfReal.hxx>
 #include <GeomPlate_Array1OfSequenceOfReal.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(GeomPlate_HArray1OfSequenceOfReal, GeomPlate_Array1OfSequenceOfReal)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TColStd_SequenceOfReal> GeomPlate_HArray1OfSequenceOfReal;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfCurveConstraint.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfCurveConstraint.hxx
index 17d1375b76..eab63d7406 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfCurveConstraint.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfCurveConstraint.hxx
@@ -19,8 +19,7 @@
 
 #include <GeomPlate_CurveConstraint.hxx>
 #include <GeomPlate_SequenceOfCurveConstraint.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(GeomPlate_HSequenceOfCurveConstraint, GeomPlate_SequenceOfCurveConstraint)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(GeomPlate_CurveConstraint)>
+  GeomPlate_HSequenceOfCurveConstraint;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfPointConstraint.hxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfPointConstraint.hxx
index 6f6f464c74..f9df694260 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfPointConstraint.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_HSequenceOfPointConstraint.hxx
@@ -18,8 +18,7 @@
 #define GeomPlate_HSequenceOfPointConstraint_HeaderFile
 
 #include <GeomPlate_SequenceOfPointConstraint.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(GeomPlate_HSequenceOfPointConstraint, GeomPlate_SequenceOfPointConstraint)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(GeomPlate_PointConstraint)>
+  GeomPlate_HSequenceOfPointConstraint;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/Plate/Plate_HArray1OfPinpointConstraint.hxx b/src/ModelingAlgorithms/TKGeomAlgo/Plate/Plate_HArray1OfPinpointConstraint.hxx
index cdc2220697..48ce6c199b 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/Plate/Plate_HArray1OfPinpointConstraint.hxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/Plate/Plate_HArray1OfPinpointConstraint.hxx
@@ -19,8 +19,6 @@
 
 #include <Plate_PinpointConstraint.hxx>
 #include <Plate_Array1OfPinpointConstraint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Plate_HArray1OfPinpointConstraint, Plate_Array1OfPinpointConstraint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Plate_PinpointConstraint> Plate_HArray1OfPinpointConstraint;
 #endif
diff --git a/src/ModelingAlgorithms/TKHLR/Contap/Contap_TheHSequenceOfPoint.hxx b/src/ModelingAlgorithms/TKHLR/Contap/Contap_TheHSequenceOfPoint.hxx
index c155e9112b..b6b864c11b 100644
--- a/src/ModelingAlgorithms/TKHLR/Contap/Contap_TheHSequenceOfPoint.hxx
+++ b/src/ModelingAlgorithms/TKHLR/Contap/Contap_TheHSequenceOfPoint.hxx
@@ -19,8 +19,6 @@
 
 #include <Contap_Point.hxx>
 #include <Contap_TheSequenceOfPoint.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Contap_TheHSequenceOfPoint, Contap_TheSequenceOfPoint)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Contap_Point> Contap_TheHSequenceOfPoint;
 #endif
diff --git a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx
index bce4083180..c090dcaa2e 100644
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPHDat.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfPHDat_HeaderFile
 
 #include <HLRAlgo_Array1OfPHDat.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfPHDat, HLRAlgo_Array1OfPHDat)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<HLRAlgo_PolyHidingData> HLRAlgo_HArray1OfPHDat;
 #endif
diff --git a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx
index d44cfde3ec..3b8bad583c 100644
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPINod.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfPINod_HeaderFile
 
 #include <HLRAlgo_Array1OfPINod.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfPINod, HLRAlgo_Array1OfPINod)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(HLRAlgo_PolyInternalNode)> HLRAlgo_HArray1OfPINod;
 #endif
diff --git a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx
index ad61ff7422..461fadb274 100644
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfPISeg.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfPISeg_HeaderFile
 
 #include <HLRAlgo_Array1OfPISeg.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfPISeg, HLRAlgo_Array1OfPISeg)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<HLRAlgo_PolyInternalSegment> HLRAlgo_HArray1OfPISeg;
 #endif
diff --git a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfTData.hxx b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfTData.hxx
index 23a2f368f1..d29adeca0f 100644
--- a/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfTData.hxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_HArray1OfTData.hxx
@@ -18,8 +18,6 @@
 #define HLRAlgo_HArray1OfTData_HeaderFile
 
 #include <HLRAlgo_Array1OfTData.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(HLRAlgo_HArray1OfTData, HLRAlgo_Array1OfTData)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<HLRAlgo_TriangleData> HLRAlgo_HArray1OfTData;
 #endif
diff --git a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_HSequenceOfFreeBounds.hxx b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_HSequenceOfFreeBounds.hxx
index 8e31b382f8..c6bd27480d 100644
--- a/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_HSequenceOfFreeBounds.hxx
+++ b/src/ModelingAlgorithms/TKShHealing/ShapeAnalysis/ShapeAnalysis_HSequenceOfFreeBounds.hxx
@@ -18,8 +18,7 @@
 #define ShapeAnalysis_HSequenceOfFreeBounds_HeaderFile
 
 #include <ShapeAnalysis_SequenceOfFreeBounds.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(ShapeAnalysis_HSequenceOfFreeBounds, ShapeAnalysis_SequenceOfFreeBounds)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(ShapeAnalysis_FreeBoundData)>
+  ShapeAnalysis_HSequenceOfFreeBounds;
 #endif
diff --git a/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_HArray1OfCurve.hxx b/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_HArray1OfCurve.hxx
index 28110b2de4..73a04c5a3d 100644
--- a/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_HArray1OfCurve.hxx
+++ b/src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_HArray1OfCurve.hxx
@@ -18,8 +18,6 @@
 #define BRepAdaptor_HArray1OfCurve_HeaderFile
 
 #include <BRepAdaptor_Array1OfCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(BRepAdaptor_HArray1OfCurve, BRepAdaptor_Array1OfCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<BRepAdaptor_Curve> BRepAdaptor_HArray1OfCurve;
 #endif
diff --git a/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfListOfShape.hxx b/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfListOfShape.hxx
index 22b5b3362c..fc695feae1 100644
--- a/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfListOfShape.hxx
+++ b/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfListOfShape.hxx
@@ -18,8 +18,6 @@
 #define TopTools_HArray1OfListOfShape_HeaderFile
 
 #include <TopTools_Array1OfListOfShape.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopTools_HArray1OfListOfShape, TopTools_Array1OfListOfShape)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopTools_ListOfShape> TopTools_HArray1OfListOfShape;
 #endif
diff --git a/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfShape.hxx b/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfShape.hxx
index 4e4b2825ef..8393f1a1b3 100644
--- a/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfShape.hxx
+++ b/src/ModelingData/TKBRep/TopTools/TopTools_HArray1OfShape.hxx
@@ -19,8 +19,6 @@
 
 #include <TopoDS_Shape.hxx>
 #include <TopTools_Array1OfShape.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TopTools_HArray1OfShape, TopTools_Array1OfShape)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TopoDS_Shape> TopTools_HArray1OfShape;
 #endif
diff --git a/src/ModelingData/TKBRep/TopTools/TopTools_HArray2OfShape.hxx b/src/ModelingData/TKBRep/TopTools/TopTools_HArray2OfShape.hxx
index 4b399957af..5b6a2cd9e8 100644
--- a/src/ModelingData/TKBRep/TopTools/TopTools_HArray2OfShape.hxx
+++ b/src/ModelingData/TKBRep/TopTools/TopTools_HArray2OfShape.hxx
@@ -19,8 +19,6 @@
 
 #include <TopoDS_Shape.hxx>
 #include <TopTools_Array2OfShape.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TopTools_HArray2OfShape, TopTools_Array2OfShape)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<TopoDS_Shape> TopTools_HArray2OfShape;
 #endif
diff --git a/src/ModelingData/TKBRep/TopTools/TopTools_HSequenceOfShape.hxx b/src/ModelingData/TKBRep/TopTools/TopTools_HSequenceOfShape.hxx
index 6b815acb16..c6f7f7b134 100644
--- a/src/ModelingData/TKBRep/TopTools/TopTools_HSequenceOfShape.hxx
+++ b/src/ModelingData/TKBRep/TopTools/TopTools_HSequenceOfShape.hxx
@@ -19,8 +19,6 @@
 
 #include <TopoDS_Shape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TopTools_HSequenceOfShape, TopTools_SequenceOfShape)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<TopoDS_Shape> TopTools_HSequenceOfShape;
 #endif
diff --git a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBSplineCurve.hxx b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBSplineCurve.hxx
index 2e135d8521..94de89b5f2 100644
--- a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBSplineCurve.hxx
+++ b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBSplineCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <Geom2d_BSplineCurve.hxx>
 #include <TColGeom2d_Array1OfBSplineCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom2d_HArray1OfBSplineCurve, TColGeom2d_Array1OfBSplineCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom2d_BSplineCurve)> TColGeom2d_HArray1OfBSplineCurve;
 #endif
diff --git a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBezierCurve.hxx b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBezierCurve.hxx
index d5cbcc4848..9486aa413f 100644
--- a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBezierCurve.hxx
+++ b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfBezierCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <Geom2d_BezierCurve.hxx>
 #include <TColGeom2d_Array1OfBezierCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom2d_HArray1OfBezierCurve, TColGeom2d_Array1OfBezierCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom2d_BezierCurve)> TColGeom2d_HArray1OfBezierCurve;
 #endif
diff --git a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfCurve.hxx b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfCurve.hxx
index 4e2d5e35c5..334ceb8c63 100644
--- a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfCurve.hxx
+++ b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HArray1OfCurve.hxx
@@ -18,8 +18,6 @@
 #define TColGeom2d_HArray1OfCurve_HeaderFile
 
 #include <TColGeom2d_Array1OfCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom2d_HArray1OfCurve, TColGeom2d_Array1OfCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom2d_Curve)> TColGeom2d_HArray1OfCurve;
 #endif
diff --git a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfBoundedCurve.hxx b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfBoundedCurve.hxx
index 1b410c6bf8..9ff56a0f59 100644
--- a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfBoundedCurve.hxx
+++ b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfBoundedCurve.hxx
@@ -18,8 +18,6 @@
 #define TColGeom2d_HSequenceOfBoundedCurve_HeaderFile
 
 #include <TColGeom2d_SequenceOfBoundedCurve.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColGeom2d_HSequenceOfBoundedCurve, TColGeom2d_SequenceOfBoundedCurve)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Geom2d_BoundedCurve)> TColGeom2d_HSequenceOfBoundedCurve;
 #endif
diff --git a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfCurve.hxx b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfCurve.hxx
index ec497e0604..5117b8e001 100644
--- a/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfCurve.hxx
+++ b/src/ModelingData/TKG2d/TColGeom2d/TColGeom2d_HSequenceOfCurve.hxx
@@ -18,8 +18,6 @@
 #define TColGeom2d_HSequenceOfCurve_HeaderFile
 
 #include <TColGeom2d_SequenceOfCurve.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColGeom2d_HSequenceOfCurve, TColGeom2d_SequenceOfCurve)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Geom2d_Curve)> TColGeom2d_HSequenceOfCurve;
 #endif
diff --git a/src/ModelingData/TKG3d/Geom/Geom_HSequenceOfBSplineSurface.hxx b/src/ModelingData/TKG3d/Geom/Geom_HSequenceOfBSplineSurface.hxx
index bf2bdbdeb2..b3bab02a31 100644
--- a/src/ModelingData/TKG3d/Geom/Geom_HSequenceOfBSplineSurface.hxx
+++ b/src/ModelingData/TKG3d/Geom/Geom_HSequenceOfBSplineSurface.hxx
@@ -18,8 +18,6 @@
 #define Geom_HSequenceOfBSplineSurface_HeaderFile
 
 #include <Geom_SequenceOfBSplineSurface.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(Geom_HSequenceOfBSplineSurface, Geom_SequenceOfBSplineSurface)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Geom_BSplineSurface)> Geom_HSequenceOfBSplineSurface;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBSplineCurve.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBSplineCurve.hxx
index d3e10d8510..ab11640466 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBSplineCurve.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBSplineCurve.hxx
@@ -18,8 +18,6 @@
 #define TColGeom_HArray1OfBSplineCurve_HeaderFile
 
 #include <TColGeom_Array1OfBSplineCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom_HArray1OfBSplineCurve, TColGeom_Array1OfBSplineCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom_BSplineCurve)> TColGeom_HArray1OfBSplineCurve;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBezierCurve.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBezierCurve.hxx
index dab7833899..018a5ab999 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBezierCurve.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfBezierCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <Geom_BezierCurve.hxx>
 #include <TColGeom_Array1OfBezierCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom_HArray1OfBezierCurve, TColGeom_Array1OfBezierCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom_BezierCurve)> TColGeom_HArray1OfBezierCurve;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfCurve.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfCurve.hxx
index 94f84403a2..330d2ba25c 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfCurve.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfCurve.hxx
@@ -18,8 +18,6 @@
 #define TColGeom_HArray1OfCurve_HeaderFile
 
 #include <TColGeom_Array1OfCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom_HArray1OfCurve, TColGeom_Array1OfCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom_Curve)> TColGeom_HArray1OfCurve;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfSurface.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfSurface.hxx
index 0445625934..39d7a55681 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfSurface.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray1OfSurface.hxx
@@ -18,8 +18,6 @@
 #define TColGeom_HArray1OfSurface_HeaderFile
 
 #include <TColGeom_Array1OfSurface.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(TColGeom_HArray1OfSurface, TColGeom_Array1OfSurface)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Geom_Surface)> TColGeom_HArray1OfSurface;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray2OfSurface.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray2OfSurface.hxx
index b23ba76a73..7c41159414 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray2OfSurface.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HArray2OfSurface.hxx
@@ -18,8 +18,6 @@
 #define TColGeom_HArray2OfSurface_HeaderFile
 
 #include <TColGeom_Array2OfSurface.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(TColGeom_HArray2OfSurface, TColGeom_Array2OfSurface)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(Geom_Surface)> TColGeom_HArray2OfSurface;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfBoundedCurve.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfBoundedCurve.hxx
index 6a02aa8a7e..8279b2ac27 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfBoundedCurve.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfBoundedCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <Geom_BoundedCurve.hxx>
 #include <TColGeom_SequenceOfBoundedCurve.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColGeom_HSequenceOfBoundedCurve, TColGeom_SequenceOfBoundedCurve)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Geom_BoundedCurve)> TColGeom_HSequenceOfBoundedCurve;
 #endif
diff --git a/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfCurve.hxx b/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfCurve.hxx
index ca2b495174..893f894986 100644
--- a/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfCurve.hxx
+++ b/src/ModelingData/TKG3d/TColGeom/TColGeom_HSequenceOfCurve.hxx
@@ -18,8 +18,6 @@
 #define TColGeom_HSequenceOfCurve_HeaderFile
 
 #include <TColGeom_SequenceOfCurve.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(TColGeom_HSequenceOfCurve, TColGeom_SequenceOfCurve)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(Geom_Curve)> TColGeom_HSequenceOfCurve;
 #endif
diff --git a/src/ModelingData/TKGeomBase/AppDef/AppDef_HArray1OfMultiPointConstraint.hxx b/src/ModelingData/TKGeomBase/AppDef/AppDef_HArray1OfMultiPointConstraint.hxx
index e8582620f8..d954d286c1 100644
--- a/src/ModelingData/TKGeomBase/AppDef/AppDef_HArray1OfMultiPointConstraint.hxx
+++ b/src/ModelingData/TKGeomBase/AppDef/AppDef_HArray1OfMultiPointConstraint.hxx
@@ -19,8 +19,6 @@
 
 #include <AppDef_MultiPointConstraint.hxx>
 #include <AppDef_Array1OfMultiPointConstraint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(AppDef_HArray1OfMultiPointConstraint, AppDef_Array1OfMultiPointConstraint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<AppDef_MultiPointConstraint> AppDef_HArray1OfMultiPointConstraint;
 #endif
diff --git a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx
index 7e9f971f39..92583ecf0c 100644
--- a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx
+++ b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx
@@ -18,8 +18,6 @@
 #define AppParCurves_HArray1OfConstraintCouple_HeaderFile
 
 #include <AppParCurves_Array1OfConstraintCouple.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(AppParCurves_HArray1OfConstraintCouple, AppParCurves_Array1OfConstraintCouple)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<AppParCurves_ConstraintCouple> AppParCurves_HArray1OfConstraintCouple;
 #endif
diff --git a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiBSpCurve.hxx b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiBSpCurve.hxx
index cac25aec2b..88158e3108 100644
--- a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiBSpCurve.hxx
+++ b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiBSpCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <AppParCurves_Array1OfMultiBSpCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(AppParCurves_HArray1OfMultiBSpCurve, AppParCurves_Array1OfMultiBSpCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<AppParCurves_MultiBSpCurve> AppParCurves_HArray1OfMultiBSpCurve;
 #endif
diff --git a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiCurve.hxx b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiCurve.hxx
index 2a7eedfea0..1b67dd4e03 100644
--- a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiCurve.hxx
+++ b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiCurve.hxx
@@ -19,8 +19,6 @@
 
 #include <AppParCurves_MultiCurve.hxx>
 #include <AppParCurves_Array1OfMultiCurve.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(AppParCurves_HArray1OfMultiCurve, AppParCurves_Array1OfMultiCurve)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<AppParCurves_MultiCurve> AppParCurves_HArray1OfMultiCurve;
 #endif
diff --git a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiPoint.hxx b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiPoint.hxx
index 5896d775a3..055d842fea 100644
--- a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiPoint.hxx
+++ b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_HArray1OfMultiPoint.hxx
@@ -19,8 +19,6 @@
 
 #include <AppParCurves_MultiPoint.hxx>
 #include <AppParCurves_Array1OfMultiPoint.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(AppParCurves_HArray1OfMultiPoint, AppParCurves_Array1OfMultiPoint)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<AppParCurves_MultiPoint> AppParCurves_HArray1OfMultiPoint;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfAdHSurface.hxx b/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfAdHSurface.hxx
index 6f557ea622..ad4235f50b 100644
--- a/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfAdHSurface.hxx
+++ b/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfAdHSurface.hxx
@@ -19,8 +19,6 @@
 
 #include <Adaptor3d_Surface.hxx>
 #include <Approx_Array1OfAdHSurface.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Approx_HArray1OfAdHSurface, Approx_Array1OfAdHSurface)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Handle(Adaptor3d_Surface)> Approx_HArray1OfAdHSurface;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfGTrsf2d.hxx b/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfGTrsf2d.hxx
index b058153157..fd9213f324 100644
--- a/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfGTrsf2d.hxx
+++ b/src/ModelingData/TKGeomBase/Approx/Approx_HArray1OfGTrsf2d.hxx
@@ -18,8 +18,6 @@
 #define Approx_HArray1OfGTrsf2d_HeaderFile
 
 #include <Approx_Array1OfGTrsf2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Approx_HArray1OfGTrsf2d, Approx_Array1OfGTrsf2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<gp_GTrsf2d> Approx_HArray1OfGTrsf2d;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv.hxx b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv.hxx
index 313cc336eb..aeab2eb380 100644
--- a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv.hxx
+++ b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv.hxx
@@ -18,8 +18,6 @@
 #define Extrema_HArray1OfPOnCurv_HeaderFile
 
 #include <Extrema_Array1OfPOnCurv.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Extrema_HArray1OfPOnCurv, Extrema_Array1OfPOnCurv)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Extrema_POnCurv> Extrema_HArray1OfPOnCurv;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv2d.hxx b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv2d.hxx
index a268f309da..ae37e6bf05 100644
--- a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv2d.hxx
+++ b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnCurv2d.hxx
@@ -19,8 +19,6 @@
 
 #include <Extrema_POnCurv2d.hxx>
 #include <Extrema_Array1OfPOnCurv2d.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Extrema_HArray1OfPOnCurv2d, Extrema_Array1OfPOnCurv2d)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Extrema_POnCurv2d> Extrema_HArray1OfPOnCurv2d;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnSurf.hxx b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnSurf.hxx
index d183f9dd68..5ff642439c 100644
--- a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnSurf.hxx
+++ b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray1OfPOnSurf.hxx
@@ -18,8 +18,6 @@
 #define Extrema_HArray1OfPOnSurf_HeaderFile
 
 #include <Extrema_Array1OfPOnSurf.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(Extrema_HArray1OfPOnSurf, Extrema_Array1OfPOnSurf)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<Extrema_POnSurf> Extrema_HArray1OfPOnSurf;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv.hxx b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv.hxx
index b607595389..7ea43b8a8e 100644
--- a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv.hxx
+++ b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv.hxx
@@ -19,8 +19,6 @@
 
 #include <Extrema_POnCurv.hxx>
 #include <Extrema_Array2OfPOnCurv.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(Extrema_HArray2OfPOnCurv, Extrema_Array2OfPOnCurv)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Extrema_POnCurv> Extrema_HArray2OfPOnCurv;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv2d.hxx b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv2d.hxx
index 7139657e28..7629065492 100644
--- a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv2d.hxx
+++ b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnCurv2d.hxx
@@ -19,8 +19,6 @@
 
 #include <Extrema_POnCurv2d.hxx>
 #include <Extrema_Array2OfPOnCurv2d.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(Extrema_HArray2OfPOnCurv2d, Extrema_Array2OfPOnCurv2d)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Extrema_POnCurv2d> Extrema_HArray2OfPOnCurv2d;
 #endif
diff --git a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnSurf.hxx b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnSurf.hxx
index 7a1f91983e..706e9c5626 100644
--- a/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnSurf.hxx
+++ b/src/ModelingData/TKGeomBase/Extrema/Extrema_HArray2OfPOnSurf.hxx
@@ -19,8 +19,6 @@
 
 #include <Extrema_POnSurf.hxx>
 #include <Extrema_Array2OfPOnSurf.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(Extrema_HArray2OfPOnSurf, Extrema_Array2OfPOnSurf)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Extrema_POnSurf> Extrema_HArray2OfPOnSurf;
 #endif
diff --git a/src/ModelingData/TKGeomBase/FEmTool/FEmTool_HAssemblyTable.hxx b/src/ModelingData/TKGeomBase/FEmTool/FEmTool_HAssemblyTable.hxx
index 41be440b76..231d80b967 100644
--- a/src/ModelingData/TKGeomBase/FEmTool/FEmTool_HAssemblyTable.hxx
+++ b/src/ModelingData/TKGeomBase/FEmTool/FEmTool_HAssemblyTable.hxx
@@ -19,8 +19,6 @@
 
 #include <TColStd_HArray1OfInteger.hxx>
 #include <FEmTool_AssemblyTable.hxx>
-#include <NCollection_DefineHArray2.hxx>
-
-DEFINE_HARRAY2(FEmTool_HAssemblyTable, FEmTool_AssemblyTable)
-
+#include <NCollection_HArray2.hxx>
+typedef NCollection_HArray2<Handle(TColStd_HArray1OfInteger)> FEmTool_HAssemblyTable;
 #endif
diff --git a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_HSequenceOfHSequenceOfPnt.hxx b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_HSequenceOfHSequenceOfPnt.hxx
index 149dbc37bb..7476e86704 100644
--- a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_HSequenceOfHSequenceOfPnt.hxx
+++ b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_HSequenceOfHSequenceOfPnt.hxx
@@ -18,8 +18,6 @@
 #define ProjLib_HSequenceOfHSequenceOfPnt_HeaderFile
 
 #include <ProjLib_SequenceOfHSequenceOfPnt.hxx>
-#include <NCollection_DefineHSequence.hxx>
-
-DEFINE_HSEQUENCE(ProjLib_HSequenceOfHSequenceOfPnt, ProjLib_SequenceOfHSequenceOfPnt)
-
+#include <NCollection_HSequence.hxx>
+typedef NCollection_HSequence<Handle(TColgp_HSequenceOfPnt)> ProjLib_HSequenceOfHSequenceOfPnt;
 #endif
diff --git a/src/Visualization/TKMeshVS/MeshVS/MeshVS_HArray1OfSequenceOfInteger.hxx b/src/Visualization/TKMeshVS/MeshVS/MeshVS_HArray1OfSequenceOfInteger.hxx
index 8edfda05d1..d892380ff2 100644
--- a/src/Visualization/TKMeshVS/MeshVS/MeshVS_HArray1OfSequenceOfInteger.hxx
+++ b/src/Visualization/TKMeshVS/MeshVS/MeshVS_HArray1OfSequenceOfInteger.hxx
@@ -17,8 +17,6 @@
 #define MeshVS_HArray1OfSequenceOfInteger_HeaderFile
 
 #include <MeshVS_Array1OfSequenceOfInteger.hxx>
-#include <NCollection_DefineHArray1.hxx>
-
-DEFINE_HARRAY1(MeshVS_HArray1OfSequenceOfInteger, MeshVS_Array1OfSequenceOfInteger)
-
+#include <NCollection_HArray1.hxx>
+typedef NCollection_HArray1<TColStd_SequenceOfInteger> MeshVS_HArray1OfSequenceOfInteger;
 #endif
diff --git a/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx b/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx
index df9e2674e6..9a274d752f 100644
--- a/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx
+++ b/src/Visualization/TKV3d/AIS/AIS_Manipulator.cxx
@@ -42,8 +42,6 @@
 IMPLEMENT_STANDARD_HANDLE(AIS_Manipulator, AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Manipulator, AIS_InteractiveObject)
 
-IMPLEMENT_HSEQUENCE(AIS_ManipulatorObjectSequence)
-
 namespace
 {
 //! Return Ax1 for specified direction of Ax2.
diff --git a/src/Visualization/TKV3d/AIS/AIS_Manipulator.hxx b/src/Visualization/TKV3d/AIS/AIS_Manipulator.hxx
index 3aef54c574..b7314259f1 100644
--- a/src/Visualization/TKV3d/AIS/AIS_Manipulator.hxx
+++ b/src/Visualization/TKV3d/AIS/AIS_Manipulator.hxx
@@ -28,7 +28,7 @@
 #include <V3d_View.hxx>
 #include <Standard_DefineHandle.hxx>
 
-NCOLLECTION_HSEQUENCE(AIS_ManipulatorObjectSequence, Handle(AIS_InteractiveObject))
+typedef NCollection_HSequence<Handle(AIS_InteractiveObject)> AIS_ManipulatorObjectSequence;
 
 DEFINE_STANDARD_HANDLE(AIS_Manipulator, AIS_InteractiveObject)