diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index 5800334c5..3ddb3da8f 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -23,17 +23,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef _HAVE_CLUTTER_PRIVATE_H
-#define _HAVE_CLUTTER_PRIVATE_H
+#ifndef __CLUTTER_PRIVATE_H__
+#define __CLUTTER_PRIVATE_H__
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include <math.h>
 
 #include <glib.h>
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index 02e94ab94..bbc332cd7 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -26,14 +26,15 @@
 #include <glib/gi18n-lib.h>
 
 #include <string.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
-#include <sys/stat.h>
+#include <unistd.h>
+
 #include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <fcntl.h>
+
 #include <errno.h>
 
 #include "clutter-backend-x11.h"
diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c
index dceb33584..2a7971ddd 100644
--- a/clutter/x11/clutter-stage-x11.c
+++ b/clutter/x11/clutter-stage-x11.c
@@ -23,6 +23,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include "clutter-backend-x11.h"
 #include "clutter-stage-x11.h"
 #include "clutter-x11.h"
diff --git a/configure.ac b/configure.ac
index 89d6c8c1c..969c8ae6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,20 +91,14 @@ dnl ========================================================================
 AM_PROG_CC_C_O
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-DOLT
+
+# Disable dolt; we should depend on libtool 2.2
+#DOLT
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_MMAP
-AC_CHECK_FUNCS([memset memcpy strcasecmp])
-
 AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])