diff --git a/ChangeLog b/ChangeLog
index f505f94e2..404793544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-30  Pavel Roskin  <proski@gnu.org>
 
+	* disk/host.c: Include grub/misc.h to fix a warning.
+	* util/hostfs.c: Use GRUB_MOD_INIT and GRUB_MOD_FINI to fix
+	warnings about implicit declarations.
+
 	* fs/udf.c (grub_udf_mount): Fix warning about a shadowing a
 	variable.
 	* include/grub/i386/loader.h: Change declaration of
diff --git a/disk/host.c b/disk/host.c
index 6767f5a3c..ccd410169 100644
--- a/disk/host.c
+++ b/disk/host.c
@@ -22,6 +22,7 @@
 
 #include <grub/dl.h>
 #include <grub/disk.h>
+#include <grub/misc.h>
 
 int grub_disk_host_i_want_a_reference;
 
diff --git a/util/hostfs.c b/util/hostfs.c
index 828fd9a3f..b74fbd3ca 100644
--- a/util/hostfs.c
+++ b/util/hostfs.c
@@ -21,6 +21,7 @@
 #include <grub/file.h>
 #include <grub/disk.h>
 #include <grub/misc.h>
+#include <grub/dl.h>
 
 #include <dirent.h>
 #include <stdio.h>
@@ -151,14 +152,12 @@ static struct grub_fs grub_hostfs_fs =
 
 
 
-void
-grub_hostfs_init (void)
+GRUB_MOD_INIT(hostfs)
 {
   grub_fs_register (&grub_hostfs_fs);
 }
 
-void
-grub_hostfs_fini (void)
+GRUB_MOD_FINI(hostfs)
 {
   grub_fs_unregister (&grub_hostfs_fs);
 }