diff --git a/ChangeLog b/ChangeLog
index 57bd81aa4e..1a850f54a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-Sat Nov 10 00:19:09 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Nov 10 00:33:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* siphash.h: include inttypes.h only when HAVE_INTTYPES_H is defined.
+	* siphash.h: check configure macros before include newer headers.
 
 Fri Nov  9 23:33:05 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/siphash.h b/siphash.h
index 8f56b99d55..3f3988408b 100644
--- a/siphash.h
+++ b/siphash.h
@@ -1,7 +1,9 @@
 #ifndef SIPHASH_H
 #define SIPHASH_H 1
 #include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif