From 46f812034e504d2d0c14cb75022d81adbf803998 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Tue, 14 Oct 2025 11:40:10 +0100
Subject: [PATCH] SheenBidi: Update internal include paths

---
 modules/juce_graphics/juce_graphics.cpp       |  2 +-
 .../juce_graphics/juce_graphics_Sheenbidi.c   |  2 +-
 .../sheenbidi/Headers/SheenBidi/SBAlgorithm.h |  8 +++---
 .../sheenbidi/Headers/SheenBidi/SBBidiType.h  |  2 +-
 .../sheenbidi/Headers/SheenBidi/SBCodepoint.h |  8 +++---
 .../Headers/SheenBidi/SBCodepointSequence.h   |  4 +--
 .../Headers/SheenBidi/SBGeneralCategory.h     |  2 +-
 .../sheenbidi/Headers/SheenBidi/SBLine.h      |  4 +--
 .../Headers/SheenBidi/SBMirrorLocator.h       |  6 ++---
 .../sheenbidi/Headers/SheenBidi/SBParagraph.h |  4 +--
 .../sheenbidi/Headers/SheenBidi/SBRun.h       |  2 +-
 .../sheenbidi/Headers/SheenBidi/SBScript.h    |  2 +-
 .../Headers/SheenBidi/SBScriptLocator.h       |  6 ++---
 .../sheenbidi/Headers/SheenBidi/SBVersion.h   |  2 +-
 .../sheenbidi/Headers/SheenBidi/SheenBidi.h   | 26 +++++++++----------
 .../unicode/sheenbidi/JUCE_CHANGES.txt        |  2 ++
 .../unicode/sheenbidi/Source/BidiChain.c      |  2 +-
 .../unicode/sheenbidi/Source/BidiChain.h      |  2 +-
 .../unicode/sheenbidi/Source/BidiTypeLookup.h |  8 +++---
 .../unicode/sheenbidi/Source/BracketQueue.c   |  2 +-
 .../unicode/sheenbidi/Source/BracketQueue.h   |  6 ++---
 .../sheenbidi/Source/GeneralCategoryLookup.h  |  8 +++---
 .../unicode/sheenbidi/Source/IsolatingRun.c   |  2 +-
 .../unicode/sheenbidi/Source/IsolatingRun.h   |  2 +-
 .../unicode/sheenbidi/Source/LevelRun.c       |  2 +-
 .../unicode/sheenbidi/Source/LevelRun.h       |  2 +-
 .../unicode/sheenbidi/Source/Object.c         |  2 +-
 .../unicode/sheenbidi/Source/Object.h         |  2 +-
 .../unicode/sheenbidi/Source/PairingLookup.h  |  6 ++---
 .../unicode/sheenbidi/Source/RunQueue.c       |  4 +--
 .../unicode/sheenbidi/Source/RunQueue.h       |  4 +--
 .../unicode/sheenbidi/Source/SBAlgorithm.c    |  2 +-
 .../unicode/sheenbidi/Source/SBAlgorithm.h    | 10 +++----
 .../unicode/sheenbidi/Source/SBBase.c         |  4 +--
 .../unicode/sheenbidi/Source/SBBase.h         |  8 +++---
 .../unicode/sheenbidi/Source/SBCodepoint.c    |  4 +--
 .../unicode/sheenbidi/Source/SBCodepoint.h    |  4 +--
 .../sheenbidi/Source/SBCodepointSequence.c    |  2 +-
 .../sheenbidi/Source/SBCodepointSequence.h    |  6 ++---
 .../unicode/sheenbidi/Source/SBLine.c         |  4 +--
 .../unicode/sheenbidi/Source/SBLine.h         | 12 ++++-----
 .../unicode/sheenbidi/Source/SBLog.c          |  2 +-
 .../unicode/sheenbidi/Source/SBLog.h          |  2 +-
 .../sheenbidi/Source/SBMirrorLocator.h        |  6 ++---
 .../unicode/sheenbidi/Source/SBParagraph.c    |  2 +-
 .../unicode/sheenbidi/Source/SBParagraph.h    |  8 +++---
 .../sheenbidi/Source/SBScriptLocator.h        |  6 ++---
 .../unicode/sheenbidi/Source/ScriptLookup.h   |  8 +++---
 .../unicode/sheenbidi/Source/ScriptStack.c    |  2 +-
 .../unicode/sheenbidi/Source/ScriptStack.h    |  6 ++---
 .../unicode/sheenbidi/Source/SheenBidi.c      |  4 +--
 .../unicode/sheenbidi/Source/StatusStack.c    |  2 +-
 .../unicode/sheenbidi/Source/StatusStack.h    |  2 +-
 53 files changed, 122 insertions(+), 120 deletions(-)

