diff --git a/src/Shuttle.cpp b/src/Shuttle.cpp
index a17891b56..d8d639937 100644
--- a/src/Shuttle.cpp
+++ b/src/Shuttle.cpp
@@ -67,7 +67,6 @@ preferences.
 
 #include "../include/audacity/EffectAutomationParameters.h" // for command automation
 
-//#include "Project.h"
 #include "WrappedType.h"
 //#include "effects/Effect.h"
 
diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp
index d2397d558..011f935fc 100644
--- a/src/UndoManager.cpp
+++ b/src/UndoManager.cpp
@@ -28,7 +28,6 @@ UndoManager
 #include "BlockFile.h"
 #include "Clipboard.h"
 #include "Diags.h"
-#include "Project.h"
 #include "Sequence.h"
 #include "WaveClip.h"
 #include "WaveTrack.h"          // temp
diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h
index 2275de989..75471be98 100644
--- a/src/commands/CommandTargets.h
+++ b/src/commands/CommandTargets.h
@@ -57,7 +57,6 @@ and sends it to that message target.
 
 #include "../MemoryX.h"
 #include <vector>
-//#include "../src/Project.h"
 #include "../commands/ResponseQueue.h"
 
 class wxStatusBar;
diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp
index a6609316f..bda1e7f06 100644
--- a/src/commands/GetInfoCommand.cpp
+++ b/src/commands/GetInfoCommand.cpp
@@ -36,7 +36,6 @@ This class now lists
 #include "CommandContext.h"
 
 #include "SelectCommand.h"
-#include "../Project.h"
 #include "../ShuttleGui.h"
 #include "CommandContext.h"
 
diff --git a/src/commands/GetTrackInfoCommand.cpp b/src/commands/GetTrackInfoCommand.cpp
index aac97816f..c87e62e30 100644
--- a/src/commands/GetTrackInfoCommand.cpp
+++ b/src/commands/GetTrackInfoCommand.cpp
@@ -19,7 +19,6 @@
 #include "../Audacity.h"
 #include "GetTrackInfoCommand.h"
 
-#include "../Project.h"
 #include "../TrackPanel.h"
 #include "../NoteTrack.h"
 #include "../WaveTrack.h"
diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp
index 2a3881429..23dff347f 100644
--- a/src/commands/SetClipCommand.cpp
+++ b/src/commands/SetClipCommand.cpp
@@ -19,7 +19,6 @@
 #include "../Audacity.h"
 #include "SetClipCommand.h"
 
-#include "../Project.h"
 #include "../TrackPanel.h"
 #include "../WaveClip.h"
 #include "../WaveTrack.h"
diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp
index c3defbb4e..f09772b64 100644
--- a/src/commands/SetEnvelopeCommand.cpp
+++ b/src/commands/SetEnvelopeCommand.cpp
@@ -19,7 +19,6 @@
 #include "../Audacity.h"
 #include "SetEnvelopeCommand.h"
 
-#include "../Project.h"
 #include "../TrackPanel.h"
 #include "../WaveClip.h"
 #include "../WaveTrack.h"
diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp
index dc6f77320..bffacd9b4 100644
--- a/src/effects/ChangeSpeed.cpp
+++ b/src/effects/ChangeSpeed.cpp
@@ -24,7 +24,6 @@
 
 #include "../LabelTrack.h"
 #include "../Prefs.h"
-#include "../Project.h"
 #include "../Resample.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp
index a69e6f56e..328e33b0b 100644
--- a/src/effects/NoiseRemoval.cpp
+++ b/src/effects/NoiseRemoval.cpp
@@ -47,7 +47,6 @@
 
 #include "../WaveTrack.h"
 #include "../Prefs.h"
-#include "../Project.h"
 #include "../FileNames.h"
 #include "../ShuttleGui.h"
 
diff --git a/src/effects/SBSMSEffect.cpp b/src/effects/SBSMSEffect.cpp
index ec89fbc35..d2feffd95 100644
--- a/src/effects/SBSMSEffect.cpp
+++ b/src/effects/SBSMSEffect.cpp
@@ -20,7 +20,6 @@ effect that uses SBSMS to do its processing (TimeScale)
 
 #include "../LabelTrack.h"
 #include "../WaveTrack.h"
