NFC - NDEF: Improve header inclusion

features/nfc/nfc/ndef/MessageBuilder.h

@@ -19,10 +19,10 @@
 
 #include <stdint.h>
 
-#include "Record.h"
-
 #include "platform/Span.h"
 
+#include "nfc/ndef/Record.h"
+
 namespace mbed {
 namespace nfc {
 namespace ndef {

features/nfc/nfc/ndef/RecordParser.h

@@ -18,7 +18,8 @@
 #define NFC_NDEF_RECORDPARSER_H_
 
 #include <stddef.h>
-#include "Record.h"
+
+#include "nfc/ndef/Record.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/nfc/ndef/common/Mime.h

@@ -17,11 +17,13 @@
 #ifndef NFC_COMMON_MIME_H_
 #define NFC_COMMON_MIME_H_
 
-#include "platform/Span.h"
-#include <nfc/ndef/RecordParser.h>
-#include <nfc/ndef/MessageBuilder.h>
 #include <stdint.h>
 
+#include "platform/Span.h"
+
+#include "nfc/ndef/RecordParser.h"
+#include "nfc/ndef/MessageBuilder.h"
+
 namespace mbed {
 namespace nfc {
 namespace ndef {

features/nfc/nfc/ndef/common/SimpleMessageParser.h

@@ -18,11 +18,12 @@
 #define NFC_COMMON_SIMPLEMESSAGEPARSER_H_
 
 #include "platform/Span.h"
+
 #include "nfc/ndef/MessageParser.h"
 #include "nfc/ndef/RecordParser.h"
-#include "URI.h"
-#include "Text.h"
-#include "Mime.h"
+#include "nfc/ndef/common/URI.h"
+#include "nfc/ndef/common/Text.h"
+#include "nfc/ndef/common/Mime.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/nfc/ndef/common/Text.h

@@ -17,11 +17,13 @@
 #ifndef NFC_COMMON_TEXT_H_
 #define NFC_COMMON_TEXT_H_
 
-#include "platform/Span.h"
-#include <nfc/ndef/RecordParser.h>
-#include <nfc/ndef/MessageBuilder.h>
 #include <stdint.h>
 
+#include "platform/Span.h"
+
+#include "nfc/ndef/RecordParser.h"
+#include "nfc/ndef/MessageBuilder.h"
+
 namespace mbed {
 namespace nfc {
 namespace ndef {

features/nfc/nfc/ndef/common/URI.h

@@ -17,12 +17,13 @@
 #ifndef NFC_COMMON_URI_H_
 #define NFC_COMMON_URI_H_
 
-#include <nfc/ndef/RecordParser.h>
-#include <nfc/ndef/MessageBuilder.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <platform/Span.h>
+#include "platform/Span.h"
+
+#include "nfc/ndef/RecordParser.h"
+#include "nfc/ndef/MessageBuilder.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/source/nfc/ndef/MessageBuilder.cpp

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "MessageBuilder.h"
 #include <cstring>
 
+#include "nfc/ndef/MessageBuilder.h"
+
 namespace mbed {
 namespace nfc {
 namespace ndef {

features/nfc/source/nfc/ndef/MessageParser.cpp

@@ -16,8 +16,8 @@
 
 #include <cstring>
 
-#include "MessageParser.h"
-#include "Record.h"
+#include "nfc/ndef/MessageParser.h"
+#include "nfc/ndef/Record.h"
 
 namespace {
 struct buffer_iterator_t {

features/nfc/source/nfc/ndef/RecordParser.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "RecordParser.h"
+#include "nfc/ndef/RecordParser.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/source/nfc/ndef/common/Mime.cpp

@@ -16,7 +16,7 @@
 
 #include <cstring>
 
-#include "Mime.h"
+#include "nfc/ndef/common/Mime.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/source/nfc/ndef/common/SimpleMessageParser.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "SimpleMessageParser.h"
+#include "nfc/ndef/common/SimpleMessageParser.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/source/nfc/ndef/common/Text.cpp

@@ -16,7 +16,7 @@
 
 #include <cstring>
 
-#include "Text.h"
+#include "nfc/ndef/common/Text.h"
 
 namespace {
 static const uint8_t utf16_encoding_bit = (1 << 7);

features/nfc/source/nfc/ndef/common/URI.cpp

@@ -15,7 +15,8 @@
  */
 
 #include <cstring>
-#include "URI.h"
+
+#include "nfc/ndef/common/URI.h"
 
 namespace {
 static const uint8_t uri_id_code_size = 1;

features/nfc/source/nfc/ndef/common/util.cpp

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "nfc/ndef/common/util.h"
-
 #include <cstring>
 
+#include "nfc/ndef/common/util.h"
+
 namespace mbed {
 namespace nfc {
 namespace ndef {