diff --git a/ChangeLog b/ChangeLog
index b3d5586ea3..2fa4ef55e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 27 18:33:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
+	  config.h and defines.h for autoconf macros.
+
 Mon Jul 26 18:18:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (config.h): add include guard.
diff --git a/defines.h b/defines.h
index f83f761852..c59a928885 100644
--- a/defines.h
+++ b/defines.h
@@ -10,6 +10,11 @@
 #ifndef DEFINES_H
 #define DEFINES_H
 
+#include "config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #define RUBY
 
 #ifdef __cplusplus
diff --git a/intern.h b/intern.h
index 640c77c9fa..d84d02110e 100644
--- a/intern.h
+++ b/intern.h
@@ -11,6 +11,13 @@
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
+#ifndef INTERN_H
+#define INTERN_H
+
+#include "defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
 
 /*
  * Functions and variables that are used by more than one source file of
@@ -538,3 +545,5 @@ VALUE rb_mod_remove_cvar _((VALUE, VALUE));
 /* version.c */
 void ruby_show_version _((void));
 void ruby_show_copyright _((void));
+
+#endif
diff --git a/missing.h b/missing.h
index 1961383e75..89a402708e 100644
--- a/missing.h
+++ b/missing.h
@@ -12,6 +12,11 @@
 #ifndef MISSING_H
 #define MISSING_H
 
+#include "config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #if defined(HAVE_SYS_TIME_H)
 #  include <sys/time.h>
 #elif !defined(_WIN32)
diff --git a/st.h b/st.h
index fb56f5ffad..b86358d748 100644
--- a/st.h
+++ b/st.h
@@ -6,6 +6,11 @@
 
 #define ST_INCLUDED
 
+#include "defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #if SIZEOF_LONG == SIZEOF_VOIDP
 typedef unsigned long st_data_t;
 #elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
diff --git a/util.h b/util.h
index b00c096dec..147e087d73 100644
--- a/util.h
+++ b/util.h
@@ -13,6 +13,11 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include "defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #ifndef _
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
diff --git a/version.h b/version.h
index c94bf1b12b..e0dcd3f55e 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-07-26"
+#define RUBY_RELEASE_DATE "2010-07-27"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100726
+#define RUBY_RELEASE_CODE 20100727
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN