From 8995e91b5f16a7eab2d58f9d698625dad541c268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Wed, 1 Apr 2015 16:50:17 +0200
Subject: [PATCH] Remove unused includes from virsh

After splitting out most of virsh command, some includes
are no longer needed.

Some files have the libXML includes despite not needing them.
---
 tools/virsh-network.c  |  6 ------
 tools/virsh-nodedev.c  |  6 ------
 tools/virsh-nwfilter.c |  6 ------
 tools/virsh-pool.c     |  6 ------
 tools/virsh-secret.c   |  6 ------
 tools/virsh.c          | 10 ----------
 tools/virsh.h          |  1 -
 7 files changed, 41 deletions(-)

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 62323c4b78..39f0266588 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -26,16 +26,10 @@
 #include <config.h>
 #include "virsh-network.h"
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
-
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virxml.h"
 #include "conf/network_conf.h"
 
 virNetworkPtr
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 46e0045270..847e5b0b16 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -26,16 +26,10 @@
 #include <config.h>
 #include "virsh-nodedev.h"
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
-
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virxml.h"
 #include "conf/node_device_conf.h"
 
 /*
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 2a75175ce0..e6bef08edf 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -26,17 +26,11 @@
 #include <config.h>
 #include "virsh-nwfilter.h"
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
-
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virutil.h"
-#include "virxml.h"
 
 virNWFilterPtr
 vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd,
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 485d23daa6..4865831c95 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -26,16 +26,10 @@
 #include <config.h>
 #include "virsh-pool.h"
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
-
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virxml.h"
 #include "conf/storage_conf.h"
 #include "virstring.h"
 
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index add2c09eb2..5065c6ffaa 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -26,18 +26,12 @@
 #include <config.h>
 #include "virsh-secret.h"
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
-
 #include "internal.h"
 #include "base64.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virutil.h"
-#include "virxml.h"
 #include "conf/secret_conf.h"
 
 static virSecretPtr
diff --git a/tools/virsh.c b/tools/virsh.c
index 9ecddf3f09..889a56128c 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -44,11 +44,6 @@
 #include <strings.h>
 #include <signal.h>
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlsave.h>
-
 #if WITH_READLINE
 # include <readline/readline.h>
 # include <readline/history.h>
@@ -56,19 +51,14 @@
 
 #include "internal.h"
 #include "virerror.h"
-#include "base64.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "virxml.h"
 #include <libvirt/libvirt-qemu.h>
 #include <libvirt/libvirt-lxc.h>
 #include "virfile.h"
 #include "configmake.h"
 #include "virthread.h"
 #include "vircommand.h"
-#include "virkeycode.h"
-#include "virnetdevbandwidth.h"
-#include "virbitmap.h"
 #include "conf/domain_conf.h"
 #include "virtypedparam.h"
 #include "virstring.h"
diff --git a/tools/virsh.h b/tools/virsh.h
index df2ea7f670..3c28454cfa 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -31,7 +31,6 @@
 # include <stdarg.h>
 # include <unistd.h>
 # include <sys/stat.h>
-# include <inttypes.h>
 # include <termios.h>
 
 # include "internal.h"