More include cleanups

15 files changed, 98 insertions, 70 deletions

diff --git a/OpenAL32/alAuxEffectSlot.cpp b/OpenAL32/alAuxEffectSlot.cpp
index cc2893c3..42966bf2 100644
--- a/OpenAL32/alAuxEffectSlot.cpp
+++ b/OpenAL32/alAuxEffectSlot.cpp
@@ -20,25 +20,31 @@
 
 #include "config.h"
 
-#include <cstdlib>
-#include <cmath>
+#include "alAuxEffectSlot.h"
 
-#include <thread>
 #include <algorithm>
+#include <cstdint>
+#include <iterator>
+#include <memory>
+#include <mutex>
+#include <thread>
 
 #include "AL/al.h"
 #include "AL/alc.h"
 
+#include "alEffect.h"
+#include "alError.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
-#include "alListener.h"
-#include "alSource.h"
-
-#include "fpu_modes.h"
 #include "alexcpt.h"
 #include "almalloc.h"
+#include "alnumeric.h"
+#include "alspan.h"
+#include "alu.h"
+#include "fpu_modes.h"
+#include "inprogext.h"
+#include "logging.h"
+#include "opthelpers.h"
 
 
 namespace {
diff --git a/OpenAL32/alAuxEffectSlot.h b/OpenAL32/alAuxEffectSlot.h
index b6976d13..369638a0 100644
--- a/OpenAL32/alAuxEffectSlot.h
+++ b/OpenAL32/alAuxEffectSlot.h
@@ -1,17 +1,20 @@
-#ifndef _AL_AUXEFFECTSLOT_H_
-#define _AL_AUXEFFECTSLOT_H_
+#ifndef AL_AUXEFFECTSLOT_H
+#define AL_AUXEFFECTSLOT_H
 
-#include <array>
+#include <atomic>
+#include <cstddef>
 
-#include "alcmain.h"
-#include "alEffect.h"
-#include "ambidefs.h"
-#include "effects/base.h"
+#include "AL/al.h"
+#include "AL/alc.h"
+#include "AL/efx.h"
 
+#include "alcmain.h"
 #include "almalloc.h"
 #include "atomic.h"
+#include "effects/base.h"
+#include "vector.h"
 
-
+struct ALeffect;
 struct ALeffectslot;
 
 
diff --git a/OpenAL32/alBuffer.cpp b/OpenAL32/alBuffer.cpp
index 597f98cb..505b9dab 100644
--- a/OpenAL32/alBuffer.cpp
+++ b/OpenAL32/alBuffer.cpp
@@ -27,7 +27,7 @@
 #include <atomic>
 #include <cassert>
 #include <cstdint>
-#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iterator>
 #include <limits>
@@ -40,9 +40,9 @@
 #include "AL/alc.h"
 #include "AL/alext.h"
 
-#include "alcmain.h"
 #include "alError.h"
 #include "albyte.h"
+#include "alcmain.h"
 #include "alcontext.h"
 #include "alexcpt.h"
 #include "almalloc.h"
@@ -51,7 +51,6 @@
 #include "atomic.h"
 #include "inprogext.h"
 #include "opthelpers.h"
-#include "vector.h"
 
 
 namespace {
diff --git a/OpenAL32/alBuffer.h b/OpenAL32/alBuffer.h
index 92655784..1d5873e5 100644
--- a/OpenAL32/alBuffer.h
+++ b/OpenAL32/alBuffer.h
@@ -1,14 +1,15 @@
-#ifndef _AL_BUFFER_H_
-#define _AL_BUFFER_H_
+#ifndef AL_BUFFER_H
+#define AL_BUFFER_H
+
+#include <atomic>
 
-#include "AL/alc.h"
 #include "AL/al.h"
-#include "AL/alext.h"
 
-#include "inprogext.h"
+#include "albyte.h"
+#include "almalloc.h"
 #include "atomic.h"
+#include "inprogext.h"
 #include "vector.h"
-#include "albyte.h"
 
 
 /* User formats */
diff --git a/OpenAL32/alEffect.cpp b/OpenAL32/alEffect.cpp
index 14353d1c..4a75f69f 100644
--- a/OpenAL32/alEffect.cpp
+++ b/OpenAL32/alEffect.cpp
@@ -37,8 +37,8 @@
 #include "AL/efx-presets.h"
 #include "AL/efx.h"
 
-#include "alcmain.h"
 #include "alError.h"
+#include "alcmain.h"
 #include "alcontext.h"
 #include "alexcpt.h"
 #include "almalloc.h"
diff --git a/OpenAL32/alEffect.h b/OpenAL32/alEffect.h
index d43aa206..270b8e20 100644
--- a/OpenAL32/alEffect.h
+++ b/OpenAL32/alEffect.h
@@ -1,7 +1,9 @@
-#ifndef _AL_EFFECT_H_
-#define _AL_EFFECT_H_
+#ifndef AL_EFFECT_H
+#define AL_EFFECT_H
+
+#include "AL/al.h"
+#include "AL/efx.h"
 
-#include "alcmain.h"
 #include "effects/base.h"
 
 
diff --git a/OpenAL32/alError.cpp b/OpenAL32/alError.cpp
index 782e10ec..159aee52 100644
--- a/OpenAL32/alError.cpp
+++ b/OpenAL32/alError.cpp
@@ -22,6 +22,11 @@
 
 #include "alError.h"
 
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
 #include <atomic>
 #include <csignal>
 #include <cstdarg>
@@ -29,11 +34,6 @@
 #include <cstring>
 #include <mutex>
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
 #include "AL/al.h"
 #include "AL/alc.h"
 
diff --git a/OpenAL32/alError.h b/OpenAL32/alError.h
index 0abd6b26..6408b60c 100644
--- a/OpenAL32/alError.h
+++ b/OpenAL32/alError.h
@@ -1,7 +1,9 @@
-#ifndef _AL_ERROR_H_
-#define _AL_ERROR_H_
+#ifndef AL_ERROR_H
+#define AL_ERROR_H
+
+#include "AL/al.h"
+#include "AL/alc.h"
 
-#include "alcmain.h"
 #include "logging.h"
 
 
diff --git a/OpenAL32/alExtension.cpp b/OpenAL32/alExtension.cpp
index 5abcf1cf..80681090 100644
--- a/OpenAL32/alExtension.cpp
+++ b/OpenAL32/alExtension.cpp
@@ -20,17 +20,18 @@
 
 #include "config.h"
 
+#include <cctype>
 #include <cstdlib>
 #include <cstring>
-#include <cctype>
 
 #include "AL/al.h"
 #include "AL/alc.h"
 
-#include "alcmain.h"
-#include "alcontext.h"
 #include "alError.h"
+#include "alcontext.h"
 #include "alexcpt.h"
+#include "opthelpers.h"
+
 
 AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extName)
 START_API_FUNC
diff --git a/OpenAL32/alFilter.cpp b/OpenAL32/alFilter.cpp
index cac12581..31fbaf21 100644
--- a/OpenAL32/alFilter.cpp
+++ b/OpenAL32/alFilter.cpp
@@ -20,16 +20,25 @@
 
 #include "config.h"
 
-#include <cstdlib>
+#include "alFilter.h"
 
 #include <algorithm>
+#include <cstdint>
+#include <iterator>
+#include <memory>
+#include <mutex>
+#include <new>
+
+#include "AL/efx.h"
 
+#include "alError.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alu.h"
-#include "alFilter.h"
-#include "alError.h"
 #include "alexcpt.h"
+#include "almalloc.h"
+#include "alnumeric.h"
+#include "opthelpers.h"
+#include "vector.h"
 
 
 namespace {
diff --git a/OpenAL32/alFilter.h b/OpenAL32/alFilter.h
index 1c033ac3..db098d70 100644
--- a/OpenAL32/alFilter.h
+++ b/OpenAL32/alFilter.h
@@ -1,8 +1,8 @@
-#ifndef _AL_FILTER_H_
-#define _AL_FILTER_H_
+#ifndef AL_FILTER_H
+#define AL_FILTER_H
 
-#include "AL/alc.h"
 #include "AL/al.h"
+#include "AL/alc.h"
 
 
 #define LOWPASSFREQREF  (5000.0f)
diff --git a/OpenAL32/alListener.cpp b/OpenAL32/alListener.cpp
index 067c0f55..d3bf3aaa 100644
--- a/OpenAL32/alListener.cpp
+++ b/OpenAL32/alListener.cpp
@@ -20,15 +20,20 @@
 
 #include "config.h"
 
+#include "alListener.h"
+
 #include <cmath>
+#include <mutex>
+
+#include "AL/efx.h"
 
-#include "alcmain.h"
-#include "alcontext.h"
-#include "alu.h"
 #include "alError.h"
-#include "alListener.h"
-#include "alSource.h"
+#include "alcontext.h"
 #include "alexcpt.h"
+#include "almalloc.h"
+#include "atomic.h"
+#include "opthelpers.h"
+
 
 #define DO_UPDATEPROPS() do {                                                 \
     if(!context->DeferUpdates.load(std::memory_order_acquire))                \
diff --git a/OpenAL32/alListener.h b/OpenAL32/alListener.h
index 4d59dbf9..a71db9f8 100644
--- a/OpenAL32/alListener.h
+++ b/OpenAL32/alListener.h
@@ -1,13 +1,12 @@
-#ifndef _AL_LISTENER_H_
-#define _AL_LISTENER_H_
+#ifndef AL_LISTENER_H
+#define AL_LISTENER_H
 
 #include <array>
+#include <atomic>
 
-#include "AL/alc.h"
 #include "AL/al.h"
-#include "AL/alext.h"
+#include "AL/alc.h"
 
-#include "atomic.h"
 #include "vecmat.h"
 
 enum class DistanceModel;
diff --git a/OpenAL32/alSource.cpp b/OpenAL32/alSource.cpp
index b080f874..4af5cc47 100644
--- a/OpenAL32/alSource.cpp
+++ b/OpenAL32/alSource.cpp
@@ -30,7 +30,6 @@
 #include <climits>
 #include <cmath>
 #include <cstdint>
-#include <cstdlib>
 #include <functional>
 #include <iterator>
 #include <limits>
@@ -39,7 +38,6 @@
 #include <new>
 #include <numeric>
 #include <thread>
-#include <type_traits>
 #include <utility>
 
 #include "AL/al.h"
@@ -69,7 +67,6 @@
 #include "opthelpers.h"
 #include "ringbuffer.h"
 #include "threads.h"
-#include "vector.h"
 
 
 namespace {
diff --git a/OpenAL32/alSource.h b/OpenAL32/alSource.h
index 330bb9f4..c9892398 100644
--- a/OpenAL32/alSource.h
+++ b/OpenAL32/alSource.h
@@ -1,21 +1,25 @@
-#ifndef _AL_SOURCE_H_
-#define _AL_SOURCE_H_
+#ifndef AL_SOURCE_H
+#define AL_SOURCE_H
 
 #include <array>
+#include <atomic>
+#include <cstddef>
 
-#include "alcmain.h"
-#include "alu.h"
-#include "hrtf.h"
-#include "almalloc.h"
-#include "atomic.h"
+#include "AL/al.h"
+#include "AL/alc.h"
 
-#define DEFAULT_SENDS  2
+#include "alcontext.h"
+#include "alnumeric.h"
+#include "alu.h"
+#include "vector.h"
 
 struct ALbuffer;
-struct ALsource;
 struct ALeffectslot;
 
 
+#define DEFAULT_SENDS  2
+
+
 struct ALbufferlistitem {
     std::atomic<ALbufferlistitem*> next;
     ALsizei max_samples;