COMP: Remove inclusion of .hxx files as headers

hjmjohnson · hjmjohnson · commit 0525c1d966c3 · 2021-12-17T19:52:30.000-06:00
The ability to include either .h or .hxx files as
header files required recursively reading the
.h files twice.  The added complexity is
unnecessary, costly, and can confuse static
analysis tools that monitor header guardes (due
to reaching the maximum depth of recursion
limits for nested #ifdefs in checking).
diff --git a/include/itkBinaryThresholdFeatureGenerator.hxx b/include/itkBinaryThresholdFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkBinaryThresholdFeatureGenerator_hxx
 #define itkBinaryThresholdFeatureGenerator_hxx
 
-#include "itkBinaryThresholdFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 namespace itk
diff --git a/include/itkCannyEdgeDetectionRecursiveGaussianImageFilter.hxx b/include/itkCannyEdgeDetectionRecursiveGaussianImageFilter.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkCannyEdgeDetectionRecursiveGaussianImageFilter_hxx
 #define itkCannyEdgeDetectionRecursiveGaussianImageFilter_hxx
-#include "itkCannyEdgeDetectionRecursiveGaussianImageFilter.h"
 
 #include "itkZeroCrossingImageFilter.h"
 #include "itkNeighborhoodInnerProduct.h"
diff --git a/include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.hxx b/include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkCannyEdgesDistanceAdvectionFieldFeatureGenerator_hxx
 #define itkCannyEdgesDistanceAdvectionFieldFeatureGenerator_hxx
 
-#include "itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkCannyEdgesDistanceFeatureGenerator.hxx b/include/itkCannyEdgesDistanceFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkCannyEdgesDistanceFeatureGenerator_hxx
 #define itkCannyEdgesDistanceFeatureGenerator_hxx
 
-#include "itkCannyEdgesDistanceFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkCannyEdgesFeatureGenerator.hxx b/include/itkCannyEdgesFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkCannyEdgesFeatureGenerator_hxx
 #define itkCannyEdgesFeatureGenerator_hxx
 
-#include "itkCannyEdgesFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkConfidenceConnectedSegmentationModule.hxx b/include/itkConfidenceConnectedSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkConfidenceConnectedSegmentationModule_hxx
 #define itkConfidenceConnectedSegmentationModule_hxx
 
-#include "itkConfidenceConnectedSegmentationModule.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkConnectedThresholdSegmentationModule.hxx b/include/itkConnectedThresholdSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkConnectedThresholdSegmentationModule_hxx
 #define itkConnectedThresholdSegmentationModule_hxx
 
-#include "itkConnectedThresholdSegmentationModule.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkDescoteauxSheetnessFeatureGenerator.hxx b/include/itkDescoteauxSheetnessFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkDescoteauxSheetnessFeatureGenerator_hxx
 #define itkDescoteauxSheetnessFeatureGenerator_hxx
 
-#include "itkDescoteauxSheetnessFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule.hxx b/include/itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule_hxx
 #define itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule_hxx
 
-#include "itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule.h"
 #include "itkGeodesicActiveContourLevelSetImageFilter.h"
 #include "itkProgressAccumulator.h"
 
diff --git a/include/itkFastMarchingAndShapeDetectionLevelSetSegmentationModule.hxx b/include/itkFastMarchingAndShapeDetectionLevelSetSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkFastMarchingAndShapeDetectionLevelSetSegmentationModule_hxx
 #define itkFastMarchingAndShapeDetectionLevelSetSegmentationModule_hxx
 
-#include "itkFastMarchingAndShapeDetectionLevelSetSegmentationModule.h"
 #include "itkShapeDetectionLevelSetImageFilter.h"
 #include "itkProgressAccumulator.h"
 
diff --git a/include/itkFastMarchingSegmentationModule.hxx b/include/itkFastMarchingSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkFastMarchingSegmentationModule_hxx
 #define itkFastMarchingSegmentationModule_hxx
 
-#include "itkFastMarchingSegmentationModule.h"
 #include "itkImageRegionIterator.h"
 #include "itkFastMarchingImageFilter.h"
 #include "itkIntensityWindowingImageFilter.h"
diff --git a/include/itkFeatureAggregator.hxx b/include/itkFeatureAggregator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkFeatureAggregator_hxx
 #define itkFeatureAggregator_hxx
 
-#include "itkFeatureAggregator.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 
diff --git a/include/itkFeatureGenerator.hxx b/include/itkFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkFeatureGenerator_hxx
 #define itkFeatureGenerator_hxx
 
-#include "itkFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkFrangiTubularnessFeatureGenerator.hxx b/include/itkFrangiTubularnessFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkFrangiTubularnessFeatureGenerator_hxx
 #define itkFrangiTubularnessFeatureGenerator_hxx
 
-#include "itkFrangiTubularnessFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkGeodesicActiveContourLevelSetSegmentationModule.hxx b/include/itkGeodesicActiveContourLevelSetSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkGeodesicActiveContourLevelSetSegmentationModule_hxx
 #define itkGeodesicActiveContourLevelSetSegmentationModule_hxx
 
-#include "itkGeodesicActiveContourLevelSetSegmentationModule.h"
 #include "itkGeodesicActiveContourLevelSetImageFilter.h"
 #include "itkProgressAccumulator.h"
 
diff --git a/include/itkGradientMagnitudeSigmoidFeatureGenerator.hxx b/include/itkGradientMagnitudeSigmoidFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkGradientMagnitudeSigmoidFeatureGenerator_hxx
 #define itkGradientMagnitudeSigmoidFeatureGenerator_hxx
 
-#include "itkGradientMagnitudeSigmoidFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkGrayscaleImageSegmentationVolumeEstimator.hxx b/include/itkGrayscaleImageSegmentationVolumeEstimator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkGrayscaleImageSegmentationVolumeEstimator_hxx
 #define itkGrayscaleImageSegmentationVolumeEstimator_hxx
 
-#include "itkGrayscaleImageSegmentationVolumeEstimator.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 
diff --git a/include/itkIsotropicResampler.hxx b/include/itkIsotropicResampler.hxx
@@ -18,7 +18,6 @@
 #ifndef itkIsotropicResampler_hxx
 #define itkIsotropicResampler_hxx
 
-#include "itkIsotropicResampler.h"
 #include "itkResampleImageFilter.h"
 #include "itkIdentityTransform.h"
 #include "itkBSplineInterpolateImageFunction.h"
diff --git a/include/itkIsotropicResamplerImageFilter.hxx b/include/itkIsotropicResamplerImageFilter.hxx
@@ -18,7 +18,6 @@
 #ifndef itkIsotropicResamplerImageFilter_hxx
 #define itkIsotropicResamplerImageFilter_hxx
 
-#include "itkIsotropicResamplerImageFilter.h"
 #include "itkProgressAccumulator.h"
 
 namespace itk
diff --git a/include/itkLandmarksReader.hxx b/include/itkLandmarksReader.hxx
@@ -18,7 +18,6 @@
 #ifndef itkLandmarksReader_hxx
 #define itkLandmarksReader_hxx
 
-#include "itkLandmarksReader.h"
 #include "itkSpatialObjectReader.h"
 
 
diff --git a/include/itkLesionSegmentationImageFilter8.hxx b/include/itkLesionSegmentationImageFilter8.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkLesionSegmentationImageFilter8_hxx
 #define itkLesionSegmentationImageFilter8_hxx
-#include "itkLesionSegmentationImageFilter8.h"
 
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
diff --git a/include/itkLesionSegmentationMethod.hxx b/include/itkLesionSegmentationMethod.hxx
@@ -18,7 +18,6 @@
 #ifndef itkLesionSegmentationMethod_hxx
 #define itkLesionSegmentationMethod_hxx
 
-#include "itkLesionSegmentationMethod.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 
diff --git a/include/itkLungWallFeatureGenerator.hxx b/include/itkLungWallFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkLungWallFeatureGenerator_hxx
 #define itkLungWallFeatureGenerator_hxx
 
-#include "itkLungWallFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkMaximumFeatureAggregator.hxx b/include/itkMaximumFeatureAggregator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkMaximumFeatureAggregator_hxx
 #define itkMaximumFeatureAggregator_hxx
 
-#include "itkMaximumFeatureAggregator.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageFileWriter.h"
diff --git a/include/itkMinimumFeatureAggregator.hxx b/include/itkMinimumFeatureAggregator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkMinimumFeatureAggregator_hxx
 #define itkMinimumFeatureAggregator_hxx
 
-#include "itkMinimumFeatureAggregator.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageFileWriter.h"
diff --git a/include/itkMorphologicalOpeningFeatureGenerator.hxx b/include/itkMorphologicalOpeningFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkMorphologicalOpeningFeatureGenerator_hxx
 #define itkMorphologicalOpeningFeatureGenerator_hxx
 
-#include "itkMorphologicalOpeningFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkMorphologicalOpenningFeatureGenerator.hxx b/include/itkMorphologicalOpenningFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkMorphologicalOpenningFeatureGenerator_hxx
 #define itkMorphologicalOpenningFeatureGenerator_hxx
 
-#include "itkMorphologicalOpenningFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkRegionCompetitionImageFilter.hxx b/include/itkRegionCompetitionImageFilter.hxx
@@ -18,7 +18,6 @@
 #ifndef itkRegionCompetitionImageFilter_hxx
 #define itkRegionCompetitionImageFilter_hxx
 
-#include "itkRegionCompetitionImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionExclusionIteratorWithIndex.h"
diff --git a/include/itkRegionGrowingSegmentationModule.hxx b/include/itkRegionGrowingSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkRegionGrowingSegmentationModule_hxx
 #define itkRegionGrowingSegmentationModule_hxx
 
-#include "itkRegionGrowingSegmentationModule.h"
 #include "itkImageRegionIterator.h"
 
 
diff --git a/include/itkSatoLocalStructureFeatureGenerator.hxx b/include/itkSatoLocalStructureFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSatoLocalStructureFeatureGenerator_hxx
 #define itkSatoLocalStructureFeatureGenerator_hxx
 
-#include "itkSatoLocalStructureFeatureGenerator.h"
 
 
 namespace itk
diff --git a/include/itkSatoVesselnessFeatureGenerator.hxx b/include/itkSatoVesselnessFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSatoVesselnessFeatureGenerator_hxx
 #define itkSatoVesselnessFeatureGenerator_hxx
 
-#include "itkSatoVesselnessFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkSatoVesselnessSigmoidFeatureGenerator.hxx b/include/itkSatoVesselnessSigmoidFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSatoVesselnessSigmoidFeatureGenerator_hxx
 #define itkSatoVesselnessSigmoidFeatureGenerator_hxx
 
-#include "itkSatoVesselnessSigmoidFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 
diff --git a/include/itkSegmentationModule.hxx b/include/itkSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSegmentationModule_hxx
 #define itkSegmentationModule_hxx
 
-#include "itkSegmentationModule.h"
 
 
 namespace itk
diff --git a/include/itkSegmentationVolumeEstimator.hxx b/include/itkSegmentationVolumeEstimator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSegmentationVolumeEstimator_hxx
 #define itkSegmentationVolumeEstimator_hxx
 
-#include "itkSegmentationVolumeEstimator.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 
diff --git a/include/itkShapeDetectionLevelSetSegmentationModule.hxx b/include/itkShapeDetectionLevelSetSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkShapeDetectionLevelSetSegmentationModule_hxx
 #define itkShapeDetectionLevelSetSegmentationModule_hxx
 
-#include "itkShapeDetectionLevelSetSegmentationModule.h"
 #include "itkShapeDetectionLevelSetImageFilter.h"
 
 
diff --git a/include/itkSigmoidFeatureGenerator.hxx b/include/itkSigmoidFeatureGenerator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSigmoidFeatureGenerator_hxx
 #define itkSigmoidFeatureGenerator_hxx
 
-#include "itkSigmoidFeatureGenerator.h"
 #include "itkProgressAccumulator.h"
 
 namespace itk
diff --git a/include/itkSinglePhaseLevelSetSegmentationModule.hxx b/include/itkSinglePhaseLevelSetSegmentationModule.hxx
@@ -18,7 +18,6 @@
 #ifndef itkSinglePhaseLevelSetSegmentationModule_hxx
 #define itkSinglePhaseLevelSetSegmentationModule_hxx
 
-#include "itkSinglePhaseLevelSetSegmentationModule.h"
 #include "itkLandmarkSpatialObject.h"
 #include "itkIntensityWindowingImageFilter.h"
 
diff --git a/include/itkVesselEnhancingDiffusion3DImageFilter.hxx b/include/itkVesselEnhancingDiffusion3DImageFilter.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVesselEnhancingDiffusion3DImageFilter_hxx
 #define itkVesselEnhancingDiffusion3DImageFilter_hxx
 
-#include "itkVesselEnhancingDiffusion3DImageFilter.h"
 
 #include "itkCastImageFilter.h"
 #include "itkConstShapedNeighborhoodIterator.h"
diff --git a/include/itkVotingBinaryHoleFillFloodingImageFilter.hxx b/include/itkVotingBinaryHoleFillFloodingImageFilter.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVotingBinaryHoleFillFloodingImageFilter_hxx
 #define itkVotingBinaryHoleFillFloodingImageFilter_hxx
 
-#include "itkVotingBinaryHoleFillFloodingImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionExclusionIteratorWithIndex.h"
diff --git a/include/itkWeightedSumFeatureAggregator.hxx b/include/itkWeightedSumFeatureAggregator.hxx
@@ -18,7 +18,6 @@
 #ifndef itkWeightedSumFeatureAggregator_hxx
 #define itkWeightedSumFeatureAggregator_hxx
 
-#include "itkWeightedSumFeatureAggregator.h"
 #include "itkImageSpatialObject.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageFileWriter.h"
