diff --git a/ChangeLog b/ChangeLog
index bdd2c80c1..58e5e91f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/emu/hostdisk.h: Add proper declaration for grub_host_init
+	and grub_hostfs_init.
+
 2013-10-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (grub_util_check_file_presence): Use
diff --git a/grub-core/disk/host.c b/grub-core/disk/host.c
index 959211bb9..69b6f0ea1 100644
--- a/grub-core/disk/host.c
+++ b/grub-core/disk/host.c
@@ -20,9 +20,13 @@
 /* When using the disk, make a reference to this module.  Otherwise
    the user will end up with a useless module :-).  */
 
+#include <config.h>
+#include <config-util.h>
+
 #include <grub/dl.h>
 #include <grub/disk.h>
 #include <grub/misc.h>
+#include <grub/emu/hostdisk.h>
 
 int grub_disk_host_i_want_a_reference;
 
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 51ede76c0..87ae256f9 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -164,11 +164,6 @@ static struct argp argp = {
 
 
 
-void grub_hostfs_init (void);
-void grub_hostfs_fini (void);
-void grub_host_init (void);
-void grub_host_fini (void);
-
 int
 main (int argc, char *argv[])
 {
diff --git a/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h
index a150467d5..ba0034d5f 100644
--- a/include/grub/emu/hostdisk.h
+++ b/include/grub/emu/hostdisk.h
@@ -84,4 +84,9 @@ struct grub_util_hostdisk_data
   int device_map;
 };
 
+void grub_host_init (void);
+void grub_host_fini (void);
+void grub_hostfs_init (void);
+void grub_hostfs_fini (void);
+
 #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */
diff --git a/util/render-label.c b/util/render-label.c
index 316da2c82..6bef638da 100644
--- a/util/render-label.c
+++ b/util/render-label.c
@@ -25,6 +25,7 @@
 #include <grub/font.h>
 #include <grub/gfxmenu_view.h>
 #include <grub/color.h>
+#include <grub/emu/hostdisk.h>
 
 #define _GNU_SOURCE	1
 
@@ -35,9 +36,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-void grub_hostfs_init (void);
-void grub_host_init (void);
-
 struct header
 {
   grub_uint8_t magic;