diff --git a/src/include/gpxe/tftp.h b/src/include/gpxe/tftp.h
index 87d629ee..b6a8e22b 100644
--- a/src/include/gpxe/tftp.h
+++ b/src/include/gpxe/tftp.h
@@ -8,10 +8,6 @@
  */
 
 #include <stdint.h>
-#include <gpxe/udp.h>
-#include <gpxe/async.h>
-#include <gpxe/retry.h>
-#include <gpxe/buffer.h>
 
 #define TFTP_PORT	       69 /**< Default TFTP server port */
 #define	TFTP_DEFAULT_BLKSIZE  512 /**< Default TFTP data block size */
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 027ada1c..4613f59e 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -28,6 +28,8 @@
 #include <gpxe/xfer.h>
 #include <gpxe/open.h>
 #include <gpxe/uri.h>
+#include <gpxe/tcpip.h>
+#include <gpxe/retry.h>
 #include <gpxe/tftp.h>
 
 /** @file