diff --git a/ChangeLog b/ChangeLog
index 03f282b27c..dc916c1a80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 14 17:04:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (inttypes.h): includes always if available.
+
+	* string.c, ext/digest/defs.h: moved inttypes.h to ruby.h.
+
 Fri Mar 14 16:59:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_LIB_PREFIX): fix for prefix.
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index bdffa26551..77a134f364 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -16,8 +16,4 @@
 # define __END_DECLS
 #endif
 
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#endif
-
 #endif /* DEFS_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index b8a7bba8c5..1876ea4d71 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -58,6 +58,10 @@ extern "C" {
 # include <intrinsics.h>
 #endif
 
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
 #include <stddef.h>
 #include <stdio.h>
 
diff --git a/string.c b/string.c
index fc7ed7c641..f88e6ba280 100644
--- a/string.c
+++ b/string.c
@@ -25,10 +25,6 @@
 #include <unistd.h>
 #endif
 
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 VALUE rb_cString;
 VALUE rb_cSymbol;