Update include headers

Don't add alc/ to the include paths.

27 files changed, 49 insertions, 49 deletions

diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index 3ee0a46e..eee274b1 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -36,18 +36,18 @@
 #include "AL/efx.h"
 
 #include "albit.h"
-#include "alcmain.h"
-#include "alcontext.h"
+#include "alc/alcmain.h"
+#include "alc/alcontext.h"
+#include "alc/alu.h"
+#include "alc/inprogext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
-#include "alu.h"
 #include "buffer.h"
 #include "core/except.h"
 #include "core/fpu_ctrl.h"
 #include "core/logging.h"
 #include "effect.h"
-#include "inprogext.h"
 #include "opthelpers.h"
 
 
diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h
index 8d7e396b..ca73c757 100644
--- a/al/auxeffectslot.h
+++ b/al/auxeffectslot.h
@@ -8,11 +8,11 @@
 #include "AL/alc.h"
 #include "AL/efx.h"
 
-#include "alcmain.h"
+#include "alc/alcmain.h"
+#include "alc/effectslot.h"
+#include "alc/effects/base.h"
 #include "almalloc.h"
 #include "atomic.h"
-#include "effectslot.h"
-#include "effects/base.h"
 #include "intrusive_ptr.h"
 #include "vector.h"
 
diff --git a/al/buffer.cpp b/al/buffer.cpp
index 21f46fc8..aaffddf1 100644
--- a/al/buffer.cpp
+++ b/al/buffer.cpp
@@ -43,8 +43,9 @@
 
 #include "albit.h"
 #include "albyte.h"
-#include "alcmain.h"
-#include "alcontext.h"
+#include "alc/alcmain.h"
+#include "alc/alcontext.h"
+#include "alc/inprogext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
@@ -52,7 +53,6 @@
 #include "core/except.h"
 #include "core/logging.h"
 #include "core/voice.h"
-#include "inprogext.h"
 #include "opthelpers.h"
 
 
diff --git a/al/buffer.h b/al/buffer.h
index fe37b0af..a78c65c6 100644
--- a/al/buffer.h
+++ b/al/buffer.h
@@ -6,10 +6,10 @@
 #include "AL/al.h"
 
 #include "albyte.h"
+#include "alc/inprogext.h"
 #include "almalloc.h"
 #include "atomic.h"
 #include "core/buffer_storage.h"
-#include "inprogext.h"
 #include "vector.h"
 
 
diff --git a/al/effect.cpp b/al/effect.cpp
index 645e41df..2c39394f 100644
--- a/al/effect.cpp
+++ b/al/effect.cpp
@@ -39,14 +39,14 @@
 #include "AL/efx.h"
 
 #include "albit.h"
-#include "alcmain.h"
-#include "alcontext.h"
+#include "alc/alcmain.h"
+#include "alc/alcontext.h"
+#include "alc/effects/base.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alstring.h"
 #include "core/except.h"
 #include "core/logging.h"
-#include "effects/base.h"
 #include "opthelpers.h"
 #include "vector.h"
 
diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp
index 65d4b702..9abef1f7 100644
--- a/al/effects/autowah.cpp
+++ b/al/effects/autowah.cpp
@@ -8,7 +8,7 @@
 
 #include "AL/efx.h"
 
