diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 52decf5a5f..b7ee6fb169 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -20,12 +20,9 @@
 
 #include <config.h>
 
-#include "viralloc.h"
 #include "virthread.h"
-#include "virfile.h"
 #include "virlog.h"
 #include "virerror.h"
-#include "virnetsocket.h"
 #include "virkeepaliveprotocol.h"
 #include "virkeepalive.h"
 #include "virprobe.h"
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 2998551cd8..3f79c03a58 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -34,7 +34,6 @@
 #include "virutil.h"
 #include "virerror.h"
 #include "virprobe.h"
-#include "virstring.h"
 #include "vireventglibwatch.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 5048033325..1647a6cc71 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -27,7 +27,6 @@
 #endif
 #include "virnetclientprogram.h"
 #include "virnetclientstream.h"
-#include "virobject.h"
 #include "viruri.h"
 
 typedef enum {
diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h
index 8cd8d4f2c8..54f6278a30 100644
--- a/src/rpc/virnetclientprogram.h
+++ b/src/rpc/virnetclientprogram.h
@@ -24,7 +24,6 @@
 #include <rpc/xdr.h>
 
 #include "virnetmessage.h"
-#include "virobject.h"
 
 typedef struct _virNetClient virNetClient;
 
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index e8e8ca2af2..a03f67e542 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -22,7 +22,6 @@
 
 #include "virnetclientstream.h"
 #include "virnetclient.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virthread.h"
diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h
index 7428843f9b..7363969424 100644
--- a/src/rpc/virnetclientstream.h
+++ b/src/rpc/virnetclientstream.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "virnetclientprogram.h"
-#include "virobject.h"
 
 typedef struct _virNetClientStream virNetClientStream;
 
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 1f32bae35f..3c4adb2ca2 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -28,13 +28,11 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virthread.h"
-#include "virthreadpool.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "virnetserver.h"
 #include "virgdbus.h"
 #include "virhash.h"
-#include "virstring.h"
 #include "virsystemd.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h
index f91b59a4fd..d588f86799 100644
--- a/src/rpc/virnetdaemon.h
+++ b/src/rpc/virnetdaemon.h
@@ -22,12 +22,9 @@
 
 #include <signal.h>
 
-#include "virnettlscontext.h"
-#include "virobject.h"
 #include "virjson.h"
 #include "virnetserverprogram.h"
 #include "virnetserverclient.h"
-#include "virnetserverservice.h"
 #include "virnetserver.h"
 
 virNetDaemon *virNetDaemonNew(void);
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index d78438bd95..d298d30d57 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -28,7 +28,6 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virutil.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index ede434ed4a..dbf777cfa3 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -21,13 +21,10 @@
 #include <config.h>
 
 #include "virnetsaslcontext.h"
-#include "virnetmessage.h"
 
 #include "virerror.h"
-#include "viralloc.h"
 #include "virthread.h"
 #include "virlog.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 371b72c8d6..17ab61b882 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -27,7 +27,6 @@
 #include "virerror.h"
 #include "virthread.h"
 #include "virthreadpool.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 371f2d07cf..9f0cf3a3fc 100644
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -25,7 +25,6 @@
 #include "virnetserverprogram.h"
 #include "virnetserverclient.h"
 #include "virnetserverservice.h"
-#include "virobject.h"
 #include "virjson.h"
 #include "virsystemd.h"
 
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index da9956f2b4..bb70856351 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -35,7 +35,6 @@
 #include "virthread.h"
 #include "virkeepalive.h"
 #include "virprobe.h"
-#include "virstring.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h
index 218287f12f..cb7c67902c 100644
--- a/src/rpc/virnetserverprogram.h
+++ b/src/rpc/virnetserverprogram.h
@@ -23,7 +23,6 @@
 
 #include "virnetmessage.h"
 #include "virnetserverclient.h"
-#include "virobject.h"
 
 typedef struct _virNetDaemon virNetDaemon;
 
diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index f3d55a9cc0..d2049556f9 100644
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "virnetserverprogram.h"
-#include "virobject.h"
 
 typedef enum {
     VIR_NET_SERVER_SERVICE_AUTH_NONE = 0,
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 1af2778b97..32f506d2d4 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -45,7 +45,6 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virthread.h"
-#include "virpidfile.h"
 #include "virprobe.h"
 #include "virprocess.h"
 #include "virstring.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index f2862979c9..485318d09b 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -32,7 +32,6 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virobject.h"
-#include "virstring.h"
 #include "virauth.h"
 
 #define VIR_FROM_THIS VIR_FROM_SSH