diff --git a/client/proxmark3.c b/client/proxmark3.c
index ab69de4b5..56a6ff1ea 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -8,6 +8,7 @@
 //-----------------------------------------------------------------------------
 // Main binary
 //-----------------------------------------------------------------------------
+#include "proxmark3.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,8 +17,6 @@
 #include <unistd.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-
-#include "proxmark3.h"
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"
diff --git a/client/proxmark3.h b/client/proxmark3.h
index 3a379066f..c68e8275c 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -16,6 +16,7 @@
 #include "cmdscript.h"  // CmdScriptRun  
 
 #define PROXPROMPT "pm3 --> "
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/client/ui.h b/client/ui.h
index 22cc38a3a..1257585b5 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -24,7 +24,6 @@
 
 #include "util.h"
 #include "cmdmain.h"
-#include "proxgui.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327
@@ -47,6 +46,8 @@ extern int flushAfterWrite;   //buzzy
 extern bool GridLocked;
 extern bool showDemod;
 
+//extern uint8_t g_debugMode;
+
 extern pthread_mutex_t print_lock;
 
 extern void iceIIR_Butterworth(int * data, const size_t len);
diff --git a/client/util.c b/client/util.c
index 74bf5c1bd..4f6984dcc 100644
--- a/client/util.c
+++ b/client/util.c
@@ -9,6 +9,9 @@
 //-----------------------------------------------------------------------------
 #include "util.h"
 
+// global client debug variable
+uint8_t g_debugMode = 0;
+
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/client/util.h b/client/util.h
index 185000081..0fe610581 100644
--- a/client/util.h
+++ b/client/util.h
@@ -25,7 +25,6 @@
   #include <endian.h>
 #endif
 
-
 #ifndef BITMASK
 # define BITMASK(X) (1 << (X))
 #endif
@@ -162,13 +161,14 @@
 # define _YELLOW_(s) #s
 #endif
 
-
 #ifndef DropField
 #define DropField() { \
 	UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
 }
 #endif
 
+extern uint8_t g_debugMode;
+
 extern int ukbhit(void);
 extern void AddLogLine(char *fileName, char *extData, char *c);
 extern void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len);
diff --git a/uart/uart.h b/uart/uart.h
index ec09149fe..ab0f9c076 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -29,8 +29,8 @@
  * @file uart.h
  */
 
-#ifndef _PM3_UART_H_
-#define _PM3_UART_H_
+#ifndef _UART_H_
+#define _UART_H_
 
 #include <stdio.h>
 #include <string.h>
@@ -94,5 +94,5 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed);
  */
 uint32_t uart_get_speed(const serial_port sp);
 
-#endif // _PM3_UART_H_
+#endif // _UART_H_