diff --git a/ChangeLog b/ChangeLog
index f810f34..04f47d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Key:
      * Something changed / fixed
 
 v.0.5dev (ongoing development)
+ * Update driver includes and LDFLAGS (fixed glk and bayrad binding error)
 
 v0.5.3
  + lcdexec: notification when called program finishes
diff --git a/server/drivers/MD8800.c b/server/drivers/MD8800.c
index bdd6fd6..f2d9e83 100644
--- a/server/drivers/MD8800.c
+++ b/server/drivers/MD8800.c
@@ -188,7 +188,6 @@
 #include "MD8800.h"
 
 #include "report.h"
-#include "lcd_lib.h"
 
 /* Constants for userdefchar_mode */
 #define NUM_CCs		0 /* max. number of custom characters */
diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
index ac7bb71..7533e62 100644
--- a/server/drivers/Makefile.am
+++ b/server/drivers/Makefile.am
@@ -18,6 +18,8 @@ AM_LDFLAGS = @LDSHARED@
 ## Forget the libs that the server core requires
 #LIBS =
 
+## Keep the lists sorted!
+
 pkglib_PROGRAMS = @DRIVERS@
 EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 svga t6963 text tyan sli ula200 xosd i2500vfd irtrans
 noinst_LIBRARIES = libLCD.a libbignum.a
@@ -31,16 +33,17 @@ shuttleVFD_CFLAGS =  @LIBUSB_CFLAGS@ $(AM_CFLAGS)
 ula200_CFLAGS =      @LIBFTDI_CFLAGS@ $(AM_CFLAGS)
 i2500vfd_CFLAGS =    @LIBFTDI_CFLAGS@ $(AM_CFLAGS)
 
+bayrad_LDADD =       libLCD.a
 CFontz_LDADD =       libLCD.a libbignum.a
 CFontz633_LDADD =    libLCD.a libbignum.a
 CFontzPacket_LDADD = libLCD.a libbignum.a
 curses_LDADD =       @LIBCURSES@
 CwLnx_LDADD =        libLCD.a libbignum.a
-g15_LDADD =          libLCD.a @LIBG15@
-glcdlib_LDADD =      libLCD.a @LIBGLCD@
+g15_LDADD =          @LIBG15@
+glcdlib_LDADD =      @LIBGLCD@
+glk_LDADD =          libbignum.a
 hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ libbignum.a
 hd44780_DEPENDENCIES = @HD44780_DRIVERS@
-icp_a106_LDADD =     libLCD.a
 imon_LDADD =         libLCD.a
 imonlcd_LDADD =      libLCD.a
 IOWarrior_LDADD =    @LIBUSB_LIBS@ libLCD.a libbignum.a
@@ -48,23 +51,22 @@ irman_LDADD =        @LIBIRMAN@
 lcterm_LDADD =       libLCD.a
 lirc_LDADD =         @LIBLIRC_CLIENT@
 lis_LDADD =          libLCD.a @LIBFTDI_LIBS@ @LIBUSB_LIBS@ @LIBPTHREAD_LIBS@ libbignum.a
-MD8800_LDADD =       libLCD.a
 mtc_s16209x_LDADD =  libLCD.a
 MtxOrb_LDADD =       libLCD.a libbignum.a
-mx5000_LDADD =       libLCD.a @LIBMX5000@
-NoritakeVFD_LDADD =  libLCD.a libbignum.a
+mx5000_LDADD =       @LIBMX5000@
+NoritakeVFD_LDADD =  libbignum.a
 picolcd_LDADD =      @LIBUSB_LIBS@ libLCD.a libbignum.a
 pyramid_LDADD =      libLCD.a
-serialPOS_LDADD =    libLCD.a libbignum.a
+serialPOS_LDADD =    libbignum.a
 serialVFD_LDADD =    libLCD.a libbignum.a
-shuttleVFD_LDADD =   @LIBUSB_LIBS@ libLCD.a libbignum.a
+shuttleVFD_LDADD =   @LIBUSB_LIBS@
 svga_LDADD =         @LIBSVGA@
 t6963_LDADD =        libLCD.a
 tyan_LDADD =         libLCD.a libbignum.a
-ula200_LDADD =       libLCD.a @LIBFTDI_LIBS@
+ula200_LDADD =       @LIBFTDI_LIBS@
 sli_LDADD =          libLCD.a
 xosd_LDADD =         @LIBXOSD@ libbignum.a
-i2500vfd_LDADD =     libLCD.a @LIBFTDI_LIBS@
+i2500vfd_LDADD =     @LIBFTDI_LIBS@
 
 libLCD_a_SOURCES =   lcd_lib.h lcd_lib.c
 libbignum_a_SOURCES = adv_bignum.h  adv_bignum.c 
diff --git a/server/drivers/NoritakeVFD.c b/server/drivers/NoritakeVFD.c
index 3d8f296..eac2efd 100644
--- a/server/drivers/NoritakeVFD.c
+++ b/server/drivers/NoritakeVFD.c
@@ -63,7 +63,6 @@
 #include "lcd.h"
 #include "NoritakeVFD.h"
 #include "report.h"
-#include "lcd_lib.h"
 #include "adv_bignum.h"
 
 
diff --git a/server/drivers/g15.c b/server/drivers/g15.c
index 5232d6b..cdac71b 100644
--- a/server/drivers/g15.c
+++ b/server/drivers/g15.c
@@ -46,7 +46,6 @@
 #include "g15.h"
 
 #include "report.h"
-#include "lcd_lib.h"
 
 /* Vars for the server core */
 MODULE_EXPORT char *api_version = API_VERSION;
diff --git a/server/drivers/glcdlib.c b/server/drivers/glcdlib.c
index 6fd01d4..2865a34 100644
--- a/server/drivers/glcdlib.c
+++ b/server/drivers/glcdlib.c
@@ -33,7 +33,6 @@
 #endif
 
 #include "lcd.h"
-#include "lcd_lib.h"
 #include "shared/debug.h"
 //#define DEBUG
 #include "report.h"
diff --git a/server/drivers/icp_a106.c b/server/drivers/icp_a106.c
index b1602f2..07eb2c3 100644
--- a/server/drivers/icp_a106.c
+++ b/server/drivers/icp_a106.c
@@ -47,7 +47,6 @@
 #endif
 
 #include "lcd.h"
-#include "lcd_lib.h"
 #include "icp_a106.h"
 #include "report.h"
 
diff --git a/server/drivers/mx5000.c b/server/drivers/mx5000.c
index cae3aaf..2e90126 100644
--- a/server/drivers/mx5000.c
+++ b/server/drivers/mx5000.c
@@ -46,7 +46,6 @@
 #include "lcd.h"
 #include "mx5000.h"
 #include "report.h"
-#include "lcd_lib.h"
 
 
 /* Internal functions */
diff --git a/server/drivers/serialPOS.c b/server/drivers/serialPOS.c
index 27ae02c..eb2278b 100644
--- a/server/drivers/serialPOS.c
+++ b/server/drivers/serialPOS.c
@@ -75,7 +75,6 @@ get_info	Implemented.
 #endif
 
 #include "lcd.h"
-#include "lcd_lib.h"
 #include "serialPOS.h"
 #include "adv_bignum.h"
 
diff --git a/server/drivers/ula200.c b/server/drivers/ula200.c
index bcb8f0e..6644785 100644
--- a/server/drivers/ula200.c
+++ b/server/drivers/ula200.c
@@ -113,7 +113,6 @@
 #include "lcd.h"
 #include "ula200.h"
 #include "report.h"
-#include "lcd_lib.h"
 #include "timing.h"