[libvirt] [PATCH 1/2] internal: Move <stdio.h> include to internal.h

Erik Skultety eskultet at redhat.com
Wed Sep 19 10:22:36 UTC 2018


It doesn't really make sense for us to have stdlib.h and string.h but
not stdio.h in the internal.h header.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 src/bhyve/bhyve_capabilities.c        | 1 -
 src/conf/capabilities.c               | 1 -
 src/conf/storage_conf.c               | 1 -
 src/esx/esx_storage_backend_iscsi.c   | 1 -
 src/esx/esx_storage_backend_vmfs.c    | 1 -
 src/internal.h                        | 1 +
 src/libvirt.c                         | 1 -
 src/locking/lock_driver_sanlock.c     | 1 -
 src/locking/sanlock_helper.c          | 1 -
 src/lxc/lxc_container.c               | 1 -
 src/lxc/lxc_fuse.c                    | 1 -
 src/lxc/lxc_native.c                  | 1 -
 src/network/bridge_driver.c           | 1 -
 src/network/leaseshelper.c            | 1 -
 src/node_device/node_device_hal.c     | 1 -
 src/openvz/openvz_conf.c              | 1 -
 src/openvz/openvz_driver.c            | 1 -
 src/phyp/phyp_driver.c                | 1 -
 src/qemu/qemu_driver.c                | 1 -
 src/rpc/virnetservermdns.c            | 1 -
 src/security/virt-aa-helper.c         | 1 -
 src/storage/parthelper.c              | 1 -
 src/storage/storage_backend_disk.c    | 1 -
 src/storage/storage_backend_fs.c      | 1 -
 src/storage/storage_backend_logical.c | 1 -
 src/storage/storage_backend_mpath.c   | 1 -
 src/storage/storage_backend_scsi.c    | 1 -
 src/storage/storage_driver.c          | 1 -
 src/storage/storage_util.c            | 1 -
 src/test/test_driver.c                | 1 -
 src/uml/uml_driver.c                  | 1 -
 src/util/iohelper.c                   | 1 -
 src/util/virarptable.c                | 1 -
 src/util/viraudit.c                   | 1 -
 src/util/virbitmap.c                  | 1 -
 src/util/virbuffer.c                  | 1 -
 src/util/vircgroup.c                  | 1 -
 src/util/virconf.c                    | 1 -
 src/util/virdnsmasq.c                 | 1 -
 src/util/virerror.c                   | 1 -
 src/util/virfile.h                    | 1 -
 src/util/virgettext.c                 | 1 -
 src/util/virhook.c                    | 1 -
 src/util/virhostcpu.c                 | 1 -
 src/util/virhostdev.c                 | 1 -
 src/util/virhostmem.c                 | 1 -
 src/util/viriptables.c                | 1 -
 src/util/viriscsi.c                   | 1 -
 src/util/virkeyfile.c                 | 1 -
 src/util/virlog.c                     | 1 -
 src/util/virmacaddr.c                 | 1 -
 src/util/virnetdevmacvlan.c           | 1 -
 src/util/virnetdevopenvswitch.c       | 1 -
 src/util/virnetdevtap.c               | 1 -
 src/util/virnetdevvportprofile.c      | 1 -
 src/util/virpci.c                     | 1 -
 src/util/virscsi.c                    | 1 -
 src/util/virsexpr.c                   | 1 -
 src/util/virstring.c                  | 1 -
 src/util/virsysinfo.c                 | 1 -
 src/util/virtime.c                    | 1 -
 src/util/virusb.c                     | 1 -
 src/util/virutil.c                    | 1 -
 src/util/viruuid.c                    | 1 -
 src/util/virxml.c                     | 1 -
 src/vz/vz_driver.c                    | 1 -
 src/xenapi/xenapi_utils.c             | 1 -
 tests/commandhelper.c                 | 1 -
 tests/commandtest.c                   | 1 -
 tests/cputest.c                       | 1 -
 tests/domainsnapshotxml2xmltest.c     | 1 -
 tests/esxutilstest.c                  | 1 -
 tests/genericxml2xmltest.c            | 1 -
 tests/interfacexml2xmltest.c          | 1 -
 tests/libxlxml2domconfigtest.c        | 1 -
 tests/lxcxml2xmltest.c                | 1 -
 tests/networkxml2conftest.c           | 1 -
 tests/networkxml2xmltest.c            | 1 -
 tests/networkxml2xmlupdatetest.c      | 1 -
 tests/nodedevxml2xmltest.c            | 1 -
 tests/nwfilterxml2xmltest.c           | 1 -
 tests/openvzutilstest.c               | 1 -
 tests/qemuargv2xmltest.c              | 1 -
 tests/qemucapsprobemock.c             | 1 -
 tests/qemumemlocktest.c               | 1 -
 tests/qemumonitortestutils.c          | 1 -
 tests/qemuxml2argvtest.c              | 1 -
 tests/qemuxml2xmltest.c               | 1 -
 tests/seclabeltest.c                  | 1 -
 tests/securityselinuxlabeltest.c      | 1 -
 tests/securityselinuxtest.c           | 1 -
 tests/sexpr2xmltest.c                 | 1 -
 tests/shunloadtest.c                  | 1 -
 tests/sockettest.c                    | 1 -
 tests/ssh.c                           | 1 -
 tests/storagebackendsheepdogtest.c    | 1 -
 tests/storagepoolxml2xmltest.c        | 1 -
 tests/storagevolxml2xmltest.c         | 1 -
 tests/sysinfotest.c                   | 1 -
 tests/testutils.c                     | 1 -
 tests/testutils.h                     | 1 -
 tests/utiltest.c                      | 1 -
 tests/vboxsnapshotxmltest.c           | 1 -
 tests/virbuftest.c                    | 1 -
 tests/vircgroupmock.c                 | 1 -
 tests/virconftest.c                   | 1 -
 tests/virfilewrapper.c                | 1 -
 tests/virhashtest.c                   | 1 -
 tests/virhostcputest.c                | 1 -
 tests/virhostdevtest.c                | 1 -
 tests/virjsontest.c                   | 1 -
 tests/virmock.h                       | 1 -
 tests/virnetdevmock.c                 | 1 -
 tests/virnwfilterbindingxml2xmltest.c | 1 -
 tests/virpcimock.c                    | 1 -
 tests/virpcitest.c                    | 1 -
 tests/virportallocatormock.c          | 1 -
 tests/virrandommock.c                 | 1 -
 tests/virrotatingfiletest.c           | 1 -
 tests/virshtest.c                     | 1 -
 tests/virtypedparamtest.c             | 1 -
 tests/vmwarevertest.c                 | 1 -
 tests/vmx2xmltest.c                   | 1 -
 tests/vshtabletest.c                  | 1 -
 tests/xlconfigtest.c                  | 1 -
 tests/xmconfigtest.c                  | 1 -
 tests/xml2sexprtest.c                 | 1 -
 tests/xml2vmxtest.c                   | 1 -
 tools/virsh-console.c                 | 1 -
 tools/virsh.c                         | 1 -
 tools/virsh.h                         | 1 -
 tools/virt-host-validate-bhyve.c      | 1 -
 tools/virt-host-validate-common.c     | 1 -
 tools/virt-host-validate.c            | 1 -
 tools/virt-login-shell.c              | 1 -
 tools/vsh.c                           | 1 -
 tools/vsh.h                           | 1 -
 137 files changed, 1 insertion(+), 136 deletions(-)

diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
index 0da778c5cb..6feaded2ad 100644
--- a/src/bhyve/bhyve_capabilities.c
+++ b/src/bhyve/bhyve_capabilities.c
@@ -23,7 +23,6 @@
 #include <config.h>
 #include <sys/utsname.h>
 #include <dirent.h>
-#include <stdio.h>
 #include <sys/types.h>
 
 #include "viralloc.h"
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 326bd15cee..ed988369ef 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 50dbc937e7..eebbb46102 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index fd0ace6fcb..0897c9cb25 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 
 #include "internal.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index bb2de4b69f..58ee753403 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -25,7 +25,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 
 #include "internal.h"
diff --git a/src/internal.h b/src/internal.h
index 47ff0479d2..d30d5da499 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -26,6 +26,7 @@
 # include <verify.h>
 # include <stdbool.h>
 # include <stdint.h>
+# include <stdio.h>
 # include <string.h>
 
 # if STATIC_ANALYSIS
diff --git a/src/libvirt.c b/src/libvirt.c
index aeb8804714..48856b2803 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 66953c70d5..daa11728a7 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c
index 57e1cfb031..267c108964 100644
--- a/src/locking/sanlock_helper.c
+++ b/src/locking/sanlock_helper.c
@@ -1,5 +1,4 @@
 #include <config.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "internal.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 3a1b2d6819..f949785f7d 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -29,7 +29,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 60d41243a9..5a5091659e 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/mount.h>
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 35077e1794..e1992fd1f9 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -22,7 +22,6 @@
  */
 
 #include <config.h>
