diff --git a/tftp/main.c b/tftp/main.c
index 245a1e9..f89ee1f 100644
--- a/tftp/main.c
+++ b/tftp/main.c
@@ -152,7 +152,7 @@ struct cmd cmdtab[] = {
 	{ "rexmt",	xhelp,		setrexmt },
 	{ "timeout",	ihelp,		settimeout },
 	{ "?",		hhelp,		help },
-	{ 0 }
+	{ 0, 0, 0 }
 };
 
 struct	cmd *getcmd(char *);
@@ -291,14 +291,14 @@ modecmd(int argc, char *argv[])
 void
 setbinary(int argc, char *argv[])
 {      
-
+	(void)argc; (void)argv;	/* Quiet unused warning */
 	settftpmode("octet");
 }
 
 void
 setascii(int argc, char *argv[])
 {
-
+	(void)argc; (void)argv;	/* Quiet unused warning */
 	settftpmode("netascii");
 }
 
@@ -541,6 +541,7 @@ settimeout(int argc, char *argv[])
 void
 status(int argc, char *argv[])
 {
+	(void)argc; (void)argv;	/* Quiet unused warning */
 	if (connected)
 		printf("Connected to %s.\n", hostname);
 	else
@@ -554,6 +555,7 @@ status(int argc, char *argv[])
 void
 intr(int sig)
 {
+	(void)sig;	/* Quiet unused warning */
 
 	bsd_signal(SIGALRM, SIG_IGN);
 	alarm(0);
@@ -668,7 +670,7 @@ makeargv(void)
 void
 quit(int argc, char *argv[])
 {
-
+	(void)argc; (void)argv;	/* Quiet unused warning */
 	exit(0);
 }
 
@@ -702,6 +704,8 @@ help(int argc, char *argv[])
 void
 settrace(int argc, char *argv[])
 {
+	(void)argc; (void)argv;	/* Quiet unused warning */
+
 	trace = !trace;
 	printf("Packet tracing %s.\n", trace ? "on" : "off");
 }
@@ -709,6 +713,8 @@ settrace(int argc, char *argv[])
 void
 setverbose(int argc, char *argv[])
 {
+	(void)argc; (void)argv;	/* Quiet unused warning */
+
 	verbose = !verbose;
 	printf("Verbose mode %s.\n", verbose ? "on" : "off");
 }
diff --git a/tftp/tftp.c b/tftp/tftp.c
index 8c40eea..f1e6961 100644
--- a/tftp/tftp.c
+++ b/tftp/tftp.c
@@ -36,10 +36,13 @@
  * SUCH DAMAGE.
  */
 
+#include "tftpsubs.h"
+
 #ifndef lint
 /* static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93"; */
 /* static char rcsid[] = "$OpenBSD: tftp.c,v 1.4 1997/08/06 06:43:45 deraadt Exp $"; */
-static const char *rcsid = "tftp-hpa $Id$";
+static const char *rcsid UNUSED =
+"tftp-hpa $Id$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
@@ -64,7 +67,6 @@ static const char *rcsid = "tftp-hpa $Id$";
 
 #include "../config.h"
 #include "extern.h"
-#include "tftpsubs.h"
 
 void bsd_signal(int, void (*)(int));
 
@@ -449,6 +451,8 @@ timer(int sig)
 {
 	int save_errno = errno;
 
+	(void)sig;		/* Shut up unused warning */
+
 	timeout += rexmtval;
 	if (timeout >= maxtimeout) {
 		printf("Transfer timed out.\n");
diff --git a/tftp/tftpsubs.h b/tftp/tftpsubs.h
index 05deb1a..d2e0969 100644
--- a/tftp/tftpsubs.h
+++ b/tftp/tftpsubs.h
@@ -46,6 +46,9 @@
 #define TFTPSUBS_H
 
 #include <stdlib.h>
+#include <stdio.h>
+
+struct tftphdr;
 
 struct tftphdr *r_init(void);
 void	read_ahead(FILE *, int);
@@ -66,4 +69,13 @@ extern int segsize;
 extern void *xmalloc(size_t);
 extern char *xstrdup(const char *);
 
+/*
+ * How to annotate unused variables
+ */
+#ifdef __GNUC__
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
 #endif