diff --git a/common_features.mk b/common_features.mk
index 8b5ee071d774..98cf129d8521 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -82,7 +82,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
     SRC += $(QUANTUM_DIR)/audio/audio.c ## common audio code, hardware agnostic
-    SRC += $(QUANTUM_DIR)/audio/driver_$(PLATFORM_KEY)_$(strip $(AUDIO_DRIVER)).c
+    SRC += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/audio_$(strip $(AUDIO_DRIVER)).c
     SRC += $(QUANTUM_DIR)/audio/voices.c
     SRC += $(QUANTUM_DIR)/audio/luts.c
 endif
diff --git a/quantum/audio/driver_avr_pwm.h b/platforms/avr/drivers/audio_pwm.h
similarity index 100%
rename from quantum/audio/driver_avr_pwm.h
rename to platforms/avr/drivers/audio_pwm.h
diff --git a/quantum/audio/driver_avr_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
similarity index 100%
rename from quantum/audio/driver_avr_pwm_hardware.c
rename to platforms/avr/drivers/audio_pwm_hardware.c
diff --git a/quantum/audio/driver_chibios_dac.h b/platforms/chibios/drivers/audio_dac.h
similarity index 100%
rename from quantum/audio/driver_chibios_dac.h
rename to platforms/chibios/drivers/audio_dac.h
diff --git a/quantum/audio/driver_chibios_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
similarity index 100%
rename from quantum/audio/driver_chibios_dac_additive.c
rename to platforms/chibios/drivers/audio_dac_additive.c
diff --git a/quantum/audio/driver_chibios_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
similarity index 100%
rename from quantum/audio/driver_chibios_dac_basic.c
rename to platforms/chibios/drivers/audio_dac_basic.c
diff --git a/quantum/audio/driver_chibios_pwm.h b/platforms/chibios/drivers/audio_pwm.h
similarity index 100%
rename from quantum/audio/driver_chibios_pwm.h
rename to platforms/chibios/drivers/audio_pwm.h
diff --git a/quantum/audio/driver_chibios_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
similarity index 100%
rename from quantum/audio/driver_chibios_pwm_hardware.c
rename to platforms/chibios/drivers/audio_pwm_hardware.c
diff --git a/quantum/audio/driver_chibios_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c
similarity index 100%
rename from quantum/audio/driver_chibios_pwm_software.c
rename to platforms/chibios/drivers/audio_pwm_software.c
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 56b9158a1a03..290d461f5a16 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -26,17 +26,12 @@
 
 #if defined(__AVR__)
 #    include <avr/io.h>
-#    if defined(AUDIO_DRIVER_PWM)
-#        include "driver_avr_pwm.h"
-#    endif
 #endif
 
-#if defined(PROTOCOL_CHIBIOS)
-#    if defined(AUDIO_DRIVER_PWM)
-#        include "driver_chibios_pwm.h"
-#    elif defined(AUDIO_DRIVER_DAC)
-#        include "driver_chibios_dac.h"
-#    endif
+#if defined(AUDIO_DRIVER_PWM)
+#    include "audio_pwm.h"
+#elif defined(AUDIO_DRIVER_DAC)
+#    include "audio_dac.h"
 #endif
 
 typedef union {