diff --git a/src/arch/i386/core/load_buffer.c b/src/arch/i386/core/load_buffer.c
index 3e34d2b5..4f19a3ce 100644
--- a/src/arch/i386/core/load_buffer.c
+++ b/src/arch/i386/core/load_buffer.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "io.h"
 #include "load_buffer.h"
 
diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c
index c9ac7ee1..1e9332ee 100644
--- a/src/arch/i386/core/relocate.c
+++ b/src/arch/i386/core/relocate.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <io.h>
 #include <registers.h>
 #include <memmap.h>
diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/i386/firmware/pcbios/hidemem.c
index 276f9c92..2225787e 100644
--- a/src/arch/i386/firmware/pcbios/hidemem.c
+++ b/src/arch/i386/firmware/pcbios/hidemem.c
@@ -15,6 +15,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <realmode.h>
 #include <biosint.h>
 
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index daa1d99c..1995dfd6 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <errno.h>
 #include <realmode.h>
diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c
index 798fb6df..790dda97 100644
--- a/src/arch/i386/interface/pcbios/int13.c
+++ b/src/arch/i386/interface/pcbios/int13.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <limits.h>
 #include <byteswap.h>
diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c
index df32dd7d..0e7c09a4 100644
--- a/src/arch/i386/interface/pxe/pxe_call.c
+++ b/src/arch/i386/interface/pxe/pxe_call.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <gpxe/uaccess.h>
 #include <registers.h>
 #include <biosint.h>
diff --git a/src/core/resolv.c b/src/core/resolv.c
index 0737294a..f13ab152 100644
--- a/src/core/resolv.c
+++ b/src/core/resolv.c
@@ -1,4 +1,5 @@
 #include "resolv.h"
+#include "stdio.h"
 
 static struct resolver resolvers[0] __table_start(resolver);
 static struct resolver resolvers_end[0] __table_end(resolver);
diff --git a/src/crypto/ssl.c b/src/crypto/ssl.c
index 00651bd4..823c926a 100644
--- a/src/crypto/ssl.c
+++ b/src/crypto/ssl.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "ssl.h"
 #include "ssl_constructs.h"
 #include <string.h> // for bcopy()
diff --git a/src/drivers/bitbash/i2c_bit.c b/src/drivers/bitbash/i2c_bit.c
index 2551bb4f..1cf78c22 100644
--- a/src/drivers/bitbash/i2c_bit.c
+++ b/src/drivers/bitbash/i2c_bit.c
@@ -16,10 +16,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <errno.h>
 #include <assert.h>
+#include <timer.h>
 #include <gpxe/bitbash.h>
 #include <gpxe/i2c.h>
 
diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index 20ad412c..add884a3 100644
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/drivers/block/ata.c b/src/drivers/block/ata.c
index 555a5f6e..84191257 100644
--- a/src/drivers/block/ata.c
+++ b/src/drivers/block/ata.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stddef.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index 222f3eea..6f72bb90 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/drivers/bus/pciextra.c b/src/drivers/bus/pciextra.c
index 4603bcb9..5d815000 100644
--- a/src/drivers/bus/pciextra.c
+++ b/src/drivers/bus/pciextra.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdint.h>
 #include <gpxe/pci.h>
 
