diff --git a/configure.ac b/configure.ac
index fe460666..bee40ce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ enable_gtk_doc=no
 
 # Checks for functions, headers, structures, etc.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([termios.h linux/kd.h sys/kd.h])
+AC_CHECK_HEADERS([termios.h linux/kd.h sys/kd.h libgen.h])
 AC_CHECK_MEMBERS([struct sysinfo.totalram],[],[],[AC_INCLUDES_DEFAULT
 		  #include <sys/sysinfo.h>
 		  ])
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 01fb4574..0f8a5bba 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -65,6 +65,10 @@
 #include "igt_core.h"
 #include "igt_aux.h"
 
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>   /* for basename() on Solaris */
+#endif
+
 /**
  * SECTION:igt_core
  * @short_description: Core i-g-t testing support