diff --git a/acinclude.m4 b/acinclude.m4
index d9bf369..7cce4aa 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -119,7 +119,11 @@ dnl				else
 			actdrivers=["$actdrivers lb216"]
 			;;
 		hd44780)
-			DRIVERS="$DRIVERS hd44780${SO}"
+			if test "$ac_cv_port_have_lpt" = yes ; then
+				DRIVERS="$DRIVERS hd44780.o hd44780-4bit.o hd44780-ext8bit.o lcd_sem.o hd44780-serialLpt.o hd44780-winamp.o hd44780-picanlcd.o"
+			else
+				DRIVERS="$DRIVERS hd44780.o hd44780-picanlcd.o"
+			fi
 			actdrivers=["$actdrivers hd44780"]
 			;;
 		joy)
diff --git a/server/drivers/hd44780-drivers.h b/server/drivers/hd44780-drivers.h
index 42baa23..8b8c654 100644
--- a/server/drivers/hd44780-drivers.h
+++ b/server/drivers/hd44780-drivers.h
@@ -11,10 +11,12 @@
 #define HD44780_DRIVERS_H
 
 // hd44780 specific header files
-#include "hd44780-4bit.h"
-#include "hd44780-ext8bit.h"
-#include "hd44780-serialLpt.h"
-#include "hd44780-winamp.h"
+#ifdef HAVE_PCSTYLE_LPT_CONTROL
+# include "hd44780-4bit.h"
+# include "hd44780-ext8bit.h"
+# include "hd44780-serialLpt.h"
+# include "hd44780-winamp.h"
+#endif
 #include "hd44780-picanlcd.h"
 // add new connection type header files here
 
@@ -23,10 +25,12 @@ static const ConnectionMapping connectionMapping[] = {
 	// string to identify connection on command line
 	// your initialisation function
 	// help string for your particular connection
+#ifdef HAVE_PCSTYLE_LPT_CONTROL
 	{"4bit", hd_init_4bit, "\tnone\n"},
 	{"8bit", hd_init_ext8bit, "\tnone\n"},
 	{"serialLpt", hd_init_serialLpt, "\tnone\n"},
 	{"winamp", hd_init_winamp, "\tnone\n"},
+#endif
 	{"picanlcd", hd_init_picanlcd, "\tnone\n"},
 		 // add new connection types and their string specifier here
 		 // default, end of structure element (do not delete)
diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c
index 8f7d922..66c5bdd 100644
--- a/server/drivers/hd44780.c
+++ b/server/drivers/hd44780.c
@@ -74,7 +74,6 @@
 #include "hd44780.h"
 #include "report.h"
 
-#include "port.h"
 #include "timing.h"
 #include "hd44780-low.h"
 #include "hd44780-drivers.h"