diff --git a/ChangeLog b/ChangeLog
index ef7f7ce98d..59158098fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 13 14:14:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* trunk/configure.in (AC_CHECK_HEADERS): stdint.h is not needed to check.
+
+	* trunk/configure.in (rb_cv_type_uint32_t): unqouted.  [ruby-dev:34030]
+
+	* trunk/string.c (hash): use inttypes.h instead of stdint.h.
+
 Thu Mar 13 03:12:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/cmd/help.rb: should be updated for new ri structure.
diff --git a/configure.in b/configure.in
index a33b5a9fc7..a6ff395519 100644
--- a/configure.in
+++ b/configure.in
@@ -582,7 +582,7 @@ AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
 		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
 		 sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h pthread.h \
-		 ucontext.h intrinsics.h langinfo.h locale.h stdint.h)
+		 ucontext.h intrinsics.h langinfo.h locale.h)
 
 dnl Check additional types.
 AC_CHECK_SIZEOF(rlim_t, 0, [
@@ -626,10 +626,11 @@ if test ${ac_cv_type_uint32_t} != yes; then
     AC_CACHE_CHECK([unsigned 32bit int],
 	rb_cv_type_uint32_t,
 	[for type in short int long; do
+	    type="unsigned $type"
 	    AC_COMPILE_IFELSE(AC_LANG_BOOL_COMPILE_TRY([], [sizeof($type) == 4]),
 		[rb_cv_type_uint32_t=$type; break], [])
 	done])
-    AC_DEFINE(uint32_t, $rb_cv_type_uint32_t)
+    AC_DEFINE_UNQUOTED(uint32_t, $rb_cv_type_uint32_t)
 fi
 
 AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
diff --git a/string.c b/string.c
index e64d440b77..39a96ee848 100644
--- a/string.c
+++ b/string.c
@@ -25,8 +25,8 @@
 #include <unistd.h>
 #endif
 
-#if HAVE_STDINT_H
-#include <stdint.h>
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
 #endif
 
 VALUE rb_cString;
@@ -761,7 +761,7 @@ rb_enc_strlen_cr(const char *p, const char *e, rb_encoding *enc, int *cr)
 
 #ifdef NONASCII_MASK
 #define is_utf8_lead_byte(c) (((c)&0xC0) != 0x80)
-static inline const VALUE
+static inline VALUE
 count_utf8_lead_bytes_with_word(const VALUE *s)
 {
     VALUE d = *s;
@@ -1807,7 +1807,7 @@ hash(const unsigned char * data, int len, unsigned int h)
 #endif
 	h *= m;
 	h ^= h >> r;
-    };
+    }
 
     h *= m;
     h ^= h >> 10;