diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3ManifestHelper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3ManifestHelper.cpp
index 0c2fed84a2..a1e9a4fdd9 100644
--- a/modules/juce_audio_plugin_client/VST3/juce_VST3ManifestHelper.cpp
+++ b/modules/juce_audio_plugin_client/VST3/juce_VST3ManifestHelper.cpp
@@ -117,6 +117,7 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 
 #include <juce_audio_processors/format_types/juce_VST3Utilities.h>
 #include <juce_audio_processors/utilities/juce_VST3Interface.h>
+#include <juce_audio_plugin_client/juce_audio_plugin_client.h>
 #include "juce_VST3ModuleInfo.h"
 
 //==============================================================================
diff --git a/modules/juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h b/modules/juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h
index ad3ea234c2..01b1f4fc61 100644
--- a/modules/juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h
+++ b/modules/juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h
@@ -35,6 +35,7 @@
 #pragma once
 
 #include <juce_audio_plugin_client/juce_audio_plugin_client.h>
+#include <juce_audio_processors/juce_audio_processors.h>
 
 #define Component juce::Component
 
diff --git a/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h b/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h
index ca1b9ab142..4473a84142 100644
--- a/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h
+++ b/modules/juce_audio_plugin_client/detail/juce_PluginUtilities.h
@@ -35,6 +35,7 @@
 #pragma once
 
 #include <juce_audio_plugin_client/detail/juce_IncludeModuleHeaders.h>
+#include <juce_audio_plugin_client/detail/juce_CreatePluginFilter.h>
 
 namespace juce::detail
 {
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 40628d5707..7bf3aa45f5 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
@@ -60,10 +60,6 @@
 
 #pragma once
 
-#include <juce_gui_basics/juce_gui_basics.h>
-#include <juce_audio_basics/juce_audio_basics.h>
-#include <juce_audio_processors/juce_audio_processors.h>
-
 /** Config: JUCE_VST3_CAN_REPLACE_VST2
 
     Enable this if you want your VST3 plug-in to load and save VST2 compatible
@@ -150,5 +146,3 @@
 #ifndef JUCE_IGNORE_VST3_MISMATCHED_PARAMETER_ID_WARNING
  #define JUCE_IGNORE_VST3_MISMATCHED_PARAMETER_ID_WARNING 0
 #endif
-
-#include "detail/juce_CreatePluginFilter.h"