diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index 73ae28f718..da67455335 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -37,7 +37,6 @@
 #include <unistd.h>
 
 #include "virfile.h"
-#include "virstring.h"
 #include "virgettext.h"
 #include "virdevmapper.h"
 #include "virerror.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index c5b36801ba..3e7a5ae67d 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -23,12 +23,9 @@
 
 #include <sys/stat.h>
 
-#include "datatypes.h"
 #include "virerror.h"
-#include "viralloc.h"
 #include "internal.h"
 #include "storage_backend.h"
-#include "storage_source_conf.h"
 #include "virlog.h"
 #include "virmodule.h"
 #include "virfile.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index be3c3c6839..ea5bf7ef83 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -33,7 +33,6 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c
index 52007db2ba..1fe21b4a2b 100644
--- a/src/storage/storage_backend_gluster.c
+++ b/src/storage/storage_backend_gluster.c
@@ -28,7 +28,6 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "viruri.h"
 #include "storage_file_probe.h"
 #include "storage_util.h"
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index eef1d91062..968a70158b 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -26,19 +26,15 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "datatypes.h"
 #include "driver.h"
 #include "storage_backend_iscsi.h"
 #include "viralloc.h"
-#include "vircommand.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "viriscsi.h"
 #include "viridentity.h"
 #include "virlog.h"
 #include "virobject.h"
-#include "virstring.h"
-#include "viruuid.h"
 #include "virsecret.h"
 #include "storage_util.h"
 #include "virutil.h"
diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c
index 302a338ec6..5df5447066 100644
--- a/src/storage/storage_backend_iscsi_direct.c
+++ b/src/storage/storage_backend_iscsi_direct.c
@@ -27,14 +27,12 @@
 #include "virsecret.h"
 #include "storage_backend_iscsi_direct.h"
 #include "storage_util.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "viridentity.h"
 #include "virlog.h"
 #include "virobject.h"
 #include "virstring.h"
 #include "virtime.h"
-#include "viruuid.h"
 #include "virsecureerase.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index ac90a38fa3..b33fe3846d 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -33,7 +33,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "virstring.h"
 #include "virutil.h"
 #include "storage_util.h"
 
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 2559991bc0..52407f8e6f 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -30,7 +30,6 @@
 #include "viridentity.h"
 #include "virlog.h"
 #include "viruuid.h"
-#include "virstring.h"
 #include "virrandom.h"
 #include "rados/librados.h"
 #include "rbd/librbd.h"
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index fc99e0414a..afc98960a8 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -26,11 +26,8 @@
 
 #include "virerror.h"
 #include "storage_backend_scsi.h"
-#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "vircommand.h"
-#include "virstring.h"
 #include "storage_util.h"
 #include "node_device_conf.h"
 #include "node_device_util.h"
diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c
index 52e9895234..21e538f2a2 100644
--- a/src/storage/storage_backend_vstorage.c
+++ b/src/storage/storage_backend_vstorage.c
@@ -1,11 +1,9 @@
 #include <config.h>
 
-#include "viralloc.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "storage_backend_vstorage.h"
 #include "virlog.h"
-#include "virstring.h"
 #include "virutil.h"
 #include <mntent.h>
 #include <paths.h>
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index e3e1604311..8dc2cfa7c9 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -45,8 +45,6 @@
 #include "virfdstream.h"
 #include "virpidfile.h"
 #include "configmake.h"
-#include "virsecret.h"
-#include "virstring.h"
 #include "viraccessapicheck.h"
 #include "storage_util.h"
 #include "virutil.h"
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index f543dc9f3d..6ed2078b65 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -47,9 +47,7 @@
 #include "virerror.h"
 #include "viralloc.h"
 #include "internal.h"
-#include "secret_conf.h"
 #include "virsecret.h"
-#include "vircrypto.h"
 #include "viruuid.h"
 #include "virstoragefile.h"
 #include "storage_file_probe.h"
@@ -59,7 +57,6 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "viridentity.h"
-#include "virjson.h"
 #include "virqemu.h"
 #include "virstring.h"
 #include "virxml.h"
diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h
index aa3c25e9fc..70b5d4e94d 100644
--- a/src/storage/storage_util.h
+++ b/src/storage/storage_util.h
@@ -22,7 +22,6 @@
 
 #include "internal.h"
 #include "vircommand.h"
-#include "storage_driver.h"
 #include "storage_backend.h"
 
 /* Storage Pool Namespace options to share w/ storage_backend_fs.c and