diff --git a/ChangeLog b/ChangeLog
index 9b4460f..38b8f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-28  Niibe Yutaka  <gniibe@fsij.org>
 
+	* boards/common/hwinit.c (hwinit0): Define here.
+	* boards/*/board.c (hwinit0): Removed.
+
 	* polarssl-0.14.0/library/aes.c (FT0, FT1, FT2): Specify the
 	section ".sys", so that we will have more room for flash ROM.
 
diff --git a/boards/CQ_STARM/board.c b/boards/CQ_STARM/board.c
index cd2a779..693a8f2 100644
--- a/boards/CQ_STARM/board.c
+++ b/boards/CQ_STARM/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/FST_01/board.c b/boards/FST_01/board.c
index cdd64bd..6e3a844 100644
--- a/boards/FST_01/board.c
+++ b/boards/FST_01/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/FST_01_00/board.c b/boards/FST_01_00/board.c
index a9e918d..c079a0c 100644
--- a/boards/FST_01_00/board.c
+++ b/boards/FST_01_00/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/OLIMEX_STM32_H103/board.c b/boards/OLIMEX_STM32_H103/board.c
index a9e918d..c079a0c 100644
--- a/boards/OLIMEX_STM32_H103/board.c
+++ b/boards/OLIMEX_STM32_H103/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/STBEE/board.c b/boards/STBEE/board.c
index 391165d..75af80b 100644
--- a/boards/STBEE/board.c
+++ b/boards/STBEE/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/STBEE_MINI/board.c b/boards/STBEE_MINI/board.c
index c65d3d9..5abd5e0 100644
--- a/boards/STBEE_MINI/board.c
+++ b/boards/STBEE_MINI/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/STM32_PRIMER2/board.c b/boards/STM32_PRIMER2/board.c
index 95baddb..83a288b 100644
--- a/boards/STM32_PRIMER2/board.c
+++ b/boards/STM32_PRIMER2/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0(void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1(void)
 {
diff --git a/boards/STM8S_DISCOVERY/board.c b/boards/STM8S_DISCOVERY/board.c
index 554b598..1fdf2a9 100644
--- a/boards/STM8S_DISCOVERY/board.c
+++ b/boards/STM8S_DISCOVERY/board.c
@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
diff --git a/boards/common/hwinit.c b/boards/common/hwinit.c
index 648b6aa..a12f1b9 100644
--- a/boards/common/hwinit.c
+++ b/boards/common/hwinit.c
@@ -29,10 +29,8 @@
  * This initialization is performed just after reset before BSS and DATA
  * segments initialization.
  */
-/*
- * Common code for hwinit0
- */
-static void hwinit0_common (void)
+void
+hwinit0 (void)
 {
 #ifdef DFU_SUPPORT
   SCB->VTOR = 0x08003000;