1 files changed, 30 insertions, 14 deletions

diff --git a/quantum/quantum.h b/quantum/quantum.h
index f4d8f09d4..d4da77289 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -13,9 +13,12 @@
   #include "audio.h"
 #endif
 #ifdef MIDI_ENABLE
-        // #include <keymap_midi.h>
         #include <lufa.h>
 #endif
+#ifdef UNICODE_ENABLE
+        #include "unicode.h"
+#endif
+
 #include "action_layer.h"
 #include "eeconfig.h"
 #include <stddef.h>
@@ -27,24 +30,37 @@ extern uint32_t default_layer_state;
         extern uint32_t layer_state;
 #endif
 
-bool music_activated;
+#ifdef AUDIO_ENABLE
+        bool music_activated;
+#endif
 
-void matrix_init_kb(void);
-void matrix_scan_kb(void);
-bool process_action_kb(keyrecord_t *record);
+#ifdef UNICODE_ENABLE
+        #define UC_OSX 0
+        #define UC_LNX 1
+        #define UC_WIN 2
+        #define UC_BSD 3
 
-void leader_start(void);
-void leader_end(void);
+        void set_unicode_input_mode(uint8_t os_target);
+#endif
+
+#ifndef DISABLE_LEADER
+        void leader_start(void);
+        void leader_end(void);
+
+        #ifndef LEADER_TIMEOUT
+                #define LEADER_TIMEOUT 200
+        #endif
+        #define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0)
+        #define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0)
+        #define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3))
 
-#ifndef LEADER_TIMEOUT
-        #define LEADER_TIMEOUT 200
+        #define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[3]; extern uint8_t leader_sequence_size
+        #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
 #endif
-#define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0)
-#define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0)
-#define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3))
 
-#define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[3]; extern uint8_t leader_sequence_size
-#define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
+void matrix_init_kb(void);
+void matrix_scan_kb(void);
+bool process_action_kb(keyrecord_t *record);
 
 bool is_music_on(void);
 void music_toggle(void);