diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index bd7132b507..4988637b10 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -655,11 +655,6 @@ ifeq ($(strip $(VIALRGB_ENABLE)), yes)
     OPT_DEFS += -DVIALRGB_ENABLE
 endif
 
-ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes)
-    OPT_DEFS += -DDYNAMIC_KEYMAP_ENABLE
-    SRC += $(QUANTUM_DIR)/dynamic_keymap.c
-endif
-
 ifeq ($(strip $(QMK_SETTINGS)), yes)
     AUTO_SHIFT_ENABLE := yes
     SRC += $(QUANTUM_DIR)/qmk_settings.c
@@ -669,11 +664,6 @@ ifeq ($(strip $(QMK_SETTINGS)), yes)
         -DCOMBO_TERM_PER_COMBO
 endif
 
-ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
-    OPT_DEFS += -DDIP_SWITCH_ENABLE
-    SRC += $(QUANTUM_DIR)/dip_switch.c
-endif
-
 VALID_MAGIC_TYPES := yes
 BOOTMAGIC_ENABLE ?= no
 ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)