diff --git a/usr.sbin/sesd/Makefile.inc b/usr.sbin/sesd/Makefile.inc
index 52d1f203a108..d34408e40fd5 100644
--- a/usr.sbin/sesd/Makefile.inc
+++ b/usr.sbin/sesd/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2000/02/22 05:26:55 erh Exp $
+# $NetBSD: Makefile.inc,v 1.6 2000/02/22 06:06:06 mjacob Exp $
 # $OpenBSD: $
 # $FreeBSD: $
 #
@@ -34,18 +34,7 @@
 # mjacob@feral.com
 #
 
-SYS	!=	uname -s
-
-.if ${SYS} == OpenBSD
-#COPTS	+=	-I${DESTDIR}/usr/include/scsi -DSESINC="<ses.h>"
-COPTS	+=	-DSESINC"<scsi/ses.h>"
-.elif	${SYS} == NetBSD
-#COPTS	+=	-I${DESTDIR}/usr/include/dev/scsipi -DSESINC="<ses.h>"
 COPTS	+=	-DSESINC="<dev/scsipi/ses.h>"
-.else
-#COPTS	+=	-I${DESTDIR}/usr/include/cam/scsi -DSESINC="<scsi_ses.h>"
-COPTS	+=	-DSESINC="<cam/scsi/scsi_ses.h>"
-.endif
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/sesd/srcs/chpmon.c b/usr.sbin/sesd/srcs/chpmon.c
index 387e9db1c9d8..49fafba7ca6e 100644
--- a/usr.sbin/sesd/srcs/chpmon.c
+++ b/usr.sbin/sesd/srcs/chpmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: chpmon.c,v 1.1 2000/02/21 08:10:27 mjacob Exp $ */
+/* $NetBSD: chpmon.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */
 /* $FreeBSD: src/share/examples/ses/chpmon.c,v 1.1 2000/01/15 22:47:16 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
@@ -47,6 +47,9 @@
  */
 #define	BADSTAT	\
 	(SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL)
+
+int main __P((int, char **));
+
 int
 main(a, v)
 	int a;
diff --git a/usr.sbin/sesd/srcs/eltsub.c b/usr.sbin/sesd/srcs/eltsub.c
index 7bec095e7b14..cd60edf98e93 100644
--- a/usr.sbin/sesd/srcs/eltsub.c
+++ b/usr.sbin/sesd/srcs/eltsub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eltsub.c,v 1.1 2000/02/21 08:10:27 mjacob Exp $ */
+/* $NetBSD: eltsub.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -40,6 +40,10 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+char *geteltnm __P((int));
+static char *scode2ascii __P((u_char));
+char *stat2ascii __P((int, u_char *));
+
 char *
 geteltnm(type)
 	int type;
diff --git a/usr.sbin/sesd/srcs/getencstat.c b/usr.sbin/sesd/srcs/getencstat.c
index 82ea1329ee65..8dabfbe27850 100644
--- a/usr.sbin/sesd/srcs/getencstat.c
+++ b/usr.sbin/sesd/srcs/getencstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getencstat.c,v 1.1 2000/02/21 08:10:28 mjacob Exp $ */ 
+/* $NetBSD: getencstat.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -43,6 +43,7 @@
 
 extern char *geteltnm __P((int));
 extern char *stat2ascii __P((int, u_char *));
+int main __P((int, char **));
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/getnobj.c b/usr.sbin/sesd/srcs/getnobj.c
index f18a7d45c5f5..b424b4ba5c16 100644
--- a/usr.sbin/sesd/srcs/getnobj.c
+++ b/usr.sbin/sesd/srcs/getnobj.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getnobj.c,v 1.1 2000/02/21 08:10:28 mjacob Exp $ */ 
+/* $NetBSD: getnobj.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -42,6 +42,8 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+int main __P((int, char **));
+
 int
 main(argc, argv)
 	int argc;
diff --git a/usr.sbin/sesd/srcs/getobjmap.c b/usr.sbin/sesd/srcs/getobjmap.c
index 82d6d96d87de..6c0a84a9b36f 100644
--- a/usr.sbin/sesd/srcs/getobjmap.c
+++ b/usr.sbin/sesd/srcs/getobjmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getobjmap.c,v 1.1 2000/02/21 08:10:28 mjacob Exp $ */ 
+/* $NetBSD: getobjmap.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -41,6 +41,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+int main __P((int, char **));
 extern char *geteltnm __P((int));
 
 int
diff --git a/usr.sbin/sesd/srcs/getobjstat.c b/usr.sbin/sesd/srcs/getobjstat.c
index 404a65569e69..5f2a6fe73cfd 100644
--- a/usr.sbin/sesd/srcs/getobjstat.c
+++ b/usr.sbin/sesd/srcs/getobjstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getobjstat.c,v 1.1 2000/02/21 08:10:29 mjacob Exp $ */ 
+/* $NetBSD: getobjstat.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -40,6 +40,8 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+int main __P((int, char **));
+
 int
 main(a, v)
 	int a;
diff --git a/usr.sbin/sesd/srcs/inienc.c b/usr.sbin/sesd/srcs/inienc.c
index 76294d52183e..d8089e29c024 100644
--- a/usr.sbin/sesd/srcs/inienc.c
+++ b/usr.sbin/sesd/srcs/inienc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inienc.c,v 1.1 2000/02/21 08:10:29 mjacob Exp $ */ 
+/* $NetBSD: inienc.c,v 1.2 2000/02/22 06:06:07 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -41,6 +41,8 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+int __P((int, char **));
+
 int
 main(a, v)
 	int a;
diff --git a/usr.sbin/sesd/srcs/sesd.c b/usr.sbin/sesd/srcs/sesd.c
index 7e74e9d0f8a0..0d9a60fb37ba 100644
--- a/usr.sbin/sesd/srcs/sesd.c
+++ b/usr.sbin/sesd/srcs/sesd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sesd.c,v 1.1 2000/02/21 08:10:30 mjacob Exp $ */
+/* $NetBSD: sesd.c,v 1.2 2000/02/22 06:06:08 mjacob Exp $ */
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -45,6 +45,7 @@
 
 #define	ALLSTAT (SES_ENCSTAT_UNRECOV | SES_ENCSTAT_CRITICAL | \
 	SES_ENCSTAT_NONCRITICAL | SES_ENCSTAT_INFO)
