cleanup extra includes and -Wall

5 files changed, 11 insertions, 16 deletions

diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 2dc789d0ffe..4a65949aa2d 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.c,v 1.22 2003/09/09 08:39:53 jmc Exp $	*/
+/*	$OpenBSD: calendar.c,v 1.23 2004/12/10 15:31:01 mickey Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: calendar.c,v 1.22 2003/09/09 08:39:53 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: calendar.c,v 1.23 2004/12/10 15:31:01 mickey Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index f6c3c4720fa..0bf255d0f9d 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: day.c,v 1.16 2004/12/10 15:00:27 mickey Exp $	*/
+/*	$OpenBSD: day.c,v 1.17 2004/12/10 15:31:01 mickey Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: day.c,v 1.16 2004/12/10 15:00:27 mickey Exp $";
+static const char rcsid[] = "$OpenBSD: day.c,v 1.17 2004/12/10 15:31:01 mickey Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 799624c9beb..8a895251a2a 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.27 2004/12/10 15:00:27 mickey Exp $	*/
+/*	$OpenBSD: io.c,v 1.28 2004/12/10 15:31:01 mickey Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: io.c,v 1.27 2004/12/10 15:00:27 mickey Exp $";
+static const char rcsid[] = "$OpenBSD: io.c,v 1.28 2004/12/10 15:31:01 mickey Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 7a4c4b02f3c..936850d25cd 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ostern.c,v 1.4 2003/06/25 22:41:24 deraadt Exp $	*/
+/*	$OpenBSD: ostern.c,v 1.5 2004/12/10 15:31:01 mickey Exp $	*/
 
 /*
  * Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
@@ -25,16 +25,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: ostern.c,v 1.4 2003/06/25 22:41:24 deraadt Exp $
+ * 	$Id: ostern.c,v 1.5 2004/12/10 15:31:01 mickey Exp $
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ostern.c,v 1.4 2003/06/25 22:41:24 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: ostern.c,v 1.5 2004/12/10 15:31:01 mickey Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <time.h>
 #include <tzfile.h>
 
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index fef3cc674ea..9109fe921a6 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: paskha.c,v 1.3 2003/06/25 22:41:24 deraadt Exp $	*/
+/*	$OpenBSD: paskha.c,v 1.4 2004/12/10 15:31:01 mickey Exp $	*/
 
 /*
  * Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
@@ -27,13 +27,10 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: paskha.c,v 1.3 2003/06/25 22:41:24 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: paskha.c,v 1.4 2004/12/10 15:31:01 mickey Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include <tzfile.h>
 
 #include "calendar.h"