diff --git a/src/CommonCommandFlags.cpp b/src/CommonCommandFlags.cpp
index b65676bd5..125b3e5aa 100644
--- a/src/CommonCommandFlags.cpp
+++ b/src/CommonCommandFlags.cpp
@@ -237,36 +237,6 @@ const ReservedCommandFlag&
          ;
       }
    }; return flag; }
-const ReservedCommandFlag&
-   HasLastGeneratorFlag() { static ReservedCommandFlag flag{
-      [](const AudacityProject &project){
-         return !MenuManager::Get( project ).mLastGenerator.empty();
-      }
-   }; return flag; }
-const ReservedCommandFlag&
-   HasLastEffectFlag() { static ReservedCommandFlag flag{
-      [](const AudacityProject &project) {
-         return !MenuManager::Get(project).mLastEffect.empty();
-      }
-   }; return flag;
-}
-const ReservedCommandFlag&
-   HasLastAnalyzerFlag() { static ReservedCommandFlag flag{
-      [](const AudacityProject &project) {
-         if (MenuManager::Get(project).mLastAnalyzerRegistration == MenuCreator::repeattypeunique) return true;
-         return !MenuManager::Get(project).mLastAnalyzer.empty();
-      }
-   }; return flag;
-}
-const ReservedCommandFlag&
-   HasLastToolFlag() { static ReservedCommandFlag flag{
-      [](const AudacityProject &project) {
-      auto& menuManager = MenuManager::Get(project);
-         if (menuManager.mLastToolRegistration == MenuCreator::repeattypeunique) return true;
-         return !menuManager.mLastTool.empty();
-      }
-   }; return flag;
-}
 const ReservedCommandFlag&
    UndoAvailableFlag() { static ReservedCommandFlag flag{
       [](const AudacityProject &project){
diff --git a/src/CommonCommandFlags.h b/src/CommonCommandFlags.h
index 47ea21c63..7c1ad372f 100644
--- a/src/CommonCommandFlags.h
+++ b/src/CommonCommandFlags.h
@@ -38,10 +38,6 @@ extern AUDACITY_DLL_API const ReservedCommandFlag
 extern AUDACITY_DLL_API const ReservedCommandFlag
    &LabelTracksExistFlag(),
    &UnsavedChangesFlag(),
-   &HasLastGeneratorFlag(),
-   &HasLastEffectFlag(),
-   &HasLastAnalyzerFlag(),
-   &HasLastToolFlag(),
    &UndoAvailableFlag(),
    &RedoAvailableFlag(),
    &ZoomInAvailableFlag(),
diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp
index 839edd1f7..4cb40e61a 100644
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@@ -811,6 +811,14 @@ MenuTable::BaseItemPtrs PopulateMacrosMenu( CommandFlag flags  )
 // Under /MenuBar
 namespace {
 using namespace MenuTable;
+
+const ReservedCommandFlag&
+   HasLastGeneratorFlag() { static ReservedCommandFlag flag{
+      [](const AudacityProject &project){
+         return !MenuManager::Get( project ).mLastGenerator.empty();
+      }
+   }; return flag; }
+
 BaseItemSharedPtr GenerateMenu()
 {
    // All of this is a bit hacky until we can get more things connected into
@@ -873,6 +881,14 @@ AttachedItem sAttachment1{
    Shared( GenerateMenu() )
 };
 
+const ReservedCommandFlag&
+   HasLastEffectFlag() { static ReservedCommandFlag flag{
+      [](const AudacityProject &project) {
+         return !MenuManager::Get(project).mLastEffect.empty();
+      }
+   }; return flag;
+}
+
 BaseItemSharedPtr EffectMenu()
 {
    // All of this is a bit hacky until we can get more things connected into
@@ -926,6 +942,15 @@ AttachedItem sAttachment2{
    Shared( EffectMenu() )
 };
 
+const ReservedCommandFlag&
+   HasLastAnalyzerFlag() { static ReservedCommandFlag flag{
+      [](const AudacityProject &project) {
+         if (MenuManager::Get(project).mLastAnalyzerRegistration == MenuCreator::repeattypeunique) return true;
+         return !MenuManager::Get(project).mLastAnalyzer.empty();
+      }
+   }; return flag;
+}
+
 BaseItemSharedPtr AnalyzeMenu()
 {
    // All of this is a bit hacky until we can get more things connected into
@@ -983,6 +1008,16 @@ AttachedItem sAttachment3{
    Shared( AnalyzeMenu() )
 };
 
+const ReservedCommandFlag&
+   HasLastToolFlag() { static ReservedCommandFlag flag{
+      [](const AudacityProject &project) {
+      auto& menuManager = MenuManager::Get(project);
+         if (menuManager.mLastToolRegistration == MenuCreator::repeattypeunique) return true;
+         return !menuManager.mLastTool.empty();
+      }
+   }; return flag;
+}
+
 BaseItemSharedPtr ToolsMenu()
 {
    using Options = CommandManager::Options;