7 files changed, 25 insertions, 18 deletions
diff --git a/alc/ambdec.cpp b/alc/ambdec.cpp
index 0991cfc5..fa29d268 100644
--- a/alc/ambdec.cpp
+++ b/alc/ambdec.cpp
@@ -3,17 +3,15 @@
 
 #include "ambdec.h"
 
-#include <cctype>
-#include <cstring>
 #include <algorithm>
-
-#include <limits>
-#include <string>
-#include <fstream>
+#include <cctype>
+#include <cstddef>
+#include <iterator>
 #include <sstream>
+#include <string>
 
-#include "logging.h"
 #include "compat.h"
+#include "logging.h"
 
 
 namespace {
diff --git a/alc/backends/base.cpp b/alc/backends/base.cpp
index a7d47c6d..78b9196e 100644
--- a/alc/backends/base.cpp
+++ b/alc/backends/base.cpp
@@ -1,14 +1,16 @@
 
 #include "config.h"
 
-#include <cstdlib>
+#include "base.h"
 
+#include <atomic>
 #include <thread>
 
-#include "alcmain.h"
-#include "alu.h"
+#include "AL/al.h"
 
-#include "backends/base.h"
+#include "alcmain.h"
+#include "alnumeric.h"
+#include "atomic.h"
 
 
 ClockLatency GetClockLatency(ALCdevice *device)
diff --git a/alc/backends/base.h b/alc/backends/base.h
index 437e31d9..5e294fe8 100644
--- a/alc/backends/base.h
+++ b/alc/backends/base.h
@@ -1,10 +1,12 @@
 #ifndef ALC_BACKENDS_BASE_H
 #define ALC_BACKENDS_BASE_H
 
-#include <memory>
 #include <chrono>
-#include <string>
+#include <memory>
 #include <mutex>
+#include <string>
+
+#include "AL/alc.h"
 
 #include "alcmain.h"
 
diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp
index b4799077..c4eebb3d 100644
--- a/alc/effects/null.cpp
+++ b/alc/effects/null.cpp
@@ -1,6 +1,5 @@
-#include "config.h"
 
-#include <cstdlib>
+#include "config.h"
 
 #include "AL/al.h"
 #include "AL/alc.h"
@@ -8,7 +7,9 @@
 #include "al/auxeffectslot.h"
 #include "al/error.h"
 #include "alcmain.h"
-#include "alcontext.h"
+#include "almalloc.h"
+#include "alspan.h"
+#include "effects/base.h"
 
 
 namespace {
diff --git a/alc/filters/nfc.cpp b/alc/filters/nfc.cpp
index 1a567f2c..4e36bc66 100644
--- a/alc/filters/nfc.cpp
+++ b/alc/filters/nfc.cpp
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include "alcmain.h"
+#include "opthelpers.h"
 
 
 /* Near-field control filters are the basis for handling the near-field effect.
diff --git a/alc/filters/splitter.cpp b/alc/filters/splitter.cpp
index 09e7bfe8..7463d795 100644
--- a/alc/filters/splitter.cpp
+++ b/alc/filters/splitter.cpp
@@ -3,11 +3,13 @@
 
 #include "splitter.h"
 
+#include <algorithm>
 #include <cmath>
 #include <limits>
-#include <algorithm>
 
 #include "math_defs.h"
+#include "opthelpers.h"
+
 
 template<typename Real>
 void BandSplitterR<Real>::init(Real f0norm)
diff --git a/alc/filters/splitter.h b/alc/filters/splitter.h
index 927c4d17..d7b0240d 100644
--- a/alc/filters/splitter.h
+++ b/alc/filters/splitter.h
@@ -1,6 +1,8 @@
 #ifndef FILTER_SPLITTER_H
 #define FILTER_SPLITTER_H
 
+#include <cstddef>
+
 #include "alcmain.h"
 #include "almalloc.h"