13 files changed, 28 insertions, 25 deletions
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