diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 0c1da6e..409322d 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -128,6 +128,9 @@
 #include "IAfThread.h"
 #include "IAfTrack.h"
 
+// Classes that depend on IAf* interfaces but are not cross-dependent.
+#include "PatchCommandThread.h"
+
 namespace android {
 
 class AudioMixer;
@@ -585,8 +588,6 @@
     using TeePatches = std::vector<TeePatch>;
 private:
 
-#include "PatchCommandThread.h"
-
 #include "DeviceEffectManager.h"
 
 #include "MelReporter.h"