diff --git a/ChangeLog b/ChangeLog
index 3fd31efaf..a367f6891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/partition.c [GRUB_UTIL]: Add missing util/misc.h inclusion.
+	* partmap/bsdlabel.c [GRUB_UTIL]: Likewise.
+
 2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
diff --git a/kern/partition.c b/kern/partition.c
index a1e37f675..a2f5dd722 100644
--- a/kern/partition.c
+++ b/kern/partition.c
@@ -21,6 +21,10 @@
 #include <grub/partition.h>
 #include <grub/disk.h>
 
+#ifdef GRUB_UTIL
+#include <grub/util/misc.h>
+#endif
+
 grub_partition_map_t grub_partition_map_list;
 
 /*
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
index d38a0eaf3..f671f76d8 100644
--- a/partmap/bsdlabel.c
+++ b/partmap/bsdlabel.c
@@ -24,6 +24,10 @@
 #include <grub/misc.h>
 #include <grub/dl.h>
 
+#ifdef GRUB_UTIL
+#include <grub/util/misc.h>
+#endif
+
 static struct grub_partition_map grub_bsdlabel_partition_map;