diff --git a/src/lib/Iex/CMakeLists.txt b/src/lib/Iex/CMakeLists.txt
index e72dbf0a7b..84a5d64fa5 100644
--- a/src/lib/Iex/CMakeLists.txt
+++ b/src/lib/Iex/CMakeLists.txt
@@ -6,21 +6,21 @@ openexr_define_library(Iex
   CURDIR ${CMAKE_CURRENT_SOURCE_DIR}
   SOURCES
     IexBaseExc.cpp
-    IexThrowErrnoExc.cpp
     IexMathFloatExc.cpp
     IexMathFpu.cpp
+    IexThrowErrnoExc.cpp
   HEADERS
+    Iex.h
     IexBaseExc.h
-    IexMathExc.h
-    IexThrowErrnoExc.h
     IexErrnoExc.h
+    IexExport.h
+    IexForward.h
     IexMacros.h
+    IexMathExc.h
     IexMathFloatExc.h
     IexMathIeeeExc.h
-    Iex.h
     IexNamespace.h
-    IexExport.h
-    IexForward.h
+    IexThrowErrnoExc.h
   DEPENDENCIES
     OpenEXR::Config
   )
diff --git a/src/lib/IlmThread/CMakeLists.txt b/src/lib/IlmThread/CMakeLists.txt
index 309ee63b3e..10dfd66b54 100644
--- a/src/lib/IlmThread/CMakeLists.txt
+++ b/src/lib/IlmThread/CMakeLists.txt
@@ -8,21 +8,21 @@ openexr_define_library(IlmThread
     IlmThread.cpp
     IlmThreadPool.cpp
     IlmThreadSemaphore.cpp
-    IlmThreadSemaphorePosixCompat.cpp
-    IlmThreadSemaphorePosix.cpp
     IlmThreadSemaphoreOSX.cpp
+    IlmThreadSemaphorePosix.cpp
+    IlmThreadSemaphorePosixCompat.cpp
     IlmThreadSemaphoreWin32.cpp
   HEADERS
-    IlmThreadPool.h
     IlmThread.h
-    IlmThreadSemaphore.h
-    IlmThreadMutex.h
-    IlmThreadNamespace.h
     IlmThreadExport.h
     IlmThreadForward.h
+    IlmThreadMutex.h
+    IlmThreadNamespace.h
+    IlmThreadPool.h
+    IlmThreadSemaphore.h
   DEPENDENCIES
-    OpenEXR::Config
     OpenEXR::Iex
+    OpenEXR::Config
 )
 
 if(OPENEXR_ENABLE_THREADING)
