From d81ca9964344c9f42d57c3ed60386f5a58880224 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 11 May 2019 15:48:39 -0400
Subject: [PATCH] CommandContext.cpp has fewer dependencies...

... freeing it (alone) from dependency cycles
---
 src/commands/CommandContext.cpp | 2 --
 src/commands/CommandContext.h   | 2 +-
 src/commands/CommandHandler.cpp | 1 +
 src/effects/EffectManager.cpp   | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/CommandContext.cpp b/src/commands/CommandContext.cpp
index 990e61ad1..d979e911a 100644
--- a/src/commands/CommandContext.cpp
+++ b/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
diff --git a/src/commands/CommandContext.h b/src/commands/CommandContext.h
index dc53ddac1..38f511347 100644
--- a/src/commands/CommandContext.h
+++ b/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;
diff --git a/src/commands/CommandHandler.cpp b/src/commands/CommandHandler.cpp
index 365f6bed5..70cff9317 100644
--- a/src/commands/CommandHandler.cpp
+++ b/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>
diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp
index dd9220767..a0dc02879 100644
--- a/src/effects/EffectManager.cpp
+++ b/src/effects/EffectManager.cpp
@@ -35,6 +35,7 @@ effects.
 
 #include "../ShuttleGetDefinition.h"
 #include "../commands/CommandContext.h"
+#include "../commands/Command.h"
 #include "../PluginManager.h"