diff --git a/drivers/media/dvb/dvb-usb/az6007.c b/drivers/media/dvb/dvb-usb/az6007.c
index a709cec16b00267cb58822677cbda346f66dbf4b..1791cb0886290fb5c3a99bee4c3c88b50d78e010 100644
--- a/drivers/media/dvb/dvb-usb/az6007.c
+++ b/drivers/media/dvb/dvb-usb/az6007.c
@@ -3,13 +3,15 @@
  * see Documentation/dvb/README.dvb-usb for more information
  */
 
-#include "az6007.h"
 #include "drxk.h"
 #include "mt2063.h"
 #include "dvb_ca_en50221.h"
+#include "dvb-usb.h"
+
+#define DVB_USB_LOG_PREFIX "az6007"
 
 /* HACK: Should be moved to the right place */
-#define USB_PID_AZUREWAVE_6007		0xccd
+#define USB_PID_AZUREWAVE_6007		0x0ccd
 #define USB_PID_TERRATEC_H7		0x10b4
 
 /* debug */
@@ -18,6 +20,11 @@ module_param_named(debug, dvb_usb_az6007_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))."
 		 DVB_USB_DEBUG_STATUS);
 
+#define deb_info(args...) dprintk(dvb_usb_az6007_debug, 0x01, args)
+#define deb_xfer(args...) dprintk(dvb_usb_az6007_debug, 0x02, args)
+#define deb_rc(args...)   dprintk(dvb_usb_az6007_debug, 0x04, args)
+#define deb_fe(args...)   dprintk(dvb_usb_az6007_debug, 0x08, args)
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct az6007_device_state {
diff --git a/drivers/media/dvb/dvb-usb/az6007.h b/drivers/media/dvb/dvb-usb/az6007.h
deleted file mode 100644
index aefa5b506ee611c65b8aa29330fe19e01ef0bf95..0000000000000000000000000000000000000000
--- a/drivers/media/dvb/dvb-usb/az6007.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _DVB_USB_AZ6007_H_
-#define _DVB_USB_AZ6007_H_
-
-#define DVB_USB_LOG_PREFIX "az6007"
-#include "dvb-usb.h"
-
-
-extern int dvb_usb_az6007_debug;
-#define deb_info(args...) dprintk(dvb_usb_az6007_debug,0x01,args)
-#define deb_xfer(args...) dprintk(dvb_usb_az6007_debug,0x02,args)
-#define deb_rc(args...)   dprintk(dvb_usb_az6007_debug,0x04,args)
-#define deb_fe(args...)   dprintk(dvb_usb_az6007_debug,0x08,args)
-
-
-extern int vp702x_usb_out_op(struct dvb_usb_device *d, u8 *o, int olen, u8 *i, int ilen, int msec);
-extern int vp702x_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen);
-
-#endif