-#include <stdio.h>
 
 #include "internal.h"
 #include "lxc_container.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 3e2eac2795..4d0c9b13d1 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -27,7 +27,6 @@
 #include <sys/poll.h>
 #include <limits.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index b4d87ee651..ad7e0903f0 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -25,7 +25,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "virthread.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 2101101bc6..f36888a525 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <libhal.h>
 
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 07d0e91b24..9c90433a41 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -28,7 +28,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 14295dfda0..86e00c422b 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -32,7 +32,6 @@
 #include <sys/poll.h>
 #include <limits.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index faa35a6a41..821a9f2f05 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <limits.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 809c13410c..d1cef92739 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -29,7 +29,6 @@
 #include <dirent.h>
 #include <limits.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index 0a2bc87322..692675162f 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -26,7 +26,6 @@
 #include <config.h>
 
 #include <time.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #if WITH_AVAHI
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index f104495af0..addfb4a48b 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -25,7 +25,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index afdaa1cee2..9025c7e04a 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include <parted/parted.h>
-#include <stdio.h>
 #include <string.h>
 #include <libdevmapper.h>
 #include <sys/types.h>
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index c638e2db25..a11dc96d46 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio.h>
 
 #include "dirname.h"
 #include "virerror.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 8983738210..beaf254295 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -25,7 +25,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index 67ca7f514d..355eeec4cc 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -25,7 +25,6 @@
 
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <stdio.h>
 #include <regex.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 5dcc40f601..9e81fff0b4 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <unistd.h>
-#include <stdio.h>
 #include <fcntl.h>
 
 #include <libdevmapper.h>
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 0a4ca98a6d..7c927c4d95 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <unistd.h>
-#include <stdio.h>
 #include <fcntl.h>
 
 #include "virerror.h"
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index c7a7155c20..8f5f9f61dc 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index e78372a5fa..b896a0b723 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <stdio.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8760babfa1..2156a3e1cf 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <fcntl.h>
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 425c0bac04..23491bc69d 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -27,7 +27,6 @@
 #include <sys/poll.h>
 #include <limits.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index f7794dc49a..11948e158e 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -29,7 +29,6 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "virutil.h"
diff --git a/src/util/virarptable.c b/src/util/virarptable.c
index 217a960d5a..0426c0b15f 100644
--- a/src/util/virarptable.c
+++ b/src/util/virarptable.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <arpa/inet.h>
 #ifdef __linux__
 # include <linux/rtnetlink.h>
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index a49d458819..a02e5b36fd 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -24,7 +24,6 @@
 #ifdef WITH_AUDIT
 # include <libaudit.h>
 #endif
-#include <stdio.h>
 #include <unistd.h>
 
 #include "virerror.h"
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index 5b6e55f239..73f0b59cee 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -25,7 +25,6 @@
 
 #include <limits.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 2cf82260a9..3f400f44db 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 64507bf8aa..4e541ce300 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -23,7 +23,6 @@
  */
 #include <config.h>
 
