--- a/usr/src/head/Makefile	Thu Apr 07 11:03:36 2011 +0530
+++ b/usr/src/head/Makefile	Wed Mar 30 23:00:17 2011 -0400
@@ -122,6 +122,7 @@
 	nss_common.h	\
 	nss_dbdefs.h	\
 	nss_netdir.h	\
+	paths.h		\
 	pcsample.h	\
 	pfmt.h		\
 	pkgdev.h	\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/head/paths.h	Wed Mar 30 23:00:17 2011 -0400
@@ -0,0 +1,77 @@
+/*	$NetBSD: paths.h,v 1.39 2010/12/29 15:53:57 pooka Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 THE REGENTS 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.
+ *
+ *	@(#)paths.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _PATHS_H
+#define	_PATHS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	_PATH_DEFPATH	"/usr/ccs/bin:/usr/bin:/bin"
+#define	_PATH_STDPATH   _PATH_STDPATH ":/usr/sbin:/sbin"
+
+#define	_PATH_BPF	"/dev/bpf"
+#define	_PATH_BSHELL	"/usr/bin/sh"
+#define	_PATH_CONSOLE	"/dev/console"
+#define	_PATH_CSHELL	"/usr/bin/csh"
+#define	_PATH_DEVNULL	"/dev/null"
+#define	_PATH_FTPUSERS	"/etc/ftpusers"
+#define	_PATH_KMEM	"/dev/kmem"
+#define	_PATH_LOCALE	"/usr/share/locale"
+#define	_PATH_MAILDIR	"/var/mail"
+#define	_PATH_MAN	"/usr/share/man"
+#define	_PATH_MEM	"/dev/mem"
+#define	_PATH_NOLOGIN	"/etc/nologin"
+#define	_PATH_RANDOM	"/dev/random"
+#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
+#define	_PATH_SHELLS	"/etc/shells"
+#define	_PATH_TTY	"/dev/tty"
+#define	_PATH_URANDOM	"/dev/urandom"
+#define	_PATH_VI	"/usr/bin/vi"
+
+/*
+ * Provide trailing slash, since mostly used for building pathnames.
+ */
+#define	_PATH_DEV	"/dev/"
+#define	_PATH_DEV_PTS	"/dev/pts/"
+#define	_PATH_TMP	"/tmp/"
+#define	_PATH_VARDB	"/var/db/"
+#define	_PATH_VARRUN	"/var/run/"
+#define	_PATH_VARTMP	"/var/tmp/"
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !_PATHS_H */

--- a/usr/src/lib/libresolv2/include/paths.h	Thu Apr 07 11:03:36 2011 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#define _PATH_DEVNULL "/dev/null"
-

--- a/usr/src/pkg/manifests/system-header.mf	Thu Apr 07 11:03:36 2011 +0530
+++ b/usr/src/pkg/manifests/system-header.mf	Wed Mar 30 23:00:17 2011 -0400
@@ -612,6 +612,7 @@
 file path=usr/include/nss_netdir.h
 file path=usr/include/nsswitch.h
 file path=usr/include/panel.h
+file path=usr/include/paths.h
 file path=usr/include/pcsample.h
 file path=usr/include/pfmt.h
 file path=usr/include/pkgdev.h