From 86237b629fd7720343c6a708c4020e16d8269b75 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 27 Jul 2017 23:00:49 +0200
Subject: [PATCH] some more adjustments

---
 client/cmddata.c |  7 +++++--
 client/ui.h      |  3 ---
 client/util.c    | 18 +++++++++++++++++-
 client/util.h    | 23 ++---------------------
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index 5931c23c..f86c2302 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -7,15 +7,15 @@
 //-----------------------------------------------------------------------------
 // Data and Graph commands
 //-----------------------------------------------------------------------------
+#include "cmddata.h"
 
 #include <stdio.h>    // also included in util.h
 #include <string.h>   // also included in util.h
+#include <inttypes.h>
 #include <limits.h>   // for CmdNorm INT_MIN && INT_MAX
 #include "data.h"     // also included in util.h
-#include "cmddata.h"
 #include "util.h"
 #include "cmdmain.h"
-#include "proxmark3.h"
 #include "ui.h"       // for show graph controls
 #include "graph.h"    // for graph data
 #include "cmdparser.h"// already included in cmdmain.h
@@ -28,6 +28,9 @@
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode = 0;
 size_t DemodBufferLen = 0;
+int g_DemodStartIdx=0;
+int g_DemodClock=0;
+
 static int CmdHelp(const char *Cmd);
 
 int usage_data_printdemodbuf(void){
diff --git a/client/ui.h b/client/ui.h
index 257a91fb..ac4d0127 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -22,11 +22,8 @@
 #include <math.h>	
 #include <complex.h>
 
-
-#include "loclass/cipherutils.h"
 #include "util.h"
 #include "cmdmain.h"
-#include "cmddata.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327
diff --git a/client/util.c b/client/util.c
index 1907412a..6f960988 100644
--- a/client/util.c
+++ b/client/util.c
@@ -9,10 +9,25 @@
 //-----------------------------------------------------------------------------
 
 #include "util.h"
+
+#include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include "data.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
-#include <sys/ttydefaults.h>
+#include <termios.h>
+#include <sys/ioctl.h> 
+#include <unistd.h>
 
 int ukbhit(void) {
   int cnt = 0;
@@ -39,6 +54,7 @@ int ukbhit(void) {
 
 #else
 
+#include <conio.h>
 int ukbhit(void) {
 	return kbhit();
 }
diff --git a/client/util.h b/client/util.h
index 76c0a10e..e9d171f8 100644
--- a/client/util.h
+++ b/client/util.h
@@ -10,28 +10,9 @@
 #ifndef __UTIL_H_
 #define __UTIL_H_
 
-#include <stdio.h>
 #include <stdint.h>		//included in data.h
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <math.h>		// math.pow
-#include <time.h>       // time, gmtime
-#include <inttypes.h>	// PRIx64 defines
-#include "proxmark3.h"	// time_t
-#include "data.h"		// for FILE_PATH_SIZE
-
-#include <time.h>
-// Handle platform specific includes
-#ifndef _WIN32
-  #include <termios.h>
-  #include <sys/ioctl.h>
-  #include <sys/time.h>
-  #include <unistd.h>  
-#else
-  #include <conio.h>
-  #include <windows.h>
-#endif
+#include <stddef.h>
+#include <inttypes.h>
 
 #ifdef ANDROID
   #include <endian.h>