diff --git a/server/drivers/hd44780-low.h b/server/drivers/hd44780-low.h
index 10edcd4..48223df 100644
--- a/server/drivers/hd44780-low.h
+++ b/server/drivers/hd44780-low.h
@@ -314,4 +314,6 @@ void common_init(PrivateData *p, unsigned char if_bit);
 
 #define HSCROLLAMOUNT	0x80	/* Only reachable with EXTREG set */
 
+#define LADDR		0x20	/* Default Lineaddress in ext_mode */
+
 #endif
diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c
index 107dceb..8e8dc63 100644
--- a/server/drivers/hd44780.c
+++ b/server/drivers/hd44780.c
@@ -53,8 +53,10 @@
 
 /*
  * Uncomment one of the lines below to select your desired delay generation
- * mechanism. If both defines are commented, the original I/O read timing
- * loop is used. Using DELAY_NANOSLEEP  seems to provide the best performance.
+ * mechanism. Using DELAY_NANOSLEEP  seems to provide the best performance.
+ *
+ * Setting this here, overrides the set or selected algorithm in timing.h.
+ * FIXME: Is this on purpose?
  */
 //#define DELAY_GETTIMEOFDAY
 #define DELAY_NANOSLEEP
@@ -63,9 +65,6 @@
 /* Default parallel port address */
 #define LPTPORT	 0x378
 
-/* Default Lineaddress in ext_mode */
-#define LADDR 0x20
-
 /* Autorepeat values */
 #define KEYPAD_AUTOREPEAT_DELAY 500
 #define KEYPAD_AUTOREPEAT_FREQ 15