5 files changed, 18 insertions, 20 deletions
diff --git a/Alc/alconfig.cpp b/Alc/alconfig.cpp
index 4acbba5e..40131cc1 100644
--- a/Alc/alconfig.cpp
+++ b/Alc/alconfig.cpp
@@ -45,6 +45,7 @@
 
 #include "alMain.h"
 #include "alconfig.h"
+#include "logging.h"
 #include "compat.h"
 
 
diff --git a/Alc/backends/base.h b/Alc/backends/base.h
index f7be5cd0..15622967 100644
--- a/Alc/backends/base.h
+++ b/Alc/backends/base.h
@@ -1,12 +1,14 @@
-#ifndef AL_BACKENDS_BASE_H
-#define AL_BACKENDS_BASE_H
-
-#include "alMain.h"
+#ifndef ALC_BACKENDS_BASE_H
+#define ALC_BACKENDS_BASE_H
 
 #include <chrono>
 #include <string>
 #include <mutex>
 
+#include "alMain.h"
+#include "polymorphism.h"
+
+
 struct ClockLatency {
     std::chrono::nanoseconds ClockTime;
     std::chrono::nanoseconds Latency;
@@ -119,4 +121,4 @@ struct BackendFactory {
     virtual ALCbackend *createBackend(ALCdevice *device, ALCbackend_Type type) = 0;
 };
 
-#endif /* AL_BACKENDS_BASE_H */
+#endif /* ALC_BACKENDS_BASE_H */
diff --git a/Alc/hrtf.h b/Alc/hrtf.h
index 15c16723..7954ac11 100644
--- a/Alc/hrtf.h
+++ b/Alc/hrtf.h
@@ -1,11 +1,11 @@
 #ifndef ALC_HRTF_H
 #define ALC_HRTF_H
 
+#include <string>
+
 #include "AL/al.h"
 #include "AL/alc.h"
 
-#include "alMain.h"
-#include "atomic.h"
 #include "vector.h"
 #include "almalloc.h"
 
@@ -36,6 +36,12 @@ struct HrtfEntry {
     const ALubyte (*delays)[2];
 };
 
+struct EnumeratedHrtf {
+    std::string name;
+
+    HrtfHandle *hrtf;
+};
+
 
 struct HrtfState {
     alignas(16) ALfloat History[HRTF_HISTORY_LENGTH];
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 2ffea8aa..bca4c49e 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -27,8 +27,6 @@
 #include "AL/alext.h"
 
 #include "inprogext.h"
-#include "logging.h"
-#include "polymorphism.h"
 #include "atomic.h"
 #include "vector.h"
 #include "almalloc.h"
@@ -77,10 +75,6 @@ constexpr inline size_t countof(const T(&)[N]) noexcept
 #endif
 #endif
 
-#ifndef UINT64_MAX
-#define UINT64_MAX U64(18446744073709551615)
-#endif
-
 #ifndef UNUSED
 #if defined(__cplusplus)
 #define UNUSED(x)
@@ -238,6 +232,7 @@ static const union {
 
 struct HrtfEntry;
 struct HrtfHandle;
+struct EnumeratedHrtf;
 struct DirectHrtfState;
 struct FrontStablizer;
 struct Compressor;
@@ -597,13 +592,6 @@ struct FilterSubList {
 };
 
 
-struct EnumeratedHrtf {
-    std::string name;
-
-    HrtfHandle *hrtf;
-};
-
-
 /* Maximum delay in samples for speaker distance compensation. */
 #define MAX_DELAY_LENGTH 1024
 
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 4620aeb6..934d6866 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -17,6 +17,7 @@
 #include "alBuffer.h"
 
 #include "hrtf.h"
+#include "logging.h"
 #include "math_defs.h"
 #include "filters/biquad.h"
 #include "filters/nfc.h"