4 files changed, 5 insertions, 5 deletions
diff --git a/al/buffer.cpp b/al/buffer.cpp
index 906b40fc..21f46fc8 100644
--- a/al/buffer.cpp
+++ b/al/buffer.cpp
@@ -50,10 +50,10 @@
 #include "aloptional.h"
 #include "atomic.h"
 #include "core/except.h"
-#include "inprogext.h"
 #include "core/logging.h"
+#include "core/voice.h"
+#include "inprogext.h"
 #include "opthelpers.h"
-#include "voice.h"
 
 
 namespace {
diff --git a/al/buffer.h b/al/buffer.h
index a9bc0e71..fe37b0af 100644
--- a/al/buffer.h
+++ b/al/buffer.h
@@ -8,7 +8,7 @@
 #include "albyte.h"
 #include "almalloc.h"
 #include "atomic.h"
-#include "buffer_storage.h"
+#include "core/buffer_storage.h"
 #include "inprogext.h"
 #include "vector.h"
 
diff --git a/al/source.h b/al/source.h
index 4f4832e5..2063068a 100644
--- a/al/source.h
+++ b/al/source.h
@@ -17,9 +17,9 @@
 #include "alnumeric.h"
 #include "alu.h"
 #include "atomic.h"
+#include "core/voice.h"
 #include "math_defs.h"
 #include "vector.h"
-#include "voice.h"
 
 struct ALbuffer;
 struct ALeffectslot;
diff --git a/al/state.cpp b/al/state.cpp
index 86a85b4d..950d64fc 100644
--- a/al/state.cpp
+++ b/al/state.cpp
@@ -40,11 +40,11 @@
 #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"
-#include "voice.h"
 
 
 namespace {