diff --git a/client/clcc.c b/client/clcc.c
index 33df9b2..cf4ec46 100644
--- a/client/clcc.c
+++ b/client/clcc.c
@@ -16,7 +16,9 @@
 #include <usb.h>
 #include <argtable2.h>
 
-#include "../firmware/globals.h"   /* custom request numbers */
+#include "globals.h"
+
+#include "../firmware/globals.h"
 
 // External functions to control the ledcube.
 extern void lc_setFrame(unsigned long);
diff --git a/client/demo.c b/client/demo.c
index e1b4053..01e8125 100644
--- a/client/demo.c
+++ b/client/demo.c
@@ -15,7 +15,9 @@
 #include <math.h>
 #include <usb.h>
 
-#include "../firmware/globals.h"   /* custom request numbers */
+#include "globals.h"
+
+#include "../firmware/globals.h"
 
 extern int lc_setFrame(unsigned long);
 extern int lc_setMode(int);
diff --git a/client/ledcube.h b/client/ledcube.h
index 3296b8b..28f9154 100644
--- a/client/ledcube.h
+++ b/client/ledcube.h
@@ -12,17 +12,14 @@
 #ifndef __LEDCUBE_H_INCLUDED__
 #define __LEDCUBE_H_INCLUDED__
 
-#define NOT_CONNECTED_ERROR    -1
-#define DEVICE_NOT_FOUND_ERROR -2
-
-#define SUCCESSFULLY_CONNECTED  1
-
 #include <stdio.h>
 #include <usb.h>        /* this is libusb */
 
 #include "opendevice.h" /* common code moved to separate module */
 
-#include "../firmware/globals.h"   /* custom request numbers */
+#include "globals.h"
+
+#include "../firmware/globals.h"
 #include "../firmware/requests.h"   /* custom request numbers */
 #include "../firmware/usbconfig.h"  /* device's VID/PID and names */