diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index fc0d5255a..92eaac3f6 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -461,6 +461,7 @@ TimeTrack and AudioIOListener and whether the playback is looped.
 
 #include "effects/EffectManager.h"
 #include "prefs/QualityPrefs.h"
+#include "prefs/RecordingPrefs.h"
 #include "toolbars/ControlToolBar.h"
 #include "widgets/Meter.h"
 #include "widgets/ErrorDialog.h"
diff --git a/src/AudioIO.h b/src/AudioIO.h
index 6e20fbc49..caf94ee66 100644
--- a/src/AudioIO.h
+++ b/src/AudioIO.h
@@ -84,15 +84,6 @@ class AudioIOListener;
 #define MAX_MIDI_BUFFER_SIZE 5000
 #define DEFAULT_SYNTH_LATENCY 5
 
-#define DEFAULT_LATENCY_DURATION 100.0
-#define DEFAULT_LATENCY_CORRECTION -130.0
-
-#define AUDIO_PRE_ROLL_KEY (wxT("/AudioIO/PreRoll"))
-#define DEFAULT_PRE_ROLL_SECONDS 5.0
-
-#define AUDIO_ROLL_CROSSFADE_KEY (wxT("/AudioIO/Crossfade"))
-#define DEFAULT_ROLL_CROSSFADE_MS 10.0
-
 #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    #define AILA_DEF_TARGET_PEAK 92
    #define AILA_DEF_DELTA_PEAK 2
diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp
index 8da59815a..2aa7bc85b 100644
--- a/src/menus/TransportMenus.cpp
+++ b/src/menus/TransportMenus.cpp
@@ -13,6 +13,7 @@
 #include "../TrackPanel.h"
 #include "../UndoManager.h"
 #include "../WaveClip.h"
+#include "../prefs/RecordingPrefs.h"
 #include "../prefs/TracksPrefs.h"
 #include "../toolbars/ControlToolBar.h"
 #include "../toolbars/TranscriptionToolBar.h"
diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp
index ae582d33f..c8edf6a5f 100644
--- a/src/prefs/DevicePrefs.cpp
+++ b/src/prefs/DevicePrefs.cpp
@@ -25,6 +25,8 @@ other settings.
 #include "../Audacity.h"
 #include "DevicePrefs.h"
 
+#include "RecordingPrefs.h"
+
 #include <wx/defs.h>
 
 #include <wx/choice.h>
diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index e0a8d5a36..cb1d91465 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -27,7 +27,6 @@
 #include <wx/textctrl.h>
 #include <algorithm>
 
-#include "../AudioIO.h"
 #include "../prefs/GUISettings.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h
index b39dae7a7..1d3af90d4 100644
--- a/src/prefs/RecordingPrefs.h
+++ b/src/prefs/RecordingPrefs.h
@@ -21,6 +21,15 @@ class ShuttleGui;
 
 #define RECORDING_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Recording") }
 
+#define DEFAULT_LATENCY_DURATION 100.0
+#define DEFAULT_LATENCY_CORRECTION -130.0
+
+#define AUDIO_PRE_ROLL_KEY (wxT("/AudioIO/PreRoll"))
+#define DEFAULT_PRE_ROLL_SECONDS 5.0
+
+#define AUDIO_ROLL_CROSSFADE_KEY (wxT("/AudioIO/Crossfade"))
+#define DEFAULT_ROLL_CROSSFADE_MS 10.0
+
 class RecordingPrefs final : public PrefsPanel
 {
  public: