Revert "Merge remote-tracking branch 'gl/gcasey/fix-macro-redefinition' into release-6.3"

Filters/Hybrid/vtkDepthSortPolyData.h

Filters/Hybrid/vtkPolyDataSilhouette.h

...ering/Annotation/Testing/Cxx/TestCubeAxesInnerGridAll.cxx

...g/Annotation/Testing/Cxx/TestCubeAxesInnerGridClosest.cxx

.../Annotation/Testing/Cxx/TestCubeAxesInnerGridFurthest.cxx

Rendering/Annotation/vtkAxisActor.cxx

Rendering/Annotation/vtkAxisActor.h

Rendering/Annotation/vtkAxisActor2D.h

Rendering/Annotation/vtkAxisFollower.cxx

Rendering/Annotation/vtkCubeAxesActor.cxx

Rendering/Annotation/vtkCubeAxesActor.h

Rendering/Annotation/vtkPolarAxesActor.cxx

Rendering/Annotation/vtkProp3DAxisFollower.cxx