diff --git a/ChangeLog b/ChangeLog
index ab603cf495..3c8babeccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 23 09:00:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XCFLAGS): reverted mistakenly removed option.
+	  [ruby-dev:41872]
+
+	* include/ruby/missing.h: needs ruby/config.h.
+
 Thu Jul 22 20:58:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_EXTERN): unnecessary after all.
diff --git a/configure.in b/configure.in
index bf7fdb6929..4aed3a1357 100644
--- a/configure.in
+++ b/configure.in
@@ -269,6 +269,7 @@ if test "$GCC" = yes; then
     linker_flag=-Wl,
     : ${optflags=-O3}
     AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
+    RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/missing.h"])
 else
     linker_flag=
 fi
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 1e0474cef8..327e0a847d 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -18,6 +18,8 @@ extern "C" {
 #endif
 #endif
 
+#include "ruby/config.h"
+
 #if defined(HAVE_SYS_TIME_H)
 #  include <sys/time.h>
 #elif !defined(_WIN32)