diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp
index 7072c50..e2908b6 100644
--- a/src/OpenColorIO/Config.cpp
+++ b/src/OpenColorIO/Config.cpp
@@ -12,7 +12,7 @@
 #include <regex>
 #include <functional>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/ConfigUtils.cpp b/src/OpenColorIO/ConfigUtils.cpp
index 9a5ecfc..d07ef7d 100644
--- a/src/OpenColorIO/ConfigUtils.cpp
+++ b/src/OpenColorIO/ConfigUtils.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright Contributors to the OpenColorIO Project.
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include "ConfigUtils.h"
 #include "MathUtils.h"
diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp
index b7e71ae..a5a9627 100644
--- a/src/OpenColorIO/Context.cpp
+++ b/src/OpenColorIO/Context.cpp
@@ -7,7 +7,7 @@
 #include <sstream>
 #include <string>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp
index c936157..21e3e0c 100644
--- a/src/OpenColorIO/OCIOYaml.cpp
+++ b/src/OpenColorIO/OCIOYaml.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 #include <unordered_set>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
index 982fce6..43cb147 100644
--- a/src/OpenColorIO/OCIOZArchive.cpp
+++ b/src/OpenColorIO/OCIOZArchive.cpp
@@ -8,7 +8,7 @@
 #include <set>
 #include <limits>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp
index 7e95bae..c6c1993 100755
--- a/src/OpenColorIO/Op.cpp
+++ b/src/OpenColorIO/Op.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 #include <sstream>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp
index 3a68d36..ea6c036 100644
--- a/src/OpenColorIO/PathUtils.cpp
+++ b/src/OpenColorIO/PathUtils.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <map>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp
index ab74ed9..1692451 100644
--- a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp
+++ b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 #include <vector>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp
index 3afddf3..8be58de 100644
--- a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp
+++ b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp
@@ -5,7 +5,7 @@
 #include <unordered_set>
 #include <iostream>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp
index 33c41f2..a98c66b 100644
--- a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp
+++ b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 #include <vector>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp
index b1f0393..9efb98f 100644
--- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp
@@ -6,7 +6,7 @@
 #include <fstream>
 #include <sstream>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
index 6a76d96..63613dc 100755
--- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/fileformats/FileFormatICC.cpp b/src/OpenColorIO/fileformats/FileFormatICC.cpp
index 4768101..16cc9ec 100755
--- a/src/OpenColorIO/fileformats/FileFormatICC.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatICC.cpp
@@ -5,7 +5,7 @@
 #include <sstream>
 #include <fstream>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
index 0ba209a..c7ec254 100755
--- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
@@ -5,7 +5,7 @@
 #include <cstring>
 #include <iterator>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp
index 33da5f3..7609dda 100755
--- a/src/OpenColorIO/transforms/FileTransform.cpp
+++ b/src/OpenColorIO/transforms/FileTransform.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <iterator>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff --git a/src/apps/ociomergeconfigs/main.cpp b/src/apps/ociomergeconfigs/main.cpp
index 7069e15..3e5deb8 100644
--- a/src/apps/ociomergeconfigs/main.cpp
+++ b/src/apps/ociomergeconfigs/main.cpp
@@ -5,7 +5,7 @@
 #include <fstream>
 #include <vector>
 
-#include <pystring.h>
+#include <pystring/pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 #include "utils/StringUtils.h"