149510

Remove files that aren't needed.

33 files changed, 0 insertions, 1930 deletions

diff --git a/include/Makefile b/include/Makefile
deleted file mode 100644
index d595a656..00000000
--- a/include/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Makefile for netsite.h
-
-BUILD_ROOT = ..
-MODULE=netsiteInclude
-
-include $(BUILD_ROOT)/nsdefs.mk
-
-HDRDEST=$(OBJDIR)/include
-
-NSPRDEST=$(HDRDEST)
-NSPRHDRS= \
-	prio.h \
-	prlong.h \
-	prtypes.h \
-	prtime.h \
-	prthread.h \
-	prinrval.h \
-	md/prcpucfg.h \
-	obsolete/protypes.h
-
-NSPRBINS=$(addprefix $(NSPRDEST)/, $(NSPRHDRS))
-
-PREFIX=copyrght.h
-
-
-NOSTDSTRIP=true
-NOSTDDEPEND=true
-
-HDRS=netsite.h version.h
-
-BINS=$(addprefix $(HDRDEST)/,$(HDRS))
-
-all: stuff nspr
-
-strip:
-depend:
-
-include $(BUILD_ROOT)/nsconfig.mk
-
-ifeq ($(NSAPI_CAPABLE), true)
-
-stuff: $(HDRDEST) $(BINS) sub-hdrs
-
-$(HDRDEST):
-	mkdir -p $(HDRDEST)
-
-ifeq ($(PRODUCT), "Netscape Proxy Server")
-sub-hdrs:
-	cd base; gmake
-	cd frame; gmake
-	cd libproxy; gmake
-else
-sub-hdrs:
-	cd base; gmake
-	cd frame; gmake
-endif
-
-$(HDRDEST)/%.h: %.h
-	cat $(PREFIX) $< > $(HDRDEST)/$*.h
-
-else
-stuff:
-
-endif
-
-$(NSPRDEST): 
-	mkdir -p $(NSPRDEST)
-
-$(NSPRDEST)/md: $(NSPRDEST)
-	mkdir -p $(NSPRDEST)/md
-
-$(NSPRDEST)/obsolete: $(NSPRDEST)
-	mkdir -p $(NSPRDEST)/obsolete
-
-$(NSPRDEST)/%.h: 
-	cp $(NSCP_DISTDIR)/include/nspr20/pr/$*.h $(NSPRDEST)/$*.h
-
-nspr: $(NSPRDEST)/md $(NSPRDEST)/obsolete $(NSPRBINS)
diff --git a/include/base/Makefile b/include/base/Makefile
deleted file mode 100644
index 67cbec88..00000000
--- a/include/base/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Makefile for netsite.h
-
-BUILD_ROOT = ../..
-MODULE=netsiteIncludeBase
-
-include $(BUILD_ROOT)/nsdefs.mk
-
-HDRDEST=$(OBJDIR)/include/base
-
-PREFIX=../copyrght.h
-
-
-NOSTDSTRIP=true
-NOSTDDEPEND=true
-
-#HDRS=$(wildcard *.h)
-HDRS=daemon.h cinfo.h crit.h ereport.h buffer.h net.h pblock.h sem.h session.h shexp.h shmem.h systhr.h util.h file.h pool.h regexp.h systems.h
-
-
-BINS=$(addprefix $(HDRDEST)/,$(HDRS))
-
-all: $(HDRDEST) $(BINS)
-
-$(HDRDEST):
-	mkdir -p $(HDRDEST)
-
-strip:
-depend:
-
-include $(BUILD_ROOT)/nsconfig.mk
-
-$(HDRDEST)/%.h: %.h
-	cat $(PREFIX) $< > $(HDRDEST)/$*.h
diff --git a/include/copyrght.h b/include/copyrght.h
deleted file mode 100644
index ffee130a..00000000
--- a/include/copyrght.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
diff --git a/include/libaccess/acladmin.h b/include/libaccess/acladmin.h
deleted file mode 100644
index 7b17a028..00000000
--- a/include/libaccess/acladmin.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __acladmin_h
-#define __acladmin_h
-
-
-/*
- * Description (acladmin.h)
- *
- *	This file describes the interface to access control list (ACL)
- *	administration functions.  This interface provides mechanisms
- *	for inspecting, modifying, and writing out in text form ACL
- *	structures.
- */
-
-#include "aclstruct.h"
-
-NSPR_BEGIN_EXTERN_C
-
-/* Flags used for various functions */
-#define ACLF_NPREFIX	0x1		/* ACL name string is a name prefix */
-#define ACLF_REXACT	0x2		/* rights must match exactly */
-#define ACLF_RALL	0x4		/* must have all specified rights */
-
-/* Functions in acladmin.c */
-extern NSAPI_PUBLIC int aclDNSAddHost(char * newhost,
-				      char ***alist, int * asize);
-extern NSAPI_PUBLIC int aclDNSAddAliases(char * host,
-					 char ***alist, int * asize);
-extern NSAPI_PUBLIC int aclDNSPutHost(char * hname, int fqdn, int aliases,
-				      char ***alist, int * asize);
-extern NSAPI_PUBLIC int aclFindByName(ACContext_t * acc, char * aclname,
-			 char **rights, int flags, ACL_t **pacl);
-extern NSAPI_PUBLIC char * aclGetAuthMethod(ACL_t * acl, int dirno);
-extern NSAPI_PUBLIC char * aclGetDatabase(ACL_t * acl, int dirno);
-extern NSAPI_PUBLIC char **aclGetHosts(ACL_t * acl, int dirno, int clsno);
-extern NSAPI_PUBLIC char * aclGetPrompt(ACL_t * acl, int dirno);
-extern NSAPI_PUBLIC char **aclGetRights(ACL_t * acl);
-extern NSAPI_PUBLIC unsigned long aclGetRightsMask(ACContext_t * acc, char **rlist);
-extern NSAPI_PUBLIC char * aclGetSignature(ACL_t * acl);
-extern NSAPI_PUBLIC char **aclGetUsers(ACL_t * acl, int dirno, int clsno);
-extern NSAPI_PUBLIC int aclDNSFilterStrings(char **list, DNSFilter_t * dnf);
-extern NSAPI_PUBLIC int aclIPFilterStrings(char **list, IPFilter_t * ipf);
-extern NSAPI_PUBLIC int aclIdsToNames(char **list,
-			 USIList_t * uilptr, int uflag, Realm_t * rlm);
-extern NSAPI_PUBLIC int aclMakeNew(ACContext_t * acc, char * aclsig, char * aclname,
-		      char **rights, int flags, ACL_t **pacl);
-extern NSAPI_PUBLIC int aclPutAllowDeny(NSErr_t * errp, ACL_t * acl,
-			   int always, int allow, char **users, char **hosts);
-extern NSAPI_PUBLIC int aclPutAuth(NSErr_t * errp, ACL_t * acl,
-		      int always, int amethod, char * dbname, char * prompt);
-extern NSAPI_PUBLIC char * aclSafeIdent(char * str);
-extern NSAPI_PUBLIC int aclSetRights(ACL_t * acl, char **rights, int replace);
-extern NSAPI_PUBLIC int accWriteFile(ACContext_t * acc, char * filename, int flags);
-extern NSAPI_PUBLIC int aclStringGet(LEXStream_t * lst);
-extern NSAPI_PUBLIC int aclStringOpen(NSErr_t * errp,
-			 int slen, char * sptr, int flags, ACLFile_t **pacf);
-extern NSAPI_PUBLIC int aclCheckUsers(NSErr_t * errp, char * dbpath, char * usernames,
-			 char * groupnames, char ***uglist, char ***badulist,
-			 char ***badglist);
-extern NSAPI_PUBLIC int aclCheckHosts(NSErr_t * errp,
-			 int hexpand, char * dnsspecs, char * ipspecs,
-			 char ***hlist, char ***baddns, char ***badip);
-
-#ifdef NOTDEF
-extern int aclSetAuthMethod(ACL_t * acl, int dirno, char * amethod);
-extern int aclSetDatabase(ACL_t * acl, int dirno, char * dbname);
-extern int aclSetExecOptions(ACL_t * acl, char **options);
-extern int aclSetHosts(ACL_t * acl, int dirno, char **hostlist);
-extern int aclSetPrompt(ACL_t * acl, int dirno, char * prompt);
-extern int aclSetUsers(ACL_t * acl, int dirno, char **userlist);
-#endif /* NOTDEF */
-
-NSPR_END_EXTERN_C
-
-#endif /* __acladmin_h */
diff --git a/include/libaccess/aclbuild.h b/include/libaccess/aclbuild.h
deleted file mode 100644
index 186ebae5..00000000
--- a/include/libaccess/aclbuild.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __aclbuild_h
-#define __aclbuild_h
-
-/*
- * Description (aclbuild.h)
- *
- *	This file describes the interface to a module which provides
- *	functions for building Access Control List (ACL) structures
- *	in memory.
- */
-
-#include "usi.h"
-#include "nserror.h"
-#include "aclstruct.h"
-
-/* Define flags for aclAuthNameAdd() return value */
-#define ANA_GROUP	0x1		/* name matches group name */
-#define ANA_USER	0x2		/* name matches user name */
-#define ANA_DUP		0x4		/* name already in AuthNode_t */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Functions in aclbuild.c */
-extern int accCreate(NSErr_t * errp, void * stp, ACContext_t **pacc);
-extern void accDestroy(ACContext_t * acc, int flags);
-extern int accDestroySym(Symbol_t * sym, void * argp);
-extern int accReadFile(NSErr_t * errp, char * aclfile, ACContext_t **pacc);
-extern int aclAuthDNSAdd(HostSpec_t **hspp, char * dnsspec, int fqdn);
-extern int aclAuthIPAdd(HostSpec_t **hspp, IPAddr_t ipaddr, IPAddr_t netmask);
-extern int aclAuthNameAdd(NSErr_t * errp, UserSpec_t * usp,
-			  Realm_t * rlm, char * name);
-extern ACClients_t * aclClientsDirCreate();
-extern int aclCreate(NSErr_t * errp,
-		     ACContext_t * acc, char * aclname, ACL_t **pacl);
-extern void aclDestroy(ACL_t * acl);
-extern void aclDelete(ACL_t * acl);
-extern int aclDirectiveAdd(ACL_t * acl, ACDirective_t * acd);
-extern ACDirective_t * aclDirectiveCreate();
-extern void aclDirectiveDestroy(ACDirective_t * acd);
-extern int aclDNSSpecDestroy(Symbol_t * sym, void * parg);
-extern void aclHostSpecDestroy(HostSpec_t * hsp);
-extern void aclRealmSpecDestroy(RealmSpec_t * rsp);
-extern int aclRightDef(NSErr_t * errp,
-		       ACContext_t * acc, char * rname, RightDef_t **prd);
-extern void aclRightSpecDestroy(RightSpec_t * rsp);
-extern UserSpec_t * aclUserSpecCreate();
-extern void aclUserSpecDestroy(UserSpec_t * usp);
-
-NSPR_END_EXTERN_C
-
-#endif /* __aclbuild_h */
diff --git a/include/libaccess/aclparse.h b/include/libaccess/aclparse.h
deleted file mode 100644
index 0015e2a7..00000000
--- a/include/libaccess/aclparse.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __aclparse_h
-#define __aclparse_h
-
-/*
- * Description (aclparse.h)
- *
- *	This file describes the interface to a parser for files
- *	containing Access Control List (ACL) definitions.  The parser
- *	uses the services of the aclbuild module to construct an
- *	in-memory representation of the ACLs it parses.
- */
-
-#include "nserror.h"
-#include "aclbuild.h"
-
-/* Define keywords */
-#define KEYWORD_ACL	"acl"
-#define KEYWORD_ALL	"all"
-#define KEYWORD_ALLOW	"allow"
-#define KEYWORD_ANY	"anyone"
-#define KEYWORD_AT	"at"
-#define KEYWORD_AUTH	"authenticate"
-#define KEYWORD_BASIC	"basic"
-#define KEYWORD_DATABASE "database"
-#define KEYWORD_DEFAULT	"default"
-#define KEYWORD_DENY	"deny"
-#define KEYWORD_EXECUTE	"execute"
-#define KEYWORD_HOSTS	"hosts"
-#define KEYWORD_IF	"if"
-#define KEYWORD_IN	"in"
-#define KEYWORD_INCLUDE	"include"
-#define KEYWORD_METHOD	"method"
-#define KEYWORD_PROMPT	"prompt"
-#define KEYWORD_REALM	"realm"
-#define KEYWORD_RIGHTS	"rights"
-#define KEYWORD_SSL	"ssl"
-
-/* Define character classes */
-#define CCM_WS		0x1	/* whitespace */
-#define CCM_NL		0x2	/* newline */
-#define CCM_SPECIAL	0x4	/* special characters */
-#define CCM_DIGIT	0x8	/* digits */
-#define CCM_LETTER	0x10	/* letters */
-#define CCM_HYPHEN	0x20	/* hyphen */
-#define CCM_USCORE	0x40	/* underscore */
-#define CCM_FILESPEC	0x80	/* filename special characters */
-
-#define CCM_HYPUND	(CCM_HYPHEN|CCM_USCORE)
-#define CCM_IDENT	(CCM_LETTER|CCM_DIGIT|CCM_HYPUND)
-#define CCM_FILENAME	(CCM_LETTER|CCM_DIGIT|CCM_FILESPEC)
-
-/* Define token numbers */
-#define TOKEN_ERROR	-1	/* error in reading data stream */
-#define TOKEN_EOF	0	/* end-of-file */
-#define TOKEN_EOS	1	/* end-of-statement */
-#define TOKEN_IDENT	2	/* identifier */
-#define TOKEN_NUMBER	3	/* number */
-#define TOKEN_COMMA	4	/* comma */
-#define TOKEN_SEMI	5	/* semicolon */
-#define TOKEN_PERIOD	6	/* period */
-#define TOKEN_LPAREN	7	/* left parenthesis */
-#define TOKEN_RPAREN	8	/* right parenthesis */
-#define TOKEN_LBRACE	9	/* left brace */
-#define TOKEN_RBRACE	10	/* right brace */
-#define TOKEN_AT	11	/* at sign */
-#define TOKEN_PLUS	12	/* plus sign */
-#define TOKEN_STAR	13	/* asterisk */
-#define TOKEN_STRING	14	/* quoted string */
-#define TOKEN_HUH	15	/* unrecognized input */
-
-/* Define flags bits for aclGetToken() */
-#define AGT_NOSKIP	0x1		/* don't skip leading whitespace */
-#define AGT_APPEND	0x2		/* append next to token buffer */
-
-NSPR_BEGIN_EXTERN_C
-
-extern void * aclChTab;			/* character table for ACL parsing */
-
-/* Functions in aclparse.c */
-extern int aclAuthListParse(NSErr_t * errp, ACLFile_t * acf,
-			    ACContext_t * acc, Realm_t * rlm,
-			    ACClients_t **clsp);
-extern int aclAuthHostsParse(NSErr_t * errp, ACLFile_t * acf,
-			     ACContext_t * acc, HostSpec_t **hspp);
-extern int aclAuthUsersParse(NSErr_t * errp, ACLFile_t * acf,
-			     Realm_t * rlm, UserSpec_t **uspp, char ***elist);
-extern int aclDirectivesParse(NSErr_t * errp, ACLFile_t * acf, ACL_t * acl);
-extern int aclACLParse(NSErr_t * errp,
-		       ACLFile_t * acf, ACContext_t * acc, int flags);
-extern void aclFileClose(ACLFile_t * acf, int flags);
-extern int aclFileOpen(NSErr_t * errp,
-		       char * filename, int flags, ACLFile_t **pacf);
-extern int aclGetDNSString(NSErr_t * errp, ACLFile_t * acf);
-extern int aclGetFileSpec(NSErr_t * errp, ACLFile_t * acf, int flags);
-extern int aclGetIPAddr(NSErr_t * errp,
-			ACLFile_t * acf, IPAddr_t * pip, IPAddr_t * pmask);
-extern int aclGetToken(NSErr_t * errp, ACLFile_t * acf, int flags);
-extern int aclParseInit();
-extern int aclRealmSpecParse(NSErr_t * errp, ACLFile_t * acf,
-			     ACContext_t * acc, RealmSpec_t **rspp);
-extern int aclRightsParse(NSErr_t * errp, ACLFile_t * acf, ACContext_t * acc,
-			  RightSpec_t **rights);
-extern int aclStreamGet(LEXStream_t * lst);
-
-NSPR_END_EXTERN_C
-
-#endif /* __aclparse_h */
diff --git a/include/libaccess/ava.h b/include/libaccess/ava.h
deleted file mode 100644
index 2ea662f4..00000000
--- a/include/libaccess/ava.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef _ava_h
-#define _ava_h
-
-#define ENTRIES_ALLOCSIZE 100
-#define ORGS_ALLOCSIZE    15
-
-
-#ifdef XP_WIN32
-#define NSAPI_PUBLIC __declspec(dllexport)
-#else /* !XP_WIN32 */
-#define NSAPI_PUBLIC
-#endif
-
-
-typedef struct {
-  char *email;
-  char *locality;
-  char *userid; 
-  char *state;
-  char *country;
-  char *company;
-  int numOrgs;
-  char **organizations;
-  char *CNEntry;
-} AVAEntry;
-
-typedef struct {
-  char *userdb;
-  int numEntries;
-  AVAEntry **enteredTable; 
-} AVATable;
-
-
-#endif
-
diff --git a/include/libaccess/avadb.h b/include/libaccess/avadb.h
deleted file mode 100644
index fe89874a..00000000
--- a/include/libaccess/avadb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef _avadb_h_
-#define _avadb_h_
-
-#define USE_NSAPI 
-
-USE_NSAPI int   AddEntry    (char *key, char *value);
-USE_NSAPI int   DeleteEntry (char *key);
-USE_NSAPI char *GetValue    (char *key);
-
-#endif /*_avadb_h_*/
diff --git a/include/libaccess/avapfile.h b/include/libaccess/avapfile.h
deleted file mode 100644
index fabfe75f..00000000
--- a/include/libaccess/avapfile.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef _avaparsedfiles_h_
-#define _avaparsedfiles_h_
-
-#include "libaccess/ava.h"
-#include "frame/req.h"
-#include "base/session.h"
-
-#define AUTH_DB_FILE "AvaCertmap"
-#define AVADB_TAG    "avadb"
-#define AVA_DB_SEL   "ava_db_sel" /*Variable name used in
-				   *outputAVAdbs
-				   */
-
-
-extern void outputAVAdbs (char *chosen); /*Outputs the selector of auth databases
-					  *and makes it so that the form submits 
-					  *when onChange event occurs. 
-					  */
-
-
-/*For the following 3 functions, enter the full path of 
- *ava database file includint tag and filename
- */
-/*Before calling _getTable, initializa yy_sn and yy_rq.  Set to NULL if no
- *Session* or Request* variables exist and an error will be reported with 
- *function report_error(libamin.h).  Otherwise error will be logged into
- *the server's error log
- */
-extern AVATable *_getTable (char *avadbfile);
-extern AVATable *_wasParsed (char *avadbfile);/*Assumes a call to yyparse was just
-					       *completed
-					       */
-extern int _hasBeenParsed (char *avadbfile);/*Check if _getTable returns NULL or not*/
-
-extern AVAEntry* _getAVAEntry (char *groupid, AVATable *table);
-extern AVAEntry* _deleteAVAEntry (char *groupid, AVATable *table);
-extern void _addAVAtoTable (AVAEntry *entry, AVATable *table);
-extern void AVAEntry_Free (AVAEntry *entry);
-
-/*Functions for writing out files*/
-extern void PrintHeader (FILE *outfile);
-extern void writeOutFile (char *avadbfilename, AVATable *table);
-
-
-extern int yyparse();
-extern FILE *yyin;
-
-extern char *currFile;
-
-extern Session *yy_sn;
-extern Request *yy_rq;
-
-
-#endif /*_avaparsedfiles_h_*/
diff --git a/include/libaccess/nsadb.h b/include/libaccess/nsadb.h
deleted file mode 100644
index 59aec77a..00000000
--- a/include/libaccess/nsadb.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsadb_h
-#define __nsadb_h
-
-/*
- * Description (nsadb.h)
- *
- *	This file describes the interface for retrieving information
- *	from a Netscape authentication database.  This facility is
- *	built on top of the Netscape (server) database interface as
- *	defined in nsdb.h.  It represents a subclass of a more general
- *	authentication database interface defined in nsauth.h.
- */
-
-#include "nserror.h"		/* error frame list support */
-#include "nsautherr.h"		/* authentication error codes */
-#include "nsauth.h"
-
-/* Begin private definitions */
-#ifdef __PRIVATE_NSADB
-
-#include "nsdb.h"
-
-#if defined(CLIENT_AUTH)
-#define ADBDBNAMES	3		/* number of named files */
-#else
-#define ADBDBNAMES	2		/* number of named files */
-#endif
-#define ADBUSERDBNAME	"Users"		/* name of user database */
-#define ADBGROUPDBNAME	"Groups"	/* name of group database */
-#if defined(CLIENT_AUTH)
-#define ADBCERTDBNAME	"Certs"		/* name of certificate mapping DB */
-#define ADBUMAPDBNAME	"Certs.nm"	/* name of mapped user names DB */
-#endif
-
-typedef struct AuthDB_s AuthDB_t;
-struct AuthDB_s {
-    char * adb_dbname;			/* database name */
-    void * adb_userdb;			/* handle for user database */
-    void * adb_groupdb;			/* handle for group database */
-#if defined(CLIENT_AUTH)
-    void * adb_certdb;			/* handle for cert mapping database */
-    void * adb_certlock;		/* lock for cert mapping database */
-    void * adb_certnm;			/* handle for username-to-certid DB */
-#endif
-    int adb_flags;			/* flags */
-};
-
-/* Definitions for adb_flags (also used on nsadbOpenXxxx() calls) */
-#define ADBF_NEW	0x1		/* newly created database */
-#define ADBF_UREAD	0x10		/* user database open for read */
-#define ADBF_UWRITE	0x20		/* user database open for write */
-#define ADBF_GREAD	0x100		/* group database open for read */
-#define ADBF_GWRITE	0x200		/* group database open for write */
-#define ADBF_CREAD	0x1000		/* cert database open for read */
-#define ADBF_CWRITE	0x2000		/* cert database open for write */
-#endif /* __PRIVATE_NSADB */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Functions in nsadb.c */
-extern NSAPI_PUBLIC int nsadbOpen(NSErr_t * errp,
-				  char * adbname, int flags, void **rptr);
-extern NSAPI_PUBLIC void nsadbClose(void * authdb, int flags);
-extern NSAPI_PUBLIC int nsadbOpenUsers(NSErr_t * errp,
-				       void * authdb, int flags);
-extern NSAPI_PUBLIC int nsadbOpenGroups(NSErr_t * errp,
-					void * authdb, int flags);
-extern NSAPI_PUBLIC int nsadbIdToName(NSErr_t * errp, void * authdb,
-				      USI_t id, int flags, char **rptr);
-extern NSAPI_PUBLIC int nsadbFindByName(NSErr_t * errp, void * authdb,
-					char * name, int flags, void **rptr);
-
-#if defined(CLIENT_AUTH)
-#include "nscert.h"
-#endif
-
-/* Authentication database interface structure in nsadb.c */
-extern AuthIF_t NSADB_AuthIF;
-
-NSPR_END_EXTERN_C
-
-#endif /* __nsadb_h */
diff --git a/include/libaccess/nsamgmt.h b/include/libaccess/nsamgmt.h
deleted file mode 100644
index ccfd5ab5..00000000
--- a/include/libaccess/nsamgmt.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsamgmt_h
-#define __nsamgmt_h
-
-/*
- * Description (nsamgmt.h)
- *
- *	This file defines the interface for managing information in a
- *	Netscape authentication database.  An authentication database
- *	consists of a user database and a group database.  This
- *	implementation of an authentication database based on Netscape
- *	user and group databases defined in nsuser.h and nsgroup.h,
- *	which in turn are based on the Netscape (server) database
- *	implementation defined in nsdb.h.  The interface for retrieving
- *	information from an authentication database is described
- *	separately in nsadb.h.
- */
-
-#include "nsadb.h"
-
-/* Flags used in enumeration call-back function return value */
-#define ADBF_KEEPOBJ	0x1		/* do not free user or group object */
-#define ADBF_STOPENUM	0x2		/* stop the enumeration */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Functions in nsamgmt.c */
-NSAPI_PUBLIC extern int nsadbAddGroupToGroup(NSErr_t * errp, void * authdb,
-					     GroupObj_t * pgoptr,
-					     GroupObj_t * cgoptr);
-
-NSAPI_PUBLIC extern int nsadbAddUserToGroup(NSErr_t * errp, void * authdb,
-					    GroupObj_t * goptr,
-					    UserObj_t * uoptr);
-
-NSAPI_PUBLIC extern int nsadbCreateGroup(NSErr_t * errp,
-					 void * authdb, GroupObj_t * goptr);
-
-NSAPI_PUBLIC extern int nsadbCreateUser(NSErr_t * errp,
-					void * authdb, UserObj_t * uoptr);
-
-/*
-for ANSI C++ standard on SCO UDK must typedef fn in arg list, otherwise fn
-name is managled
-*/
-
-#ifdef UnixWare
-typedef int(*ArgFn_EnumUsers)(NSErr_t * ferrp, void * authdb, void * parg,
-                 UserObj_t * uoptr);
-
-NSAPI_PUBLIC extern int nsadbEnumerateUsers(NSErr_t * errp, void * authdb,
-					void * argp, ArgFn_EnumUsers);
-#else /* UnixWare */
-NSAPI_PUBLIC extern int nsadbEnumerateUsers(NSErr_t * errp, void * authdb,
-					    void * argp,
-					    int (*func)(NSErr_t * ferrp,
-							void * authdb,
-							void * parg,
-							UserObj_t * uoptr));
-#endif /* UnixWare */
- 
-#ifdef UnixWare
-typedef int(*ArgFn_EnumGroups)(NSErr_t * ferrp, void * authdb, void * parg,
-                 GroupObj_t * goptr);
-NSAPI_PUBLIC extern int nsadbEnumerateGroups(NSErr_t * errp,
-						void * authdb, void * argp,
-                       				ArgFn_EnumGroups);
-#else /* UnixWare */
-NSAPI_PUBLIC extern int nsadbEnumerateGroups(NSErr_t * errp,
-                                             void * authdb, void * argp,
-					     int (*func)(NSErr_t * ferrp,
-							 void * authdb,
-							 void * parg,
-							 GroupObj_t * goptr));
-#endif /* UnixWare */
-
-NSAPI_PUBLIC extern int nsadbIsUserInGroup(NSErr_t * errp, void * authdb,
-					   USI_t uid, USI_t gid,
-					   int ngroups, USI_t * grplist);
-
-NSAPI_PUBLIC extern int nsadbModifyGroup(NSErr_t * errp,
-					 void * authdb, GroupObj_t * goptr);
-
-NSAPI_PUBLIC extern int nsadbModifyUser(NSErr_t * errp,
-					void * authdb, UserObj_t * uoptr);
-
-NSAPI_PUBLIC extern int nsadbRemoveGroup(NSErr_t * errp,
-					 void * authdb, char * name);
-
-NSAPI_PUBLIC extern int nsadbRemoveUser(NSErr_t * errp,
-					void * authdb, char * name);
-
-NSAPI_PUBLIC extern int nsadbRemGroupFromGroup(NSErr_t * errp, void * authdb,
-					       GroupObj_t * pgoptr,
-					       GroupObj_t * cgoptr);
-
-NSAPI_PUBLIC extern int nsadbRemUserFromGroup(NSErr_t * errp, void * authdb,
-					      GroupObj_t * goptr,
-					      UserObj_t * uoptr);
-
-NSAPI_PUBLIC extern int nsadbSuperGroups(NSErr_t * errp, void * authdb,
-					 GroupObj_t * goptr,
-					 USIList_t * gsuper);
-
-
-NSPR_END_EXTERN_C
-
-#if defined(CLIENT_AUTH)
-
-/* Removed for new ns security integration
-#include <sec.h>
-*/
-#include <key.h>
-#include <cert.h>
-
-#endif /* defined(CLIENT_AUTH) */
-
-#endif /* __nsamgmt_h */
diff --git a/include/libaccess/nscert.h b/include/libaccess/nscert.h
deleted file mode 100644
index 64e52169..00000000
--- a/include/libaccess/nscert.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nscert_h
-#define __nscert_h
-
-/*
- * Description (nscert.h)
- *
- *	This file describes the interface for accessing and storing
- *	information in a Netscape client certificate to username
- *	database.  This facility is built on top of the Netscape
- *	(server) database interface as defined in nsdb.h.  
- */
-
-#include <libaccess/nserror.h>		/* error frame list support */
-#include <libaccess/nsautherr.h>	/* authentication error codes */
-#include <libaccess/nsauth.h>
-
-#include <prtypes.h>
-/* Removed for new ns security integration
-#include <sec.h>
-*/
-#include <cert.h>
-
-#if defined(CLIENT_AUTH)
-
-/* Certificate to user record attribute tags */
-#define CAT_USERNAME	0x61		/* username associated with cert */
-#define CAT_CERTID	0x62		/* id assigned to cert */
-
-/* Attribute tags used in certificate key encoding */
-#define KAT_ISSUER	0x01		/* issuer DER */
-#define KAT_SUBJECT	0x02		/* subject DER */
-
-typedef struct CertObj_s CertObj_t;
-struct CertObj_s {
-    SECItem co_issuer;		/* issuing authority */
-    SECItem co_subject;		/* certicate's subject */
-    char * co_username;		/* the local name it mapps to */
-    USI_t co_certid;		/* internal id for this client certificate */
-};
-
-typedef int (*CertEnumCallback)(NSErr_t * ferrp, void * authdb,
-				void * argp, CertObj_t * coptr);
-    
-NSPR_BEGIN_EXTERN_C
-
-extern NSAPI_PUBLIC int nsadbCertInitialize(void);
-
-extern NSAPI_PUBLIC int nsadbDecodeCertKey(int keylen, char * keyptr,
-					   SECItem * issuer,
-					   SECItem * subject);
-
-extern NSAPI_PUBLIC int nsadbDecodeCertRec(int reclen, char * recptr,
-					   CertObj_t * coptr);
-
-extern NSAPI_PUBLIC int nsadbEncodeCertKey(SECItem * issuer, SECItem * subject,
-					   int * keylen, char **keyptr);
-
-extern NSAPI_PUBLIC int nsadbEnumerateCerts(NSErr_t * errp, void * authdb,
-					    void * argp,
-					    CertEnumCallback func);
-
-extern NSAPI_PUBLIC void nsadbFreeCertObj(CertObj_t * coptr);
-
-extern NSAPI_PUBLIC int nsadbGetCertById(NSErr_t * errp, void * authdb,
-					 USI_t certid, CertObj_t **coptr);
-
-extern NSAPI_PUBLIC int nsadbGetUserByCert(NSErr_t * errp, void * authdb,
-					   CERTCertificate * cert,
-					   char **username);
-
-extern NSAPI_PUBLIC int nsadbOpenCerts(NSErr_t * errp,
-				       void * authdb, int flags);
-
-extern NSAPI_PUBLIC int nsadbPutUserByCert(NSErr_t * errp, void * authdb,
-					   CERTCertificate * cert,
-					   const char * username);
-
-extern NSAPI_PUBLIC int nsadbRemoveCert(NSErr_t * errp, void * authdb,
-					void * username, CertObj_t * coptr);
-
-extern NSAPI_PUBLIC int nsadbRemoveUserCert(NSErr_t * errp, void * authdb,
-					    char * username);
-
-extern NSAPI_PUBLIC void nsadbCloseCerts(void * authdb, int flags);
-
-extern NSAPI_PUBLIC void nsadbCloseCertUsers(void * authdb, int flags);
-
-extern NSAPI_PUBLIC int nsadbFindCertUser(NSErr_t * errp, void * authdb,
-					  const char * username, USI_t * id);
-
-
-NSPR_END_EXTERN_C
-
-#endif /* CLIENT_AUTH */
-
-
-#endif /* __nscert_h */
diff --git a/include/libaccess/nsdb.h b/include/libaccess/nsdb.h
deleted file mode 100644
index c6b442b3..00000000
--- a/include/libaccess/nsdb.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsdb_h
-#define __nsdb_h
-
-/*
- * Description (nsdb.h)
- *
- *	This file describes the interface for retrieving information
- *	from a Netscape (server) database.  A database is composed of
- *	two (libdbm) DB files.  One of these (<dbname>.db) contains
- *	records indexed by a string key.  These records contain the
- *	primary information in the database.  A second DB file
- *	(<dbname>.id) is used to map an integer id value to a string
- *	key, which can then be used to locate a record in the first file.
- *	The interface for managing information in a database is described
- *	in nsdbmgmt.h.
- */
-
-/* Begin private definitions */
-#ifdef __PRIVATE_NSDB
-
-#include "mcom_db.h"
-
-/*
- * Description (NSDB_t)
- *
- *	This type describes the structure that used to represent a
- *	Netscape server database.  It includes fields to reference
- *	both the primary and id-to-name DB files, and information
- *	about the current state of the database.
- */
-
-typedef struct NSDB_s NSDB_t;
-struct NSDB_s {
-    char * ndb_pname;			/* primary DB file name pointer */
-    DB * ndb_pdb;			/* primary DB file handle */
-    char * ndb_iname;			/* id-to-name DB file name pointer */
-    DB * ndb_idb;			/* id-to-name DB file handle */
-    int ndb_flags;			/* bit flags */
-#define NDBF_RDNAME	0x1		/* primary DB open for read */
-#define NDBF_WRNAME	0x2		/* primary DB open for write */
-#define NDBF_NONAME	0x4		/* primary DB does not exist */
-#define NDBF_RDID	0x10		/* id-to-name DB open for read */
-#define NDBF_WRID	0x20		/* id-to-name DB open for write */
-#define NDBF_NOID	0x40		/* id-to-name DB does not exist */
-
-    int ndb_dbtype;			/* database type */
-    int ndb_version;			/* type-specific version number */
-};
-
-/* Define metadata record keys (must start with NDB_MDPREFIX) */
-#define NDB_DBTYPE	"?dbtype"	/* database type and version info */
-#define NDB_IDMAP	"?idmap"	/* id allocation bitmap */
-
-#endif /* __PRIVATE_NSDB */
-
-/* Begin public definitions */
-
-#include "nserror.h"		/* error frame list support */
-#include "nsdberr.h"		/* error codes for NSDB facility */
-
-/* Define the NSDB version number */
-#define NDB_VERSION		0x10	/* NSDB version 1.0 */
-
-/* Define reserved database type codes for ndb_dbtype */
-#define NDB_TYPE_USERDB		1	/* user database */
-#define NDB_TYPE_GROUPDB	2	/* group database */
-#define NDB_TYPE_CLIENTDB	3	/* client database */
-#define NDB_TYPE_ACLDB		4	/* access control list database */
-
-/*
- * Define the metadata record key prefix character.  Normal data record
- * keys (names) cannot begin with this character.
- */
-#define NDB_MDPREFIX	'?'
-
-/* Define flags for ndbEnumerate() */
-#define NDBF_ENUMNORM	0x1		/* enumerate normal data records */
-#define NDBF_ENUMMETA	0x2		/* enumerate metadata records */
-
-/* Define return values for a user function called by ndbEnumerate */
-#define NDB_ENUMSTOP	-1		/* terminate enumeration */
-#define NDB_ENUMCONT	0		/* continue enumeration */
-#define NDB_ENUMRESET	1		/* restart enumeration at beginning */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Functions for database information retrieval in nsdb.c */
-extern void ndbClose(void * ndb, int flags);
-
-/* for ANSI C++ standard on SCO UDK, otherwise fn name is mangled */
-#ifdef UnixWare
-typedef int (*ArgFn_ndbEnum)(NSErr_t * ferrp, void * parg, int namelen,
-                           char * name, int reclen, char * recptr);
-extern int ndbEnumerate(NSErr_t * errp, void * ndb, int flags, void * argp,
-                        ArgFn_ndbEnum);
-#else /* UnixWare */
-extern int ndbEnumerate(NSErr_t * errp, void * ndb, int flags, void * argp,
-			int (*func)(NSErr_t * ferrp, void * parg,
-				    int namelen, char * name,
-				    int reclen, char * recptr));
-#endif /* UnixWare */
-extern int ndbFindName(NSErr_t * errp, void * ndb, int namelen, char * name,
-		       int * reclen, char **recptr);
-extern int ndbIdToName(NSErr_t * errp,
-		       void * ndb, unsigned int id, int * plen, char **pname);
-extern int ndbInitPrimary(NSErr_t * errp, void * ndb);
-extern void * ndbOpen(NSErr_t * errp,
-		      char * dbname, int flags, int dbtype, int * version);
-extern int ndbReOpen(NSErr_t * errp, void * ndb, int flags);
-
-NSPR_END_EXTERN_C
-
-/* richm - 20020218 - these macros were added as part of the port to DBM 1.6
- * apparently, these were exported for outside use from mcom_db.h in
- * DBM 1.5x and earlier, but were made private in 1.6 - so I copied them
- * here
- */
-/*
- * Little endian <==> big endian 32-bit swap macros.
- *	M_32_SWAP	swap a memory location
- *	P_32_SWAP	swap a referenced memory location
- *	P_32_COPY	swap from one location to another
- */
-#ifndef M_32_SWAP
-#define	M_32_SWAP(a) {							\
-	uint32 _tmp = a;						\
-	((char *)&a)[0] = ((char *)&_tmp)[3];				\
-	((char *)&a)[1] = ((char *)&_tmp)[2];				\
-	((char *)&a)[2] = ((char *)&_tmp)[1];				\
-	((char *)&a)[3] = ((char *)&_tmp)[0];				\
-}
-#endif
-#ifndef P_32_SWAP
-#define	P_32_SWAP(a) {							\
-	uint32 _tmp = *(uint32 *)a;				\
-	((char *)a)[0] = ((char *)&_tmp)[3];				\
-	((char *)a)[1] = ((char *)&_tmp)[2];				\
-	((char *)a)[2] = ((char *)&_tmp)[1];				\
-	((char *)a)[3] = ((char *)&_tmp)[0];				\
-}
-#endif
-#ifndef P_32_COPY
-#define	P_32_COPY(a, b) {						\
-	((char *)&(b))[0] = ((char *)&(a))[3];				\
-	((char *)&(b))[1] = ((char *)&(a))[2];				\
-	((char *)&(b))[2] = ((char *)&(a))[1];				\
-	((char *)&(b))[3] = ((char *)&(a))[0];				\
-}
-#endif
-/*
- * Little endian <==> big endian 16-bit swap macros.
- *	M_16_SWAP	swap a memory location
- *	P_16_SWAP	swap a referenced memory location
- *	P_16_COPY	swap from one location to another
- */
-#ifndef M_16_SWAP
-#define	M_16_SWAP(a) {							\
-	uint16 _tmp = a;						\
-	((char *)&a)[0] = ((char *)&_tmp)[1];				\
-	((char *)&a)[1] = ((char *)&_tmp)[0];				\
-}
-#endif
-#ifndef P_16_SWAP
-#define	P_16_SWAP(a) {							\
-	uint16 _tmp = *(uint16 *)a;				\
-	((char *)a)[0] = ((char *)&_tmp)[1];				\
-	((char *)a)[1] = ((char *)&_tmp)[0];				\
-}
-#endif
-#ifndef P_16_COPY
-#define	P_16_COPY(a, b) {						\
-	((char *)&(b))[0] = ((char *)&(a))[1];				\
-	((char *)&(b))[1] = ((char *)&(a))[0];				\
-}
-#endif
-
-#endif /* __nsdb_h */
diff --git a/include/libaccess/nsdberr.h b/include/libaccess/nsdberr.h
deleted file mode 100644
index 8017b2eb..00000000
--- a/include/libaccess/nsdberr.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsdberr_h
-#define __nsdberr_h
-
-/* NSDB facility name (defined in nsdb,c) */
-extern char * NSDB_Program;
-
-/* Define error identifiers for NSDB facility */
-
-/* Errors generated in nsdb.c */
-
-/* ndbFindName() */
-#define NSDBERR1000	1000	/* primary DB get operation failed */
-
-/* ndbIdToName() */
-#define NSDBERR1100	1100	/* id-to-name DB get operation failed */
-
-/* ndbInitPrimary() */
-#define NSDBERR1200	1200	/* primary database already exists */
-#define NSDBERR1220	1220	/* primary database open failed */
-#define NSDBERR1240	1240	/* primary DB put operation failed */
-#define NSDBERR1260	1260	/* primary DB put operation failed */
-
-/* ndbOpen() */
-#define NSDBERR1400	1400	/* insufficient dynamic memory */
-#define NSDBERR1420	1420	/* insufficient dynamic memory */
-#define NSDBERR1440	1440	/* insufficient dynamic memory */
-#define NSDBERR1460	1460	/* primary DB get metadata operation failed */
-#define NSDBERR1480	1480	/* metadata format error */
-#define NSDBERR1500	1500	/* unsupported database version number */
-#define NSDBERR1520	1520	/* wrong database type */
-
-/* ndbReOpen() */
-#define NSDBERR1600	1600	/* create primary DB failed */
-#define NSDBERR1620	1620	/* open primary/write failed */
-#define NSDBERR1640	1640	/* open primary/read failed */
-#define NSDBERR1660	1660	/* create id-to-name DB failed */
-#define NSDBERR1680	1680	/* open id-to-name DB for write failed */
-#define NSDBERR1700	1700	/* open id-to-name DB for read failed */
-
-/* Define error ids generated in nsdbmgmt.c */
-
-/* ndbAllocId() */
-#define NSDBERR2000	2000	/* bad DB name key */
-#define NSDBERR2020	2020	/* metadata get operation failed */
-#define NSDBERR2040	2040	/* no space to grow DB id bitmap */
-#define NSDBERR2060	2060	/* no space to copy DB id bitmap */
-#define NSDBERR2080	2080	/* put bitmap to DB operation failed */
-#define NSDBERR2100	2100	/* put id-to-name operation failed */
-
-/* ndbDeleteName() */
-#define NSDBERR2200	2200	/* error deleting record */
-
-/* ndbFreeId() */
-#define NSDBERR2300	2300	/* invalid id value */
-#define NSDBERR2320	2320	/* error deleting id-to-name record */
-#define NSDBERR2340	2340	/* error reading id bitmap from primary DB */
-#define NSDBERR2360	2360	/* invalid id value */
-#define NSDBERR2380	2380	/* insufficient dynamic memory */
-#define NSDBERR2400	2400	/* error writing id bitmap back to DB */
-
-/* ndbRenameId() */
-#define NSDBERR2500	2500	/* invalid new key name string */
-#define NSDBERR2520	2520	/* get id record operation failed */
-#define NSDBERR2540	2540	/* put id record operation failed */
-
-/* ndbStoreName() */
-#define NSDBERR2700	2700	/* database put operation failed */
-
-/* Define error return codes */
-#define NDBERRNOMEM	-1		/* insufficient dynamic memory */
-#define NDBERRNAME	-2		/* invalid key name string */
-#define NDBERROPEN	-3		/* database open error */
-#define NDBERRMDGET	-4		/* database metadata get failed */
-#define NDBERRMDPUT	-5		/* database metadata put failed */
-#define NDBERRIDPUT	-6		/* id-to-name record put failed */
-#define NDBERRNMDEL	-7		/* delete named record failed */
-#define NDBERRPINIT	-8		/* error creating primary DB file */
-#define NDBERRGET	-9		/* database get failed */
-#define NDBERREXIST	-10		/* DB already exists */
-#define NDBERRMDFMT	-11		/* invalid metadata format */
-#define NDBERRDBTYPE	-12		/* wrong DB type */
-#define NDBERRBADID	-13		/* invalid id value for name */
-#define NDBERRPUT	-14		/* database put operation failed */
-#define NDBERRVERS	-15		/* unsupported database version */
-#define NDBERRIDDEL	-16		/* delete id-to-name record failed */
-
-#endif /* __nsdberr_h */
diff --git a/include/libaccess/nsdbmgmt.h b/include/libaccess/nsdbmgmt.h
deleted file mode 100644
index a5dc5ac1..00000000
--- a/include/libaccess/nsdbmgmt.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsdbmgmt_h
-#define __nsdbmgmt_h
-
-/*
- * Description (nsdbmgmt.h)
- *
- *	The file describes the interface for managing information in
- *	a Netscape (server) database.  A database is composed of
- *	two (libdbm) DB files.  One of these (<dbname>.db) contains
- *	records indexed by a string key.  These records contain the
- *	primary information in the database.  A second DB file
- *	(<dbname>.id) is used to map an integer id value to a string
- *	key, which can then be used to locate a record in the first file.
- *	The interface for retrieving information from a database is
- *	described in nsdb.h.
- *
- * FUTURE:
- *	Normally the records in the primary DB file will contain the
- *	id values which are used to key the id-to-name DB.  When this
- *	is the case, it is possible to construct the id-to-name DB from
- *	the primary DB file, and an interface is provided to facilitate
- *	this.
- */
-
-#include "nsdb.h"			/* database access */
-
-/* Define flags for ndbStoreName() */
-#define NDBF_NEWNAME	0x1		/* this is (should be) a new name */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Functions for database management in nsdbmgmt.c */
-extern int ndbAllocId(NSErr_t * errp, void * ndb,
-		      int namelen, char * name, unsigned int * id);
-extern int ndbDeleteName(NSErr_t * errp,
-			 void * ndb, int flags, int namelen, char * name);
-extern int ndbFreeId(NSErr_t * errp,
-		     void * ndb, int namelen, char * name, unsigned int id);
-extern int ndbRenameId(NSErr_t * errp, void * ndb,
-		       int namelen, char * newname, unsigned int id);
-extern int ndbStoreName(NSErr_t * errp, void * ndb, int flags,
-			int namelen, char * name, int reclen, char * recptr);
-extern int ndbSync(NSErr_t * errp, void * ndb, int flags);
-
-NSPR_END_EXTERN_C
-
-#endif /* __nsdbmgmt_h */
diff --git a/include/libaccess/nsgmgmt.h b/include/libaccess/nsgmgmt.h
deleted file mode 100644
index 6ce92865..00000000
--- a/include/libaccess/nsgmgmt.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsgmgmt_h
-#define __nsgmgmt_h
-
-/*
- * Description (nsgmgmt.h)
- *
- *	This file defines the interface to group management facilities
- *	implemented using a Netscape group database.  This interface
- *	provides functions for adding, modifying, and removing group
- *	entries in the database, using the group object (GroupObj_t)
- *	structure to convey information across the interface.
- */
-
-#define __PRIVATE_NSGROUP
-#include "nsgroup.h"		/* group object access */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Group information management operations in nsgmgmt.c */
-extern NSAPI_PUBLIC int groupAddMember(GroupObj_t * goptr, int isgid, USI_t id);
-extern NSAPI_PUBLIC GroupObj_t * groupCreate(NTS_t name, NTS_t desc);
-extern NSAPI_PUBLIC int groupDeleteMember(GroupObj_t * goptr, int isgid, USI_t id);
-extern NSAPI_PUBLIC int groupEncode(GroupObj_t * goptr, int * ureclen, ATR_t * urecptr);
-extern NSAPI_PUBLIC int groupRemove(NSErr_t * errp, void * groupdb, int flags, NTS_t name);
-extern NSAPI_PUBLIC int groupStore(NSErr_t * errp,
-		      void * groupdb, int flags, GroupObj_t * goptr);
-
-NSPR_END_EXTERN_C
-
-#endif /* __nsgmgmt_h */
diff --git a/include/libaccess/nsgroup.h b/include/libaccess/nsgroup.h
deleted file mode 100644
index 8350a8fc..00000000
--- a/include/libaccess/nsgroup.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsgroup_h
-#define __nsgroup_h
-
-/*
- * Description (nsgroup.h)
- *
- *	This file describes the interface to group information stored in
- *	a Netscape group database.  Information about a group is provided
- *	to the caller in the form of a group object (GroupObj_t), defined
- *	in nsauth.h.  This interface provides only read access to group
- *	information.  The interface for managing the group database is
- *	described in nsgmgmt.h.
- */
-
-#include "nserror.h"		/* error frame list support */
-#include "nsautherr.h"		/* authentication error codes */
-#include "nsauth.h"		/* authentication types */
-
-/* Begin private definitions */
-#ifdef __PRIVATE_NSGROUP
-
-#include "nsdb.h"
-
-/*
- * Define structure used to communicate between groupEnumerate() and
- * groupEnumHelp().
- */
-
-typedef struct GroupEnumArgs_s GroupEnumArgs_t;
-struct GroupEnumArgs_s {
-    void * groupdb;			/* group database handle */
-    int flags;				/* groupEnumerate() flags */
-    int (*func)(NSErr_t * ferrp, void * parg,
-		GroupObj_t * goptr);	/* user function pointer */
-    void * user;			/* user's argp pointer */
-};
-
-/* Define attribute tags for group DB records */
-#define GAT_GID		0x50		/* group id (USI) */
-#define GAT_FLAGS	0x51		/* flags (USI) */
-#define GAT_DESCRIPT	0x52		/* group description (NTS) */
-#define GAT_USERS	0x53		/* list of users (USI...) */
-#define GAT_GROUPS	0x54		/* list of groups (USI...) */
-#define GAT_PGROUPS	0x55		/* list of paret groups (USI...) */
-
-#endif /* __PRIVATE_NSGROUP */
-
-/* Begin public definitions */
-
-/* Define flags for groupEnumerate() */
-#define GOF_ENUMKEEP	0x1		/* don't free group objects */
-
-NSPR_BEGIN_EXTERN_C
-
-    /* Operations on a group object (see nsgroup.c) */
-extern NSAPI_PUBLIC GroupObj_t * groupDecode(NTS_t name, int ureclen, ATR_t urecptr);
-extern NSAPI_PUBLIC int groupEnumerate(NSErr_t * errp,
-			  void * groupdb, int flags, void * argp,
-			  int (*func)(NSErr_t * ferrp,
-				     void * parg, GroupObj_t * goptr));
-extern NSAPI_PUBLIC GroupObj_t * groupFindByName(NSErr_t * errp,
-				    void * groupdb, NTS_t name);
-extern NSAPI_PUBLIC GroupObj_t * groupFindByGid(NSErr_t * errp, void * groupdb, USI_t gid);
-extern NSAPI_PUBLIC void groupFree(GroupObj_t * goptr);
-
-NSPR_END_EXTERN_C
-
-#endif /* __nsgroup_h */
diff --git a/include/libaccess/nslock.h b/include/libaccess/nslock.h
deleted file mode 100644
index 097ecb98..00000000
--- a/include/libaccess/nslock.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nslock_h
-#define __nslock_h
-
-/*
- * Description (nslock.h)
- *
- *	This file defines to interface for a locking facility that
- *	provides exclusive access to a resource across multiple
- *	server processes.
- */
-
-#include "nserror.h"
-#include "base/crit.h"
-
-#ifdef __PRIVATE_NSLOCK
-
-/*
- * Description (NSLock_t)
- *
- *	This type represents a lock.  It includes a name which
- *	uniquely identifies the lock, and a handle for referencing
- *	the lock once it has been initialized.
- */
-
-typedef struct NSLock_s NSLock_t;
-struct NSLock_s {
-    NSLock_t * nl_next;			/* next lock on NSLock_List */
-    char * nl_name;			/* name associate with lock */
-#if defined(FILE_UNIX)
-    CRITICAL nl_crit;			/* critical section for threads */
-    SYS_FILE nl_fd;			/* file descriptor */
-    int nl_cnt;				/* nsLockAcquire() count */
-#elif defined(XP_WIN32)
-#else
-#error "nslock.h needs work for this platform"
-#endif
-};
-
-#endif /* __PRIVATE_NSLOCK */
-
-/* Define error identifiers */
-
-/* nsLockOpen() */
-#define NSLERR1000	1000		/* insufficient dynamic memory */
-#define NSLERR1020	1020		/* error creating lock */
-#define NSLERR1040	1040		/* error accessing lock */
-
-/* nsLockAcquire() */
-#define NSLERR1100	1100		/* error acquiring lock */
-
-/* Define error return codes */
-
-#define NSLERRNOMEM	-1		/* insufficient dynamic memory */
-#define NSLERRCREATE	-2		/* error creating lock */
-#define NSLERROPEN	-3		/* error accessing lock */
-#define NSLERRLOCK	-4		/* error acquiring lock */
-
-NSPR_BEGIN_EXTERN_C
-
-/* Functions in nslock.c */
-extern NSAPI_PUBLIC int nsLockOpen(NSErr_t * errp,
-				   char * lockname, void **plock);
-extern NSAPI_PUBLIC int nsLockAcquire(NSErr_t * errp, void * lock);
-extern NSAPI_PUBLIC void nsLockRelease(void * lock);
-extern NSAPI_PUBLIC void nsLockClose(void * lock);
-
-NSPR_END_EXTERN_C
-
-#endif __nslock_h
diff --git a/include/libaccess/nsumgmt.h b/include/libaccess/nsumgmt.h
deleted file mode 100644
index 0367aade..00000000
--- a/include/libaccess/nsumgmt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsumgmt_h
-#define __nsumgmt_h
-
-/*
- * Description (nsumgmt.h)
- *
- *	This file defines the interface to user management facilities
- *	implemented using a Netscape user database.  This interface
- *	provides functions for adding, modifying, and removing user
- *	entries in the database, using the user object (UserObj_t)
- *	structure to convey information across the interface.
- */
-
-#include "nsuser.h"		/* user object access */
-
-NSPR_BEGIN_EXTERN_C
-
-/* User information management operations in nsumgmt.c */
-extern int userAddGroup(UserObj_t * uoptr, USI_t gid);
-extern NSAPI_PUBLIC UserObj_t * userCreate(NTS_t name, NTS_t pwd, NTS_t rname);
-extern int userDeleteGroup(UserObj_t * uoptr, USI_t gid);
-extern int userEncode(UserObj_t * uoptr, int * ureclen, ATR_t * urecptr);
-extern NSAPI_PUBLIC int userRemove(NSErr_t * errp, void * userdb, int flags, NTS_t name);
-extern NSAPI_PUBLIC int userRename(NSErr_t * errp,
-		      void * userdb, UserObj_t * uoptr, NTS_t newname);
-extern NSAPI_PUBLIC int userStore(NSErr_t * errp,
-		     void * userdb, int flags, UserObj_t * uoptr);
-
-NSPR_END_EXTERN_C
-
-#endif /* __nsumgmt_h */
diff --git a/include/libaccess/nsuser.h b/include/libaccess/nsuser.h
deleted file mode 100644
index 2fec7d31..00000000
--- a/include/libaccess/nsuser.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef __nsuser_h
-#define __nsuser_h
-
-/*
- * Description (nsuser.h)
- *
- *	This file describes the interface to user information stored in
- *	a Netscape user database.  Information about a user is provided
- *	to the caller in the form of a user object (UserObj_t), defined
- *	in nsauth.h.  This interface provides only read access to user
- *	information.  The interface for managing the user database is
- *	described in nsumgmt.h.
- */
-
-#include "nserror.h"		/* error frame list support */
-#include "nsautherr.h"		/* authentication error codes */
-#include "nsauth.h"		/* authentication types */
-
-/* Begin private definitions */
-#ifdef __PRIVATE_NSUSER
-
-#include "nsdb.h"
-
-/*
- * Define structure used to communicate between userEnumerate() and
- * userEnumHelp().
- */
-
-typedef struct UserEnumArgs_s UserEnumArgs_t;
-struct UserEnumArgs_s {
-    void * userdb;			/* user database handle */
-    int flags;				/* userEnumerate() flags */
-    int (*func)(NSErr_t * ferrp, void * parg,
-		UserObj_t * uoptr);	/* user function pointer */
-    void * user;			/* user's argp pointer */
-};
-
-/* Define attribute tags for user DB records */
-#define UAT_PASSWORD	0x40		/* password (NTS) */
-#define UAT_UID		0x41		/* user id (USI) */
-#define UAT_ACCFLAGS	0x42		/* account flags (USI) */
-#define UAT_REALNAME	0x43		/* real name (NTS) */
-#define UAT_GROUPS	0x44		/* list of groups (USI...) */
-
-#endif /* __PRIVATE_NSUSER */
-
-/* Begin public definitions */
-
-/* Define flags for userEnumerate() */
-#define UOF_ENUMKEEP	0x1		/* don't free user objects */
-
-NSPR_BEGIN_EXTERN_C
-
-/* User information retrieval operations in nsuser.c */
-extern UserObj_t * userDecode(NTS_t name, int ureclen, ATR_t urecptr);
-extern int userEnumerate(NSErr_t * errp, void * userdb, int flags, void * argp,
-			 int (*func)(NSErr_t * ferrp,
-				     void * parg, UserObj_t * uoptr));
-extern UserObj_t * userFindByName(NSErr_t * errp, void * userdb, NTS_t name);
-extern UserObj_t * userFindByUid(NSErr_t * errp, void * userdb, USI_t uid);
-NSAPI_PUBLIC extern void userFree(UserObj_t * uoptr);
-
-NSPR_END_EXTERN_C
-
-#endif /* __nsuser_h */
diff --git a/include/libaccess/register.h b/include/libaccess/register.h
deleted file mode 100644
index 051be9ae..00000000
--- a/include/libaccess/register.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifndef ACL_REGISTER_HEADER
-#define ACL_REGISTER_HEADER
-
-#include <prhash.h>
-
-#include <ldap.h>
-#include <base/pblock.h>
-#include <base/plist.h>
-#include <libaccess/nserror.h>
-#include <libaccess/acl.h>
-
-typedef	void * ACLMethod_t;
-#define	ACL_METHOD_ANY		(ACLMethod_t)-1
-#define	ACL_METHOD_INVALID	(ACLMethod_t)-2
-extern ACLMethod_t ACL_METHOD_BASIC;
-
-typedef	void * ACLDbType_t;
-#define	ACL_DBTYPE_ANY		(ACLDbType_t)-1
-#define	ACL_DBTYPE_INVALID	(ACLDbType_t)-2
-extern ACLDbType_t ACL_ACL_DBTYPE_LDAP;
-
-typedef int (*AttrGetterFn)(NSErr_t *errp, PList_t subject, PList_t resource, PList_t auth_info, PList_t global_auth, void *arg);
-typedef int (*AclModuleInitFunc)(pblock *pb, Session *sn, Request *rq);
-typedef int (*DbParseFn_t)(NSErr_t *errp, ACLDbType_t dbtype,
-			   const char *name, const char *url,
-			   PList_t plist, void **db);
-typedef int (*AclCacheFlushFunc_t)(void);
-
-#ifdef __cplusplus
-typedef int (*LASEvalFunc_t)(NSErr_t*, char*, CmpOp_t, char*, int*, void**, PList_t, PList_t, PList_t, PList_t);
-typedef void (*LASFlushFunc_t)(void **);
-#else
-typedef int (*LASEvalFunc_t)();
-typedef void (*LASFlushFunc_t)();
-#endif
-
-/* We need to hide ACLGetter_t */
-typedef struct ACLGetter_s {
-	ACLMethod_t	method;
-	ACLDbType_t	db;
-	AttrGetterFn	fn;
-	void 		*arg;
-} ACLGetter_t;
-typedef ACLGetter_t *ACLGetter_p;
-
-/*
- *	Command values for the "position" argument to ACL_RegisterGetter
- *	Any positive >0 value is the specific position in the list to insert
- *	the new function.
- */
-#define	ACL_AT_FRONT		0
-#define	ACL_AT_END		-1
-#define	ACL_REPLACE_ALL 	-2
-#define	ACL_REPLACE_MATCHING	-3
-
-#ifdef	ACL_LIB_INTERNAL
-#define	ACL_MAX_METHOD		32
-#define	ACL_MAX_DBTYPE		32
-#endif
-
-NSPR_BEGIN_EXTERN_C
-
-NSAPI_PUBLIC extern int
-	ACL_LasRegister( NSErr_t *errp, char *attr_name, LASEvalFunc_t
-	eval_func, LASFlushFunc_t flush_func );
-NSAPI_PUBLIC extern int
-	ACL_LasFindEval( NSErr_t *errp, char *attr_name, LASEvalFunc_t
-	*eval_funcp );
-NSAPI_PUBLIC extern int
-	ACL_LasFindFlush( NSErr_t *errp, char *attr_name, LASFlushFunc_t
-	*flush_funcp );
-extern void
-	ACL_LasHashInit( void );
-extern void
-	ACL_LasHashDestroy( void );
-
-/*
- *	Revised, normalized method/dbtype registration routines
- */
-NSAPI_PUBLIC extern int
-	ACL_MethodRegister(const char *name, ACLMethod_t *t);
-NSAPI_PUBLIC extern int
-	ACL_MethodIsEqual(const ACLMethod_t t1, const ACLMethod_t t2);
-NSAPI_PUBLIC extern int
-	ACL_MethodNameIsEqual(const ACLMethod_t t, const char *name);
-NSAPI_PUBLIC extern int
-	ACL_MethodFind(const char *name, ACLMethod_t *t);
-NSAPI_PUBLIC extern ACLMethod_t
-	ACL_MethodGetDefault();
-NSAPI_PUBLIC extern void
-	ACL_MethodSetDefault(const ACLMethod_t t);
-NSAPI_PUBLIC extern int
-	ACL_AuthInfoGetMethod(PList_t auth_info, ACLMethod_t *t);
-
-NSAPI_PUBLIC extern int
-	ACL_DbTypeRegister(const char *name, DbParseFn_t func, ACLDbType_t *t);
-NSAPI_PUBLIC extern int
-	ACL_DbTypeIsEqual(const ACLDbType_t t1, const ACLDbType_t t2);
-NSAPI_PUBLIC extern int
-	ACL_DbTypeNameIsEqual(const ACLDbType_t t, const char *name);
-NSAPI_PUBLIC extern int
-	ACL_DbTypeFind(const char *name, ACLDbType_t *t);
-NSAPI_PUBLIC extern const ACLDbType_t
-	ACL_DbTypeGetDefault();
-NSAPI_PUBLIC extern void
-	ACL_DbTypeSetDefault(ACLDbType_t t);
-NSAPI_PUBLIC extern int
-	ACL_AuthInfoGetDbType(PList_t auth_info, ACLDbType_t *t);
-NSAPI_PUBLIC extern int
-	ACL_DbTypeIsRegistered(const ACLDbType_t dbtype);
-NSAPI_PUBLIC extern DbParseFn_t
-	ACL_DbTypeParseFn(const ACLDbType_t dbtype);
-
-NSAPI_PUBLIC extern int
-	ACL_AttrGetterRegister(const char *attr, AttrGetterFn fn, ACLMethod_t m,
-	ACLDbType_t d, int position, void *arg);
-typedef ACLGetter_t *AttrGetterList; /* TEMPORARY */
-NSAPI_PUBLIC extern int
-	ACL_AttrGetterFind(PList_t auth_info, const char *attr,
-	AttrGetterList *getters);
-
-NSPR_END_EXTERN_C
-
-
-/* LAS return codes - Must all be negative numbers */
-#define	LAS_EVAL_TRUE		-1
-#define	LAS_EVAL_FALSE		-2
-#define	LAS_EVAL_DECLINE	-3
-#define	LAS_EVAL_FAIL		-4
-#define	LAS_EVAL_INVALID	-5
-#define	LAS_EVAL_NEED_MORE_INFO	-6
-
-#define ACL_ATTR_GROUP	    "group"
-#define ACL_ATTR_RAW_USER_LOGIN "user-login"
-#define ACL_ATTR_AUTH_USER	    "auth-user"
-#define ACL_ATTR_AUTH_TYPE	    "auth-type"
-#define ACL_ATTR_AUTH_DB	    "auth-db"
-#define ACL_ATTR_AUTH_PASSWORD  "auth-password"
-#define ACL_ATTR_USER	    "user"
-#define ACL_ATTR_PASSWORD	    "pw"
-#define ACL_ATTR_USERDN	    "userdn"
-#define ACL_ATTR_RAW_USER	    "raw-user"
-#define ACL_ATTR_RAW_PASSWORD   "raw-pw"
-#define ACL_ATTR_USER_ISMEMBER  "user-ismember"
-#define ACL_ATTR_DATABASE	    "database"
-#define ACL_ATTR_DBTYPE	    "dbtype"
-#define ACL_ATTR_DBNAME	    "dbname"
-#define ACL_ATTR_DATABASE_URL   "url"
-#define ACL_ATTR_METHOD	    "method"
-#define ACL_ATTR_AUTHTYPE	    "authtype"
-#define ACL_ATTR_AUTHORIZATION  "authorization"
-#define ACL_ATTR_PARSEFN	    "parsefn"
-#define ACL_ATTR_ATTRIBUTE	    "attr"
-#define ACL_ATTR_GETTERFN	    "getterfunc"
-#define ACL_ATTR_IP		    "ip"
-#define ACL_ATTR_DNS	    "dns"
-#define ACL_ATTR_MODULE	    "module"
-#define ACL_ATTR_MODULEFUNC	    "func"
-#define ACL_ATTR_GROUPS	    "groups"
-#define ACL_ATTR_IS_VALID_PASSWORD "isvalid-password"
-#define ACL_ATTR_CERT2USER	    "cert2user"
-#define ACL_ATTR_USER_CERT	    "cert"
-#define ACL_ATTR_PROMPT	    "prompt"
-#define ACL_ATTR_TIME	    "time"
-#define ACL_ATTR_USERS_GROUP    "users-group"
-
-#define ACL_DBTYPE_LDAP	    "ldap"
-
-#define METHOD_DEFAULT	    "default"
-
-typedef PRHashTable AttrGetterTable_t;
-
-typedef struct {
-    char *method;
-    char *authtype;
-    char *dbtype;
-    AttrGetterTable_t *attrGetters;
-} MethodInfo_t;
-
-NSPR_BEGIN_EXTERN_C
-
-NSAPI_PUBLIC int ACL_FindMethod (NSErr_t *errp, const char *method, MethodInfo_t **method_info_handle);
-NSAPI_PUBLIC int ACL_RegisterModule (NSErr_t *errp, const char *moduleName, AclModuleInitFunc func);
-NSAPI_PUBLIC int ACL_RegisterMethod (NSErr_t *errp, const char *method, const char *authtype, const char *dbtype, MethodInfo_t **method_info_handle);
-NSAPI_PUBLIC int ACL_RegisterAttrGetter (NSErr_t *errp, MethodInfo_t *method_info_handle, const char *attr, AttrGetterFn func);
-NSAPI_PUBLIC int ACL_UseAttrGettersFromMethod (NSErr_t *errp, const char *method, const char *usefrom);
-NSAPI_PUBLIC int ACL_GetAttribute(NSErr_t *errp, const char *attr, void **val, PList_t subject, PList_t resource, PList_t auth_info, PList_t global_auth);
-NSAPI_PUBLIC int ACL_FindAttrGetter (NSErr_t *errp, const char *method, const char *attr, AttrGetterFn *func);
-NSAPI_PUBLIC int ACL_CallAttrGetter (NSErr_t *errp, const char *method, const char *attr, PList_t subject, PList_t resource, PList_t auth_info, PList_t global_auth);
-NSAPI_PUBLIC int ACL_RegisterDbType(NSErr_t *errp, const char *dbtype, DbParseFn_t func);
-NSAPI_PUBLIC int ACL_RegisterDbName(NSErr_t *errp, ACLDbType_t dbtype, const char *dbname, const char *url, PList_t plist);
-NSAPI_PUBLIC int ACL_RegisterDbFromACL(NSErr_t *errp, const char *url, ACLDbType_t *dbtype);
-NSAPI_PUBLIC int ACL_DatabaseFind(NSErr_t *errp, const char *dbname,
-				  ACLDbType_t *dbtype, void **db);
-NSAPI_PUBLIC int ACL_SetDefaultDatabase (NSErr_t *errp, const char *dbname);
-NSAPI_PUBLIC int ACL_SetDefaultMethod (NSErr_t *errp, const char *method);
-NSAPI_PUBLIC const char *ACL_DbnameGetDefault (NSErr_t *errp);
-NSAPI_PUBLIC int ACL_LDAPDatabaseHandle (NSErr_t *errp, const char *dbname, LDAP **ld);
-NSAPI_PUBLIC int ACL_AuthInfoGetDbname (NSErr_t *errp, PList_t auth_info, char **dbname);
-NSAPI_PUBLIC int ACL_CacheFlushRegister(AclCacheFlushFunc_t func);
-
-NSPR_END_EXTERN_C
-
-struct program_groups {
-	char **groups;
-	char **programs;
-};
-  
-#endif
diff --git a/include/libaccess/stubs.h b/include/libaccess/stubs.h
deleted file mode 100644
index 9aea601c..00000000
--- a/include/libaccess/stubs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-typedef	void	PropList_t;
diff --git a/include/public/Makefile b/include/public/Makefile
deleted file mode 100644
index cf0c3611..00000000
--- a/include/public/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Makefile for netsite.h
-
-BUILD_ROOT = ../..
-MODULE=netsiteInclude
-
-include $(BUILD_ROOT)/nsdefs.mk
-
-HDRDEST=$(OBJDIR)/include
-
-PREFIX=../copyrght.h
-
-
-NOSTDSTRIP=true
-NOSTDDEPEND=true
-
-HDRS=netsite.h nsapi.h
-
-BINS=$(addprefix $(HDRDEST)/,$(HDRS))
-
-all: stuff
-
-strip:
-depend:
-
-include $(BUILD_ROOT)/nsconfig.mk
-
-ifeq ($(NSAPI_CAPABLE), true)
-
-stuff: $(HDRDEST) $(BINS) sub-hdrs
-
-$(HDRDEST):
-	mkdir -p $(HDRDEST)
-
-ifeq ($(PRODUCT), "Netscape Proxy Server")
-sub-hdrs:
-	cd base; $(MAKE) $(MAKEFLAGS)
-	cd frame; $(MAKE) $(MAKEFLAGS)
-	cd libproxy; $(MAKE) $(MAKEFLAGS)
-else
-sub-hdrs:
-	cd base; $(MAKE) $(MAKEFLAGS) 
-	cd frame; $(MAKE) $(MAKEFLAGS) 
-	cd nsacl; $(MAKE) $(MAKEFLAGS) 
-endif
-
-$(HDRDEST)/%.h: %.h
-	cat $(PREFIX) $< > $(HDRDEST)/$*.h
-
-else
-stuff:
-
-endif
diff --git a/include/public/base/Makefile b/include/public/base/Makefile
deleted file mode 100644
index d92527a2..00000000
--- a/include/public/base/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Makefile for netsite.h
-
-BUILD_ROOT = ../../..
-MODULE=netsiteIncludeBase
-
-include $(BUILD_ROOT)/nsdefs.mk
-
-HDRDEST=$(OBJDIR)/include/base
-
-PREFIX=../../copyrght.h
-
-
-NOSTDSTRIP=true
-NOSTDDEPEND=true
-
-#HDRS=$(wildcard *.h)
-HDRS=daemon.h cinfo.h crit.h ereport.h buffer.h net.h pblock.h sem.h session.h shexp.h shmem.h systhr.h util.h file.h pool.h regexp.h systems.h
-
-
-BINS=$(addprefix $(HDRDEST)/,$(HDRS))
-
-all: $(HDRDEST) $(BINS)
-
-$(HDRDEST):
-	mkdir -p $(HDRDEST)
-
-strip:
-depend:
-
-include $(BUILD_ROOT)/nsconfig.mk
-
-$(HDRDEST)/%.h: %.h
-	cat $(PREFIX) $< > $(HDRDEST)/$*.h
diff --git a/include/public/base/crit.h b/include/public/base/crit.h
deleted file mode 100644
index aa641f9e..00000000
--- a/include/public/base/crit.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_CRIT_H
-#define PUBLIC_BASE_CRIT_H
-
-/*
- * File:        crit.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* !PUBLIC_BASE_CRIT_H */
diff --git a/include/public/base/ereport.h b/include/public/base/ereport.h
deleted file mode 100644
index d866cd2c..00000000
--- a/include/public/base/ereport.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_EREPORT_H
-#define PUBLIC_BASE_EREPORT_H
-
-/*
- * File:        ereport.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* !PUBLIC_BASE_EREPORT_H */
diff --git a/include/public/base/file.h b/include/public/base/file.h
deleted file mode 100644
index eea8c59e..00000000
--- a/include/public/base/file.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_FILE_H
-#define PUBLIC_BASE_FILE_H
-
-/*
- * File:        file.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* !PUBLIC_BASE_FILE_H */
diff --git a/include/public/base/pool.h b/include/public/base/pool.h
deleted file mode 100644
index 6f9a6a67..00000000
--- a/include/public/base/pool.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_POOL_H
-#define PUBLIC_BASE_POOL_H
-
-/*
- * File:        pool.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* !PUBLIC_BASE_POOL_H */
-
diff --git a/include/public/base/shexp.h b/include/public/base/shexp.h
deleted file mode 100644
index c9ba7e35..00000000
--- a/include/public/base/shexp.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_SHEXP_H
-#define PUBLIC_BASE_SHEXP_H
-
-/*
- * File:        shexp.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* !PUBLIC_BASE_SHEXP_H */
-
diff --git a/include/public/base/systhr.h b/include/public/base/systhr.h
deleted file mode 100644
index 8a48c3fe..00000000
--- a/include/public/base/systhr.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_SYSTHR_H
-#define PUBLIC_BASE_SYSTHR_H
-
-/*
- * File:        systhr.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* !PUBLIC_BASE_SYSTHR_H */
diff --git a/include/public/base/util.h b/include/public/base/util.h
deleted file mode 100644
index 967a1ca8..00000000
--- a/include/public/base/util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-#ifndef PUBLIC_BASE_UTIL_H
-#define PUBLIC_BASE_UTIL_H
-
-/*
- * File:        util.h
- *
- * Description:
- *
- *      Deprecated include file.
- */
-
-#ifndef PUBLIC_NSAPI_H
-#include "../nsapi.h"
-#endif /* !PUBLIC_NSAPI_H */
-
-#endif /* PUBLIC_BASE_UTIL_H */
diff --git a/include/public/nsacl/Makefile b/include/public/nsacl/Makefile
deleted file mode 100644
index cf5e94e5..00000000
--- a/include/public/nsacl/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Makefile for include/public/nsacl public header files
-
-BUILD_ROOT = ../../..
-MODULE=netsiteIncludeNsacl
-
-include $(BUILD_ROOT)/nsdefs.mk
-
-HDRDEST=$(OBJDIR)/include/nsacl
-
-PREFIX=copyrght.h
-
-
-NOSTDSTRIP=true
-NOSTDDEPEND=true
-
-HDRS=$(wildcard *.h)
-
-BINS=$(addprefix $(HDRDEST)/,$(HDRS))
-
-all: $(HDRDEST) $(BINS)
-
-$(HDRDEST):
-	mkdir -p $(HDRDEST)
-
-strip:
-depend:
-
-include $(BUILD_ROOT)/nsconfig.mk
-
-$(HDRDEST)/%.h: %.h
-	cat $(PREFIX) $< > $(HDRDEST)/$*.h
diff --git a/include/public/nsacl/copyrght.h b/include/public/nsacl/copyrght.h
deleted file mode 100644
index ffee130a..00000000
--- a/include/public/nsacl/copyrght.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-