5 files changed, 12 insertions, 8 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 0db68efe..376a3ce8 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -29,6 +29,9 @@
 #include "alMain.h"
 #include "AL/al.h"
 #include "AL/alc.h"
+#include "alThunk.h"
+#include "alSource.h"
+#include "alExtension.h"
 
 ///////////////////////////////////////////////////////
 // DEBUG INFORMATION
diff --git a/Alc/ALu.c b/Alc/ALu.c
index f3cd24f5..b19bd518 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -26,6 +26,10 @@
 #include "alMain.h"
 #include "AL/al.h"
 #include "AL/alc.h"
+#include "alSource.h"
+#include "alBuffer.h"
+#include "alThunk.h"
+#include "alListener.h"
 
 #if defined(HAVE_STDINT_H)
 #include <stdint.h>
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index c6738868..f2beb30f 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -56,13 +56,7 @@ static inline void DeleteCriticalSection(CRITICAL_SECTION *cs)
 #define max(x,y) (((x)>(y))?(x):(y))
 #endif
 
-#include "alBuffer.h"
-#include "alError.h"
-#include "alExtension.h"
 #include "alListener.h"
-#include "alSource.h"
-#include "alState.h"
-#include "alThunk.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -156,8 +150,8 @@ struct ALCcontext_struct
 {
     ALlistener  Listener;
 
-    ALsource   *Source;
-    ALuint      SourceCount;
+    struct ALsource *Source;
+    ALuint           SourceCount;
 
     ALenum      LastError;
     ALboolean   InUse;
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 33db7cfb..13b98b21 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -27,6 +27,7 @@
 #include "AL/alc.h"
 #include "alError.h"
 #include "alBuffer.h"
+#include "alThunk.h"
 
 
 static void LoadData(ALbuffer *ALBuf, const ALubyte *data, ALsizei size, ALuint freq, ALenum OrigFormat, ALenum NewFormat);
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 7c022e6c..44cd8b41 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -26,6 +26,8 @@
 #include "AL/alc.h"
 #include "alError.h"
 #include "alSource.h"
+#include "alBuffer.h"
+#include "alThunk.h"
 
 static ALvoid InitSourceParams(ALsource *pSource);
 static ALboolean GetSourceOffset(ALsource *pSource, ALenum eName, ALfloat *pflOffset);