Prefix acore lib files with ac_ to avoid include clashes

features/nfc/acore/acore/ac_buffer_builder.h

@@ -37,7 +37,7 @@ extern "C" {
 #include "stddef.h"
 #include "stdbool.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 typedef struct __ac_buffer_builder {
     ac_buffer_t ac_buffer;

features/nfc/acore/acore/ac_buffer_reader.h

@@ -37,7 +37,7 @@ extern "C" {
 #include "stddef.h"
 #include "stdbool.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 /** Read n-bytes in big-endian format from buffer reader and advance read posiion
  * \param pBuf the buffer to read from

features/nfc/acore/acore/ac_stream.h

@@ -37,7 +37,7 @@ typedef struct __ac_ostream ac_ostream_t;
 #include "stdbool.h"
 #include "stdint.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 typedef void (*ac_istream_fn)(ac_buffer_t *pDataIn, bool *pClose, size_t maxLength, void *pUserParam);
 typedef void (*ac_ostream_fn)(ac_buffer_t *pDataOut, bool closed, void *pUserParam);

features/nfc/acore/source/ac_buffer.c

@@ -23,11 +23,11 @@
 
 #include "string.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/macros.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_macros.h"
 
-#include "acore/debug.h"
+#include "acore/ac_debug.h"
 
 void ac_buffer_init(ac_buffer_t *pBuf, const uint8_t *data, size_t size)
 {

features/nfc/acore/source/ac_buffer_builder.c

@@ -20,9 +20,9 @@
  * \author Donatien Garnier
  */
 
-#include "acore/buffer_builder.h"
-#include "acore/buffer_reader.h"
-#include "acore/macros.h"
+#include "acore/ac_buffer_builder.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_macros.h"
 
 #include "string.h"
 

features/nfc/acore/source/ac_buffer_reader.c

@@ -20,8 +20,8 @@
  * \author Donatien Garnier
  */
 
-#include "acore/buffer_reader.h"
-#include "acore/macros.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_macros.h"
 
 #include "string.h"
 

features/nfc/acore/source/ac_stream.c

@@ -20,8 +20,8 @@
  * \author Donatien Garnier
  */
 
-#include "acore/stream.h"
-#include "acore/macros.h"
+#include "acore/ac_stream.h"
+#include "acore/ac_macros.h"
 
 //Called by supplier
 void ac_istream_init(ac_istream_t *pac_istream, ac_istream_fn fn, void *pUserParam)

features/nfc/nfc/NFCDefinitions.h

@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include "stack/nfc_errors.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/nfc/Type4RemoteInitiator.h

@@ -24,7 +24,7 @@
 #include "NFCNDEFCapable.h"
 #include "NFCRemoteInitiator.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 namespace mbed {
 namespace nfc {

features/nfc/source/nfc/NFCNDEFCapable.cpp

@@ -16,9 +16,9 @@
 
 #include "NFCNDEFCapable.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_buffer_builder.h"
 
 #include "ndef/ndef.h"
 

features/nfc/source/nfc/NFCRemoteEndpoint.cpp

@@ -16,9 +16,9 @@
 
 #include "NFCRemoteEndpoint.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_buffer_builder.h"
 
 #include "stack/transceiver/transceiver.h"
 

features/nfc/source/nfc/Type4RemoteInitiator.cpp

@@ -16,9 +16,9 @@
 
 #include "Type4RemoteInitiator.h"
 
-#include "acore/buffer.h"
-#include "acore/buffer_reader.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_reader.h"
+#include "acore/ac_buffer_builder.h"
 
 #include "stack/transceiver/transceiver.h"
 #include "stack/tech/iso7816/iso7816.h"

features/nfc/stack/ndef/ndef.h

@@ -33,8 +33,8 @@
 extern "C" {
 #endif
 
-#include "acore/buffer.h"
-#include "acore/buffer_builder.h"
+#include "acore/ac_buffer.h"
+#include "acore/ac_buffer_builder.h"
 
 //Generic interface for NDEF messages
 

features/nfc/stack/tech/iso7816/iso7816.h

@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include "acore/stream.h"
+#include "acore/ac_stream.h"
 
 #include "transceiver/protocols.h"
 #include "tech/isodep/isodep_target.h"

features/nfc/stack/transceiver/pn512/pn512.c

@@ -29,7 +29,7 @@
 
 #include "stdlib.h"
 
-#include "acore/buffer.h"
+#include "acore/ac_buffer.h"
 
 #include "transceiver/transceiver.h"
 #include "transceiver/protocols.h"