diff --git a/modules/juce_graphics/juce_graphics.cpp b/modules/juce_graphics/juce_graphics.cpp
index be60a39344..7af204e8b8 100644
--- a/modules/juce_graphics/juce_graphics.cpp
+++ b/modules/juce_graphics/juce_graphics.cpp
@@ -153,7 +153,7 @@
 
 extern "C"
 {
-#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SheenBidi.h>
 } // extern "C"
 
 #if JUCE_UNIT_TESTS
diff --git a/modules/juce_graphics/juce_graphics_Sheenbidi.c b/modules/juce_graphics/juce_graphics_Sheenbidi.c
index de61bc7c66..eaa92f5ec5 100644
--- a/modules/juce_graphics/juce_graphics_Sheenbidi.c
+++ b/modules/juce_graphics/juce_graphics_Sheenbidi.c
@@ -41,7 +41,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wsign-conversion",
                                      "-Wstringop-overflow",
                                      "-Wimplicit-fallthrough")
 
-JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4189 4706)
+JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4189 4706 6011)
 
 //==============================================================================
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h
index e1b382da6f..1d7c948b8e 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h
@@ -17,10 +17,10 @@
 #ifndef _SB_PUBLIC_ALGORITHM_H
 #define _SB_PUBLIC_ALGORITHM_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBBidiType.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBParagraph.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h
index 8f78b1b305..20c739a7fb 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h
@@ -17,7 +17,7 @@
 #ifndef _SB_PUBLIC_BIDI_TYPE_H
 #define _SB_PUBLIC_BIDI_TYPE_H
 
-#include <SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h
index 6f470c4adf..9d691218fa 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h
@@ -17,10 +17,10 @@
 #ifndef _SB_PUBLIC_CODEPOINT_H
 #define _SB_PUBLIC_CODEPOINT_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBBidiType.h>
-#include <SheenBidi/SBGeneralCategory.h>
-#include <SheenBidi/SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h
index b5f58647a1..c7482a3c1f 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h
@@ -17,8 +17,8 @@
 #ifndef _SB_PUBLIC_CODEPOINT_SEQUENCE_H
 #define _SB_PUBLIC_CODEPOINT_SEQUENCE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h
index f32545312f..dd18e4e3de 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h
@@ -17,7 +17,7 @@
 #ifndef _SB_PUBLIC_GENERAL_CATEGORY_H
 #define _SB_PUBLIC_GENERAL_CATEGORY_H
 
-#include <SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h
index 7c696f7cb5..13469b3493 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h
@@ -17,8 +17,8 @@
 #ifndef _SB_PUBLIC_LINE_H
 #define _SB_PUBLIC_LINE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBRun.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBMirrorLocator.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBMirrorLocator.h
index 452a597cd9..a72d3244c8 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBMirrorLocator.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBMirrorLocator.h
@@ -17,9 +17,9 @@
 #ifndef _SB_PUBLIC_MIRROR_LOCATOR_H
 #define _SB_PUBLIC_MIRROR_LOCATOR_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h
index 7f0df44281..178e42b027 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h
@@ -17,8 +17,8 @@
 #ifndef _SB_PUBLIC_PARAGRAPH_H
 #define _SB_PUBLIC_PARAGRAPH_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h
index 442a0ea17d..c190f50266 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h
@@ -17,7 +17,7 @@
 #ifndef _SB_PUBLIC_RUN_H
 #define _SB_PUBLIC_RUN_H
 
