diff --git a/lib-src/mod-nyq-bench/NyqBench.cpp b/lib-src/mod-nyq-bench/NyqBench.cpp
index 3ea86f6d9..c10408eaa 100755
--- a/lib-src/mod-nyq-bench/NyqBench.cpp
+++ b/lib-src/mod-nyq-bench/NyqBench.cpp
@@ -14,6 +14,7 @@
 #include <wx/filedlg.h>
 #include <wx/font.h>
 #include <wx/fontdlg.h>
+#include <wx/menu.h>
 #include <wx/msgdlg.h>
 #include <wx/settings.h>
 #include <wx/sizer.h>
diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
index 906936326..0497bacb3 100644
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@@ -43,6 +43,8 @@
 #include "widgets/AButton.h"
 #include "widgets/Grabber.h"
 
+#include <wx/menu.h>
+
 using std::min;
 using std::max;
 
diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp
index 6d0457cb2..87cbf2446 100644
--- a/src/LabelTrack.cpp
+++ b/src/LabelTrack.cpp
@@ -49,6 +49,7 @@ for drawing different aspects of the label and its text box.
 #include <wx/event.h>
 #include <wx/intl.h>
 #include <wx/log.h>
+#include <wx/menu.h>
 #include <wx/pen.h>
 #include <wx/string.h>
 #include <wx/textfile.h>
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 9da4534f3..6b6eab655 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -49,6 +49,8 @@
 #include "toolbars/ControlToolBar.h"
 #include "toolbars/ToolManager.h"
 
+#include <wx/menu.h>
+
 PrefsListener::~PrefsListener()
 {
 }
diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 93a4d06d2..95ac83b44 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -90,6 +90,7 @@ CommandManager.  It holds the callback for one command.
 #include <wx/hash.h>
 #include <wx/intl.h>
 #include <wx/log.h>
+#include <wx/menu.h>
 #include <wx/tokenzr.h>
 
 #include "../AudacityException.h"
@@ -134,6 +135,31 @@ TopLevelKeystrokeHandlingWindow::~TopLevelKeystrokeHandlingWindow()
 {
 }
 
+MenuBarListEntry::MenuBarListEntry(const wxString &name_, wxMenuBar *menubar_)
+   : name(name_), menubar(menubar_)
+{
+}
+
+MenuBarListEntry::~MenuBarListEntry()
+{
+}
+
+SubMenuListEntry::SubMenuListEntry(
+   const wxString &name_, std::unique_ptr<wxMenu> &&menu_ )
+   : name(name_), menu( std::move(menu_) )
+{
+}
+
+SubMenuListEntry::SubMenuListEntry(SubMenuListEntry &&that)
+   : name(std::move(that.name))
+   , menu(std::move(that.menu))
+{
+}
+
+SubMenuListEntry::~SubMenuListEntry()
+{
+}
+
 // Shared by all projects
 static class CommandManagerEventMonitor final : public wxEventFilter
 {
diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
index 3b6d7b72b..0d93ec6e7 100644
--- a/src/commands/CommandManager.h
+++ b/src/commands/CommandManager.h
@@ -23,7 +23,6 @@
 #include "Keyboard.h"
 #include <vector>
 #include <wx/string.h>
-#include <wx/menu.h>
 #include <wx/hashmap.h>
 
 #include "../xml/XMLTagHandler.h"
@@ -32,14 +31,15 @@
 
 #include <unordered_map>
 
+class wxMenu;
+class wxMenuBar;
 class TranslatedInternalString;
 using CommandParameter = CommandID;
 
 struct MenuBarListEntry
 {
-   MenuBarListEntry(const wxString &name_, wxMenuBar *menubar_)
-      : name(name_), menubar(menubar_)
-   {}
+   MenuBarListEntry(const wxString &name_, wxMenuBar *menubar_);
+   ~MenuBarListEntry();
 
    wxString name;
    wxWeakRef<wxMenuBar> menubar; // This structure does not assume memory ownership!
@@ -47,15 +47,9 @@ struct MenuBarListEntry
 
 struct SubMenuListEntry
 {
-   SubMenuListEntry(const wxString &name_, std::unique_ptr<wxMenu> &&menu_)
-      : name(name_), menu( std::move(menu_) )
-   {}
-
-   SubMenuListEntry(SubMenuListEntry &&that)
-      : name(std::move(that.name))
-      , menu(std::move(that.menu))
-   {
-   }
+   SubMenuListEntry(const wxString &name_, std::unique_ptr<wxMenu> &&menu_);
+   SubMenuListEntry(SubMenuListEntry &&that);
+   ~SubMenuListEntry();
 
    wxString name;
    std::unique_ptr<wxMenu> menu;
diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp
index a39f38c47..ad8b4bfd1 100644
--- a/src/commands/GetInfoCommand.cpp
+++ b/src/commands/GetInfoCommand.cpp
@@ -46,6 +46,8 @@ This class now lists
 #include "../PluginManager.h"
 #include "../ShuttleGui.h"
 
+#include <wx/menu.h>
+
 enum {
    kCommands,
    //kCommandsPlus,
diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp
index c1b1350ed..7218cf732 100644
--- a/src/commands/ScreenshotCommand.cpp
+++ b/src/commands/ScreenshotCommand.cpp
@@ -25,6 +25,7 @@ small calculations of rectangles.
 #include <wx/toplevel.h>
 #include <wx/dcscreen.h>
 #include <wx/dcmemory.h>
+#include <wx/menu.h>
 #include <wx/settings.h>
 #include <wx/bitmap.h>
 #include <wx/valgen.h>
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 19dfab11a..73136a4ce 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -30,6 +30,7 @@ greater use in future.
 
 #include <wx/defs.h>
 #include <wx/hashmap.h>
+#include <wx/menu.h>
 #include <wx/sizer.h>
 #include <wx/stockitem.h>
 #include <wx/string.h>
diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
index 686b19480..ce8d5932b 100644
--- a/src/menus/FileMenus.cpp
+++ b/src/menus/FileMenus.cpp
@@ -21,6 +21,8 @@
 
 #include "../ondemand/ODManager.h"
 
+#include <wx/menu.h>
+
 // private helper classes and functions
 namespace {
 void DoExport
diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index 3c5b78343..e8a0b7138 100644
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@@ -27,6 +27,7 @@ KeyConfigPrefs and MousePrefs use.
 #include <wx/ffile.h>
 #include <wx/intl.h>
 #include <wx/filedlg.h>
+#include <wx/menu.h>
 #include <wx/button.h>
 
 #include "../Prefs.h"
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index f070b3815..19e550fc9 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -42,6 +42,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <wx/app.h>
 #include <wx/dc.h>
+#include <wx/menu.h>
 
 // Yet another experimental scrub would drag the track under a
 // stationary play head
diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp
index 0f624e208..3eda2a51f 100644
--- a/src/widgets/KeyView.cpp
+++ b/src/widgets/KeyView.cpp
@@ -24,6 +24,7 @@
 #include "../commands/Keyboard.h"
 
 #include <wx/dc.h>
+#include <wx/menu.h>
 #include "../Internat.h"
 
 // Various drawing constants