-#include <stdio.h>
 #if defined HAVE_MNTENT_H && defined HAVE_SYS_MOUNT_H \
     && defined HAVE_GETMNTENT_R
 # include <mntent.h>
diff --git a/src/util/virconf.c b/src/util/virconf.c
index e0a3fd12c0..5981e0ae98 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 7872b6ef43..2df732a15b 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 4688e019cc..8bb0382812 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 2bc3cf022d..0f7dece958 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -26,7 +26,6 @@
 #ifndef __VIR_FILE_H_
 # define __VIR_FILE_H_
 
-# include <stdio.h>
 # include <dirent.h>
 
 # include "internal.h"
diff --git a/src/util/virgettext.c b/src/util/virgettext.c
index f583eaf8c4..7c12a5c142 100644
--- a/src/util/virgettext.c
+++ b/src/util/virgettext.c
@@ -21,7 +21,6 @@
 #include <config.h>
 
 #include <locale.h>
-#include <stdio.h>
 
 #include "configmake.h"
 #include "internal.h"
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 993f06d819..e5ac4040e5 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "virerror.h"
 #include "virhook.h"
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 2337ad7d61..2906777928 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index ca79c37787..beb491428d 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "virhostdev.h"
 #include "viralloc.h"
diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 6ef5a9f80d..f64cba28e4 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index e65e8dc717..2366525f18 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
index 0fcedc8693..84000733ee 100644
--- a/src/util/viriscsi.c
+++ b/src/util/viriscsi.c
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include <regex.h>
-#include <stdio.h>
 
 #include "viriscsi.h"
 
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index da064256e5..48c025a4a5 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 
 #include "c-ctype.h"
 #include "virlog.h"
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 64c0efc1bd..f8d24d845a 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index e739775d29..237e43f916 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "c-ctype.h"
 #include "virmacaddr.h"
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index a6b726fedd..ddb4c3ad07 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -43,7 +43,6 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
 
 #if WITH_MACVTAP
 # include <stdint.h>
-# include <stdio.h>
 # include <errno.h>
 # include <fcntl.h>
 # include <sys/socket.h>
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index a5de54150c..1a4c36654a 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -26,7 +26,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 
 #include "virnetdevopenvswitch.h"
 #include "vircommand.h"
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index ff655add05..8a9e2df43a 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -36,7 +36,6 @@
 #include "datatypes.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <regex.h>
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 215d649c33..14b79da893 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -49,7 +49,6 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST,
 #if WITH_VIRTUALPORT
 
 # include <stdint.h>
-# include <stdio.h>
 # include <errno.h>
 # include <fcntl.h>
 # include <c-ctype.h>
diff --git a/src/util/virpci.c b/src/util/virpci.c
index fb3f04fac3..7676bcf0d3 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 2297134d0e..1e661f651e 100644
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -29,7 +29,6 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c
index 885c382a5f..1755109505 100644
--- a/src/util/virsexpr.c
+++ b/src/util/virsexpr.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "c-ctype.h"
diff --git a/src/util/virstring.c b/src/util/virstring.c
index afad5736e1..e407ed845b 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <regex.h>
 #include <locale.h>
 
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 5795d90c7b..a3337bfbf6 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "virerror.h"
 #include "virsysinfo.h"
diff --git a/src/util/virtime.c b/src/util/virtime.c
index 640eb5a1d1..44ec127401 100644
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -33,7 +33,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
 
diff --git a/src/util/virusb.c b/src/util/virusb.c
index b033b2b80d..3e5e2db5b4 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -27,7 +27,6 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 0341c63493..1c74a4b78d 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -27,7 +27,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index f588a62ec6..187c533d4d 100644
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/util/virxml.c b/src/util/virxml.c
index d1926f4605..b383c3d3e9 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 7a79ec2c0f..95411bda8f 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -27,7 +27,6 @@
 #include <sys/poll.h>
 #include <limits.h>
 #include <string.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index cf5bf66732..5796bca893 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <xen/api/xen_all.h>
 #include "internal.h"
diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index bf91550ede..7b53a8e199 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/tests/commandtest.c b/tests/commandtest.c
index 744a387aa0..4c23b79787 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/cputest.c b/tests/cputest.c
index baf2b3c648..e5d3403600 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 5ea0f325de..9ec4882389 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index 7941f89b9a..68cfe63d77 100644
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -4,7 +4,6 @@
 
 #ifdef WITH_ESX
 
-# include <stdio.h>
 # include <string.h>
 # include <unistd.h>
 
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index e6d4ef2a7f..bcc2e9d62e 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index 46dbecbea7..d71bc76ed1 100644
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index b814461acc..611cc5c9e7 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c
index 5dbeb0b2eb..9fed462dc9 100644
--- a/tests/lxcxml2xmltest.c
+++ b/tests/lxcxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index 8e7751e36b..ab0bedd56f 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index eb7db766fa..cce7e2159c 100644
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c
index b4b44ceff3..e7c728acaa 100644
--- a/tests/networkxml2xmlupdatetest.c
+++ b/tests/networkxml2xmlupdatetest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index 207d97483e..d6fb9902fb 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 89f809ca8f..c213b850c7 100644
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index cdf96a18ed..54e729de8b 100644
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -4,7 +4,6 @@
 
 #ifdef WITH_OPENVZ
 
-# include <stdio.h>
 # include <string.h>
 # include <unistd.h>
 
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 7e250b7b9d..8a30b8c640 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index 5936975505..0e8008e08d 100644
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -19,7 +19,6 @@
  */
 
 #include <config.h>
-#include <stdio.h>
 #include <dlfcn.h>
 
 #include "internal.h"
diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
index bc0b53e6fa..d7747c4353 100644
--- a/tests/qemumemlocktest.c
+++ b/tests/qemumemlocktest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 15eba5898e..3fe6a8ba8c 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -19,7 +19,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 20052575ab..d6a8e4791b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 43eac2f066..3b7c928400 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index b9eff1ee22..5290e7e54f 100644
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -2,7 +2,6 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include "security/security_driver.h"
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index cf3cf237ce..b69a33eee3 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 5a19cb15fb..1df6129046 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 9ff4ab3d7b..39ac6c5e8e 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c
index 37d990d71b..1636e27a11 100644
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -48,7 +48,6 @@
 # include <dlfcn.h>
 # include <pthread.h>
 # include <stdbool.h>
-# include <stdio.h>
 # include <unistd.h>
 # include <signal.h>
 
diff --git a/tests/sockettest.c b/tests/sockettest.c
index 30b16b4e4d..21a28ae9fb 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/tests/ssh.c b/tests/ssh.c
index 31bd390db4..4a75a5d568 100644
--- a/tests/ssh.c
+++ b/tests/ssh.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include "internal.h"
 #define NO_LIBVIRT /* This file intentionally does not link to libvirt */
 #include "testutils.h"
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index cc7b163241..00d7ae483a 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 28421235bf..583c910db6 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index 7bac4974ae..5c46e4cf68 100644
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 53d5725fd2..e8e7502eda 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/testutils.c b/tests/testutils.c
index ab938c12fc..ecaa000a2d 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/time.h>
diff --git a/tests/testutils.h b/tests/testutils.h
index 3bd7bf1603..8531b2a735 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -23,7 +23,6 @@
 #ifndef __VIR_TEST_UTILS_H__
 # define __VIR_TEST_UTILS_H__
 
-# include <stdio.h>
 # include "viralloc.h"
 # include "virfile.h"
 # include "virstring.h"
diff --git a/tests/utiltest.c b/tests/utiltest.c
index 4479b0e0e0..602b5dd3d3 100644
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
index 6db258ea02..0f28711a04 100644
--- a/tests/vboxsnapshotxmltest.c
+++ b/tests/vboxsnapshotxmltest.c
@@ -4,7 +4,6 @@
 
 #ifdef WITH_VBOX
 
