diff --git a/usr.sbin/tzsetup/main.c b/usr.sbin/tzsetup/main.c
index 6869dd46aded..6a46538f5c71 100644
--- a/usr.sbin/tzsetup/main.c
+++ b/usr.sbin/tzsetup/main.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcsid[] =
-	"$Id: main.c,v 1.7 1996/04/01 08:17:49 joerg Exp $";
+	"$Id: main.c,v 1.8 1996/07/03 01:17:34 jkh Exp $";
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -40,12 +40,10 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "tzsetup.h"
-
-#define PATH_LOCALTIME		"/etc/localtime"
-#define PATH_WALL_CMOS_CLOCK	"/etc/wall_cmos_clock"
-#define PATH_ZONEINFO		"/usr/share/zoneinfo"
+#include "pathnames.h"
 
 static int set_time();
 
diff --git a/usr.sbin/tzsetup/pathnames.h b/usr.sbin/tzsetup/pathnames.h
new file mode 100644
index 000000000000..006b2d7abc96
--- /dev/null
+++ b/usr.sbin/tzsetup/pathnames.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 1996
+ *	FreeBSD Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY FreeBSD Inc. AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL [your name] OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ *
+ * 	$Id$
+ */
+
+#define PATH_LOCALTIME          "/etc/localtime"
+#define PATH_WALL_CMOS_CLOCK    "/etc/wall_cmos_clock"
+#define PATH_ZONEINFO           "/usr/share/zoneinfo" 
diff --git a/usr.sbin/tzsetup/tzmenu.c b/usr.sbin/tzsetup/tzmenu.c
index 3fb89c63040a..dbcba7175200 100644
--- a/usr.sbin/tzsetup/tzmenu.c
+++ b/usr.sbin/tzsetup/tzmenu.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcsid[] =
-	"$Id: tzmenu.c,v 1.3 1996/03/22 22:22:40 joerg Exp $";
+	"$Id: tzmenu.c,v 1.4 1996/03/31 09:55:02 joerg Exp $";
 
 #include <stdio.h>
 #include <ncurses.h>
@@ -75,8 +75,6 @@ tzmenu(void)
 	int item = 0;
 	int sc = 0;
 	const char *res;
-	struct winsize win;
-	char *cp;
 
 	while(1) {
 		dialog_clear();
@@ -155,7 +153,6 @@ location_menu(const struct country *ctry, const char *name)
 	int rv;
 	int item = 0;
 	int sc = 0;
-	const char *res;
 
 	snprintf(title, sizeof title, "Timezone Selector - %s", name);