3 files changed, 17 insertions, 20 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 945860a0..71898964 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -8,23 +8,21 @@
 extern "C" {
 #endif
 
-typedef struct ALeffectStateFactory ALeffectStateFactory;
+struct ALeffectStateVtable;
+struct ALeffectslot;
 
-typedef struct ALeffectState ALeffectState;
-typedef struct ALeffectslot ALeffectslot;
+typedef struct ALeffectState {
+    const struct ALeffectStateVtable *vtbl;
+} ALeffectState;
 
 struct ALeffectStateVtable {
     ALvoid (*const Destruct)(ALeffectState *state);
 
     ALboolean (*const deviceUpdate)(ALeffectState *state, ALCdevice *device);
-    ALvoid (*const update)(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot);
+    ALvoid (*const update)(ALeffectState *state, ALCdevice *device, const struct ALeffectslot *slot);
     ALvoid (*const process)(ALeffectState *state, ALuint samplesToDo, const ALfloat *restrict samplesIn, ALfloat (*restrict samplesOut)[BUFFERSIZE]);
 
-    void (*const Delete)(ALeffectState *state);
-};
-
-struct ALeffectState {
-    const struct ALeffectStateVtable *vtbl;
+    void (*const Delete)(struct ALeffectState *state);
 };
 
 #define DEFINE_ALEFFECTSTATE_VTABLE(T)                                        \
@@ -50,12 +48,14 @@ static const struct ALeffectStateVtable T##_ALeffectState_vtable = {          \
 }
 
 
-struct ALeffectStateFactoryVtable {
-    ALeffectState *(*const create)(ALeffectStateFactory *factory);
-};
+struct ALeffectStateFactoryVtable;
 
-struct ALeffectStateFactory {
+typedef struct ALeffectStateFactory {
     const struct ALeffectStateFactoryVtable *vtbl;
+} ALeffectStateFactory;
+
+struct ALeffectStateFactoryVtable {
+    ALeffectState *(*const create)(ALeffectStateFactory *factory);
 };
 
 #define DEFINE_ALEFFECTSTATEFACTORY_VTABLE(T)                                 \
@@ -67,8 +67,7 @@ static const struct ALeffectStateFactoryVtable T##_ALeffectStateFactory_vtable =
 }
 
 
-struct ALeffectslot
-{
+typedef struct ALeffectslot {
     ALenum EffectType;
     ALeffectProps EffectProps;
 
@@ -87,7 +86,7 @@ struct ALeffectslot
 
     /* Self ID */
     ALuint id;
-};
+} ALeffectslot;
 
 
 ALenum InitEffectSlot(ALeffectslot *slot);
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h
index 19390e5e..358b3c9f 100644
--- a/OpenAL32/Include/alBuffer.h
+++ b/OpenAL32/Include/alBuffer.h
@@ -67,8 +67,7 @@ static inline ALuint FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type)
 }
 
 
-typedef struct ALbuffer
-{
+typedef struct ALbuffer {
     ALvoid  *data;
 
     ALsizei  Frequency;
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 632c8fc1..f547b188 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -22,8 +22,7 @@ extern const ALsizei ResamplerPadding[ResamplerMax];
 extern const ALsizei ResamplerPrePadding[ResamplerMax];
 
 
-typedef struct ALbufferlistitem
-{
+typedef struct ALbufferlistitem {
     struct ALbuffer         *buffer;
     struct ALbufferlistitem *next;
     struct ALbufferlistitem *prev;