-#include "effects/base.h"
+#include "alc/effects/base.h"
 #include "effects.h"
 
 namespace {
diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
index 60152755..704d7230 100644
--- a/al/effects/chorus.cpp
+++ b/al/effects/chorus.cpp
@@ -4,10 +4,10 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "aloptional.h"
 #include "core/logging.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp
index 94e07431..f5db2a6f 100644
--- a/al/effects/compressor.cpp
+++ b/al/effects/compressor.cpp
@@ -4,8 +4,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/convolution.cpp b/al/effects/convolution.cpp
index 4d87b1c4..8e850fd3 100644
--- a/al/effects/convolution.cpp
+++ b/al/effects/convolution.cpp
@@ -2,10 +2,10 @@
 #include "config.h"
 
 #include "AL/al.h"
-#include "inprogext.h"
+#include "alc/inprogext.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/dedicated.cpp b/al/effects/dedicated.cpp
index 334d9e56..db57003c 100644
--- a/al/effects/dedicated.cpp
+++ b/al/effects/dedicated.cpp
@@ -4,10 +4,10 @@
 #include <cmath>
 
 #include "AL/al.h"
-#include "AL/efx.h"
+#include "AL/alext.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp
index 8961a4d9..f5d64a9a 100644
--- a/al/effects/distortion.cpp
+++ b/al/effects/distortion.cpp
@@ -4,8 +4,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp
index 79a60521..65f691c6 100644
--- a/al/effects/echo.cpp
+++ b/al/effects/echo.cpp
@@ -4,8 +4,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp
index 3a7c0a8f..3c039688 100644
--- a/al/effects/equalizer.cpp
+++ b/al/effects/equalizer.cpp
@@ -4,8 +4,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp
index 444b0260..63621aa6 100644
--- a/al/effects/fshifter.cpp
+++ b/al/effects/fshifter.cpp
@@ -4,9 +4,9 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "aloptional.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
index 89dcc209..4c4ee485 100644
--- a/al/effects/modulator.cpp
+++ b/al/effects/modulator.cpp
@@ -4,9 +4,9 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "aloptional.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/null.cpp b/al/effects/null.cpp
index 0ac5278f..516446db 100644
--- a/al/effects/null.cpp
+++ b/al/effects/null.cpp
@@ -4,8 +4,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp
index e6b0b3b0..56059a3c 100644
--- a/al/effects/pshifter.cpp
+++ b/al/effects/pshifter.cpp
@@ -4,8 +4,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp
index caa0c81e..3f234b93 100644
--- a/al/effects/reverb.cpp
+++ b/al/effects/reverb.cpp
@@ -6,8 +6,8 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp
index 03eb2c62..076776a9 100644
--- a/al/effects/vmorpher.cpp
+++ b/al/effects/vmorpher.cpp
@@ -4,9 +4,9 @@
 #include "AL/al.h"
 #include "AL/efx.h"
 
+#include "alc/effects/base.h"
 #include "aloptional.h"
 #include "effects.h"
-#include "effects/base.h"
 
 
 namespace {
diff --git a/al/error.cpp b/al/error.cpp
index 444b55aa..b6489a86 100644
--- a/al/error.cpp
+++ b/al/error.cpp
@@ -35,7 +35,7 @@
 #include "AL/al.h"
 #include "AL/alc.h"
 
-#include "alcontext.h"
+#include "alc/alcontext.h"
 #include "almalloc.h"
 #include "core/except.h"
 #include "core/logging.h"
diff --git a/al/event.cpp b/al/event.cpp
index 843a90e1..5b6c1976 100644
--- a/al/event.cpp
+++ b/al/event.cpp
@@ -18,14 +18,14 @@
 #include "AL/alc.h"
 
 #include "albyte.h"
-#include "alcontext.h"
+#include "alc/alcontext.h"
+#include "alc/effects/base.h"
+#include "alc/inprogext.h"
 #include "almalloc.h"
 #include "core/async_event.h"
 #include "core/except.h"
 #include "core/logging.h"
 #include "core/voice_change.h"
-#include "effects/base.h"
-#include "inprogext.h"
 #include "opthelpers.h"
 #include "ringbuffer.h"
 #include "threads.h"
diff --git a/al/extension.cpp b/al/extension.cpp
index 7346a5c6..bd903a6f 100644
--- a/al/extension.cpp
+++ b/al/extension.cpp
@@ -27,7 +27,7 @@
 #include "AL/al.h"
 #include "AL/alc.h"
 
-#include "alcontext.h"
+#include "alc/alcontext.h"
 #include "alstring.h"
 #include "core/except.h"
 #include "opthelpers.h"
diff --git a/al/filter.cpp b/al/filter.cpp
index c3391193..09249c81 100644
--- a/al/filter.cpp
+++ b/al/filter.cpp
@@ -37,8 +37,8 @@
 #include "AL/efx.h"
 
 #include "albit.h"
-#include "alcmain.h"
-#include "alcontext.h"
+#include "alc/alcmain.h"
+#include "alc/alcontext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "core/except.h"
diff --git a/al/listener.cpp b/al/listener.cpp
index edc1ed06..00626a20 100644
--- a/al/listener.cpp
+++ b/al/listener.cpp
@@ -29,7 +29,7 @@
 #include "AL/alc.h"
 #include "AL/efx.h"
 
-#include "alcontext.h"
+#include "alc/alcontext.h"
 #include "almalloc.h"
 #include "atomic.h"
 #include "core/except.h"
diff --git a/al/source.cpp b/al/source.cpp
index ca234a05..25d84f9f 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -46,16 +46,17 @@
 #include "AL/efx.h"
 
 #include "albit.h"
-#include "alcmain.h"
-#include "alcontext.h"
+#include "alc/alcmain.h"
+#include "alc/alcontext.h"
+#include "alc/alu.h"
+#include "alc/backends/base.h"
+#include "alc/inprogext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "alspan.h"
-#include "alu.h"
 #include "atomic.h"
 #include "auxeffectslot.h"
-#include "backends/base.h"
 #include "buffer.h"
 #include "core/ambidefs.h"
 #include "core/bformatdec.h"
@@ -66,7 +67,6 @@
 #include "core/voice_change.h"
 #include "event.h"
 #include "filter.h"
-#include "inprogext.h"
 #include "math_defs.h"
 #include "opthelpers.h"
 #include "ringbuffer.h"
diff --git a/al/source.h b/al/source.h
index 2063068a..dd3f56a7 100644
--- a/al/source.h
+++ b/al/source.h
@@ -11,11 +11,11 @@
 #include "AL/al.h"
 #include "AL/alc.h"
 
-#include "alcontext.h"
+#include "alc/alcontext.h"
+#include "alc/alu.h"
 #include "aldeque.h"
 #include "almalloc.h"
 #include "alnumeric.h"
-#include "alu.h"
 #include "atomic.h"
 #include "core/voice.h"
 #include "math_defs.h"
diff --git a/al/state.cpp b/al/state.cpp
index 950d64fc..b0b05972 100644
--- a/al/state.cpp
+++ b/al/state.cpp
@@ -32,17 +32,17 @@
 #include "AL/alc.h"
 #include "AL/alext.h"
 
-#include "alcmain.h"
-#include "alcontext.h"
+#include "alc/alcmain.h"
+#include "alc/alcontext.h"
+#include "alc/alu.h"
+#include "alc/inprogext.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
-#include "alu.h"
 #include "atomic.h"
 #include "core/except.h"
 #include "core/voice.h"
 #include "event.h"
-#include "inprogext.h"
 #include "opthelpers.h"
 #include "strutils.h"