11 files changed, 12 insertions, 11 deletions
diff --git a/src/hci/commands/autoboot_cmd.c b/src/hci/commands/autoboot_cmd.c
index d7fb2e1fb..0e6f2948d 100644
--- a/src/hci/commands/autoboot_cmd.c
+++ b/src/hci/commands/autoboot_cmd.c
@@ -1,4 +1,4 @@
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/command.h>
 #include <usr/autoboot.h>
 
diff --git a/src/hci/commands/config_cmd.c b/src/hci/commands/config_cmd.c
index a15593913..368a6ca4a 100644
--- a/src/hci/commands/config_cmd.c
+++ b/src/hci/commands/config_cmd.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/command.h>
 #include <gpxe/settings.h>
 #include <gpxe/settings_ui.h>
diff --git a/src/hci/commands/dhcp_cmd.c b/src/hci/commands/dhcp_cmd.c
index 8cfd428e3..208f35578 100644
--- a/src/hci/commands/dhcp_cmd.c
+++ b/src/hci/commands/dhcp_cmd.c
@@ -18,8 +18,8 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <getopt.h>
-#include <vsprintf.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/command.h>
 #include <usr/dhcpmgmt.h>
diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c
index dc255e160..f2508e556 100644
--- a/src/hci/commands/ifmgmt_cmd.c
+++ b/src/hci/commands/ifmgmt_cmd.c
@@ -16,8 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <getopt.h>
-#include <vsprintf.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/command.h>
 #include <usr/ifmgmt.h>
diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index 900886ff2..98de50e25 100644
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -18,10 +18,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include <libgen.h>
 #include <getopt.h>
-#include <vsprintf.h>
 #include <gpxe/image.h>
 #include <gpxe/command.h>
 #include <gpxe/initrd.h>
diff --git a/src/hci/commands/nvo_cmd.c b/src/hci/commands/nvo_cmd.c
index 91c132059..4392787b0 100644
--- a/src/hci/commands/nvo_cmd.c
+++ b/src/hci/commands/nvo_cmd.c
@@ -1,8 +1,8 @@
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <getopt.h>
 #include <gpxe/nvo.h>
 #include <gpxe/dhcp.h>
diff --git a/src/hci/commands/route_cmd.c b/src/hci/commands/route_cmd.c
index 2e9de562f..227682cb4 100644
--- a/src/hci/commands/route_cmd.c
+++ b/src/hci/commands/route_cmd.c
@@ -16,8 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <getopt.h>
-#include <vsprintf.h>
 #include <gpxe/command.h>
 #include <usr/route.h>
 
diff --git a/src/hci/mucurses/alert.c b/src/hci/mucurses/alert.c
index 4e88b82a7..00e959a89 100644
--- a/src/hci/mucurses/alert.c
+++ b/src/hci/mucurses/alert.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include <vsprintf.h>
+#include <stdio.h>
 
 /** @file
  *
diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c
index fc14e67e0..80766bc94 100644
--- a/src/hci/mucurses/print.c
+++ b/src/hci/mucurses/print.c
@@ -1,6 +1,7 @@
 #include <curses.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <stddef.h>
+#include <vsprintf.h>
 #include "mucurses.h"
 
 /** @file
diff --git a/src/hci/shell.c b/src/hci/shell.c
index 95662b501..b14af5426 100644
--- a/src/hci/shell.c
+++ b/src/hci/shell.c
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <readline/readline.h>
 #include <gpxe/command.h>
 #include <gpxe/shell.h>
diff --git a/src/hci/strerror.c b/src/hci/strerror.c
index e407d30b8..56b07e8a9 100644
--- a/src/hci/strerror.c
+++ b/src/hci/strerror.c
@@ -1,6 +1,6 @@
 #include <errno.h>
 #include <string.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/errortab.h>
 
 /** @file