From 43899da80d210822deb20dc362dd7ff1554f260a Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 20 Nov 2018 06:56:37 -0500
Subject: [PATCH] Remove some nested #include from TrackPanelAx.h

---
 src/TrackPanelAx.cpp                | 1 +
 src/TrackPanelAx.h                  | 5 +++--
 src/tracks/ui/EditCursorOverlay.cpp | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp
index a66385c6c..14bb44456 100644
--- a/src/TrackPanelAx.cpp
+++ b/src/TrackPanelAx.cpp
@@ -29,6 +29,7 @@
 #include <wx/intl.h>
 
 #include "Track.h"
+#include "TrackPanel.h"
 #include "Internat.h"
 
 TrackPanelAx::TrackPanelAx( wxWindow *window )
diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h
index f90b636fc..6a56e6490 100644
--- a/src/TrackPanelAx.h
+++ b/src/TrackPanelAx.h
@@ -11,6 +11,7 @@
 #ifndef __AUDACITY_TRACK_PANEL_ACCESSIBILITY__
 #define __AUDACITY_TRACK_PANEL_ACCESSIBILITY__
 
+#include <memory>
 #include <wx/window.h>
 #include <wx/panel.h>
 
@@ -19,8 +20,8 @@
 #include "widgets/WindowAccessible.h"
 #endif
 
-#include "Track.h"
-#include "TrackPanel.h"
+class Track;
+class TrackPanel;
 
 class TrackPanelAx final
 #if wxUSE_ACCESSIBILITY
diff --git a/src/tracks/ui/EditCursorOverlay.cpp b/src/tracks/ui/EditCursorOverlay.cpp
index b2386da7b..4547510d7 100644
--- a/src/tracks/ui/EditCursorOverlay.cpp
+++ b/src/tracks/ui/EditCursorOverlay.cpp
@@ -15,7 +15,9 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../AColor.h"
 #include "../../AdornedRulerPanel.h"
 #include "../../Project.h"
+#include "../../Track.h"
 #include "../../TrackPanelAx.h"
+#include "../../TrackPanel.h"
 #include "../../ViewInfo.h"
 
 #include <wx/dc.h>