+int main __P((int, char **));
 
 /*
  * Monitor named SES devices and note (via syslog) any changes in status.
@@ -57,7 +58,7 @@ main(a, v)
 {
 	static char *usage =
 	    "usage: %s [ -d ] [ -t pollinterval ] device [ device ]\n";
-	int fd, polltime, dev, devbase, nodaemon, bpri;
+	int fd, polltime, dev, devbase, nodaemon;
 	ses_encstat stat, *carray;
 
 	if (a < 2) {
@@ -117,7 +118,6 @@ main(a, v)
 
 	for (;;) {
 		for (dev = devbase; dev < a; dev++) {
-			char buf[128];
 			fd = open(v[dev], O_RDWR);
 			if (fd < 0) {
 				syslog(LOG_ERR, "%s: %m", v[dev]);
diff --git a/usr.sbin/sesd/srcs/setencstat.c b/usr.sbin/sesd/srcs/setencstat.c
index 0a3b07acabec..f3605cdc48ee 100644
--- a/usr.sbin/sesd/srcs/setencstat.c
+++ b/usr.sbin/sesd/srcs/setencstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setencstat.c,v 1.1 2000/02/21 08:10:30 mjacob Exp $ */ 
+/* $NetBSD: setencstat.c,v 1.2 2000/02/22 06:06:09 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -41,6 +41,8 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+int main __P((int, char **));
+
 int
 main(a, v)
 	int a;
diff --git a/usr.sbin/sesd/srcs/setobjstat.c b/usr.sbin/sesd/srcs/setobjstat.c
index ab3c9b056a33..3d7ddce21483 100644
--- a/usr.sbin/sesd/srcs/setobjstat.c
+++ b/usr.sbin/sesd/srcs/setobjstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setobjstat.c,v 1.1 2000/02/21 08:10:30 mjacob Exp $ */ 
+/* $NetBSD: setobjstat.c,v 1.2 2000/02/22 06:06:10 mjacob Exp $ */ 
 /* $FreeBSD: $ */
 /* $OpenBSD: $ */
 /*
@@ -41,6 +41,8 @@
 #include <sys/ioctl.h>
 #include SESINC
 
+int main __P((int, char **));
+
 int
 main(a, v)
 	int a;