--- oiio-Release-2.2.18.0/src/dpx.imageio/dpxinput.cpp.orig
+++ oiio-Release-2.2.18.0/src/dpx.imageio/dpxinput.cpp
@@ -6,7 +6,7 @@
 #include <iomanip>
 #include <memory>
 
-#include <OpenEXR/ImfTimeCode.h>  //For TimeCode support
+#include <OpenEXR-3/ImfTimeCode.h>  //For TimeCode support
 
 // Note: libdpx originally from: https://github.com/PatrickPalmer/dpx
 // But that seems not to be actively maintained.
--- oiio-Release-2.2.18.0/src/field3d.imageio/field3d_pvt.h.orig
+++ oiio-Release-2.2.18.0/src/field3d.imageio/field3d_pvt.h
@@ -8,7 +8,7 @@
 #include <OpenImageIO/Imath.h>
 
 #if OIIO_USING_IMATH >= 3
-#    include <Imath/ImathBox.h>
+#    include <Imath-3/ImathBox.h>
 #else
 #    include <OpenEXR/ImathBox.h>
 #endif
--- oiio-Release-2.2.18.0/src/include/OpenImageIO/Imath.h.in.orig
+++ oiio-Release-2.2.18.0/src/include/OpenImageIO/Imath.h.in
@@ -13,10 +13,10 @@
 #define OIIO_USING_IMATH @OIIO_USING_IMATH@
 
 #if OIIO_USING_IMATH >= 3
-#   include <Imath/ImathColor.h>
-#   include <Imath/ImathMatrix.h>
-#   include <Imath/ImathVec.h>
-#   include <Imath/half.h>
+#   include <Imath-3/ImathColor.h>
+#   include <Imath-3/ImathMatrix.h>
+#   include <Imath-3/ImathVec.h>
+#   include <Imath-3/half.h>
 #else
 #   include <OpenEXR/ImathColor.h>
 #   include <OpenEXR/ImathMatrix.h>
--- oiio-Release-2.2.18.0/src/libOpenImageIO/imagebufalgo_xform.cpp.orig
+++ oiio-Release-2.2.18.0/src/libOpenImageIO/imagebufalgo_xform.cpp
@@ -18,7 +18,7 @@
 #include <OpenImageIO/thread.h>
 
 #if OIIO_USING_IMATH >= 3
-#    include <Imath/ImathBox.h>
+#    include <Imath-3/ImathBox.h>
 #else
 #    include <OpenEXR/ImathBox.h>
 #endif
--- oiio-Release-2.2.18.0/src/libutil/fmath_test.cpp.orig
+++ oiio-Release-2.2.18.0/src/libutil/fmath_test.cpp
@@ -18,7 +18,7 @@
 #include <OpenImageIO/unittest.h>
 
 #if OIIO_USING_IMATH >= 3
-#    include <Imath/ImathFun.h>
+#    include <Imath-3/ImathFun.h>
 #else
 #    include <OpenEXR/ImathFun.h>
 #endif
--- oiio-Release-2.2.18.0/src/libutil/typedesc_test.cpp.orig
+++ oiio-Release-2.2.18.0/src/libutil/typedesc_test.cpp
@@ -9,12 +9,14 @@
 #include <OpenImageIO/Imath.h>
 
 #if OIIO_USING_IMATH >= 3
-#    include <Imath/ImathBox.h>
+#    include <Imath-3/ImathBox.h>
+#    include <OpenEXR-3/ImfKeyCode.h>
+#    include <OpenEXR-3/ImfTimeCode.h>
 #else
 #    include <OpenEXR/ImathBox.h>
+#    include <OpenEXR/ImfKeyCode.h>
+#    include <OpenEXR/ImfTimeCode.h>
 #endif
-#include <OpenEXR/ImfKeyCode.h>
-#include <OpenEXR/ImfTimeCode.h>
 
 #include <OpenImageIO/typedesc.h>
 #include <OpenImageIO/unittest.h>
--- oiio-Release-2.2.18.0/src/oiiotool/oiiotool.cpp.orig
+++ oiio-Release-2.2.18.0/src/oiiotool/oiiotool.cpp
@@ -16,7 +16,7 @@
 #include <utility>
 #include <vector>
 
-#include <OpenEXR/ImfTimeCode.h>
+#include <OpenEXR-3/ImfTimeCode.h>
 
 #include <OpenImageIO/argparse.h>
 #include <OpenImageIO/color.h>
--- oiio-Release-2.2.18.0/src/openexr.imageio/exrinput.cpp.orig
+++ oiio-Release-2.2.18.0/src/openexr.imageio/exrinput.cpp
@@ -22,11 +22,11 @@
 
 #include <OpenImageIO/platform.h>
 
