diff --git a/src/add-ons/kernel/drivers/Jamfile b/src/add-ons/kernel/drivers/Jamfile
index a0fbf56faf..5b0cdc0a3f 100644
--- a/src/add-ons/kernel/drivers/Jamfile
+++ b/src/add-ons/kernel/drivers/Jamfile
@@ -5,6 +5,7 @@ SubInclude HAIKU_TOP src add-ons kernel drivers bus ;
 SubInclude HAIKU_TOP src add-ons kernel drivers audio ;
 SubInclude HAIKU_TOP src add-ons kernel drivers common ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk ;
+SubInclude HAIKU_TOP src add-ons kernel drivers dvb ;
 SubInclude HAIKU_TOP src add-ons kernel drivers input ;
 SubInclude HAIKU_TOP src add-ons kernel drivers graphics ;
 SubInclude HAIKU_TOP src add-ons kernel drivers midi ;
diff --git a/src/add-ons/kernel/drivers/dvb/Jamfile b/src/add-ons/kernel/drivers/dvb/Jamfile
new file mode 100644
index 0000000000..1c7fc74bb9
--- /dev/null
+++ b/src/add-ons/kernel/drivers/dvb/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src add-ons kernel drivers dvb ;
+
+SubInclude HAIKU_TOP src add-ons kernel drivers dvb cx23882 ;
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/Jamfile b/src/add-ons/kernel/drivers/dvb/cx23882/Jamfile
new file mode 100644
index 0000000000..747d184e7e
--- /dev/null
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/Jamfile
@@ -0,0 +1,15 @@
+SubDir HAIKU_TOP src add-ons kernel drivers dvb cx23882 ;
+
+UsePrivateHeaders drivers ;
+
+KernelAddon cx23882 :
+	cx22702.c
+	cx23882.c
+	cx23882_i2c.c
+	driver.c
+	dtt7592.c
+	dvb_interface.c
+	i2c_core.c
+	util.c
+;
+
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/config.h b/src/add-ons/kernel/drivers/dvb/cx23882/config.h
index 493df85bb1..b2024264b6 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/config.h
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/config.h
@@ -25,10 +25,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define REVISION		"unknown"
 #define VERSION			"1.0"
 #define BUILD			__DATE__ " "__TIME__
-#define INFO1			"cx23882: DVB-T Driver. Version " VERSION ", Revision " REVISION ", Build " BUILD
-#define INFO2			"cx23882: Copyright (c) 2004-2006 Marcus Overhagen. All rights reserved.\n"
+#define INFO			"cx23882: DVB-T Driver. Version " VERSION ", Revision " REVISION ", Build " BUILD "\n"
 
 #define MAX_CARDS 		8
 
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.c b/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.c
index 874c7fb270..ecd9a082ea 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.c
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.c
@@ -23,6 +23,7 @@
  */
 
 #include <KernelExport.h>
+#include <string.h>
 #include "cx22702.h"
 #include "dtt7592.h"
 #include "config.h"
@@ -36,6 +37,7 @@
 #endif
 
 
+#if 0
 static void
 cx22702_reg_dump(i2c_bus *bus)
 {
@@ -48,6 +50,7 @@ cx22702_reg_dump(i2c_bus *bus)
 			dprintf("cx22702_reg 0x%02x value 0x%02x\n", i, data);
 	}
 }
+#endif
 
 
 status_t
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.h b/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.h
index f92e20ac17..e93741ca44 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.h
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/cx22702.h
@@ -25,7 +25,7 @@
 #ifndef __CX22702_H
 #define __CX22702_H
 
-#include "i2c-core.h"
+#include "i2c_core.h"
 #include "dvb.h"
 
 status_t cx22702_reg_write(i2c_bus *bus, uint8 reg, uint8 data);
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/cx23882.h b/src/add-ons/kernel/drivers/dvb/cx23882/cx23882.h
index 8dd852a749..0204c6cb79 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/cx23882.h
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/cx23882.h
@@ -28,7 +28,7 @@
 #include <SupportDefs.h>
 #include "driver.h"
 #include "cx23882_regs.h"
