FIX: 'lf hitag2' forgot to add some of @marshmellow42 's changes. Lf search should works just fine now.

common/cmd.c

@@ -31,8 +31,6 @@
  */
 
 #include "cmd.h"
-#include "string.h"
-#include "proxmark3.h"
 
 bool cmd_receive(UsbCommand* cmd) {
  

common/cmd.h

@@ -36,6 +36,8 @@
 #include "common.h"
 #include "usb_cmd.h"
 #include "usb_cdc.h"
+#include "proxmark3.h"
+#include "string.h"
 
 bool cmd_receive(UsbCommand* cmd);
 bool cmd_send(uint32_t cmd, uint32_t arg0, uint32_t arg1, uint32_t arg2, void* data, size_t len);

common/crc32.c

@@ -1,11 +1,8 @@
-#include <stdint.h>
-#include <stddef.h>
 #include "crc32.h"
 
 #define htole32(x) (x)
 #define CRC32_PRESET 0xFFFFFFFF
 
-
 static void crc32_byte (uint32_t *crc, const uint8_t value);
 
 static void crc32_byte (uint32_t *crc, const uint8_t value) {
@@ -32,4 +29,4 @@ void crc32 (const uint8_t *data, const size_t len, uint8_t *crc) {
 
 void crc32_append (uint8_t *data, const size_t len) {
     crc32 (data, len, data + len);
-}
+}

common/crc32.h

@@ -9,7 +9,19 @@
 #ifndef __CRC32_H
 #define __CRC32_H
 
+#include <stdint.h>
+#include <stddef.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void crc32 (const uint8_t *data, const size_t len, uint8_t *crc);
 void crc32_append (uint8_t *data, const size_t len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

common/protocols.c

@@ -1,6 +1,3 @@
-#include <string.h>
-#include <stdint.h>
-#include <stdarg.h>
 #include "protocols.h"
 
 // ATA55xx shared presets & routines

common/protocols.h

@@ -1,6 +1,11 @@
 #ifndef PROTOCOLS_H
 #define PROTOCOLS_H
 
+#include <string.h>
+#include <stdint.h>
+#include <stdarg.h>
+
+
 //The following data is taken from http://www.proxmark.org/forum/viewtopic.php?pid=13501#p13501
 /*
 ISO14443A (usually NFC tags)