13 files changed, 29 insertions, 30 deletions
diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp
index 96292636..298d5c96 100644
--- a/alc/effects/autowah.cpp
+++ b/alc/effects/autowah.cpp
@@ -25,10 +25,10 @@
 
 #include <algorithm>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 #include "filters/biquad.h"
 #include "vecmat.h"
diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp
index d475b57a..28514a9b 100644
--- a/alc/effects/chorus.cpp
+++ b/alc/effects/chorus.cpp
@@ -30,9 +30,9 @@
 #include "AL/alc.h"
 #include "AL/efx.h"
 
-#include "alAuxEffectSlot.h"
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
-#include "alError.h"
 #include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
diff --git a/alc/effects/compressor.cpp b/alc/effects/compressor.cpp
index 4a487097..86e2e02b 100644
--- a/alc/effects/compressor.cpp
+++ b/alc/effects/compressor.cpp
@@ -22,11 +22,11 @@
 
 #include <cstdlib>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
 #include "alu.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "vecmat.h"
 
 
diff --git a/alc/effects/dedicated.cpp b/alc/effects/dedicated.cpp
index b31b3750..c05df772 100644
--- a/alc/effects/dedicated.cpp
+++ b/alc/effects/dedicated.cpp
@@ -24,10 +24,10 @@
 #include <cmath>
 #include <algorithm>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 
 
diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp
index 59557395..a74575d4 100644
--- a/alc/effects/distortion.cpp
+++ b/alc/effects/distortion.cpp
@@ -25,10 +25,10 @@
 
 #include <cmath>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 #include "filters/biquad.h"
 
diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp
index c10f2eb2..8e309cbb 100644
--- a/alc/effects/echo.cpp
+++ b/alc/effects/echo.cpp
@@ -25,11 +25,11 @@
 
 #include <algorithm>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
+#include "al/filter.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alFilter.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 #include "filters/biquad.h"
 #include "vector.h"
diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp
index 69ab5021..0ae3a25f 100644
--- a/alc/effects/equalizer.cpp
+++ b/alc/effects/equalizer.cpp
@@ -26,10 +26,10 @@
 #include <algorithm>
 #include <functional>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 #include "filters/biquad.h"
 #include "vecmat.h"
diff --git a/alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp
index b47aa00e..b36c53a1 100644
--- a/alc/effects/fshifter.cpp
+++ b/alc/effects/fshifter.cpp
@@ -26,10 +26,10 @@
 #include <complex>
 #include <algorithm>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 
 #include "alcomplex.h"
diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp
index 086482d7..5f28e1da 100644
--- a/alc/effects/modulator.cpp
+++ b/alc/effects/modulator.cpp
@@ -26,10 +26,10 @@
 #include <cmath>
 #include <algorithm>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 #include "filters/biquad.h"
 #include "vecmat.h"
diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp
index e55c8699..b4799077 100644
--- a/alc/effects/null.cpp
+++ b/alc/effects/null.cpp
@@ -5,10 +5,10 @@
 #include "AL/al.h"
 #include "AL/alc.h"
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 
 
 namespace {
diff --git a/alc/effects/pshifter.cpp b/alc/effects/pshifter.cpp
index 39d3cf1a..eac5894b 100644
--- a/alc/effects/pshifter.cpp
+++ b/alc/effects/pshifter.cpp
@@ -30,14 +30,13 @@
 #include <complex>
 #include <algorithm>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
+#include "alcomplex.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 
-#include "alcomplex.h"
-
 
 namespace {
 
diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp
index ac996b3f..82b04436 100644
--- a/alc/effects/reverb.cpp
+++ b/alc/effects/reverb.cpp
@@ -29,12 +29,12 @@
 #include <algorithm>
 #include <functional>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
+#include "al/listener.h"
 #include "alcmain.h"
 #include "alcontext.h"
 #include "alu.h"
-#include "alAuxEffectSlot.h"
-#include "alListener.h"
-#include "alError.h"
 #include "bformatdec.h"
 #include "filters/biquad.h"
 #include "vector.h"
diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp
index eebba3f1..d1bf8587 100644
--- a/alc/effects/vmorpher.cpp
+++ b/alc/effects/vmorpher.cpp
@@ -25,10 +25,10 @@
 #include <algorithm>
 #include <functional>
 
+#include "al/auxeffectslot.h"
+#include "al/error.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alAuxEffectSlot.h"
-#include "alError.h"
 #include "alu.h"
 
 namespace {