diff --git a/Makefile b/Makefile
index ca174e93f203..5abb4d651990 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ endif
 
 ifeq ($(strip $(UNICODE_ENABLE)), yes)
     OPT_DEFS += -DUNICODE_ENABLE
-	SRC += $(QUANTUM_DIR)/process_keycode/process_music.c
+	SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c
 endif
 
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 1287b01e6331..a84b5a1b0e44 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -10,15 +10,6 @@
 #ifdef RGBLIGHT_ENABLE
   #include "rgblight.h"
 #endif
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#ifdef MIDI_ENABLE
-	#include <lufa.h>
-#endif
-#ifdef UNICODE_ENABLE
-	#include "unicode.h"
-#endif
 
 #include "action_layer.h"
 #include "eeconfig.h"
@@ -40,10 +31,12 @@ extern uint32_t default_layer_state;
 #endif
 
 #ifdef MIDI_ENABLE
+	#include <lufa.h>
 	#include "process_midi.h"
 #endif
 
 #ifdef AUDIO_ENABLE
+ 	#include "audio.h"
 	#include "process_music.h"
 #endif