Make hrtf_inc.cpp a proper header

4 files changed, 9 insertions, 14 deletions

diff --git a/Alc/mixer/hrtf_inc.cpp b/Alc/mixer/hrtf.h
index 97065392..3fd19306 100644
--- a/Alc/mixer/hrtf_inc.cpp
+++ b/Alc/mixer/hrtf.h
@@ -1,18 +1,13 @@
-#include "config.h"
+#ifndef MIXER_HRTF_H
+#define MIXER_HRTF_H
 
-#include "alMain.h"
-#include "alSource.h"
-
-#include "hrtf.h"
-#include "alu.h"
-#include "defs.h"
+#include "../hrtf.h"
 
 
 using ApplyCoeffsT = void(ALsizei Offset, ALfloat (&Values)[HRIR_LENGTH][2],
     const ALsizei irSize, const ALfloat (&Coeffs)[HRIR_LENGTH][2],
     const ALfloat left, const ALfloat right);
 
-
 template<ApplyCoeffsT ApplyCoeffs>
 inline void MixHrtfBase(ALfloat *RESTRICT LeftOut, ALfloat *RESTRICT RightOut, const ALfloat *data,
     ALsizei Offset, const ALsizei OutPos, const ALsizei IrSize, MixHrtfParams *hrtfparams,
@@ -194,3 +189,5 @@ inline void MixDirectHrtfBase(ALfloat *RESTRICT LeftOut, ALfloat *RESTRICT Right
         }
     }
 }
+
+#endif /* MIXER_HRTF_H */
diff --git a/Alc/mixer/mixer_c.cpp b/Alc/mixer/mixer_c.cpp
index fad08e74..26358e73 100644
--- a/Alc/mixer/mixer_c.cpp
+++ b/Alc/mixer/mixer_c.cpp
@@ -9,6 +9,7 @@
 #include "alSource.h"
 #include "alAuxEffectSlot.h"
 #include "defs.h"
+#include "hrtf.h"
 
 
 static inline ALfloat do_point(const InterpState&, const ALfloat *RESTRICT vals, const ALsizei) noexcept
@@ -125,8 +126,6 @@ static inline void ApplyCoeffs(ALsizei Offset, ALfloat (&Values)[HRIR_LENGTH][2]
     }
 }
 
-#include "hrtf_inc.cpp"
-
 template<>
 void MixHrtf_<CTag>(ALfloat *RESTRICT LeftOut, ALfloat *RESTRICT RightOut, const ALfloat *data,
     ALsizei Offset, const ALsizei OutPos, const ALsizei IrSize, MixHrtfParams *hrtfparams,
diff --git a/Alc/mixer/mixer_neon.cpp b/Alc/mixer/mixer_neon.cpp
index 1c033bd3..a60f054d 100644
--- a/Alc/mixer/mixer_neon.cpp
+++ b/Alc/mixer/mixer_neon.cpp
@@ -10,6 +10,8 @@
 #include "alu.h"
 #include "hrtf.h"
 #include "defs.h"
+#include "hrtf.h"
+
 
 
 template<>
@@ -164,8 +166,6 @@ static inline void ApplyCoeffs(ALsizei Offset, ALfloat (&Values)[HRIR_LENGTH][2]
     }
 }
 
-#include "hrtf_inc.cpp"
-
 template<>
 void MixHrtf_<NEONTag>(ALfloat *RESTRICT LeftOut, ALfloat *RESTRICT RightOut, const ALfloat *data,
     ALsizei Offset, const ALsizei OutPos, const ALsizei IrSize, MixHrtfParams *hrtfparams,
diff --git a/Alc/mixer/mixer_sse.cpp b/Alc/mixer/mixer_sse.cpp
index 3f756f2b..093dbda8 100644
--- a/Alc/mixer/mixer_sse.cpp
+++ b/Alc/mixer/mixer_sse.cpp
@@ -12,6 +12,7 @@
 #include "alSource.h"
 #include "alAuxEffectSlot.h"
 #include "defs.h"
+#include "hrtf.h"
 
 
 template<>
@@ -143,8 +144,6 @@ static inline void ApplyCoeffs(ALsizei Offset, ALfloat (&Values)[HRIR_LENGTH][2]
     }
 }
 
-#include "hrtf_inc.cpp"
-
 template<>
 void MixHrtf_<SSETag>(ALfloat *RESTRICT LeftOut, ALfloat *RESTRICT RightOut, const ALfloat *data,
     ALsizei Offset, const ALsizei OutPos, const ALsizei IrSize, MixHrtfParams *hrtfparams,