diff -up src/hal-0.5.15/hald/linux/blockdev.c.orig src/hal-0.5.15/hald/linux/blockdev.c
--- src/hal-0.5.15/hald/linux/blockdev.c.orig	2015-08-13 18:03:19.000000000 -0600
+++ src/hal-0.5.15/hald/linux/blockdev.c	2019-08-06 03:30:01.000000000 -0600
@@ -35,6 +35,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <errno.h>
diff -up src/hal-0.5.15/tools/Makefile.in.orig src/hal-0.5.15/tools/Makefile.in
--- src/hal-0.5.15/tools/Makefile.in.orig	2015-08-13 18:09:13.000000000 -0600
+++ src/hal-0.5.15/tools/Makefile.in	2019-08-06 03:28:38.000000000 -0600
@@ -1345,7 +1345,7 @@ uninstall-am: uninstall-binPROGRAMS unin
 
 
 @BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
-@BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@	awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
+@BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@	cpp -fdirectives-only $< | awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "__KEY_T_TYPE") { print substr($$2, 5) } }' > $@
 
 @BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
 @BUILD_KEYMAPS_TRUE@@HAVE_GPERF_TRUE@	awk 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", KEY_" $$1 }' < $< > $@