diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp
index 02e1963bb..0454affc4 100644
--- a/src/LabelDialog.cpp
+++ b/src/LabelDialog.cpp
@@ -38,6 +38,7 @@
 #include "ViewInfo.h"
 #include "widgets/NumericTextCtrl.h"
 #include "widgets/ErrorDialog.h"
+#include "widgets/Grid.h"
 #include "widgets/HelpSystem.h"
 
 #include "FileNames.h"
diff --git a/src/LabelDialog.h b/src/LabelDialog.h
index 77a0d1250..23924ba8f 100644
--- a/src/LabelDialog.h
+++ b/src/LabelDialog.h
@@ -15,11 +15,14 @@
 #include <wx/defs.h>
 
 #include "Internat.h"
-#include "widgets/Grid.h"
 #include "widgets/wxPanelWrapper.h"
+#include "audacity/ComponentInterface.h" // member variable
 
 class wxArrayString;
 class wxGridEvent;
+class ChoiceEditor;
+class Grid;
+class NumericEditor;
 class TrackFactory;
 class TrackList;
 class RowData;
diff --git a/src/Tags.h b/src/Tags.h
index ff4125d7d..46bf56e46 100644
--- a/src/Tags.h
+++ b/src/Tags.h
@@ -31,7 +31,6 @@
 
 #include "Audacity.h"
 
-#include "widgets/Grid.h"
 #include "xml/XMLTagHandler.h"
 
 #include "MemoryX.h"
@@ -44,6 +43,8 @@
 class wxArrayString;
 class wxComboBox;
 class wxGridCellChoiceEditor;
+class wxGridCellStringRenderer;
+class wxGridEvent;
 class wxTextCtrl;
 
 class Grid;
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index ca5177122..2608f406d 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -21,7 +21,6 @@
 
 #include "Effect.h"
 #include "../xml/XMLTagHandler.h"
-#include "../widgets/Grid.h"
 #include "../RealFFTf.h"
 #include "../SampleFormat.h"
 
diff --git a/src/export/Export.h b/src/export/Export.h
index aea8901c7..36026aea1 100644
--- a/src/export/Export.h
+++ b/src/export/Export.h
@@ -13,12 +13,11 @@
 
 #include "../MemoryX.h"
 #include <vector>
-#include "../Tags.h"
+#include <wx/filename.h> // member variable
 #include "../SampleFormat.h"
 #include "../widgets/wxPanelWrapper.h"
 
 class wxArrayString;
-class wxFileName;
 class FileDialogWrapper;
 class wxFileCtrlEvent;
 class wxMemoryDC;
@@ -27,6 +26,7 @@ class wxStaticText;
 class AudacityProject;
 class DirManager;
 class WaveTrack;
+class Tags;
 class TrackList;
 class MixerSpec;
 class ProgressDialog;
diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index 07a98291f..079f6a58b 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -54,6 +54,28 @@
 #include "../widgets/ErrorDialog.h"
 
 
+namespace {
+/** \brief A private class used to store the information needed to do an
+    * export.
+    *
+    * We create a set of these during the interactive phase of the export
+    * cycle, then use them when the actual exports are done. */
+   class ExportKit
+   {
+   public:
+      Tags filetags; /**< The set of metadata to use for the export */
+      wxFileNameWrapper destfile; /**< The file to export to */
+      double t0;           /**< Start time for the export */
+      double t1;           /**< End time for the export */
+      unsigned channels;   /**< Number of channels for ExportMultipleByTrack */
+   };  // end of ExportKit declaration
+   /* we are going to want an set of these kits, and don't know how many until
+    * runtime. I would dearly like to use a std::vector, but it seems that
+    * this isn't done anywhere else in Audacity, presumably for a reason?, so
+    * I'm stuck with wxArrays, which are much harder, as well as non-standard.
+    */
+}
+
 /* define our dynamic array of export settings */
 
 enum {
diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h
index 9b92f54ef..ddfb0744f 100644
--- a/src/export/ExportMultiple.h
+++ b/src/export/ExportMultiple.h
@@ -12,7 +12,6 @@
 #define __AUDACITY_EXPORT_MULTIPLE__
 
 #include "Export.h"
-#include "../Tags.h"       // we need to know about the Tags class for metadata
 #include "../wxFileNameWrapper.h" // member variable
 
 class wxButton;
@@ -188,25 +187,4 @@ private:
 };
 
 
-/** \brief A private class used to store the information needed to do an
-    * export.
-    *
-    * We create a set of these during the interactive phase of the export
-    * cycle, then use them when the actual exports are done. */
-   class ExportKit
-   {
-   public:
-      Tags filetags; /**< The set of metadata to use for the export */
-      wxFileNameWrapper destfile; /**< The file to export to */
-      double t0;           /**< Start time for the export */
-      double t1;           /**< End time for the export */
-      unsigned channels;   /**< Number of channels for ExportMultipleByTrack */
-   };  // end of ExportKit declaration
-   /* we are going to want an set of these kits, and don't know how many until
-    * runtime. I would dearly like to use a std::vector, but it seems that
-    * this isn't done anywhere else in Audacity, presumably for a reason?, so
-    * I'm stuck with wxArrays, which are much harder, as well as non-standard.
-    */
-
-
 #endif
diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp
index 9d1bb520e..f557cdc29 100644
--- a/src/prefs/ExtImportPrefs.cpp
+++ b/src/prefs/ExtImportPrefs.cpp
@@ -24,6 +24,7 @@
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 #include "../widgets/ErrorDialog.h"
+#include "../widgets/Grid.h"
 
 #define EXTIMPORT_MIME_SUPPORT 0
 
diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h
index 3325f788c..8220385fd 100644
--- a/src/prefs/ExtImportPrefs.h
+++ b/src/prefs/ExtImportPrefs.h
@@ -13,7 +13,6 @@
 
 #include <wx/defs.h>
 #include <wx/dnd.h> // to inherit wxDropTarget
-#include "../widgets/Grid.h"
 
 #include "PrefsPanel.h"
 
@@ -21,9 +20,12 @@
 #include "../import/ImportPlugin.h"
 
 class wxButton;
+class wxGridEvent;
+class wxGridRangeSelectEvent;
 class wxListCtrl;
 class wxListEvent;
 class ExtImportPrefs;
+class Grid;
 class ShuttleGui;
 
 class ExtImportPrefsDropTarget final : public wxDropTarget