diff --git a/connectivity/nfc/nfc/NFC.h b/connectivity/nfc/include/nfc/NFC.h
similarity index 100%
rename from connectivity/nfc/nfc/NFC.h
rename to connectivity/nfc/include/nfc/NFC.h
diff --git a/connectivity/nfc/nfc/NFCController.h b/connectivity/nfc/include/nfc/NFCController.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCController.h
rename to connectivity/nfc/include/nfc/NFCController.h
diff --git a/connectivity/nfc/nfc/NFCControllerDriver.h b/connectivity/nfc/include/nfc/NFCControllerDriver.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCControllerDriver.h
rename to connectivity/nfc/include/nfc/NFCControllerDriver.h
diff --git a/connectivity/nfc/nfc/NFCDefinitions.h b/connectivity/nfc/include/nfc/NFCDefinitions.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCDefinitions.h
rename to connectivity/nfc/include/nfc/NFCDefinitions.h
diff --git a/connectivity/nfc/nfc/NFCEEPROM.h b/connectivity/nfc/include/nfc/NFCEEPROM.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCEEPROM.h
rename to connectivity/nfc/include/nfc/NFCEEPROM.h
diff --git a/connectivity/nfc/nfc/NFCEEPROMDriver.h b/connectivity/nfc/include/nfc/NFCEEPROMDriver.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCEEPROMDriver.h
rename to connectivity/nfc/include/nfc/NFCEEPROMDriver.h
diff --git a/connectivity/nfc/nfc/NFCNDEFCapable.h b/connectivity/nfc/include/nfc/NFCNDEFCapable.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCNDEFCapable.h
rename to connectivity/nfc/include/nfc/NFCNDEFCapable.h
diff --git a/connectivity/nfc/nfc/NFCRemoteEndpoint.h b/connectivity/nfc/include/nfc/NFCRemoteEndpoint.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCRemoteEndpoint.h
rename to connectivity/nfc/include/nfc/NFCRemoteEndpoint.h
diff --git a/connectivity/nfc/nfc/NFCRemoteInitiator.h b/connectivity/nfc/include/nfc/NFCRemoteInitiator.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCRemoteInitiator.h
rename to connectivity/nfc/include/nfc/NFCRemoteInitiator.h
diff --git a/connectivity/nfc/nfc/NFCTarget.h b/connectivity/nfc/include/nfc/NFCTarget.h
similarity index 100%
rename from connectivity/nfc/nfc/NFCTarget.h
rename to connectivity/nfc/include/nfc/NFCTarget.h
diff --git a/connectivity/nfc/nfc/Type4RemoteInitiator.h b/connectivity/nfc/include/nfc/Type4RemoteInitiator.h
similarity index 100%
rename from connectivity/nfc/nfc/Type4RemoteInitiator.h
rename to connectivity/nfc/include/nfc/Type4RemoteInitiator.h
diff --git a/connectivity/nfc/nfc/ndef/MessageBuilder.h b/connectivity/nfc/include/nfc/ndef/MessageBuilder.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/MessageBuilder.h
rename to connectivity/nfc/include/nfc/ndef/MessageBuilder.h
diff --git a/connectivity/nfc/nfc/ndef/MessageParser.h b/connectivity/nfc/include/nfc/ndef/MessageParser.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/MessageParser.h
rename to connectivity/nfc/include/nfc/ndef/MessageParser.h
diff --git a/connectivity/nfc/nfc/ndef/Record.h b/connectivity/nfc/include/nfc/ndef/Record.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/Record.h
rename to connectivity/nfc/include/nfc/ndef/Record.h
diff --git a/connectivity/nfc/nfc/ndef/RecordParser.h b/connectivity/nfc/include/nfc/ndef/RecordParser.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/RecordParser.h
rename to connectivity/nfc/include/nfc/ndef/RecordParser.h
diff --git a/connectivity/nfc/nfc/ndef/common/Mime.h b/connectivity/nfc/include/nfc/ndef/common/Mime.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/common/Mime.h
rename to connectivity/nfc/include/nfc/ndef/common/Mime.h
diff --git a/connectivity/nfc/nfc/ndef/common/SimpleMessageParser.h b/connectivity/nfc/include/nfc/ndef/common/SimpleMessageParser.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/common/SimpleMessageParser.h
rename to connectivity/nfc/include/nfc/ndef/common/SimpleMessageParser.h
diff --git a/connectivity/nfc/nfc/ndef/common/Text.h b/connectivity/nfc/include/nfc/ndef/common/Text.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/common/Text.h
rename to connectivity/nfc/include/nfc/ndef/common/Text.h
diff --git a/connectivity/nfc/nfc/ndef/common/URI.h b/connectivity/nfc/include/nfc/ndef/common/URI.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/common/URI.h
rename to connectivity/nfc/include/nfc/ndef/common/URI.h
diff --git a/connectivity/nfc/nfc/ndef/common/util.h b/connectivity/nfc/include/nfc/ndef/common/util.h
similarity index 100%
rename from connectivity/nfc/nfc/ndef/common/util.h
rename to connectivity/nfc/include/nfc/ndef/common/util.h