diff --git a/fido2/ctap.c b/fido2/ctap.c
index 585a964..ccdc0cb 100644
--- a/fido2/ctap.c
+++ b/fido2/ctap.c
@@ -19,7 +19,6 @@
 #include "crypto.h"
 #include "util.h"
 #include "log.h"
-#include "nfc.h"
 #include "device.h"
 #include APP_CONFIG
 #include "wallet.h"
diff --git a/fido2/device.h b/fido2/device.h
index 46a8e20..75af9de 100644
--- a/fido2/device.h
+++ b/fido2/device.h
@@ -99,7 +99,10 @@ typedef enum {
 // 2: fastest clock rate.  Generally for USB interface.
 void device_set_clock_rate(DEVICE_CLOCK_RATE param);
 
-// Returns NFC_IS_NA (0), NFC_IS_ACTIVE (1), or NFC_IS_AVAILABLE (2)
+// Returns NFC_IS_NA, NFC_IS_ACTIVE, or NFC_IS_AVAILABLE
+#define NFC_IS_NA        0
+#define NFC_IS_ACTIVE    1
+#define NFC_IS_AVAILABLE 2
 int device_is_nfc();
 
 void device_init_button();
diff --git a/pc/device.c b/pc/device.c
index 3f2265d..f267e16 100644
--- a/pc/device.c
+++ b/pc/device.c
@@ -624,7 +624,7 @@ void device_wink()
     printf("*WINK*\n");
 }
 
-bool device_is_nfc()
+int device_is_nfc()
 {
     return 0;
 }
diff --git a/targets/stm32l432/src/nfc.h b/targets/stm32l432/src/nfc.h
index 86f64d2..9871537 100644
--- a/targets/stm32l432/src/nfc.h
+++ b/targets/stm32l432/src/nfc.h
@@ -10,10 +10,6 @@ int nfc_loop();
 
 int nfc_init();
 
-#define NFC_IS_NA        0
-#define NFC_IS_ACTIVE    1
-#define NFC_IS_AVAILABLE 2
-
 typedef struct
 {
     uint8_t cclen_hi;