diff --git a/ChangeLog b/ChangeLog
index 81c574b79f..15d13ac42f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 26 09:55:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby{io,sig}.h: moved to include/ruby/backward.
+
 Fri Sep 26 09:47:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/rubysig.h: old macros for backward compatibility.
diff --git a/include/ruby/backward/rubyio.h b/include/ruby/backward/rubyio.h
new file mode 100644
index 0000000000..d5246db546
--- /dev/null
+++ b/include/ruby/backward/rubyio.h
@@ -0,0 +1,6 @@
+#if   defined __GNUC__
+#warning use "ruby/io.h" instead of "rubyio.h"
+#elif defined _MSC_VER || defined __BORLANDC__
+#pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
+#endif
+#include "ruby/io.h"
diff --git a/include/rubysig.h b/include/ruby/backward/rubysig.h
similarity index 100%
rename from include/rubysig.h
rename to include/ruby/backward/rubysig.h
diff --git a/include/rubyio.h b/include/rubyio.h
deleted file mode 100644
index 59ecedca96..0000000000
--- a/include/rubyio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ruby/io.h"