Rename usb_device to usb-device, fix includes

src/cold-flash.c

@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <usb.h>
 
+#include "cold-flash.h"
 #include "image.h"
 
 #define READ_DEV		0x81

src/main2.c

@@ -28,9 +28,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "device.h"
 #include "image.h"
 #include "fiasco2.h"
+#include "device.h"
+#include "usb-device.h"
 
 #define VERSION "0.6"
 

src/usb-device.c

@@ -26,7 +26,7 @@
 #include <usb.h>
 
 #include "device.h"
-#include "usb_device.h"
+#include "usb-device.h"
 
 static struct usb_flash_device usb_devices[] = {
 	{ 0x0421, 0x0105,  2,  1, -1, FLASH_NOLO, { DEVICE_SU_18, DEVICE_RX_44, DEVICE_RX_48, DEVICE_RX_51, 0 } },