Move declarations to a more appropriate header

10 files changed, 22 insertions, 14 deletions

diff --git a/alc/alc.cpp b/alc/alc.cpp
index 945f322a..b79ea9c8 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -1316,12 +1316,6 @@ void ProbeCaptureDeviceList()
 
 } // namespace
 
-/* Mixing thread piority level */
-int RTPrioLevel{1};
-
-/* Allow reducing the process's RTTime limit for RTKit. */
-bool AllowRTTimeLimit{true};
-
 FILE *gLogFile{stderr};
 #ifdef _DEBUG
 LogLevel gLogLevel{LogLevel::Warning};
diff --git a/alc/alcmain.h b/alc/alcmain.h
index d8cbb1a0..dea3b6ba 100644
--- a/alc/alcmain.h
+++ b/alc/alcmain.h
@@ -358,10 +358,6 @@ struct ALCdevice : public al::intrusive_ref<ALCdevice> {
 #define RECORD_THREAD_NAME "alsoft-record"
 
 
-extern int RTPrioLevel;
-extern bool AllowRTTimeLimit;
-void SetRTPriority(void);
-
 /**
  * Returns the index for the given channel name (e.g. FrontCenter), or
  * INVALID_CHANNEL_INDEX if it doesn't exist.
@@ -370,7 +366,4 @@ inline uint GetChannelIdxByName(const RealMixParams &real, Channel chan) noexcep
 { return real.ChannelIndex[chan]; }
 #define INVALID_CHANNEL_INDEX ~0u
 
-
-al::vector<std::string> SearchDataFiles(const char *match, const char *subdir);
-
 #endif
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index 6a7a1187..fe19be04 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -42,6 +42,7 @@
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "alu.h"
+#include "compat.h"
 #include "core/logging.h"
 #include "dynload.h"
 #include "ringbuffer.h"
diff --git a/alc/backends/null.cpp b/alc/backends/null.cpp
index 15a36ddd..bf267163 100644
--- a/alc/backends/null.cpp
+++ b/alc/backends/null.cpp
@@ -33,6 +33,7 @@
 #include "alcmain.h"
 #include "almalloc.h"
 #include "alu.h"
+#include "compat.h"
 #include "threads.h"
 
 
diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index 196744b0..3db80961 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -48,6 +48,7 @@
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "alu.h"
+#include "compat.h"
 #include "core/logging.h"
 #include "ringbuffer.h"
 #include "threads.h"
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index 00365721..0011c1c7 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -38,6 +38,7 @@
 #include "alcmain.h"
 #include "alu.h"
 #include "alconfig.h"
+#include "compat.h"
 #include "core/logging.h"
 #include "dynload.h"
 #include "strutils.h"
diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp
index a26eeaa6..f5dbdcb2 100644
--- a/alc/backends/sndio.cpp
+++ b/alc/backends/sndio.cpp
@@ -31,6 +31,7 @@
 
 #include "alcmain.h"
 #include "alu.h"
+#include "compat.h"
 #include "core/logging.h"
 #include "ringbuffer.h"
 #include "threads.h"
diff --git a/alc/compat.h b/alc/compat.h
index 960b4b94..d858e5c9 100644
--- a/alc/compat.h
+++ b/alc/compat.h
@@ -3,7 +3,16 @@
 
 #include <string>
 
+#include "vector.h"
+
+
 struct PathNamePair { std::string path, fname; };
 const PathNamePair &GetProcBinary(void);
 
+extern int RTPrioLevel;
+extern bool AllowRTTimeLimit;
+void SetRTPriority(void);
+
+al::vector<std::string> SearchDataFiles(const char *match, const char *subdir);
+
 #endif /* AL_COMPAT_H */
diff --git a/alc/helpers.cpp b/alc/helpers.cpp
index 28cf2a0f..ae9ba4ba 100644
--- a/alc/helpers.cpp
+++ b/alc/helpers.cpp
@@ -41,6 +41,13 @@
 #include "vector.h"
 
 
+/* Mixing thread piority level */
+int RTPrioLevel{1};
+
+/* Allow reducing the process's RTTime limit for RTKit. */
+bool AllowRTTimeLimit{true};
+
+
 #ifdef _WIN32
 
 #include <shlobj.h>
diff --git a/alc/hrtf.cpp b/alc/hrtf.cpp
index 2d842fda..6d7bc949 100644
--- a/alc/hrtf.cpp
+++ b/alc/hrtf.cpp
@@ -42,13 +42,13 @@
 
 #include "albit.h"
 #include "albyte.h"
-#include "alcmain.h"
 #include "alconfig.h"
 #include "alfstream.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "alspan.h"
+#include "compat.h"
 #include "core/ambidefs.h"
 #include "core/filters/splitter.h"
 #include "core/logging.h"