diff --git a/src/fido/cbor.c b/src/fido/cbor.c
index c823f29..aebc662 100644
--- a/src/fido/cbor.c
+++ b/src/fido/cbor.c
@@ -15,13 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
 #include "pico/stdlib.h"
-#include "ctap2_cbor.h"
 #include "ctap.h"
-#include "ctap_hid.h"
 #include "fido.h"
-#include "hsm.h"
 #include "usb.h"
 #include "apdu.h"
 
diff --git a/src/fido/cbor_config.c b/src/fido/cbor_config.c
index 7df0ba5..2029748 100644
--- a/src/fido/cbor_config.c
+++ b/src/fido/cbor_config.c
@@ -15,11 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
 #include "ctap2_cbor.h"
 #include "fido.h"
 #include "ctap.h"
-#include "bsp/board.h"
 #include "files.h"
 #include "apdu.h"
 #include "credential.h"
diff --git a/src/fido/cbor_cred_mgmt.c b/src/fido/cbor_cred_mgmt.c
index 07dc6e3..e43a749 100644
--- a/src/fido/cbor_cred_mgmt.c
+++ b/src/fido/cbor_cred_mgmt.c
@@ -15,10 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ctap2_cbor.h"
 #include "fido.h"
 #include "ctap.h"
-#include "bsp/board.h"
 #include "cbor_make_credential.h"
 #include "files.h"
 #include "apdu.h"
diff --git a/src/fido/cbor_get_assertion.c b/src/fido/cbor_get_assertion.c
index 7f9059c..b7b589a 100644
--- a/src/fido/cbor_get_assertion.c
+++ b/src/fido/cbor_get_assertion.c
@@ -17,17 +17,16 @@
 
 #include "cbor.h"
 #include "ctap.h"
-#include "ctap2_cbor.h"
 #include "bsp/board.h"
 #include "fido.h"
 #include "files.h"
-#include "random.h"
 #include "crypto_utils.h"
 #include "hsm.h"
 #include "apdu.h"
 #include "cbor_make_credential.h"
 #include "credential.h"
-#include <math.h>
+#include "mbedtls/sha256.h"
+#include "random.h"
 
 int cbor_get_assertion(const uint8_t *data, size_t len, bool next);
 
diff --git a/src/fido/cbor_large_blobs.c b/src/fido/cbor_large_blobs.c
index ed2ec46..24b685b 100644
--- a/src/fido/cbor_large_blobs.c
+++ b/src/fido/cbor_large_blobs.c
@@ -20,7 +20,6 @@
 #include "ctap.h"
 #include "files.h"
 #include "apdu.h"
-#include "version.h"
 #include "hsm.h"
 #include "mbedtls/sha256.h"
 
diff --git a/src/fido/cbor_make_credential.c b/src/fido/cbor_make_credential.c
index ebe03fe..d2ffa40 100644
--- a/src/fido/cbor_make_credential.c
+++ b/src/fido/cbor_make_credential.c
@@ -15,17 +15,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
-#include "ctap2_cbor.h"
 #include "cbor_make_credential.h"
+#include "ctap2_cbor.h"
 #include "fido.h"
 #include "ctap.h"
 #include "files.h"
-#include "random.h"
-#include "hsm.h"
-#include <math.h>
 #include "apdu.h"
 #include "credential.h"
