diff --git a/src/commands/Command.h b/src/commands/Command.h
index b1cfcfdcb..2152c0a89 100644
--- a/src/commands/Command.h
+++ b/src/commands/Command.h
@@ -21,7 +21,6 @@
 
 #include "CommandMisc.h"
 #include "CommandSignature.h"
-#include "CommandTargets.h"
 #include "../commands/AudacityCommand.h"
 
 class AudacityApp;
diff --git a/src/commands/CommandContext.cpp b/src/commands/CommandContext.cpp
index 6a38f69ce..b199b4835 100644
--- a/src/commands/CommandContext.cpp
+++ b/src/commands/CommandContext.cpp
@@ -66,6 +66,8 @@ CommandContext::CommandContext(
 {
 }
 
+CommandContext::~CommandContext() = default;
+
 void CommandContext::Status( const wxString & message, bool bFlush ) const
 {
    if( pOutput )
diff --git a/src/commands/CommandContext.h b/src/commands/CommandContext.h
index c855d7a5b..8f2eb3f4b 100644
--- a/src/commands/CommandContext.h
+++ b/src/commands/CommandContext.h
@@ -34,6 +34,8 @@ public:
       AudacityProject &p,
       std::unique_ptr<CommandOutputTargets> target);
 
+   ~CommandContext();
+
    virtual void Status( const wxString &message, bool bFlush = false ) const;
    virtual void Error(  const wxString &message ) const;
    virtual void Progress( double d ) const;
diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp
index d2a9c0a80..9b3e46a0b 100644
--- a/src/menus/EditMenus.cpp
+++ b/src/menus/EditMenus.cpp
@@ -17,6 +17,7 @@
 #include "../prefs/PrefsDialog.h"
 #include "../prefs/SpectrogramSettings.h"
 #include "../prefs/WaveformSettings.h"
+#include "../widgets/ErrorDialog.h"
 
 // private helper classes and functions
 namespace {
diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
index ce8d5932b..ed98ad12d 100644
--- a/src/menus/FileMenus.cpp
+++ b/src/menus/FileMenus.cpp
@@ -14,6 +14,7 @@
 #include "../commands/CommandManager.h"
 #include "../export/Export.h"
 #include "../export/ExportMultiple.h"
+#include "../widgets/ErrorDialog.h"
 
 #ifdef USE_MIDI
 #include "../import/ImportMIDI.h"
diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp
index 00155c116..96eae6634 100644
--- a/src/menus/TransportMenus.cpp
+++ b/src/menus/TransportMenus.cpp
@@ -20,6 +20,7 @@
 #include "../toolbars/ControlToolBar.h"
 #include "../toolbars/TranscriptionToolBar.h"
 #include "../tracks/ui/Scrubbing.h"
+#include "../widgets/ErrorDialog.h"
 
 #include <float.h>