20 files changed, 528 insertions, 581 deletions
diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100644
index 1a37f3512..000000000
--- a/lib/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../make_include
-include ../MCONFIG
-
-all: err.o my_reboot.o setproctitle.o env.o carefulputc.o xstrncpy.o md5.o
-
-err.o: err.c
-
-my_reboot.o: my_reboot.c linux_reboot.h
-
-env.o: env.h
-
-setproctitle.o: setproctitle.h
-
-carefulputc.o: carefulputc.h
-
-xstrncpy.o: xstrncpy.h
-
-md5.o: md5.c md5.h
-
-.PHONY: clean
-clean:
-	-rm -f *.o *~ core
-
-install:
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 000000000..35fe8c444
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+noinst_LTLIBRARIES = libmd5.la
+libmd5_la_SOURCES = md5.c
+
+noinst_LTLIBRARIES += libenv.la
+libenv_la_SOURCES = env.c
+
+noinst_LTLIBRARIES += libsetproctitle.la
+libsetproctitle_la_SOURCES = setproctitle.c
diff --git a/lib/Makefile.in b/lib/Makefile.in
new file mode 100644
index 000000000..05dfbb988
--- /dev/null
+++ b/lib/Makefile.in
@@ -0,0 +1,517 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/include-Makefile.am
+subdir = lib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libenv_la_LIBADD =
+am_libenv_la_OBJECTS = env.lo
+libenv_la_OBJECTS = $(am_libenv_la_OBJECTS)
+libmd5_la_LIBADD =
+am_libmd5_la_OBJECTS = md5.lo
+libmd5_la_OBJECTS = $(am_libmd5_la_OBJECTS)
+libsetproctitle_la_LIBADD =
+am_libsetproctitle_la_OBJECTS = setproctitle.lo
+libsetproctitle_la_OBJECTS = $(am_libsetproctitle_la_OBJECTS)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libenv_la_SOURCES) $(libmd5_la_SOURCES) \
+	$(libsetproctitle_la_SOURCES)
+DIST_SOURCES = $(libenv_la_SOURCES) $(libmd5_la_SOURCES) \
+	$(libsetproctitle_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
+BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
+BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
+BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
+BUILD_INIT_TRUE = @BUILD_INIT_TRUE@
+BUILD_KILL_FALSE = @BUILD_KILL_FALSE@
+BUILD_KILL_TRUE = @BUILD_KILL_TRUE@
+BUILD_LAST_FALSE = @BUILD_LAST_FALSE@
+BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
+BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
+BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
+BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
+BUILD_MESG_TRUE = @BUILD_MESG_TRUE@
+BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@
+BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@
+BUILD_RAW_FALSE = @BUILD_RAW_FALSE@
+BUILD_RAW_TRUE = @BUILD_RAW_TRUE@
+BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@
+BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@
+BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@
+BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@
+BUILD_RESET_FALSE = @BUILD_RESET_FALSE@
+BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
+BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
+BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
+BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
+BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
+BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
+BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GMSGFMT = @GMSGFMT@
+HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@
+HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@
+HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@
+HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@
+HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@
+HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@
+HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@
+HAVE_RAW_FALSE = @HAVE_RAW_FALSE@
+HAVE_RAW_TRUE = @HAVE_RAW_TRUE@
+HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@
+HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@
+HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
+HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
+HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
+HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
+HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTEL_FALSE = @INTEL_FALSE@
+INTEL_TRUE = @INTEL_TRUE@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@
+NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPARC_FALSE = @SPARC_FALSE@
+SPARC_TRUE = @SPARC_TRUE@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+USE_SLANG_FALSE = @USE_SLANG_FALSE@
+USE_SLANG_TRUE = @USE_SLANG_TRUE@
+USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
+USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = $(prefix)/usr/share
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = $(datadir)/info
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = $(datadir)/man
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+usrbindir = $(prefix)/usr/bin
+usrsbindir = $(prefix)/usr/sbin
+AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include
+DEFAULT_INCLUDES = 
+noinst_LTLIBRARIES = libmd5.la libenv.la libsetproctitle.la
+libmd5_la_SOURCES = md5.c
+libenv_la_SOURCES = env.c
+libsetproctitle_la_SOURCES = setproctitle.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libenv.la: $(libenv_la_OBJECTS) $(libenv_la_DEPENDENCIES) 
+	$(LINK)  $(libenv_la_LDFLAGS) $(libenv_la_OBJECTS) $(libenv_la_LIBADD) $(LIBS)
+libmd5.la: $(libmd5_la_OBJECTS) $(libmd5_la_DEPENDENCIES) 
+	$(LINK)  $(libmd5_la_LDFLAGS) $(libmd5_la_OBJECTS) $(libmd5_la_LIBADD) $(LIBS)
+libsetproctitle.la: $(libsetproctitle_la_OBJECTS) $(libsetproctitle_la_DEPENDENCIES) 
+	$(LINK)  $(libsetproctitle_la_LDFLAGS) $(libsetproctitle_la_OBJECTS) $(libsetproctitle_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/README.widechar b/lib/README.widechar
deleted file mode 100644
index 5a8179bb7..000000000
--- a/lib/README.widechar
+++ /dev/null
@@ -1,18 +0,0 @@
-From haible@ilog.fr Mon Sep 20 15:34:21 1999
-
-Hello Andries,
-
-Here is a patch for adding multi-byte locale support to a few programs
-found in util-linux-2.9u. With these patches, the programs
-
-    col colcrt colrm column rev ul
-
-now work correctly in UTF-8 locales. This is done by using the ISO C / SUSV2
-i18n functions, therefore they will become effective when glibc-2.2 comes
-out. For the moment, you can test the patches by
-  1. defining ENABLE_WIDECHAR in defines.h
-  2. Change the #if 0 to #if 1 in lib/widechar.h
-  3. Modify your CFLAGS and LDFLAGS to include the directories where libutf8
-     is installed.
-
-
diff --git a/lib/carefulputc.c b/lib/carefulputc.c
deleted file mode 100644
index 932233772..000000000
--- a/lib/carefulputc.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* putc() for use in write and wall (that sometimes are sgid tty) */
-/* Avoid control characters in our locale, and also ASCII control characters.
-   Note that the locale of the recipient is unknown. */
-#include <stdio.h>
-#include <ctype.h>
-#include "carefulputc.h"
-
-#define iso8859x_iscntrl(c) \
-	(((c) & 0x7f) < 0x20 || (c) == 0x7f)
-
-int
-carefulputc(int c, FILE *fp) {
-	int ret;
-
-	if (c == '\007' || c == '\t' || c == '\r' || c == '\n' ||
-	    (!iso8859x_iscntrl(c) && (isprint(c) || isspace(c))))
-		ret = putc(c, fp);
-	else if ((c & 0x80) || !isprint(c^0x40))
-		ret = fprintf(fp, "\\%3o", (unsigned char) c);
-	else {
-		ret = putc('^', fp);
-		if (ret != EOF)
-			ret = putc(c^0x40, fp);
-	}
-	return (ret < 0) ? EOF : 0;
-}
diff --git a/lib/carefulputc.h b/lib/carefulputc.h
deleted file mode 100644
index 29cc75da0..000000000
--- a/lib/carefulputc.h
+++ /dev/null
@@ -1 +0,0 @@
-extern int carefulputc(int c, FILE *fp);
diff --git a/lib/env.c b/lib/env.c
index dffb371f0..82fadf524 100644
--- a/lib/env.c
+++ b/lib/env.c
@@ -1,5 +1,5 @@
 /*
- * Security checks of enviroment
+ * Security checks of environment
  * Added from shadow-utils package
  * by Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL>
  *
diff --git a/lib/env.h b/lib/env.h
deleted file mode 100644
index d69b4f295..000000000
--- a/lib/env.h
+++ /dev/null
@@ -1,2 +0,0 @@
-extern void sanitize_env (void);
-
diff --git a/lib/err.c b/lib/err.c
deleted file mode 100644
index dc0ab8a7b..000000000
--- a/lib/err.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * Copyright (c) 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. 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.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include "errs.h"
-
-
-#include "../defines.h"
-#ifdef HAVE_progname
-extern char *__progname;		/* Program name, from crt0. */
-#else
-char *__progname = "foo";		/* probably libc4 */
-#endif
-
-/* Some compilers complain "null format string" upon err(1,NULL) */
-/* Make them happy with a separate routine. */
-void
-err_nomsg(int exitval) {
-	(void)fprintf(stderr, "%s: %s\n", __progname, strerror(errno));
-	exit(exitval);
-}
-
-void
-err(int exitval, const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	verr(exitval, fmt, ap);
-	va_end(ap);
-}
-
-void
-verr(int exitval, const char *fmt, va_list ap) {
-	int sverrno;
-
-	sverrno = errno;
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL && *fmt != 0) {
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fprintf(stderr, ": ");
-	}
-	(void)fprintf(stderr, "%s\n", strerror(sverrno));
-	exit(exitval);
-}
-
-void
-errx(int exitval, const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	verrx(exitval, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrx(int exitval, const char *fmt, va_list ap) {
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL)
-		(void)vfprintf(stderr, fmt, ap);
-	(void)fprintf(stderr, "\n");
-	exit(exitval);
-}
-
-void
-warn(const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	vwarn(fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarn(const char *fmt, va_list ap) {
-	int sverrno;
-
-	sverrno = errno;
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL) {
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fprintf(stderr, ": ");
-	}
-	(void)fprintf(stderr, "%s\n", strerror(sverrno));
-}
-
-void
-warnx(const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnx(const char *fmt, va_list ap) {
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL)
-		(void)vfprintf(stderr, fmt, ap);
-	(void)fprintf(stderr, "\n");
-}
diff --git a/lib/errs.h b/lib/errs.h
deleted file mode 100644
index 7961880dc..000000000
--- a/lib/errs.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _ERR_H_
-#define	_ERR_H_
-
-#include <stdarg.h>
-
-void	err_nomsg (int);
-void	err (int, const char *, ...);
-void	verr (int, const char *, va_list);
-void	errx (int, const char *, ...);
-void	verrx (int, const char *, va_list);
-void	warn (const char *, ...);
-void	vwarn (const char *, va_list);
-void	warnx (const char *, ...);
-void	vwarnx (const char *, va_list);
-
-#endif /* !_ERR_H_ */
diff --git a/lib/linux_reboot.h b/lib/linux_reboot.h
deleted file mode 100644
index 780d75093..000000000
--- a/lib/linux_reboot.h
+++ /dev/null
@@ -1,30 +0,0 @@
-extern int my_reboot(int);
-
-/*
- * Magic values required to use _reboot() system call.
- */
-
-#define	LINUX_REBOOT_MAGIC1	0xfee1dead
-#define	LINUX_REBOOT_MAGIC2	672274793
-#define	LINUX_REBOOT_MAGIC2A	85072278
-#define	LINUX_REBOOT_MAGIC2B	369367448
-
-
-/*
- * Commands accepted by the _reboot() system call.
- *
- * RESTART     Restart system using default command and mode.
- * HALT        Stop OS and give system control to ROM monitor, if any.
- * CAD_ON      Ctrl-Alt-Del sequence causes RESTART command.
- * CAD_OFF     Ctrl-Alt-Del sequence sends SIGINT to init task.
- * POWER_OFF   Stop OS and remove all power from system, if possible.
- * RESTART2    Restart system using given command string.
- */
-
-#define	LINUX_REBOOT_CMD_RESTART	0x01234567
-#define	LINUX_REBOOT_CMD_HALT		0xCDEF0123
-#define	LINUX_REBOOT_CMD_CAD_ON		0x89ABCDEF
-#define	LINUX_REBOOT_CMD_CAD_OFF	0x00000000
-#define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
-#define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
-
diff --git a/lib/md5.h b/lib/md5.h
deleted file mode 100644
index ec07650c6..000000000
--- a/lib/md5.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef MD5_H
-#define MD5_H
-
-#include "../defines.h"
-#ifdef HAVE_stdint_h
-#include <stdint.h>
-#else
-typedef unsigned int uint32_t;
-#endif
-
-struct MD5Context {
-	uint32_t buf[4];
-	uint32_t bits[2];
-	unsigned char in[64];
-};
-
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
-	       unsigned len);
-void MD5Final(unsigned char digest[16], struct MD5Context *context);
-void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
-
-/*
- * This is needed to make RSAREF happy on some MS-DOS compilers.
- */
-typedef struct MD5Context MD5_CTX;
-
-#endif /* !MD5_H */
diff --git a/lib/my_reboot.c b/lib/my_reboot.c
deleted file mode 100644
index 12ea4c926..000000000
--- a/lib/my_reboot.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Including <unistd.h> makes sure that on a glibc system
-   <features.h> is included, which again defines __GLIBC__ */
-#include <unistd.h>
-#include "linux_reboot.h"
-
-#define USE_LIBC
-
-#ifdef USE_LIBC
-
-/* libc version */
-#if defined __GLIBC__ && __GLIBC__ >= 2
-#  include <sys/reboot.h>
-#  define REBOOT(cmd) reboot(cmd)
-#else
-extern int reboot(int, int, int);
-#  define REBOOT(cmd) reboot(LINUX_REBOOT_MAGIC1,LINUX_REBOOT_MAGIC2,(cmd))
-#endif
-int
-my_reboot(int cmd) {
-	return REBOOT(cmd);
-}
-
-#else /* no USE_LIBC */
-
-/* direct syscall version */
-#include <linux/unistd.h>
-
-#ifdef _syscall3
-_syscall3(int,  reboot,  int,  magic, int, magic_too, int, cmd);
-#else
-/* Let us hope we have a 3-argument reboot here */
-extern int reboot(int, int, int);
-#endif
-
-int
-my_reboot(int cmd) {
-	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd);
-}
-
-#endif
diff --git a/lib/nls.h b/lib/nls.h
deleted file mode 100644
index f54f94dfc..000000000
--- a/lib/nls.h
+++ /dev/null
@@ -1,34 +0,0 @@
-int main(int argc, char *argv[]);
-
-#include "../defines.h"		/* for HAVE_locale_h */
-
-#ifndef PACKAGE
-#define PACKAGE	"util-linux"
-#endif
-
-#ifndef LOCALEDIR
-#define LOCALEDIR "/usr/share/locale"
-#endif
-
-#ifdef HAVE_locale_h
-# include <locale.h>
-#endif
-
-#if defined MAY_ENABLE_NLS && !defined DISABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-# ifdef gettext_noop
-#  define N_(String) gettext_noop (String)
-# else
-#  define N_(String) (String)
-# endif
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */
-# define _(Text) (Text)
-# define N_(Text) (Text)
-#endif
-
-
diff --git a/lib/pathnames.h b/lib/pathnames.h
deleted file mode 100644
index d9e05b321..000000000
--- a/lib/pathnames.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Vaguely based on
- *	@(#)pathnames.h	5.3 (Berkeley) 5/9/89
- * This code is in the public domain.
- */
-#include <paths.h>
-
-#ifndef __STDC__
-# error "we need an ANSI compiler"
-#endif
-
-/* The paths for some of these are wrong in /usr/include/paths.h,
-   but we re-define them here. */
-
-/* Used in login.c, agetty.c, simpleinit.c, shutdown.c, write.c */
-#undef _PATH_UTMP
-/* Used in login.c, agetty.c, simpleinit.c, shutdown.c, last.c */
-#undef _PATH_WTMP
-/* These four are used in login.c only */
-#undef _PATH_DEFPATH
-#undef _PATH_DEFPATH_ROOT
-#undef _PATH_LASTLOG
-
-/*
- * HISTORY
- *
-What is the history of these six, and related defines?
-------------------------------------------------------------------------
-_PATH_UTMP and UTMP_FILE and UTMP_FILENAME
-	/etc/utmp > /var/adm/utmp > /var/run/utmp.
-Traditionally we have /etc/utmp.
-In <paths.h> we have /etc/utmp, but since 4.6.0 /var/adm/utmp
-and since 5.0.9 (and in glibc2) /var/run/utmp.
-In login/pathnames.h we have /etc/utmp, but since 4.6.6 /var/adm/utmp.
-In <utmp.h> UTMP_FILE is defined as /etc/utmp, but in 4.6.* as _PATH_UTMP.
-
-_PATH_WTMP and WTMP_FILE and WTMP_FILENAME
-	/etc/wtmp > /usr/adm/wtmp > /var/adm/wtmp > /var/log/wtmp.
-Traditionally we have /etc/wtmp.
-In <paths.h> we have /usr/adm/wtmp, but since 4.5.13 /var/adm/wtmp,
-and since 5.0.9 (and in glibc2) /var/log/wtmp.
-In login/pathnames.h. we have /etc/wtmp, but since 4.6.6 /var/adm/wtmp.
-In <utmp.h> WTMP_FILE is defined as /usr/adm/wtmp, but in 4.5.* as
-/var/adm/wtmp, and in 4.6.* as _PATH_WTMP.
-
-_PATH_DEFPATH
-Long ago this was ".:/bin:/usr/bin".
-In <paths.h> libc 4.4.1-4.4.4 have "/usr/bin:/bin"
-and libc 4.5.21-5.4.23 have "/usr/local/bin:/usr/bin:/bin:."
-and libc 5.4.38-5.4.46 have "/usr/local/bin:/usr/bin:/bin".
-In login/pathnames.h libc4 and libc5 have "/usr/local/bin:/bin:/usr/bin:."
-
-_PATH_DEFPATH_ROOT
-Long ago this was identical to _PATH_DEFPATH.
-In <paths.h> no definition is present before libc 4.5.13.
-Libc 4.5.13 has "/bin:/usr/bin:/etc"
-Libc 4.5.14-5.4.46 have "/sbin:/bin:/usr/sbin:/usr/bin"
-In login/pathnames.h libc4 and libc5 have "/bin:/usr/bin:/etc"
-
-_PATH_LASTLOG
-	/etc/lastlog > /usr/adm/lastlog > /var/adm/lastlog > /var/log/lastlog.
-Traditionally we have /etc/lastlog.
-In <bsd/utmp.h> libc 4.4.1-4.5.12 have /usr/adm/lastlog, 4.5.13 and
-later have /var/adm/lastlog.
-In paths.h all libc5 and glibc2 versions have /var/log/lastlog.
-In login/pathnames.h all libc4 and libc5 versions have /usr/adm/lastlog.
-
-_PATH_MAILDIR
-	/usr/spool/mail > /var/spool/mail > /var/mail.
-Traditionally we have /usr/spool/mail.
-In <paths.h> we have /usr/spool/mail, but since libc 4.5.13 /var/spool/mail.
-In login/pathnames.h all libc4 versions have /var/spool/mail.
-Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
-------------------------------------------------------------------------*/
-
-
-#ifndef SBINDIR
-#define SBINDIR			"/sbin"
-#endif
-
-#ifndef USRSBINDIR
-#define USRSBINDIR              "/usr/sbin"
-#endif
-
-#ifndef LOGDIR
-#define LOGDIR                  "/var/log"
-#endif
-
-#ifndef VARPATH
-#define VARPATH			"/var"
-#endif
-
-#ifndef UT_NAMESIZE
-#define UT_NAMESIZE     	8
-#endif
-
-#define _PATH_BSHELL    	"/bin/sh"
-#define _PATH_CSHELL    	"/bin/csh"
-#define _PATH_TTY       	"/dev/tty"
-#define TTYTYPES        	"/etc/ttytype"
-#define SECURETTY       	"/etc/securetty"
-#define _PATH_UTMP      	"/var/run/utmp"
-#define _PATH_WTMP      	LOGDIR "/wtmp"
-#define _PATH_WTMPLOCK		"/etc/wtmplock"
-
-/* no more . in DEFPATH */
-#define	_PATH_DEFPATH	        "/usr/local/bin:/bin:/usr/bin"
-#define	_PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:" SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
-#define	_PATH_HUSHLOGIN		".hushlogin"
-#define	_PATH_LASTLOG		LOGDIR "/lastlog"
-
-#ifndef _PATH_MAILDIR
-#define	_PATH_MAILDIR		VARPATH "/spool/mail"
-#endif
-#define	_PATH_MOTDFILE		"/etc/motd"
-#define	_PATH_NOLOGIN		"/etc/nologin"
-
-#define _PATH_LOGIN		"/bin/login"
-#define _PATH_INITTAB		"/etc/inittab"
-#define _PATH_RC		"/etc/rc"
-#define _PATH_REBOOT		SBINDIR "/reboot"
-#define _PATH_SINGLE		"/etc/singleboot"
-#define _PATH_SHUTDOWN_CONF	"/etc/shutdown.conf"
-
-#define _PATH_SECURE		"/etc/securesingle"
-#define _PATH_USERTTY           "/etc/usertty"
-
-/* used in login-utils/shutdown.c */
-#define _PATH_MTAB		"/etc/mtab"
-#define _PATH_UMOUNT		"/bin/umount"
-#define UMOUNT_ARGS		"umount", "-a", "-t", "nodevfs"
-#define SWAPOFF_ARGS            "swapoff", "-a"
-
-/* used in login-utils/setpwnam.h and login-utils/islocal.c */
-#define _PATH_PASSWD            "/etc/passwd"
-
-/* used in login-utils/setpwnam.h */
-#define _PATH_PTMP              "/etc/ptmp"
-#define _PATH_PTMPTMP           "/etc/ptmptmp"
-#define _PATH_GROUP             "/etc/group"
-#define _PATH_GTMP              "/etc/gtmp"
-#define _PATH_GTMPTMP           "/etc/gtmptmp"
-#define _PATH_SHADOW_PASSWD     "/etc/shadow"
-#define _PATH_SHADOW_PTMP       "/etc/sptmp"
-#define _PATH_SHADOW_PTMPTMP    "/etc/sptmptmp"
-#define _PATH_SHADOW_GROUP      "/etc/gshadow"
-#define _PATH_SHADOW_GTMP       "/etc/sgtmp"
-#define _PATH_SHADOW_GTMPTMP    "/etc/sgtmptmp"
-
-/* used in misc-utils/look.c */
-#define _PATH_WORDS             "/usr/share/dict/words"
-#define _PATH_WORDS_ALT         "/usr/share/dict/web2"
diff --git a/lib/setproctitle.h b/lib/setproctitle.h
deleted file mode 100644
index d57abda6b..000000000
--- a/lib/setproctitle.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-void initproctitle (int argc, char **argv);
-#if 0
-void setproctitle (const char *fmt, ...);
-#else
-void setproctitle (const char *prog, const char *txt);
-#endif
diff --git a/lib/sysmacros.h b/lib/sysmacros.h
deleted file mode 100644
index 171b33d43..000000000
--- a/lib/sysmacros.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* versions to be used with > 16-bit dev_t - leave unused for now */
-
-#ifndef major
-#define major(dev)	((dev) >> 8)
-#endif
-
-#ifndef minor
-#define minor(dev)	((dev) & 0xff)
-#endif
diff --git a/lib/widechar.h b/lib/widechar.h
deleted file mode 100644
index 61021be35..000000000
--- a/lib/widechar.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Declarations for wide characters */
-/* This file must be included last because the redefinition of wchar_t may
-   cause conflicts when system include files were included after it. */
-
-#include "../defines.h"  /* for ENABLE_WIDECHAR */
-
-#ifdef ENABLE_WIDECHAR
-
-# include <wchar.h>
-# include <wctype.h>
-#if 0 /* for testing on platforms without built-in wide character support */
-#  include <libutf8.h>
-#endif
-
-#if 1
-/* explicit prototypes, since sometimes <wchar.h> does not give them */
-extern int wcwidth (wchar_t c);         /* old: wint_t c */
-extern int wcswidth (const wchar_t *s, size_t n);
-extern size_t wcslen (const wchar_t *s);
-extern wchar_t *wcsdup (const wchar_t *s);
-#endif
-
-#else
-
-# include <ctype.h>
-  /* Fallback for types */
-# define wchar_t char
-# define wint_t int
-# define WEOF EOF
-  /* Fallback for input operations */
-# define fgetwc fgetc
-# define getwc getc
-# define getwchar getchar
-# define fgetws fgets
-  /* Fallback for output operations */
-# define fputwc fputc
-# define putwc putc
-# define putwchar putchar
-# define fputws fputs
-  /* Fallback for character classification */
-# define iswgraph isgraph
-# define iswprint isprint
-# define iswspace isspace
-  /* Fallback for string functions */
-# define wcschr strchr
-# define wcsdup strdup
-# define wcslen strlen
-
-# define wcwidth(c) 1
-
-#endif
diff --git a/lib/xstrncpy.c b/lib/xstrncpy.c
deleted file mode 100644
index 79754261c..000000000
--- a/lib/xstrncpy.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* NUL-terminated version of strncpy() */
-#include <string.h>
-#include "xstrncpy.h"
-
-/* caller guarantees n > 0 */
-void
-xstrncpy(char *dest, const char *src, size_t n) {
-	strncpy(dest, src, n-1);
-	dest[n-1] = 0;
-}
diff --git a/lib/xstrncpy.h b/lib/xstrncpy.h
deleted file mode 100644
index 05c8fa26f..000000000
--- a/lib/xstrncpy.h
+++ /dev/null
@@ -1 +0,0 @@
-extern void xstrncpy(char *dest, const char *src, size_t n);