+#include "mbedtls/sha256.h"
+#include "random.h"
 
 int cbor_make_credential(const uint8_t *data, size_t len) {
     CborParser parser;
diff --git a/src/fido/cbor_make_credential.h b/src/fido/cbor_make_credential.h
index 52b3704..cb74cd5 100644
--- a/src/fido/cbor_make_credential.h
+++ b/src/fido/cbor_make_credential.h
@@ -18,13 +18,7 @@
 #ifndef _CBOR_MAKE_CREDENTIAL_H_
 #define _CBOR_MAKE_CREDENTIAL_H_
 
-#include "common.h"
-#include "mbedtls/chachapoly.h"
-#include <stdlib.h>
-#include "pico/stdlib.h"
 #include "ctap2_cbor.h"
-#include "random.h"
-#include "mbedtls/sha256.h"
 
 typedef struct PublicKeyCredentialEntity
 {
diff --git a/src/fido/cbor_reset.c b/src/fido/cbor_reset.c
index 8835ada..586d0a8 100644
--- a/src/fido/cbor_reset.c
+++ b/src/fido/cbor_reset.c
@@ -16,10 +16,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ctap2_cbor.h"
 #include "file.h"
 #include "fido.h"
-#include "apdu.h"
 #include "ctap.h"
 #include "bsp/board.h"
 
diff --git a/src/fido/cbor_selection.c b/src/fido/cbor_selection.c
index 3e23a9c..9887474 100644
--- a/src/fido/cbor_selection.c
+++ b/src/fido/cbor_selection.c
@@ -16,10 +16,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ctap2_cbor.h"
 #include "fido.h"
 #include "ctap.h"
-#include "bsp/board.h"
 
 int cbor_selection() {
     if (wait_button_pressed() == true)
diff --git a/src/fido/cbor_vendor.c b/src/fido/cbor_vendor.c
index 0252d1b..5039caf 100644
--- a/src/fido/cbor_vendor.c
+++ b/src/fido/cbor_vendor.c
@@ -15,7 +15,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
 #include "ctap2_cbor.h"
 #include "fido.h"
 #include "ctap.h"
diff --git a/src/fido/cmd_authenticate.c b/src/fido/cmd_authenticate.c
index 647f5b6..1405cbe 100644
--- a/src/fido/cmd_authenticate.c
+++ b/src/fido/cmd_authenticate.c
@@ -19,7 +19,6 @@
 #include "hsm.h"
 #include "apdu.h"
 #include "ctap.h"
-#include "mbedtls/ecdsa.h"
 #include "random.h"
 #include "files.h"
 #include "credential.h"
diff --git a/src/fido/cmd_register.c b/src/fido/cmd_register.c
index dd1fed1..432132c 100644
--- a/src/fido/cmd_register.c
+++ b/src/fido/cmd_register.c
@@ -19,7 +19,6 @@
 #include "hsm.h"
 #include "apdu.h"
 #include "ctap.h"
-#include "mbedtls/ecdsa.h"
 #include "random.h"
 #include "files.h"
 
diff --git a/src/fido/cmd_version.c b/src/fido/cmd_version.c
index 5bff13d..6a3b132 100644
--- a/src/fido/cmd_version.c
+++ b/src/fido/cmd_version.c
@@ -15,7 +15,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
 #include "apdu.h"
 #include "hsm.h"
 
diff --git a/src/fido/credential.c b/src/fido/credential.c
index dbc9fc1..bfe7a30 100644
--- a/src/fido/credential.c
+++ b/src/fido/credential.c
@@ -15,7 +15,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
 #include "mbedtls/chachapoly.h"
 #include "mbedtls/sha256.h"
 #include "credential.h"
@@ -24,7 +23,6 @@
 #include "ctap.h"
 #include "random.h"
 #include "files.h"
-#include "file.h"
 #include "hsm.h"
 
 int credential_derive_chacha_key(uint8_t *outk);
diff --git a/src/fido/ctap2_cbor.h b/src/fido/ctap2_cbor.h
index de632c6..81a4d67 100644
--- a/src/fido/ctap2_cbor.h
+++ b/src/fido/ctap2_cbor.h
@@ -18,9 +18,6 @@
 #ifndef _CTAP2_CBOR_H_
 #define _CTAP2_CBOR_H_
 
-#include <stdlib.h>
-#include "pico/stdlib.h"
-#include <stdio.h>
 #include "cbor.h"
 
 extern uint8_t *driver_prepare_response();
diff --git a/src/fido/fido.c b/src/fido/fido.c
index 49d0080..c9e42f5 100644
--- a/src/fido/fido.c
+++ b/src/fido/fido.c
@@ -15,26 +15,19 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
 #include "fido.h"
 #include "hsm.h"
 #include "apdu.h"
 #include "ctap.h"
 #include "files.h"
-#include "file.h"
 #include "usb.h"
 #include "random.h"
-#include "bsp/board.h"
-#include "mbedtls/ecdsa.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/hkdf.h"
-#include "pk_wrap.h"
-#include "crypto_utils.h"
 #ifdef USB_ITF_CCID
 #include "ccid.h"
 #endif
 #include <math.h>
-#include <stdio.h>
 
 int fido_process_apdu();
 int fido_unload();
diff --git a/src/fido/fido.h b/src/fido/fido.h
index b3d2316..8230cb9 100644
--- a/src/fido/fido.h
+++ b/src/fido/fido.h
@@ -18,7 +18,6 @@
 #ifndef _FIDO_H_
 #define _FIDO_H_
 
-#include <stdlib.h>
 #include "pico/stdlib.h"
 #include "common.h"
 #include "mbedtls/ecdsa.h"
diff --git a/src/fido/files.c b/src/fido/files.c
index fe917da..2c09f30 100644
--- a/src/fido/files.c
+++ b/src/fido/files.c
@@ -15,7 +15,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "file.h"
 #include "files.h"
 
 file_t file_entries[] = {
diff --git a/src/fido/known_apps.c b/src/fido/known_apps.c
index 2061962..04bcf08 100644
--- a/src/fido/known_apps.c
+++ b/src/fido/known_apps.c
@@ -15,7 +15,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
 #include "fido.h"
 #include "ctap2_cbor.h"
 
diff --git a/src/fido/oath.c b/src/fido/oath.c
index cf1f929..67ea75e 100644
--- a/src/fido/oath.c
+++ b/src/fido/oath.c
@@ -15,27 +15,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
 #include "fido.h"
 #include "hsm.h"
 #include "apdu.h"
-#include "ctap.h"
 #include "files.h"
-#include "file.h"
-#include "usb.h"
 #include "random.h"
-#include "bsp/board.h"
-#include "mbedtls/ecdsa.h"
-#include "mbedtls/x509_crt.h"
-#include "mbedtls/hkdf.h"
-#include "pk_wrap.h"
-#include "crypto_utils.h"
-#ifdef USB_ITF_CCID
-#include "ccid.h"
-#endif
 #include "version.h"
 #include "asn1.h"
-#include <stdio.h>
 
 #define MAX_OATH_CRED   255
 #define CHALLENGE_LEN   8