diff --git a/configure.ac b/configure.ac
index 106d9709..1fd0818e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,8 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_FUNC_ALLOCA
 
+AC_CHECK_HEADERS([sys/mkdev.h])
+
 # Initialize libtool
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
diff --git a/xf86drm.c b/xf86drm.c
index 194cd35e..34728bec 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -52,6 +52,9 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <stdarg.h>
+#ifdef HAVE_SYS_MKDEV_H
+# include <sys/mkdev.h> /* defines major(), minor(), and makedev() on Solaris */
+#endif
 
 /* Not all systems have MAP_FAILED defined */
 #ifndef MAP_FAILED