From 34f318cd410d6f3502cc9cfc6bd1cff4806e1df9 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 16 Nov 2018 10:12:10 -0500
Subject: [PATCH] Remove wx/{imaglist,generic/dragimgg,gauge,dynarray}.h from
 *.h

---
 src/AutoRecovery.cpp           | 1 +
 src/Dependencies.cpp           | 1 +
 src/Project.h                  | 6 +-----
 src/commands/AudacityCommand.h | 1 -
 src/effects/Equalization.cpp   | 1 +
 src/export/ExportMultiple.cpp  | 1 +
 src/prefs/KeyConfigPrefs.h     | 1 -
 src/widgets/ProgressDialog.cpp | 1 +
 src/widgets/ProgressDialog.h   | 2 +-
 9 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp
index eca21cbb2..5ec2f08f7 100644
--- a/src/AutoRecovery.cpp
+++ b/src/AutoRecovery.cpp
@@ -28,6 +28,7 @@ text or binary format to a file.
 
 #include <wx/wxprec.h>
 #include <wx/filefn.h>
+#include <wx/listctrl.h>
 #include <wx/dir.h>
 #include <wx/dialog.h>
 #include <wx/app.h>
diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp
index da9a1f92d..ada464421 100644
--- a/src/Dependencies.cpp
+++ b/src/Dependencies.cpp
@@ -41,6 +41,7 @@ AliasedFile s.
 #include <wx/defs.h>
 #include <wx/dialog.h>
 #include <wx/filename.h>
+#include <wx/listctrl.h>
 #include <wx/menu.h>
 #include <wx/progdlg.h>
 #include <wx/choice.h>
diff --git a/src/Project.h b/src/Project.h
index 345c760ac..4e5f14e6b 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -35,11 +35,6 @@
 
 #include <memory>
 #include <wx/defs.h>
-
-// dragimgg.h uses this incomplete type without declaring it on some OSs !
-class wxMemoryDC;
-#include <wx/generic/dragimgg.h>
-
 #include <wx/frame.h> // to inherit
 
 #include "import/ImportRaw.h" // defines TrackHolders
@@ -53,6 +48,7 @@ class wxDialog;
 class wxScrollEvent;
 class wxScrollBar;
 class wxPanel;
+class wxTimer;
 class wxTimerEvent;
 
 class AudacityProject;
diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h
index 741c422c4..fccebb127 100644
--- a/src/commands/AudacityCommand.h
+++ b/src/commands/AudacityCommand.h
@@ -18,7 +18,6 @@
 
 #include "../MemoryX.h"
 #include <wx/defs.h>
-#include <wx/dynarray.h>
 
 class wxWindow;
 
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index 0403ec20a..c543b4de0 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -69,6 +69,7 @@
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/event.h>
+#include <wx/listctrl.h>
 #include <wx/image.h>
 #include <wx/intl.h>
 #include <wx/choice.h>
diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index 373cc5ac6..07a98291f 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -25,6 +25,7 @@
 #include <wx/dialog.h>
 #include <wx/dirdlg.h>
 #include <wx/event.h>
+#include <wx/listbase.h>
 #include <wx/filedlg.h>
 #include <wx/filefn.h>
 #include <wx/filename.h>
diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h
index 8bab60828..a24fead73 100644
--- a/src/prefs/KeyConfigPrefs.h
+++ b/src/prefs/KeyConfigPrefs.h
@@ -16,7 +16,6 @@ class CommandManager;
 class ShuttleGui;
 
 #include <wx/defs.h>
-#include <wx/imaglist.h>
 #include <wx/srchctrl.h>
 #include <wx/timer.h>
 
diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
index 67d56c694..567727c63 100644
--- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
@@ -40,6 +40,7 @@
 #include <wx/dialog.h>
 #include <wx/event.h>
 #include <wx/evtloop.h>
+#include <wx/gauge.h>
 #include <wx/frame.h>
 #include <wx/intl.h>
 #include <wx/msgdlg.h>
diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h
index 47d6b4e05..3b878e454 100644
--- a/src/widgets/ProgressDialog.h
+++ b/src/widgets/ProgressDialog.h
@@ -24,10 +24,10 @@
 #include <vector>
 #include <wx/defs.h>
 #include <wx/evtloop.h>
-#include <wx/gauge.h>
 
 #include "wxPanelWrapper.h"
 
+class wxGauge;
 class wxStaticText;
 
 enum class ProgressResult : unsigned