diff --git a/ChangeLog b/ChangeLog
index 570c6eb49f44623a3895043e034e389f31205b32..b62efb8a6e798fe689adb6914cf8edb59b25453d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 15 16:21:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* configure.in: Solaris header file fixes (Mark Johnson).
+
 Fri Jun 15 14:42:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* src/test.c, src/virsh.c, src/xend_internal.c, src/xm_internal.c:
diff --git a/configure.in b/configure.in
index 891da7fe798e64e5d9c64c860e10e3cbec9c37c4..4cee3a3b011cd046ded8fcffa74ed712335027a2 100644
--- a/configure.in
+++ b/configure.in
@@ -43,9 +43,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
 AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
 AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
 
-dnl Availability of various common functions.
-AC_CHECK_FUNCS([regexec])
-
 dnl Make sure we have an ANSI compiler
 AM_C_PROTOTYPES
 test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
@@ -56,6 +53,12 @@ AM_PROG_CC_C_O
 
 LIBVIRT_COMPILE_WARNINGS(maximum)
 
+dnl Availability of various common functions (non-fatal if missing).
+AC_CHECK_FUNCS([regexec])
+
+dnl Availability of various common headers (non-fatal if missing).
+AC_CHECK_HEADERS(paths.h)
+
 dnl Specific dir for HTML output ?
 AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],
             [path to base html directory, default $datadir/doc/html]),
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 620cf1f4c10b6932601582e1c7639cb4dbc93c5b..7f2ed69d9f213e53bba41c823325ac782f7dcdec 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -18,6 +18,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
+#include <string.h>
 #include "internal.h"
 #include "driver.h"
 #include "proxy_internal.h"
diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index d487d3e707d2fc8db153e9bac6d9a694ac10f56e..53043385c4b14df0168a8d033df90c8846be6db0 100644
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -41,7 +41,14 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <limits.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
+
+#ifndef _PATH_DEVNULL
+#define	_PATH_DEVNULL	"/dev/null"
+#endif
+
 
 #include "internal.h"
 #include "qemu_internal.h"
diff --git a/src/virsh.c b/src/virsh.c
index 3c96a2a1ba3957b0077238103f9037e1701291a6..be2af348d4d28fdbb7730f23ecb9492484f545cb 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <locale.h>
+#include <limits.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/src/xen_unified.c b/src/xen_unified.c
index 8e913aeb19002c79ca73330d3ae265a21d904fac..bfc546e22a4f29f94b072b57d81847e6eaebf998 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -27,6 +27,7 @@
 
 #include <stdint.h>
 #include <unistd.h>
+#include <string.h>
 #include <sys/types.h>
 #include <xen/dom0_ops.h>
 
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 0a7736c99732f8346e93971701cdf211d6503ef2..c2d6e8db4fce7938fa7bf45fae9bda3160a9d6a6 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <libxml/uri.h>
+#include <errno.h>
 
 #include "libvirt/libvirt.h"
 #include "driver.h"
diff --git a/src/xm_internal.c b/src/xm_internal.c
index fe8d04857f13ef494b3cdc780966e7e2cc0970b2..e44fd2232e0d5aa8c7286fd9c65ce5c30c089e5c 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -26,6 +26,7 @@
 #include <dirent.h>
 #include <time.h>
 #include <sys/stat.h>
+#include <limits.h>
 
 #include <unistd.h>
 #include <stdint.h>
@@ -35,6 +36,9 @@
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 
+#ifndef NAME_MAX
+#define	NAME_MAX	255
+#endif
 
 #include "xen_unified.h"
 #include "xm_internal.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index b32716aaa5ea02e300b11818baed01fca171b17d..76fe4d84aafda66c76eb75dc179ac7d27f15fc59 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -19,9 +19,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <paths.h>
 #include "testutils.h"
 
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+
+#ifndef _PATH_DEVNULL
+#define	_PATH_DEVNULL	"/dev/null"
+#endif
+
 #define GETTIMEOFDAY(T) gettimeofday(T, NULL)
 #define DIFF_MSEC(T, U)                                 \
     ((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 +	\
diff --git a/tests/virshtest.c b/tests/virshtest.c
index a075f78f4132e1f66f17c38f61830e81280d3a27..cc2a02230173bc828a074a95a4e26299a31fe1da 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include "xml.h"
 #include "testutils.h"