diff --git a/ChangeLog b/ChangeLog
index 7e9e18348..dede0af2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/multiboot2.h: Remove leftover file.
+	* include/grub/normal.h [GRUB_UTIL]: Remove leftover declarations.
+	* include/grub/partition.h [GRUB_UTIL]: Likewise.
 
 2010-02-07  Yves Blusseau  <blusseau@zetam.org>
 
diff --git a/include/grub/normal.h b/include/grub/normal.h
index e804fde77..fad1a41ba 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -110,37 +110,4 @@ void read_terminal_list (void);
 
 void grub_set_more (int onoff);
 
-#ifdef GRUB_UTIL
-void grub_normal_init (void);
-void grub_normal_fini (void);
-void grub_hello_init (void);
-void grub_hello_fini (void);
-void grub_ls_init (void);
-void grub_ls_fini (void);
-void grub_cat_init (void);
-void grub_cat_fini (void);
-void grub_boot_init (void);
-void grub_boot_fini (void);
-void grub_cmp_init (void);
-void grub_cmp_fini (void);
-void grub_terminal_init (void);
-void grub_terminal_fini (void);
-void grub_loop_init (void);
-void grub_loop_fini (void);
-void grub_help_init (void);
-void grub_help_fini (void);
-void grub_halt_init (void);
-void grub_halt_fini (void);
-void grub_reboot_init (void);
-void grub_reboot_fini (void);
-void grub_configfile_init (void);
-void grub_configfile_fini (void);
-void grub_search_init (void);
-void grub_search_fini (void);
-void grub_test_init (void);
-void grub_test_fini (void);
-void grub_blocklist_init (void);
-void grub_blocklist_fini (void);
-#endif
-
 #endif /* ! GRUB_NORMAL_HEADER */
diff --git a/include/grub/partition.h b/include/grub/partition.h
index d35658cdd..faa89cea6 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -83,20 +83,6 @@ void EXPORT_FUNC(grub_partition_map_register) (grub_partition_map_t partmap);
 
 void EXPORT_FUNC(grub_partition_map_unregister) (grub_partition_map_t partmap);
 
-#ifdef GRUB_UTIL
-void grub_msdos_partition_map_init (void);
-void grub_msdos_partition_map_fini (void);
-void grub_amiga_partition_map_init (void);
-void grub_amiga_partition_map_fini (void);
-void grub_apple_partition_map_init (void);
-void grub_apple_partition_map_fini (void);
-void grub_sun_partition_map_init (void);
-void grub_sun_partition_map_fini (void);
-void grub_gpt_partition_map_init (void);
-void grub_gpt_partition_map_fini (void);
-void grub_apple_partition_map_init (void);
-void grub_apple_partition_map_fini (void);
-#endif
 
 static inline grub_disk_addr_t
 grub_partition_get_start (const grub_partition_t p)