Move the vector and matrix declarations to a separate header

1 files changed, 10 insertions, 13 deletions

diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index 33dea4f3..ec6ee509 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -1,12 +1,13 @@
 #ifndef _AL_LISTENER_H_
 #define _AL_LISTENER_H_
 
-#include "alMain.h"
-#include "alu.h"
+#include "AL/alc.h"
+#include "AL/al.h"
+#include "AL/alext.h"
+
+#include "atomic.h"
+#include "vecmat.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct ALlistenerProps {
     ALfloat Position[3];
@@ -15,10 +16,10 @@ struct ALlistenerProps {
     ALfloat Up[3];
     ALfloat Gain;
 
-    ATOMIC(struct ALlistenerProps*) next;
+    ATOMIC(ALlistenerProps*) next;
 };
 
-typedef struct ALlistener {
+struct ALlistener {
     alignas(16) ALfloat Position[3];
     ALfloat Velocity[3];
     ALfloat Forward[3];
@@ -29,7 +30,7 @@ typedef struct ALlistener {
 
     /* Pointer to the most recent property values that are awaiting an update.
      */
-    ATOMIC(struct ALlistenerProps*) Update;
+    ATOMIC(ALlistenerProps*) Update;
 
     struct {
         aluMatrixf Matrix;
@@ -45,12 +46,8 @@ typedef struct ALlistener {
         ALboolean SourceDistanceModel;
         enum DistanceModel DistanceModel;
     } Params;
-} ALlistener;
+};
 
 void UpdateListenerProps(ALCcontext *context);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif