diff --git a/ChangeLog b/ChangeLog
index 4d86a6d98..0b91edea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-03  Pavel Roskin  <proski@gnu.org>
+
+	* kern/i386/linuxbios/init.c: Put "void" to all function
+	declarations with no arguments.
+	* kern/powerpc/ieee1275/init.c: Likewise.
+	* term/i386/pc/at_keyboard.c: Likewise.
+	* term/i386/pc/vga_text.c: Likewise.
+	* util/grub-mkdevicemap.c: Likewise.
+
 2008-01-02  Robert Millan  <rmh@aybabtu.com>
 
 	* loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Improve error
diff --git a/kern/i386/linuxbios/init.c b/kern/i386/linuxbios/init.c
index d41ff3f1a..2a2e2d1b0 100644
--- a/kern/i386/linuxbios/init.c
+++ b/kern/i386/linuxbios/init.c
@@ -66,14 +66,14 @@ grub_millisleep (grub_uint32_t ms __attribute__ ((unused)))
 }
 
 void
-grub_exit ()
+grub_exit (void)
 {
   grub_printf ("grub_exit() is not implemented.\n");
   grub_stop ();
 }
 
 void
-grub_reboot ()
+grub_reboot (void)
 {
   grub_printf ("grub_reboot() is not implemented.\n");
   grub_stop ();
diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c
index 4727d7d0b..aad17634f 100644
--- a/kern/powerpc/ieee1275/init.c
+++ b/kern/powerpc/ieee1275/init.c
@@ -127,7 +127,7 @@ grub_machine_set_prefix (void)
 }
 
 /* Claim some available memory in the first /memory node. */
-static void grub_claim_heap ()
+static void grub_claim_heap (void)
 {
   unsigned long total = 0;
 
diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index d3759b8ea..5852ec94b 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -123,7 +123,7 @@ grub_keyboard_isr (char key)
 
 /* If there is a raw key pending, return it; otherwise return -1.  */
 static int
-grub_keyboard_getkey ()
+grub_keyboard_getkey (void)
 {
   grub_uint8_t key;
   if (KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
@@ -137,7 +137,7 @@ grub_keyboard_getkey ()
 
 /* If there is a character pending, return it; otherwise return -1.  */
 int
-grub_console_checkkey ()
+grub_console_checkkey (void)
 {
   int key;
   key = grub_keyboard_getkey ();
@@ -171,7 +171,7 @@ grub_console_checkkey ()
 }
 
 int
-grub_console_getkey ()
+grub_console_getkey (void)
 {
   int key;
   do
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 7ef3b0de9..07a254469 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -57,7 +57,7 @@ update_cursor (void)
 }
 
 static void
-inc_y ()
+inc_y (void)
 {
   grub_curr_x = 0;
   if (grub_curr_y < ROWS - 1)
@@ -72,7 +72,7 @@ inc_y ()
 }
 
 static void
-inc_x ()
+inc_x (void)
 {
   if (grub_curr_x >= COLS - 2)
     inc_y ();
@@ -105,7 +105,7 @@ grub_console_real_putchar (int c)
 }
 
 grub_uint16_t
-grub_console_getxy ()
+grub_console_getxy (void)
 {
   return (grub_curr_x << 8) | grub_curr_y;
 }
@@ -119,7 +119,7 @@ grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 void
-grub_console_cls ()
+grub_console_cls (void)
 {
   int i;
   for (i = 0; i < ROWS * COLS; i++)
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index ceaab4b27..c071dab0d 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -87,7 +87,7 @@ struct hd_geometry
   /* Runtime detection of kernel */
 # include <sys/utsname.h>
 int
-get_kfreebsd_version ()
+get_kfreebsd_version (void)
 {
   struct utsname uts;
   int major;