From 94fc24e41aaa001c9a2fbc86e98dcff12de3f051 Mon Sep 17 00:00:00 2001
From: attila <attila@juce.com>
Date: Fri, 16 May 2025 12:21:27 +0200
Subject: [PATCH] iOS: Fix compiling juce_audio_devices when juce_graphics
 isn't added

---
 examples/DemoRunner/Builds/Android/app/CMakeLists.txt       | 4 ++--
 .../Builds/VisualStudio2019/DemoRunner_App.vcxproj          | 2 +-
 .../Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters  | 6 +++---
 .../Builds/VisualStudio2022/DemoRunner_App.vcxproj          | 2 +-
 .../Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters  | 6 +++---
 .../AudioPerformanceTest/Builds/Android/app/CMakeLists.txt  | 4 ++--
 .../VisualStudio2022/AudioPerformanceTest_App.vcxproj       | 2 +-
 .../AudioPerformanceTest_App.vcxproj.filters                | 6 +++---
 extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt    | 4 ++--
 .../Builds/VisualStudio2019/AudioPluginHost_App.vcxproj     | 2 +-
 .../VisualStudio2019/AudioPluginHost_App.vcxproj.filters    | 6 +++---
 .../Builds/VisualStudio2022/AudioPluginHost_App.vcxproj     | 2 +-
 .../VisualStudio2022/AudioPluginHost_App.vcxproj.filters    | 6 +++---
 .../VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj       | 1 +
 .../BinaryBuilder_ConsoleApp.vcxproj.filters                | 3 +++
 .../NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt   | 4 ++--
 .../Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj | 2 +-
 .../NetworkGraphicsDemo_App.vcxproj.filters                 | 6 +++---
 .../Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj   | 2 +-
 .../Builds/VisualStudio2019/Projucer_App.vcxproj.filters    | 6 +++---
 .../Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj   | 2 +-
 .../Builds/VisualStudio2022/Projucer_App.vcxproj.filters    | 6 +++---
 .../VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj      | 2 +-
 .../UnitTestRunner_ConsoleApp.vcxproj.filters               | 6 +++---
 .../VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj      | 2 +-
 .../UnitTestRunner_ConsoleApp.vcxproj.filters               | 6 +++---
 .../VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj      | 2 +-
 .../WindowsDLL_DynamicLibrary.vcxproj.filters               | 6 +++---
 .../fonts => juce_core/detail}/juce_LruCache.h              | 0
 modules/juce_core/juce_core.h                               | 1 +
 modules/juce_graphics/juce_graphics.h                       | 1 -
 31 files changed, 57 insertions(+), 53 deletions(-)
 rename modules/{juce_graphics/fonts => juce_core/detail}/juce_LruCache.h (100%)

diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt
index 37ea4a5039..bd83165456 100644
--- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt
+++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt
@@ -1038,6 +1038,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -1859,7 +1860,6 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@@ -3696,6 +3696,7 @@ set_source_files_properties(
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -4517,7 +4518,6 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
index 479dea4bce..31160012da 100644
--- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
+++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
@@ -3855,6 +3855,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -4385,7 +4386,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
index 583ae234bd..877b8f35d3 100644
--- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
+++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
@@ -5871,6 +5871,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -7461,9 +7464,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
index 93cc9e813a..5d2f2bdc4a 100644
--- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
+++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
@@ -3855,6 +3855,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -4385,7 +4386,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
index 07401609c0..16296c26c0 100644
--- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
+++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
@@ -5871,6 +5871,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -7461,9 +7464,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
index cc1da3d5da..d3a487a805 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
+++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
@@ -897,6 +897,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -1621,7 +1622,6 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@@ -3169,6 +3169,7 @@ set_source_files_properties(
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -3893,7 +3894,6 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj
index 893c8f3e28..900ec10635 100644
--- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj
+++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj
@@ -3321,6 +3321,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -3798,7 +3799,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters
index 66e7235de2..bace50fe0e 100644
--- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters
+++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters
@@ -4989,6 +4989,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -6420,9 +6423,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
index e39f4103f3..ac75b2804e 100644
--- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
+++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
@@ -930,6 +930,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -1751,7 +1752,6 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@@ -3355,6 +3355,7 @@ set_source_files_properties(
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -4176,7 +4177,6 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
index 12a30867a6..2afed47b1f 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
+++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
@@ -3501,6 +3501,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -4031,7 +4032,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
index 70e8c2c67f..64440b3d61 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
+++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
@@ -5265,6 +5265,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -6855,9 +6858,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj
index 9e9320959a..eaab5f11a0 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj
+++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj
@@ -3501,6 +3501,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -4031,7 +4032,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters
index 4dad07db53..57c4b9056c 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters
+++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters
@@ -5265,6 +5265,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -6855,9 +6858,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj
index 5b797facd4..a100ff5af5 100644
--- a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj
+++ b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj
@@ -539,6 +539,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
diff --git a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters
index 9f85d311a2..8f72ed58a1 100644
--- a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters
+++ b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters
@@ -549,6 +549,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
index 527d16e1c9..e8c52b12f1 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
+++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
@@ -901,6 +901,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -1640,7 +1641,6 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
@@ -3253,6 +3253,7 @@ set_source_files_properties(
     "../../../../../modules/juce_core/containers/juce_Variant.cpp"
     "../../../../../modules/juce_core/containers/juce_Variant.h"
     "../../../../../modules/juce_core/detail/juce_CallbackListenerList.h"
+    "../../../../../modules/juce_core/detail/juce_LruCache.h"
     "../../../../../modules/juce_core/detail/juce_NativeFileHandle.h"
     "../../../../../modules/juce_core/files/juce_AndroidDocument.h"
     "../../../../../modules/juce_core/files/juce_common_MimeTypes.cpp"
@@ -3992,7 +3993,6 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_GlyphArrangementOptions.h"
-    "../../../../../modules/juce_graphics/fonts/juce_LruCache.h"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"
     "../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
     "../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj
index 09c825e796..b723af6e44 100644
--- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj
+++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj
@@ -3412,6 +3412,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -3896,7 +3897,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters
index 89d1fd7b02..a7ff5b74e5 100644
--- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters
+++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters
@@ -5130,6 +5130,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -6582,9 +6585,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj
index b76097d88f..c711b861d2 100644
--- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj
+++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj
@@ -2112,6 +2112,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -2596,7 +2597,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters
index d33ebde60e..1cdcc5c0c8 100644
--- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters
+++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters
@@ -2772,6 +2772,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -4224,9 +4227,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj
index 4ce609118f..a2782bf470 100644
--- a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj
+++ b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj
@@ -2112,6 +2112,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -2596,7 +2597,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters
index b2c35f95b9..967264b9d1 100644
--- a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters
+++ b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters
@@ -2772,6 +2772,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -4224,9 +4227,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj
index e9dd17b043..a8f4bed67f 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj
+++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj
@@ -3613,6 +3613,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -4143,7 +4144,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters
index 41ab333f30..477d6c62f0 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters
+++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters
@@ -5424,6 +5424,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -7014,9 +7017,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj
index 619a842e7f..b891fbe902 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj
+++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj
@@ -3613,6 +3613,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -4143,7 +4144,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters
index 575159195e..5ad5888e06 100644
--- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters
+++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters
@@ -5424,6 +5424,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -7014,9 +7017,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj
index ab305f38d5..650b294bb3 100644
--- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj
+++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj
@@ -3388,6 +3388,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_SparseSet.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\containers\juce_Variant.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_AndroidDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\files\juce_common_MimeTypes.h"/>
@@ -3872,7 +3873,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceFileCache.h"/>
diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters
index 03cf355dc1..0ad5e2b63e 100644
--- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters
+++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters
@@ -5097,6 +5097,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_CallbackListenerList.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_LruCache.h">
+      <Filter>JUCE Modules\juce_core\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\detail\juce_NativeFileHandle.h">
       <Filter>JUCE Modules\juce_core\detail</Filter>
     </ClInclude>
@@ -6549,9 +6552,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangementOptions.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_LruCache.h">
-      <Filter>JUCE Modules\juce_graphics\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_TextLayout.h">
       <Filter>JUCE Modules\juce_graphics\fonts</Filter>
     </ClInclude>
diff --git a/modules/juce_graphics/fonts/juce_LruCache.h b/modules/juce_core/detail/juce_LruCache.h
similarity index 100%
rename from modules/juce_graphics/fonts/juce_LruCache.h
rename to modules/juce_core/detail/juce_LruCache.h
diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h
index 39a1d3af2e..097430ca6e 100644
--- a/modules/juce_core/juce_core.h
+++ b/modules/juce_core/juce_core.h
@@ -373,6 +373,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
 #include "misc/juce_OptionsHelpers.h"
 
 #include "detail/juce_CallbackListenerList.h"
+#include "detail/juce_LruCache.h"
 
 #if JUCE_CORE_INCLUDE_OBJC_HELPERS && (JUCE_MAC || JUCE_IOS)
  #include "native/juce_CFHelpers_mac.h"
diff --git a/modules/juce_graphics/juce_graphics.h b/modules/juce_graphics/juce_graphics.h
index aec2075586..09029dc397 100644
--- a/modules/juce_graphics/juce_graphics.h
+++ b/modules/juce_graphics/juce_graphics.h
@@ -147,7 +147,6 @@ namespace juce
 #include "fonts/juce_TextLayout.h"
 #include "contexts/juce_LowLevelGraphicsContext.h"
 #include "images/juce_ScaledImage.h"
-#include "fonts/juce_LruCache.h"
 #include "native/juce_RenderingHelpers.h"
 #include "contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
 #include "effects/juce_ImageEffectFilter.h"