diff --git a/recipes/opencolorio/all/patches/1.1.1.patch b/recipes/opencolorio/all/patches/1.1.1.patch
deleted file mode 100644
index 579e529242a44..0000000000000
--- a/recipes/opencolorio/all/patches/1.1.1.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4f31196..b73396b4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,11 +4,13 @@ set(OCIO_VERSION_MINOR 1)
- set(OCIO_VERSION_PATCH 1)
- 
- cmake_minimum_required(VERSION 2.8)
--set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
-+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/share/cmake)
- if(NOT DEFINED CMAKE_FIRST_RUN)
-     SET(CMAKE_FIRST_RUN 1 CACHE INTERNAL "")
- endif()
- 
-+set(CMAKE_CXX_STANDARD 11)
-+
- ###############################################################################
- ### GLOBAL ###
- 
-@@ -142,11 +144,11 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
- ###############################################################################
- ### Python ###
- 
--OCIOFindPython()
-+#OCIOFindPython()
- 
- # Find Python, used for (possibly) building pyglue, and now to
- # construct the external project path
--set(EXTDIST_ROOT ${CMAKE_BINARY_DIR}/ext/dist)
-+set(EXTDIST_ROOT ${PROJECT_BINARY_DIR}/ext/dist)
- set(EXTDIST_BINPATH ${EXTDIST_ROOT}/bin)
- if(PYTHON_OK)
-     set(EXTDIST_PYTHONPATH ${EXTDIST_ROOT}/${PYTHON_VARIANT_PATH})
-@@ -170,7 +172,12 @@ messageonce("Setting EXTDIST_PYTHONPATH: ${EXTDIST_PYTHONPATH}")
- 
- if(USE_EXTERNAL_TINYXML)
-     set(TINYXML_VERSION_MIN "2.6.1")
--    find_package(TinyXML)
-+    find_package(TinyXML REQUIRED)
-+    set(TINYXML_FOUND ${TinyXML_FOUND})
-+    set(TINYXML_LIBRARIES TinyXML::TinyXML)
-+    set(TINYXML_VERSION "${TinyXML_VERSION}")
-+    list(APPEND EXTERNAL_LIBRARIES ${TINYXML_LIBRARIES})
-+
-     if(TINYXML_FOUND)
-         if(TINYXML_VERSION VERSION_EQUAL ${TINYXML_VERSION_MIN} OR
-            TINYXML_VERSION VERSION_GREATER ${TINYXML_VERSION_MIN})
-@@ -251,6 +258,13 @@ endif(USE_EXTERNAL_TINYXML)
- if(USE_EXTERNAL_YAML)
-     # Set minimum yaml version for non-patched sources.
-     set(YAML_VERSION_MIN "0.3.0")
-+    find_package(yaml-cpp REQUIRED)
-+    set(YAML_CPP_INCLUDE_DIRS "${CONAN_INCLUDE_DIRS_YAML-CPP}")
-+    set(YAML_CPP_LIBRARIES yaml-cpp::yaml-cpp)
-+    set(YAML_CPP_VERSION "${yaml-cpp_VERSION}")
-+    list(APPEND EXTERNAL_LIBRARIES ${YAML_CPP_LIBRARIES})
-+
-+    if(0)
-     include(FindPkgConfig)
-     pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
-     find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
-@@ -293,6 +307,7 @@ if(USE_EXTERNAL_YAML)
-     else(YAML_CPP_FOUND)
-         message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.")
-     endif(YAML_CPP_FOUND)
-+    endif()
- else(USE_EXTERNAL_YAML) ## provide 2 ways to build this dependency
-     set(YAML_CPP_VERSION 0.3.0)
-     set(YAML_CPP_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist -DYAML_CPP_BUILD_TOOLS:BOOL=FALSE -DOCIO_INLINES_HIDDEN:BOOL=${OCIO_INLINES_HIDDEN})
-@@ -384,7 +399,7 @@ else()
-     set(OCIO_INLINES_HIDDEN OFF)
- endif()
- 
--set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
-+set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
- 
- set(EXTERNAL_LINK_FLAGS "")
- set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
-@@ -460,7 +475,7 @@ endif()
- if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
- 
-     # Try to find OpenImageIO (OIIO) and OpenGL stuff
--    OCIOFindOpenImageIO()
-+    #OCIOFindOpenImageIO()
-     
-     if(OIIO_FOUND)
-         add_subdirectory(src/apps/ocioconvert)
-@@ -528,7 +543,7 @@ endif()
- 
- ###############################################################################
- ### Configure env script ###
--configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-+configure_file(${PROJECT_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
- INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-@@ -597,7 +612,7 @@ if(TARGET OpenColorIO_STATIC)
-     endif()
- endif()
- install(EXPORT OpenColorIO DESTINATION cmake)
--file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-+file(WRITE "${PROJECT_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-     
-@@ -646,4 +661,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${PROJECT_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-diff --git a/share/cmake/OCIOMacros.cmake b/share/cmake/OCIOMacros.cmake
-index b9fb2393..b1a206e7 100644
---- a/share/cmake/OCIOMacros.cmake
-+++ b/share/cmake/OCIOMacros.cmake
-@@ -356,9 +356,9 @@ ENDMACRO()
- 
- MACRO(ExtractRstCPP INFILE OUTFILE)
-    add_custom_command(
--      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-       OUTPUT ${OUTFILE}
--      COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
-+      COMMAND ${PYTHON} ${PROJECT_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
-       DEPENDS ${INFILE}
-       COMMENT "Extracting reStructuredText from ${INFILE} (using old process)"
-    )
-@@ -366,9 +366,9 @@ ENDMACRO()
- 
- MACRO(ExtractRstSimple INFILE OUTFILE)
-    add_custom_command(
--      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-       OUTPUT ${OUTFILE}
--      COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
-+      COMMAND ${PYTHON} ${PROJECT_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
-       DEPENDS ${INFILE}
-       COMMENT "Extracting reStructuredText from ${INFILE}"
-    )
-diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt
-index d31b4e34..4aa1efb2 100644
---- a/src/apps/ociobakelut/CMakeLists.txt
-+++ b/src/apps/ociobakelut/CMakeLists.txt
-@@ -1,6 +1,10 @@
- # LCMS
--include(FindPkgConfig FindPackageMessage)
--pkg_check_modules(LCMS QUIET lcms2)
-+find_package(lcms REQUIRED)
-+set(LCMS_FOUND ${lcms_FOUND})
-+set(LCMS_VERSION ${lcms_VERSION})
-+set(LCMS_LIBRARIES ${lcms_LIBRARIES})
-+set(LCMS_INCLUDE_DIR ${lcms_INCLUDE_DIR})
-+
- if(LCMS_FOUND AND (LCMS_VERSION VERSION_EQUAL 2.1 OR LCMS_VERSION VERSION_GREATER 2.1))
-     FIND_PACKAGE_MESSAGE(LCMS "Found lcms: ${LCMS_LIBRARIES}"
-         "${LCMS_INCLUDE_DIR}")
-@@ -29,12 +33,12 @@ else()
-     set(LCMS_LIBRARIES 		${PROJECT_BINARY_DIR}/ext/dist/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lcms2${CMAKE_STATIC_LIBRARY_SUFFIX})
- endif()
- 
--file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
-+file(GLOB_RECURSE share_src_files "${PROJECT_SOURCE_DIR}/src/apps/share/*.cpp")
- 
- include_directories(
--    ${CMAKE_SOURCE_DIR}/export/
--    ${CMAKE_BINARY_DIR}/export/
--    ${CMAKE_SOURCE_DIR}/src/apps/share/
-+    ${PROJECT_SOURCE_DIR}/export/
-+    ${PROJECT_BINARY_DIR}/export/
-+    ${PROJECT_SOURCE_DIR}/src/apps/share/
-     ${LCMS_INCLUDE_DIRS}
-     ${Boost_INCLUDE_DIR}
- )
-diff --git a/src/apps/ociocheck/CMakeLists.txt b/src/apps/ociocheck/CMakeLists.txt
-index 4955f4db..14b5017f 100644
---- a/src/apps/ociocheck/CMakeLists.txt
-+++ b/src/apps/ociocheck/CMakeLists.txt
-@@ -1,9 +1,9 @@
--file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
-+file(GLOB_RECURSE share_src_files "${PROJECT_SOURCE_DIR}/src/apps/share/*.cpp")
- 
- include_directories(
--    ${CMAKE_SOURCE_DIR}/export/
--    ${CMAKE_BINARY_DIR}/export/
--    ${CMAKE_SOURCE_DIR}/src/apps/share/
-+    ${PROJECT_SOURCE_DIR}/export/
-+    ${PROJECT_BINARY_DIR}/export/
-+    ${PROJECT_SOURCE_DIR}/src/apps/share/
-     ${Boost_INCLUDE_DIR}
-     )
- 
-diff --git a/src/core/CDLTransform.cpp b/src/core/CDLTransform.cpp
-index 8b05debc..a7d6031f 100644
---- a/src/core/CDLTransform.cpp
-+++ b/src/core/CDLTransform.cpp
-@@ -126,7 +126,11 @@ OCIO_NAMESPACE_ENTER
-             TiXmlPrinter printer;
-             printer.SetStreamPrinting();
-             doc.Accept( &printer );
--            return printer.Str();
-+            #ifdef TIXML_USE_STL
-+                return printer.Str();
-+            #else
-+                return printer.CStr();
-+            #endif
-         }
-     }
-     
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 1eb691b6..a2f099ab 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -2,29 +2,29 @@
- ### OCIO CORE ###
- 
- include_directories(
--    ${CMAKE_SOURCE_DIR}/export/
--    ${CMAKE_BINARY_DIR}/export/
--    ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
-+    ${PROJECT_SOURCE_DIR}/export/
-+    ${PROJECT_BINARY_DIR}/export/
-+    ${PROJECT_SOURCE_DIR}/ext/oiio/src/include
-     ${EXTERNAL_INCLUDE_DIRS}
- )
- 
--file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
--file(GLOB_RECURSE core_export_headers "${CMAKE_SOURCE_DIR}/export/OpenColorIO/*.h")
-+file(GLOB_RECURSE core_src_files "${PROJECT_SOURCE_DIR}/src/core/*.cpp")
-+file(GLOB_RECURSE core_export_headers "${PROJECT_SOURCE_DIR}/export/OpenColorIO/*.h")
- 
- message(STATUS "Create OpenColorABI.h from OpenColorABI.h.in")
--configure_file(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorABI.h.in
--    ${CMAKE_BINARY_DIR}/export/OpenColorABI.h @ONLY)
--list(APPEND core_export_headers ${CMAKE_BINARY_DIR}/export/OpenColorABI.h)
-+configure_file(${PROJECT_SOURCE_DIR}/export/OpenColorIO/OpenColorABI.h.in
-+    ${PROJECT_BINARY_DIR}/export/OpenColorABI.h @ONLY)
-+list(APPEND core_export_headers ${PROJECT_BINARY_DIR}/export/OpenColorABI.h)
- 
- # Process all warnings as errors
- 
- if(WIN32)
-     # On debug mode there are other kinds of warning...
-     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
--        set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
-+        # set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
-     endif()
- else()
--    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
-+    # set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
- 
- # SHARED
-@@ -75,7 +75,7 @@ endif()
- # STATIC
- 
- if(OCIO_BUILD_STATIC)
--    list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
-+    list(REMOVE_ITEM core_src_files ${PROJECT_SOURCE_DIR}/src/core/UnitTest.cpp)
-     add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
-     add_dependencies(OpenColorIO_STATIC TINYXML_LIB YAML_CPP_LIB)
-     if(EXTERNAL_LIBRARIES)
-@@ -113,7 +113,7 @@ install(FILES ${core_export_headers}
- 
- # pkg-config
- message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
--configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
-+configure_file(${PROJECT_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
-     ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
-     DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
-diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp
-index 68fcef60..a1c1c1d8 100644
---- a/src/core/OCIOYaml.cpp
-+++ b/src/core/OCIOYaml.cpp
-@@ -1442,7 +1442,7 @@ OCIO_NAMESPACE_ENTER
- #ifdef OLDYAML
-             if(node.FindValue("ocio_profile_version") == NULL)
- #else
--            if(node["ocio_profile_version"] == NULL)
-+            if(node["ocio_profile_version"].IsNull())
- #endif
-             {
-                 std::ostringstream os;
diff --git a/recipes/opencolorio/all/patches/fix-cmake-source-dir-and-targets.patch b/recipes/opencolorio/all/patches/fix-cmake-source-dir-and-targets.patch
deleted file mode 100644
index c9f1055c82e2c..0000000000000
--- a/recipes/opencolorio/all/patches/fix-cmake-source-dir-and-targets.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b0840ac2..e4875ab6 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,9 +9,9 @@ cmake_minimum_required(VERSION 3.12)
- 
- set(CMAKE_MODULE_PATH
-     ${CMAKE_MODULE_PATH}
--    ${CMAKE_SOURCE_DIR}/share/cmake/utils
--    ${CMAKE_SOURCE_DIR}/share/cmake/macros
--    ${CMAKE_SOURCE_DIR}/share/cmake/modules
-+    ${CMAKE_CURRENT_SOURCE_DIR}/share/cmake/utils
-+    ${CMAKE_CURRENT_SOURCE_DIR}/share/cmake/macros
-+    ${CMAKE_CURRENT_SOURCE_DIR}/share/cmake/modules
- )
- 
- set(CMAKE_WARN_DEPRECATED ON)
-@@ -272,7 +272,7 @@ else()
-     set(OCIO_SETUP_NAME setup_ocio.sh)
- endif()
- 
--configure_file(${CMAKE_SOURCE_DIR}/share/ocio/${OCIO_SETUP_NAME}.in
-+configure_file(${PROJECT_SOURCE_DIR}/share/ocio/${OCIO_SETUP_NAME}.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} @ONLY)
- 
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} DESTINATION share/ocio/)
-diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
-index 86a02258..a8fed622 100644
---- a/share/cmake/modules/FindExtPackages.cmake
-+++ b/share/cmake/modules/FindExtPackages.cmake
-@@ -26,7 +26,7 @@ set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL
- 
- # expat
- # https://github.com/libexpat/libexpat
--find_package(expat 2.2.8 REQUIRED)
-+find_package(EXPAT 2.2.8 REQUIRED)
- 
- # yaml-cpp
- # https://github.com/jbeder/yaml-cpp
-@@ -50,9 +50,9 @@ else()
- 
-     # OpenEXR/IlmBase (<=2.5)
-     # https://github.com/AcademySoftwareFoundation/openexr
--    find_package(Half 2.4.0 REQUIRED)
-+    find_package(OpenEXR 2.4.0 REQUIRED)
- 
--    set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE)
-+		set(OCIO_HALF_LIB OpenEXR::Half CACHE STRING "Half library target" FORCE)
-     set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE)
- endif()
- 
-@@ -65,7 +65,7 @@ if(OCIO_BUILD_APPS)
- 
-     # lcms2
-     # https://github.com/mm2/Little-CMS
--    find_package(lcms2 2.2 REQUIRED)
-+    find_package(lcms 2.2 REQUIRED)
- endif()
- 
- if(OCIO_BUILD_OPENFX)
-diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
-index be50b7b6..8423a099 100755
---- a/src/OpenColorIO/CMakeLists.txt
-+++ b/src/OpenColorIO/CMakeLists.txt
-@@ -211,7 +211,7 @@ target_link_libraries(OpenColorIO
- 	PUBLIC
- 		OpenColorIOHeaders
- 	PRIVATE
--		expat::expat
-+		EXPAT::EXPAT
- 		${OCIO_HALF_LIB}
- 		pystring::pystring
- 		sampleicc::sampleicc
-diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt
-index 7eb1cd8a..de136073 100755
---- a/src/apps/ociobakelut/CMakeLists.txt
-+++ b/src/apps/ociobakelut/CMakeLists.txt
-@@ -35,7 +35,7 @@ set_target_properties(ociobakelut
- target_link_libraries(ociobakelut 
-     PRIVATE 
-         apputils
--        lcms2::lcms2
-+        lcms::lcms
-         OpenColorIO
- )
- 
diff --git a/recipes/opencolorio/all/patches/pstring.patch b/recipes/opencolorio/all/patches/pstring.patch
deleted file mode 100644
index 38f15d7e20889..0000000000000
--- a/recipes/opencolorio/all/patches/pstring.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp
-index 26fdcbee..9ddb4522 100644
---- a/src/OpenColorIO/Context.cpp
-+++ b/src/OpenColorIO/Context.cpp
-@@ -14,7 +14,7 @@
- #include "Mutex.h"
- #include "PathUtils.h"
- #include "PrivateTypes.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "utils/StringUtils.h"
- 
- 
-diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp
-index 67cafdf1..744fb817 100644
---- a/src/OpenColorIO/OCIOYaml.cpp
-+++ b/src/OpenColorIO/OCIOYaml.cpp
-@@ -19,7 +19,7 @@
- #include "ParseUtils.h"
- #include "PathUtils.h"
- #include "Platform.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "utils/StringUtils.h"
- #include "ViewingRules.h"
- #include "yaml-cpp/yaml.h"
-diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp
-index ebbba040..08db0f68 100755
---- a/src/OpenColorIO/Op.cpp
-+++ b/src/OpenColorIO/Op.cpp
-@@ -20,7 +20,7 @@
- #include "ops/lut1d/Lut1DOp.h"
- #include "ops/lut3d/Lut3DOp.h"
- #include "ops/range/RangeOp.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- 
- namespace OCIO_NAMESPACE
- {
-diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp
-index 7ed5e9e8..e71d03d9 100644
---- a/src/OpenColorIO/PathUtils.cpp
-+++ b/src/OpenColorIO/PathUtils.cpp
-@@ -10,7 +10,7 @@
- 
- #include "Mutex.h"
- #include "PathUtils.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "utils/StringUtils.h"
- 
- #if !defined(_WIN32)
-diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp
-index 89c13066..648aabc0 100644
---- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp
-+++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp
-@@ -22,7 +22,7 @@
- #include "OpBuilders.h"
- #include "ops/noop/NoOps.h"
- #include "Platform.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "TransformBuilder.h"
- #include "transforms/FileTransform.h"
- #include "utils/StringUtils.h"
-diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
-index a52bc728..bd827f06 100755
---- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
-+++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
-@@ -16,7 +16,7 @@
- #include "ops/lut1d/Lut1DOp.h"
- #include "ops/lut3d/Lut3DOp.h"
- #include "ParseUtils.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "Platform.h"
- #include "transforms/FileTransform.h"
- #include "utils/StringUtils.h"
-diff --git a/src/OpenColorIO/fileformats/FileFormatICC.cpp b/src/OpenColorIO/fileformats/FileFormatICC.cpp
-index df86206e..b6983cf6 100755
---- a/src/OpenColorIO/fileformats/FileFormatICC.cpp
-+++ b/src/OpenColorIO/fileformats/FileFormatICC.cpp
-@@ -12,7 +12,7 @@
- #include "ops/gamma/GammaOp.h"
- #include "ops/lut1d/Lut1DOp.h"
- #include "ops/matrix/MatrixOp.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "transforms/FileTransform.h"
- 
- 
-diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
-index 0f83f5b3..d6ee59de 100755
---- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
-+++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
-@@ -13,7 +13,7 @@
- #include "ops/lut3d/Lut3DOp.h"
- #include "ParseUtils.h"
- #include "Platform.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "transforms/FileTransform.h"
- #include "utils/StringUtils.h"
- 
-diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp
-index 4f6ea887..97621959 100755
---- a/src/OpenColorIO/transforms/FileTransform.cpp
-+++ b/src/OpenColorIO/transforms/FileTransform.cpp
-@@ -17,7 +17,7 @@
- #include "ops/noop/NoOps.h"
- #include "PathUtils.h"
- #include "Platform.h"
--#include "pystring/pystring.h"
-+#include "pystring.h"
- #include "utils/StringUtils.h"
- 
- 
diff --git a/recipes/opencolorio/all/patches/strlen.patch b/recipes/opencolorio/all/patches/strlen.patch
deleted file mode 100644
index b90bcdfcf5d57..0000000000000
--- a/recipes/opencolorio/all/patches/strlen.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/OpenColorIO/FileRules.cpp b/src/OpenColorIO/FileRules.cpp
-index 794dfdbe..94729459 100644
---- a/src/OpenColorIO/FileRules.cpp
-+++ b/src/OpenColorIO/FileRules.cpp
-@@ -6,6 +6,7 @@
- #include <map>
- #include <regex>
- #include <sstream>
-+#include <string.h>
- 
- #include <OpenColorIO/OpenColorIO.h>
-