diff --git a/features/nfc/stack/transceiver/pn512/pn512.c b/features/nfc/stack/transceiver/pn512/pn512.c
index bff68ed2e3..e2eb348cf5 100644
--- a/features/nfc/stack/transceiver/pn512/pn512.c
+++ b/features/nfc/stack/transceiver/pn512/pn512.c
@@ -211,7 +211,7 @@ void pn512_poll(nfc_transceiver_t *pTransceiver)
 {
     pn512_t *pPN512 = (pn512_t *) pTransceiver;
     pPN512->nextFrameMode = pn512_transceive_mode_transceive;
-    return pn512_poll_hw(pPN512, pn512_transceiver_callback);
+    pn512_poll_hw(pPN512, pn512_transceiver_callback);
 }
 
 void pn512_set_crc(nfc_transceiver_t *pTransceiver, bool crc_out, bool crc_in)
diff --git a/features/nfc/stack/transceiver/pn512/pn512.h b/features/nfc/stack/transceiver/pn512/pn512.h
index 6116b6e2e6..122f0db5eb 100644
--- a/features/nfc/stack/transceiver/pn512/pn512.h
+++ b/features/nfc/stack/transceiver/pn512/pn512.h
@@ -52,7 +52,7 @@ typedef enum __pn512_transceive_mode {
     pn512_transceive_mode_receive,
 } pn512_transceive_mode_t;
 
-typedef struct __pn512 {
+struct __pn512 {
     nfc_transceiver_t transceiver;
     //Impl specific
     pn512_registers_t registers;
@@ -142,7 +142,7 @@ typedef struct __pn512 {
         } anticollision;
     };
 
-} pn512_t;
+};
 
 nfc_err_t pn512_init(pn512_t *pPN512, nfc_transport_t *pTransport, nfc_scheduler_timer_t *pTimer);
 
diff --git a/features/nfc/stack/transceiver/pn512/pn512_rf.h b/features/nfc/stack/transceiver/pn512/pn512_rf.h
index a781e7053f..93043e9981 100644
--- a/features/nfc/stack/transceiver/pn512/pn512_rf.h
+++ b/features/nfc/stack/transceiver/pn512/pn512_rf.h
@@ -30,7 +30,6 @@ extern "C" {
 #include "stack/nfc_common.h"
 #include "pn512_callback.h"
 #include "pn512.h"
-#include "pn512_rf.h"
 
 typedef struct __pn512 pn512_t;