diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm
index 85666b3895..e3e97e3437 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm
@@ -74,7 +74,7 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 #include <juce_audio_basics/native/juce_CoreAudioTimeConversions_mac.h>
 #include <juce_audio_basics/native/juce_AudioWorkgroup_mac.h>
 #include <juce_audio_processors_headless/format_types/juce_LegacyAudioParameter.h>
-#include <juce_audio_processors/format_types/juce_AU_Shared.h>
+#include <juce_audio_processors_headless/format_types/juce_AU_Shared.h>
 #include <juce_gui_basics/detail/juce_ComponentPeerHelpers.h>
 
 #if JucePlugin_Enable_ARA
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AUv3.mm b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AUv3.mm
index edf795c3cf..9217a78f80 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AUv3.mm
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AUv3.mm
@@ -55,7 +55,7 @@
 #include <juce_audio_basics/native/juce_CoreAudioTimeConversions_mac.h>
 #include <juce_audio_basics/native/juce_AudioWorkgroup_mac.h>
 #include <juce_audio_processors_headless/format_types/juce_LegacyAudioParameter.h>
-#include <juce_audio_processors/format_types/juce_AU_Shared.h>
+#include <juce_audio_processors_headless/format_types/juce_AU_Shared.h>
 
 #define JUCE_VIEWCONTROLLER_OBJC_NAME(x) JUCE_JOIN_MACRO (x, FactoryAUv3)
 
diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp
index f695e29096..7e57507992 100644
--- a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp
+++ b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp
@@ -38,7 +38,7 @@ namespace juce
 {
 
 //==============================================================================
-void addDefaultFormatsToManager (AudioPluginFormatManager& manager)
+void addDefaultFormatsToManager ([[maybe_unused]] AudioPluginFormatManager& manager)
 {
    #if JUCE_INTERNAL_HAS_AU
     manager.addFormat (std::make_unique<AudioUnitPluginFormat>());
diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
index 2864c12c41..26ea81e0d7 100644
--- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
+++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
@@ -51,7 +51,7 @@
 
 #include <juce_audio_basics/native/juce_CoreAudioTimeConversions_mac.h>
 #include <juce_audio_basics/native/juce_CoreAudioLayouts_mac.h>
-#include <juce_audio_processors/format_types/juce_AU_Shared.h>
+#include <juce_audio_processors_headless/format_types/juce_AU_Shared.h>
 #include <juce_audio_processors_headless/format_types/juce_ARACommonInternal.h>
 
 namespace juce
diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat_test.cpp b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat_test.cpp
index b310be7278..33d395dd17 100644
--- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat_test.cpp
+++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat_test.cpp
@@ -32,7 +32,7 @@
   ==============================================================================
 */
 
-#include "juce_AU_Shared.h"
+#include <juce_audio_processors_headless/format_types/juce_AU_Shared.h>
 
 namespace juce
 {
diff --git a/modules/juce_audio_processors/format_types/juce_AU_Shared.h b/modules/juce_audio_processors_headless/format_types/juce_AU_Shared.h
similarity index 100%
rename from modules/juce_audio_processors/format_types/juce_AU_Shared.h
rename to modules/juce_audio_processors_headless/format_types/juce_AU_Shared.h