diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 0834d035cd43..86cf4147998f 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-26  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* testsuite/libffi.call/ffitest.h: Conditionally include stdint.h
+	and inttypes.h.
+	* testsuite/libffi.special/unwindtest.cc: Ditto.
+
 2009-12-26  Andreas Tobler  <a.tobler@schweiz.org>
 
 	* configure.ac: Add amd64-*-openbsd*.
diff --git a/libffi/testsuite/libffi.call/ffitest.h b/libffi/testsuite/libffi.call/ffitest.h
index a54b2146f9c8..7b1c5efa5cee 100644
--- a/libffi/testsuite/libffi.call/ffitest.h
+++ b/libffi/testsuite/libffi.call/ffitest.h
@@ -2,11 +2,17 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
-#include <stdint.h>
-#include <inttypes.h>
 #include <ffi.h>
 #include "fficonfig.h"
 
+#if defined HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if defined HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #define MAX_ARGS 256
 
 #define CHECK(x) !(x) ? abort() : 0
diff --git a/libffi/testsuite/libffi.special/unwindtest.cc b/libffi/testsuite/libffi.special/unwindtest.cc
index 723871626d18..d7ffd4aa2147 100644
--- a/libffi/testsuite/libffi.special/unwindtest.cc
+++ b/libffi/testsuite/libffi.special/unwindtest.cc
@@ -6,7 +6,14 @@
 
 /* { dg-do run } */
 #include "ffitestcxx.h"
+
+#if defined HAVE_STDINT_H
 #include <stdint.h>
+#endif
+
+#if defined HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 
 void
 closure_test_fn(ffi_cif* cif __UNUSED__, void* resp __UNUSED__,