From: Pasukhin Dmitry <dpasukhi@opencascade.com>
Date: Wed, 8 Oct 2025 17:04:28 +0000 (+0100)
Subject: Coding - Remove duplicate and self-referencing include directives (#739)
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=775454b75a1ef53d3710fab1ecbbffd522262eb0;p=occt.git

Coding - Remove duplicate and self-referencing include directives (#739)

- Removal of self-referencing includes where files include themselves
- Elimination of duplicate include statements within the same file
- Cleanup of redundant includes in conditional compilation blocks
- Adding CI validation for validation PRs
---

diff --git a/.github/actions/clang-format-check/action.yml b/.github/actions/clang-format-check/action.yml
index ae6e94e372..bc90f88ba0 100644
--- a/.github/actions/clang-format-check/action.yml
+++ b/.github/actions/clang-format-check/action.yml
@@ -56,6 +56,24 @@ runs:
           clang-format -i -style=file $_
         }
 
+    - name: Clean up duplicate includes
+      if: steps.changed-files.outputs.has_files == 'true'
+      shell: pwsh
+      run: |
+        $files = Get-Content "changed_files.txt" | Where-Object { Test-Path $_ }
+        $files | ForEach-Object {
+          python3 .github/actions/scripts/cleanup-includes.py --files "$_"
+        }
+
+    - name: Re-run clang-format after include cleanup
+      if: steps.changed-files.outputs.has_files == 'true'
+      shell: pwsh
+      run: |
+        $files = Get-Content "changed_files.txt" | Where-Object { Test-Path $_ }
+        $files | ForEach-Object -ThrottleLimit 8 -Parallel {
+          clang-format -i -style=file $_
+        }
+
     - name: Remove empty lines after Standard_DEPRECATED
       if: steps.changed-files.outputs.has_files == 'true'
       shell: pwsh
diff --git a/.github/actions/scripts/cleanup-includes.py b/.github/actions/scripts/cleanup-includes.py
new file mode 100644
index 0000000000..accf2a863d
--- /dev/null
+++ b/.github/actions/scripts/cleanup-includes.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+"""
+Script to clean up duplicate #include directives and self-includes in C++ source files.
+Removes:
+1. Duplicate #include statements (keeps only the first occurrence)
+2. Self-includes (e.g., Foo.hxx including "Foo.hxx")
+
+Processes: .cxx, .hxx, .pxx, .lxx, .gxx files
+"""
+
+import os
+import re
+from pathlib import Path
+from typing import List, Tuple
+
+
+def get_filename_without_extension(filepath: str) -> str:
+    """Get the filename without extension."""
+    return Path(filepath).stem
+
+
+def process_file(filepath: str, dry_run: bool = False) -> Tuple[bool, int, bool]:
+    """
+    Process a single file to remove duplicate includes and self-includes.
+
+    Returns:
+        Tuple of (modified, num_duplicates_removed, had_self_include)
+    """
+    try:
+        with open(filepath, 'r', encoding='utf-8', errors='ignore') as f:
+            lines = f.readlines()
+    except Exception as e:
+        print(f"Error reading {filepath}: {e}")
+        return False, 0, False
+
+    # Pattern to match #include directives and preprocessor directives
+    include_pattern = re.compile(r'^\s*#\s*include\s+[<"]([^>"]+)[>"]')
+    preprocessor_pattern = re.compile(r'^\s*#\s*(if|ifdef|ifndef|elif|else|endif)')
+
+    ifdef_stack = [set()]  # Stack of tuples: (parent_scope_includes, current_branch_includes)
+    new_lines = []
+    duplicates_removed = 0
+    had_self_include = False
+    in_block_comment = False
+
+    base_filename = get_filename_without_extension(filepath)
+    file_extension = Path(filepath).suffix
+
+    for line in lines:
+        # Track multi-line comments
+        if '/*' in line:
+            in_block_comment = True
+        if '*/' in line:
+            in_block_comment = False
+            new_lines.append(line)
+            continue
+
+        # Skip lines in block comments or single-line comments
+        stripped = line.lstrip()
+        if in_block_comment or stripped.startswith('//'):
+            new_lines.append(line)
+            continue
+
+        # Track preprocessor scope changes
+        prep_match = preprocessor_pattern.match(line)
+        if prep_match:
+            directive = prep_match.group(1)
+            if directive in ('if', 'ifdef', 'ifndef'):
+                # Start new scope, inheriting parent scope's includes
+                parent_includes = ifdef_stack[-1].copy() if ifdef_stack else set()
+                ifdef_stack.append(parent_includes)
+            elif directive == 'endif':
+                # End scope
+                if len(ifdef_stack) > 1:
+                    ifdef_stack.pop()
+            elif directive in ('elif', 'else'):
+                # Alternative branches - reset to empty scope (don't inherit sibling branch)
+                # Only keep includes from before the entire #if block started
+                if len(ifdef_stack) > 1:
+                    # Get the scope from before this #if block (grandparent)
+                    grandparent_includes = ifdef_stack[-2].copy() if len(ifdef_stack) > 1 else set()
+                    ifdef_stack[-1] = grandparent_includes
+                else:
+                    ifdef_stack[-1] = set()
+            new_lines.append(line)
+            continue
+
+        match = include_pattern.match(line)
+
+        if match:
+            included_file = match.group(1)
+
+            # Skip malformed includes (e.g., empty or just extension)
+            if not included_file or included_file.startswith('.') or len(included_file) <= 4:
+                new_lines.append(line)
+                continue
+
+            included_basename = Path(included_file).stem
+            included_extension = Path(included_file).suffix
+
+            # Skip .gxx includes from duplicate checking
+            if included_extension == '.gxx':
+                new_lines.append(line)
+                continue
+
+            # Check for self-include (same name AND same extension)
+            if included_basename == base_filename and included_extension == file_extension:
+                had_self_include = True
+                print(f"  Removing self-include: {line.strip()}")
+                continue
+
+            # Check for duplicate only in current scope
+            current_scope = ifdef_stack[-1]
+            if included_file in current_scope:
+                duplicates_removed += 1
+                print(f"  Removing duplicate: {line.strip()}")
+                continue
+
+            current_scope.add(included_file)
+
+        new_lines.append(line)
+
+    # Check if file was modified
+    modified = (len(new_lines) != len(lines))
+
+    if modified and not dry_run:
+        try:
+            with open(filepath, 'w', encoding='utf-8') as f:
+                f.writelines(new_lines)
+        except Exception as e:
+            print(f"Error writing {filepath}: {e}")
+            return False, 0, False
+
+    return modified, duplicates_removed, had_self_include
+
+
+def find_files(root_dir: str, extensions: List[str]) -> List[str]:
+    """Find all files with specified extensions in the directory tree."""
+    files = []
+    for ext in extensions:
+        files.extend(Path(root_dir).rglob(f"*{ext}"))
+    return [str(f) for f in files]
+
+
+def main():
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        description='Clean up duplicate #include directives and self-includes in C++ files'
+    )
+    parser.add_argument(
+        'path',
+        nargs='?',
+        default='src',
+        help='Root directory to process (default: src)'
+    )
+    parser.add_argument(
+        '--dry-run',
+        action='store_true',
+        help='Show what would be changed without modifying files'
+    )
+    parser.add_argument(
+        '--extensions',
+        nargs='+',
+        default=['.cxx', '.hxx', '.pxx', '.lxx', '.gxx'],
+        help='File extensions to process (default: .cxx .hxx .pxx .lxx .gxx)'
+    )
+    parser.add_argument(
+        '--files',
+        nargs='+',
+        help='Specific files to process (overrides path scanning)'
+    )
+
+    args = parser.parse_args()
+
+    if args.files:
+        # Process specific files (single file mode - minimal output)
+        files = [os.path.abspath(f) for f in args.files if os.path.isfile(f)]
+    else:
+        # Scan directory (batch mode - verbose output)
+        root_dir = os.path.abspath(args.path)
+
+        if not os.path.isdir(root_dir):
+            print(f"Error: {root_dir} is not a directory")
+            return 1
+
+        print(f"Scanning for files in: {root_dir}")
+        print(f"Extensions: {', '.join(args.extensions)}")
+        files = find_files(root_dir, args.extensions)
+        print(f"Found {len(files)} files to process")
+
+    if args.dry_run:
+        print("DRY RUN MODE - No files will be modified\n")
+
+    total_modified = 0
+    total_duplicates = 0
+    total_self_includes = 0
+    single_file_mode = len(files) == 1
+
+    for filepath in sorted(files):
+        modified, duplicates, self_include = process_file(filepath, args.dry_run)
+
+        if modified:
+            total_modified += 1
+            total_duplicates += duplicates
+            if self_include:
+                total_self_includes += 1
+
+            if not single_file_mode:
+                print(f"Modified: {filepath}")
+                if duplicates > 0:
+                    print(f"  - Removed {duplicates} duplicate include(s)")
+                if self_include:
+                    print(f"  - Removed self-include")
+                print()
+
+    # Only show summary in batch mode
+    if not single_file_mode:
+        print("\n" + "="*70)
+        print("SUMMARY")
+        print("="*70)
+        print(f"Files processed: {len(files)}")
+        print(f"Files modified: {total_modified}")
+        print(f"Duplicate includes removed: {total_duplicates}")
+        print(f"Files with self-includes fixed: {total_self_includes}")
+
+        if args.dry_run:
+            print("\nThis was a dry run. Use without --dry-run to apply changes.")
+
+    return 0
+
+
+if __name__ == '__main__':
+    exit(main())
diff --git a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx
index 9c271ee2ad..e5383c3dd7 100644
--- a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx
+++ b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Name.cxx
@@ -67,12 +67,9 @@
 #endif
 #ifdef OCCT_DEBUG
   #include <TCollection_AsciiString.hxx>
-  #include <TDF_Tool.hxx>
-  #include <BRepTools.hxx>
 #endif
 #ifdef OCCT_DEBUG
   #include <TCollection_AsciiString.hxx>
-  #include <TDF_Tool.hxx>
   #include <TDF_ChildIterator.hxx>
   #include <TDF_MapIteratorOfLabelMap.hxx>
 
diff --git a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx
index ed5bb87341..2826d7beb1 100644
--- a/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx
+++ b/src/ApplicationFramework/TKCAF/TNaming/TNaming_Naming.cxx
@@ -78,13 +78,6 @@ typedef TNaming_DataMapOfShapeMapOfShape::Iterator
   #include <TDF_MapIteratorOfLabelMap.hxx>
   #include <TCollection_AsciiString.hxx>
   #include <TDF_Tool.hxx>
-  #include <BRepTools.hxx>
-  #include <TNaming_Tool.hxx>
-  #include <TDF_Tool.hxx>
-  #include <TDF_MapIteratorOfLabelMap.hxx>
-
-  #include <TCollection_AsciiString.hxx>
-  #include <BRepTools.hxx>
 
 void Print_Entry(const TDF_Label& label)
 {
diff --git a/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeDoubleMap.hxx b/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeDoubleMap.hxx
index ea13c8eafb..ef00216a16 100644
--- a/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeDoubleMap.hxx
+++ b/src/ApplicationFramework/TKLCAF/TDF/TDF_AttributeDoubleMap.hxx
@@ -16,7 +16,6 @@
 #ifndef TDF_AttributeDoubleMap_HeaderFile
 #define TDF_AttributeDoubleMap_HeaderFile
 
-#include <TDF_Attribute.hxx>
 #include <TDF_Attribute.hxx>
 #include <NCollection_DoubleMap.hxx>
 
diff --git a/src/DataExchange/TKDEIGES/IGESData/IGESData_FileRecognizer_0.cxx b/src/DataExchange/TKDEIGES/IGESData/IGESData_FileRecognizer_0.cxx
index 58396bda6f..8f850e8550 100644
--- a/src/DataExchange/TKDEIGES/IGESData/IGESData_FileRecognizer_0.cxx
+++ b/src/DataExchange/TKDEIGES/IGESData/IGESData_FileRecognizer_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <IGESData_IGESEntity.hxx>
-#include <IGESData_FileRecognizer.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <IGESData_IGESType.hxx>
 
diff --git a/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx b/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx
index aa6f4c491e..341466ee99 100644
--- a/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx
+++ b/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx
@@ -20,7 +20,6 @@
 
 #include <IGESData_SpecificModule.hxx>
 #include <IGESData_Protocol.hxx>
-#include <IGESData_GlobalNodeOfSpecificLib.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <IGESData_SpecificLib.hxx>
 #include <IGESData_NodeOfSpecificLib.hxx>
diff --git a/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx b/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx
index a5d9d2f28d..919abf863a 100644
--- a/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx
+++ b/src/DataExchange/TKDEIGES/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx
@@ -20,7 +20,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <IGESData_Protocol.hxx>
-#include <IGESData_GlobalNodeOfWriterLib.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <IGESData_WriterLib.hxx>
 #include <IGESData_NodeOfWriterLib.hxx>
diff --git a/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfSpecificLib_0.cxx b/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfSpecificLib_0.cxx
index 0df198638d..807b7a4e7d 100644
--- a/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfSpecificLib_0.cxx
+++ b/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfSpecificLib_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <IGESData_GlobalNodeOfSpecificLib.hxx>
-#include <IGESData_NodeOfSpecificLib.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <IGESData_SpecificModule.hxx>
 #include <IGESData_Protocol.hxx>
diff --git a/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfWriterLib_0.cxx b/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfWriterLib_0.cxx
index 7eec3e2ad3..be545f1e3d 100644
--- a/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfWriterLib_0.cxx
+++ b/src/DataExchange/TKDEIGES/IGESData/IGESData_NodeOfWriterLib_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <IGESData_GlobalNodeOfWriterLib.hxx>
-#include <IGESData_NodeOfWriterLib.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <IGESData_ReadWriteModule.hxx>
 #include <IGESData_Protocol.hxx>
diff --git a/src/DataExchange/TKDESTEP/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/DataExchange/TKDESTEP/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
index 28c6f18f98..12b858c25b 100644
--- a/src/DataExchange/TKDESTEP/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
+++ b/src/DataExchange/TKDESTEP/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
@@ -1270,10 +1270,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule, StepData_ReadWriteModule
 #include <StepDimTol_CommonDatum.hxx>
 #include <StepDimTol_DatumTarget.hxx>
 #include <StepDimTol_PlacedDatumTargetFeature.hxx>
-#include <StepRepr_ValueRange.hxx>
-#include <StepRepr_CompositeShapeAspect.hxx>
-#include <StepRepr_DerivedShapeAspect.hxx>
-#include <StepRepr_Extension.hxx>
 #include "../RWStepRepr/RWStepRepr_RWCompositeShapeAspect.pxx"
 #include "../RWStepRepr/RWStepRepr_RWDerivedShapeAspect.pxx"
 #include "../RWStepRepr/RWStepRepr_RWExtension.pxx"
diff --git a/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx b/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx
index d8b880adee..9b733b46ed 100644
--- a/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx
+++ b/src/DataExchange/TKDESTEP/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cxx
@@ -35,8 +35,6 @@ void RWStepVisual_RWPresentationLayerUsage::ReadStep(
     return;
 
   // --- own fields
-#include <StepVisual_PresentationLayerAssignment.hxx>
-#include <StepVisual_PresentationRepresentation.hxx>
   Handle(StepVisual_PresentationLayerAssignment) pla;
   Handle(StepVisual_PresentationRepresentation)  pr;
 
diff --git a/src/DataExchange/TKDESTEP/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/DataExchange/TKDESTEP/STEPCAFControl/STEPCAFControl_Reader.cxx
index e245492cbb..52e992b6fa 100644
--- a/src/DataExchange/TKDESTEP/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/DataExchange/TKDESTEP/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -239,8 +239,6 @@
 #include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 
-#include <StepRepr_ShapeAspectRelationship.hxx>
-
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <Transfer_ActorOfTransientProcess.hxx>
diff --git a/src/DataExchange/TKDESTEP/STEPConstruct/STEPConstruct_Styles.cxx b/src/DataExchange/TKDESTEP/STEPConstruct/STEPConstruct_Styles.cxx
index 21b36bfe9a..ea906bae42 100644
--- a/src/DataExchange/TKDESTEP/STEPConstruct/STEPConstruct_Styles.cxx
+++ b/src/DataExchange/TKDESTEP/STEPConstruct/STEPConstruct_Styles.cxx
@@ -67,7 +67,6 @@
 #include <XSControl_TransferWriter.hxx>
 #include <XSControl_WorkSession.hxx>
 #include <StepVisual_ContextDependentOverRidingStyledItem.hxx>
-#include <StepShape_ShapeRepresentation.hxx>
 
 namespace
 {
diff --git a/src/DataExchange/TKDESTEP/STEPControl/STEPControl_Controller.cxx b/src/DataExchange/TKDESTEP/STEPControl/STEPControl_Controller.cxx
index 5521f9e80f..b21019bde5 100644
--- a/src/DataExchange/TKDESTEP/STEPControl/STEPControl_Controller.cxx
+++ b/src/DataExchange/TKDESTEP/STEPControl/STEPControl_Controller.cxx
@@ -35,8 +35,6 @@
 #include <STEPEdit.hxx>
 #include <STEPEdit_EditContext.hxx>
 #include <STEPEdit_EditSDR.hxx>
-#include <STEPControl_ActorRead.hxx>
-#include <StepData_StepModel.hxx>
 #include <StepSelect_WorkLibrary.hxx>
 #include <STEPSelections_SelectAssembly.hxx>
 #include <STEPSelections_SelectDerived.hxx>
diff --git a/src/DataExchange/TKDESTEP/StepData/StepData_FileRecognizer_0.cxx b/src/DataExchange/TKDESTEP/StepData/StepData_FileRecognizer_0.cxx
index a5a04f7ede..2158eb47c5 100644
--- a/src/DataExchange/TKDESTEP/StepData/StepData_FileRecognizer_0.cxx
+++ b/src/DataExchange/TKDESTEP/StepData/StepData_FileRecognizer_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <StepData_FileRecognizer.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/DataExchange/TKDESTEP/StepData/StepData_GlobalNodeOfWriterLib_0.cxx b/src/DataExchange/TKDESTEP/StepData/StepData_GlobalNodeOfWriterLib_0.cxx
index e009a7d3e7..ecdf0a3c30 100644
--- a/src/DataExchange/TKDESTEP/StepData/StepData_GlobalNodeOfWriterLib_0.cxx
+++ b/src/DataExchange/TKDESTEP/StepData/StepData_GlobalNodeOfWriterLib_0.cxx
@@ -20,7 +20,6 @@
 
 #include <StepData_ReadWriteModule.hxx>
 #include <StepData_Protocol.hxx>
-#include <StepData_GlobalNodeOfWriterLib.hxx>
 #include <Standard_Transient.hxx>
 #include <StepData_WriterLib.hxx>
 #include <StepData_NodeOfWriterLib.hxx>
diff --git a/src/DataExchange/TKDESTEP/StepData/StepData_NodeOfWriterLib_0.cxx b/src/DataExchange/TKDESTEP/StepData/StepData_NodeOfWriterLib_0.cxx
index d825290dde..a01a39f7b5 100644
--- a/src/DataExchange/TKDESTEP/StepData/StepData_NodeOfWriterLib_0.cxx
+++ b/src/DataExchange/TKDESTEP/StepData/StepData_NodeOfWriterLib_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepData_GlobalNodeOfWriterLib.hxx>
-#include <StepData_NodeOfWriterLib.hxx>
 #include <Standard_Transient.hxx>
 #include <StepData_ReadWriteModule.hxx>
 #include <StepData_Protocol.hxx>
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
index 96792881dd..74fd3ece56 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepDimTol_RunoutZoneOrientation_HeaderFile
 #define _StepDimTol_RunoutZoneOrientation_HeaderFile
 
-#include <StepDimTol_RunoutZoneOrientation.hxx>
-
 #include <Standard_Transient.hxx>
 #include <Standard.hxx>
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
diff --git a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_ToleranceZoneForm.hxx b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
index ce30cdf981..f35bebbbc4 100644
--- a/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
+++ b/src/DataExchange/TKDESTEP/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepDimTol_ToleranceZoneForm_HeaderFile
 #define _StepDimTol_ToleranceZoneForm_HeaderFile
 
-#include <StepDimTol_ToleranceZoneForm.hxx>
-
 #include <Standard_Transient.hxx>
 #include <Standard.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/DataExchange/TKDESTEP/StepShape/StepShape_ValueFormatTypeQualifier.hxx b/src/DataExchange/TKDESTEP/StepShape/StepShape_ValueFormatTypeQualifier.hxx
index 42b655cf34..be733e0dd2 100644
--- a/src/DataExchange/TKDESTEP/StepShape/StepShape_ValueFormatTypeQualifier.hxx
+++ b/src/DataExchange/TKDESTEP/StepShape/StepShape_ValueFormatTypeQualifier.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepShape_ValueFormatTypeQualifier_HeaderFile
 #define _StepShape_ValueFormatTypeQualifier_HeaderFile
 
-#include <StepShape_ValueFormatTypeQualifier.hxx>
-
 #include <Standard_Transient.hxx>
 #include <Standard.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedCurveSet.hxx b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedCurveSet.hxx
index a424423dee..f85e7d378d 100644
--- a/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedCurveSet.hxx
+++ b/src/DataExchange/TKDESTEP/StepVisual/StepVisual_TessellatedCurveSet.hxx
@@ -23,7 +23,6 @@
 
 #include <NCollection_Vector.hxx>
 #include <NCollection_Handle.hxx>
-#include <StepVisual_CoordinatesList.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 
 typedef NCollection_Vector<Handle(TColStd_HSequenceOfInteger)>
diff --git a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_DimTolTool.cxx b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_DimTolTool.cxx
index 4a11754135..fa5d26523f 100644
--- a/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_DimTolTool.cxx
+++ b/src/DataExchange/TKXCAF/XCAFDoc/XCAFDoc_DimTolTool.cxx
@@ -31,7 +31,6 @@
 #include <XCAFDoc_GeomTolerance.hxx>
 #include <XCAFDoc_Datum.hxx>
 #include <XCAFDoc_DimTol.hxx>
-#include <XCAFDoc_DimTolTool.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 #include <XCAFDoc_GraphNode.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectAnyType.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectAnyType.hxx
index 4c9c0a1717..511bcbff55 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectAnyType.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectAnyType.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectExtract.hxx>
-#include <Standard_Type.hxx>
 #include <Standard_Integer.hxx>
 class Standard_Transient;
 class Interface_InterfaceModel;
diff --git a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectType.hxx b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectType.hxx
index 87a2135c46..1b048958dd 100644
--- a/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectType.hxx
+++ b/src/DataExchange/TKXSBase/IFSelect/IFSelect_SelectType.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Type.hxx>
 #include <IFSelect_SelectAnyType.hxx>
 class TCollection_AsciiString;
 
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx b/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx
index 1d73a318bf..fc901d8f0a 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx
@@ -20,7 +20,6 @@
 
 #include <Interface_GeneralModule.hxx>
 #include <Interface_Protocol.hxx>
-#include <Interface_GlobalNodeOfGeneralLib.hxx>
 #include <Standard_Transient.hxx>
 #include <Interface_GeneralLib.hxx>
 #include <Interface_NodeOfGeneralLib.hxx>
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfReaderLib_0.cxx b/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfReaderLib_0.cxx
index ed3417eb93..00c3f43e3d 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfReaderLib_0.cxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_GlobalNodeOfReaderLib_0.cxx
@@ -20,7 +20,6 @@
 
 #include <Interface_ReaderModule.hxx>
 #include <Interface_Protocol.hxx>
-#include <Interface_GlobalNodeOfReaderLib.hxx>
 #include <Standard_Transient.hxx>
 #include <Interface_ReaderLib.hxx>
 #include <Interface_NodeOfReaderLib.hxx>
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_NodeOfGeneralLib_0.cxx b/src/DataExchange/TKXSBase/Interface/Interface_NodeOfGeneralLib_0.cxx
index cf416ac809..e6742e90d0 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_NodeOfGeneralLib_0.cxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_NodeOfGeneralLib_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <Interface_GlobalNodeOfGeneralLib.hxx>
-#include <Interface_NodeOfGeneralLib.hxx>
 #include <Standard_Transient.hxx>
 #include <Interface_GeneralModule.hxx>
 #include <Interface_Protocol.hxx>
diff --git a/src/DataExchange/TKXSBase/Interface/Interface_NodeOfReaderLib_0.cxx b/src/DataExchange/TKXSBase/Interface/Interface_NodeOfReaderLib_0.cxx
index ed0826a893..50fb6bb0b3 100644
--- a/src/DataExchange/TKXSBase/Interface/Interface_NodeOfReaderLib_0.cxx
+++ b/src/DataExchange/TKXSBase/Interface/Interface_NodeOfReaderLib_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_Type.hxx>
 
 #include <Interface_GlobalNodeOfReaderLib.hxx>
-#include <Interface_NodeOfReaderLib.hxx>
 #include <Standard_Transient.hxx>
 #include <Interface_ReaderModule.hxx>
 #include <Interface_Protocol.hxx>
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForFinder_0.cxx b/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForFinder_0.cxx
index dc540d533b..6269e41daa 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForFinder_0.cxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForFinder_0.cxx
@@ -20,7 +20,6 @@
 #include <Standard_Handle.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
-#include <Transfer_ActorOfProcessForFinder.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_Finder.hxx>
 #include <Transfer_FindHasher.hxx>
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForTransient_0.cxx b/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForTransient_0.cxx
index 02c89e31f3..6e31b91786 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForTransient_0.cxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_ActorOfProcessForTransient_0.cxx
@@ -19,7 +19,6 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
-#include <Transfer_ActorOfProcessForTransient.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_IteratorOfProcessForTransient.hxx>
 #include <Transfer_ProcessForTransient.hxx>
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForFinder_0.cxx b/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForFinder_0.cxx
index 89b0ea0047..baf8228ca8 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForFinder_0.cxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForFinder_0.cxx
@@ -22,7 +22,6 @@
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_Msg.hxx>
-#include <Message_Msg.hxx>
 #include <Message_ProgressScope.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
diff --git a/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForTransient_0.cxx b/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForTransient_0.cxx
index 552f890fbe..1597665aea 100644
--- a/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForTransient_0.cxx
+++ b/src/DataExchange/TKXSBase/Transfer/Transfer_ProcessForTransient_0.cxx
@@ -22,8 +22,6 @@
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_Msg.hxx>
-#include <Message_Msg.hxx>
-#include <Message_Msg.hxx>
 #include <Message_ProgressScope.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
@@ -34,18 +32,15 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_MapIteratorOfMapOfInteger.hxx>
 #include <Transfer_ActorOfProcessForTransient.hxx>
-#include <Transfer_ActorOfProcessForTransient.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_FindHasher.hxx>
 #include <Transfer_IteratorOfProcessForTransient.hxx>
-#include <Transfer_IteratorOfProcessForTransient.hxx>
 #include <Transfer_MultipleBinder.hxx>
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <Transfer_StatusResult.hxx>
 #include <Transfer_TransferDeadLoop.hxx>
 #include <Transfer_TransferFailure.hxx>
 #include <Transfer_TransferMapOfProcessForTransient.hxx>
-#include <Transfer_TransferMapOfProcessForTransient.hxx>
 #include <Transfer_VoidBinder.hxx>
 
 //=================================================================================================
diff --git a/src/Draw/TKDCAF/DDataStd/DDataStd_BasicCommands.cxx b/src/Draw/TKDCAF/DDataStd/DDataStd_BasicCommands.cxx
index 292758bffa..73f50fa64a 100644
--- a/src/Draw/TKDCAF/DDataStd/DDataStd_BasicCommands.cxx
+++ b/src/Draw/TKDCAF/DDataStd/DDataStd_BasicCommands.cxx
@@ -1098,7 +1098,6 @@ static Standard_Integer DDataStd_GetVariable(Draw_Interpretor& di,
 }
 
 #include <TDataStd_Relation.hxx>
-#include <TDataStd_Variable.hxx>
 
 //=======================================================================
 // function : SetRelation (DF, entry, expression, var1[, var2, ...])
diff --git a/src/Draw/TKQADraw/QABugs/QABugs_10.cxx b/src/Draw/TKQADraw/QABugs/QABugs_10.cxx
index 7b20c64446..278320935e 100644
--- a/src/Draw/TKQADraw/QABugs/QABugs_10.cxx
+++ b/src/Draw/TKQADraw/QABugs/QABugs_10.cxx
@@ -311,7 +311,6 @@ static Standard_Integer OCC486(Draw_Interpretor& di, Standard_Integer argc, cons
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <TopoDS_Wire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
 #include <Geom_Plane.hxx>
 #include <gp_Pln.hxx>
 #include <BRepPrimAPI_MakePrism.hxx>
diff --git a/src/Draw/TKQADraw/QABugs/QABugs_11.cxx b/src/Draw/TKQADraw/QABugs/QABugs_11.cxx
index 6ffee92f79..d43db032d4 100644
--- a/src/Draw/TKQADraw/QABugs/QABugs_11.cxx
+++ b/src/Draw/TKQADraw/QABugs/QABugs_11.cxx
@@ -563,7 +563,6 @@ Standard_Integer OCC165(Draw_Interpretor& di, Standard_Integer n, const char** a
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
 
 static Standard_Integer OCC297(Draw_Interpretor& di, Standard_Integer /*argc*/, const char** argv)
 
@@ -906,7 +905,6 @@ static Standard_Integer OCC277bug(Draw_Interpretor& di, Standard_Integer nb, con
 
 #include <DDocStd_DrawDocument.hxx>
 #include <TDataStd_Name.hxx>
-#include <Draw.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 #include <TDF_LabelSequence.hxx>
@@ -1757,7 +1755,6 @@ static Standard_Integer OCC902(Draw_Interpretor& di, Standard_Integer argc, cons
 
 #include <DDF.hxx>
 #include <TPrsStd_AISViewer.hxx>
-#include <TPrsStd_AISPresentation.hxx>
 
 //=======================================================================
 // function : OCC1029_AISTransparency
@@ -4727,7 +4724,6 @@ static Standard_Integer OCC12584(Draw_Interpretor& di, Standard_Integer argc, co
 
 #include <Interface_Macros.hxx>
 #include <Draw_ProgressIndicator.hxx>
-#include <XSControl_WorkSession.hxx>
 #include <Message_ProgressScope.hxx>
 
 #include <Geom_Plane.hxx>
@@ -5032,8 +5028,6 @@ Standard_Integer OCC23429(Draw_Interpretor& /*di*/, Standard_Integer narg, const
   return 0;
 }
 
-#include <ExprIntrp_GenExp.hxx>
-
 Standard_Integer CR23403(Draw_Interpretor& di, Standard_Integer argc, const char** argv)
 {
 
diff --git a/src/Draw/TKQADraw/QABugs/QABugs_17.cxx b/src/Draw/TKQADraw/QABugs/QABugs_17.cxx
index 61aeaa0ebc..092a74705e 100644
--- a/src/Draw/TKQADraw/QABugs/QABugs_17.cxx
+++ b/src/Draw/TKQADraw/QABugs/QABugs_17.cxx
@@ -518,7 +518,6 @@ static Standard_Integer OCC138LC(Draw_Interpretor& di, Standard_Integer /*argc*/
 }
 
 #include <BRepBndLib.hxx>
-#include <Draw.hxx>
 
 //=================================================================================================
 
diff --git a/src/Draw/TKQADraw/QABugs/QABugs_19.cxx b/src/Draw/TKQADraw/QABugs/QABugs_19.cxx
index c936417aa2..e8b7cd3fba 100644
--- a/src/Draw/TKQADraw/QABugs/QABugs_19.cxx
+++ b/src/Draw/TKQADraw/QABugs/QABugs_19.cxx
@@ -562,7 +562,6 @@ static Standard_Integer OCC23683(Draw_Interpretor& di, Standard_Integer argc, co
   return 0;
 }
 
-#include <gp_Ax1.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom2d_Circle.hxx>
 #include <BRepPrimAPI_MakeRevol.hxx>
@@ -660,8 +659,6 @@ static Standard_Integer OCC24008(Draw_Interpretor& di, Standard_Integer argc, co
   return 0;
 }
 
-#include <Draw.hxx>
-
 //=================================================================================================
 
 static Standard_Integer OCC23945(Draw_Interpretor& /*di*/, Standard_Integer n, const char** a)
@@ -2981,7 +2978,6 @@ static Standard_Integer OCC25413(Draw_Interpretor& di, Standard_Integer narg, co
 //
 #include <BRepAlgoAPI_Common.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Section.hxx>
 //
 #include <TopExp.hxx>
@@ -3983,7 +3979,6 @@ static Standard_Integer OCC26448(Draw_Interpretor& theDI, Standard_Integer, cons
 
 //=================================================================================================
 
-#include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <TCollection_AsciiString.hxx>
 
@@ -4119,8 +4114,6 @@ static Standard_Integer OCC26485(Draw_Interpretor& theDI,
 
 //=================================================================================================
 
-#include <BRepBuilderAPI_MakeWire.hxx>
-
 static Standard_Integer OCC26553(Draw_Interpretor& theDI,
                                  Standard_Integer  theArgc,
                                  const char**      theArgv)
@@ -4388,7 +4381,6 @@ static Standard_Integer OCC26313(Draw_Interpretor& di, Standard_Integer n, const
 // function : OCC26525
 // purpose  : check number of intersection points
 //=======================================================================
-#include <BRepAdaptor_Curve.hxx>
 #include <IntCurveSurface_HInter.hxx>
 
 Standard_Integer OCC26525(Draw_Interpretor& di, Standard_Integer n, const char** a)
@@ -4705,7 +4697,6 @@ static Standard_Integer OCC24537(Draw_Interpretor& theDI, Standard_Integer argc,
   return 0;
 }
 
-#include <TopExp.hxx>
 #include <BRepOffsetAPI_DraftAngle.hxx>
 #include <vector>
 
diff --git a/src/Draw/TKQADraw/QABugs/QABugs_20.cxx b/src/Draw/TKQADraw/QABugs/QABugs_20.cxx
index 8c7d199121..176a4ad18c 100644
--- a/src/Draw/TKQADraw/QABugs/QABugs_20.cxx
+++ b/src/Draw/TKQADraw/QABugs/QABugs_20.cxx
@@ -3159,7 +3159,6 @@ Standard_Boolean IsSameGuid(const Standard_GUID& aGuidNull, const Standard_GUID&
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_IntegerArray.hxx>
 #include <TDataStd_IntegerList.hxx>
-#include <TDataStd_Name.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataStd_RealArray.hxx>
 #include <TDataStd_RealList.hxx>
diff --git a/src/Draw/TKQADraw/QADraw/QADraw.cxx b/src/Draw/TKQADraw/QADraw/QADraw.cxx
index 58ab87e4ad..81f9c9cee3 100644
--- a/src/Draw/TKQADraw/QADraw/QADraw.cxx
+++ b/src/Draw/TKQADraw/QADraw/QADraw.cxx
@@ -16,7 +16,6 @@
 #include <QADraw.hxx>
 
 #include <QABugs.hxx>
-#include <QADraw.hxx>
 #include <QADNaming.hxx>
 
 #include <AIS_InteractiveContext.hxx>
diff --git a/src/Draw/TKTopTest/BRepTest/BRepTest_CheckCommands.cxx b/src/Draw/TKTopTest/BRepTest/BRepTest_CheckCommands.cxx
index 7575bb50a3..216a391c22 100644
--- a/src/Draw/TKTopTest/BRepTest/BRepTest_CheckCommands.cxx
+++ b/src/Draw/TKTopTest/BRepTest/BRepTest_CheckCommands.cxx
@@ -28,7 +28,6 @@
 #include <Draw_Appli.hxx>
 #include <Draw.hxx>
 #include <DBRep.hxx>
-#include <BRepTest.hxx>
 #include <LocalAnalysis_SurfaceContinuity.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
diff --git a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx
index 2be98f712a..b5bdabb50b 100644
--- a/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/Draw/TKViewerTest/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -69,8 +69,6 @@
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ColoredShape.hxx>
-#include <AIS_DisplayMode.hxx>
-#include <AIS_Shape.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 #include <Geom_Plane.hxx>
@@ -83,7 +81,6 @@
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_Axis1Placement.hxx>
 #include <AIS_Trihedron.hxx>
-#include <AIS_Axis.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Quaternion.hxx>
 #include <TopLoc_Location.hxx>
@@ -125,7 +122,6 @@
 #include <AIS_MultipleConnectedInteractive.hxx>
 #include <AIS_ConnectedInteractive.hxx>
 #include <AIS_TextLabel.hxx>
-#include <TopLoc_Location.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
@@ -133,7 +129,6 @@
 #include <Select3D_SensitivePrimitiveArray.hxx>
 #include <Select3D_SensitivePoint.hxx>
 #include <Select3D_SensitivePoly.hxx>
-#include <BRepAdaptor_Curve.hxx>
 #include <StdPrs_Curve.hxx>
 
 #include <BRepExtrema_ExtPC.hxx>
@@ -910,8 +905,6 @@ static int VPlaneTrihedron(Draw_Interpretor& di, Standard_Integer argc, const ch
 // Draw arg : vaxis AxisName Xa Ya Za Xb Yb Zb
 //==============================================================================
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
 #include <Geom_Line.hxx>
 
 static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char** argv)
@@ -1087,9 +1080,6 @@ static int VAxisBuilder(Draw_Interpretor& di, Standard_Integer argc, const char*
 
 //=================================================================================================
 
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
 #include <AIS_Point.hxx>
 #include <Geom_CartesianPoint.hxx>
 
@@ -1853,7 +1843,6 @@ static int VChangePlane(Draw_Interpretor& /*theDi*/,
 // Draw arg : vline LineName  [AIS_PointName] [AIS_PointName]
 //                           [Xa] [Ya] [Za]   [Xb] [Yb] [Zb]
 //==============================================================================
-#include <Geom_CartesianPoint.hxx>
 #include <AIS_Line.hxx>
 
 static int VLineBuilder(Draw_Interpretor& di, Standard_Integer argc, const char** argv)
@@ -2720,9 +2709,7 @@ static int VDrawText(Draw_Interpretor& theDI, Standard_Integer theArgsNb, const
 
 #include <math.h>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfPoints.hxx>
 #include <Graphic3d_ArrayOfPrimitives.hxx>
-#include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Triangle.hxx>
 #include <Poly_Triangulation.hxx>
@@ -2743,9 +2730,6 @@ static int VDrawText(Draw_Interpretor& theDI, Standard_Integer theArgsNb, const
 #include <Graphic3d_AspectFillArea3d.hxx>
 
 #include <BRepPrimAPI_MakeCylinder.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopAbs.hxx>
 #include <AIS_InteractiveObject.hxx>
 
 //===============================================================================================
diff --git a/src/FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx b/src/FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx
index 6b8e92f6be..c8fcadb4e9 100644
--- a/src/FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx
+++ b/src/FoundationClasses/TKMath/Poly/Poly_CoherentTriangulation.hxx
@@ -378,6 +378,4 @@ public:
   friend class IteratorOfLink;
 };
 
-#include <Poly_CoherentTriangulation.hxx>
-
 #endif
diff --git a/src/FoundationClasses/TKMath/gp/gp_Pln.hxx b/src/FoundationClasses/TKMath/gp/gp_Pln.hxx
index fa82594743..19b4571c09 100644
--- a/src/FoundationClasses/TKMath/gp/gp_Pln.hxx
+++ b/src/FoundationClasses/TKMath/gp/gp_Pln.hxx
@@ -279,8 +279,6 @@ private:
   gp_Ax3 pos;
 };
 
-#include <gp_Lin.hxx>
-
 //=================================================================================================
 
 inline void gp_Pln::Coefficients(Standard_Real& theA,
diff --git a/src/FoundationClasses/TKMath/gp/gp_Pnt.hxx b/src/FoundationClasses/TKMath/gp/gp_Pnt.hxx
index 175daf799c..d8f98c0251 100644
--- a/src/FoundationClasses/TKMath/gp/gp_Pnt.hxx
+++ b/src/FoundationClasses/TKMath/gp/gp_Pnt.hxx
@@ -251,7 +251,6 @@ struct equal_to<gp_Pnt>
 
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
-#include <gp_XYZ.hxx>
 
 //=================================================================================================
 
diff --git a/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx b/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx
index f55be66839..cc82331ad4 100644
--- a/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx
+++ b/src/FoundationClasses/TKernel/NCollection/NCollection_DynamicArray.hxx
@@ -21,9 +21,7 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#include <NCollection_BasePointerVector.hxx>
 #include <NCollection_DefineAlloc.hxx>
-#include <NCollection_Allocator.hxx>
 #include <NCollection_Iterator.hxx>
 #include <NCollection_OccAllocator.hxx>
 #include <StdFail_NotDone.hxx>
diff --git a/src/FoundationClasses/TKernel/OSD/OSD_FileIterator.cxx b/src/FoundationClasses/TKernel/OSD/OSD_FileIterator.cxx
index 37fe6ecb67..ebb44e186b 100644
--- a/src/FoundationClasses/TKernel/OSD/OSD_FileIterator.cxx
+++ b/src/FoundationClasses/TKernel/OSD/OSD_FileIterator.cxx
@@ -12,14 +12,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <OSD_FileIterator.hxx>
+
+#include <OSD_Path.hxx>
+#include <TCollection_AsciiString.hxx>
+
 #ifndef _WIN32
 
   #include <OSD_File.hxx>
-  #include <OSD_FileIterator.hxx>
   #include <OSD_OSDError.hxx>
-  #include <OSD_Path.hxx>
   #include <OSD_WhoAmI.hxx>
-  #include <TCollection_AsciiString.hxx>
 
   #include <dirent.h>
   #include <stdio.h>
@@ -275,9 +277,6 @@ Standard_Integer OSD_FileIterator::Error() const
 
   #include <windows.h>
 
-  #include <OSD_FileIterator.hxx>
-  #include <OSD_Path.hxx>
-  #include <TCollection_AsciiString.hxx>
   #include <TCollection_ExtendedString.hxx>
 
   #define _FD ((PWIN32_FIND_DATAW)myData)
diff --git a/src/FoundationClasses/TKernel/OSD/OSD_FileNode.cxx b/src/FoundationClasses/TKernel/OSD/OSD_FileNode.cxx
index 4c505e5d32..bfc9ee56a0 100644
--- a/src/FoundationClasses/TKernel/OSD/OSD_FileNode.cxx
+++ b/src/FoundationClasses/TKernel/OSD/OSD_FileNode.cxx
@@ -12,20 +12,22 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <OSD_FileNode.hxx>
+
+#include <OSD_Protection.hxx>
+#include <Quantity_Date.hxx>
+#include <Standard_ProgramError.hxx>
+
 #ifndef _WIN32
 
 //----------------------------------------------------------------------------
 //------------------- Linux Sources of OSD_FileNode --------------------------
 //----------------------------------------------------------------------------
 
-  #include <OSD_FileNode.hxx>
   #include <OSD_OSDError.hxx>
   #include <OSD_Path.hxx>
-  #include <OSD_Protection.hxx>
   #include <OSD_WhoAmI.hxx>
-  #include <Quantity_Date.hxx>
   #include <Standard_NullObject.hxx>
-  #include <Standard_ProgramError.hxx>
 
   #include <errno.h>
   #include <fcntl.h>
@@ -390,10 +392,6 @@ Standard_Integer OSD_FileNode::Error() const
   #endif
   #include <windows.h>
 
-  #include <OSD_FileNode.hxx>
-  #include <OSD_Protection.hxx>
-  #include <Quantity_Date.hxx>
-  #include <Standard_ProgramError.hxx>
   #include <TCollection_ExtendedString.hxx>
 
   #include <OSD_WNT.hxx>
diff --git a/src/FoundationClasses/TKernel/OSD/OSD_Path.cxx b/src/FoundationClasses/TKernel/OSD/OSD_Path.cxx
index 40d338c914..209b716fc3 100644
--- a/src/FoundationClasses/TKernel/OSD/OSD_Path.cxx
+++ b/src/FoundationClasses/TKernel/OSD/OSD_Path.cxx
@@ -57,7 +57,6 @@ static OSD_SysType whereAmI()
   #include <Standard_NumericError.hxx>
   #include <Standard_NullObject.hxx>
   #include <Standard_ProgramError.hxx>
-  #include <Standard_ConstructionError.hxx>
   #include <OSD_WhoAmI.hxx>
 
 OSD_Path::OSD_Path()
diff --git a/src/ModelingAlgorithms/TKBO/GTests/BOPTest_Utilities.pxx b/src/ModelingAlgorithms/TKBO/GTests/BOPTest_Utilities.pxx
index f8f2f0caa8..e42692323f 100644
--- a/src/ModelingAlgorithms/TKBO/GTests/BOPTest_Utilities.pxx
+++ b/src/ModelingAlgorithms/TKBO/GTests/BOPTest_Utilities.pxx
@@ -60,8 +60,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <Standard_Real.hxx>
 #include <NCollection_BaseAllocator.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
 
 #include <cmath>
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_ProcessGR.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
index cd5be7af6f..162662dc21 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRep/TopOpeBRep_ProcessGR.cxx
@@ -39,7 +39,6 @@
 #include <TopOpeBRepTool_SC.hxx>
 
 #ifdef OCCT_DEBUG
-  #include <TopOpeBRep_FFDumper.hxx>
   #include <Geom_TrimmedCurve.hxx>
   #include <Geom_Line.hxx>
 extern Standard_Boolean TopOpeBRep_GettraceBIPS();
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx
index f051d941c7..fdccd30602 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridEE.cxx
@@ -37,7 +37,6 @@
 #include <TopoDS.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_Plane.hxx>
-#include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
index bc79102eb4..ea0202c349 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
@@ -28,7 +28,6 @@
 #ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepTool_GettraceVC();
   #include <TopOpeBRepBuild_Builder.hxx>
-  #include <gp_Pnt.hxx>
 #endif
 
 //=================================================================================================
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx
index 9a46bd8afc..ceffed582d 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx
@@ -58,7 +58,6 @@
 // includes especially needed by the static Project function
 #ifdef DRAW
   #include <TopOpeBRepDS_DRAW.hxx>
-  #include <Geom2d_Curve.hxx>
 #endif
 
 Standard_EXPORT Handle(Geom2d_Curve) BASISCURVE2D(const Handle(Geom2d_Curve)& C);
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
index a65a45b395..8a1cc6dd50 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
@@ -70,7 +70,6 @@ extern Standard_Boolean TopOpeBRepTool_GettraceCHKBSPL();
 #define CurveImprovement
 #ifdef DRAW
   #include <DrawTrSurf.hxx>
-  #include <Geom2d_Curve.hxx>
 static Standard_Integer NbCalls = 0;
 #endif
 //=================================================================================================
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.cxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.cxx
index ccb24ea946..583fa1be7a 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.cxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.cxx
@@ -33,7 +33,6 @@
   #include <Geom_TrimmedCurve.hxx>
   #include <Geom2d_Line.hxx>
   #include <Geom2d_TrimmedCurve.hxx>
-  #include <BRep_Tool.hxx>
   #include <TopExp_Explorer.hxx>
   #include <TopOpeBRepTool_DRAW.hxx>
 
diff --git a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.hxx b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.hxx
index d6d4d1900d..3b59d1e0a5 100644
--- a/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.hxx
+++ b/src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_DRAW.hxx
@@ -26,7 +26,6 @@
   #include <TopOpeBRepTool_define.hxx>
   #include <Geom_Curve.hxx>
   #include <Geom2d_Curve.hxx>
-  #include <TopOpeBRepTool_define.hxx>
 
 Standard_EXPORT void           TopOpeBRepTool_DrawPoint(const gp_Pnt&          P,
                                                         const Draw_MarkerShape T,
diff --git a/src/ModelingAlgorithms/TKFillet/ChFi3d/ChFi3d_FilBuilder_C2.cxx b/src/ModelingAlgorithms/TKFillet/ChFi3d/ChFi3d_FilBuilder_C2.cxx
index a2b9929b27..6fe1054a14 100644
--- a/src/ModelingAlgorithms/TKFillet/ChFi3d/ChFi3d_FilBuilder_C2.cxx
+++ b/src/ModelingAlgorithms/TKFillet/ChFi3d/ChFi3d_FilBuilder_C2.cxx
@@ -14,7 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBlend_Line.hxx>
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_EvolvedSection.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_EvolvedSection.cxx
index 37d21999c3..73eb596332 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_EvolvedSection.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_EvolvedSection.cxx
@@ -33,7 +33,6 @@ IMPLEMENT_STANDARD_RTTIEXT(GeomFill_EvolvedSection, GeomFill_SectionLaw)
 
 #ifdef DRAW
   #include <DrawTrSurf.hxx>
-  #include <Geom_Curve.hxx>
   #include <Geom_BSplineCurve.hxx>
 static Standard_Integer NumSec = 0;
 static Standard_Boolean Affich = 0;
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_LocationGuide.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_LocationGuide.cxx
index 37c2305379..44522579bd 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_LocationGuide.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_LocationGuide.cxx
@@ -59,7 +59,6 @@ IMPLEMENT_STANDARD_RTTIEXT(GeomFill_LocationGuide, GeomFill_LocationLaw)
 static Standard_Integer Affich = 0;
   #include <Approx_Curve3d.hxx>
   #include <DrawTrSurf.hxx>
-  #include <GeomFill_TrihedronWithGuide.hxx>
 #endif
 
 //=======================================================================
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx
index 0d4903b23a..aa431f29bf 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_NSections.cxx
@@ -49,7 +49,6 @@ IMPLEMENT_STANDARD_RTTIEXT(GeomFill_NSections, GeomFill_SectionLaw)
 #ifdef OCCT_DEBUG
   #ifdef DRAW
     #include <DrawTrSurf.hxx>
-    #include <Geom_Curve.hxx>
   #endif
 static Standard_Boolean Affich = 0;
 static Standard_Integer NbSurf = 0;
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_Pipe.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_Pipe.cxx
index 495a2f0a2a..2362174ee4 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_Pipe.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_Pipe.cxx
@@ -77,7 +77,6 @@ static Standard_Integer NbSections = 0;
 
 #ifdef DRAW
   #include <DrawTrSurf.hxx>
-  #include <Geom_Curve.hxx>
 #endif
 
 static Standard_Boolean CheckSense(const TColGeom_SequenceOfCurve& Seq1,
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_UniformSection.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_UniformSection.cxx
index 43e411dcdf..3525b1f487 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_UniformSection.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_UniformSection.cxx
@@ -34,8 +34,6 @@ IMPLEMENT_STANDARD_RTTIEXT(GeomFill_UniformSection, GeomFill_SectionLaw)
 
 #ifdef DRAW
   #include <DrawTrSurf.hxx>
-  #include <Geom_Curve.hxx>
-  #include <Geom_BSplineCurve.hxx>
 static Standard_Integer NumSec = 0;
 static Standard_Boolean Affich = 0;
 #endif
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_BuildPlateSurface.cxx
index de4952c785..9c5a67385f 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_BuildPlateSurface.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/GeomPlate/GeomPlate_BuildPlateSurface.cxx
@@ -83,7 +83,6 @@ static Standard_Integer NbProj = 0;
 
 #ifdef OCCT_DEBUG
   #include <OSD_Chronometer.hxx>
-  #include <Geom_Surface.hxx>
 static Standard_Integer Affich = 0;
 #endif
 
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/IntCurveSurface/IntCurveSurface_Inter.gxx b/src/ModelingAlgorithms/TKGeomAlgo/IntCurveSurface/IntCurveSurface_Inter.gxx
index db108ccec7..a6ccf2e973 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/IntCurveSurface/IntCurveSurface_Inter.gxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/IntCurveSurface/IntCurveSurface_Inter.gxx
@@ -61,7 +61,6 @@
 #include <IntAna2d_IntPoint.hxx>
 #include <gp_Parab2d.hxx>
 #include <IntAna2d_Conic.hxx>
-#include <IntAna2d_AnaIntersection.hxx>
 #include <gp_Hypr2d.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/IntPatch/IntPatch_Intersection.cxx b/src/ModelingAlgorithms/TKGeomAlgo/IntPatch/IntPatch_Intersection.cxx
index 79ec38baf2..53a94fae6b 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/IntPatch/IntPatch_Intersection.cxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/IntPatch/IntPatch_Intersection.cxx
@@ -234,8 +234,6 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_Surface)&   S1,
 #include <Extrema_POnSurf.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2dAPI_InterCurveCurve.hxx>
-#include <Geom_Plane.hxx>
-#include <ProjLib_ProjectOnPlane.hxx>
 #include <GeomProjLib.hxx>
 #include <ElCLib.hxx>
 #include <Geom_TrimmedCurve.hxx>
diff --git a/src/ModelingAlgorithms/TKGeomAlgo/IntStart/IntStart_SearchOnBoundaries.gxx b/src/ModelingAlgorithms/TKGeomAlgo/IntStart/IntStart_SearchOnBoundaries.gxx
index b081f263e6..294669b3d8 100644
--- a/src/ModelingAlgorithms/TKGeomAlgo/IntStart/IntStart_SearchOnBoundaries.gxx
+++ b/src/ModelingAlgorithms/TKGeomAlgo/IntStart/IntStart_SearchOnBoundaries.gxx
@@ -19,7 +19,6 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <GeomAbs_SurfaceType.hxx>
 #include <BRep_Tool.hxx>
 #include <Geom_Line.hxx>
@@ -33,7 +32,6 @@
 #include <gp_Dir.hxx>
 #include <gp_Cylinder.hxx>
 #include <gp_Ax1.hxx>
-#include <gp_Lin.hxx>
 
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
@@ -49,7 +47,6 @@
 
 //  Modified by skv - Tue Aug 31 12:13:51 2004 OCC569
 
-#include <Precision.hxx>
 #include <IntSurf_Quadric.hxx>
 #include <math_Function.hxx>
 #include <math_BrentMinimum.hxx>
diff --git a/src/ModelingAlgorithms/TKHLR/HLRBRep/HLRBRep_Data.cxx b/src/ModelingAlgorithms/TKHLR/HLRBRep/HLRBRep_Data.cxx
index ff7932ed96..a14c1e322a 100644
--- a/src/ModelingAlgorithms/TKHLR/HLRBRep/HLRBRep_Data.cxx
+++ b/src/ModelingAlgorithms/TKHLR/HLRBRep/HLRBRep_Data.cxx
@@ -64,7 +64,6 @@ static const Standard_Real DERIVEE_PREMIERE_NULLE = 0.000000000001;
 
 #include <IntRes2d_TypeTrans.hxx>
 #include <IntRes2d_Position.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_Transition.hxx>
 
 static long unsigned Mask32[32] = {
diff --git a/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_BuilderHelixCoil.cxx b/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_BuilderHelixCoil.cxx
index 70d752cdec..cebcf10abf 100644
--- a/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_BuilderHelixCoil.cxx
+++ b/src/ModelingAlgorithms/TKHelix/HelixGeom/HelixGeom_BuilderHelixCoil.cxx
@@ -14,7 +14,6 @@
 #include <Geom_BSplineCurve.hxx>
 #include <HelixGeom_BuilderHelixCoil.hxx>
 #include <HelixGeom_HelixCurve.hxx>
-#include <HelixGeom_HelixCurve.hxx>
 #include <HelixGeom_Tools.hxx>
 
 //=================================================================================================
diff --git a/src/ModelingAlgorithms/TKOffset/Draft/Draft_Modification_1.cxx b/src/ModelingAlgorithms/TKOffset/Draft/Draft_Modification_1.cxx
index 8b02ac6392..a2e0302155 100644
--- a/src/ModelingAlgorithms/TKOffset/Draft/Draft_Modification_1.cxx
+++ b/src/ModelingAlgorithms/TKOffset/Draft/Draft_Modification_1.cxx
@@ -14,7 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
 #include <Approx_CurveOnSurface.hxx>
diff --git a/src/ModelingAlgorithms/TKTopAlgo/BRepCheck/BRepCheck_Edge.cxx b/src/ModelingAlgorithms/TKTopAlgo/BRepCheck/BRepCheck_Edge.cxx
index a9aacb5e13..c0cfac0032 100644
--- a/src/ModelingAlgorithms/TKTopAlgo/BRepCheck/BRepCheck_Edge.cxx
+++ b/src/ModelingAlgorithms/TKTopAlgo/BRepCheck/BRepCheck_Edge.cxx
@@ -16,7 +16,6 @@
 
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <BRep_GCurve.hxx>
 #include <BRepLib_ValidateEdge.hxx>
 #include <BRep_PolygonOnTriangulation.hxx>
diff --git a/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfBisector_0.cxx b/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfBisector_0.cxx
index 057e969ced..99378d4fc7 100644
--- a/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfBisector_0.cxx
+++ b/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfBisector_0.cxx
@@ -18,7 +18,6 @@
 
 #include <Standard_Type.hxx>
 
-#include <MAT_TListNodeOfListOfBisector.hxx>
 #include <MAT_Bisector.hxx>
 #include <MAT_ListOfBisector.hxx>
 
diff --git a/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfEdge_0.cxx b/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfEdge_0.cxx
index 768352b687..4bd966b3d2 100644
--- a/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfEdge_0.cxx
+++ b/src/ModelingAlgorithms/TKTopAlgo/MAT/MAT_TListNodeOfListOfEdge_0.cxx
@@ -18,7 +18,6 @@
 
 #include <Standard_Type.hxx>
 
-#include <MAT_TListNodeOfListOfEdge.hxx>
 #include <MAT_Edge.hxx>
 #include <MAT_ListOfEdge.hxx>
 
diff --git a/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Circuit.cxx b/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Circuit.cxx
index 9ad7f0777b..e2a128d258 100644
--- a/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Circuit.cxx
+++ b/src/ModelingAlgorithms/TKTopAlgo/MAT2d/MAT2d_Circuit.cxx
@@ -39,8 +39,6 @@ IMPLEMENT_STANDARD_RTTIEXT(MAT2d_Circuit, Standard_Transient)
   #include <Geom2d_Curve.hxx>
   #include <Geom2d_Parabola.hxx>
   #include <Geom2d_Hyperbola.hxx>
-  #include <Geom2d_TrimmedCurve.hxx>
-  #include <Geom2d_CartesianPoint.hxx>
   #include <Geom2d_Line.hxx>
   #include <Geom2d_Circle.hxx>
 #endif
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx
index 525ea5cf20..b89f570f8f 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfLinearExtrusion.cxx
@@ -18,7 +18,6 @@
 
 #include <Adaptor3d_Curve.hxx>
 #include <gp_Ax3.hxx>
-#include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
 #include <GeomEvaluator_SurfaceOfExtrusion.hxx>
 #include <Standard_NoSuchObject.hxx>
 
diff --git a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx
index 6aea7c4304..ba28084674 100644
--- a/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx
+++ b/src/ModelingData/TKG3d/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx
@@ -18,7 +18,6 @@
 
 #include <Adaptor3d_Curve.hxx>
 #include <ElCLib.hxx>
-#include <GeomAdaptor_SurfaceOfRevolution.hxx>
 #include <GeomEvaluator_SurfaceOfRevolution.hxx>
 #include <Standard_NoSuchObject.hxx>
 
diff --git a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_LeastSquare.gxx b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_LeastSquare.gxx
index 5e28cddaf4..bc10957ad1 100644
--- a/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_LeastSquare.gxx
+++ b/src/ModelingData/TKGeomBase/AppParCurves/AppParCurves_LeastSquare.gxx
@@ -40,9 +40,7 @@
 #include <AppParCurves_MultiPoint.hxx>
 #include <StdFail_NotDone.hxx>
 #include <Standard_NoSuchObject.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <math_Recipes.hxx>
-#include <math_Crout.hxx>
 
 static int FlatLength(const TColStd_Array1OfInteger& Mults)
 {
diff --git a/src/ModelingData/TKGeomBase/BndLib/BndLib_AddSurface.cxx b/src/ModelingData/TKGeomBase/BndLib/BndLib_AddSurface.cxx
index 504c299cf1..f20e70d40d 100644
--- a/src/ModelingData/TKGeomBase/BndLib/BndLib_AddSurface.cxx
+++ b/src/ModelingData/TKGeomBase/BndLib/BndLib_AddSurface.cxx
@@ -16,7 +16,6 @@
 
 //  Modified by skv - Fri Aug 27 12:29:04 2004 OCC6503
 
-#include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Bnd_Box.hxx>
 #include <BndLib.hxx>
diff --git a/src/ModelingData/TKGeomBase/GeomConvert/GeomConvert_SurfToAnaSurf.cxx b/src/ModelingData/TKGeomBase/GeomConvert/GeomConvert_SurfToAnaSurf.cxx
index 98fa2f9171..518bc0cd8d 100644
--- a/src/ModelingData/TKGeomBase/GeomConvert/GeomConvert_SurfToAnaSurf.cxx
+++ b/src/ModelingData/TKGeomBase/GeomConvert/GeomConvert_SurfToAnaSurf.cxx
@@ -33,7 +33,6 @@
 #include <Geom_ToroidalSurface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
diff --git a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx
index 1ff8bf29e0..c30e247a51 100644
--- a/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx
+++ b/src/ModelingData/TKGeomBase/ProjLib/ProjLib_ProjectOnPlane.hxx
@@ -22,7 +22,6 @@
 #include <gp_Dir.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <Adaptor3d_Curve.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx b/src/Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx
index a2100d2de7..a395f1fa86 100644
--- a/src/Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx
+++ b/src/Visualization/TKV3d/SelectMgr/SelectMgr_ViewerSelector.hxx
@@ -27,7 +27,6 @@
 #include <SelectMgr_StateOfSelection.hxx>
 #include <SelectMgr_ToleranceMap.hxx>
 #include <SelectMgr_TypeOfDepthTolerance.hxx>
-#include <SelectMgr_ViewerSelector.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_Transient.hxx>
 #include <StdSelect_TypeOfSelectionImage.hxx>