diff --git a/common_features.mk b/common_features.mk
index 250cf61cf5..f0e302f801 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -203,12 +203,16 @@ ifeq ($(strip $(HD44780_ENABLE)), yes)
 	OPT_DEFS += -DHD44780_ENABLE
 endif
 
+ifeq ($(strip $(VELOCIKEY_ENABLE)), yes)
+    OPT_DEFS += -DVELOCIKEY_ENABLE
+    SRC += $(QUANTUM_DIR)/velocikey.c
+endif
+
 QUANTUM_SRC:= \
     $(QUANTUM_DIR)/quantum.c \
     $(QUANTUM_DIR)/keymap_common.c \
     $(QUANTUM_DIR)/keycode_config.c \
-    $(QUANTUM_DIR)/process_keycode/process_leader.c \
-    $(QUANTUM_DIR)/velocikey.c
+    $(QUANTUM_DIR)/process_keycode/process_leader.c
 
 ifndef CUSTOM_MATRIX
     ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 32f5f29267..8a4344986d 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -198,7 +198,9 @@ bool process_record_quantum(keyrecord_t *record) {
   keypos_t key = record->event.key;
   uint16_t keycode;
 
+#ifdef VELOCIKEY_ENABLE
   if (velocikey_enabled()) velocikey_accelerate();
+#endif
 
   #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS)
     /* TODO: Use store_or_get_action() or a similar function. */
@@ -520,11 +522,13 @@ bool process_record_quantum(keyrecord_t *record) {
     }
     return false;
   #endif // defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-  case VLK_TOG:
-    if (record->event.pressed) {
-      velocikey_toggle();
-    }
-    return false;
+  #ifdef VELOCIKEY_ENABLE
+    case VLK_TOG:
+      if (record->event.pressed) {
+        velocikey_toggle();
+      }
+      return false;
+  #endif
   #ifdef PROTOCOL_LUFA
     case OUT_AUTO:
       if (record->event.pressed) {
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index d3eb283f80..0cb08b14d2 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -606,9 +606,11 @@ void rgblight_effect_breathing(uint8_t interval) {
   static uint16_t last_timer = 0;
   float val;
 
-  uint8_t interval_time = velocikey_enabled()
-    ? velocikey_match_speed(1, 100) 
-    : pgm_read_byte(&RGBLED_RAINBOW_SWIRL_INTERVALS[interval / 2]);
+  uint8_t interval_time = 
+#ifdef VELOCIKEY_ENABLE
+    velocikey_enabled() ? velocikey_match_speed(1, 100) :
+#endif
+    pgm_read_byte(&RGBLED_RAINBOW_SWIRL_INTERVALS[interval / 2]);
   
   if (timer_elapsed(last_timer) < interval_time) {
     return;
@@ -625,9 +627,11 @@ void rgblight_effect_rainbow_mood(uint8_t interval) {
   static uint16_t current_hue = 0;
   static uint16_t last_timer = 0;
 
-  uint8_t interval_time = velocikey_enabled()
-    ? velocikey_match_speed(5, 100)
-    : pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval]);
+  uint8_t interval_time = 
+#ifdef VELOCIKEY_ENABLE
+    velocikey_enabled() ? velocikey_match_speed(5, 100) :
+#endif
+    pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval]);
 
   if (timer_elapsed(last_timer) < interval_time) {
     return;
@@ -642,9 +646,11 @@ void rgblight_effect_rainbow_swirl(uint8_t interval) {
   uint16_t hue;
   uint8_t i;
 
-  uint8_t interval_time = velocikey_enabled()
-    ? velocikey_match_speed(1, 100)
-    : pgm_read_byte(&RGBLED_RAINBOW_SWIRL_INTERVALS[interval / 2]);
+  uint8_t interval_time = 
+#ifdef VELOCIKEY_ENABLE
+    velocikey_enabled() ? velocikey_match_speed(1, 100) : 
+#endif
+    pgm_read_byte(&RGBLED_RAINBOW_SWIRL_INTERVALS[interval / 2]);
 
   if (timer_elapsed(last_timer) < interval_time) {
     return;
@@ -676,9 +682,11 @@ void rgblight_effect_snake(uint8_t interval) {
     increment = -1;
   }
 
-  uint8_t interval_time = velocikey_enabled()
-    ? velocikey_match_speed(1, 200)
-    : pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval / 2]);
+  uint8_t interval_time = 
+#ifdef VELOCIKEY_ENABLE
+    velocikey_enabled() ? velocikey_match_speed(1, 200) :
+#endif
+    pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval / 2]);
 
   if (timer_elapsed(last_timer) < interval_time) {
     return;
@@ -712,9 +720,11 @@ void rgblight_effect_snake(uint8_t interval) {
 void rgblight_effect_knight(uint8_t interval) {
   static uint16_t last_timer = 0;
 
-  uint8_t interval_time = velocikey_enabled()
-    ? velocikey_match_speed(5, 100)
-    : pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval]);
+  uint8_t interval_time = 
+#ifdef VELOCIKEY_ENABLE
+    velocikey_enabled() ? velocikey_match_speed(5, 100) :
+#endif
+    pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval]);
 
   if (timer_elapsed(last_timer) < interval_time) {
     return;
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index fd9595c447..b93afaaa51 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1075,7 +1075,9 @@ int main(void)
         MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
 
+#ifdef VELOCIKEY_ENABLE
     if (velocikey_enabled()) velocikey_decay_task();    
+#endif
 
 #if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
         rgblight_task();