diff --git a/src/arch/i386/core/nulltrap.c b/src/arch/i386/core/nulltrap.c
index bd4b7577..61fe5564 100644
--- a/src/arch/i386/core/nulltrap.c
+++ b/src/arch/i386/core/nulltrap.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include <vsprintf.h>
+#include <stdio.h>
 
 __attribute__ (( noreturn, section ( ".text.null_trap" ) ))
 void null_function_trap ( void ) {
diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c
index c93ad247..648835cf 100644
--- a/src/arch/i386/drivers/net/undi.c
+++ b/src/arch/i386/drivers/net/undi.c
@@ -18,8 +18,8 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
-#include <vsprintf.h>
 #include <gpxe/pci.h>
 #include <undi.h>
 #include <undirom.h>
diff --git a/src/core/exec.c b/src/core/exec.c
index 8f1ef333..a1c073e3 100644
--- a/src/core/exec.c
+++ b/src/core/exec.c
@@ -19,11 +19,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/tables.h>
 #include <gpxe/command.h>
 
diff --git a/src/core/getopt.c b/src/core/getopt.c
index 547aa694..6de412bb 100644
--- a/src/core/getopt.c
+++ b/src/core/getopt.c
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <getopt.h>
 
 /** @file
diff --git a/src/core/image.c b/src/core/image.c
index 0ff0a706..5a2ee824 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -19,9 +19,9 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/list.h>
 #include <gpxe/image.h>
 
diff --git a/src/core/malloc.c b/src/core/malloc.c
index 448080b4..6dfdd632 100644
--- a/src/core/malloc.c
+++ b/src/core/malloc.c
@@ -340,7 +340,7 @@ void mpopulate ( void *start, size_t len ) {
 }
 
 #if 0
-#include <vsprintf.h>
+#include <stdio.h>
 /**
  * Dump free block list
  *
diff --git a/src/core/settings.c b/src/core/settings.c
index a1f40444..42029fdc 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -18,12 +18,12 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/in.h>
 #include <gpxe/settings.h>
 
diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c
index e225d48c..ca22ae88 100644
--- a/src/core/vsprintf.c
+++ b/src/core/vsprintf.c
@@ -18,6 +18,7 @@
 
 #include <stddef.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <console.h>
 #include <errno.h>
 #include <vsprintf.h>
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index 56436b7d..e8f34fba 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -21,9 +21,9 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <gpxe/tables.h>
 #include <gpxe/device.h>
 #include <gpxe/pci.h>
diff --git a/src/drivers/net/legacy.c b/src/drivers/net/legacy.c
index 73d1d787..1719c82a 100644
--- a/src/drivers/net/legacy.c
+++ b/src/drivers/net/legacy.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
+#include <stdio.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <gpxe/if_ether.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/ethernet.h>
diff --git a/src/drivers/net/pnic.c b/src/drivers/net/pnic.c
index 21097d2e..7f442420 100644
--- a/src/drivers/net/pnic.c
+++ b/src/drivers/net/pnic.c
@@ -13,8 +13,8 @@ Bochs Pseudo NIC driver for Etherboot
  */
 
 #include <stdint.h>
+#include <stdio.h>
 #include <io.h>
-#include <vsprintf.h>
 #include <errno.h>
 #include <gpxe/pci.h>
 #include <gpxe/if_ether.h>
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index ff1fa646..d3b89223 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -68,9 +68,9 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <io.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
diff --git a/src/hci/commands/autoboot_cmd.c b/src/hci/commands/autoboot_cmd.c
index d7fb2e1f..0e6f2948 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 a1559391..368a6ca4 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 8cfd428e..208f3557 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 dc255e16..f2508e55 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 900886ff..98de50e2 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 91c13205..4392787b 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 2e9de562..227682cb 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 4e88b82a..00e959a8 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 fc14e67e..80766bc9 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 95662b50..b14af542 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 e407d30b..56b07e8a 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
diff --git a/src/include/console.h b/src/include/console.h
index f38d4ecf..b1fe955b 100644
--- a/src/include/console.h
+++ b/src/include/console.h
@@ -1,8 +1,6 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "stdint.h"
-#include "vsprintf.h"
 #include <gpxe/tables.h>
 
 /** @file
diff --git a/src/net/aoe.c b/src/net/aoe.c
index 1c3cd1d2..58579e23 100644
--- a/src/net/aoe.c
+++ b/src/net/aoe.c
@@ -18,7 +18,7 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index 3013b669..b2a22666 100644
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -18,11 +18,11 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <byteswap.h>
 #include <errno.h>
 #include <string.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/list.h>
 #include <gpxe/in.h>
 #include <gpxe/dhcp.h>
diff --git a/src/net/ethernet.c b/src/net/ethernet.c
index 690b2218..cee67d46 100644
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -17,11 +17,11 @@
  */
 
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/if_arp.h>
 #include <gpxe/if_ether.h>
 #include <gpxe/netdevice.h>
diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 065bf61c..8bbcff15 100644
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <vsprintf.h>
 #include <gpxe/list.h>
 #include <gpxe/in.h>
 #include <gpxe/arp.h>
diff --git a/src/net/ipv6.c b/src/net/ipv6.c
index 26c43dd0..458a9375 100644
--- a/src/net/ipv6.c
+++ b/src/net/ipv6.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <byteswap.h>
 #include <gpxe/in.h>
 #include <gpxe/ip6.h>
diff --git a/src/net/netdevice.c b/src/net/netdevice.c
index c5085918..af2bbf58 100644
--- a/src/net/netdevice.c
+++ b/src/net/netdevice.c
@@ -18,10 +18,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <byteswap.h>
 #include <string.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <gpxe/if_ether.h>
 #include <gpxe/pkbuff.h>
 #include <gpxe/tables.h>
diff --git a/src/net/tcp.c b/src/net/tcp.c
index 2311881b..2c2f0b33 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -1,10 +1,10 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 #include <byteswap.h>
 #include <timer.h>
-#include <vsprintf.h>
 #include <gpxe/pkbuff.h>
 #include <gpxe/malloc.h>
 #include <gpxe/retry.h>
diff --git a/src/net/tcp/ftp.c b/src/net/tcp/ftp.c
index 7d10d855..78567884 100644
--- a/src/net/tcp/ftp.c
+++ b/src/net/tcp/ftp.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
-#include <vsprintf.h>
 #include <assert.h>
 #include <errno.h>
 #include <gpxe/async.h>
diff --git a/src/net/tcp/http.c b/src/net/tcp/http.c
index 87f6eee2..32932445 100644
--- a/src/net/tcp/http.c
+++ b/src/net/tcp/http.c
@@ -25,12 +25,12 @@
 
 #include <stddef.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/async.h>
 #include <gpxe/uri.h>
 #include <gpxe/buffer.h>
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index 09edf697..4d95c0b9 100644
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 992b82ba..b07c150a 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -18,12 +18,12 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <vsprintf.h>
 #include <gpxe/async.h>
 #include <gpxe/tftp.h>
 #include <gpxe/uri.h>
diff --git a/src/tests/aoeboot.c b/src/tests/aoeboot.c
index 0fa9ba82..17fda2c6 100644
--- a/src/tests/aoeboot.c
+++ b/src/tests/aoeboot.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <console.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/aoe.h>
diff --git a/src/tests/dhcptest.c b/src/tests/dhcptest.c
index f35a3478..7e4bedbd 100644
--- a/src/tests/dhcptest.c
+++ b/src/tests/dhcptest.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <byteswap.h>
 #include <gpxe/ip.h>
 #include <gpxe/dhcp.h>
diff --git a/src/tests/iscsiboot.c b/src/tests/iscsiboot.c
index ce847856..bb20a5fa 100644
--- a/src/tests/iscsiboot.c
+++ b/src/tests/iscsiboot.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <string.h>
+#include <stdio.h>
 #include <byteswap.h>
-#include <vsprintf.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/iscsi.h>
 #include <gpxe/ibft.h>
diff --git a/src/tests/linebuf_test.c b/src/tests/linebuf_test.c
index 31ce808b..8ba88c56 100644
--- a/src/tests/linebuf_test.c
+++ b/src/tests/linebuf_test.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <string.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/linebuf.h>
 
 static const char data1[] = 
diff --git a/src/tests/umalloc_test.c b/src/tests/umalloc_test.c
index 910edfef..7a361868 100644
--- a/src/tests/umalloc_test.c
+++ b/src/tests/umalloc_test.c
@@ -1,4 +1,4 @@
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/uaccess.h>
 #include <gpxe/umalloc.h>
 #include <gpxe/memmap.h>
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index ebafde7e..0e606efb 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -17,8 +17,8 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/dhcp.h>
 #include <gpxe/image.h>
diff --git a/src/usr/dhcpmgmt.c b/src/usr/dhcpmgmt.c
index 42a0f2b7..060dd67e 100644
--- a/src/usr/dhcpmgmt.c
+++ b/src/usr/dhcpmgmt.c
@@ -17,8 +17,8 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <byteswap.h>
-#include <vsprintf.h>
 #include <gpxe/in.h>
 #include <gpxe/ip.h>
 #include <gpxe/dhcp.h>
diff --git a/src/usr/ifmgmt.c b/src/usr/ifmgmt.c
index 7b9d8470..ff5b34a6 100644
--- a/src/usr/ifmgmt.c
+++ b/src/usr/ifmgmt.c
@@ -17,7 +17,7 @@
  */
 
 #include <string.h>
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/device.h>
 #include <usr/ifmgmt.h>
diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c
index 06ae872e..0d2c9cb4 100644
--- a/src/usr/imgmgmt.c
+++ b/src/usr/imgmgmt.c
@@ -18,8 +18,8 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <gpxe/image.h>
 #include <gpxe/umalloc.h>
 #include <gpxe/download.h>
diff --git a/src/usr/route.c b/src/usr/route.c
index b7f02f57..f3a49f46 100644
--- a/src/usr/route.c
+++ b/src/usr/route.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <vsprintf.h>
+#include <stdio.h>
 #include <gpxe/netdevice.h>
 #include <gpxe/ip.h>
 #include <usr/route.h>