-#include <SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h
index 4c8a20bf0d..dab4d13f6f 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h
@@ -17,7 +17,7 @@
 #ifndef _SB_PUBLIC_SCRIPT_H
 #define _SB_PUBLIC_SCRIPT_H
 
-#include <SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScriptLocator.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScriptLocator.h
index f3231b2a90..8f88faccc9 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScriptLocator.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScriptLocator.h
@@ -17,9 +17,9 @@
 #ifndef _SB_PUBLIC_SCRIPT_LOCATOR_H
 #define _SB_PUBLIC_SCRIPT_LOCATOR_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBVersion.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBVersion.h
index f2b81bf7e8..d49977f582 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBVersion.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBVersion.h
@@ -17,7 +17,7 @@
 #ifndef _SB_PUBLIC_VERSION_H
 #define _SB_PUBLIC_VERSION_H
 
-#include <SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
 
 SB_EXTERN_C_BEGIN
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SheenBidi.h b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SheenBidi.h
index 3cce4983b3..c7633e717d 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SheenBidi.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SheenBidi.h
@@ -17,18 +17,18 @@
 #ifndef _SHEEN_BIDI_H
 #define _SHEEN_BIDI_H
 
-#include <SheenBidi/SBAlgorithm.h>
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBBidiType.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBGeneralCategory.h>
-#include <SheenBidi/SBLine.h>
-#include <SheenBidi/SBMirrorLocator.h>
-#include <SheenBidi/SBParagraph.h>
-#include <SheenBidi/SBRun.h>
-#include <SheenBidi/SBScript.h>
-#include <SheenBidi/SBScriptLocator.h>
-#include <SheenBidi/SBVersion.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBMirrorLocator.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScriptLocator.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBVersion.h>
 
 #endif
diff --git a/modules/juce_graphics/unicode/sheenbidi/JUCE_CHANGES.txt b/modules/juce_graphics/unicode/sheenbidi/JUCE_CHANGES.txt
index e69de29bb2..bb54deb103 100644
--- a/modules/juce_graphics/unicode/sheenbidi/JUCE_CHANGES.txt
+++ b/modules/juce_graphics/unicode/sheenbidi/JUCE_CHANGES.txt
@@ -0,0 +1,2 @@
+- Include paths to SheenBidi headers in <angle brackets> have been swapped for
+  versions that explicitly point inside the juce_graphics module.
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.c b/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.c
index 694cf14c5b..d5be2b8a88 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "SBBase.h"
 #include "BidiChain.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.h b/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.h
index a55055917a..00633ee21f 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.h
@@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_BIDI_CHAIN_H
 #define _SB_INTERNAL_BIDI_CHAIN_H
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "SBBase.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/BidiTypeLookup.h b/modules/juce_graphics/unicode/sheenbidi/Source/BidiTypeLookup.h
index 2ce0e00fd8..19c0dae10c 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BidiTypeLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BidiTypeLookup.h
@@ -6,10 +6,10 @@
 #ifndef _SB_INTERNAL_BIDI_TYPE_LOOKUP_H
 #define _SB_INTERNAL_BIDI_TYPE_LOOKUP_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBBidiType.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 SB_INTERNAL SBBidiType LookupBidiType(SBCodepoint codepoint);
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.c b/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.c
index f337e0a997..11a8a99a77 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.c
@@ -16,7 +16,7 @@
 
 #include <stddef.h>
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiChain.h"
 #include "Object.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.h b/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.h
index bfe16d9ead..b00c736741 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.h
@@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_BRACKET_QUEUE_H
 #define _SB_INTERNAL_BRACKET_QUEUE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiChain.h"
 #include "Object.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/GeneralCategoryLookup.h b/modules/juce_graphics/unicode/sheenbidi/Source/GeneralCategoryLookup.h
index 7d21f7f787..8c14c5b062 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/GeneralCategoryLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/GeneralCategoryLookup.h
@@ -6,10 +6,10 @@
 #ifndef _SB_INTERNAL_GENERAL_CATEGORY_LOOKUP_H
 #define _SB_INTERNAL_GENERAL_CATEGORY_LOOKUP_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBGeneralCategory.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBGeneralCategory.h>
 
 SB_INTERNAL SBGeneralCategory LookupGeneralCategory(SBCodepoint codepoint);
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.c b/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.c
index 23ac44a071..14cbd3dda9 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiChain.h"
 #include "BracketQueue.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.h b/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.h
