diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index 3df90a595370..2191f5591acf 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /*
@@ -38,6 +36,9 @@
  *   e.g. faithd telnet /usr/libexec/telnetd telnetd
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -702,7 +703,7 @@ map6to4(struct sockaddr_in6 *dst6, struct sockaddr_in *dst4)
 
 
 static void
-sig_child(int sig)
+sig_child(int sig __unused)
 {
 	int status;
 	pid_t pid;
@@ -714,7 +715,7 @@ sig_child(int sig)
 }
 
 void
-sig_terminate(int sig)
+sig_terminate(int sig __unused)
 {
 	syslog(LOG_INFO, "Terminating faith daemon");	
 	exit(EXIT_SUCCESS);
diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c
index 714df9a159c2..825ea352a02d 100644
--- a/usr.sbin/faithd/tcp.c
+++ b/usr.sbin/faithd/tcp.c
@@ -27,10 +27,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -77,7 +78,7 @@ static void relay __P((int, int, const char *, int));
  * - parent side (ppid == 0) will check the last SIGUSR1 it have seen.
  */
 static void
-sig_ctimeout(int sig)
+sig_ctimeout(int sig __unused)
 {
 	/* parent side: record notification from the child */
 	if (dflag)
@@ -87,7 +88,7 @@ sig_ctimeout(int sig)
 
 /* parent will terminate if child dies. */
 static void
-sig_child(int sig)
+sig_child(int sig __unused)
 {
 	int status;
 	pid_t pid;
@@ -148,7 +149,7 @@ notify_active()
 }
 
 static void
-send_data(int s_rcv, int s_snd, const char *service, int direction)
+send_data(int s_rcv, int s_snd, const char *service __unused, int direction)
 {
 	int cc;