-#include "../Project.h"
 #include "TimeWarper.h"
 
 enum {
diff --git a/src/effects/SoundTouchEffect.cpp b/src/effects/SoundTouchEffect.cpp
index 4b380863f..e3a8e81b7 100644
--- a/src/effects/SoundTouchEffect.cpp
+++ b/src/effects/SoundTouchEffect.cpp
@@ -21,7 +21,6 @@ effect that uses SoundTouch to do its processing (ChangeTempo
 
 #include "../LabelTrack.h"
 #include "../WaveTrack.h"
-#include "../Project.h"
 #include "../NoteTrack.h"
 
 // Soundtouch defines these as well, which are also in generated configmac.h
diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp
index c6aa665f5..a99433cb7 100644
--- a/src/export/ExportFFmpegDialogs.cpp
+++ b/src/export/ExportFFmpegDialogs.cpp
@@ -58,7 +58,6 @@
 
 #include "../FileFormats.h"
 #include "../Mix.h"
-#include "../Project.h"
 #include "../Tags.h"
 #include "../TranslatableStringArray.h"
 #include "../widgets/AudacityMessageBox.h"
diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp
index 4538fd5f9..43a298215 100644
--- a/src/prefs/PrefsDialog.cpp
+++ b/src/prefs/PrefsDialog.cpp
@@ -35,7 +35,6 @@
 #include <wx/treebook.h>
 
 #include "../AudioIO.h"
-#include "../Project.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 
diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp
index fb360a89b..a024d1442 100644
--- a/src/toolbars/ToolDock.cpp
+++ b/src/toolbars/ToolDock.cpp
@@ -48,7 +48,6 @@
 #include "../AllThemeResources.h"
 #include "../ImageManipulation.h"
 #include "../Prefs.h"
-#include "../Project.h"
 #include "../widgets/AButton.h"
 #include "../widgets/Grabber.h"
 
diff --git a/src/tracks/labeltrack/ui/LabelTrackUI.cpp b/src/tracks/labeltrack/ui/LabelTrackUI.cpp
index c99fff778..e7c764dae 100644
--- a/src/tracks/labeltrack/ui/LabelTrackUI.cpp
+++ b/src/tracks/labeltrack/ui/LabelTrackUI.cpp
@@ -18,7 +18,6 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../ui/SelectHandle.h"
 
 #include "../../../HitTestResult.h"
-#include "../../../Project.h"
 #include "../../../TrackPanelMouseEvent.h"
 
 std::vector<UIHandlePtr> LabelTrack::DetailedHitTest
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp
index 60efc202b..350c3a881 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp
@@ -18,7 +18,6 @@ Paul Licameli split from TrackPanel.cpp
 #include "NoteTrackVRulerControls.h"
 
 #include "../../../../HitTestResult.h"
-#include "../../../../Project.h"
 #include "../../../../TrackPanelMouseEvent.h"
 #include "../../../ui/SelectHandle.h"
 #include "StretchHandle.h"
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp
index 250dca773..c2424d32f 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp
@@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp
 #include "WaveTrackVRulerControls.h"
 
 #include "../../../../HitTestResult.h"
-#include "../../../../Project.h"
 #include "../../../../TrackPanelMouseEvent.h"
 #include "../../../../toolbars/ToolsToolBar.h"
 
diff --git a/src/tracks/timetrack/ui/TimeTrackUI.cpp b/src/tracks/timetrack/ui/TimeTrackUI.cpp
index e3e23a198..cc54ccfb0 100644
--- a/src/tracks/timetrack/ui/TimeTrackUI.cpp
+++ b/src/tracks/timetrack/ui/TimeTrackUI.cpp
@@ -15,7 +15,6 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "../../../HitTestResult.h"
 #include "../../../TrackPanelMouseEvent.h"
-#include "../../../Project.h"
 
 #include "../../ui/EnvelopeHandle.h"