6 files changed, 6 insertions, 5 deletions
diff --git a/src/core/exec.c b/src/core/exec.c
index 8f1ef3339..a1c073e3a 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 547aa6940..6de412bb8 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 0ff0a7065..5a2ee824e 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 448080b4f..6dfdd632a 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 a1f404440..42029fdcd 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 e225d48c2..ca22ae886 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>