diff --git a/src/CommonCommandFlags.cpp b/src/CommonCommandFlags.cpp
index 32ce3b3af..9cae1321b 100644
--- a/src/CommonCommandFlags.cpp
+++ b/src/CommonCommandFlags.cpp
@@ -21,7 +21,6 @@ Paul Licameli split from Menus.cpp
 #include "NoteTrack.h"
 #include "Project.h"
 #include "ProjectAudioIO.h"
-#include "ProjectAudioManager.h"
 #include "ProjectFileIO.h"
 #include "ProjectHistory.h"
 #include "ProjectSettings.h"
@@ -343,14 +342,3 @@ const ReservedCommandFlag
      [](const AudacityProject &){ return true; }
    } // jkc
 ;
-
-RegisteredMenuItemEnabler stopIfPaused{{
-   PausedFlag,
-   AudioIONotBusyFlag,
-   []( const AudacityProject &project ){
-      return MenuManager::Get( project ).mStopIfWasPaused; },
-   []( AudacityProject &project, CommandFlag ){
-      if ( MenuManager::Get( project ).mStopIfWasPaused )
-         TransportActions::StopIfPaused( project );
-   }
-}};
diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp
index 050a71b1c..346642f2e 100644
--- a/src/ProjectAudioManager.cpp
+++ b/src/ProjectAudioManager.cpp
@@ -392,3 +392,16 @@ void DoStop( AudacityProject &project )
 }
 
 }
+
+#include "CommonCommandFlags.h"
+
+static RegisteredMenuItemEnabler stopIfPaused{{
+   PausedFlag,
+   AudioIONotBusyFlag,
+   []( const AudacityProject &project ){
+      return MenuManager::Get( project ).mStopIfWasPaused; },
+   []( AudacityProject &project, CommandFlag ){
+      if ( MenuManager::Get( project ).mStopIfWasPaused )
+         TransportActions::StopIfPaused( project );
+   }
+}};