diff --git a/ChangeLog b/ChangeLog
index a62f86d02f..165dcc6e28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 20 18:17:14 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk, *.ci: renamed to *.c.
+
+	* eval_laod.c: renamed to load.c.
+
 Thu Dec 20 17:36:01 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems*:  Import RubyGems 1.0.0, r1575.
diff --git a/common.mk b/common.mk
index 980516364e..48119a0572 100644
--- a/common.mk
+++ b/common.mk
@@ -28,7 +28,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
 		eval.$(OBJEXT) \
-		eval_load.$(OBJEXT) \
+		load.$(OBJEXT) \
 		proc.$(OBJEXT) \
 		file.$(OBJEXT) \
 		gc.$(OBJEXT) \
@@ -427,14 +427,14 @@ error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}st.h {$(VPATH)}vm_opts.h {$(VPATH)}signal.h \
   {$(VPATH)}vm_core.h {$(VPATH)}id.h {$(VPATH)}node.h {$(VPATH)}debug.h \
   {$(VPATH)}thread_$(THREAD_MODEL).h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_error.ci {$(VPATH)}eval_intern.h \
-  {$(VPATH)}eval_method.ci {$(VPATH)}eval_safe.ci {$(VPATH)}eval_jump.ci \
+eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_error.c {$(VPATH)}eval_intern.h \
+  {$(VPATH)}eval_method.c {$(VPATH)}eval_safe.c {$(VPATH)}eval_jump.c \
   {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}vm_core.h {$(VPATH)}id.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}signal.h \
   {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}debug.h \
   {$(VPATH)}vm_opts.h {$(VPATH)}thread_$(THREAD_MODEL).h
-eval_load.$(OBJEXT): {$(VPATH)}eval_load.c {$(VPATH)}eval_intern.h \
+load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
   {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}vm_core.h {$(VPATH)}id.h \
@@ -540,7 +540,7 @@ struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
 thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
   {$(VPATH)}thread_win32.h {$(VPATH)}thread_pthread.h \
-  {$(VPATH)}thread_win32.ci {$(VPATH)}thread_pthread.ci \
+  {$(VPATH)}thread_win32.c {$(VPATH)}thread_pthread.c \
   {$(VPATH)}ruby.h {$(VPATH)}vm_core.h {$(VPATH)}id.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}node.h {$(VPATH)}util.h \
@@ -581,7 +581,7 @@ iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}vm_core.h {$(VPATH)}id.h {$(VPATH)}de
 vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}vm.h {$(VPATH)}vm_core.h {$(VPATH)}id.h \
 	{$(VPATH)}debug.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}st.h \
 	{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}dln.h \