index 8b49731cd1..151907b0dd 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.h
@@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_ISOLATING_RUN_H
 #define _SB_INTERNAL_ISOLATING_RUN_H
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiChain.h"
 #include "BracketQueue.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.c b/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.c
index c44f102d16..43cd74b40e 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include <stddef.h>
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.h b/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.h
index 2bb5d5c63b..301d248b94 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.h
@@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_LEVEL_RUN_H
 #define _SB_INTERNAL_LEVEL_RUN_H
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiChain.h"
 #include "RunExtrema.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/Object.c b/modules/juce_graphics/unicode/sheenbidi/Source/Object.c
index 829d9cbdc2..1824b0bcd8 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/Object.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/Object.c
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "SBAssert.h"
 #include "SBBase.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/Object.h b/modules/juce_graphics/unicode/sheenbidi/Source/Object.h
index 40ec8a7109..536ae9c334 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/Object.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/Object.h
@@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_OBJECT_H
 #define _SB_INTERNAL_OBJECT_H
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "SBBase.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/PairingLookup.h b/modules/juce_graphics/unicode/sheenbidi/Source/PairingLookup.h
index 0b422aeb6a..b11703a381 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/PairingLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/PairingLookup.h
@@ -6,9 +6,9 @@
 #ifndef _SB_INTERNAL_PAIRING_LOOKUP_H
 #define _SB_INTERNAL_PAIRING_LOOKUP_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BracketType.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.c b/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.c
index 73e615d67d..1437facb23 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.c
@@ -16,8 +16,8 @@
 
 #include <stddef.h>
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "LevelRun.h"
 #include "Object.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.h b/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.h
index 77e76ba72f..8053cdf732 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.h
@@ -17,8 +17,8 @@
 #ifndef _SB_INTERNAL_RUN_QUEUE_H
 #define _SB_INTERNAL_RUN_QUEUE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "LevelRun.h"
 #include "Object.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.c
index a802f0c36b..05ab2143fa 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.c
@@ -16,7 +16,7 @@
 
 #include <stddef.h>
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiTypeLookup.h"
 #include "Object.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.h
index c9b2ee0bc2..e52a8a5774 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.h
@@ -17,11 +17,11 @@
 #ifndef _SB_INTERNAL_ALGORITHM_H
 #define _SB_INTERNAL_ALGORITHM_H
 
-#include <SheenBidi/SBAlgorithm.h>
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBBidiType.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "Object.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.c
index c85dbe8446..5b245266e9 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBVersion.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBVersion.h>
 
 #include "SBBase.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.h
