From: Iceman <iceman@iuse.se>
Date: Fri, 24 Mar 2017 07:19:23 +0000 (+0100)
Subject: Merge pull request #243 from pwpiwi/cleanup
X-Git-Tag: v3.0.0~37
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f513388ee056cfaa34799ed19e451383db1065c3?hp=42a6a3f87b425911d3fceb3b0056a5b867d20a12

Merge pull request #243 from pwpiwi/cleanup

Deduplicate mfkey32 and mfkey64
---

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 648966f3..c60b7a57 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdio.h>      // sscanf
 #include "proxmark3.h"  // Definitions, USB controls, etc
+#include "cmdlfawid.h"
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "lfdemod.h"    // parityTest +
diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index 480c828b..699465a8 100644
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -11,6 +11,8 @@
 #ifndef CMDLFAWID_H__
 #define CMDLFAWID_H__
 
+#include <stdint.h>  // for uint_32+
+
 int CmdLFAWID(const char *Cmd);
 int CmdAWIDReadFSK(const char *Cmd);
 int CmdAWIDSim(const char *Cmd);
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 12300955..1dfab394 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
+#include "cmdlfem4x.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"
diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index ff8e1c4d..cdb59acd 100644
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -11,6 +11,8 @@
 #ifndef CMDLFEM4X_H__
 #define CMDLFEM4X_H__
 
+#include <stdbool.h>    // for bool
+
 extern int CmdLFEM4X(const char *Cmd);
 extern void printEM410x(uint32_t hi, uint64_t id);
 extern int CmdEMdemodASK(const char *Cmd);
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 68e9b07f..a4b49481 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -10,6 +10,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "cmdlfhid.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 626fe639..1b43d7dd 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <limits.h>
+#include "cmdlfio.h"
 #include "proxmark3.h"
 #include "data.h"
 #include "graph.h"
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index d1b4c293..613a0b66 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <stdio.h>
+#include "cmdlfpyramid.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index edbc3500..601c29f2 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include "proxmark3.h"
+#include "cmdlfviking.h"
 #include "ui.h"
 #include "util.h"
 #include "graph.h"