11 files changed, 18 insertions, 15 deletions
diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp
index 3df19eb2..6016b8ab 100644
--- a/alc/effects/autowah.cpp
+++ b/alc/effects/autowah.cpp
@@ -26,12 +26,12 @@
 #include <iterator>
 #include <utility>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/mixer.h"
diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp
index 4171cef8..50cf1e40 100644
--- a/alc/effects/chorus.cpp
+++ b/alc/effects/chorus.cpp
@@ -26,11 +26,11 @@
 #include <cstdlib>
 #include <iterator>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/mixer.h"
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index b460904b..fd68ea41 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -19,14 +19,13 @@
 
 #include "albyte.h"
 #include "alcomplex.h"
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
-#include "config.h"
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
 #include "core/buffer_storage.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/filters/splitter.h"
diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp
index d5d0fd32..a3f287c0 100644
--- a/alc/effects/distortion.cpp
+++ b/alc/effects/distortion.cpp
@@ -25,11 +25,11 @@
 #include <cstdlib>
 #include <iterator>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/filters/biquad.h"
diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp
index 8ee1723c..4fccabfe 100644
--- a/alc/effects/echo.cpp
+++ b/alc/effects/echo.cpp
@@ -26,11 +26,11 @@
 #include <iterator>
 #include <tuple>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/filters/biquad.h"
diff --git a/alc/effects/equalizer.cpp b/alc/effects/equalizer.cpp
index 26a3cc47..aedf537e 100644
--- a/alc/effects/equalizer.cpp
+++ b/alc/effects/equalizer.cpp
@@ -27,11 +27,11 @@
 #include <iterator>
 #include <utility>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alspan.h"
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/filters/biquad.h"
diff --git a/alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp
index aae4b72c..e19809bb 100644
--- a/alc/effects/fshifter.cpp
+++ b/alc/effects/fshifter.cpp
@@ -28,11 +28,11 @@
 #include <iterator>
 
 #include "alcomplex.h"
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/mixer.h"
diff --git a/alc/effects/modulator.cpp b/alc/effects/modulator.cpp
index 735163a4..ded35805 100644
--- a/alc/effects/modulator.cpp
+++ b/alc/effects/modulator.cpp
@@ -25,12 +25,12 @@
 #include <cstdlib>
 #include <iterator>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/filters/biquad.h"
diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp
index f838a367..1413909f 100644
--- a/alc/effects/null.cpp
+++ b/alc/effects/null.cpp
@@ -1,12 +1,17 @@
 
 #include "config.h"
 
-#include "alcmain.h"
-#include "alcontext.h"
+#include <stddef.h>
+
 #include "almalloc.h"
 #include "alspan.h"
+#include "core/bufferline.h"
 #include "effects/base.h"
-#include "effectslot.h"
+#include "intrusive_ptr.h"
+
+struct ContextBase;
+struct DeviceBase;
+struct EffectSlot;
 
 
 namespace {
diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp
index ccb4f544..0db27210 100644
--- a/alc/effects/reverb.cpp
+++ b/alc/effects/reverb.cpp
@@ -28,13 +28,12 @@
 #include <numeric>
 #include <stdint.h>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
-#include "alu.h"
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/filters/biquad.h"
diff --git a/alc/effects/vmorpher.cpp b/alc/effects/vmorpher.cpp
index f3ed7aad..c17ccd0c 100644
--- a/alc/effects/vmorpher.cpp
+++ b/alc/effects/vmorpher.cpp
@@ -26,12 +26,12 @@
 #include <functional>
 #include <iterator>
 
-#include "alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "core/ambidefs.h"
 #include "core/bufferline.h"
+#include "core/context.h"
 #include "core/devformat.h"
 #include "core/device.h"
 #include "core/mixer.h"