diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
index 5be90d9..b9966eb 100644
--- a/server/drivers/Makefile.am
+++ b/server/drivers/Makefile.am
@@ -30,7 +30,6 @@ CFontz633_LDADD =    libLCD.a
 CFontzPacket_LDADD = libLCD.a
 curses_LDADD =       @LIBCURSES@
 CwLnx_LDADD =        libLCD.a
-CwLnx_SOURCES =      lcd.h CwLnx.c CwLnx.h report.h
 glcdlib_LDADD =      libLCD.a @LIBGLCD@
 hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@ @libusb_libs@
 hd44780_DEPENDENCIES = @HD44780_DRIVERS@
@@ -51,40 +50,41 @@ xosd_LDADD =         @LIBXOSD@
 libLCD_a_SOURCES =   lcd_lib.h lcd_lib.c
 libbignum_a_SOURCES = adv_bignum.h  adv_bignum.c 
 
-bayrad_SOURCES =     lcd.h bayrad.h bayrad.c report.h
-CFontz_SOURCES =     lcd.h CFontz.c CFontz.h CFontz-charmap.h report.h
-CFontz633_SOURCES =  lcd.h CFontz633.c CFontz633.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h
-CFontzPacket_SOURCES = lcd.h CFontzPacket.c CFontzPacket.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h
+bayrad_SOURCES =     lcd.h lcd_lib.h bayrad.h bayrad.c report.h
+CFontz_SOURCES =     lcd.h lcd_lib.h CFontz.c CFontz.h CFontz-charmap.h report.h
+CFontz633_SOURCES =  lcd.h lcd_lib.h CFontz633.c CFontz633.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h
+CFontzPacket_SOURCES = lcd.h lcd_lib.h CFontzPacket.c CFontzPacket.h CFontz-charmap.h CFontz633io.c CFontz633io.h report.h
 curses_SOURCES =     lcd.h curses_drv.h curses_drv.c report.h
-glcdlib_SOURCES =    lcd.h glcdlib.h glcdlib.c report.h
+CwLnx_SOURCES =      lcd.h lcd_lib.h CwLnx.c CwLnx.h report.h
+glcdlib_SOURCES =    lcd.h lcd_lib.h glcdlib.h glcdlib.c report.h
 glk_SOURCES =        lcd.h glk.c glk.h glkproto.c glkproto.h report.h
-hd44780_SOURCES =    lcd.h hd44780.h hd44780.c hd44780-drivers.h hd44780-low.h hd44780-charmap.h report.h
+hd44780_SOURCES =    lcd.h lcd_lib.h hd44780.h hd44780.c hd44780-drivers.h hd44780-low.h hd44780-charmap.h report.h
 EXTRA_hd44780_SOURCES = hd44780-4bit.c hd44780-4bit.h hd44780-ext8bit.c hd44780-ext8bit.h lcd_sem.c lcd_sem.h hd44780-serialLpt.c hd44780-serialLpt.h hd44780-winamp.c hd44780-winamp.h hd44780-picanlcd.c hd44780-picanlcd.h hd44780-bwct-usb.c hd44780-bwct-usb.h hd44780-lcdserializer.c hd44780-lcdserializer.h hd44780-lis2.c hd44780-lis2.h hd44780-i2c.c hd44780-i2c.h port.h lpt-port.h timing.h
 
-icp_a106_SOURCES =   lcd.h icp_a106.c icp_a106.h report.h
-imon_SOURCES =       lcd.h imon.h imon.c report.h
+icp_a106_SOURCES =   lcd.h lcd_lib.h icp_a106.c icp_a106.h report.h
+imon_SOURCES =       lcd.h lcd_lib.h imon.h imon.c report.h
 IOWarrior_SOURCES =  lcd.h lcd_lib.h hd44780-charmap.h IOWarrior.c IOWarrior.h report.h
 irman_SOURCES =      lcd.h irmanin.c irmanin.h report.h
 joy_SOURCES =        lcd.h joy.c joy.h port.h report.h
 lb216_SOURCES =      lcd.h lb216.c lb216.h report.h
 lcdm001_SOURCES =    lcd.h lcdm001.c lcdm001.h report.h
-lcterm_SOURCES =     lcd.h lcterm.c lcterm.h report.h
+lcterm_SOURCES =     lcd.h lcd_lib.h lcterm.c lcterm.h report.h
 lirc_SOURCES =       lcd.h lircin.c lircin.h report.h
-ms6931_SOURCES =     lcd.h ms6931.h ms6931.c report.h
-mtc_s16209x_SOURCES =  lcd.h mtc_s16209x.c mtc_s16209x.h report.h
-MtxOrb_SOURCES =     lcd.h MtxOrb.c MtxOrb.h report.h bigfont.h
-NoritakeVFD_SOURCES = lcd.h NoritakeVFD.c NoritakeVFD.h report.h
+ms6931_SOURCES =     lcd.h lcd_lib.h ms6931.h ms6931.c report.h
+mtc_s16209x_SOURCES =  lcd.h lcd_lib.h mtc_s16209x.c mtc_s16209x.h report.h
+MtxOrb_SOURCES =     lcd.h lcd_lib.h MtxOrb.c MtxOrb.h report.h bigfont.h
+NoritakeVFD_SOURCES = lcd.h lcd_lib.h NoritakeVFD.c NoritakeVFD.h report.h
 pylcd_SOURCES =      lcd.h pylcd.c pylcd.h
 sed1330_SOURCES =    lcd.h sed1330.h sed1330.c port.h lpt-port.h timing.h report.h
 sed1520_SOURCES =    lcd.h sed1520.c sed1520.h sed1520fm.c sed1520fm.h port.h report.h
-serialVFD_SOURCES =  lcd.h serialVFD.c serialVFD.h report.h adv_bignum.h
+serialVFD_SOURCES =  lcd.h lcd_lib.h serialVFD.c serialVFD.h report.h adv_bignum.h
 stv5730_SOURCES =    lcd.h stv5730.c stv5730.h report.h
 svga_SOURCES =       lcd.h svgalib_drv.c svgalib_drv.h report.h
-t6963_SOURCES =      lcd.h t6963.c t6963.h t6963_font.h report.h
+t6963_SOURCES =      lcd.h lcd_lib.h t6963.c t6963.h t6963_font.h report.h
 text_SOURCES =       lcd.h text.h text.c report.h
-tyan_SOURCES =       lcd.h tyan_lcdm.h tyan_lcdm.c report.h
-ula200_SOURCES =     lcd.h ula200.h ula200.c report.h
-wirz_sli_SOURCES =   lcd.h wirz-sli.h wirz-sli.c report.h
+tyan_SOURCES =       lcd.h lcd_lib.h tyan_lcdm.h tyan_lcdm.c report.h
+ula200_SOURCES =     lcd.h lcd_lib.h ula200.h ula200.c report.h
+wirz_sli_SOURCES =   lcd.h lcd_lib.h wirz-sli.h wirz-sli.c report.h
 xosd_SOURCES =       lcd.h xosdlib_drv.c xosdlib_drv.h report.h
 
 AM_CPPFLAGS = -I$(top_srcdir)