diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt
index d0325337da..261168c542 100644
--- a/src/liboslcomp/CMakeLists.txt
+++ b/src/liboslcomp/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries (${local_lib}
         ${CMAKE_DL_LIBS}
         ${CLANG_LIBRARIES} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS}
         ${LLVM_SYSTEM_LIBRARIES})
+target_include_directories (${local_lib}  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
 
 # link with (system) library to prevent missing symbols inside clangDriver.lib
 if (MSVC)
diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
index eb7c6cb000..8b9cfccda9 100644
--- a/src/liboslexec/CMakeLists.txt
+++ b/src/liboslexec/CMakeLists.txt
@@ -539,6 +539,9 @@ target_include_directories (${local_lib}
         "${CMAKE_SOURCE_DIR}/src/liboslcomp"
         ${ROBINMAP_INCLUDES}
     )
+
+target_include_directories (${local_lib}  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
+
 target_compile_definitions (${local_lib}
     PRIVATE
         OSL_EXPORTS
@@ -607,16 +610,19 @@ install_targets (${local_lib})
 if (OSL_BUILD_TESTS AND BUILD_TESTING)
     add_executable (accum_test accum_test.cpp)
     target_link_libraries (accum_test PRIVATE oslexec ${CMAKE_DL_LIBS})
+    target_include_directories (accum_test  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
     set_target_properties (accum_test PROPERTIES FOLDER "Unit Tests")
     add_test (unit_accum ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/accum_test)
 
     add_executable (dual_test dual_test.cpp)
     target_link_libraries (dual_test PRIVATE OpenImageIO::OpenImageIO Imath::Imath ${CMAKE_DL_LIBS})
+    target_include_directories (dual_test  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
     set_target_properties (dual_test PROPERTIES FOLDER "Unit Tests")
     add_test (unit_dual ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dual_test)
 
     add_executable (llvmutil_test llvmutil_test.cpp)
     target_link_libraries (llvmutil_test PRIVATE oslexec ${CMAKE_DL_LIBS})
+    target_include_directories (llvmutil_test  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
     set_target_properties (llvmutil_test PROPERTIES FOLDER "Unit Tests")
     add_test (unit_llvmutil ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/llvmutil_test)
 endif ()
diff --git a/src/liboslnoise/CMakeLists.txt b/src/liboslnoise/CMakeLists.txt
index f78135188f..23bd41147f 100644
--- a/src/liboslnoise/CMakeLists.txt
+++ b/src/liboslnoise/CMakeLists.txt
@@ -13,6 +13,7 @@ target_include_directories (${local_lib}
         ${CMAKE_INSTALL_FULL_INCLUDEDIR}
     PRIVATE
         ../liboslexec)
+target_include_directories (${local_lib}  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
 target_link_libraries (${local_lib}
     PUBLIC
         OpenImageIO::OpenImageIO
@@ -45,6 +46,7 @@ install_targets (${local_lib})
 if (OSL_BUILD_TESTS AND BUILD_TESTING)
     add_executable (oslnoise_test oslnoise_test.cpp)
     set_target_properties (oslnoise_test PROPERTIES FOLDER "Unit Tests")
+    target_include_directories (oslnoise_test BEFORE PRIVATE ${OpenImageIO_INCLUDES})
     target_link_libraries (oslnoise_test PRIVATE oslnoise)
     add_test (unit_oslnoise ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/oslnoise_test)
 endif()
diff --git a/src/liboslquery/CMakeLists.txt b/src/liboslquery/CMakeLists.txt
index 231eaa8afc..70a252595e 100644
--- a/src/liboslquery/CMakeLists.txt
+++ b/src/liboslquery/CMakeLists.txt
@@ -18,6 +18,7 @@ target_link_libraries (${local_lib}
     PUBLIC
         OpenImageIO::OpenImageIO_Util
     )
+target_include_directories (${local_lib}  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
 
 target_compile_features (${local_lib}
                          INTERFACE cxx_std_${DOWNSTREAM_CXX_STANDARD})
diff --git a/src/oslc/CMakeLists.txt b/src/oslc/CMakeLists.txt
index f1f7dff8c4..7750fd1413 100644
--- a/src/oslc/CMakeLists.txt
+++ b/src/oslc/CMakeLists.txt
@@ -12,5 +12,6 @@ if (NOT BUILD_SHARED_LIBS)
 endif ()
 
 add_executable ( oslc ${oslc_srcs} )
+target_include_directories ( oslc  BEFORE PRIVATE ${OpenImageIO_INCLUDES})
 target_link_libraries ( oslc PRIVATE oslcomp ${CMAKE_DL_LIBS})
 install_targets (oslc)
diff --git a/src/oslinfo/CMakeLists.txt b/src/oslinfo/CMakeLists.txt
index bb12dbc065..498271df0d 100644
--- a/src/oslinfo/CMakeLists.txt
+++ b/src/oslinfo/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 set ( oslinfo_srcs oslinfo.cpp )
 add_executable ( oslinfo ${oslinfo_srcs} )
+target_include_directories (oslinfo BEFORE PRIVATE ${OpenImageIO_INCLUDES})
 target_link_libraries (oslinfo
                        PRIVATE oslquery)
 install_targets (oslinfo)
diff --git a/src/osltoy/CMakeLists.txt b/src/osltoy/CMakeLists.txt
index a8c93a4602..59418ed385 100644
--- a/src/osltoy/CMakeLists.txt
+++ b/src/osltoy/CMakeLists.txt
@@ -9,6 +9,7 @@ endif()
 set (osltoy_srcs
      osltoymain.cpp osltoyapp.cpp codeeditor.cpp osltoyrenderer.cpp)
 add_executable (osltoy ${osltoy_srcs})
+target_include_directories (osltoy BEFORE PRIVATE ${OpenImageIO_INCLUDES})
 set_target_properties (osltoy PROPERTIES FOLDER "Tools")
 target_link_libraries (osltoy
     PRIVATE
diff --git a/src/testrender/CMakeLists.txt b/src/testrender/CMakeLists.txt
index 657572b012..6b01e7e2a4 100644
--- a/src/testrender/CMakeLists.txt
+++ b/src/testrender/CMakeLists.txt
@@ -77,6 +77,8 @@ endif ()
 
 add_executable (testrender ${testrender_srcs})
 
+target_include_directories (testrender BEFORE PRIVATE ${OpenImageIO_INCLUDES})
+
 target_link_libraries (testrender
     PRIVATE
         oslexec oslquery oslcomp BSDL
diff --git a/src/testshade/CMakeLists.txt b/src/testshade/CMakeLists.txt
index 29cab5a18c..759b6c13fa 100644
--- a/src/testshade/CMakeLists.txt
+++ b/src/testshade/CMakeLists.txt
@@ -77,6 +77,8 @@ EMBED_LLVM_BITCODE_IN_CPP ( "${rs_srcs}" "_host" "testshade_llvm_compiled_rs" te
 
 add_executable ( testshade ${testshade_srcs} testshademain.cpp )
 
+target_include_directories (testshade BEFORE PRIVATE ${OpenImageIO_INCLUDES})
+
 target_link_libraries (testshade
                        PRIVATE
                            oslexec oslquery oslcomp)
@@ -107,12 +109,14 @@ if (NOT CODECOV)
     target_link_libraries (libtestshade
                            PRIVATE
                                oslexec oslquery oslcomp)
+    target_include_directories (libtestshade BEFORE PRIVATE ${OpenImageIO_INCLUDES})
     set_target_properties (libtestshade PROPERTIES PREFIX "")
 
     install_targets ( libtestshade )
 
     # The 'testshade_dso' executable
     add_executable ( testshade_dso testshade_dso.cpp )
+    target_include_directories (testshade_dso BEFORE PRIVATE ${OpenImageIO_INCLUDES})
     target_link_libraries (testshade_dso
                            PRIVATE
                                OpenImageIO::OpenImageIO