-# include <stdio.h>
 # include <stdlib.h>
 # include <regex.h>
 # include "vbox/vbox_snapshot_conf.h"
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 5fd8f6c969..f5aaed32a3 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index 51861be38e..d8b7d7ec7c 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -22,7 +22,6 @@
 
 #ifdef __linux__
 # include "virmock.h"
-# include <stdio.h>
 # include <stdlib.h>
 # include <unistd.h>
 # include <fcntl.h>
diff --git a/tests/virconftest.c b/tests/virconftest.c
index 3cf0df3ac0..d5581fe66b 100644
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -23,7 +23,6 @@
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include "virconf.h"
diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c
index 062ae63a49..bd2708e3e1 100644
--- a/tests/virfilewrapper.c
+++ b/tests/virfilewrapper.c
@@ -20,7 +20,6 @@
 
 #ifndef WIN32
 
-# include <stdio.h>
 # include <stdlib.h>
 # include <fcntl.h>
 
diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index e9c03c1afb..aee534181f 100644
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index e9d237ae0e..ea92f4a0e8 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
index 5b03cb6aee..557aa75d96 100644
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -26,7 +26,6 @@
 #ifdef __linux__
 
 # include <stdlib.h>
-# include <stdio.h>
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <sys/ioctl.h>
diff --git a/tests/virjsontest.c b/tests/virjsontest.c
index baf1070c5a..97136a0561 100644
--- a/tests/virjsontest.c
+++ b/tests/virjsontest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/tests/virmock.h b/tests/virmock.h
index 914d5141c9..4bf7dc8e09 100644
--- a/tests/virmock.h
+++ b/tests/virmock.h
@@ -26,7 +26,6 @@
 #  include <dlfcn.h>
 # endif
 # include <stdlib.h>
-# include <stdio.h>
 
 # include "internal.h"
 
diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c
index 3eb5059031..edbb392e8e 100644
--- a/tests/virnetdevmock.c
+++ b/tests/virnetdevmock.c
@@ -23,7 +23,6 @@
 #ifdef __linux__
 # include "internal.h"
 # include <stdlib.h>
-# include <stdio.h>
 # include "virstring.h"
 # include "virnetdev.h"
 
diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c
index a3948084af..072eb329fc 100644
--- a/tests/virnwfilterbindingxml2xmltest.c
+++ b/tests/virnwfilterbindingxml2xmltest.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/tests/virpcimock.c b/tests/virpcimock.c
index 3acf33b6f2..46a447f381 100644
--- a/tests/virpcimock.c
+++ b/tests/virpcimock.c
@@ -22,7 +22,6 @@
 
 #if defined(__linux__) || defined(__FreeBSD__)
 # include "virmock.h"
-# include <stdio.h>
 # include <stdlib.h>
 # include <unistd.h>
 # include <fcntl.h>
diff --git a/tests/virpcitest.c b/tests/virpcitest.c
index 80e994ae52..a58a51d950 100644
--- a/tests/virpcitest.c
+++ b/tests/virpcitest.c
@@ -25,7 +25,6 @@
 #ifdef __linux__
 
 # include <stdlib.h>
-# include <stdio.h>
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <fcntl.h>
diff --git a/tests/virportallocatormock.c b/tests/virportallocatormock.c
index fa6e75b2fa..ddb891ac90 100644
--- a/tests/virportallocatormock.c
+++ b/tests/virportallocatormock.c
@@ -31,7 +31,6 @@
 # include <errno.h>
 # include <arpa/inet.h>
 # include <netinet/in.h>
-# include <stdio.h>
 # include <unistd.h>
 
 static bool host_has_ipv6;
diff --git a/tests/virrandommock.c b/tests/virrandommock.c
index 3079b8bacb..9d7f695749 100644
--- a/tests/virrandommock.c
+++ b/tests/virrandommock.c
@@ -22,7 +22,6 @@
 
 #ifndef WIN32
 
