diff --git a/features/nfc/controllers/PN512Driver.h b/features/nfc/controllers/PN512Driver.h
index 0e4f33213e..1af39e350c 100644
--- a/features/nfc/controllers/PN512Driver.h
+++ b/features/nfc/controllers/PN512Driver.h
@@ -30,7 +30,6 @@
 namespace mbed {
 namespace nfc {
 
-struct PN512TransportDriver;
 class PN512Driver : public NFCControllerDriver, private PN512TransportDriver::Delegate {
 public:
     PN512Driver(PN512TransportDriver *transport_driver);
diff --git a/features/nfc/nfc/NFCController.h b/features/nfc/nfc/NFCController.h
index 83dd4cd53e..a4a3362f74 100644
--- a/features/nfc/nfc/NFCController.h
+++ b/features/nfc/nfc/NFCController.h
@@ -149,10 +149,11 @@ public:
     nfc_err_t cancel_discovery();
 
 private:
+    // These two classes need to be friends to access the following transceiver() method
     friend class NFCRemoteEndpoint;
-    friend class NFCRemoteInitiator;
     friend class Type4RemoteInitiator;
     nfc_transceiver_t *transceiver() const;
+
     void polling_callback(nfc_err_t ret);
 
     // NFC Stack scheduler
diff --git a/features/nfc/nfc/NFCDefinitions.h b/features/nfc/nfc/NFCDefinitions.h
index bf4c037f5e..0c1d3cedee 100644
--- a/features/nfc/nfc/NFCDefinitions.h
+++ b/features/nfc/nfc/NFCDefinitions.h
@@ -18,6 +18,8 @@
 #define MBED_NFC_DEFINITIONS_H
 
 #include <stdint.h>
+#include <stdbool.h>
+
 #include "stack/nfc_errors.h"
 
 #include "acore/ac_buffer.h"
@@ -25,19 +27,19 @@
 namespace mbed {
 namespace nfc {
 struct nfc_rf_protocols_bitmask_t {
-    uint8_t initiator_t1t : 1;
-    uint8_t initiator_t2t : 1;
-    uint8_t initiator_t3t : 1;
-    uint8_t initiator_iso_dep : 1;
-    uint8_t initiator_nfc_dep : 1;
-    uint8_t initiator_t5t : 1;
+    bool initiator_t1t : 1;
+    bool initiator_t2t : 1;
+    bool initiator_t3t : 1;
+    bool initiator_iso_dep : 1;
+    bool initiator_nfc_dep : 1;
+    bool initiator_t5t : 1;
 
-    uint8_t target_t1t : 1;
-    uint8_t target_t2t : 1;
-    uint8_t target_t3t : 1;
-    uint8_t target_iso_dep : 1;
-    uint8_t target_nfc_dep : 1;
-    uint8_t target_t5t : 1;
+    bool target_t1t : 1;
+    bool target_t2t : 1;
+    bool target_t3t : 1;
+    bool target_iso_dep : 1;
+    bool target_nfc_dep : 1;
+    bool target_t5t : 1;
 };
 
 enum nfc_tag_type_t {