CommandContext.cpp has fewer dependencies...

... freeing it (alone) from dependency cycles

src/commands/CommandContext.cpp

@@ -30,9 +30,7 @@ messaging from a command back to its invoker.
 #include <wx/variant.h>
 #include <wx/arrstr.h>
 
-#include "CommandBuilder.h"
 #include "CommandTargets.h"
-#include "CommandDirectory.h"
 
 CommandContext::CommandContext(
       AudacityProject &p

src/commands/CommandContext.h

@@ -11,8 +11,8 @@
 #ifndef __AUDACITY_COMMAND_CONTEXT__
 #define __AUDACITY_COMMAND_CONTEXT__
 
+#include <memory>
 #include "audacity/Types.h"
-#include "Command.h"
 
 class AudacityProject;
 class AudacityApp;

src/commands/CommandHandler.cpp

@@ -24,6 +24,7 @@
 #include "AppCommandEvent.h"
 #include "ScriptCommandRelay.h"
 #include "../commands/CommandContext.h"
+#include "../commands/Command.h"
 
 CommandHandler::CommandHandler()
  : mCurrentContext(std::make_unique<CommandContext>

src/effects/EffectManager.cpp

@@ -35,6 +35,7 @@ effects.
 
 #include "../ShuttleGetDefinition.h"
 #include "../commands/CommandContext.h"
+#include "../commands/Command.h"
 #include "../PluginManager.h"