diff --git a/sys/Makefile.dep b/sys/Makefile.dep
index 71094649ca..e04fb4e391 100644
--- a/sys/Makefile.dep
+++ b/sys/Makefile.dep
@@ -745,33 +745,7 @@ ifneq (,$(filter dbgpin,$(USEMODULE)))
   FEATURES_REQUIRED += dbgpin
 endif
 
-ifneq (,$(filter fido2_ctap_%,$(USEMODULE)))
-  USEMODULE += fido2_ctap_transport
-  USEMODULE += fido2_ctap
-  ifneq (,$(filter fido2_ctap_transport_hid,$(USEMODULE)))
-      USEMODULE += ztimer64_msec
-      USEMODULE += usbus_hid
-      DISABLE_MODULE += auto_init_usbus
-  endif
-endif
-
-ifneq (,$(filter fido2_ctap,$(USEMODULE)))
-  FEATURES_REQUIRED += periph_flashpage
-  FEATURES_REQUIRED += periph_flashpage_in_address_space
-  FEATURES_REQUIRED += periph_gpio_irq
-
-  USEPKG += tiny-asn1
-  USEPKG += tinycbor
-  USEPKG += micro-ecc
-
-  USEMODULE += mtd_flashpage
-  USEMODULE += mtd_write_page
-  USEMODULE += ztimer_msec
-  USEMODULE += event
-  USEMODULE += event_timeout_ztimer
-  USEMODULE += cipher_modes
-  USEMODULE += crypto_aes_256
-  USEMODULE += hashes
+ifneq (,$(filter fido2_ctap%,$(USEMODULE)))
   USEMODULE += fido2
 endif
 
diff --git a/sys/fido2/Makefile.dep b/sys/fido2/Makefile.dep
new file mode 100644
index 0000000000..6164ad235c
--- /dev/null
+++ b/sys/fido2/Makefile.dep
@@ -0,0 +1,29 @@
+ifneq (,$(filter fido2_ctap_%,$(USEMODULE)))
+  USEMODULE += fido2_ctap_transport
+  USEMODULE += fido2_ctap
+  ifneq (,$(filter fido2_ctap_transport_hid,$(USEMODULE)))
+      USEMODULE += ztimer64_msec
+      USEMODULE += usbus_hid
+      DISABLE_MODULE += auto_init_usbus
+  endif
+endif
+
+ifneq (,$(filter fido2_ctap,$(USEMODULE)))
+  FEATURES_REQUIRED += periph_flashpage
+  FEATURES_REQUIRED += periph_flashpage_in_address_space
+  FEATURES_REQUIRED += periph_gpio_irq
+
+  USEPKG += tiny-asn1
+  USEPKG += tinycbor
+  USEPKG += micro-ecc
+
+  USEMODULE += mtd_flashpage
+  USEMODULE += mtd_write_page
+  USEMODULE += ztimer_msec
+  USEMODULE += event
+  USEMODULE += event_timeout_ztimer
+  USEMODULE += cipher_modes
+  USEMODULE += crypto_aes_256
+  USEMODULE += hashes
+  USEMODULE += fido2
+endif