-#include "i2c-core.h"
+#include "i2c_core.h"
 
 typedef struct {
 	const pci_info *	pci_info;
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/cx23882_i2c.c b/src/add-ons/kernel/drivers/dvb/cx23882/cx23882_i2c.c
index 20216f4ea5..d0d2d40189 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/cx23882_i2c.c
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/cx23882_i2c.c
@@ -22,8 +22,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "i2c.h"
-#include "i2c-core.h"
+#include "cx23882_i2c.h"
+#include "i2c_core.h"
 
 
 static void
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/driver.c b/src/add-ons/kernel/drivers/dvb/cx23882/driver.c
index 683aed0333..adad11266a 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/driver.c
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/driver.c
@@ -29,10 +29,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "version.h"
 #include "config.h"
 #include "driver.h"
-#include "mktime.h"
+#include "dvb_interface.h"
 
 #define TRACE_DRIVER
 #ifdef TRACE_DRIVER
@@ -126,7 +125,7 @@ init_driver(void)
 	load_driver_symbols("cx23882");
 #endif
 	
-	dprintf(gBanner);
+	dprintf(INFO);
 	
 	item = (pci_info *)malloc(sizeof(pci_info));
 	if (!item)
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.c b/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.c
index 660cbbfdd5..06a36ad8c4 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.c
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.c
@@ -131,6 +131,7 @@ dtt7592_set_frequency(i2c_bus *bus, uint32 frequency, dvb_bandwidth_t bandwidth)
 }
 
 
+#if 0
 void
 dtt7582_dump(i2c_bus *bus)
 {
@@ -163,6 +164,4 @@ dtt7582_test(i2c_bus *bus)
 	dtt7592_set_frequency(bus, 333000000, DVB_BANDWIDTH_7_MHZ);
 	dtt7582_dump(bus);
 }
-
-
-
+#endif
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.h b/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.h
index 63ce7faa8f..45480a30a6 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.h
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/dtt7592.h
@@ -25,7 +25,7 @@
 #ifndef __DTT7592_H
 #define __DTT7592_H
 
-#include "i2c-core.h"
+#include "i2c_core.h"
 #include "dvb.h"
 
 status_t dtt7592_write(i2c_bus *bus, const uint8 data[4]);
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.c b/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.c
index 8791f4bb04..2213c77acb 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.c
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.c
@@ -24,14 +24,15 @@
 
 #include <KernelExport.h>
 #include <stdlib.h>
-#include "interface.h"
+#include <string.h>
+#include "dvb_interface.h"
 #include "cx23882.h"
+#include "cx23882_i2c.h"
 #include "cx22702.h"
 #include "dtt7592.h"
 #include "driver.h"
 #include "config.h"
 #include "util.h"
-#include "i2c.h"
 
 #define TRACE_INTERFACE
 #ifdef TRACE_INTERFACE
@@ -40,9 +41,8 @@
   #define TRACE(a...)
 #endif
 
-static inline status_t user_memcpy(void *d, const void *s, size_t z) { memcpy(d, s, z); return B_OK; }
-#define B_BAD_ADDRESS B_ERROR
 
+#if 0
 static void
 dump_eeprom(cx23882_device *device)
 {
@@ -62,6 +62,7 @@ dump_eeprom(cx23882_device *device)
 		TRACE("EEPROM %02x: %02x %02x %02x %02x %02x %02x %02x %02x\n", i * 8, p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
 		
 }
+#endif
 
 
 status_t
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.h b/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.h
index 6e9454bd0c..769da16d1d 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.h
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/dvb_interface.h
@@ -25,6 +25,8 @@
 #ifndef __DVB_INTERFACE_H
 #define __DVB_INTERFACE_H
 
+#include <PCI.h>
+
 status_t	interface_attach(void **cookie, const pci_info *info);
 void		interface_detach(void *cookie);
 status_t	interface_ioctl(void *cookie, uint32 op, void *arg, size_t len);
diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/i2c_core.c b/src/add-ons/kernel/drivers/dvb/cx23882/i2c_core.c
index 1293827fb0..fa7f63a0bf 100644
--- a/src/add-ons/kernel/drivers/dvb/cx23882/i2c_core.c
+++ b/src/add-ons/kernel/drivers/dvb/cx23882/i2c_core.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <KernelExport.h>
-#include "i2c-core.h"
+#include "i2c_core.h"
 
 #define TRACE_I2C
 #ifdef TRACE_I2C