From 434f3919f91a2a4ba7fad7da193b7d16dae919d5 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 17 Feb 2021 12:22:36 -0500
Subject: [PATCH] MemoryX.h does not include wx/utils.h

---
 src/MemoryX.h              | 2 +-
 src/ModuleManager.h        | 1 +
 src/effects/Biquad.cpp     | 1 +
 src/effects/EBUR128.h      | 2 ++
 src/effects/TimeWarper.cpp | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/MemoryX.h b/src/MemoryX.h
index 213d4db26..0a274cd85 100644
--- a/src/MemoryX.h
+++ b/src/MemoryX.h
@@ -2,6 +2,7 @@
 #define __AUDACITY_MEMORY_X_H__
 
 // C++ standard header <memory> with a few extensions
+#include <iterator>
 #include <memory>
 #include <cstdlib> // Needed for free.
 #ifndef safenew
@@ -329,7 +330,6 @@ Final_action<F> finally (F f)
    return Final_action<F>(f);
 }
 
-#include <wx/utils.h> // for wxMin, wxMax
 #include <algorithm>
 
 /**
diff --git a/src/ModuleManager.h b/src/ModuleManager.h
index 3954ff700..f749deb71 100644
--- a/src/ModuleManager.h
+++ b/src/ModuleManager.h
@@ -23,6 +23,7 @@ class wxArrayString;
 class wxDynamicLibrary;
 class ComponentInterface;
 class ModuleInterface;
+class wxWindow;
 
 //
 // Module Manager
diff --git a/src/effects/Biquad.cpp b/src/effects/Biquad.cpp
index b4a996801..ec2185331 100644
--- a/src/effects/Biquad.cpp
+++ b/src/effects/Biquad.cpp
@@ -12,6 +12,7 @@ Max Maisel
 #include "Biquad.h"
 
 #include <cmath>
+#include <wx/utils.h>
 
 #define square(a) ((a)*(a))
 #define PI M_PI
diff --git a/src/effects/EBUR128.h b/src/effects/EBUR128.h
index e12b76263..80522d867 100644
--- a/src/effects/EBUR128.h
+++ b/src/effects/EBUR128.h
@@ -15,6 +15,8 @@ Max Maisel
 #include <memory>
 #include "SampleFormat.h"
 
+#include <cmath>
+
 /// \brief Implements EBU-R128 loudness measurement.
 class EBUR128
 {
diff --git a/src/effects/TimeWarper.cpp b/src/effects/TimeWarper.cpp
index ced77d845..ad893a155 100644
--- a/src/effects/TimeWarper.cpp
+++ b/src/effects/TimeWarper.cpp
@@ -20,6 +20,7 @@ Geometric TimeWarper classes
 
 #include <wx/string.h>
 #include <math.h>
+#include <wx/debug.h>
 
 TimeWarper::~TimeWarper() = default;