From 4da02d667f6068d7e0f0536acaafa0a2801d481f Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 11 May 2019 09:07:24 -0400
Subject: [PATCH] ShuttleGui.cpp and ShuttlePrefs.cpp have fewer
 dependencies...

... Freeing 13 files from cyclic dependencies
---
 src/ShuttleGui.cpp   | 4 +++-
 src/ShuttlePrefs.cpp | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index 5c1f2edd6..ddeab28ac 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -2124,7 +2124,6 @@ void SetIfCreated( wxStaticText *&Var, wxStaticText * Val )
 // two files at some later date.
 #include "../extnpanel-src/GuiWaveTrack.h"
 #endif
-#include "./widgets/AttachableScrollBar.h"
 
 ShuttleGui::ShuttleGui(wxWindow * pParent, teShuttleMode ShuttleMode) :
    ShuttleGuiBase( pParent, ShuttleMode )
@@ -2184,6 +2183,8 @@ GuiWaveTrack * ShuttleGui::AddGuiWaveTrack( const wxString & WXUNUSED(Name))
 #endif
 }
 
+//#include "./widgets/AttachableScrollBar.h"
+#if 0
 AttachableScrollBar * ShuttleGui::AddAttachableScrollBar( long style )
 {
    UseUpId();
@@ -2203,6 +2204,7 @@ AttachableScrollBar * ShuttleGui::AddAttachableScrollBar( long style )
    UpdateSizers();
    return pAttachableScrollBar;
 }
+#endif
 
 std::unique_ptr<wxSizer> CreateStdButtonSizer(wxWindow *parent, long buttons, wxWindow *extra)
 {
diff --git a/src/ShuttlePrefs.cpp b/src/ShuttlePrefs.cpp
index fb621b4a0..fa7071b81 100644
--- a/src/ShuttlePrefs.cpp
+++ b/src/ShuttlePrefs.cpp
@@ -29,7 +29,6 @@
 
 #include <wx/defs.h>
 
-#include "Project.h"
 #include "WrappedType.h"
 #include "Prefs.h"