af678521c1d786fe5578f82c2f671f5553b08dfe

 1diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
 2index 7f07be5144d2adfa5253aace5b62b4c7cf635d1c..8814d8b0f921e35d2aefbcff4f1d9eaed6572b9b 100644
 3--- a/builddefs/common_features.mk
 4+++ b/builddefs/common_features.mk
 5@@ -64,6 +64,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
 6         OPT_DEFS += -DAUDIO_DRIVER_PWM
 7     endif
 8     OPT_DEFS += -DAUDIO_ENABLE
 9+    COMMON_VPATH += $(QUANTUM_PATH)/audio
10     MUSIC_ENABLE = yes
11     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
12     SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
13diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
14index 54a2b45840bfe0c4fa1833822ef875a8cfb8eed5..6f61d6e2e203685f0bbbb5bb3ceed169215e0ef3 100644
15--- a/keyboards/lfkeyboards/lfk78/lfk78.c
16+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
17@@ -2,11 +2,14 @@
18 
19 #include <avr/timer_avr.h>
20 #include <avr/wdt.h>
21-#include "audio.h"
22 #include "issi.h"
23 #include "TWIlib.h"
24 #include "lighting.h"
25 
26+#ifdef AUDIO_ENABLE
27+#    include "audio.h"
28+#endif
29+
30 uint16_t click_hz = CLICK_HZ;
31 uint16_t click_time = CLICK_MS;
32 uint8_t click_toggle = CLICK_ENABLED;
33diff --git a/keyboards/lfkeyboards/lighting.c b/keyboards/lfkeyboards/lighting.c
34index dcc5c402348c71efd7e8216ffef3b376e8b762d6..f4940ec079cd929b5ee6a4a6357104557b386404 100644
35--- a/keyboards/lfkeyboards/lighting.c
36+++ b/keyboards/lfkeyboards/lighting.c
37@@ -11,7 +11,6 @@
38 #include "lighting.h"
39 #include "debug.h"
40 #include "rgblight.h"
41-#include "audio.h"
42 
43 
44 extern rgblight_config_t rgblight_config; // Declared in rgblight.c
45diff --git a/paths.mk b/paths.mk
46index 85ccfa07964bc1442b0d8ca8b7511c9fc0461265..99df2e9d6ee4a2c09b5325784a48a87e2a818015 100644
47--- a/paths.mk
48+++ b/paths.mk
49@@ -27,7 +27,6 @@ COMMON_VPATH := $(TOP_DIR)
50 COMMON_VPATH += $(TMK_PATH)
51 COMMON_VPATH += $(QUANTUM_PATH)
52 COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
53-COMMON_VPATH += $(QUANTUM_PATH)/audio
54 COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
55 COMMON_VPATH += $(QUANTUM_PATH)/sequencer
56 COMMON_VPATH += $(DRIVER_PATH)
57diff --git a/quantum/config_common.h b/quantum/config_common.h
58index d93477b27e03de2bd7a4c9c3ec4cfe56a98bd24f..6ab8a2aa7db3be10ff2786920901b8fee9694e22 100644
59--- a/quantum/config_common.h
60+++ b/quantum/config_common.h
61@@ -24,4 +24,6 @@
62 #define COL2ROW 0
63 #define ROW2COL 1
64 
65-#include "song_list.h"
66+#ifdef AUDIO_ENABLE
67+#    include "song_list.h"
68+#endif
69diff --git a/quantum/unicode/unicode.c b/quantum/unicode/unicode.c
70index 3f934c9277f29ebeeddd31e7d3ed3de2414b5169..e2bfd68a3ae585059c931414c3abce4f1d47e13d 100644
71--- a/quantum/unicode/unicode.c
72+++ b/quantum/unicode/unicode.c
73@@ -23,10 +23,13 @@
74 #include "host.h"
75 #include "keycode.h"
76 #include "wait.h"
77-#include "audio.h"
78 #include "send_string.h"
79 #include "utf8.h"
80 
81+#if defined(AUDIO_ENABLE)
82+#    include "audio.h"
83+#endif
84+
85 #if defined(UNICODE_ENABLE) + defined(UNICODEMAP_ENABLE) + defined(UCIS_ENABLE) > 1
86 #    error "Cannot enable more than one Unicode method (UNICODE, UNICODEMAP, UCIS) at the same time"
87 #endif