diff --git a/src/Project.cpp b/src/Project.cpp
index 065888da2..8e6949c59 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -155,8 +155,6 @@ scroll information.  It also has some status flags.
 #include "toolbars/ToolManager.h"
 #include "toolbars/ControlToolBar.h"
 #include "toolbars/DeviceToolBar.h"
-#include "toolbars/EditToolBar.h"
-#include "toolbars/MeterToolBar.h"
 #include "toolbars/MixerToolBar.h"
 #include "toolbars/ScrubbingToolBar.h"
 #include "toolbars/SelectionBar.h"
@@ -4816,14 +4814,6 @@ DeviceToolBar *AudacityProject::GetDeviceToolBar()
            NULL);
 }
 
-EditToolBar *AudacityProject::GetEditToolBar()
-{
-   return (EditToolBar *)
-          (mToolManager ?
-           mToolManager->GetToolBar(EditBarID) :
-           NULL);
-}
-
 MixerToolBar *AudacityProject::GetMixerToolBar()
 {
    return (MixerToolBar *)
diff --git a/src/Project.h b/src/Project.h
index 4e5f14e6b..7665e9397 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -68,8 +68,6 @@ class MeterPanel;
 // toolbar classes
 class ControlToolBar;
 class DeviceToolBar;
-class EditToolBar;
-class MeterToolBar;
 class MixerToolBar;
 class Scrubber;
 class ScrubbingToolBar;
@@ -465,7 +463,6 @@ public:
    ControlToolBar *GetControlToolBar();
 
    DeviceToolBar *GetDeviceToolBar();
-   EditToolBar *GetEditToolBar();
    MixerToolBar *GetMixerToolBar();
    ScrubbingToolBar *GetScrubbingToolBar();
    SelectionBar *GetSelectionBar();
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index e4abaf31e..b253e8966 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -42,8 +42,6 @@ class Ruler;
 class SnapManager;
 class AdornedRulerPanel;
 class LWSlider;
-class ControlToolBar; //Needed because state of controls can affect what gets drawn.
-class ToolsToolBar; //Needed because state of controls can affect what gets drawn.
 
 class TrackPanelAx;
 
diff --git a/src/TrackPanelListener.h b/src/TrackPanelListener.h
index e5e54d647..041e53168 100644
--- a/src/TrackPanelListener.h
+++ b/src/TrackPanelListener.h
@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_TRACK_PANEL_LISTENER__
 #define __AUDACITY_TRACK_PANEL_LISTENER__
 
-class ToolsToolBar;
-class ControlToolBar;
 enum class UndoPush : unsigned char;
 
 /*
diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp
index 6ce40355c..f5f06a979 100644
--- a/src/commands/AudacityCommand.cpp
+++ b/src/commands/AudacityCommand.cpp
@@ -44,7 +44,6 @@ ShuttleGui.
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"
-#include "../toolbars/ControlToolBar.h"
 #include "../widgets/AButton.h"
 #include "../widgets/ProgressDialog.h"
 #include "../ondemand/ODManager.h"
diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp
index 7218cf732..8c63889a4 100644
--- a/src/commands/ScreenshotCommand.cpp
+++ b/src/commands/ScreenshotCommand.cpp
@@ -35,14 +35,6 @@ small calculations of rectangles.
 #include "../TrackPanel.h"
 #include "../toolbars/ToolManager.h"
 #include "../toolbars/ToolBar.h"
-#include "../toolbars/ControlToolBar.h"
-#include "../toolbars/DeviceToolBar.h"
-#include "../toolbars/EditToolBar.h"
-#include "../toolbars/MeterToolBar.h"
-#include "../toolbars/MixerToolBar.h"
-#include "../toolbars/SelectionBar.h"
-#include "../toolbars/ToolsToolBar.h"
-#include "../toolbars/TranscriptionToolBar.h"
 #include "../Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 31ef14155..3ebbfa123 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -20,9 +20,7 @@
   This class, which is a child of Toolbar, creates the
   window containing the Transport (rewind/play/stop/record/ff)
   buttons. The window can be embedded within a
-  normal project window, or within a ToolbarFrame that is
-  managed by a global ToolBarStub called
-  gControlToolBarStub.
+  normal project window, or within a ToolBarFrame.
 
   All of the controls in this window were custom-written for
   Audacity - they are not native controls on any platform -
@@ -59,7 +57,6 @@
 #include <wx/datetime.h>
 
 #include "TranscriptionToolBar.h"
-#include "MeterToolBar.h"
 
 #include "../AColor.h"
 #include "../AdornedRulerPanel.h"
diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp
index b09ab5083..a5cdddba7 100644
--- a/src/toolbars/EditToolBar.cpp
+++ b/src/toolbars/EditToolBar.cpp
@@ -19,8 +19,7 @@
   window containing interfaces to commonly-used edit
   functions that are otherwise only available through
   menus. The window can be embedded within a normal project
-  window, or within a ToolbarFrame that is managed by a
-  global ToolBarStub called gControlToolBarStub.
+  window, or within a ToolBarFrame.
 
   All of the controls in this window were custom-written for
   Audacity - they are not native controls on any platform -
diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp
index c16744f79..b78203b15 100644
--- a/src/toolbars/ToolsToolBar.cpp
+++ b/src/toolbars/ToolsToolBar.cpp
@@ -18,9 +18,7 @@
   This class, which is a child of Toolbar, creates the
   window containing the tool selection (ibeam, envelope,
   move, zoom). The window can be embedded within a
-  normal project window, or within a ToolbarFrame that is
-  managed by a global ToolBarStub called
-  gToolsToolBarStub.
+  normal project window, or within a ToolBarFrame.
 
   All of the controls in this window were custom-written for
   Audacity - they are not native controls on any platform -
@@ -48,8 +46,6 @@
 #endif
 #include <wx/tooltip.h>
 
-#include "MeterToolBar.h"
-
 #include "../Prefs.h"
 #include "../AllThemeResources.h"
 #include "../ImageManipulation.h"
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 62931928e..e5e13e4c9 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -67,8 +67,6 @@
 #include "../ImageManipulation.h"
 #include "../prefs/GUISettings.h"
 #include "../Project.h"
-#include "../toolbars/MeterToolBar.h"
-#include "../toolbars/ControlToolBar.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"