diff --git a/tests/server/tftp.h b/tests/server/tftp.h
index b991875cce..d6c7acec5d 100644
--- a/tests/server/tftp.h
+++ b/tests/server/tftp.h
@@ -46,12 +46,6 @@ struct tftphdr {
 #define th_code  th_block
 #define th_msg   th_data
 
-#define opcode_RRQ   1
-#define opcode_WRQ   2
-#define opcode_DATA  3
-#define opcode_ACK   4
-#define opcode_ERROR 5
-
 #define EUNDEF    0
 #define ENOTFOUND 1
 #define EACCESS   2
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 8675675602..364cddc3aa 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -118,6 +118,11 @@ static int writeit(struct testcase *test, struct tftphdr **dpp, int ct,
                    int convert);
 static void mysignal(int, void (*func)(int));
 
+#define opcode_RRQ   1
+#define opcode_WRQ   2
+#define opcode_DATA  3
+#define opcode_ACK   4
+#define opcode_ERROR 5
 
 #define TIMEOUT         5