46 files changed, 93 insertions, 94 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1c7ede0..52d61ff0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -798,24 +798,24 @@ set(ALC_OBJS
 if (ALSOFT_EAX)
     set(OPENAL_OBJS
         ${OPENAL_OBJS}
-        al/eax_api.cpp
-        al/eax_api.h
-        al/eax_eax_call.cpp
-        al/eax_eax_call.h
-        al/eax_effect.cpp
-        al/eax_effect.h
-        al/eax_exception.cpp
-        al/eax_exception.h
-        al/eax_fx_slot_index.cpp
-        al/eax_fx_slot_index.h
-        al/eax_fx_slots.cpp
-        al/eax_fx_slots.h
-        al/eax_globals.cpp
-        al/eax_globals.h
-        al/eax_utils.cpp
-        al/eax_utils.h
-        al/eax_x_ram.cpp
-        al/eax_x_ram.h
+        al/eax/api.cpp
+        al/eax/api.h
+        al/eax/eax_call.cpp
+        al/eax/eax_call.h
+        al/eax/effect.cpp
+        al/eax/effect.h
+        al/eax/exception.cpp
+        al/eax/exception.h
+        al/eax/fx_slot_index.cpp
+        al/eax/fx_slot_index.h
+        al/eax/fx_slots.cpp
+        al/eax/fx_slots.h
+        al/eax/globals.cpp
+        al/eax/globals.h
+        al/eax/utils.cpp
+        al/eax/utils.h
+        al/eax/x_ram.cpp
+        al/eax/x_ram.h
 )
 endif ()
 
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index c33fb149..455a1072 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -51,8 +51,8 @@
 #include "opthelpers.h"
 
 #ifdef ALSOFT_EAX
-#include "eax_exception.h"
-#include "eax_utils.h"
+#include "eax/exception.h"
+#include "eax/utils.h"
 #endif // ALSOFT_EAX
 
 namespace {
diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h
index ca0dcd31..5336a2a8 100644
--- a/al/auxeffectslot.h
+++ b/al/auxeffectslot.h
@@ -19,9 +19,9 @@
 #ifdef ALSOFT_EAX
 #include <memory>
 
-#include "eax_eax_call.h"
-#include "eax_effect.h"
-#include "eax_fx_slot_index.h"
+#include "eax/eax_call.h"
+#include "eax/effect.h"
+#include "eax/fx_slot_index.h"
 #endif // ALSOFT_EAX
 
 struct ALbuffer;
diff --git a/al/buffer.cpp b/al/buffer.cpp
index 13407103..9b455b9c 100644
--- a/al/buffer.cpp
+++ b/al/buffer.cpp
@@ -57,8 +57,8 @@
 #include "opthelpers.h"
 
 #ifdef ALSOFT_EAX
-#include "eax_globals.h"
-#include "eax_x_ram.h"
+#include "eax/globals.h"
+#include "eax/x_ram.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/buffer.h b/al/buffer.h
index b3a0f0d8..7ded83bd 100644
--- a/al/buffer.h
+++ b/al/buffer.h
@@ -13,7 +13,7 @@
 #include "vector.h"
 
 #ifdef ALSOFT_EAX
-#include "eax_x_ram.h"
+#include "eax/x_ram.h"
 #endif // ALSOFT_EAX
 
 /* User formats */
diff --git a/al/eax_api.cpp b/al/eax/api.cpp
index 6b1f7fcf..f859a1c4 100644
--- a/al/eax_api.cpp
+++ b/al/eax/api.cpp
@@ -9,7 +9,7 @@
 
 #include <algorithm>
 
-#include "al/eax_api.h"
+#include "api.h"
 
 
 const GUID DSPROPSETID_EAX_ReverbProperties =
diff --git a/al/eax_api.h b/al/eax/api.h
index d0737d1d..d0737d1d 100644
--- a/al/eax_api.h
+++ b/al/eax/api.h
diff --git a/al/eax_eax_call.cpp b/al/eax/eax_call.cpp
index 914d2fbf..19565852 100644
--- a/al/eax_eax_call.cpp
+++ b/al/eax/eax_call.cpp
@@ -1,8 +1,7 @@
 #include "config.h"
 
-#include "al/eax_eax_call.h"
-
-#include "al/eax_exception.h"
+#include "eax_call.h"
+#include "exception.h"
 
 
 namespace {
diff --git a/al/eax_eax_call.h b/al/eax/eax_call.h
index 7b990d87..2c90bdc3 100644
--- a/al/eax_eax_call.h
+++ b/al/eax/eax_call.h
@@ -6,8 +6,8 @@
 
 #include "alspan.h"
 
-#include "eax_api.h"
-#include "eax_fx_slot_index.h"
+#include "api.h"
+#include "fx_slot_index.h"
 
 
 enum class EaxEaxCallPropertySetId
diff --git a/al/eax/effect.cpp b/al/eax/effect.cpp
new file mode 100644
index 00000000..4e8faa73
--- /dev/null
+++ b/al/eax/effect.cpp
@@ -0,0 +1,3 @@
+#include "config.h"
+
+#include "effect.h"
diff --git a/al/eax_effect.h b/al/eax/effect.h
index 45315ca6..9c9fdef4 100644
--- a/al/eax_effect.h
+++ b/al/eax/effect.h
@@ -6,7 +6,7 @@
 
 #include "AL/al.h"
 #include "core/effects/base.h"
-#include "eax_eax_call.h"
+#include "eax_call.h"
 
 class EaxEffect
 {
diff --git a/al/eax_exception.cpp b/al/eax/exception.cpp
index fdeecaaa..3b319648 100644
--- a/al/eax_exception.cpp
+++ b/al/eax/exception.cpp
@@ -1,9 +1,8 @@
 #include "config.h"
 
-#include "eax_exception.h"
+#include "exception.h"
 
 #include <cassert>
-
 #include <string>
 
 
diff --git a/al/eax_exception.h b/al/eax/exception.h
index 9a7acf71..9a7acf71 100644
--- a/al/eax_exception.h
+++ b/al/eax/exception.h
diff --git a/al/eax_fx_slot_index.cpp b/al/eax/fx_slot_index.cpp
index 9aa695ad..28b11882 100644
--- a/al/eax_fx_slot_index.cpp
+++ b/al/eax/fx_slot_index.cpp
@@ -1,8 +1,8 @@
 #include "config.h"
 
-#include "eax_fx_slot_index.h"
+#include "fx_slot_index.h"
 
-#include "eax_exception.h"
+#include "exception.h"
 
 
 namespace
diff --git a/al/eax_fx_slot_index.h b/al/eax/fx_slot_index.h
index e1e5475a..63dba037 100644
--- a/al/eax_fx_slot_index.h
+++ b/al/eax/fx_slot_index.h
@@ -5,7 +5,7 @@
 #include <cstddef>
 
 #include "aloptional.h"
-#include "eax_api.h"
+#include "api.h"
 
 
 using EaxFxSlotIndexValue = std::size_t;
diff --git a/al/eax_fx_slots.cpp b/al/eax/fx_slots.cpp
index 3a27dabd..5897e951 100644
--- a/al/eax_fx_slots.cpp
+++ b/al/eax/fx_slots.cpp
@@ -1,12 +1,11 @@
 #include "config.h"
 
-#include "eax_fx_slots.h"
+#include "fx_slots.h"
 
 #include <array>
 
-#include "eax_exception.h"
-
-#include "eax_api.h"
+#include "api.h"
+#include "exception.h"
 
 
 namespace
diff --git a/al/eax_fx_slots.h b/al/eax/fx_slots.h
index a104c6ab..49cabd75 100644
--- a/al/eax_fx_slots.h
+++ b/al/eax/fx_slots.h
@@ -6,9 +6,8 @@
 
 #include "al/auxeffectslot.h"
 
-#include "eax_api.h"
-
-#include "eax_fx_slot_index.h"
+#include "api.h"
+#include "fx_slot_index.h"
 
 
 class EaxFxSlots
diff --git a/al/eax_globals.cpp b/al/eax/globals.cpp
index 07909459..80e9dbfe 100644
--- a/al/eax_globals.cpp
+++ b/al/eax/globals.cpp
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "eax_globals.h"
+#include "globals.h"
 
 
 bool eax_g_is_enabled = true;
diff --git a/al/eax_globals.h b/al/eax/globals.h
index 1b4d63b8..1b4d63b8 100644
--- a/al/eax_globals.h
+++ b/al/eax/globals.h
diff --git a/al/eax_utils.cpp b/al/eax/utils.cpp
index 67389de4..9fa2871d 100644
--- a/al/eax_utils.cpp
+++ b/al/eax/utils.cpp
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "eax_utils.h"
+#include "utils.h"
 
 #include <cassert>
 #include <exception>
diff --git a/al/eax_utils.h b/al/eax/utils.h
index d3d4a196..d3d4a196 100644
--- a/al/eax_utils.h
+++ b/al/eax/utils.h
diff --git a/al/eax/x_ram.cpp b/al/eax/x_ram.cpp
new file mode 100644
index 00000000..7332c82e
--- /dev/null
+++ b/al/eax/x_ram.cpp
@@ -0,0 +1,3 @@
+#include "config.h"
+
+#include "x_ram.h"
diff --git a/al/eax_x_ram.h b/al/eax/x_ram.h
index 438b9916..438b9916 100644
--- a/al/eax_x_ram.h
+++ b/al/eax/x_ram.h
diff --git a/al/eax_effect.cpp b/al/eax_effect.cpp
deleted file mode 100644
index 9cbf4c13..00000000
--- a/al/eax_effect.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "config.h"
-
-#include "eax_effect.h"
diff --git a/al/eax_x_ram.cpp b/al/eax_x_ram.cpp
deleted file mode 100644
index ac3e7ebb..00000000
--- a/al/eax_x_ram.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "config.h"
-
-#include "eax_x_ram.h"
diff --git a/al/effect.cpp b/al/effect.cpp
index 5a74ca53..90a4dfde 100644
--- a/al/effect.cpp
+++ b/al/effect.cpp
@@ -54,7 +54,7 @@
 #ifdef ALSOFT_EAX
 #include <cassert>
 
-#include "eax_exception.h"
+#include "eax/exception.h"
 #endif // ALSOFT_EAX
 
 const EffectList gEffectList[16]{
diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp
index 273ec7ae..23f43305 100644
--- a/al/effects/autowah.cpp
+++ b/al/effects/autowah.cpp
@@ -14,8 +14,8 @@
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
index 56318095..b612a6c1 100644
--- a/al/effects/chorus.cpp
+++ b/al/effects/chorus.cpp
@@ -16,8 +16,8 @@
 
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp
index bb5dfa3e..a18609ca 100644
--- a/al/effects/compressor.cpp
+++ b/al/effects/compressor.cpp
@@ -10,8 +10,8 @@
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp
index 13b1f23d..441b89a0 100644
--- a/al/effects/distortion.cpp
+++ b/al/effects/distortion.cpp
@@ -10,8 +10,8 @@
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp
index 61adad7f..56849b9d 100644
--- a/al/effects/echo.cpp
+++ b/al/effects/echo.cpp
@@ -10,8 +10,8 @@
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/effects.h b/al/effects/effects.h
index 830e7191..f8b97eeb 100644
--- a/al/effects/effects.h
+++ b/al/effects/effects.h
@@ -6,7 +6,7 @@
 #include "core/except.h"
 
 #ifdef ALSOFT_EAX
-#include "al/eax_effect.h"
+#include "al/eax/effect.h"
 #endif // ALSOFT_EAX
 
 union EffectProps;
diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp
index f829328c..ccc00f67 100644
--- a/al/effects/equalizer.cpp
+++ b/al/effects/equalizer.cpp
@@ -10,8 +10,8 @@
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp
index d334890b..1ca97ecb 100644
--- a/al/effects/fshifter.cpp
+++ b/al/effects/fshifter.cpp
@@ -15,8 +15,8 @@
 
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
index 800b892d..082597cd 100644
--- a/al/effects/modulator.cpp
+++ b/al/effects/modulator.cpp
@@ -15,8 +15,8 @@
 
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/null.cpp b/al/effects/null.cpp
index a0eb2247..0ec387d4 100644
--- a/al/effects/null.cpp
+++ b/al/effects/null.cpp
@@ -8,7 +8,7 @@
 #include "effects.h"
 
 #ifdef ALSOFT_EAX
-#include "al/eax_exception.h"
+#include "al/eax/exception.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp
index 1b2dcff0..cb81d831 100644
--- a/al/effects/pshifter.cpp
+++ b/al/effects/pshifter.cpp
@@ -10,8 +10,8 @@
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp
index 197ea500..4184eda0 100644
--- a/al/effects/reverb.cpp
+++ b/al/effects/reverb.cpp
@@ -11,10 +11,13 @@
 
 #ifdef ALSOFT_EAX
 #include <tuple>
-#include "alnumeric.h"
+
 #include "AL/efx-presets.h"
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+
+#include "alnumeric.h"
+
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp
index 8c0b3adb..da513015 100644
--- a/al/effects/vmorpher.cpp
+++ b/al/effects/vmorpher.cpp
@@ -15,8 +15,8 @@
 
 #include "alnumeric.h"
 
-#include "al/eax_exception.h"
-#include "al/eax_utils.h"
+#include "al/eax/exception.h"
+#include "al/eax/utils.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/al/source.cpp b/al/source.cpp
index d2ccfe08..604d4566 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -73,7 +73,7 @@
 #include "threads.h"
 
 #ifdef ALSOFT_EAX
-#include "eax_exception.h"
+#include "eax/exception.h"
 #endif // ALSOFT_EAX
 
 namespace {
diff --git a/al/source.h b/al/source.h
index 6db6bfa7..6fc1c1d4 100644
--- a/al/source.h
+++ b/al/source.h
@@ -22,9 +22,9 @@
 #include "vector.h"
 
 #ifdef ALSOFT_EAX
-#include "eax_eax_call.h"
-#include "eax_fx_slot_index.h"
-#include "eax_utils.h"
+#include "eax/eax_call.h"
+#include "eax/fx_slot_index.h"
+#include "eax/utils.h"
 #endif // ALSOFT_EAX
 
 struct ALbuffer;
diff --git a/al/state.cpp b/al/state.cpp
index 1a07f624..f41016d6 100644
--- a/al/state.cpp
+++ b/al/state.cpp
@@ -49,8 +49,8 @@
 #ifdef ALSOFT_EAX
 #include "alc/device.h"
 
-#include "eax_globals.h"
-#include "eax_x_ram.h"
+#include "eax/globals.h"
+#include "eax/x_ram.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 686b794e..3fa0d353 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -156,8 +156,8 @@
 #endif
 
 #ifdef ALSOFT_EAX
-#include "al/eax_globals.h"
-#include "al/eax_x_ram.h"
+#include "al/eax/globals.h"
+#include "al/eax/x_ram.h"
 #endif // ALSOFT_EAX
 
 
diff --git a/alc/context.cpp b/alc/context.cpp
index 34da3784..5fe03e78 100644
--- a/alc/context.cpp
+++ b/alc/context.cpp
@@ -34,8 +34,8 @@
 #include <cstring>
 
 #include "alstring.h"
-#include "al/eax_exception.h"
-#include "al/eax_globals.h"
+#include "al/eax/exception.h"
+#include "al/eax/globals.h"
 #endif // ALSOFT_EAX
 
 namespace {
diff --git a/alc/context.h b/alc/context.h
index 72b259e9..b3f1ea09 100644
--- a/alc/context.h
+++ b/alc/context.h
@@ -20,10 +20,10 @@
 #include "vector.h"
 
 #ifdef ALSOFT_EAX
-#include "al/eax_eax_call.h"
-#include "al/eax_fx_slot_index.h"
-#include "al/eax_fx_slots.h"
-#include "al/eax_utils.h"
+#include "al/eax/eax_call.h"
+#include "al/eax/fx_slot_index.h"
+#include "al/eax/fx_slots.h"
+#include "al/eax/utils.h"
 
 
 using EaxContextSharedDirtyFlagsValue = std::uint_least8_t;
diff --git a/alc/device.h b/alc/device.h
index 434d4d8f..ef50f53e 100644
--- a/alc/device.h
+++ b/alc/device.h
@@ -20,7 +20,7 @@
 #include "vector.h"
 
 #ifdef ALSOFT_EAX
-#include "al/eax_x_ram.h"
+#include "al/eax/x_ram.h"
 #endif // ALSOFT_EAX
 
 struct ALbuffer;