From d598f82722d6784fada1c8b2a522463d5bf31c42 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 9 Oct 2012 04:48:12 -0700
Subject: [PATCH] Don't include alListener.h from alMain.h

---
 Alc/ALc.c                     | 3 +--
 OpenAL32/Include/alListener.h | 3 +--
 OpenAL32/Include/alMain.h     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Alc/ALc.c b/Alc/ALc.c
index f08ee597..4e4119e8 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -29,8 +29,7 @@
 
 #include "alMain.h"
 #include "alSource.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alListener.h"
 #include "alThunk.h"
 #include "alSource.h"
 #include "alBuffer.h"
diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index e25807c4..8c5fe734 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -7,8 +7,7 @@
 extern "C" {
 #endif
 
-typedef struct ALlistener_struct
-{
+typedef struct ALlistener {
     volatile ALfloat Position[3];
     volatile ALfloat Velocity[3];
     volatile ALfloat Forward[3];
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index e12e432f..9c44cfc6 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -366,7 +366,6 @@ static __inline void LockUIntMapWrite(UIntMap *map)
 static __inline void UnlockUIntMapWrite(UIntMap *map)
 { WriteUnlock(&map->lock); }
 
-#include "alListener.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -709,7 +708,7 @@ struct ALCcontext_struct
 {
     volatile RefCount ref;
 
-    ALlistener *Listener;
+    struct ALlistener *Listener;
 
     UIntMap SourceMap;
     UIntMap EffectSlotMap;