-	{$(VPATH)}insnhelper.h {$(VPATH)}insnhelper.ci {$(VPATH)}vm_evalbody.ci \
+	{$(VPATH)}insnhelper.h {$(VPATH)}vm_insnhelper.c {$(VPATH)}vm_evalbody.c \
         {$(VPATH)}insns.inc {$(VPATH)}vm.inc {$(VPATH)}vmtc.inc \
 	{$(VPATH)}vm_opts.h {$(VPATH)}eval_intern.h \
         {$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
diff --git a/eval.c b/eval.c
index c727ea796f..a1010d74b8 100644
--- a/eval.c
+++ b/eval.c
@@ -38,10 +38,10 @@ static VALUE eval(VALUE, VALUE, VALUE, const char *, int);
 static inline VALUE rb_yield_0(int argc, VALUE *argv);
 static VALUE rb_call(VALUE, VALUE, ID, int, const VALUE *, int);
 
-#include "eval_error.ci"
-#include "eval_method.ci"
-#include "eval_safe.ci"
-#include "eval_jump.ci"
+#include "eval_error.c"
+#include "eval_method.c"
+#include "eval_safe.c"
+#include "eval_jump.c"
 
 /* initialize ruby */
 
diff --git a/eval_error.ci b/eval_error.c
similarity index 100%
rename from eval_error.ci
rename to eval_error.c
diff --git a/eval_jump.ci b/eval_jump.c
similarity index 100%
rename from eval_jump.ci
rename to eval_jump.c
diff --git a/eval_method.ci b/eval_method.c
similarity index 100%
rename from eval_method.ci
rename to eval_method.c
diff --git a/eval_safe.ci b/eval_safe.c
similarity index 100%
rename from eval_safe.ci
rename to eval_safe.c
diff --git a/eval_load.c b/load.c
similarity index 100%
rename from eval_load.c
rename to load.c
diff --git a/thread.c b/thread.c
index 63f161cc5e..936360d5b6 100644
--- a/thread.c
+++ b/thread.c
@@ -147,7 +147,7 @@ NOINLINE(static int thread_start_func_2(rb_thread_t *th, VALUE *stack_start,
 					VALUE *register_stack_start));
 
 #if   defined(_WIN32)
-#include "thread_win32.ci"
+#include "thread_win32.c"
 
 #define DEBUG_OUT() \
   WaitForSingleObject(&debug_mutex, INFINITE); \
@@ -156,7 +156,7 @@ NOINLINE(static int thread_start_func_2(rb_thread_t *th, VALUE *stack_start,
   ReleaseMutex(&debug_mutex);
 
 #elif defined(HAVE_PTHREAD_H)
-#include "thread_pthread.ci"
+#include "thread_pthread.c"
 
 #define DEBUG_OUT() \
   pthread_mutex_lock(&debug_mutex); \
diff --git a/thread_pthread.ci b/thread_pthread.c
similarity index 99%
rename from thread_pthread.ci
rename to thread_pthread.c
index 6cf43dbeb3..feeffdf5da 100644
--- a/thread_pthread.ci
+++ b/thread_pthread.c
@@ -1,7 +1,7 @@
 /* -*-c-*- */
 /**********************************************************************
 
-  thread_pthread.ci -
+  thread_pthread.c -
 
   $Author$
   $Date$
diff --git a/thread_win32.ci b/thread_win32.c
similarity index 99%
rename from thread_win32.ci
rename to thread_win32.c
index 9d151cdb6d..d8b33e23e0 100644
--- a/thread_win32.ci
+++ b/thread_win32.c
@@ -1,7 +1,7 @@
 /* -*-c-*- */
 /**********************************************************************
 
-  thread_win32.ci -
+  thread_win32.c -
 
   $Author$
   $Date$
diff --git a/vm.c b/vm.c
index 7818acadf2..d603c03b55 100644
--- a/vm.c
+++ b/vm.c
@@ -16,7 +16,7 @@
 #include "gc.h"
 
 #include "insnhelper.h"
-#include "insnhelper.ci"
+#include "vm_insnhelper.c"
 
 #define BUFSIZE 0x100
 #define PROCDEBUG 0
@@ -1026,7 +1026,7 @@ vm_init_redefined_flag(void)
 
 /* evaluator body */
 
-#include "vm_evalbody.ci"
+#include "vm_evalbody.c"
 
 /*                  finish
   VMe (h1)          finish
diff --git a/vm_evalbody.ci b/vm_evalbody.c
similarity index 99%
rename from vm_evalbody.ci
rename to vm_evalbody.c
index 7657c838ca..128f233266 100644
--- a/vm_evalbody.ci
+++ b/vm_evalbody.c
@@ -1,7 +1,7 @@
 /* -*-c-*- */
 /**********************************************************************
 
-  vm_evalbody.ci -
+  vm_evalbody.c -
 
   $Author$
   $Date$
diff --git a/insnhelper.ci b/vm_insnhelper.c
similarity index 99%
rename from insnhelper.ci
rename to vm_insnhelper.c
index ba390c3aed..a7684e110e 100644
--- a/insnhelper.ci
+++ b/vm_insnhelper.c
@@ -1,7 +1,6 @@
-/* -*-c-*- */
 /**********************************************************************
 
-  insnhelper.ci - instruction helper functions.
+  insnhelper.c - instruction helper functions.
 
   $Author$
   $Date$