8 files changed, 25 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58d512e0..3a1f6a09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -647,6 +647,8 @@ set(CORE_OBJS
     core/ambidefs.cpp
     core/ambidefs.h
     core/async_event.h
+    core/bformatdec.cpp
+    core/bformatdec.h
     core/bs2b.cpp
     core/bs2b.h
     core/bsinc_defs.h
@@ -673,6 +675,7 @@ set(CORE_OBJS
     core/fmt_traits.h
     core/fpu_ctrl.cpp
     core/fpu_ctrl.h
+    core/front_stablizer.h
     core/helpers.cpp
     core/helpers.h
     core/hrtf.cpp
@@ -759,8 +762,6 @@ set(ALC_OBJS
     alc/alconfig.cpp
     alc/alconfig.h
     alc/alcontext.h
-    alc/bformatdec.cpp
-    alc/bformatdec.h
     alc/buffer_storage.cpp
     alc/buffer_storage.h
     alc/effectslot.cpp
@@ -780,7 +781,6 @@ set(ALC_OBJS
     alc/effects/pshifter.cpp
     alc/effects/reverb.cpp
     alc/effects/vmorpher.cpp
-    alc/front_stablizer.h
     alc/inprogext.h
     alc/panning.cpp
     alc/voice.cpp
diff --git a/al/source.cpp b/al/source.cpp
index 69120bac..4855b72d 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -56,9 +56,9 @@
 #include "atomic.h"
 #include "auxeffectslot.h"
 #include "backends/base.h"
-#include "bformatdec.h"
 #include "buffer.h"
 #include "core/ambidefs.h"
+#include "core/bformatdec.h"
 #include "core/except.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 8ba1c8a2..d06ca067 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -77,9 +77,9 @@
 #include "alstring.h"
 #include "alu.h"
 #include "atomic.h"
-#include "bformatdec.h"
 #include "core/ambidefs.h"
 #include "core/async_event.h"
+#include "core/bformatdec.h"
 #include "core/bs2b.h"
 #include "core/cpu_caps.h"
 #include "core/devformat.h"
@@ -89,11 +89,11 @@
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
 #include "core/fpu_ctrl.h"
+#include "core/front_stablizer.h"
 #include "core/hrtf.h"
 #include "core/logging.h"
 #include "core/uhjfilter.h"
 #include "effects/base.h"
-#include "front_stablizer.h"
 #include "inprogext.h"
 #include "intrusive_ptr.h"
 #include "opthelpers.h"
diff --git a/alc/alu.cpp b/alc/alu.cpp
index a97bc18b..14ffd8b5 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -51,9 +51,9 @@
 #include "alspan.h"
 #include "alstring.h"
 #include "atomic.h"
-#include "bformatdec.h"
 #include "core/ambidefs.h"
 #include "core/async_event.h"
+#include "core/bformatdec.h"
 #include "core/bs2b.h"
 #include "core/bsinc_tables.h"
 #include "core/cpu_caps.h"
@@ -62,6 +62,7 @@
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
 #include "core/fpu_ctrl.h"
+#include "core/front_stablizer.h"
 #include "core/hrtf.h"
 #include "core/mastering.h"
 #include "core/mixer.h"
@@ -69,7 +70,6 @@
 #include "core/uhjfilter.h"
 #include "effects/base.h"
 #include "effectslot.h"
-#include "front_stablizer.h"
 #include "inprogext.h"
 #include "math_defs.h"
 #include "opthelpers.h"
diff --git a/alc/panning.cpp b/alc/panning.cpp
index ce6ba29c..5e263111 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -47,15 +47,15 @@
 #include "alspan.h"
 #include "alstring.h"
 #include "alu.h"
-#include "bformatdec.h"
 #include "core/ambdec.h"
 #include "core/ambidefs.h"
+#include "core/bformatdec.h"
 #include "core/bs2b.h"
 #include "core/devformat.h"
+#include "core/front_stablizer.h"
 #include "core/hrtf.h"
 #include "core/logging.h"
 #include "core/uhjfilter.h"
-#include "front_stablizer.h"
 #include "math_defs.h"
 #include "opthelpers.h"
 
diff --git a/alc/bformatdec.cpp b/core/bformatdec.cpp
index e29af045..6bf85ec9 100644
--- a/alc/bformatdec.cpp
+++ b/core/bformatdec.cpp
@@ -9,11 +9,11 @@
 #include <utility>
 
 #include "almalloc.h"
-#include "core/ambdec.h"
-#include "core/filters/splitter.h"
-#include "core/mixer.h"
+#include "ambdec.h"
+#include "filters/splitter.h"
 #include "front_stablizer.h"
 #include "math_defs.h"
+#include "mixer.h"
 #include "opthelpers.h"
 
 
diff --git a/alc/bformatdec.h b/core/bformatdec.h
index bb39f709..a0ae3f27 100644
--- a/alc/bformatdec.h
+++ b/core/bformatdec.h
@@ -1,5 +1,5 @@
-#ifndef BFORMATDEC_H
-#define BFORMATDEC_H
+#ifndef CORE_BFORMATDEC_H
+#define CORE_BFORMATDEC_H
 
 #include <array>
 #include <cstddef>
@@ -7,10 +7,10 @@
 
 #include "almalloc.h"
 #include "alspan.h"
-#include "core/ambidefs.h"
-#include "core/bufferline.h"
-#include "core/devformat.h"
-#include "core/filters/splitter.h"
+#include "ambidefs.h"
+#include "bufferline.h"
+#include "devformat.h"
+#include "filters/splitter.h"
 
 struct AmbDecConf;
 struct FrontStablizer;
@@ -68,4 +68,4 @@ public:
     DEF_FAM_NEWDEL(BFormatDec, mChannelDec)
 };
 
-#endif /* BFORMATDEC_H */
+#endif /* CORE_BFORMATDEC_H */
diff --git a/alc/front_stablizer.h b/core/front_stablizer.h
index 0fedeb50..3d328a8d 100644
--- a/alc/front_stablizer.h
+++ b/core/front_stablizer.h
@@ -1,12 +1,12 @@
-#ifndef ALC_FRONT_STABLIZER_H
-#define ALC_FRONT_STABLIZER_H
+#ifndef CORE_FRONT_STABLIZER_H
+#define CORE_FRONT_STABLIZER_H
 
 #include <array>
 #include <memory>
 
 #include "almalloc.h"
-#include "core/bufferline.h"
-#include "core/filters/splitter.h"
+#include "bufferline.h"
+#include "filters/splitter.h"
 
 
 struct FrontStablizer {
@@ -33,4 +33,4 @@ struct FrontStablizer {
     DEF_FAM_NEWDEL(FrontStablizer, DelayBuf)
 };
 
-#endif /* ALC_FRONT_STABLIZER_H */
+#endif /* CORE_FRONT_STABLIZER_H */