diff --git a/connectivity/drivers/nfc/PN512/include/PN512Driver.h b/connectivity/drivers/nfc/PN512/include/PN512Driver.h
index be849795fb..cd84dbccdd 100644
--- a/connectivity/drivers/nfc/PN512/include/PN512Driver.h
+++ b/connectivity/drivers/nfc/PN512/include/PN512Driver.h
@@ -22,9 +22,9 @@
 #include "nfc/NFCControllerDriver.h"
 #include "PN512TransportDriver.h"
 
-#include "nfc/acore/acore/ac_buffer.h"
-#include "nfc/acore/acore/ac_buffer_reader.h"
-#include "nfc/acore/acore/ac_buffer_builder.h"
+#include "acore/acore/ac_buffer.h"
+#include "acore/acore/ac_buffer_reader.h"
+#include "acore/acore/ac_buffer_builder.h"
 #include "transceiver/pn512.h"
 
 namespace mbed {
diff --git a/connectivity/drivers/nfc/PN512/source/PN512Driver.cpp b/connectivity/drivers/nfc/PN512/source/PN512Driver.cpp
index 9f424607e5..315c53eb0a 100644
--- a/connectivity/drivers/nfc/PN512/source/PN512Driver.cpp
+++ b/connectivity/drivers/nfc/PN512/source/PN512Driver.cpp
@@ -16,7 +16,7 @@
 
 #include "PN512Driver.h"
 
-#include "nfc/stack/platform/nfc_debug.h"
+#include "stack/platform/nfc_debug.h"
 
 using namespace mbed;
 using namespace mbed::nfc;
diff --git a/connectivity/nfc/include/nfc/NFCNDEFCapable.h b/connectivity/nfc/include/nfc/NFCNDEFCapable.h
index 66b3cd5af8..46f718d046 100644
--- a/connectivity/nfc/include/nfc/NFCNDEFCapable.h
+++ b/connectivity/nfc/include/nfc/NFCNDEFCapable.h
@@ -23,10 +23,10 @@
 
 #include "NFCDefinitions.h"
 
-#include "nfc/stack/ndef/ndef.h"
-#include "nfc/acore/acore/ac_buffer.h"
-#include "nfc/acore/acore/ac_buffer_reader.h"
-#include "nfc/acore/acore/ac_buffer_builder.h"
+#include "stack/ndef/ndef.h"
+#include "acore/acore/ac_buffer.h"
+#include "acore/acore/ac_buffer_reader.h"
+#include "acore/acore/ac_buffer_builder.h"
 
 namespace mbed {
 namespace nfc {
diff --git a/connectivity/nfc/include/nfc/Type4RemoteInitiator.h b/connectivity/nfc/include/nfc/Type4RemoteInitiator.h
index 5e7ef45d1a..af71c7f4ed 100644
--- a/connectivity/nfc/include/nfc/Type4RemoteInitiator.h
+++ b/connectivity/nfc/include/nfc/Type4RemoteInitiator.h
@@ -23,10 +23,10 @@
 #include "NFCNDEFCapable.h"
 #include "NFCRemoteInitiator.h"
 
-#include "nfc/acore/acore/ac_buffer.h"
-#include "nfc/acore/acore/ac_buffer_reader.h"
-#include "nfc/acore/acore/ac_buffer_builder.h"
-#include "nfc/stack/tech/type4/type4_target.h"
+#include "acore/acore/ac_buffer.h"
+#include "acore/acore/ac_buffer_reader.h"
+#include "acore/acore/ac_buffer_builder.h"
+#include "stack/tech/type4/type4_target.h"
 
 #include "platform/Span.h"