-#include <OpenEXR/ImfChannelList.h>
-#include <OpenEXR/ImfEnvmap.h>
-#include <OpenEXR/ImfInputFile.h>
-#include <OpenEXR/ImfTestFile.h>
-#include <OpenEXR/ImfTiledInputFile.h>
+#include <OpenEXR-3/ImfChannelList.h>
+#include <OpenEXR-3/ImfEnvmap.h>
+#include <OpenEXR-3/ImfInputFile.h>
+#include <OpenEXR-3/ImfTestFile.h>
+#include <OpenEXR-3/ImfTiledInputFile.h>
 
 #ifdef OPENEXR_VERSION_MAJOR
 #    define OPENEXR_CODED_VERSION                                    \
@@ -37,7 +37,7 @@
 #endif
 
 #if OPENEXR_CODED_VERSION >= 20400 \
-    || __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)
+    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
 #    define OPENEXR_HAS_FLOATVECTOR 1
 #else
 #    define OPENEXR_HAS_FLOATVECTOR 0
@@ -48,37 +48,37 @@
 OIIO_PRAGMA_VISIBILITY_PUSH
 OIIO_PRAGMA_WARNING_PUSH
 OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
-#include <OpenEXR/IexBaseExc.h>
-#include <OpenEXR/IexThrowErrnoExc.h>
-#include <OpenEXR/ImfBoxAttribute.h>
-#include <OpenEXR/ImfChromaticitiesAttribute.h>
-#include <OpenEXR/ImfCompressionAttribute.h>
-#include <OpenEXR/ImfDeepFrameBuffer.h>
-#include <OpenEXR/ImfDeepScanLineInputPart.h>
-#include <OpenEXR/ImfDeepTiledInputPart.h>
-#include <OpenEXR/ImfDoubleAttribute.h>
-#include <OpenEXR/ImfEnvmapAttribute.h>
-#include <OpenEXR/ImfFloatAttribute.h>
-#include <OpenEXR/ImfHeader.h>
+#include <OpenEXR-3/IexBaseExc.h>
+#include <OpenEXR-3/IexThrowErrnoExc.h>
+#include <OpenEXR-3/ImfBoxAttribute.h>
+#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
+#include <OpenEXR-3/ImfCompressionAttribute.h>
+#include <OpenEXR-3/ImfDeepFrameBuffer.h>
+#include <OpenEXR-3/ImfDeepScanLineInputPart.h>
+#include <OpenEXR-3/ImfDeepTiledInputPart.h>
+#include <OpenEXR-3/ImfDoubleAttribute.h>
+#include <OpenEXR-3/ImfEnvmapAttribute.h>
+#include <OpenEXR-3/ImfFloatAttribute.h>
+#include <OpenEXR-3/ImfHeader.h>
 #if OPENEXR_HAS_FLOATVECTOR
-#    include <OpenEXR/ImfFloatVectorAttribute.h>
+#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
 #endif
-#include <OpenEXR/ImfInputPart.h>
-#include <OpenEXR/ImfIntAttribute.h>
-#include <OpenEXR/ImfKeyCodeAttribute.h>
-#include <OpenEXR/ImfMatrixAttribute.h>
-#include <OpenEXR/ImfMultiPartInputFile.h>
-#include <OpenEXR/ImfPartType.h>
-#include <OpenEXR/ImfRationalAttribute.h>
-#include <OpenEXR/ImfStringAttribute.h>
-#include <OpenEXR/ImfStringVectorAttribute.h>
-#include <OpenEXR/ImfTiledInputPart.h>
-#include <OpenEXR/ImfTimeCodeAttribute.h>
-#include <OpenEXR/ImfVecAttribute.h>
+#include <OpenEXR-3/ImfInputPart.h>
+#include <OpenEXR-3/ImfIntAttribute.h>
+#include <OpenEXR-3/ImfKeyCodeAttribute.h>
+#include <OpenEXR-3/ImfMatrixAttribute.h>
+#include <OpenEXR-3/ImfMultiPartInputFile.h>
+#include <OpenEXR-3/ImfPartType.h>
+#include <OpenEXR-3/ImfRationalAttribute.h>
+#include <OpenEXR-3/ImfStringAttribute.h>
+#include <OpenEXR-3/ImfStringVectorAttribute.h>
+#include <OpenEXR-3/ImfTiledInputPart.h>
+#include <OpenEXR-3/ImfTimeCodeAttribute.h>
+#include <OpenEXR-3/ImfVecAttribute.h>
 OIIO_PRAGMA_WARNING_POP
 OIIO_PRAGMA_VISIBILITY_POP
 
-#include <OpenEXR/ImfCRgbaFile.h>
+#include <OpenEXR-3/ImfCRgbaFile.h>
 
 #include "imageio_pvt.h"
 #include <OpenImageIO/dassert.h>
