diff --git a/ChangeLog b/ChangeLog
index b891b206fd..299b0ed1d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Nov 10 00:49:26 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ruby_atomic.h: renamed from atomic.h to avoid header file name
+	  conflict on Solaris 10. [ruby-dev:46414] [Bug #7287]
+
+	* gc.c, signal.c, vm_core.h, common.mk: reflect the rename from
+	  atomic.h to ruby_atomic.h.
+
 Sat Nov 10 00:46:57 2012  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* atomic.h: Revert r37491 which is a temporary workaroud.
diff --git a/common.mk b/common.mk
index 5ade929e66..1c7efbb5ae 100644
--- a/common.mk
+++ b/common.mk
@@ -610,7 +610,7 @@ RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
 ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
 ID_H_INCLUDES      = {$(VPATH)}id.h
 VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
-		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}atomic.h \
+		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
 		     $(ID_H_INCLUDES)
 
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
diff --git a/gc.c b/gc.c
index b930621065..007b6bad0d 100644
--- a/gc.c
+++ b/gc.c
@@ -22,7 +22,7 @@
 #include "internal.h"
 #include "gc.h"
 #include "constant.h"
-#include "atomic.h"
+#include "ruby_atomic.h"
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/types.h>
diff --git a/atomic.h b/ruby_atomic.h
similarity index 100%
rename from atomic.h
rename to ruby_atomic.h
diff --git a/signal.c b/signal.c
index 304b1e4f3f..e0f1872bef 100644
--- a/signal.c
+++ b/signal.c
@@ -16,7 +16,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
-#include "atomic.h"
+#include "ruby_atomic.h"
 
 #if defined(__native_client__) && defined(NACL_NEWLIB)
 # include "nacl/signal.h"
diff --git a/vm_core.h b/vm_core.h
index a50ff5287f..dd9e3872e2 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -22,7 +22,7 @@
 #include "vm_opts.h"
 #include "id.h"
 #include "method.h"
-#include "atomic.h"
+#include "ruby_atomic.h"
 
 #if   defined(_WIN32)
 #include "thread_win32.h"