diff --git a/src/shared/tests.h b/src/shared/tests.h
index 07e05bf2676ae..1572ca71022f0 100644
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include <sys/prctl.h>
+#include <unistd.h>
 
 #include "sd-daemon.h"
 
diff --git a/tools/check-version-history.py b/tools/check-version-history.py
index c4d4b3e1ec033..d4a87df3555f7 100644
--- a/tools/check-version-history.py
+++ b/tools/check-version-history.py
@@ -3,7 +3,12 @@
 
 import os
 import sys
-import lxml.etree as tree
+
+try:
+    import lxml.etree as tree
+except ImportError as e:
+    print(str(e), file=sys.stderr)
+    sys.exit(77)
 
 _parser = tree.XMLParser(resolve_entities=False)
 tree.set_default_parser(_parser)