--- oiio-Release-2.2.18.0/src/openexr.imageio/exroutput.cpp.orig
+++ oiio-Release-2.2.18.0/src/openexr.imageio/exroutput.cpp
@@ -13,10 +13,10 @@
 
 #include <OpenImageIO/platform.h>
 
-#include <OpenEXR/ImfChannelList.h>
-#include <OpenEXR/ImfEnvmap.h>
-#include <OpenEXR/ImfOutputFile.h>
-#include <OpenEXR/ImfTiledOutputFile.h>
+#include <OpenEXR-3/ImfChannelList.h>
+#include <OpenEXR-3/ImfEnvmap.h>
+#include <OpenEXR-3/ImfOutputFile.h>
+#include <OpenEXR-3/ImfTiledOutputFile.h>
 
 #ifdef OPENEXR_VERSION_MAJOR
 #    define OPENEXR_CODED_VERSION                                    \
@@ -27,7 +27,7 @@
 #endif
 
 #if OPENEXR_CODED_VERSION >= 20400 \
-    || __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)
+    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
 #    define OPENEXR_HAS_FLOATVECTOR 1
 #else
 #    define OPENEXR_HAS_FLOATVECTOR 0
@@ -38,34 +38,34 @@
 OIIO_PRAGMA_VISIBILITY_PUSH
 OIIO_PRAGMA_WARNING_PUSH
 OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
-#include <OpenEXR/IexBaseExc.h>
-#include <OpenEXR/ImfBoxAttribute.h>
-#include <OpenEXR/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
-#include <OpenEXR/ImfChromaticitiesAttribute.h>
-#include <OpenEXR/ImfCompressionAttribute.h>
-#include <OpenEXR/ImfEnvmapAttribute.h>
-#include <OpenEXR/ImfFloatAttribute.h>
+#include <OpenEXR-3/IexBaseExc.h>
+#include <OpenEXR-3/ImfBoxAttribute.h>
+#include <OpenEXR-3/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
+#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
+#include <OpenEXR-3/ImfCompressionAttribute.h>
+#include <OpenEXR-3/ImfEnvmapAttribute.h>
+#include <OpenEXR-3/ImfFloatAttribute.h>
 #if OPENEXR_HAS_FLOATVECTOR
-#    include <OpenEXR/ImfFloatVectorAttribute.h>
+#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
 #endif
-#include <OpenEXR/ImfHeader.h>
-#include <OpenEXR/ImfIntAttribute.h>
-#include <OpenEXR/ImfKeyCodeAttribute.h>
-#include <OpenEXR/ImfMatrixAttribute.h>
-#include <OpenEXR/ImfRationalAttribute.h>
-#include <OpenEXR/ImfStringAttribute.h>
-#include <OpenEXR/ImfTimeCodeAttribute.h>
-#include <OpenEXR/ImfVecAttribute.h>
-
-#include <OpenEXR/ImfDeepFrameBuffer.h>
-#include <OpenEXR/ImfDeepScanLineOutputPart.h>
-#include <OpenEXR/ImfDeepTiledOutputPart.h>
-#include <OpenEXR/ImfDoubleAttribute.h>
-#include <OpenEXR/ImfMultiPartOutputFile.h>
-#include <OpenEXR/ImfOutputPart.h>
-#include <OpenEXR/ImfPartType.h>
-#include <OpenEXR/ImfStringVectorAttribute.h>
-#include <OpenEXR/ImfTiledOutputPart.h>
+#include <OpenEXR-3/ImfHeader.h>
+#include <OpenEXR-3/ImfIntAttribute.h>
+#include <OpenEXR-3/ImfKeyCodeAttribute.h>
+#include <OpenEXR-3/ImfMatrixAttribute.h>
+#include <OpenEXR-3/ImfRationalAttribute.h>
+#include <OpenEXR-3/ImfStringAttribute.h>
+#include <OpenEXR-3/ImfTimeCodeAttribute.h>
+#include <OpenEXR-3/ImfVecAttribute.h>
+
+#include <OpenEXR-3/ImfDeepFrameBuffer.h>
+#include <OpenEXR-3/ImfDeepScanLineOutputPart.h>
+#include <OpenEXR-3/ImfDeepTiledOutputPart.h>
+#include <OpenEXR-3/ImfDoubleAttribute.h>
+#include <OpenEXR-3/ImfMultiPartOutputFile.h>
+#include <OpenEXR-3/ImfOutputPart.h>
+#include <OpenEXR-3/ImfPartType.h>
+#include <OpenEXR-3/ImfStringVectorAttribute.h>
+#include <OpenEXR-3/ImfTiledOutputPart.h>
 OIIO_PRAGMA_WARNING_POP
 OIIO_PRAGMA_VISIBILITY_POP