4 files changed, 3 insertions, 46 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 00f90d91..de0038a2 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -74,6 +74,7 @@
 #include "compat.h"
 #include "cpu_caps.h"
 #include "effects/base.h"
+#include "event.h"
 #include "filters/nfc.h"
 #include "filters/splitter.h"
 #include "fpu_modes.h"
diff --git a/alc/alcmain.h b/alc/alcmain.h
index a22e0e81..85f37e73 100644
--- a/alc/alcmain.h
+++ b/alc/alcmain.h
@@ -461,48 +461,6 @@ struct ALCdevice {
 #define RECORD_THREAD_NAME "alsoft-record"
 
 
-enum {
-    /* End event thread processing. */
-    EventType_KillThread = 0,
-
-    /* User event types. */
-    EventType_SourceStateChange = 1<<0,
-    EventType_BufferCompleted   = 1<<1,
-    EventType_Error             = 1<<2,
-    EventType_Performance       = 1<<3,
-    EventType_Deprecated        = 1<<4,
-    EventType_Disconnected      = 1<<5,
-
-    /* Internal events. */
-    EventType_ReleaseEffectState = 65536,
-};
-
-struct AsyncEvent {
-    unsigned int EnumType{0u};
-    union {
-        char dummy;
-        struct {
-            ALuint id;
-            ALenum state;
-        } srcstate;
-        struct {
-            ALuint id;
-            ALsizei count;
-        } bufcomp;
-        struct {
-            ALenum type;
-            ALuint id;
-            ALuint param;
-            ALchar msg[1008];
-        } user;
-        EffectState *mEffectState;
-    } u{};
-
-    AsyncEvent() noexcept = default;
-    constexpr AsyncEvent(unsigned int type) noexcept : EnumType{type} { }
-};
-
-
 void AllocateVoices(ALCcontext *context, size_t num_voices);
 
 
@@ -525,10 +483,6 @@ inline ALint GetChannelIdxByName(const RealMixParams &real, Channel chan) noexce
 { return real.ChannelIndex[chan]; }
 
 
-void StartEventThrd(ALCcontext *ctx);
-void StopEventThrd(ALCcontext *ctx);
-
-
 al::vector<std::string> SearchDataFiles(const char *match, const char *subdir);
 
 #endif
diff --git a/alc/alu.cpp b/alc/alu.cpp
index cc1a5a98..31689997 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -60,6 +60,7 @@
 #include "bs2b.h"
 #include "cpu_caps.h"
 #include "effects/base.h"
+#include "event.h"
 #include "filters/biquad.h"
 #include "filters/nfc.h"
 #include "filters/splitter.h"
diff --git a/alc/mixvoice.cpp b/alc/mixvoice.cpp
index be872f6d..aea04b15 100644
--- a/alc/mixvoice.cpp
+++ b/alc/mixvoice.cpp
@@ -50,6 +50,7 @@
 #include "alspan.h"
 #include "alu.h"
 #include "cpu_caps.h"
+#include "event.h"
 #include "filters/biquad.h"
 #include "filters/nfc.h"
 #include "filters/splitter.h"