diff --git a/ChangeLog b/ChangeLog
index 04f47d2..46b5d7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Key:
 
 v.0.5dev (ongoing development)
  * Update driver includes and LDFLAGS (fixed glk and bayrad binding error)
+ * Modify all drivers to use server/drivers/report.h instead of shared/report.h
 
 v0.5.3
  + lcdexec: notification when called program finishes
diff --git a/server/drivers/glcdlib.c b/server/drivers/glcdlib.c
index 2865a34..9f5f13d 100644
--- a/server/drivers/glcdlib.c
+++ b/server/drivers/glcdlib.c
@@ -33,8 +33,6 @@
 #endif
 
 #include "lcd.h"
-#include "shared/debug.h"
-//#define DEBUG
 #include "report.h"
 
 #include "glcdlib.h"
diff --git a/server/drivers/hd44780-i2c.c b/server/drivers/hd44780-i2c.c
index 5800c04..bbbcdc8 100644
--- a/server/drivers/hd44780-i2c.c
+++ b/server/drivers/hd44780-i2c.c
@@ -54,7 +54,7 @@
 #include "hd44780-low.h"
 
 #include "shared/str.h"
-#include "shared/report.h"
+#include "report.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/server/drivers/hd44780-usblcd.c b/server/drivers/hd44780-usblcd.c
index 36e7cb1..b493c98 100644
--- a/server/drivers/hd44780-usblcd.c
+++ b/server/drivers/hd44780-usblcd.c
@@ -19,7 +19,7 @@
  */
 
 #include "hd44780-usblcd.h"
-#include "shared/report.h"
+#include "report.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/server/drivers/hd44780-usblcd.h b/server/drivers/hd44780-usblcd.h
index 4918af7..666276b 100644
--- a/server/drivers/hd44780-usblcd.h
+++ b/server/drivers/hd44780-usblcd.h
@@ -4,8 +4,7 @@
 #include "lcd.h"			  /* for lcd_logical_driver */
 #include "hd44780-low.h"		  /* for HD44780_functions */
 
-// initialise this particular driver, args is probably not used but keep
-// for consistency
+// initialise this particular driver
 int hd_init_usblcd(Driver *drvthis);
 
 #endif
diff --git a/server/drivers/imon.c b/server/drivers/imon.c
index e882ce5..09b30a4 100644
--- a/server/drivers/imon.c
+++ b/server/drivers/imon.c
@@ -42,8 +42,6 @@
 
 #include "lcd.h"
 #include "lcd_lib.h"
-#include "shared/debug.h"
-//#define DEBUG
 #include "report.h"
 
 
@@ -123,12 +121,12 @@ MODULE_EXPORT int imon_init (Driver *drvthis)
 	// Alocate, initialize and store private p
 	p = (PrivateData *) calloc(1, sizeof(PrivateData));
 	if (p == NULL) {
-		debug(RPT_ERR, "%s: failed to allocate private data", drvthis->name);
+		report(RPT_ERR, "%s: failed to allocate private data", drvthis->name);
 		return -1;
 	}
 
 	if (drvthis->store_private_ptr(drvthis, p)) {
-		debug(RPT_ERR, "%s: failed to store private data pointer", drvthis->name);
+		report(RPT_ERR, "%s: failed to store private data pointer", drvthis->name);
 		return -1;
 	}
 
diff --git a/server/drivers/imonlcd.c b/server/drivers/imonlcd.c
index be8fe69..6890b1c 100644
--- a/server/drivers/imonlcd.c
+++ b/server/drivers/imonlcd.c
@@ -50,7 +50,6 @@
 
 #include "lcd.h"
 #include "lcd_lib.h"
-#include "shared/debug.h"
 #include "report.h"
 
 /* Defines a 6x8 font based on ISO 8859-15 */
@@ -278,11 +277,11 @@ imonlcd_init(Driver *drvthis)
 	/* Allocate, initialize and store private p */
 	p = (PrivateData *) calloc(1, sizeof(PrivateData));
 	if (p == NULL) {
-		debug(RPT_ERR, "%s: failed to allocate private data", drvthis->name);
+		report(RPT_ERR, "%s: failed to allocate private data", drvthis->name);
 		return -1;
 	}
 	if (drvthis->store_private_ptr(drvthis, p)) {
-		debug(RPT_ERR, "%s: failed to store private data pointer", drvthis->name);
+		report(RPT_ERR, "%s: failed to store private data pointer", drvthis->name);
 		return -1;
 	}
 
diff --git a/server/drivers/irmanin.c b/server/drivers/irmanin.c
index 02e03f4..a223db2 100644
--- a/server/drivers/irmanin.c
+++ b/server/drivers/irmanin.c
@@ -21,15 +21,13 @@
 #define __u32 unsigned int
 #define __u8 unsigned char
 
-#include "shared/debug.h"
-#include "shared/str.h"
-
 #define NAME_LENGTH 128
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "shared/str.h"
 #include "lcd.h"
 #include "irmanin.h"
 #include "report.h"
diff --git a/server/drivers/t6963.c b/server/drivers/t6963.c
index 3d8edac..3c0c159 100644
--- a/server/drivers/t6963.c
+++ b/server/drivers/t6963.c
@@ -21,8 +21,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-//#include <asm/io.h>
-//#include <sys/perm.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -32,14 +30,11 @@
 #include "t6963.h"
 #include "t6963_font.h"
 
-#include "shared/debug.h"
 #include "report.h"
 #include "lcd_lib.h"
 #include "port.h"
 
 
-//extern int debug_level;
-
 /** private data for the \c t6963 driver */
 typedef struct t6963_private_data {
 	u16 port;
diff --git a/server/drivers/wirz-sli.c b/server/drivers/wirz-sli.c
index 0be71fa..b8f2ac7 100644
--- a/server/drivers/wirz-sli.c
+++ b/server/drivers/wirz-sli.c
@@ -22,11 +22,9 @@
 
 #include "lcd.h"
 #include "wirz-sli.h"
-//#include "drv_base.h"
 #include "report.h"
 #include "lcd_lib.h"
 
-//#include "shared/debug.h"
 #include "shared/str.h"
 
 #define SLI_DEFAULT_DEVICE	"/dev/lcd"