diff --git a/src/lib/OpenEXR/CMakeLists.txt b/src/lib/OpenEXR/CMakeLists.txt
index adbd618174..e91b476887 100644
--- a/src/lib/OpenEXR/CMakeLists.txt
+++ b/src/lib/OpenEXR/CMakeLists.txt
@@ -7,186 +7,186 @@ openexr_define_library(OpenEXR
   SOURCES
     b44ExpLogTable.h
     dwaLookups.h
+    ImfAcesFile.cpp
     ImfAttribute.cpp
+    ImfB44Compressor.cpp
     ImfBoxAttribute.cpp
-    ImfCRgbaFile.cpp
     ImfChannelList.cpp
     ImfChannelListAttribute.cpp
+    ImfChromaticities.cpp
+    ImfChromaticitiesAttribute.cpp
+    ImfCompositeDeepScanLine.cpp
+    ImfCompressionAttribute.cpp
+    ImfCompressor.cpp
+    ImfConvert.cpp
+    ImfCRgbaFile.cpp
+    ImfDeepCompositing.cpp
+    ImfDeepFrameBuffer.cpp
+    ImfDeepImageStateAttribute.cpp
+    ImfDeepScanLineInputFile.cpp
+    ImfDeepScanLineInputPart.cpp
+    ImfDeepScanLineOutputFile.cpp
+    ImfDeepScanLineOutputPart.cpp
+    ImfDeepTiledInputFile.cpp
+    ImfDeepTiledInputPart.cpp
+    ImfDeepTiledOutputFile.cpp
+    ImfDeepTiledOutputPart.cpp
+    ImfDoubleAttribute.cpp
+    ImfDwaCompressor.cpp
+    ImfEnvmap.cpp
+    ImfEnvmapAttribute.cpp
+    ImfFastHuf.cpp
     ImfFloatAttribute.cpp
+    ImfFloatVectorAttribute.cpp
     ImfFrameBuffer.cpp
+    ImfFramesPerSecond.cpp
+    ImfGenericInputFile.cpp
+    ImfGenericOutputFile.cpp
     ImfHeader.cpp
-    ImfIO.cpp
+    ImfHuf.cpp
+    ImfIDManifest.cpp
+    ImfIDManifestAttribute.cpp
     ImfInputFile.cpp
+    ImfInputPart.cpp
+    ImfInputPartData.cpp
     ImfIntAttribute.cpp
+    ImfIO.cpp
+    ImfKeyCode.cpp
+    ImfKeyCodeAttribute.cpp
     ImfLineOrderAttribute.cpp
+    ImfLut.cpp
     ImfMatrixAttribute.cpp
+    ImfMisc.cpp
+    ImfMultiPartInputFile.cpp
+    ImfMultiPartOutputFile.cpp
+    ImfMultiView.cpp
     ImfOpaqueAttribute.cpp
     ImfOutputFile.cpp
-    ImfRgbaFile.cpp
-    ImfStringAttribute.cpp
-    ImfVecAttribute.cpp
-    ImfHuf.cpp
-    ImfThreading.cpp
-    ImfWav.cpp
-    ImfLut.cpp
-    ImfCompressor.cpp
-    ImfRleCompressor.cpp
-    ImfZipCompressor.cpp
+    ImfOutputPart.cpp
+    ImfOutputPartData.cpp
+    ImfPartType.cpp
     ImfPizCompressor.cpp
-    ImfB44Compressor.cpp
-    ImfDwaCompressor.cpp
-    ImfMisc.cpp
-    ImfCompressionAttribute.cpp
-    ImfDoubleAttribute.cpp
-    ImfConvert.cpp
     ImfPreviewImage.cpp
     ImfPreviewImageAttribute.cpp
-    ImfVersion.cpp
-    ImfChromaticities.cpp
-    ImfChromaticitiesAttribute.cpp
-    ImfKeyCode.cpp
-    ImfKeyCodeAttribute.cpp
-    ImfTimeCode.cpp
-    ImfTimeCodeAttribute.cpp
+    ImfPxr24Compressor.cpp
     ImfRational.cpp
     ImfRationalAttribute.cpp
-    ImfFramesPerSecond.cpp
+    ImfRgbaFile.cpp
+    ImfRgbaYca.cpp
+    ImfRle.cpp
+    ImfRleCompressor.cpp
+    ImfScanLineInputFile.cpp
     ImfStandardAttributes.cpp
     ImfStdIO.cpp
-    ImfEnvmap.cpp
-    ImfEnvmapAttribute.cpp
-    ImfScanLineInputFile.cpp
+    ImfStringAttribute.cpp
+    ImfStringVectorAttribute.cpp
+    ImfSystemSpecific.cpp
+    ImfTestFile.cpp
+    ImfThreading.cpp
+    ImfTileDescriptionAttribute.cpp
     ImfTiledInputFile.cpp
+    ImfTiledInputPart.cpp
     ImfTiledMisc.cpp
     ImfTiledOutputFile.cpp
+    ImfTiledOutputPart.cpp
     ImfTiledRgbaFile.cpp
-    ImfTileDescriptionAttribute.cpp
     ImfTileOffsets.cpp
-    ImfRgbaYca.cpp
-    ImfPxr24Compressor.cpp
-    ImfTestFile.cpp
-    ImfStringVectorAttribute.cpp
-    ImfMultiView.cpp
-    ImfAcesFile.cpp
-    ImfMultiPartOutputFile.cpp
-    ImfGenericOutputFile.cpp
-    ImfOutputPartData.cpp
-    ImfMultiPartInputFile.cpp
-    ImfGenericInputFile.cpp
-    ImfPartType.cpp
-    ImfInputPartData.cpp
-    ImfOutputPart.cpp
-    ImfTiledOutputPart.cpp
-    ImfInputPart.cpp
-    ImfTiledInputPart.cpp
-    ImfDeepScanLineInputPart.cpp
-    ImfDeepScanLineOutputPart.cpp
-    ImfDeepScanLineInputFile.cpp
-    ImfDeepScanLineOutputFile.cpp
-    ImfDeepTiledInputPart.cpp
-    ImfDeepTiledOutputPart.cpp
-    ImfDeepTiledInputFile.cpp
-    ImfDeepTiledOutputFile.cpp
-    ImfDeepFrameBuffer.cpp
-    ImfDeepCompositing.cpp
-    ImfCompositeDeepScanLine.cpp
-    ImfDeepImageStateAttribute.cpp
-    ImfFastHuf.cpp
-    ImfFloatVectorAttribute.cpp
-    ImfRle.cpp
-    ImfSystemSpecific.cpp
+    ImfTimeCode.cpp
+    ImfTimeCodeAttribute.cpp
+    ImfVecAttribute.cpp
+    ImfVersion.cpp
+    ImfWav.cpp
     ImfZip.cpp
-    ImfIDManifest.cpp
-    ImfIDManifestAttribute.cpp
+    ImfZipCompressor.cpp
   HEADERS
-    ImfForward.h
-    ImfExport.h
+    ImfAcesFile.h
+    ImfArray.h
     ImfAttribute.h
     ImfBoxAttribute.h
-    ImfCRgbaFile.h
     ImfChannelList.h
     ImfChannelListAttribute.h
+    ImfChromaticities.h
+    ImfChromaticitiesAttribute.h
+    ImfCompositeDeepScanLine.h
+    ImfCompression.h
     ImfCompressionAttribute.h
+    ImfConvert.h
+    ImfCRgbaFile.h
+    ImfDeepCompositing.h
+    ImfDeepFrameBuffer.h
+    ImfDeepImageState.h
+    ImfDeepImageStateAttribute.h
+    ImfDeepScanLineInputFile.h
+    ImfDeepScanLineInputPart.h
+    ImfDeepScanLineOutputFile.h
+    ImfDeepScanLineOutputPart.h
+    ImfDeepTiledInputFile.h
+    ImfDeepTiledInputPart.h
+    ImfDeepTiledOutputFile.h
+    ImfDeepTiledOutputPart.h
     ImfDoubleAttribute.h
+    ImfEnvmap.h
+    ImfEnvmapAttribute.h
+    ImfExport.h
     ImfFloatAttribute.h
+    ImfFloatVectorAttribute.h
+    ImfForward.h
     ImfFrameBuffer.h
+    ImfFramesPerSecond.h
+    ImfGenericInputFile.h
+    ImfGenericOutputFile.h
     ImfHeader.h
-    ImfIO.h
+    ImfHuf.h
+    ImfIDManifest.h
+    ImfIDManifestAttribute.h
     ImfInputFile.h
+    ImfInputPart.h
+    ImfInt64.h
     ImfIntAttribute.h
+    ImfIO.h
+    ImfKeyCode.h
+    ImfKeyCodeAttribute.h
+    ImfLineOrder.h
     ImfLineOrderAttribute.h
+    ImfLut.h
     ImfMatrixAttribute.h
+    ImfMultiPartInputFile.h
+    ImfMultiPartOutputFile.h
+    ImfMultiView.h
+    ImfName.h
+    ImfNamespace.h
     ImfOpaqueAttribute.h
     ImfOutputFile.h
-    ImfRgbaFile.h
-    ImfStringAttribute.h
-    ImfVecAttribute.h
-    ImfHuf.h
-    ImfWav.h
-    ImfLut.h
-    ImfArray.h
-    ImfCompression.h
-    ImfLineOrder.h
-    ImfName.h
+    ImfOutputPart.h
+    ImfPartHelper.h
+    ImfPartType.h
     ImfPixelType.h
-    ImfVersion.h
-    ImfXdr.h
-    ImfConvert.h
     ImfPreviewImage.h
     ImfPreviewImageAttribute.h
-    ImfChromaticities.h
-    ImfChromaticitiesAttribute.h
-    ImfKeyCode.h
-    ImfKeyCodeAttribute.h
-    ImfTimeCode.h
-    ImfTimeCodeAttribute.h
     ImfRational.h
     ImfRationalAttribute.h
-    ImfFramesPerSecond.h
+    ImfRgba.h
+    ImfRgbaFile.h
+    ImfRgbaYca.h
     ImfStandardAttributes.h
     ImfStdIO.h
-    ImfEnvmap.h
-    ImfEnvmapAttribute.h
-    ImfInt64.h
-    ImfRgba.h
+    ImfStringAttribute.h
+    ImfStringVectorAttribute.h
+    ImfTestFile.h
+    ImfThreading.h
     ImfTileDescription.h
     ImfTileDescriptionAttribute.h
     ImfTiledInputFile.h
+    ImfTiledInputPart.h
     ImfTiledOutputFile.h
-    ImfTiledRgbaFile.h
-    ImfRgbaYca.h
-    ImfTestFile.h
-    ImfThreading.h
-    ImfStringVectorAttribute.h
-    ImfMultiView.h
-    ImfAcesFile.h
-    ImfMultiPartOutputFile.h
-    ImfGenericOutputFile.h
-    ImfMultiPartInputFile.h
-    ImfGenericInputFile.h
-    ImfPartType.h
-    ImfPartHelper.h
-    ImfOutputPart.h
     ImfTiledOutputPart.h
-    ImfInputPart.h
-    ImfTiledInputPart.h
-    ImfDeepScanLineOutputFile.h
-    ImfDeepScanLineOutputPart.h
-    ImfDeepScanLineInputFile.h
-    ImfDeepScanLineInputPart.h
-    ImfDeepTiledInputFile.h
-    ImfDeepTiledInputPart.h
-    ImfDeepTiledOutputFile.h
-    ImfDeepTiledOutputPart.h
-    ImfDeepFrameBuffer.h
-    ImfDeepCompositing.h
-    ImfCompositeDeepScanLine.h
-    ImfNamespace.h
-    ImfDeepImageState.h
-    ImfDeepImageStateAttribute.h
-    ImfFloatVectorAttribute.h
-    ImfIDManifest.h
-    ImfIDManifestAttribute.h
+    ImfTiledRgbaFile.h
+    ImfTimeCode.h
+    ImfTimeCodeAttribute.h
+    ImfVecAttribute.h
+    ImfVersion.h
+    ImfWav.h
+    ImfXdr.h
   DEPENDENCIES
     OpenEXR::Config
     OpenEXR::Iex