-# include <stdio.h>
 # include <gnutls/gnutls.h>
 
 # include "internal.h"
diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c
index 89ceda8e49..159d84ec9d 100644
--- a/tests/virrotatingfiletest.c
+++ b/tests/virrotatingfiletest.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <sys/stat.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/tests/virshtest.c b/tests/virshtest.c
index 078c6bfdca..7b9b6779b5 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c
index fbacfa85ad..ec389c65aa 100644
--- a/tests/virtypedparamtest.c
+++ b/tests/virtypedparamtest.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <virtypedparam.h>
 
 #include "testutils.h"
diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c
index 579fe06a5e..8e75b214e0 100644
--- a/tests/vmwarevertest.c
+++ b/tests/vmwarevertest.c
@@ -22,7 +22,6 @@
 
 #ifdef WITH_VMWARE
 
-# include <stdio.h>
 # include <stdlib.h>
 
 # include "vmware/vmware_conf.h"
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 7289dc91e3..e6ad822f3f 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -4,7 +4,6 @@
 
 #ifdef WITH_VMX
 
-# include <stdio.h>
 # include <string.h>
 # include <unistd.h>
 
diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
index ce415e8c5c..06da9ae6fb 100644
--- a/tests/vshtabletest.c
+++ b/tests/vshtabletest.c
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <locale.h>
 #include <wctype.h>
 
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 36f7699fa9..3f2773a791 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index eaec7c3a5c..76c01f8e82 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 98092d8a4b..93d05f87cb 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index f6bcd7b012..87ca6d43ca 100644
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -4,7 +4,6 @@
 
 #ifdef WITH_VMX
 
-# include <stdio.h>
 # include <string.h>
 # include <unistd.h>
 
diff --git a/tools/virsh-console.c b/tools/virsh-console.c
index c1927c28ab..e767c8e42d 100644
--- a/tools/virsh-console.c
+++ b/tools/virsh-console.c
@@ -25,7 +25,6 @@
 
 #ifndef WIN32
 
-# include <stdio.h>
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <fcntl.h>
diff --git a/tools/virsh.c b/tools/virsh.c
index 62226eea4c..ed1554f185 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #include "virsh.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/tools/virsh.h b/tools/virsh.h
index e164aabcee..5399cd143e 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -25,7 +25,6 @@
 #ifndef VIRSH_H
 # define VIRSH_H
 
-# include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
 # include <stdarg.h>
diff --git a/tools/virt-host-validate-bhyve.c b/tools/virt-host-validate-bhyve.c
index fb0ccd3ec9..2f0ec1e36c 100644
--- a/tools/virt-host-validate-bhyve.c
+++ b/tools/virt-host-validate-bhyve.c
@@ -23,7 +23,6 @@
 
 #include <sys/param.h>
 #include <sys/linker.h>
-#include <stdio.h>
 
 #include "virt-host-validate-bhyve.h"
 #include "virt-host-validate-common.h"
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index c45dfc5d8c..b12a32b052 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -23,7 +23,6 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 #ifdef HAVE_MNTENT_H
diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c
index 1470bf1c7d..1c0ec8c92e 100644
--- a/tools/virt-host-validate.c
+++ b/tools/virt-host-validate.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_LIBINTL_H
 # include <libintl.h>
diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c
index b68c393026..77b04ec484 100644
--- a/tools/virt-login-shell.c
+++ b/tools/virt-login-shell.c
@@ -26,7 +26,6 @@
 #include <getopt.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/tools/vsh.c b/tools/vsh.c
index 1049729065..ddd8ff1f18 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -26,7 +26,6 @@
 #include "vsh.h"
 
 #include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/tools/vsh.h b/tools/vsh.h
index 694476471b..9b690aea77 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -25,7 +25,6 @@
 #ifndef VSH_H
 # define VSH_H
 
-# include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
 # include <stdarg.h>
-- 
2.17.1




More information about the libvir-list mailing list