monster merge...

all those changes marshmellow did..  and more...

client/hid-flasher/flash.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "sleep.h"
+#include "util_posix.h"
 #include "proxusb.h"
 #include "flash.h"
 #include "elf.h"

client/hid-flasher/flasher.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sleep.h"
+#include "util_posix.h"
 #include "proxusb.h"
 #include "flash.h"
 

client/hid-flasher/proxusb.c

@@ -8,20 +8,7 @@
 //-----------------------------------------------------------------------------
 // USB utilities
 //-----------------------------------------------------------------------------
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <usb.h>
-#include <strings.h>
-#include <errno.h>
-
-#include "sleep.h"
 #include "proxusb.h"
-#include "proxmark3.h"
-#include "usb_cmd.h"
 
 // It seems to be missing for mingw
 #ifndef ETIMEDOUT

client/hid-flasher/proxusb.h

@@ -13,8 +13,16 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <usb.h>
+#include <strings.h>
+#include <errno.h>
+#include "proxmark3.h"
 #include "usb_cmd.h"
+#include "util_posix.h"
 
 extern unsigned char return_on_error;
 extern unsigned char error_occured;