diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
index 1b9edf9a6f..9128db7017 100644
--- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
@@ -24,13 +24,13 @@
 */
 
 #include <juce_core/system/juce_TargetPlatform.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
 
 #if JucePlugin_Build_AAX && (JUCE_MAC || JUCE_WINDOWS)
 
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
-#include <juce_audio_plugin_client/utility/juce_WindowsHooks.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_WindowsHooks.h>
 
 #include <juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp>
 
diff --git a/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp b/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp
index 4be01d8c94..732b4d6388 100644
--- a/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/ARA/juce_ARA_Wrapper.cpp
@@ -24,12 +24,12 @@
 */
 
 #include <juce_core/system/juce_TargetPlatform.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
 
 #if JucePlugin_Enable_ARA
 
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h>
 
 JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wunused-parameter", "-Wgnu-zero-variadic-macro-arguments", "-Wmissing-prototypes")
 JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4100)
diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
index dc94ea2fc7..77ca9aabc9 100644
--- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
+++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
@@ -25,7 +25,7 @@
 
 #include <juce_core/system/juce_TargetPlatform.h>
 #include <juce_core/system/juce_CompilerWarnings.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
 
 #if JucePlugin_Build_AU
 
@@ -45,7 +45,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wshorten-64-to-32",
                                      "-Wformat-pedantic",
                                      "-Wdeprecated-anon-enum-enum-conversion")
 
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
 
 #include <AudioUnit/AUCocoaUIView.h>
 #include <AudioUnit/AudioUnit.h>
@@ -58,7 +58,7 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 
 #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1
 
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
 
 #include <juce_audio_basics/native/juce_mac_CoreAudioLayouts.h>
 #include <juce_audio_basics/native/juce_mac_CoreAudioTimeConversions.h>
diff --git a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
index eab87f8495..fef366b52f 100644
--- a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
+++ b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
@@ -24,7 +24,7 @@
 */
 
 #include <juce_core/system/juce_TargetPlatform.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
 
 #if JucePlugin_Build_AUv3
 
@@ -38,8 +38,8 @@
 
 #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1
 
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
 
 #import <CoreAudioKit/CoreAudioKit.h>
 #import <AudioToolbox/AudioToolbox.h>
diff --git a/modules/juce_audio_plugin_client/LV2/juce_LV2_Client.cpp b/modules/juce_audio_plugin_client/LV2/juce_LV2_Client.cpp
index 5d1dacd5ea..d89f5578a3 100644
--- a/modules/juce_audio_plugin_client/LV2/juce_LV2_Client.cpp
+++ b/modules/juce_audio_plugin_client/LV2/juce_LV2_Client.cpp
@@ -38,9 +38,9 @@
 #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
 
 #include <juce_audio_plugin_client/juce_audio_plugin_client.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
-#include <juce_audio_plugin_client/utility/juce_LinuxMessageThread.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_LinuxMessageThread.h>
 
 #include <juce_audio_processors/utilities/juce_FlagCache.h>
 #include <juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp>
diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
index 67d4534f42..0ccae14f57 100644
--- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
+++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
@@ -24,11 +24,11 @@
 */
 
 #include <juce_core/system/juce_TargetPlatform.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
 
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_WindowsHooks.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_WindowsHooks.h>
 
 #include <juce_audio_devices/juce_audio_devices.h>
 #include <juce_gui_extra/juce_gui_extra.h>
diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
index d7268e436d..4a60e94f44 100644
--- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
+++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #ifndef DOXYGEN
- #include <juce_audio_plugin_client/utility/juce_CreatePluginFilter.h>
+ #include <juce_audio_plugin_client/detail/juce_CreatePluginFilter.h>
 #endif
 
 namespace juce
diff --git a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp
index 86d40226bd..f25583f5cf 100644
--- a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp
@@ -27,11 +27,11 @@
 
 #if JucePlugin_Build_Unity
 
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
 #include <juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp>
 
 #if JUCE_WINDOWS
- #include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
+ #include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
 #endif
 
 #include "juce_UnityPluginInterface.h"
diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
index 3e7c1cb76f..ba8d3ac105 100644
--- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
@@ -25,13 +25,13 @@
 
 #include <juce_core/system/juce_CompilerWarnings.h>
 #include <juce_core/system/juce_TargetPlatform.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
 
 #if JucePlugin_Build_VST
 
 JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996 4100)
 
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
 #include <juce_core/juce_core.h>
 
 #if JucePlugin_VersionCode < 0x010000   // Major < 0
@@ -100,13 +100,13 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 #define JUCE_VSTINTERFACE_H_INCLUDED 1
 #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
 
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
 
 using namespace juce;
 
-#include <juce_audio_plugin_client/utility/juce_WindowsHooks.h>
-#include <juce_audio_plugin_client/utility/juce_LinuxMessageThread.h>
-#include <juce_audio_plugin_client/utility/juce_VSTWindowUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_WindowsHooks.h>
+#include <juce_audio_plugin_client/detail/juce_LinuxMessageThread.h>
+#include <juce_audio_plugin_client/detail/juce_VSTWindowUtilities.h>
 
 #include <juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp>
 #include <juce_audio_processors/format_types/juce_VSTCommon.h>
diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
index d3ec1aa45f..c0388209e2 100644
--- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
@@ -44,12 +44,12 @@ JUCE_BEGIN_NO_SANITIZE ("vptr")
 #undef JUCE_VST3HEADERS_INCLUDE_HEADERS_ONLY
 #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
 
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_PluginUtilities.h>
-#include <juce_audio_plugin_client/utility/juce_WindowsHooks.h>
-#include <juce_audio_plugin_client/utility/juce_LinuxMessageThread.h>
-#include <juce_audio_plugin_client/utility/juce_VSTWindowUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_PluginUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_WindowsHooks.h>
+#include <juce_audio_plugin_client/detail/juce_LinuxMessageThread.h>
+#include <juce_audio_plugin_client/detail/juce_VSTWindowUtilities.h>
 
 #include <juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp>
 #include <juce_audio_processors/utilities/juce_FlagCache.h>
diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/detail/juce_CheckSettingMacros.h
similarity index 100%
rename from modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
rename to modules/juce_audio_plugin_client/detail/juce_CheckSettingMacros.h
diff --git a/modules/juce_audio_plugin_client/utility/juce_CreatePluginFilter.h b/modules/juce_audio_plugin_client/detail/juce_CreatePluginFilter.h
similarity index 100%
rename from modules/juce_audio_plugin_client/utility/juce_CreatePluginFilter.h
rename to modules/juce_audio_plugin_client/detail/juce_CreatePluginFilter.h
diff --git a/modules/juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h b/modules/juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h
similarity index 100%
rename from modules/juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h
rename to modules/juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h
diff --git a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h b/modules/juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h
similarity index 100%
rename from modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
rename to modules/juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h
diff --git a/modules/juce_audio_plugin_client/utility/juce_LinuxMessageThread.h b/modules/juce_audio_plugin_client/detail/juce_LinuxMessageThread.h
similarity index 100%
rename from modules/juce_audio_plugin_client/utility/juce_LinuxMessageThread.h
rename to modules/juce_audio_plugin_client/detail/juce_LinuxMessageThread.h
diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp b/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.cpp
similarity index 94%
rename from modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp
rename to modules/juce_audio_plugin_client/detail/juce_PluginUtilities.cpp
index 4e4e18cdb6..68d682a579 100644
--- a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp
+++ b/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.cpp
@@ -28,8 +28,8 @@
 #endif
 
 #include <juce_core/system/juce_TargetPlatform.h>
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
-#include <juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h>
 
 namespace juce
 {
diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.h b/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h
similarity index 92%
rename from modules/juce_audio_plugin_client/utility/juce_PluginUtilities.h
rename to modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h
index aa68d25dae..7269e8f09a 100644
--- a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.h
+++ b/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h>
 
 namespace juce::detail
 {
diff --git a/modules/juce_audio_plugin_client/utility/juce_VSTWindowUtilities.h b/modules/juce_audio_plugin_client/detail/juce_VSTWindowUtilities.h
similarity index 94%
rename from modules/juce_audio_plugin_client/utility/juce_VSTWindowUtilities.h
rename to modules/juce_audio_plugin_client/detail/juce_VSTWindowUtilities.h
index d007505350..a45308f164 100644
--- a/modules/juce_audio_plugin_client/utility/juce_VSTWindowUtilities.h
+++ b/modules/juce_audio_plugin_client/detail/juce_VSTWindowUtilities.h
@@ -27,7 +27,7 @@
 
 #if JUCE_MAC
 
-#include <juce_audio_plugin_client/utility/juce_IncludeModuleHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h>
 
 namespace juce::detail
 {
diff --git a/modules/juce_audio_plugin_client/utility/juce_VSTWindowUtilities.mm b/modules/juce_audio_plugin_client/detail/juce_VSTWindowUtilities.mm
similarity index 95%
rename from modules/juce_audio_plugin_client/utility/juce_VSTWindowUtilities.mm
rename to modules/juce_audio_plugin_client/detail/juce_VSTWindowUtilities.mm
index e4fae114db..7e8ee6dd91 100644
--- a/modules/juce_audio_plugin_client/utility/juce_VSTWindowUtilities.mm
+++ b/modules/juce_audio_plugin_client/detail/juce_VSTWindowUtilities.mm
@@ -29,9 +29,9 @@
 
 #if JUCE_MAC
 
-#include <juce_audio_plugin_client/utility/juce_CheckSettingMacros.h>
-#include <juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h>
-#include <juce_audio_plugin_client/utility/juce_VSTWindowUtilities.h>
+#include <juce_audio_plugin_client/detail/juce_CheckSettingMacros.h>
+#include <juce_audio_plugin_client/detail/juce_IncludeSystemHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_VSTWindowUtilities.h>
 
 namespace juce::detail
 {
diff --git a/modules/juce_audio_plugin_client/utility/juce_WindowsHooks.h b/modules/juce_audio_plugin_client/detail/juce_WindowsHooks.h
similarity index 100%
rename from modules/juce_audio_plugin_client/utility/juce_WindowsHooks.h
rename to modules/juce_audio_plugin_client/detail/juce_WindowsHooks.h
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
index 72b957961c..802f7fc25c 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
@@ -127,4 +127,4 @@
  #define JUCE_STANDALONE_FILTER_WINDOW_USE_KIOSK_MODE (JUCE_IOS || JUCE_ANDROID)
 #endif
 
-#include "utility/juce_CreatePluginFilter.h"
+#include "detail/juce_CreatePluginFilter.h"
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm b/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm
index fc182e9f0a..682e9eb4a5 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm
@@ -24,5 +24,5 @@
 */
 
 #if JucePlugin_Build_VST || JucePlugin_Build_VST3
- #include "utility/juce_VSTWindowUtilities.mm"
+ #include "detail/juce_VSTWindowUtilities.mm"
 #endif
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp
index 520c8bb828..c8769ab172 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp
@@ -23,4 +23,4 @@
   ==============================================================================
 */
 
-#include "utility/juce_PluginUtilities.cpp"
+#include "detail/juce_PluginUtilities.cpp"