18 files changed, 2 insertions, 18 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 8cda3733..1b06b57f 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -68,7 +68,6 @@
 #include "albyte.h"
 #include "alconfig.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
@@ -82,6 +81,7 @@
 #include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/devformat.h"
+#include "core/except.h"
 #include "core/mastering.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index 4adf64b3..f8b22aaf 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -40,7 +40,6 @@
 #include "albyte.h"
 #include "alcmain.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
diff --git a/alc/backends/base.cpp b/alc/backends/base.cpp
index 60d99bff..8642f40c 100644
--- a/alc/backends/base.cpp
+++ b/alc/backends/base.cpp
@@ -13,7 +13,6 @@
 #endif
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "atomic.h"
diff --git a/alc/backends/base.h b/alc/backends/base.h
index 963d01a4..df076276 100644
--- a/alc/backends/base.h
+++ b/alc/backends/base.h
@@ -8,7 +8,7 @@
 
 #include "albyte.h"
 #include "alcmain.h"
-#include "alexcpt.h"
+#include "core/except.h"
 
 
 using uint = unsigned int;
diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp
index a4c93819..8e38a777 100644
--- a/alc/backends/coreaudio.cpp
+++ b/alc/backends/coreaudio.cpp
@@ -30,7 +30,6 @@
 #include <cmath>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "ringbuffer.h"
 #include "converter.h"
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
index a8577dbc..a09def73 100644
--- a/alc/backends/dsound.cpp
+++ b/alc/backends/dsound.cpp
@@ -45,7 +45,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "core/logging.h"
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index c70e5b0d..7c9573ce 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -34,7 +34,6 @@
 #include "alcmain.h"
 #include "alu.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "core/logging.h"
 #include "dynload.h"
 #include "ringbuffer.h"
diff --git a/alc/backends/null.cpp b/alc/backends/null.cpp
index 87fb2689..15a36ddd 100644
--- a/alc/backends/null.cpp
+++ b/alc/backends/null.cpp
@@ -31,7 +31,6 @@
 #include <thread>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alu.h"
 #include "threads.h"
diff --git a/alc/backends/opensl.cpp b/alc/backends/opensl.cpp
index b41a4d84..8d966fca 100644
--- a/alc/backends/opensl.cpp
+++ b/alc/backends/opensl.cpp
@@ -33,7 +33,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "core/logging.h"
diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index 1178a3ac..b333432d 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -46,7 +46,6 @@
 #include "alcmain.h"
 #include "alconfig.h"
 #include "albyte.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
diff --git a/alc/backends/portaudio.cpp b/alc/backends/portaudio.cpp
index 4cb9fe0a..d2e6a5a4 100644
--- a/alc/backends/portaudio.cpp
+++ b/alc/backends/portaudio.cpp
@@ -27,7 +27,6 @@
 #include <cstring>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "alconfig.h"
 #include "core/logging.h"
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index 9e5424de..8c65460f 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -38,7 +38,6 @@
 #include "alcmain.h"
 #include "alu.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "compat.h"
 #include "core/logging.h"
 #include "dynload.h"
diff --git a/alc/backends/sdl2.cpp b/alc/backends/sdl2.cpp
index 300f4934..58045c85 100644
--- a/alc/backends/sdl2.cpp
+++ b/alc/backends/sdl2.cpp
@@ -30,7 +30,6 @@
 #include "AL/al.h"
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alu.h"
 #include "core/logging.h"
diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp
index 258eda19..41bdb73b 100644
--- a/alc/backends/sndio.cpp
+++ b/alc/backends/sndio.cpp
@@ -30,7 +30,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "core/logging.h"
 #include "ringbuffer.h"
diff --git a/alc/backends/solaris.cpp b/alc/backends/solaris.cpp
index 6a2c2da0..f2763357 100644
--- a/alc/backends/solaris.cpp
+++ b/alc/backends/solaris.cpp
@@ -40,7 +40,6 @@
 
 #include "alcmain.h"
 #include "albyte.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "alconfig.h"
 #include "compat.h"
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 45359bf6..a0eb814f 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -56,7 +56,6 @@
 #include <vector>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "converter.h"
diff --git a/alc/backends/wave.cpp b/alc/backends/wave.cpp
index 7e076e47..b870ea67 100644
--- a/alc/backends/wave.cpp
+++ b/alc/backends/wave.cpp
@@ -38,7 +38,6 @@
 #include "albyte.h"
 #include "alcmain.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alu.h"
diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp
index 2474a316..9b88f12e 100644
--- a/alc/backends/winmm.cpp
+++ b/alc/backends/winmm.cpp
@@ -39,7 +39,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "core/logging.h"