diff --git a/src/interface/pxe/pxe_loader.c b/src/interface/pxe/pxe_loader.c
index 2539aaeb..b8dc06bd 100644
--- a/src/interface/pxe/pxe_loader.c
+++ b/src/interface/pxe/pxe_loader.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include "pxe.h"
 
 /* PXENV_UNDI_LOADER
diff --git a/src/interface/pxe/pxe_tftp.c b/src/interface/pxe/pxe_tftp.c
index a834be09..dbaf601b 100644
--- a/src/interface/pxe/pxe_tftp.c
+++ b/src/interface/pxe/pxe_tftp.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include "pxe.h"
 
 static int pxe_tftp_read_block ( unsigned char *data, unsigned int block,
diff --git a/src/interface/pxe/pxe_udp.c b/src/interface/pxe/pxe_udp.c
index 5f94e8c0..453d5b6c 100644
--- a/src/interface/pxe/pxe_udp.c
+++ b/src/interface/pxe/pxe_udp.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <byteswap.h>
 #include <gpxe/udp.h>
diff --git a/src/interface/pxe/pxe_undi.c b/src/interface/pxe/pxe_undi.c
index 6d30d1b6..f9bf2a9a 100644
--- a/src/interface/pxe/pxe_undi.c
+++ b/src/interface/pxe/pxe_undi.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include "pxe.h"
 
 /* PXENV_UNDI_STARTUP
diff --git a/src/net/arp.c b/src/net/arp.c
index fea81d71..8ca30245 100644
--- a/src/net/arp.c
+++ b/src/net/arp.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "stdio.h"
 #include <stdint.h>
 #include <string.h>
 #include <byteswap.h>
diff --git a/src/net/icmpv6.c b/src/net/icmpv6.c
index 183fd06c..c48bf127 100644
--- a/src/net/icmpv6.c
+++ b/src/net/icmpv6.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <byteswap.h>
@@ -23,7 +24,7 @@ struct tcpip_protocol icmp6_protocol;
  * This function prepares a neighbour solicitation packet and sends it to the
  * network layer.
  */
-int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src,
+int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src __unused,
 			 struct in6_addr *dest ) {
 	union {
 		struct sockaddr_in6 sin6;
@@ -60,7 +61,7 @@ int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src,
 	st_dest.sin6.sin6_addr.in6_u.u6_addr8[13] = 0xff;
 	
 	/* Send packet over IP6 */
-	tcpip_tx ( pkb, &icmp6_protocol, &st_dest.st );
+	return ( tcpip_tx ( pkb, &icmp6_protocol, &st_dest.st ) );
 }
 
 /**
diff --git a/src/net/ndp.c b/src/net/ndp.c
index b72cf76f..d99a9569 100644
--- a/src/net/ndp.c
+++ b/src/net/ndp.c
@@ -1,3 +1,4 @@
+#include "stdio.h"
 #include <stdint.h>
 #include <string.h>
 #include <byteswap.h>
@@ -147,8 +148,8 @@ int ndp_resolve ( struct net_device *netdev, struct in6_addr *dest,
  * @v st_src	Source address
  * @v st_dest	Destination address 
  */
-int ndp_process_advert ( struct pk_buff *pkb, struct sockaddr_tcpip *st_src,
-			   struct sockaddr_tcpip *st_dest ) {
+int ndp_process_advert ( struct pk_buff *pkb, struct sockaddr_tcpip *st_src __unused,
+			   struct sockaddr_tcpip *st_dest __unused ) {
 	struct neighbour_advert *nadvert = pkb->data;
 	struct ndp_entry *ndp;
 
diff --git a/src/net/netdevice.c b/src/net/netdevice.c
index 634977f7..2ee14090 100644
--- a/src/net/netdevice.c
+++ b/src/net/netdevice.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <byteswap.h>
 #include <string.h>
diff --git a/src/net/retry.c b/src/net/retry.c
index 0fb47952..ac98dcfa 100644
--- a/src/net/retry.c
+++ b/src/net/retry.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <stddef.h>
 #include <latch.h>
 #include <gpxe/list.h>
diff --git a/src/net/tcp.c b/src/net/tcp.c
index b84c302b..7f2f2166 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/net/tcpip.c b/src/net/tcpip.c
index 33c9872c..7476628e 100644
--- a/src/net/tcpip.c
+++ b/src/net/tcpip.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/net/udp.c b/src/net/udp.c
index 21bfebcd..e46c772e 100644
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index af32f213..9c36516d 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
diff --git a/src/proto/nmb.c b/src/proto/nmb.c
index d2944031..9fa17d9c 100644
--- a/src/proto/nmb.c
+++ b/src/proto/nmb.c
@@ -1,3 +1,4 @@
+#include "stdio.h"
 #include "resolv.h"
 #include "string.h"
 #include "dns.h"