diff --git a/configure.ac b/configure.ac
index caee4e4..666a8a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ # Checks for libraries.
 
 # Checks for header files.
 AC_HEADER_STDC
+AC_CHECK_HEADERS([elf.h] [elf_abi.h])
 
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
diff --git a/src/vloaduc.c b/src/vloaduc.c
index ff281e8..9f3e17e 100644
--- a/src/vloaduc.c
+++ b/src/vloaduc.c
@@ -12,12 +12,17 @@ #include "v1kregs.h"
 #include "v1krisc.h"
 #include "vloaduc.h"
 #include "vos.h"
-#include "elf.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
+#ifdef HAVE_ELF_H
+#include <elf.h>
+#endif
+#ifdef HAVE_ELF_ABI_H
+#include <elf_abi.h>
+#endif
 
 /*
  * defines