diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c
index e67e7fe76..47b95f947 100644
--- a/liblvm/lvm_lv.c
+++ b/liblvm/lvm_lv.c
@@ -22,8 +22,6 @@
 #include "activate.h"
 #include "lvm_misc.h"
 
-#include <string.h>
-
 static int _lv_check_handle(const lv_t lv, const int vg_writeable)
 {
 	if (!lv || !lv->vg || vg_read_error(lv->vg))
diff --git a/liblvm/lvm_misc.c b/liblvm/lvm_misc.c
index f52c5630c..e339faab2 100644
--- a/liblvm/lvm_misc.c
+++ b/liblvm/lvm_misc.c
@@ -12,7 +12,9 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "lvm2app.h"
 #include "lvm_misc.h"
+#include "lib.h"
 
 struct dm_list *tag_list_copy(struct dm_pool *p, struct dm_list *tag_list)
 {
diff --git a/liblvm/lvm_misc.h b/liblvm/lvm_misc.h
index 1d73532f4..ced1f0f09 100644
--- a/liblvm/lvm_misc.h
+++ b/liblvm/lvm_misc.h
@@ -14,15 +14,7 @@
 #ifndef _LVM2APP_MISC_H
 #define _LVM2APP_MISC_H
 
-#include "lib.h"
-#include "lvm2app.h"
-#include "toolcontext.h"
-#include "metadata-exported.h"
-#include "archiver.h"
-#include "locking.h"
-#include "lvm-string.h"
-#include "lvmcache.h"
-#include "metadata.h"
+#include "libdevmapper.h"
 
 struct dm_list *tag_list_copy(struct dm_pool *p, struct dm_list *tag_list);
 
diff --git a/liblvm/lvm_vg.c b/liblvm/lvm_vg.c
index 99558c74f..a75652d38 100644
--- a/liblvm/lvm_vg.c
+++ b/liblvm/lvm_vg.c
@@ -15,17 +15,12 @@
 #include "lib.h"
 #include "lvm2app.h"
 #include "toolcontext.h"
-#include "metadata-exported.h"
+#include "metadata.h"
 #include "archiver.h"
 #include "locking.h"
-#include "lvm-string.h"
 #include "lvmcache.h"
-#include "metadata.h"
 #include "lvm_misc.h"
 
-#include <errno.h>
-#include <string.h>
-
 int lvm_vg_add_tag(vg_t vg, const char *tag)
 {
 	if (vg_read_error(vg))