Include them in the files that need them instead.
---
tools/virsh-domain.c | 1 +
tools/virsh-network.c | 1 +
tools/virsh-nodedev.c | 1 +
tools/virsh-snapshot.c | 1 +
tools/virsh.h | 2 --
5 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 9bbb964..eee441f 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -47,6 +47,7 @@
#include "virjson.h"
#include "virkeycode.h"
#include "virmacaddr.h"
+#include "virnetdevbandwidth.h"
#include "virprocess.h"
#include "virstring.h"
#include "virsh-console.h"
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 39f0266..09ee11a 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -30,6 +30,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virfile.h"
+#include "virstring.h"
#include "conf/network_conf.h"
virNetworkPtr
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 847e5b0..0d7315c 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -30,6 +30,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virfile.h"
+#include "virstring.h"
#include "conf/node_device_conf.h"
/*
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 1bb74a6..459a8a8 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -38,6 +38,7 @@
#include "viralloc.h"
#include "virfile.h"
#include "virsh-domain.h"
+#include "virstring.h"
#include "virxml.h"
#include "conf/snapshot_conf.h"
diff --git a/tools/virsh.h b/tools/virsh.h
index 3c28454..e89d315 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -36,8 +36,6 @@
# include "internal.h"
# include "virerror.h"
# include "virthread.h"
-# include "virnetdevbandwidth.h"
-# include "virstring.h"
# define VSH_MAX_XML_FILE (10*1024*1024)
--
2.0.5