From 98d84058305ec6bfbce02b04ed22d5f579820054 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 8 Apr 2019 12:58:26 +0200
Subject: [PATCH] wrong includes

---
 client/cmdhfmfdes.c     | 16 ----------------
 client/cmdhfmfdes.h     | 15 +++++++++++++++
 client/cmdhfmfdesfire.c |  5 +----
 client/cmdhfmfdesfire.h |  9 +++++++++
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 3de3c6a4a..e0c4245bc 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -7,23 +7,7 @@
 //-----------------------------------------------------------------------------
 // High frequency MIFARE Desfire commands
 //-----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "des.h"
-#include "cmdmain.h"
-#include "proxmark3.h"
-#include "../include/common.h"
-#include "../include/mifare.h"
-#include "iso14443crc.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "util.h"
 #include "cmdhfmfdes.h"
-#include "cmdhf14a.h"
-
 
 uint8_t CMDPOS = 0;
 uint8_t LENPOS = 1;
diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 6f2f0fa3f..774a2f3e3 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -10,6 +10,21 @@
 #ifndef __MFDESFIRE_H
 #define __MFDESFIRE_H
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "cmdmain.h"
+#include "proxmark3.h"
+#include "../include/common.h"
+#include "../include/mifare.h"
+#include "iso14443crc.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "util.h"
+#include "cmdhf14a.h"
+#include "mbedtls/des.h"
+
 int CmdHFMFDes(const char *Cmd);
 int CmdHF14ADesAuth(const char *Cmd);
 int CmdHF14ADesRb(const char *Cmd);
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 78c0bf3b3..cb8259da1 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -8,10 +8,7 @@
 // High frequency MIFARE commands
 //-----------------------------------------------------------------------------
 
-#include "cmdhfmf.h"
-#include "util.h"
-#include <openssl/des.h>
-#include <openssl/aes.h>
+#include "cmdhfmfdesfire.h"
 
 static int CmdHelp(const char *Cmd);
 
diff --git a/client/cmdhfmfdesfire.h b/client/cmdhfmfdesfire.h
index 46737c684..6ba79c5a2 100644
--- a/client/cmdhfmfdesfire.h
+++ b/client/cmdhfmfdesfire.h
@@ -1,4 +1,13 @@
+#ifndef __MFDESFIRE_AD_H
+#define __MFDESFIRE_AD_H
+
+#include "cmdhfmf.h"
+#include "util.h"
+#include "mbedtls/des.h"
+#include "mbedtls/aes.h"
 
 int CmdHF14AMfDESAuth(const char *Cmd);
 int CmdHFMFDesfire(const char *Cmd);
 int CmdHelp(const char *Cmd);
+
+#endif
\ No newline at end of file