diff --git a/lib/device/device_id.c b/lib/device/device_id.c
index 74edae05c..1c4ba78f6 100644
--- a/lib/device/device_id.c
+++ b/lib/device/device_id.c
@@ -18,7 +18,6 @@
 #include "lib/device/device.h"
 #include "lib/device/device_id.h"
 #include "lib/device/dev-type.h"
-#include "lib/device/device-types.h"
 #include "lib/label/label.h"
 #include "lib/metadata/metadata.h"
 #include "lib/format_text/layout.h"
diff --git a/tools/command.c b/tools/command.c
index 282c9fa43..81720acf1 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -21,7 +21,6 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/tools/lvmdevices.c b/tools/lvmdevices.c
index 42fa189c3..b67db7464 100644
--- a/tools/lvmdevices.c
+++ b/tools/lvmdevices.c
@@ -14,7 +14,6 @@
 
 #include "tools.h"
 #include "lib/cache/lvmcache.h"
-#include "lib/filters/filter.h"
 #include "lib/device/device_id.h"
 
 static void _search_devs_for_pvids(struct cmd_context *cmd, struct dm_list *search_pvids, struct dm_list *found_devs)
diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c
index 18f10f49a..1e6bb2d69 100644
--- a/tools/vgimportclone.c
+++ b/tools/vgimportclone.c
@@ -14,7 +14,6 @@
 
 #include "tools.h"
 #include "lib/cache/lvmcache.h"
-#include "lib/filters/filter.h"
 #include "lib/device/device_id.h"
 
 struct vgimportclone_params {
diff --git a/tools/vgimportdevices.c b/tools/vgimportdevices.c
index b7b363369..88435af92 100644
--- a/tools/vgimportdevices.c
+++ b/tools/vgimportdevices.c
@@ -14,7 +14,6 @@
 
 #include "tools.h"
 #include "lib/cache/lvmcache.h"
-#include "lib/filters/filter.h"
 #include "lib/device/device_id.h"
 
 struct vgimportdevices_params {