diff --git a/src/export/Export.h b/src/export/Export.h
index 21cc88630..63d07de59 100644
--- a/src/export/Export.h
+++ b/src/export/Export.h
@@ -19,7 +19,7 @@
 #include "../widgets/wxPanelWrapper.h" // to inherit
 #include "../FileNames.h" // for FileTypes
 
-#include "../commands/CommandManager.h" // for Registry::Placement
+#include "../Registry.h"
 
 class wxArrayString;
 class FileDialogWrapper;
diff --git a/src/import/Import.h b/src/import/Import.h
index 17650af51..41455ed06 100644
--- a/src/import/Import.h
+++ b/src/import/Import.h
@@ -20,7 +20,7 @@
 #include "../widgets/wxPanelWrapper.h" // to inherit
 #include "../FileNames.h" // for FileType
 
-#include "../commands/CommandManager.h" // for Registry::Placement
+#include "../Registry.h"
 
 class wxArrayString;
 class wxListBox;
diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h
index 153ca2a28..f89943b82 100644
--- a/src/prefs/PrefsPanel.h
+++ b/src/prefs/PrefsPanel.h
@@ -30,7 +30,7 @@ MousePrefs, QualityPrefs, SpectrumPrefs and ThemePrefs.
 #include <functional>
 #include "../widgets/wxPanelWrapper.h" // to inherit
 #include "../include/audacity/ComponentInterface.h"
-#include "../commands/CommandManager.h"
+#include "../Registry.h"
 
 /* A few constants for an attempt at semi-uniformity */
 #define PREFS_FONT_SIZE     8