diff --git a/ChangeLog b/ChangeLog
index db1cb63340..a43c7e579c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Aug 19 21:31:35 2013  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: Fix a compilation error with
+	  i586-mingw32msvc-gcc of gcc-mingw32 package on Debian squeeze.
+	  ruby/missing.h should be included before include/ruby/win32.h
+	  because struct timespec, used in the clock_gettime declaration in
+	  include/ruby/win32.h, is defined in ruby/missing.h instead of
+	  system headers.
+
 Mon Aug 19 20:55:12 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c: fix around GC_DEBUG.
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index cb3e21002a..3327e69123 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -65,6 +65,8 @@ extern "C" {
 #include <setjmpex.h>
 #endif
 
+#include "ruby/missing.h"
+
 #define RUBY
 
 #ifdef __cplusplus
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index abcc73b5b3..ad0c30af41 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1736,7 +1736,6 @@ rb_special_const_p(VALUE obj)
 }
 #endif
 
-#include "ruby/missing.h"
 #include "ruby/intern.h"
 
 #if defined(EXTLIB) && defined(USE_DLN_A_OUT)