diff --git a/configure.ac b/configure.ac
index 38b3e8b9..1949ef62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ AC_CHECK_LIB(X11, XOpenDisplay,
 
 AC_CHECK_FUNCS([getaddrinfo posix_openpt ptsname setresuid strsignal updwtmpx fstatat dirfd futimes])
 AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [[#include <time.h>]])
+AC_CHECK_HEADERS([sys/auxv.h asm/hwcap.h])
 AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Define if clock_gettime() is available])])
 
 AC_CACHE_CHECK([for SO_PEERCRED and dependencies], [x_cv_linux_so_peercred], [
diff --git a/unix/uxutils.c b/unix/uxutils.c
index fcbcc4d4..7b63842e 100644
--- a/unix/uxutils.c
+++ b/unix/uxutils.c
@@ -1,6 +1,8 @@
+#include "putty.h"
 #include "ssh.h"
 
-#if defined __linux__ && (defined __arm__ || defined __aarch64__)
+#if defined __linux__ && (defined __arm__ || defined __aarch64__) && \
+    HAVE_SYS_AUXV_H && HAVE_ASM_HWCAP_H
 
 #include <sys/auxv.h>
 #include <asm/hwcap.h>