diff --git a/ChangeLog b/ChangeLog
index 325652a86..0f81cbcbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/util/lvm.h: Removed.
+
 2013-10-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/misc.c (fsync) [__MINGW32__]: Move to ...
diff --git a/grub-core/osdep/apple/getroot.c b/grub-core/osdep/apple/getroot.c
index 9ca8afcef..d8690e123 100644
--- a/grub-core/osdep/apple/getroot.c
+++ b/grub-core/osdep/apple/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/aros/getroot.c b/grub-core/osdep/aros/getroot.c
index a16cb3aba..7d09b7af7 100644
--- a/grub-core/osdep/aros/getroot.c
+++ b/grub-core/osdep/aros/getroot.c
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/basic/getroot.c b/grub-core/osdep/basic/getroot.c
index 0242c9cc1..8831eb3af 100644
--- a/grub-core/osdep/basic/getroot.c
+++ b/grub-core/osdep/basic/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/bsd/getroot.c b/grub-core/osdep/bsd/getroot.c
index 062bce294..db2fb07d3 100644
--- a/grub-core/osdep/bsd/getroot.c
+++ b/grub-core/osdep/bsd/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c
index d919a40d3..b5df7c2c7 100644
--- a/grub-core/osdep/devmapper/getroot.c
+++ b/grub-core/osdep/devmapper/getroot.c
@@ -44,7 +44,7 @@
 
 #include <grub/types.h>
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/freebsd/getroot.c b/grub-core/osdep/freebsd/getroot.c
index 024743300..620d2b553 100644
--- a/grub-core/osdep/freebsd/getroot.c
+++ b/grub-core/osdep/freebsd/getroot.c
@@ -44,7 +44,7 @@
 #include <libgeom.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -56,6 +56,8 @@
 
 #include <libgeom.h>
 
+#define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
+
 static const char *
 grub_util_get_geom_abstraction (const char *dev)
 {
diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c
index 0cd29dc0e..b3e8d8140 100644
--- a/grub-core/osdep/hurd/getroot.c
+++ b/grub-core/osdep/hurd/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index b1fede8f6..fb0bad765 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -40,7 +40,7 @@
 #include <sys/mount.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -55,6 +55,7 @@
 #include <linux/raid/md_u.h>
 #include <grub/i18n.h>
 
+#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
 
 /* Defines taken from btrfs/ioctl.h.  */
 
diff --git a/grub-core/osdep/sun/getroot.c b/grub-core/osdep/sun/getroot.c
index d63f5a69f..8535a892a 100644
--- a/grub-core/osdep/sun/getroot.c
+++ b/grub-core/osdep/sun/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
index 619bfefbc..19e6dcf8d 100644
--- a/grub-core/osdep/unix/getroot.c
+++ b/grub-core/osdep/unix/getroot.c
@@ -35,7 +35,7 @@
 #include <limits.h>
 #endif
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/cryptodisk.h>
 #include <grub/i18n.h>
 
@@ -101,6 +101,12 @@
 # endif /* ! RAW_FLOPPY_MAJOR */
 #endif /* defined(__NetBSD__) */
 
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
+#else
+#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
+#endif
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c
index b023af534..56756555c 100644
--- a/grub-core/osdep/windows/getroot.c
+++ b/grub-core/osdep/windows/getroot.c
@@ -38,7 +38,7 @@
 #include <grub/types.h>
 
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
diff --git a/include/grub/util/lvm.h b/include/grub/util/lvm.h
deleted file mode 100644
index f4577d56f..000000000
--- a/include/grub/util/lvm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* lvm.h - LVM support for GRUB utils.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2011  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_LVM_UTIL_HEADER
-#define GRUB_LVM_UTIL_HEADER	1
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#define LVM_DEV_MAPPER_STRING "/dev/linux_lvm/"
-#else
-#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
-#endif
-
-#endif /* ! GRUB_RAID_UTIL_HEADER */
diff --git a/util/getroot.c b/util/getroot.c
index 9e852a681..f0d98c66e 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -36,7 +36,7 @@
 #include <limits.h>
 #endif
 #include <grub/util/misc.h>
-#include <grub/util/lvm.h>
+
 #include <grub/cryptodisk.h>
 #include <grub/i18n.h>
 
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 27a815f2e..e65c7ceed 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -30,7 +30,7 @@
 #include <grub/emu/hostdisk.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
-#include <grub/util/lvm.h>
+
 #ifdef GRUB_SETUP_SPARC64
 #include <grub/util/ofpath.h>
 #include <grub/sparc64/ieee1275/boot.h>