diff --git a/server/drivers/CFontzPacket.c b/server/drivers/CFontzPacket.c
index d8fb34a..b98a97b 100644
--- a/server/drivers/CFontzPacket.c
+++ b/server/drivers/CFontzPacket.c
@@ -1068,7 +1068,7 @@ CFontzPacket_hbar (Driver *drvthis, int x, int y, int len, int promille, int opt
 /*
  * Inits big numbers
  */
-void
+static void
 CFontzPacket_init_num(Driver *drvthis)
 {
 PrivateData *p = drvthis->private_data;
diff --git a/server/drivers/CwLnx.c b/server/drivers/CwLnx.c
index 9fbf629..1ae89af 100644
--- a/server/drivers/CwLnx.c
+++ b/server/drivers/CwLnx.c
@@ -124,7 +124,7 @@ static void CwLnx_linewrap(int fd, int on);
 static void CwLnx_autoscroll(int fd, int on);
 static void CwLnx_hidecursor(int fd);
 
-void CwLnx_draw_frame(Driver *drvthis, char *dat);
+static void CwLnx_draw_frame(Driver *drvthis, char *dat);
 
 #define LCD_CMD			254
 #define LCD_CMD_END		253
@@ -815,7 +815,8 @@ void Set_Insert(int fd, int row, int col)
  *
  * _flush_box is not an API entry anymore.
  * 
-void CwLnx_flush_box(int lft, int top, int rgt, int bot)
+static void
+CwLnx_flush_box(int lft, int top, int rgt, int bot)
 {
     int y;
 
@@ -916,7 +917,8 @@ CwLnx_set_brightness(Driver * drvthis, int state, int promille)
 /*********************************************************
  * Toggle the built-in linewrapping feature
  */
-static void CwLnx_linewrap(int fd, int on)
+static void
+CwLnx_linewrap(int fd, int on)
 {
     if (on)
 	    Enable_Wrap(fd);
@@ -928,7 +930,8 @@ static void CwLnx_linewrap(int fd, int on)
 /****************************************************************
  * Toggle the built-in automatic scrolling feature
  */
-static void CwLnx_autoscroll(int fd, int on)
+static void
+CwLnx_autoscroll(int fd, int on)
 {
     if (on)
 	    Enable_Scroll(fd);
@@ -940,7 +943,8 @@ static void CwLnx_autoscroll(int fd, int on)
 /*******************************************************************
  * Get rid of the blinking curson
  */
-static void CwLnx_hidecursor(int fd)
+static void
+CwLnx_hidecursor(int fd)
 {
 	Disable_Cursor(fd);
 }
@@ -950,7 +954,8 @@ static void CwLnx_hidecursor(int fd)
  * NOTAPI: Inits vertical bars...
  * This was part of API in 0.4 and removed in 0.5
  */
-void CwLnx_init_vbar(Driver * drvthis)
+static void
+CwLnx_init_vbar(Driver * drvthis)
 {
     PrivateData * p = drvthis->private_data;
 
@@ -1027,7 +1032,8 @@ void CwLnx_init_vbar(Driver * drvthis)
  * NOTAPI: Inits horizontal bars...
  * This was part of API in 0.4 and removed in 0.5
  */
-void CwLnx_init_hbar(Driver * drvthis)
+static void
+CwLnx_init_hbar(Driver * drvthis)
 {
     PrivateData * p = drvthis->private_data;
 
@@ -1334,7 +1340,8 @@ CwLnx_icon(Driver * drvthis, int x, int y, int icon)
  *
  * Input is a character array, sized CwLnx->wid*CwLnx->hgt
  */
-void CwLnx_draw_frame(Driver *drvthis, char *dat)
+static void
+CwLnx_draw_frame(Driver *drvthis, char *dat)
 {
     PrivateData * p = drvthis->private_data;
 
diff --git a/server/drivers/CwLnx.h b/server/drivers/CwLnx.h
index 046f9e9..b43502d 100644
--- a/server/drivers/CwLnx.h
+++ b/server/drivers/CwLnx.h
@@ -54,8 +54,8 @@
 
 MODULE_EXPORT int  CwLnx_init(Driver * drvthis);
 MODULE_EXPORT void CwLnx_close(Driver * drvthis);
-/* */ MODULE_EXPORT int  CwLnx_width (Driver * drvthis);
-/* */ MODULE_EXPORT int  CwLnx_height (Driver * drvthis);
+MODULE_EXPORT int  CwLnx_width (Driver * drvthis);
+MODULE_EXPORT int  CwLnx_height (Driver * drvthis);
 MODULE_EXPORT void CwLnx_clear (Driver * drvthis);
 MODULE_EXPORT void CwLnx_flush(Driver * drvthis);
 MODULE_EXPORT void CwLnx_string(Driver * drvthis, int x, int y, char string[]);
@@ -70,11 +70,5 @@ MODULE_EXPORT void CwLnx_set_contrast(Driver * drvthis, int contrast);
 MODULE_EXPORT void CwLnx_clear(Driver * drvthis);
 MODULE_EXPORT void CwLnx_backlight(Driver * drvthis, int on);
 
-// MODULE_EXPORT void CwLnx_flush_box(Driver * drvthis, int lft, int top, int rgt, int bot);
-// MODULE_EXPORT void CwLnx_init_vbar( Driver * drvthis);
-// MODULE_EXPORT void CwLnx_init_hbar( Driver * drvthis);
-// MODULE_EXPORT void CwLnx_init_num( Driver * drvthis);
-// MODULE_EXPORT void CwLnx_draw_frame(Driver * drvthis, char *dat);
-
 #endif
 
diff --git a/server/drivers/NoritakeVFD.c b/server/drivers/NoritakeVFD.c
index 388a1ed..686a745 100644
--- a/server/drivers/NoritakeVFD.c
+++ b/server/drivers/NoritakeVFD.c
@@ -294,24 +294,6 @@ NoritakeVFD_flush (Driver *drvthis)
 }
 
 
-MODULE_EXPORT void
-NoritakeVFD_flush_box (Driver *drvthis, int lft, int top, int rgt, int bot)
-{
-	PrivateData *p = drvthis->private_data;
-	int y;
-	char out[LCD_MAX_WIDTH];
-
-	debug(RPT_DEBUG, "%s: flush_box(%i,%i)-(%i,%i)", __FUNCTION__, lft, top, rgt, bot);
-
-	for (y = top; y <= bot; y++) {
-		int pos = y*p->width;
-		snprintf(out, sizeof(out), "%c%c%c", 0x1B, 'H', pos+lft);
-		write(p->fd, out, 3);
-		write(p->fd, p->framebuf + (y * p->width) + lft, rgt - lft + 1);
-	}
-
-}
-
 /////////////////////////////////////////////////////////////////
 // Prints a character on the lcd display, at position (x,y).  The
 // upper-left is (1,1), and the lower right should be (20,4).
@@ -402,7 +384,7 @@ NoritakeVFD_reboot (Driver *drvthis)
 /////////////////////////////////////////////////////////////////
 // Sets up for vertical bars.  Call before NoritakeVFD->vbar()
 //
-void
+static void
 NoritakeVFD_init_vbar (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
@@ -475,7 +457,7 @@ NoritakeVFD_init_vbar (Driver *drvthis)
 /////////////////////////////////////////////////////////////////
 // Inits horizontal bars...
 //
-void
+static void
 NoritakeVFD_init_hbar (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
@@ -658,7 +640,7 @@ NoritakeVFD_icon (Driver *drvthis, int x, int y, int icon)
 //
 // Input is a character array, sized NoritakeVFD->width*NoritakeVFD->height
 //
-void
+static void
 NoritakeVFD_draw_frame (Driver *drvthis, unsigned char *dat)
 {
 	PrivateData *p = drvthis->private_data;
diff --git a/server/drivers/bayrad.c b/server/drivers/bayrad.c
index d300d4e..2fe47df 100644
--- a/server/drivers/bayrad.c
+++ b/server/drivers/bayrad.c
@@ -43,6 +43,7 @@
 
 #define BAYRAD_DEFAULT_DEVICE	"/dev/lcd"
 
+
 //////////////////////////////////////////////////////////////////////////
 ////////////////////// Base "class" to derive from ///////////////////////
 //////////////////////////////////////////////////////////////////////////
@@ -362,7 +363,7 @@ bayrad_backlight(Driver * drvthis, int on)
 //////////////////////////////////////////////////////////////////////
 // Tells the driver to get ready for vertical bargraphs.
 //
-void
+static void
 bayrad_init_vbar(Driver * drvthis)
 {
   PrivateData *p = drvthis->private_data;
@@ -460,7 +461,7 @@ bayrad_init_vbar(Driver * drvthis)
 //////////////////////////////////////////////////////////////////////
 // Tells the driver to get ready for horizontal bargraphs.
 //
-void
+static void
 bayrad_init_hbar(Driver * drvthis)
 {
   PrivateData *p = drvthis->private_data;
@@ -538,7 +539,7 @@ bayrad_init_hbar(Driver * drvthis)
 //////////////////////////////////////////////////////////////////////
 // Tells the driver to get ready for big numbers, if possible.
 //
-void
+static void
 bayrad_init_num(Driver * drvthis)
 {
   //PrivateData *p = drvthis->private_data;
diff --git a/server/drivers/bayrad.h b/server/drivers/bayrad.h
index 48b1bab..1457d2c 100644
--- a/server/drivers/bayrad.h
+++ b/server/drivers/bayrad.h
@@ -31,7 +31,4 @@ MODULE_EXPORT void bayrad_backlight(Driver * drvthis, int promille);
 
 MODULE_EXPORT const char *bayrad_get_key(Driver * drvthis);
 
-MODULE_EXPORT void bayrad_init_vbar(Driver * drvthis);
-MODULE_EXPORT void bayrad_init_hbar(Driver * drvthis);
-
 #endif
diff --git a/server/drivers/debug.c b/server/drivers/debug.c
index 5a1beec..fab9222 100644
--- a/server/drivers/debug.c
+++ b/server/drivers/debug.c
@@ -181,19 +181,7 @@ debug_backlight (Driver *drvthis, int on)
 	report(RPT_INFO, "%s(%i)", __FUNCTION__, on);
 }
 
-MODULE_EXPORT void
-debug_init_vbar (Driver *drvthis)
-{
-	report(RPT_INFO, "%s()", __FUNCTION__);
-}
-
-MODULE_EXPORT void
-debug_init_hbar (Driver *drvthis)
-{
-	report(RPT_INFO, "%s()", __FUNCTION__);
-}
-
-MODULE_EXPORT void
+static void
 debug_init_num (Driver *drvthis)
 {
 	report(RPT_INFO, "%s()", __FUNCTION__);
@@ -211,6 +199,12 @@ debug_set_char (Driver *drvthis, int n, char *dat)
 	report(RPT_INFO, "%s(%i,data)", __FUNCTION__, n);
 }
 
+static void
+debug_init_vbar (Driver *drvthis)
+{
+	report(RPT_INFO, "%s()", __FUNCTION__);
+}
+
 /////////////////////////////////////////////////////////////////
 // Draws a vertical bar; erases entire column onscreen.
 //
@@ -230,6 +224,12 @@ debug_vbar (Driver *drvthis, int x, int y, int len, int promille, int options)
 	}
 }
 
+static void
+debug_init_hbar (Driver *drvthis)
+{
+	report(RPT_INFO, "%s()", __FUNCTION__);
+}
+
 /////////////////////////////////////////////////////////////////
 // Draws a horizontal bar to the right.
 //
diff --git a/server/drivers/debug.h b/server/drivers/debug.h
index 8a56311..da9ac90 100644
--- a/server/drivers/debug.h
+++ b/server/drivers/debug.h
@@ -24,8 +24,4 @@ MODULE_EXPORT void debug_backlight (Driver *drvthis, int promille);
 
 MODULE_EXPORT const char *debug_get_key (Driver *drvthis);
 
-MODULE_EXPORT void debug_init_vbar (Driver *drvthis);
-MODULE_EXPORT void debug_init_hbar (Driver *drvthis);
-MODULE_EXPORT void debug_init_num (Driver *drvthis);
-
 #endif
diff --git a/server/drivers/glk.c b/server/drivers/glk.c
index ab84077..aab1795 100644
--- a/server/drivers/glk.c
+++ b/server/drivers/glk.c
@@ -338,7 +338,7 @@ glk_flush(Driver *drvthis)
         /* Write accumulated string */
         glkputl(p->PortFD, GLKCommand, 0x79, xs * 6 + 1, y * 8, EOF);
         glkputa(p->PortFD, x - xs, ps);
-        debug(RPT_DEBUG, "draw_frame: Writing at (%d,%d) for %d", xs, y, x - xs);
+        debug(RPT_DEBUG, "flush: Writing at (%d,%d) for %d", xs, y, x - xs);
         xs = -1;
       } else if ((*qf != *pf) && (xs < 0)) {
         /* Start new string of changes */
@@ -351,7 +351,7 @@ glk_flush(Driver *drvthis)
       /* Write accumulated line */
       glkputl(p->PortFD, GLKCommand, 0x79, xs * 6 + 1, y * 8, EOF);
       glkputa(p->PortFD, p->width - xs, ps);
-      debug(RPT_DEBUG, "draw_frame: Writing at (%d,%d) for %d", xs, y, p->width - xs);
+      debug(RPT_DEBUG, "flush: Writing at (%d,%d) for %d", xs, y, p->width - xs);
     }
   }  /* For y */
 }
@@ -495,7 +495,7 @@ glk_output(Driver *drvthis, int on)
 //////////////////////////////////////////////////////////////////////
 // Tells the driver to get ready for vertical bargraphs.
 //
-MODULE_EXPORT void
+static void
 glk_init_vbar(Driver *drvthis)
 {
   //PrivateData *p = drvthis->private_data;
@@ -506,7 +506,7 @@ glk_init_vbar(Driver *drvthis)
 //////////////////////////////////////////////////////////////////////
 // Tells the driver to get ready for horizontal bargraphs.
 //
-MODULE_EXPORT void
+static void
 glk_init_hbar(Driver *drvthis)
 {
   //PrivateData *p = drvthis->private_data;
@@ -517,7 +517,7 @@ glk_init_hbar(Driver *drvthis)
 //////////////////////////////////////////////////////////////////////
 // Tells the driver to get ready for big numbers, if possible.
 //
-MODULE_EXPORT void
+static void
 glk_init_num(Driver *drvthis)
 {
   PrivateData *p = drvthis->private_data;
diff --git a/server/drivers/glk.h b/server/drivers/glk.h
index 901be17..6c07667 100644
--- a/server/drivers/glk.h
+++ b/server/drivers/glk.h
@@ -28,8 +28,4 @@ MODULE_EXPORT void glk_output(Driver *drvthis, int on);
 
 MODULE_EXPORT const char *glk_get_key(Driver *drvthis);
 
-MODULE_EXPORT void glk_init_vbar(Driver *drvthis);
-MODULE_EXPORT void glk_init_hbar(Driver *drvthis);
-MODULE_EXPORT void glk_init_num(Driver *drvthis);
-
 #endif
diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c
index e949ac7..3b83537 100644
--- a/server/drivers/hd44780.c
+++ b/server/drivers/hd44780.c
@@ -775,7 +775,7 @@ HD44780_hbar (Driver *drvthis, int x, int y, int len, int promille, int options)
 /////////////////////////////////////////////////////////////////
 // Sets up for big numbers.
 //
-MODULE_EXPORT void
+static void
 HD44780_init_num (Driver *drvthis)
 {
 	PrivateData *p = (PrivateData *) drvthis->private_data;
diff --git a/server/drivers/hd44780.h b/server/drivers/hd44780.h
index 33fe546..c551c45 100644
--- a/server/drivers/hd44780.h
+++ b/server/drivers/hd44780.h
@@ -39,8 +39,4 @@ MODULE_EXPORT void HD44780_output (Driver *drvthis, int state);
 
 MODULE_EXPORT const char * HD44780_get_key (Driver *drvthis);
 
-static        void HD44780_init_vbar (Driver *drvthis);
-static        void HD44780_init_hbar (Driver *drvthis);
-static        void HD44780_init_num (Driver *drvthis);
-
 #endif
diff --git a/server/drivers/lb216.c b/server/drivers/lb216.c
index 3011a0b..68c2854 100644
--- a/server/drivers/lb216.c
+++ b/server/drivers/lb216.c
@@ -383,7 +383,7 @@ LB216_string (Driver * drvthis, int x, int y, char string[])
 /////////////////////////////////////////////////////////////////
 // Sets up for vertical bars.  Call before LB216->vbar()
 //
-MODULE_EXPORT void
+static void
 LB216_init_vbar(Driver * drvthis)
 {
   PrivateData *p = drvthis->private_data;
@@ -473,7 +473,7 @@ LB216_init_vbar(Driver * drvthis)
 /////////////////////////////////////////////////////////////////
 // Inits horizontal bars...
 //
-MODULE_EXPORT void
+static void
 LB216_init_hbar(Driver * drvthis)
 {
   PrivateData *p = drvthis->private_data;
diff --git a/server/drivers/lb216.h b/server/drivers/lb216.h
index 7ee712a..6958cb7 100644
--- a/server/drivers/lb216.h
+++ b/server/drivers/lb216.h
@@ -23,8 +23,4 @@ MODULE_EXPORT void LB216_set_char(Driver * drvthis, int n, char *dat);
 
 MODULE_EXPORT void LB216_backlight(Driver * drvthis, int on);
 
-MODULE_EXPORT void LB216_init_vbar(Driver * drvthis);
-MODULE_EXPORT void LB216_init_hbar(Driver * drvthis);
-MODULE_EXPORT void LB216_init_num(Driver * drvthis);
-
 #endif
diff --git a/server/drivers/lcdm001.c b/server/drivers/lcdm001.c
index 1081136..3734a0b 100644
--- a/server/drivers/lcdm001.c
+++ b/server/drivers/lcdm001.c
@@ -307,8 +307,6 @@ lcdm001_flush (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
-	// Next 4 lines are moved from draw_frame (Joris)
-
         //TODO: Check whether this is still correct
 
 	write(p->fd, p->framebuf, p->width * p->height);
diff --git a/server/drivers/lcterm.c b/server/drivers/lcterm.c
index 5e1128f..34711e9 100644
--- a/server/drivers/lcterm.c
+++ b/server/drivers/lcterm.c
@@ -529,7 +529,7 @@ lcterm_hbar(Driver *drvthis, int x, int y, int len, int promille, int options)
 /////////////////////////////////////////////////////////////////
 // Sets up for big numbers.
 //
-MODULE_EXPORT void
+static void
 lcterm_init_num (Driver *drvthis)
 {
   PrivateData *p = (PrivateData *) drvthis->private_data;
diff --git a/server/drivers/ms6931.c b/server/drivers/ms6931.c
index 2c230c0..6b2ad4c 100644
--- a/server/drivers/ms6931.c
+++ b/server/drivers/ms6931.c
@@ -117,7 +117,7 @@ ms6931_attn(int fd, int len)
 //
 // Input is a character array, sized width*height
 //
-void
+static void
 ms6931_draw_frame (Driver *drvthis, unsigned char *dat)
 {
 	PrivateData *p = drvthis->private_data;
diff --git a/server/drivers/serialVFD.c b/server/drivers/serialVFD.c
index 9ddf158..d17cd0d 100644
--- a/server/drivers/serialVFD.c
+++ b/server/drivers/serialVFD.c
@@ -235,11 +235,11 @@ MODULE_EXPORT int supports_multiple = 0;
 MODULE_EXPORT char *symbol_prefix = "serialVFD_";
 
 /* Internal functions */
-void serialVFD_init_vbar (Driver *drvthis);
-void serialVFD_init_hbar (Driver *drvthis);
-void serialVFD_draw_frame (Driver *drvthis, char *dat);
-void serialVFD_put_brightness (Driver *drvthis);
-void serialVFD_put_char (Driver *drvthis, int n);
+static void serialVFD_init_vbar (Driver *drvthis);
+static void serialVFD_init_hbar (Driver *drvthis);
+static void serialVFD_draw_frame (Driver *drvthis, char *dat);
+static void serialVFD_put_brightness (Driver *drvthis);
+static void serialVFD_put_char (Driver *drvthis, int n);
 
 // Opens com port and sets baud correctly...
 //
@@ -663,7 +663,7 @@ serialVFD_set_brightness (Driver *drvthis, int state, int brightness)
 	}
 }
 
-void
+static void
 serialVFD_put_brightness (Driver *drvthis)
 {	// set hardware brightness
 	PrivateData *p = drvthis->private_data;
@@ -737,7 +737,7 @@ serialVFD_set_char (Driver *drvthis, int n, char *dat)
 		p->custom_char_changed[n] = 1;
 }
 
-void
+static void
 serialVFD_put_char (Driver *drvthis, int n)
 {	// put char in display
 	PrivateData *p = drvthis->private_data;
@@ -755,7 +755,7 @@ serialVFD_put_char (Driver *drvthis, int n)
 //
 // Input is a character array, sized serialVFD->width*serialVFD->height
 //
-void
+static void
 serialVFD_draw_frame (Driver *drvthis, char *dat)
 {
 	PrivateData *p = drvthis->private_data;
@@ -907,7 +907,7 @@ serialVFD_icon (Driver *drvthis, int x, int y, int icon)
 /////////////////////////////////////////////////////////////////
 // Sets up for vertical bars.  Call before serialVFD->vbar()
 //
-void
+static void
 serialVFD_init_vbar (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
@@ -980,7 +980,7 @@ serialVFD_init_vbar (Driver *drvthis)
 /////////////////////////////////////////////////////////////////
 // Inits horizontal bars...
 //
-void
+static void
 serialVFD_init_hbar (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;