index 551b6bbcdf..afd3378ae2 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.h
@@ -17,10 +17,10 @@
 #ifndef _SB_INTERNAL_BASE_H
 #define _SB_INTERNAL_BASE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBBidiType.h>
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h>
 
 /**
  * A value that indicates an invalid unsigned index.
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.c
index 3901b6b847..7535c758f8 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiTypeLookup.h"
 #include "GeneralCategoryLookup.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.h
index ecaf4c80f9..a25c6447bc 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepoint.h
@@ -17,8 +17,8 @@
 #ifndef _SB_INTERNAL_CODEPOINT_H
 #define _SB_INTERNAL_CODEPOINT_H
 
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 SB_INTERNAL SBBoolean SBCodepointIsCanonicalEquivalentBracket(
     SBCodepoint codepoint, SBCodepoint bracket);
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.c
index 827f58da90..bef921ec6f 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "SBBase.h"
 #include "SBCodepoint.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.h
index 31db78cf03..3e86912fdf 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.h
@@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_CODEPOINT_SEQUENCE_H
 #define _SB_INTERNAL_CODEPOINT_SEQUENCE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 SB_INTERNAL SBBoolean SBCodepointSequenceIsValid(const SBCodepointSequence *codepointSequence);
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.c
index c9fccad2d0..8440c5bf36 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.c
@@ -16,8 +16,8 @@
 
 #include <stddef.h>
 
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBRun.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h>
 
 #include "Object.h"
 #include "PairingLookup.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.h
index b0539196ef..06f43630e9 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.h
@@ -17,12 +17,12 @@
 #ifndef _SB_INTERNAL_LINE_H
 #define _SB_INTERNAL_LINE_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBLine.h>
-#include <SheenBidi/SBParagraph.h>
-#include <SheenBidi/SBRun.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBRun.h>
 
 #include "Object.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.c
index f3b645901e..3a947e1803 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #ifdef SB_CONFIG_LOG
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.h
index fc373bbe5a..60e4e28389 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.h
@@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_LOG_H
 #define _SB_INTERNAL_LOG_H
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #ifdef SB_CONFIG_LOG
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBMirrorLocator.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBMirrorLocator.h
index 726437adba..f266d13759 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBMirrorLocator.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBMirrorLocator.h
@@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_MIRROR_LOCATOR_H
 #define _SB_INTERNAL_MIRROR_LOCATOR_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBLine.h>
-#include <SheenBidi/SBMirrorLocator.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBMirrorLocator.h>
 
 #include "Object.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.c b/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.c
index 8a64f09ee8..284553ea1d 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.c
@@ -17,7 +17,7 @@
 
 #include <stddef.h>
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "BidiChain.h"
 #include "BidiTypeLookup.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.h
index 3568f574ff..efaf15b966 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.h
@@ -17,10 +17,10 @@
 #ifndef _SB_INTERNAL_PARAGRAPH_H
 #define _SB_INTERNAL_PARAGRAPH_H
 
-#include <SheenBidi/SBAlgorithm.h>
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBParagraph.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBAlgorithm.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBParagraph.h>
 
 #include "Object.h"
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SBScriptLocator.h b/modules/juce_graphics/unicode/sheenbidi/Source/SBScriptLocator.h
index e513d05002..7968e44021 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBScriptLocator.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBScriptLocator.h
@@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_SCRIPT_LOCATOR_H
 #define _SB_INTERNAL_SCRIPT_LOCATOR_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepointSequence.h>
-#include <SheenBidi/SBScriptLocator.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScriptLocator.h>
 
 #include "Object.h"
 #include "ScriptStack.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptLookup.h b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptLookup.h
index 517beec779..445e6e35e2 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptLookup.h
@@ -6,10 +6,10 @@
 #ifndef _SB_INTERNAL_SCRIPT_LOOKUP_H
 #define _SB_INTERNAL_SCRIPT_LOOKUP_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBScript.h>
 
 SB_INTERNAL SBScript LookupScript(SBCodepoint codepoint);
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.c b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.c
index 6347e2a0f6..ab04ecf54b 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "SBAssert.h"
 #include "SBBase.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.h b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.h
index 15996bdcb8..466f399ea1 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.h
@@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_SCRIPT_STACK_H
 #define _SB_INTERNAL_SCRIPT_STACK_H
 
-#include <SheenBidi/SBBase.h>
-#include <SheenBidi/SBCodepoint.h>
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #define _SBScriptStackCapacity  63
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/SheenBidi.c b/modules/juce_graphics/unicode/sheenbidi/Source/SheenBidi.c
index 76406141ad..bab72e424a 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SheenBidi.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SheenBidi.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <SheenBidi/SBConfig.h>
-#include <SheenBidi/SheenBidi.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SheenBidi.h>
 
 #ifdef SB_CONFIG_UNITY
 
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.c b/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.c
index 1892b6942c..59e88e1335 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.c
@@ -16,7 +16,7 @@
 
 #include <stddef.h>
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "Object.h"
 #include "SBAssert.h"
diff --git a/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.h b/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.h
index 468caf646f..6c87531533 100644
--- a/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.h
@@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_STATUS_STACK_H
 #define _SB_INTERNAL_STATUS_STACK_H
 
-#include <SheenBidi/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi/SBConfig.h>
 
 #include "Object.h"
 #include "SBBase.h"