bump version, requirementsEVOLUTION_1_5_9_2EVOLUTION_1_5_9evolution-1-5-9

2004-06-03  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version, requirements

37 files changed, 0 insertions, 4656 deletions

diff --git a/libdb/dbinc_auto/btree_auto.h b/libdb/dbinc_auto/btree_auto.h
deleted file mode 100644
index 4feb07ad9..000000000
--- a/libdb/dbinc_auto/btree_auto.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__bam_AUTO_H
-#define	__bam_AUTO_H
-#define	DB___bam_split	62
-typedef struct ___bam_split_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	left;
-	DB_LSN	llsn;
-	db_pgno_t	right;
-	DB_LSN	rlsn;
-	u_int32_t	indx;
-	db_pgno_t	npgno;
-	DB_LSN	nlsn;
-	db_pgno_t	root_pgno;
-	DBT	pg;
-	u_int32_t	opflags;
-} __bam_split_args;
-
-#define	DB___bam_rsplit	63
-typedef struct ___bam_rsplit_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DBT	pgdbt;
-	db_pgno_t	root_pgno;
-	db_pgno_t	nrec;
-	DBT	rootent;
-	DB_LSN	rootlsn;
-} __bam_rsplit_args;
-
-#define	DB___bam_adj	55
-typedef struct ___bam_adj_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	lsn;
-	u_int32_t	indx;
-	u_int32_t	indx_copy;
-	u_int32_t	is_insert;
-} __bam_adj_args;
-
-#define	DB___bam_cadjust	56
-typedef struct ___bam_cadjust_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	lsn;
-	u_int32_t	indx;
-	int32_t	adjust;
-	u_int32_t	opflags;
-} __bam_cadjust_args;
-
-#define	DB___bam_cdel	57
-typedef struct ___bam_cdel_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	lsn;
-	u_int32_t	indx;
-} __bam_cdel_args;
-
-#define	DB___bam_repl	58
-typedef struct ___bam_repl_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	lsn;
-	u_int32_t	indx;
-	u_int32_t	isdeleted;
-	DBT	orig;
-	DBT	repl;
-	u_int32_t	prefix;
-	u_int32_t	suffix;
-} __bam_repl_args;
-
-#define	DB___bam_root	59
-typedef struct ___bam_root_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	meta_pgno;
-	db_pgno_t	root_pgno;
-	DB_LSN	meta_lsn;
-} __bam_root_args;
-
-#define	DB___bam_curadj	64
-typedef struct ___bam_curadj_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_ca_mode	mode;
-	db_pgno_t	from_pgno;
-	db_pgno_t	to_pgno;
-	db_pgno_t	left_pgno;
-	u_int32_t	first_indx;
-	u_int32_t	from_indx;
-	u_int32_t	to_indx;
-} __bam_curadj_args;
-
-#define	DB___bam_rcuradj	65
-typedef struct ___bam_rcuradj_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	ca_recno_arg	mode;
-	db_pgno_t	root;
-	db_recno_t	recno;
-	u_int32_t	order;
-} __bam_rcuradj_args;
-
-#endif
diff --git a/libdb/dbinc_auto/btree_ext.h b/libdb/dbinc_auto/btree_ext.h
deleted file mode 100644
index ec5468acf..000000000
--- a/libdb/dbinc_auto/btree_ext.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_btree_ext_h_
-#define	_btree_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __bam_cmp __P((DB *, const DBT *, PAGE *, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
-int __bam_defcmp __P((DB *, const DBT *, const DBT *));
-size_t __bam_defpfx __P((DB *, const DBT *, const DBT *));
-int __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __bam_mswap __P((PAGE *));
-void __bam_cprint __P((DBC *));
-int __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, int));
-int __ram_ca_delete __P((DB *, db_pgno_t));
-int __bam_ca_di __P((DBC *, db_pgno_t, u_int32_t, int));
-int __bam_ca_dup __P((DBC *, u_int32_t, db_pgno_t, u_int32_t, db_pgno_t, u_int32_t));
-int __bam_ca_undodup __P((DB *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t));
-int __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
-int __bam_ca_split __P((DBC *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, int));
-void __bam_ca_undosplit __P((DB *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t));
-int __bam_c_init __P((DBC *, DBTYPE));
-int __bam_c_refresh __P((DBC *));
-int __bam_c_count __P((DBC *, db_recno_t *));
-int __bam_c_dup __P((DBC *, DBC *));
-int __bam_bulk_overflow __P((DBC *, u_int32_t, db_pgno_t, u_int8_t *));
-int __bam_bulk_duplicates __P((DBC *, db_pgno_t, u_int8_t *, int32_t *, int32_t **, u_int8_t **, u_int32_t *, int));
-int __bam_c_rget __P((DBC *, DBT *));
-int __bam_ditem __P((DBC *, PAGE *, u_int32_t));
-int __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
-int __bam_dpages __P((DBC *, EPG *));
-int __bam_db_create __P((DB *));
-int __bam_db_close __P((DB *));
-int __bam_set_flags __P((DB *, u_int32_t *flagsp));
-int __ram_set_flags __P((DB *, u_int32_t *flagsp));
-int __bam_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
-int __bam_metachk __P((DB *, const char *, BTMETA *));
-int __bam_read_root __P((DB *, DB_TXN *, db_pgno_t, u_int32_t));
-int __bam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __bam_new_subdb __P((DB *, DB *, DB_TXN *));
-int __bam_iitem __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
-int __bam_ritem __P((DBC *, PAGE *, u_int32_t, DBT *));
-int __bam_split_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rsplit_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_adj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cadjust_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_repl_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_root_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rcuradj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_reclaim __P((DB *, DB_TXN *));
-int __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
-int __ram_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
-int __ram_append __P((DBC *, DBT *, DBT *));
-int __ram_c_del __P((DBC *));
-int __ram_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-int __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-int __ram_ca __P((DBC *, ca_recno_arg));
-int __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
-int __ram_writeback __P((DB *));
-int __bam_rsearch __P((DBC *, db_recno_t *, u_int32_t, int, int *));
-int __bam_adjust __P((DBC *, int32_t));
-int __bam_nrecs __P((DBC *, db_recno_t *));
-db_recno_t __bam_total __P((DB *, PAGE *));
-int __bam_search __P((DBC *, db_pgno_t, const DBT *, u_int32_t, int, db_recno_t *, int *));
-int __bam_stkrel __P((DBC *, u_int32_t));
-int __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
-int __bam_split __P((DBC *, void *, db_pgno_t *));
-int __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
-int __bam_stat __P((DB *, void *, u_int32_t));
-int __bam_traverse __P((DBC *, db_lockmode_t, db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
-int __bam_stat_callback __P((DB *, PAGE *, void *, int *));
-int __bam_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-int __bam_30_btreemeta __P((DB *, char *, u_int8_t *));
-int __bam_31_btreemeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __bam_31_lbtree __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *, db_pgno_t, u_int32_t));
-int __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __bam_vrfy_itemorder __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t, int, int, u_int32_t));
-int __bam_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-int __bam_vrfy_subtree __P((DB *, VRFY_DBINFO *, db_pgno_t, void *, void *, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *));
-int __bam_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, PAGE *, void *, int (*)(void *, const void *), DBT *, u_int32_t));
-int __bam_salvage_walkdupint __P((DB *, VRFY_DBINFO *, PAGE *, DBT *, void *, int (*)(void *, const void *), u_int32_t));
-int __bam_meta2pgset __P((DB *, VRFY_DBINFO *, BTMETA *, u_int32_t, DB *));
-int __bam_split_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, u_int32_t));
-int __bam_split_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_split_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_split_read __P((DB_ENV *, void *, __bam_split_args **));
-int __bam_rsplit_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *));
-int __bam_rsplit_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rsplit_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rsplit_read __P((DB_ENV *, void *, __bam_rsplit_args **));
-int __bam_adj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
-int __bam_adj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_adj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_adj_read __P((DB_ENV *, void *, __bam_adj_args **));
-int __bam_cadjust_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, int32_t, u_int32_t));
-int __bam_cadjust_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cadjust_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cadjust_read __P((DB_ENV *, void *, __bam_cadjust_args **));
-int __bam_cdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t));
-int __bam_cdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cdel_read __P((DB_ENV *, void *, __bam_cdel_args **));
-int __bam_repl_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, u_int32_t, u_int32_t));
-int __bam_repl_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_repl_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_repl_read __P((DB_ENV *, void *, __bam_repl_args **));
-int __bam_root_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, db_pgno_t, DB_LSN *));
-int __bam_root_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_root_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_root_read __P((DB_ENV *, void *, __bam_root_args **));
-int __bam_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ca_mode, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t));
-int __bam_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_curadj_read __P((DB_ENV *, void *, __bam_curadj_args **));
-int __bam_rcuradj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, ca_recno_arg, db_pgno_t, db_recno_t, u_int32_t));
-int __bam_rcuradj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rcuradj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rcuradj_read __P((DB_ENV *, void *, __bam_rcuradj_args **));
-int __bam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __bam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __bam_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_btree_ext_h_ */
diff --git a/libdb/dbinc_auto/clib_ext.h b/libdb/dbinc_auto/clib_ext.h
deleted file mode 100644
index 7e2817d62..000000000
--- a/libdb/dbinc_auto/clib_ext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_clib_ext_h_
-#define	_clib_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifndef HAVE_GETCWD
-char *getcwd __P((char *, size_t));
-#endif
-#ifndef HAVE_GETOPT
-int getopt __P((int, char * const *, const char *));
-#endif
-#ifndef HAVE_MEMCMP
-int memcmp __P((const void *, const void *, size_t));
-#endif
-#ifndef HAVE_MEMCPY
-void *memcpy __P((void *, const void *, size_t));
-#endif
-#ifndef HAVE_MEMMOVE
-void *memmove __P((void *, const void *, size_t));
-#endif
-#ifndef HAVE_RAISE
-int raise __P((int));
-#endif
-#ifndef HAVE_SNPRINTF
-int snprintf __P((char *, size_t, const char *, ...));
-#endif
-#ifndef HAVE_STRCASECMP
-int strcasecmp __P((const char *, const char *));
-#endif
-#ifndef HAVE_STRCASECMP
-int strncasecmp __P((const char *, const char *, size_t));
-#endif
-#ifndef HAVE_STRDUP
-char *strdup __P((const char *));
-#endif
-#ifndef HAVE_STRERROR
-char *strerror __P((int));
-#endif
-#ifndef HAVE_VSNPRINTF
-int vsnprintf __P((char *, size_t, const char *, va_list));
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_clib_ext_h_ */
diff --git a/libdb/dbinc_auto/common_ext.h b/libdb/dbinc_auto/common_ext.h
deleted file mode 100644
index 7744982fe..000000000
--- a/libdb/dbinc_auto/common_ext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_common_ext_h_
-#define	_common_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __db_isbigendian __P((void));
-int __db_byteorder __P((DB_ENV *, int));
-int __db_fchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t));
-int __db_fcchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t, u_int32_t));
-int __db_ferr __P((const DB_ENV *, const char *, int));
-void __db_pgerr __P((DB *, db_pgno_t, int));
-int __db_pgfmt __P((DB_ENV *, db_pgno_t));
-int __db_eopnotsup __P((const DB_ENV *));
-#ifdef DIAGNOSTIC
-void __db_assert __P((const char *, const char *, int));
-#endif
-int __db_panic_msg __P((DB_ENV *));
-int __db_panic __P((DB_ENV *, int));
-void __db_err __P((const DB_ENV *, const char *, ...));
-void __db_errcall __P((const DB_ENV *, int, int, const char *, va_list));
-void __db_errfile __P((const DB_ENV *, int, int, const char *, va_list));
-void __db_logmsg __P((const DB_ENV *, DB_TXN *, const char *, u_int32_t, const char *, ...));
-int __db_unknown_flag __P((DB_ENV *, char *, u_int32_t));
-int __db_unknown_type __P((DB_ENV *, char *, DBTYPE));
-int __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
-int __db_not_txn_env __P((DB_ENV *));
-int __db_getlong __P((DB *, const char *, char *, long, long, long *));
-int __db_getulong __P((DB *, const char *, char *, u_long, u_long, u_long *));
-void __db_idspace __P((u_int32_t *, int, u_int32_t *, u_int32_t *));
-u_int32_t __db_log2 __P((u_int32_t));
-int __db_util_arg __P((char *, char *, int *, char ***));
-int __db_util_cache __P((DB_ENV *, DB *, u_int32_t *, int *));
-int __db_util_logset __P((const char *, char *));
-void __db_util_siginit __P((void));
-int __db_util_interrupted __P((void));
-void __db_util_sigresend __P((void));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_common_ext_h_ */
diff --git a/libdb/dbinc_auto/crdel_auto.h b/libdb/dbinc_auto/crdel_auto.h
deleted file mode 100644
index bdae193fa..000000000
--- a/libdb/dbinc_auto/crdel_auto.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__crdel_AUTO_H
-#define	__crdel_AUTO_H
-#define	DB___crdel_metasub	142
-typedef struct ___crdel_metasub_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DBT	page;
-	DB_LSN	lsn;
-} __crdel_metasub_args;
-
-#endif
diff --git a/libdb/dbinc_auto/crypto_ext.h b/libdb/dbinc_auto/crypto_ext.h
deleted file mode 100644
index e37a895d9..000000000
--- a/libdb/dbinc_auto/crypto_ext.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_crypto_ext_h_
-#define	_crypto_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __aes_setup __P((DB_ENV *, DB_CIPHER *));
-int __aes_adj_size __P((size_t));
-int __aes_close __P((DB_ENV *, void *));
-int __aes_decrypt __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
-int __aes_encrypt __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
-int __aes_init __P((DB_ENV *, DB_CIPHER *));
-int __crypto_region_init __P((DB_ENV *));
-int __crypto_dbenv_close __P((DB_ENV *));
-int __crypto_algsetup __P((DB_ENV *, DB_CIPHER *, u_int32_t, int));
-int __crypto_decrypt_meta __P((DB_ENV *, DB *, u_int8_t *, int));
-int __db_generate_iv __P((DB_ENV *, u_int32_t *));
-int __db_rijndaelKeySetupEnc __P((u32 *, const u8 *, int));
-int __db_rijndaelKeySetupDec __P((u32 *, const u8 *, int));
-void __db_rijndaelEncrypt __P((u32 *, int, const u8 *, u8 *));
-void __db_rijndaelDecrypt __P((u32 *, int, const u8 *, u8 *));
-void __db_rijndaelEncryptRound __P((const u32 *, int, u8 *, int));
-void __db_rijndaelDecryptRound __P((const u32 *, int, u8 *, int));
-int __db_makeKey __P((keyInstance *, int, int, char *));
-int __db_cipherInit __P((cipherInstance *, int, char *));
-int __db_blockEncrypt __P((cipherInstance *, keyInstance *, BYTE *, size_t, BYTE *));
-int __db_padEncrypt __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *));
-int __db_blockDecrypt __P((cipherInstance *, keyInstance *, BYTE *, size_t, BYTE *));
-int __db_padDecrypt __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *));
-int __db_cipherUpdateRounds __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *, int));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_crypto_ext_h_ */
diff --git a/libdb/dbinc_auto/db_auto.h b/libdb/dbinc_auto/db_auto.h
deleted file mode 100644
index e56f38b38..000000000
--- a/libdb/dbinc_auto/db_auto.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__db_AUTO_H
-#define	__db_AUTO_H
-#define	DB___db_addrem	41
-typedef struct ___db_addrem_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	u_int32_t	indx;
-	u_int32_t	nbytes;
-	DBT	hdr;
-	DBT	dbt;
-	DB_LSN	pagelsn;
-} __db_addrem_args;
-
-#define	DB___db_big	43
-typedef struct ___db_big_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	db_pgno_t	prev_pgno;
-	db_pgno_t	next_pgno;
-	DBT	dbt;
-	DB_LSN	pagelsn;
-	DB_LSN	prevlsn;
-	DB_LSN	nextlsn;
-} __db_big_args;
-
-#define	DB___db_ovref	44
-typedef struct ___db_ovref_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	int32_t	adjust;
-	DB_LSN	lsn;
-} __db_ovref_args;
-
-#define	DB___db_relink	45
-typedef struct ___db_relink_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	lsn;
-	db_pgno_t	prev;
-	DB_LSN	lsn_prev;
-	db_pgno_t	next;
-	DB_LSN	lsn_next;
-} __db_relink_args;
-
-#define	DB___db_debug	47
-typedef struct ___db_debug_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	op;
-	int32_t	fileid;
-	DBT	key;
-	DBT	data;
-	u_int32_t	arg_flags;
-} __db_debug_args;
-
-#define	DB___db_noop	48
-typedef struct ___db_noop_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	prevlsn;
-} __db_noop_args;
-
-#define	DB___db_pg_alloc	49
-typedef struct ___db_pg_alloc_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	DB_LSN	meta_lsn;
-	db_pgno_t	meta_pgno;
-	DB_LSN	page_lsn;
-	db_pgno_t	pgno;
-	u_int32_t	ptype;
-	db_pgno_t	next;
-} __db_pg_alloc_args;
-
-#define	DB___db_pg_free	50
-typedef struct ___db_pg_free_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	meta_lsn;
-	db_pgno_t	meta_pgno;
-	DBT	header;
-	db_pgno_t	next;
-} __db_pg_free_args;
-
-#define	DB___db_cksum	51
-typedef struct ___db_cksum_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-} __db_cksum_args;
-
-#endif
diff --git a/libdb/dbinc_auto/db_ext.h b/libdb/dbinc_auto/db_ext.h
deleted file mode 100644
index 24a13975c..000000000
--- a/libdb/dbinc_auto/db_ext.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_db_ext_h_
-#define	_db_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __crdel_metasub_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
-int __crdel_metasub_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __crdel_metasub_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __crdel_metasub_read __P((DB_ENV *, void *, __crdel_metasub_args **));
-int __crdel_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __crdel_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __crdel_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __crdel_metasub_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_master_open __P((DB *, DB_TXN *, const char *, u_int32_t, int, DB **));
-int __db_master_update __P((DB *, DB *, DB_TXN *, const char *, DBTYPE, mu_action, const char *, u_int32_t));
-int __db_dbenv_setup __P((DB *, DB_TXN *, const char *, u_int32_t, u_int32_t));
-int __db_close __P((DB *, u_int32_t));
-int __db_close_i __P((DB *, DB_TXN *, u_int32_t));
-int __db_refresh __P((DB *, DB_TXN *, u_int32_t));
-int __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
-int __db_backup_name __P((DB_ENV *, const char *, DB_TXN *, char **));
-DB *__dblist_get __P((DB_ENV *, u_int32_t));
-#if CONFIG_TEST
-int __db_testcopy __P((DB_ENV *, DB *, const char *));
-#endif
-int __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-int __db_icursor __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, u_int32_t, DBC **));
-int __db_cprint __P((DB *));
-int __db_fd __P((DB *, int *));
-int __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __db_delete __P((DB *, DB_TXN *, DBT *, u_int32_t));
-int __db_sync __P((DB *, u_int32_t));
-int __db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-int __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-int __db_addrem_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, const DBT *, const DBT *, DB_LSN *));
-int __db_addrem_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_addrem_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_addrem_read __P((DB_ENV *, void *, __db_addrem_args **));
-int __db_big_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *, DB_LSN *, DB_LSN *));
-int __db_big_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_big_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_big_read __P((DB_ENV *, void *, __db_big_args **));
-int __db_ovref_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, int32_t, DB_LSN *));
-int __db_ovref_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_ovref_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_ovref_read __P((DB_ENV *, void *, __db_ovref_args **));
-int __db_relink_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
-int __db_relink_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_relink_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_relink_read __P((DB_ENV *, void *, __db_relink_args **));
-int __db_debug_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, int32_t, const DBT *, const DBT *, u_int32_t));
-int __db_debug_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_debug_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_debug_read __P((DB_ENV *, void *, __db_debug_args **));
-int __db_noop_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *));
-int __db_noop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_noop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_noop_read __P((DB_ENV *, void *, __db_noop_args **));
-int __db_pg_alloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
-int __db_pg_alloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_alloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_alloc_read __P((DB_ENV *, void *, __db_pg_alloc_args **));
-int __db_pg_free_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, db_pgno_t));
-int __db_pg_free_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_free_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_free_read __P((DB_ENV *, void *, __db_pg_free_args **));
-int __db_cksum_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
-int __db_cksum_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_cksum_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_cksum_read __P((DB_ENV *, void *, __db_cksum_args **));
-int __db_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_c_close __P((DBC *));
-int __db_c_destroy __P((DBC *));
-int __db_c_count __P((DBC *, db_recno_t *, u_int32_t));
-int __db_c_del __P((DBC *, u_int32_t));
-int __db_c_dup __P((DBC *, DBC **, u_int32_t));
-int __db_c_idup __P((DBC *, DBC **, u_int32_t));
-int __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
-int __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_duperr __P((DB *, u_int32_t));
-int __db_c_secondary_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __db_c_del_primary __P((DBC *));
-DB *__db_s_first __P((DB *));
-int __db_s_next __P((DB **));
-int __db_s_done __P((DB *));
-u_int32_t __db_partsize __P((u_int32_t, DBT *));
-int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *));
-int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *));
-void __db_metaswap __P((PAGE *));
-int __db_byteswap __P((DB_ENV *, DB *, db_pgno_t, PAGE *, size_t, int));
-int __db_dispatch __P((DB_ENV *, int (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)), size_t, DBT *, DB_LSN *, db_recops, void *));
-int __db_add_recovery __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));
-int __db_txnlist_init __P((DB_ENV *, u_int32_t, u_int32_t, DB_LSN *, void *));
-int __db_txnlist_add __P((DB_ENV *, void *, u_int32_t, int32_t, DB_LSN *));
-int __db_txnlist_remove __P((DB_ENV *, void *, u_int32_t));
-void __db_txnlist_ckp __P((DB_ENV *, void *, DB_LSN *));
-void __db_txnlist_end __P((DB_ENV *, void *));
-int __db_txnlist_find __P((DB_ENV *, void *, u_int32_t));
-int __db_txnlist_update __P((DB_ENV *, void *, u_int32_t, u_int32_t, DB_LSN *));
-int __db_txnlist_gen __P((DB_ENV *, void *, int, u_int32_t, u_int32_t));
-int __db_txnlist_lsnadd __P((DB_ENV *, void *, DB_LSN *, u_int32_t));
-int __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *));
-int __db_add_limbo __P((DB_ENV *, void *, int32_t, db_pgno_t, int32_t));
-int __db_do_the_limbo __P((DB_ENV *, DB_TXN *, DB_TXN *, DB_TXNHEAD *));
-void __db_txnlist_print __P((void *));
-int __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t));
-int __db_pitem __P((DBC *, PAGE *, u_int32_t, u_int32_t, DBT *, DBT *));
-int __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int));
-int __db_cursorchk __P((const DB *, u_int32_t));
-int __db_ccountchk __P((const DB *, u_int32_t, int));
-int __db_cdelchk __P((const DB *, u_int32_t, int));
-int __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
-int __db_cputchk __P((const DB *, const DBT *, DBT *, u_int32_t, int));
-int __db_pgetchk __P((const DB *, const DBT *, DBT *, DBT *, u_int32_t));
-int __db_cpgetchk __P((const DB *, DBT *, DBT *, DBT *, u_int32_t, int));
-int __db_delchk __P((const DB *, DBT *, u_int32_t));
-int __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
-int __db_joinchk __P((const DB *, DBC * const *, u_int32_t));
-int __db_joingetchk __P((const DB *, DBT *, u_int32_t));
-int __db_putchk __P((const DB *, DBT *, const DBT *, u_int32_t, int));
-int __db_statchk __P((const DB *, u_int32_t));
-int __db_syncchk __P((const DB *, u_int32_t));
-int __db_secondary_corrupt __P((DB *));
-int __db_associatechk __P((DB *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-int __db_txn_auto __P((DB *, DB_TXN **));
-int __db_join __P((DB *, DBC **, DBC **, u_int32_t));
-int __db_new __P((DBC *, u_int32_t, PAGE **));
-int __db_free __P((DBC *, PAGE *));
-int __db_lprint __P((DBC *));
-int __db_lget __P((DBC *, int, db_pgno_t, db_lockmode_t, u_int32_t, DB_LOCK *));
-int __db_lput __P((DBC *, DB_LOCK *));
-int __dbh_am_chk __P((DB *, u_int32_t));
-int  __db_set_lorder __P((DB *, int));
-int __db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
-int __db_dbopen __P((DB *, DB_TXN *, const char *, const char *, u_int32_t, int, db_pgno_t));
-int __db_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __db_init_subdb __P((DB *, DB *, const char *, DB_TXN *));
-int __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
-int __db_meta_setup __P((DB_ENV *, DB *, const char *, DBMETA *, u_int32_t, int));
-int __db_goff __P((DB *, DBT *, u_int32_t, db_pgno_t, void **, u_int32_t *));
-int __db_poff __P((DBC *, const DBT *, db_pgno_t *));
-int __db_ovref __P((DBC *, db_pgno_t, int32_t));
-int __db_doff __P((DBC *, db_pgno_t));
-int __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
-int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __db_vrfy_ovfl_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t));
-int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void **, u_int32_t));
-void __db_loadme __P((void));
-int __db_dump __P((DB *, char *, char *));
-void __db_inmemdbflags __P((u_int32_t, void *, void (*)(u_int32_t, const FN *, void *)));
-int __db_prnpage __P((DB *, db_pgno_t, FILE *));
-int __db_prpage __P((DB *, PAGE *, FILE *, u_int32_t));
-void __db_pr __P((u_int8_t *, u_int32_t, FILE *));
-int __db_prdbt __P((DBT *, int, const char *, void *, int (*)(void *, const void *), int, VRFY_DBINFO *));
-void __db_prflags __P((u_int32_t, const FN *, void *));
-const char * __db_dbtype_to_string __P((DBTYPE));
-int	__db_prheader __P((DB *, char *, int, int, void *, int (*)(void *, const void *), VRFY_DBINFO *, db_pgno_t));
-int __db_prfooter __P((void *, int (*)(void *, const void *)));
-int __db_addrem_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_big_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_ovref_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_relink_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_debug_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_noop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_alloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_free_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_cksum_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_traverse_big __P((DB *, db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
-int __db_reclaim_callback __P((DB *, PAGE *, void *, int *));
-int __db_truncate_callback __P((DB *, PAGE *, void *, int *));
-int __dbenv_dbremove __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int32_t));
-int __db_remove __P((DB *, const char *, const char *, u_int32_t));
-int __db_remove_i __P((DB *, DB_TXN *, const char *, const char *));
-int __dbenv_dbrename __P((DB_ENV *, DB_TXN *, const char *, const char *, const char *, u_int32_t));
-int __db_rename __P((DB *, const char *, const char *, const char *, u_int32_t));
-int __db_rename_i __P((DB *, DB_TXN *, const char *, const char *, const char *));
-int __db_ret __P((DB *, PAGE *, u_int32_t, DBT *, void **, u_int32_t *));
-int __db_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *));
-int __db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
-int __db_upgrade __P((DB *, const char *, u_int32_t));
-int __db_lastpgno __P((DB *, char *, DB_FH *, db_pgno_t *));
-int __db_31_offdup __P((DB *, char *, DB_FH *, int, db_pgno_t *));
-int __db_verify __P((DB *, const char *, const char *, FILE *, u_int32_t));
-int  __db_verify_callback __P((void *, const void *));
-int __db_verify_internal __P((DB *, const char *, const char *, void *, int (*)(void *, const void *), u_int32_t));
-int __db_vrfy_datapage __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __db_vrfy_meta __P((DB *, VRFY_DBINFO *, DBMETA *, db_pgno_t, u_int32_t));
-void __db_vrfy_struct_feedback __P((DB *, VRFY_DBINFO *));
-int __db_vrfy_inpitem __P((DB *, PAGE *, db_pgno_t, u_int32_t, int, u_int32_t, u_int32_t *, u_int32_t *));
-int __db_vrfy_duptype __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-int __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void *, int (*)(void *, const void *), u_int32_t));
-int __db_vrfy_dbinfo_create __P((DB_ENV *, u_int32_t, VRFY_DBINFO **));
-int __db_vrfy_dbinfo_destroy __P((DB_ENV *, VRFY_DBINFO *));
-int __db_vrfy_getpageinfo __P((VRFY_DBINFO *, db_pgno_t, VRFY_PAGEINFO **));
-int __db_vrfy_putpageinfo __P((DB_ENV *, VRFY_DBINFO *, VRFY_PAGEINFO *));
-int __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **));
-int __db_vrfy_pgset_get __P((DB *, db_pgno_t, int *));
-int __db_vrfy_pgset_inc __P((DB *, db_pgno_t));
-int __db_vrfy_pgset_dec __P((DB *, db_pgno_t));
-int __db_vrfy_pgset_next __P((DBC *, db_pgno_t *));
-int __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **));
-int __db_vrfy_childput __P((VRFY_DBINFO *, db_pgno_t, VRFY_CHILDINFO *));
-int __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **));
-int __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **));
-int __db_vrfy_ccclose __P((DBC *));
-int  __db_salvage_init __P((VRFY_DBINFO *));
-void  __db_salvage_destroy __P((VRFY_DBINFO *));
-int __db_salvage_getnext __P((VRFY_DBINFO *, db_pgno_t *, u_int32_t *));
-int __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t));
-int __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t));
-int __db_salvage_markneeded __P((VRFY_DBINFO *, db_pgno_t, u_int32_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_db_ext_h_ */
diff --git a/libdb/dbinc_auto/db_server.h b/libdb/dbinc_auto/db_server.h
deleted file mode 100644
index 3409eed1a..000000000
--- a/libdb/dbinc_auto/db_server.h
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _DB_SERVER_H_RPCGEN
-#define	_DB_SERVER_H_RPCGEN
-
-
-struct __env_cachesize_msg {
-	u_int dbenvcl_id;
-	u_int gbytes;
-	u_int bytes;
-	u_int ncache;
-};
-typedef struct __env_cachesize_msg __env_cachesize_msg;
-
-struct __env_cachesize_reply {
-	int status;
-};
-typedef struct __env_cachesize_reply __env_cachesize_reply;
-
-struct __env_close_msg {
-	u_int dbenvcl_id;
-	u_int flags;
-};
-typedef struct __env_close_msg __env_close_msg;
-
-struct __env_close_reply {
-	int status;
-};
-typedef struct __env_close_reply __env_close_reply;
-
-struct __env_create_msg {
-	u_int timeout;
-};
-typedef struct __env_create_msg __env_create_msg;
-
-struct __env_create_reply {
-	int status;
-	u_int envcl_id;
-};
-typedef struct __env_create_reply __env_create_reply;
-
-struct __env_dbremove_msg {
-	u_int dbenvcl_id;
-	u_int txnpcl_id;
-	char *name;
-	char *subdb;
-	u_int flags;
-};
-typedef struct __env_dbremove_msg __env_dbremove_msg;
-
-struct __env_dbremove_reply {
-	int status;
-};
-typedef struct __env_dbremove_reply __env_dbremove_reply;
-
-struct __env_dbrename_msg {
-	u_int dbenvcl_id;
-	u_int txnpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int flags;
-};
-typedef struct __env_dbrename_msg __env_dbrename_msg;
-
-struct __env_dbrename_reply {
-	int status;
-};
-typedef struct __env_dbrename_reply __env_dbrename_reply;
-
-struct __env_encrypt_msg {
-	u_int dbenvcl_id;
-	char *passwd;
-	u_int flags;
-};
-typedef struct __env_encrypt_msg __env_encrypt_msg;
-
-struct __env_encrypt_reply {
-	int status;
-};
-typedef struct __env_encrypt_reply __env_encrypt_reply;
-
-struct __env_flags_msg {
-	u_int dbenvcl_id;
-	u_int flags;
-	u_int onoff;
-};
-typedef struct __env_flags_msg __env_flags_msg;
-
-struct __env_flags_reply {
-	int status;
-};
-typedef struct __env_flags_reply __env_flags_reply;
-
-struct __env_open_msg {
-	u_int dbenvcl_id;
-	char *home;
-	u_int flags;
-	u_int mode;
-};
-typedef struct __env_open_msg __env_open_msg;
-
-struct __env_open_reply {
-	int status;
-	u_int envcl_id;
-};
-typedef struct __env_open_reply __env_open_reply;
-
-struct __env_remove_msg {
-	u_int dbenvcl_id;
-	char *home;
-	u_int flags;
-};
-typedef struct __env_remove_msg __env_remove_msg;
-
-struct __env_remove_reply {
-	int status;
-};
-typedef struct __env_remove_reply __env_remove_reply;
-
-struct __txn_abort_msg {
-	u_int txnpcl_id;
-};
-typedef struct __txn_abort_msg __txn_abort_msg;
-
-struct __txn_abort_reply {
-	int status;
-};
-typedef struct __txn_abort_reply __txn_abort_reply;
-
-struct __txn_begin_msg {
-	u_int dbenvcl_id;
-	u_int parentcl_id;
-	u_int flags;
-};
-typedef struct __txn_begin_msg __txn_begin_msg;
-
-struct __txn_begin_reply {
-	int status;
-	u_int txnidcl_id;
-};
-typedef struct __txn_begin_reply __txn_begin_reply;
-
-struct __txn_commit_msg {
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __txn_commit_msg __txn_commit_msg;
-
-struct __txn_commit_reply {
-	int status;
-};
-typedef struct __txn_commit_reply __txn_commit_reply;
-
-struct __txn_discard_msg {
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __txn_discard_msg __txn_discard_msg;
-
-struct __txn_discard_reply {
-	int status;
-};
-typedef struct __txn_discard_reply __txn_discard_reply;
-
-struct __txn_prepare_msg {
-	u_int txnpcl_id;
-	char gid[128];
-};
-typedef struct __txn_prepare_msg __txn_prepare_msg;
-
-struct __txn_prepare_reply {
-	int status;
-};
-typedef struct __txn_prepare_reply __txn_prepare_reply;
-
-struct __txn_recover_msg {
-	u_int dbenvcl_id;
-	u_int count;
-	u_int flags;
-};
-typedef struct __txn_recover_msg __txn_recover_msg;
-
-struct __txn_recover_reply {
-	int status;
-	struct {
-		u_int txn_len;
-		u_int *txn_val;
-	} txn;
-	struct {
-		u_int gid_len;
-		char *gid_val;
-	} gid;
-	u_int retcount;
-};
-typedef struct __txn_recover_reply __txn_recover_reply;
-
-struct __db_associate_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int sdbpcl_id;
-	u_int flags;
-};
-typedef struct __db_associate_msg __db_associate_msg;
-
-struct __db_associate_reply {
-	int status;
-};
-typedef struct __db_associate_reply __db_associate_reply;
-
-struct __db_bt_maxkey_msg {
-	u_int dbpcl_id;
-	u_int maxkey;
-};
-typedef struct __db_bt_maxkey_msg __db_bt_maxkey_msg;
-
-struct __db_bt_maxkey_reply {
-	int status;
-};
-typedef struct __db_bt_maxkey_reply __db_bt_maxkey_reply;
-
-struct __db_bt_minkey_msg {
-	u_int dbpcl_id;
-	u_int minkey;
-};
-typedef struct __db_bt_minkey_msg __db_bt_minkey_msg;
-
-struct __db_bt_minkey_reply {
-	int status;
-};
-typedef struct __db_bt_minkey_reply __db_bt_minkey_reply;
-
-struct __db_close_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_close_msg __db_close_msg;
-
-struct __db_close_reply {
-	int status;
-};
-typedef struct __db_close_reply __db_close_reply;
-
-struct __db_create_msg {
-	u_int dbenvcl_id;
-	u_int flags;
-};
-typedef struct __db_create_msg __db_create_msg;
-
-struct __db_create_reply {
-	int status;
-	u_int dbcl_id;
-};
-typedef struct __db_create_reply __db_create_reply;
-
-struct __db_del_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int flags;
-};
-typedef struct __db_del_msg __db_del_msg;
-
-struct __db_del_reply {
-	int status;
-};
-typedef struct __db_del_reply __db_del_reply;
-
-struct __db_encrypt_msg {
-	u_int dbpcl_id;
-	char *passwd;
-	u_int flags;
-};
-typedef struct __db_encrypt_msg __db_encrypt_msg;
-
-struct __db_encrypt_reply {
-	int status;
-};
-typedef struct __db_encrypt_reply __db_encrypt_reply;
-
-struct __db_extentsize_msg {
-	u_int dbpcl_id;
-	u_int extentsize;
-};
-typedef struct __db_extentsize_msg __db_extentsize_msg;
-
-struct __db_extentsize_reply {
-	int status;
-};
-typedef struct __db_extentsize_reply __db_extentsize_reply;
-
-struct __db_flags_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_flags_msg __db_flags_msg;
-
-struct __db_flags_reply {
-	int status;
-};
-typedef struct __db_flags_reply __db_flags_reply;
-
-struct __db_get_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __db_get_msg __db_get_msg;
-
-struct __db_get_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __db_get_reply __db_get_reply;
-
-struct __db_h_ffactor_msg {
-	u_int dbpcl_id;
-	u_int ffactor;
-};
-typedef struct __db_h_ffactor_msg __db_h_ffactor_msg;
-
-struct __db_h_ffactor_reply {
-	int status;
-};
-typedef struct __db_h_ffactor_reply __db_h_ffactor_reply;
-
-struct __db_h_nelem_msg {
-	u_int dbpcl_id;
-	u_int nelem;
-};
-typedef struct __db_h_nelem_msg __db_h_nelem_msg;
-
-struct __db_h_nelem_reply {
-	int status;
-};
-typedef struct __db_h_nelem_reply __db_h_nelem_reply;
-
-struct __db_key_range_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int flags;
-};
-typedef struct __db_key_range_msg __db_key_range_msg;
-
-struct __db_key_range_reply {
-	int status;
-	double less;
-	double equal;
-	double greater;
-};
-typedef struct __db_key_range_reply __db_key_range_reply;
-
-struct __db_lorder_msg {
-	u_int dbpcl_id;
-	u_int lorder;
-};
-typedef struct __db_lorder_msg __db_lorder_msg;
-
-struct __db_lorder_reply {
-	int status;
-};
-typedef struct __db_lorder_reply __db_lorder_reply;
-
-struct __db_open_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	char *name;
-	char *subdb;
-	u_int type;
-	u_int flags;
-	u_int mode;
-};
-typedef struct __db_open_msg __db_open_msg;
-
-struct __db_open_reply {
-	int status;
-	u_int dbcl_id;
-	u_int type;
-	u_int dbflags;
-	u_int lorder;
-};
-typedef struct __db_open_reply __db_open_reply;
-
-struct __db_pagesize_msg {
-	u_int dbpcl_id;
-	u_int pagesize;
-};
-typedef struct __db_pagesize_msg __db_pagesize_msg;
-
-struct __db_pagesize_reply {
-	int status;
-};
-typedef struct __db_pagesize_reply __db_pagesize_reply;
-
-struct __db_pget_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int skeydlen;
-	u_int skeydoff;
-	u_int skeyulen;
-	u_int skeyflags;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	u_int pkeydlen;
-	u_int pkeydoff;
-	u_int pkeyulen;
-	u_int pkeyflags;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __db_pget_msg __db_pget_msg;
-
-struct __db_pget_reply {
-	int status;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __db_pget_reply __db_pget_reply;
-
-struct __db_put_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __db_put_msg __db_put_msg;
-
-struct __db_put_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-};
-typedef struct __db_put_reply __db_put_reply;
-
-struct __db_re_delim_msg {
-	u_int dbpcl_id;
-	u_int delim;
-};
-typedef struct __db_re_delim_msg __db_re_delim_msg;
-
-struct __db_re_delim_reply {
-	int status;
-};
-typedef struct __db_re_delim_reply __db_re_delim_reply;
-
-struct __db_re_len_msg {
-	u_int dbpcl_id;
-	u_int len;
-};
-typedef struct __db_re_len_msg __db_re_len_msg;
-
-struct __db_re_len_reply {
-	int status;
-};
-typedef struct __db_re_len_reply __db_re_len_reply;
-
-struct __db_re_pad_msg {
-	u_int dbpcl_id;
-	u_int pad;
-};
-typedef struct __db_re_pad_msg __db_re_pad_msg;
-
-struct __db_re_pad_reply {
-	int status;
-};
-typedef struct __db_re_pad_reply __db_re_pad_reply;
-
-struct __db_remove_msg {
-	u_int dbpcl_id;
-	char *name;
-	char *subdb;
-	u_int flags;
-};
-typedef struct __db_remove_msg __db_remove_msg;
-
-struct __db_remove_reply {
-	int status;
-};
-typedef struct __db_remove_reply __db_remove_reply;
-
-struct __db_rename_msg {
-	u_int dbpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int flags;
-};
-typedef struct __db_rename_msg __db_rename_msg;
-
-struct __db_rename_reply {
-	int status;
-};
-typedef struct __db_rename_reply __db_rename_reply;
-
-struct __db_stat_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_stat_msg __db_stat_msg;
-
-struct __db_stat_reply {
-	int status;
-	struct {
-		u_int stats_len;
-		u_int *stats_val;
-	} stats;
-};
-typedef struct __db_stat_reply __db_stat_reply;
-
-struct __db_sync_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_sync_msg __db_sync_msg;
-
-struct __db_sync_reply {
-	int status;
-};
-typedef struct __db_sync_reply __db_sync_reply;
-
-struct __db_truncate_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __db_truncate_msg __db_truncate_msg;
-
-struct __db_truncate_reply {
-	int status;
-	u_int count;
-};
-typedef struct __db_truncate_reply __db_truncate_reply;
-
-struct __db_cursor_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __db_cursor_msg __db_cursor_msg;
-
-struct __db_cursor_reply {
-	int status;
-	u_int dbcidcl_id;
-};
-typedef struct __db_cursor_reply __db_cursor_reply;
-
-struct __db_join_msg {
-	u_int dbpcl_id;
-	struct {
-		u_int curs_len;
-		u_int *curs_val;
-	} curs;
-	u_int flags;
-};
-typedef struct __db_join_msg __db_join_msg;
-
-struct __db_join_reply {
-	int status;
-	u_int dbcidcl_id;
-};
-typedef struct __db_join_reply __db_join_reply;
-
-struct __dbc_close_msg {
-	u_int dbccl_id;
-};
-typedef struct __dbc_close_msg __dbc_close_msg;
-
-struct __dbc_close_reply {
-	int status;
-};
-typedef struct __dbc_close_reply __dbc_close_reply;
-
-struct __dbc_count_msg {
-	u_int dbccl_id;
-	u_int flags;
-};
-typedef struct __dbc_count_msg __dbc_count_msg;
-
-struct __dbc_count_reply {
-	int status;
-	u_int dupcount;
-};
-typedef struct __dbc_count_reply __dbc_count_reply;
-
-struct __dbc_del_msg {
-	u_int dbccl_id;
-	u_int flags;
-};
-typedef struct __dbc_del_msg __dbc_del_msg;
-
-struct __dbc_del_reply {
-	int status;
-};
-typedef struct __dbc_del_reply __dbc_del_reply;
-
-struct __dbc_dup_msg {
-	u_int dbccl_id;
-	u_int flags;
-};
-typedef struct __dbc_dup_msg __dbc_dup_msg;
-
-struct __dbc_dup_reply {
-	int status;
-	u_int dbcidcl_id;
-};
-typedef struct __dbc_dup_reply __dbc_dup_reply;
-
-struct __dbc_get_msg {
-	u_int dbccl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __dbc_get_msg __dbc_get_msg;
-
-struct __dbc_get_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __dbc_get_reply __dbc_get_reply;
-
-struct __dbc_pget_msg {
-	u_int dbccl_id;
-	u_int skeydlen;
-	u_int skeydoff;
-	u_int skeyulen;
-	u_int skeyflags;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	u_int pkeydlen;
-	u_int pkeydoff;
-	u_int pkeyulen;
-	u_int pkeyflags;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __dbc_pget_msg __dbc_pget_msg;
-
-struct __dbc_pget_reply {
-	int status;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __dbc_pget_reply __dbc_pget_reply;
-
-struct __dbc_put_msg {
-	u_int dbccl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __dbc_put_msg __dbc_put_msg;
-
-struct __dbc_put_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-};
-typedef struct __dbc_put_reply __dbc_put_reply;
-
-#define	__DB_env_cachesize ((unsigned long)(1))
-extern  __env_cachesize_reply * __db_env_cachesize_4001();
-#define	__DB_env_close ((unsigned long)(2))
-extern  __env_close_reply * __db_env_close_4001();
-#define	__DB_env_create ((unsigned long)(3))
-extern  __env_create_reply * __db_env_create_4001();
-#define	__DB_env_dbremove ((unsigned long)(4))
-extern  __env_dbremove_reply * __db_env_dbremove_4001();
-#define	__DB_env_dbrename ((unsigned long)(5))
-extern  __env_dbrename_reply * __db_env_dbrename_4001();
-#define	__DB_env_encrypt ((unsigned long)(6))
-extern  __env_encrypt_reply * __db_env_encrypt_4001();
-#define	__DB_env_flags ((unsigned long)(7))
-extern  __env_flags_reply * __db_env_flags_4001();
-#define	__DB_env_open ((unsigned long)(8))
-extern  __env_open_reply * __db_env_open_4001();
-#define	__DB_env_remove ((unsigned long)(9))
-extern  __env_remove_reply * __db_env_remove_4001();
-#define	__DB_txn_abort ((unsigned long)(10))
-extern  __txn_abort_reply * __db_txn_abort_4001();
-#define	__DB_txn_begin ((unsigned long)(11))
-extern  __txn_begin_reply * __db_txn_begin_4001();
-#define	__DB_txn_commit ((unsigned long)(12))
-extern  __txn_commit_reply * __db_txn_commit_4001();
-#define	__DB_txn_discard ((unsigned long)(13))
-extern  __txn_discard_reply * __db_txn_discard_4001();
-#define	__DB_txn_prepare ((unsigned long)(14))
-extern  __txn_prepare_reply * __db_txn_prepare_4001();
-#define	__DB_txn_recover ((unsigned long)(15))
-extern  __txn_recover_reply * __db_txn_recover_4001();
-#define	__DB_db_associate ((unsigned long)(16))
-extern  __db_associate_reply * __db_db_associate_4001();
-#define	__DB_db_bt_maxkey ((unsigned long)(17))
-extern  __db_bt_maxkey_reply * __db_db_bt_maxkey_4001();
-#define	__DB_db_bt_minkey ((unsigned long)(18))
-extern  __db_bt_minkey_reply * __db_db_bt_minkey_4001();
-#define	__DB_db_close ((unsigned long)(19))
-extern  __db_close_reply * __db_db_close_4001();
-#define	__DB_db_create ((unsigned long)(20))
-extern  __db_create_reply * __db_db_create_4001();
-#define	__DB_db_del ((unsigned long)(21))
-extern  __db_del_reply * __db_db_del_4001();
-#define	__DB_db_encrypt ((unsigned long)(22))
-extern  __db_encrypt_reply * __db_db_encrypt_4001();
-#define	__DB_db_extentsize ((unsigned long)(23))
-extern  __db_extentsize_reply * __db_db_extentsize_4001();
-#define	__DB_db_flags ((unsigned long)(24))
-extern  __db_flags_reply * __db_db_flags_4001();
-#define	__DB_db_get ((unsigned long)(25))
-extern  __db_get_reply * __db_db_get_4001();
-#define	__DB_db_h_ffactor ((unsigned long)(26))
-extern  __db_h_ffactor_reply * __db_db_h_ffactor_4001();
-#define	__DB_db_h_nelem ((unsigned long)(27))
-extern  __db_h_nelem_reply * __db_db_h_nelem_4001();
-#define	__DB_db_key_range ((unsigned long)(28))
-extern  __db_key_range_reply * __db_db_key_range_4001();
-#define	__DB_db_lorder ((unsigned long)(29))
-extern  __db_lorder_reply * __db_db_lorder_4001();
-#define	__DB_db_open ((unsigned long)(30))
-extern  __db_open_reply * __db_db_open_4001();
-#define	__DB_db_pagesize ((unsigned long)(31))
-extern  __db_pagesize_reply * __db_db_pagesize_4001();
-#define	__DB_db_pget ((unsigned long)(32))
-extern  __db_pget_reply * __db_db_pget_4001();
-#define	__DB_db_put ((unsigned long)(33))
-extern  __db_put_reply * __db_db_put_4001();
-#define	__DB_db_re_delim ((unsigned long)(34))
-extern  __db_re_delim_reply * __db_db_re_delim_4001();
-#define	__DB_db_re_len ((unsigned long)(35))
-extern  __db_re_len_reply * __db_db_re_len_4001();
-#define	__DB_db_re_pad ((unsigned long)(36))
-extern  __db_re_pad_reply * __db_db_re_pad_4001();
-#define	__DB_db_remove ((unsigned long)(37))
-extern  __db_remove_reply * __db_db_remove_4001();
-#define	__DB_db_rename ((unsigned long)(38))
-extern  __db_rename_reply * __db_db_rename_4001();
-#define	__DB_db_stat ((unsigned long)(39))
-extern  __db_stat_reply * __db_db_stat_4001();
-#define	__DB_db_sync ((unsigned long)(40))
-extern  __db_sync_reply * __db_db_sync_4001();
-#define	__DB_db_truncate ((unsigned long)(41))
-extern  __db_truncate_reply * __db_db_truncate_4001();
-#define	__DB_db_cursor ((unsigned long)(42))
-extern  __db_cursor_reply * __db_db_cursor_4001();
-#define	__DB_db_join ((unsigned long)(43))
-extern  __db_join_reply * __db_db_join_4001();
-#define	__DB_dbc_close ((unsigned long)(44))
-extern  __dbc_close_reply * __db_dbc_close_4001();
-#define	__DB_dbc_count ((unsigned long)(45))
-extern  __dbc_count_reply * __db_dbc_count_4001();
-#define	__DB_dbc_del ((unsigned long)(46))
-extern  __dbc_del_reply * __db_dbc_del_4001();
-#define	__DB_dbc_dup ((unsigned long)(47))
-extern  __dbc_dup_reply * __db_dbc_dup_4001();
-#define	__DB_dbc_get ((unsigned long)(48))
-extern  __dbc_get_reply * __db_dbc_get_4001();
-#define	__DB_dbc_pget ((unsigned long)(49))
-extern  __dbc_pget_reply * __db_dbc_pget_4001();
-#define	__DB_dbc_put ((unsigned long)(50))
-extern  __dbc_put_reply * __db_dbc_put_4001();
-extern int db_rpc_serverprog_4001_freeresult();
-
-/* the xdr functions */
-extern bool_t xdr___env_cachesize_msg();
-extern bool_t xdr___env_cachesize_reply();
-extern bool_t xdr___env_close_msg();
-extern bool_t xdr___env_close_reply();
-extern bool_t xdr___env_create_msg();
-extern bool_t xdr___env_create_reply();
-extern bool_t xdr___env_dbremove_msg();
-extern bool_t xdr___env_dbremove_reply();
-extern bool_t xdr___env_dbrename_msg();
-extern bool_t xdr___env_dbrename_reply();
-extern bool_t xdr___env_encrypt_msg();
-extern bool_t xdr___env_encrypt_reply();
-extern bool_t xdr___env_flags_msg();
-extern bool_t xdr___env_flags_reply();
-extern bool_t xdr___env_open_msg();
-extern bool_t xdr___env_open_reply();
-extern bool_t xdr___env_remove_msg();
-extern bool_t xdr___env_remove_reply();
-extern bool_t xdr___txn_abort_msg();
-extern bool_t xdr___txn_abort_reply();
-extern bool_t xdr___txn_begin_msg();
-extern bool_t xdr___txn_begin_reply();
-extern bool_t xdr___txn_commit_msg();
-extern bool_t xdr___txn_commit_reply();
-extern bool_t xdr___txn_discard_msg();
-extern bool_t xdr___txn_discard_reply();
-extern bool_t xdr___txn_prepare_msg();
-extern bool_t xdr___txn_prepare_reply();
-extern bool_t xdr___txn_recover_msg();
-extern bool_t xdr___txn_recover_reply();
-extern bool_t xdr___db_associate_msg();
-extern bool_t xdr___db_associate_reply();
-extern bool_t xdr___db_bt_maxkey_msg();
-extern bool_t xdr___db_bt_maxkey_reply();
-extern bool_t xdr___db_bt_minkey_msg();
-extern bool_t xdr___db_bt_minkey_reply();
-extern bool_t xdr___db_close_msg();
-extern bool_t xdr___db_close_reply();
-extern bool_t xdr___db_create_msg();
-extern bool_t xdr___db_create_reply();
-extern bool_t xdr___db_del_msg();
-extern bool_t xdr___db_del_reply();
-extern bool_t xdr___db_encrypt_msg();
-extern bool_t xdr___db_encrypt_reply();
-extern bool_t xdr___db_extentsize_msg();
-extern bool_t xdr___db_extentsize_reply();
-extern bool_t xdr___db_flags_msg();
-extern bool_t xdr___db_flags_reply();
-extern bool_t xdr___db_get_msg();
-extern bool_t xdr___db_get_reply();
-extern bool_t xdr___db_h_ffactor_msg();
-extern bool_t xdr___db_h_ffactor_reply();
-extern bool_t xdr___db_h_nelem_msg();
-extern bool_t xdr___db_h_nelem_reply();
-extern bool_t xdr___db_key_range_msg();
-extern bool_t xdr___db_key_range_reply();
-extern bool_t xdr___db_lorder_msg();
-extern bool_t xdr___db_lorder_reply();
-extern bool_t xdr___db_open_msg();
-extern bool_t xdr___db_open_reply();
-extern bool_t xdr___db_pagesize_msg();
-extern bool_t xdr___db_pagesize_reply();
-extern bool_t xdr___db_pget_msg();
-extern bool_t xdr___db_pget_reply();
-extern bool_t xdr___db_put_msg();
-extern bool_t xdr___db_put_reply();
-extern bool_t xdr___db_re_delim_msg();
-extern bool_t xdr___db_re_delim_reply();
-extern bool_t xdr___db_re_len_msg();
-extern bool_t xdr___db_re_len_reply();
-extern bool_t xdr___db_re_pad_msg();
-extern bool_t xdr___db_re_pad_reply();
-extern bool_t xdr___db_remove_msg();
-extern bool_t xdr___db_remove_reply();
-extern bool_t xdr___db_rename_msg();
-extern bool_t xdr___db_rename_reply();
-extern bool_t xdr___db_stat_msg();
-extern bool_t xdr___db_stat_reply();
-extern bool_t xdr___db_sync_msg();
-extern bool_t xdr___db_sync_reply();
-extern bool_t xdr___db_truncate_msg();
-extern bool_t xdr___db_truncate_reply();
-extern bool_t xdr___db_cursor_msg();
-extern bool_t xdr___db_cursor_reply();
-extern bool_t xdr___db_join_msg();
-extern bool_t xdr___db_join_reply();
-extern bool_t xdr___dbc_close_msg();
-extern bool_t xdr___dbc_close_reply();
-extern bool_t xdr___dbc_count_msg();
-extern bool_t xdr___dbc_count_reply();
-extern bool_t xdr___dbc_del_msg();
-extern bool_t xdr___dbc_del_reply();
-extern bool_t xdr___dbc_dup_msg();
-extern bool_t xdr___dbc_dup_reply();
-extern bool_t xdr___dbc_get_msg();
-extern bool_t xdr___dbc_get_reply();
-extern bool_t xdr___dbc_pget_msg();
-extern bool_t xdr___dbc_pget_reply();
-extern bool_t xdr___dbc_put_msg();
-extern bool_t xdr___dbc_put_reply();
-
-#endif /* !_DB_SERVER_H_RPCGEN */
diff --git a/libdb/dbinc_auto/dbreg_auto.h b/libdb/dbinc_auto/dbreg_auto.h
deleted file mode 100644
index 4d7d4a91b..000000000
--- a/libdb/dbinc_auto/dbreg_auto.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__dbreg_AUTO_H
-#define	__dbreg_AUTO_H
-#define	DB___dbreg_register	2
-typedef struct ___dbreg_register_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	DBT	name;
-	DBT	uid;
-	int32_t	fileid;
-	DBTYPE	ftype;
-	db_pgno_t	meta_pgno;
-	u_int32_t	id;
-} __dbreg_register_args;
-
-#endif
diff --git a/libdb/dbinc_auto/dbreg_ext.h b/libdb/dbinc_auto/dbreg_ext.h
deleted file mode 100644
index eda26206d..000000000
--- a/libdb/dbinc_auto/dbreg_ext.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_dbreg_ext_h_
-#define	_dbreg_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __dbreg_setup __P((DB *, const char *, u_int32_t));
-int __dbreg_teardown __P((DB *));
-int __dbreg_new_id __P((DB *, DB_TXN *));
-int __dbreg_assign_id __P((DB *, int32_t));
-int __dbreg_revoke_id __P((DB *, int));
-int __dbreg_close_id __P((DB *, DB_TXN *));
-int __dbreg_register_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, int32_t, DBTYPE, db_pgno_t, u_int32_t));
-int __dbreg_register_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __dbreg_register_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __dbreg_register_read __P((DB_ENV *, void *, __dbreg_register_args **));
-int __dbreg_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __dbreg_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __dbreg_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __dbreg_register_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
-void __dbreg_rem_dbentry __P((DB_LOG *, int32_t));
-int __dbreg_open_files __P((DB_ENV *));
-int __dbreg_close_files __P((DB_ENV *));
-int __dbreg_nofiles __P((DB_ENV *));
-int __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
-int __dbreg_id_to_db_int __P((DB_ENV *, DB_TXN *, DB **, int32_t, int, int));
-int __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
-int __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **));
-int __dbreg_get_name __P((DB_ENV *, u_int8_t *, char **));
-int __dbreg_do_open __P((DB_ENV *, DB_TXN *, DB_LOG *, u_int8_t *, char *, DBTYPE, int32_t, db_pgno_t, void *, u_int32_t));
-int __dbreg_lazy_id __P((DB *));
-int __dbreg_push_id __P((DB_ENV *, int32_t));
-int __dbreg_pop_id __P((DB_ENV *, int32_t *));
-int __dbreg_pluck_id __P((DB_ENV *, int32_t));
-void __dbreg_print_dblist __P((DB_ENV *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_dbreg_ext_h_ */
diff --git a/libdb/dbinc_auto/env_ext.h b/libdb/dbinc_auto/env_ext.h
deleted file mode 100644
index 4bd0eee4a..000000000
--- a/libdb/dbinc_auto/env_ext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_env_ext_h_
-#define	_env_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void __db_shalloc_init __P((void *, size_t));
-int __db_shalloc_size __P((size_t, size_t));
-int __db_shalloc __P((void *, size_t, size_t, void *));
-void __db_shalloc_free __P((void *, void *));
-size_t __db_shsizeof __P((void *));
-void __db_shalloc_dump __P((void *, FILE *));
-int __db_tablesize __P((u_int32_t));
-void __db_hashinit __P((void *, u_int32_t));
-int __db_fileinit __P((DB_ENV *, DB_FH *, size_t, int));
-int __db_overwrite __P((DB_ENV *, const char *));
-int __db_mi_env __P((DB_ENV *, const char *));
-int __db_mi_open __P((DB_ENV *, const char *, int));
-int __db_env_config __P((DB_ENV *, char *, u_int32_t));
-int __dbenv_open __P((DB_ENV *, const char *, u_int32_t, int));
-int __dbenv_remove __P((DB_ENV *, const char *, u_int32_t));
-int __dbenv_close __P((DB_ENV *, u_int32_t));
-int __db_appname __P((DB_ENV *, APPNAME, const char *, u_int32_t, DB_FH *, char **));
-int __db_home __P((DB_ENV *, const char *, u_int32_t));
-int __db_apprec __P((DB_ENV *, DB_LSN *, u_int32_t));
-int __env_openfiles __P((DB_ENV *, DB_LOGC *, void *, DBT *, DB_LSN *, DB_LSN *, double, int));
-int __db_e_attach __P((DB_ENV *, u_int32_t *));
-int __db_e_detach __P((DB_ENV *, int));
-int __db_e_remove __P((DB_ENV *, u_int32_t));
-int __db_e_stat __P((DB_ENV *, REGENV *, REGION *, int *, u_int32_t));
-int __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
-int __db_r_detach __P((DB_ENV *, REGINFO *, int));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_env_ext_h_ */
diff --git a/libdb/dbinc_auto/ext_185_def.in b/libdb/dbinc_auto/ext_185_def.in
deleted file mode 100644
index 8da68a8df..000000000
--- a/libdb/dbinc_auto/ext_185_def.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_185_DEF_IN_
-#define	_DB_EXT_185_DEF_IN_
-
-#ifdef _DB185_INT_H_
-#define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
-#else
-#define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
-#endif
-
-#endif /* !_DB_EXT_185_DEF_IN_ */
diff --git a/libdb/dbinc_auto/ext_185_prot.in b/libdb/dbinc_auto/ext_185_prot.in
deleted file mode 100644
index dfd8d3d47..000000000
--- a/libdb/dbinc_auto/ext_185_prot.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_185_PROT_IN_
-#define	_DB_EXT_185_PROT_IN_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifdef _DB185_INT_H_
-DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
-#else
-DB *__db185_open __P((const char *, int, int, DBTYPE, const void *));
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_EXT_185_PROT_IN_ */
diff --git a/libdb/dbinc_auto/ext_def.in b/libdb/dbinc_auto/ext_def.in
deleted file mode 100644
index 7bef24656..000000000
--- a/libdb/dbinc_auto/ext_def.in
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_DEF_IN_
-#define	_DB_EXT_DEF_IN_
-
-#define	db_create db_create@DB_VERSION_UNIQUE_NAME@
-#define	db_strerror db_strerror@DB_VERSION_UNIQUE_NAME@
-#define	db_env_create db_env_create@DB_VERSION_UNIQUE_NAME@
-#define	db_version db_version@DB_VERSION_UNIQUE_NAME@
-#define	log_compare log_compare@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_close db_env_set_func_close@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_dirfree db_env_set_func_dirfree@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_dirlist db_env_set_func_dirlist@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_exists db_env_set_func_exists@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_free db_env_set_func_free@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_fsync db_env_set_func_fsync@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_ioinfo db_env_set_func_ioinfo@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_malloc db_env_set_func_malloc@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_map db_env_set_func_map@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_open db_env_set_func_open@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_read db_env_set_func_read@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_realloc db_env_set_func_realloc@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_rename db_env_set_func_rename@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_seek db_env_set_func_seek@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_sleep db_env_set_func_sleep@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_unlink db_env_set_func_unlink@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_unmap db_env_set_func_unmap@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_write db_env_set_func_write@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_yield db_env_set_func_yield@DB_VERSION_UNIQUE_NAME@
-#if DB_DBM_HSEARCH != 0
-#define	__db_ndbm_clearerr __db_ndbm_clearerr@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_close __db_ndbm_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_delete __db_ndbm_delete@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_dirfno __db_ndbm_dirfno@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_error __db_ndbm_error@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_fetch __db_ndbm_fetch@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_firstkey __db_ndbm_firstkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_nextkey __db_ndbm_nextkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_open __db_ndbm_open@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_pagfno __db_ndbm_pagfno@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_rdonly __db_ndbm_rdonly@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_store __db_ndbm_store@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_close __db_dbm_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_dbrdonly __db_dbm_dbrdonly@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_delete __db_dbm_delete@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_dirf __db_dbm_dirf@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_fetch __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_init __db_dbm_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_nextkey __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_pagf __db_dbm_pagf@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_store __db_dbm_store@DB_VERSION_UNIQUE_NAME@
-#endif
-#if DB_DBM_HSEARCH != 0
-#define	__db_hcreate __db_hcreate@DB_VERSION_UNIQUE_NAME@
-#define	__db_hsearch __db_hsearch@DB_VERSION_UNIQUE_NAME@
-#define	__db_hdestroy __db_hdestroy@DB_VERSION_UNIQUE_NAME@
-#endif
-#define db_xa_switch db_xa_switch@DB_VERSION_UNIQUE_NAME@
-
-#endif /* !_DB_EXT_DEF_IN_ */
diff --git a/libdb/dbinc_auto/ext_prot.in b/libdb/dbinc_auto/ext_prot.in
deleted file mode 100644
index 42c77a1f7..000000000
--- a/libdb/dbinc_auto/ext_prot.in
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_PROT_IN_
-#define	_DB_EXT_PROT_IN_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int db_create __P((DB **, DB_ENV *, u_int32_t));
-char *db_strerror __P((int));
-int db_env_create __P((DB_ENV **, u_int32_t));
-char *db_version __P((int *, int *, int *));
-int log_compare __P((const DB_LSN *, const DB_LSN *));
-int db_env_set_func_close __P((int (*)(int)));
-int db_env_set_func_dirfree __P((void (*)(char **, int)));
-int db_env_set_func_dirlist __P((int (*)(const char *, char ***, int *)));
-int db_env_set_func_exists __P((int (*)(const char *, int *)));
-int db_env_set_func_free __P((void (*)(void *)));
-int db_env_set_func_fsync __P((int (*)(int)));
-int db_env_set_func_ioinfo __P((int (*)(const char *, int, u_int32_t *, u_int32_t *, u_int32_t *)));
-int db_env_set_func_malloc __P((void *(*)(size_t)));
-int db_env_set_func_map __P((int (*)(char *, size_t, int, int, void **)));
-int db_env_set_func_open __P((int (*)(const char *, int, ...)));
-int db_env_set_func_read __P((ssize_t (*)(int, void *, size_t)));
-int db_env_set_func_realloc __P((void *(*)(void *, size_t)));
-int db_env_set_func_rename __P((int (*)(const char *, const char *)));
-int db_env_set_func_seek __P((int (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
-int db_env_set_func_sleep __P((int (*)(u_long, u_long)));
-int db_env_set_func_unlink __P((int (*)(const char *)));
-int db_env_set_func_unmap __P((int (*)(void *, size_t)));
-int db_env_set_func_write __P((ssize_t (*)(int, const void *, size_t)));
-int db_env_set_func_yield __P((int (*)(void)));
-int txn_abort __P((DB_TXN *));
-int txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-int txn_commit __P((DB_TXN *, u_int32_t));
-#if DB_DBM_HSEARCH != 0
-int	 __db_ndbm_clearerr __P((DBM *));
-void	 __db_ndbm_close __P((DBM *));
-int	 __db_ndbm_delete __P((DBM *, datum));
-int	 __db_ndbm_dirfno __P((DBM *));
-int	 __db_ndbm_error __P((DBM *));
-datum __db_ndbm_fetch __P((DBM *, datum));
-datum __db_ndbm_firstkey __P((DBM *));
-datum __db_ndbm_nextkey __P((DBM *));
-DBM	*__db_ndbm_open __P((const char *, int, int));
-int	 __db_ndbm_pagfno __P((DBM *));
-int	 __db_ndbm_rdonly __P((DBM *));
-int	 __db_ndbm_store __P((DBM *, datum, datum, int));
-int	 __db_dbm_close __P((void));
-int	 __db_dbm_dbrdonly __P((void));
-int	 __db_dbm_delete __P((datum));
-int	 __db_dbm_dirf __P((void));
-datum __db_dbm_fetch __P((datum));
-datum __db_dbm_firstkey __P((void));
-int	 __db_dbm_init __P((char *));
-datum __db_dbm_nextkey __P((datum));
-int	 __db_dbm_pagf __P((void));
-int	 __db_dbm_store __P((datum, datum));
-#endif
-#if DB_DBM_HSEARCH != 0
-int __db_hcreate __P((size_t));
-ENTRY *__db_hsearch __P((ENTRY, ACTION));
-void __db_hdestroy __P((void));
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_EXT_PROT_IN_ */
diff --git a/libdb/dbinc_auto/fileops_auto.h b/libdb/dbinc_auto/fileops_auto.h
deleted file mode 100644
index ee1f58616..000000000
--- a/libdb/dbinc_auto/fileops_auto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__fop_AUTO_H
-#define	__fop_AUTO_H
-#define	DB___fop_create	143
-typedef struct ___fop_create_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	name;
-	u_int32_t	appname;
-	u_int32_t	mode;
-} __fop_create_args;
-
-#define	DB___fop_remove	144
-typedef struct ___fop_remove_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	name;
-	DBT	fid;
-	u_int32_t	appname;
-} __fop_remove_args;
-
-#define	DB___fop_write	145
-typedef struct ___fop_write_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	name;
-	u_int32_t	appname;
-	u_int32_t	offset;
-	DBT	page;
-	u_int32_t	flag;
-} __fop_write_args;
-
-#define	DB___fop_rename	146
-typedef struct ___fop_rename_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	oldname;
-	DBT	newname;
-	DBT	fileid;
-	u_int32_t	appname;
-} __fop_rename_args;
-
-#define	DB___fop_file_remove	141
-typedef struct ___fop_file_remove_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	real_fid;
-	DBT	tmp_fid;
-	DBT	name;
-	u_int32_t	appname;
-	u_int32_t	child;
-} __fop_file_remove_args;
-
-#endif
diff --git a/libdb/dbinc_auto/fileops_ext.h b/libdb/dbinc_auto/fileops_ext.h
deleted file mode 100644
index 5edf7bd30..000000000
--- a/libdb/dbinc_auto/fileops_ext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_fileops_ext_h_
-#define	_fileops_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __fop_create_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t));
-int __fop_create_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_create_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_create_read __P((DB_ENV *, void *, __fop_create_args **));
-int __fop_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, u_int32_t));
-int __fop_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_remove_read __P((DB_ENV *, void *, __fop_remove_args **));
-int __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t, const DBT *, u_int32_t));
-int __fop_write_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_write_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_write_read __P((DB_ENV *, void *, __fop_write_args **));
-int __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
-int __fop_rename_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_rename_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_rename_read __P((DB_ENV *, void *, __fop_rename_args **));
-int __fop_file_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t, u_int32_t));
-int __fop_file_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_file_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_file_remove_read __P((DB_ENV *, void *, __fop_file_remove_args **));
-int __fop_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __fop_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __fop_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __fop_create __P((DB_ENV *, DB_TXN *, DB_FH *, const char *, APPNAME, int));
-int __fop_remove __P((DB_ENV *, DB_TXN *, u_int8_t *, const char *, APPNAME));
-int __fop_write __P((DB_ENV *, DB_TXN *, const char *, APPNAME, DB_FH *, u_int32_t, u_int8_t *, u_int32_t, u_int32_t));
-int __fop_rename __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int8_t *, APPNAME));
-int __fop_create_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_write_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_rename_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_file_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_lock_handle __P((DB_ENV *, DB *, u_int32_t, db_lockmode_t, DB_LOCK *, u_int32_t));
-int __fop_file_setup __P((DB *, DB_TXN *, const char *, int, u_int32_t, u_int32_t *));
-int __fop_subdb_setup __P((DB *, DB_TXN *, const char *, const char *, int, u_int32_t));
-int __fop_remove_setup __P((DB *, DB_TXN *, const char *, u_int32_t));
-int __fop_read_meta __P((DB_ENV *, const char *, u_int8_t *, size_t, DB_FH *, int, size_t *, u_int32_t));
-int __fop_dummy __P((DB *, DB_TXN *, const char *, const char *, u_int32_t));
-int __fop_dbrename __P((DB *, const char *, const char *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_fileops_ext_h_ */
diff --git a/libdb/dbinc_auto/hash_auto.h b/libdb/dbinc_auto/hash_auto.h
deleted file mode 100644
index 7ec3fb7ef..000000000
--- a/libdb/dbinc_auto/hash_auto.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__ham_AUTO_H
-#define	__ham_AUTO_H
-#define	DB___ham_insdel	21
-typedef struct ___ham_insdel_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	u_int32_t	ndx;
-	DB_LSN	pagelsn;
-	DBT	key;
-	DBT	data;
-} __ham_insdel_args;
-
-#define	DB___ham_newpage	22
-typedef struct ___ham_newpage_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	fileid;
-	db_pgno_t	prev_pgno;
-	DB_LSN	prevlsn;
-	db_pgno_t	new_pgno;
-	DB_LSN	pagelsn;
-	db_pgno_t	next_pgno;
-	DB_LSN	nextlsn;
-} __ham_newpage_args;
-
-#define	DB___ham_splitdata	24
-typedef struct ___ham_splitdata_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	u_int32_t	opcode;
-	db_pgno_t	pgno;
-	DBT	pageimage;
-	DB_LSN	pagelsn;
-} __ham_splitdata_args;
-
-#define	DB___ham_replace	25
-typedef struct ___ham_replace_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	u_int32_t	ndx;
-	DB_LSN	pagelsn;
-	int32_t	off;
-	DBT	olditem;
-	DBT	newitem;
-	u_int32_t	makedup;
-} __ham_replace_args;
-
-#define	DB___ham_copypage	28
-typedef struct ___ham_copypage_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	DB_LSN	pagelsn;
-	db_pgno_t	next_pgno;
-	DB_LSN	nextlsn;
-	db_pgno_t	nnext_pgno;
-	DB_LSN	nnextlsn;
-	DBT	page;
-} __ham_copypage_args;
-
-#define	DB___ham_metagroup	29
-typedef struct ___ham_metagroup_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	u_int32_t	bucket;
-	db_pgno_t	mmpgno;
-	DB_LSN	mmetalsn;
-	db_pgno_t	mpgno;
-	DB_LSN	metalsn;
-	db_pgno_t	pgno;
-	DB_LSN	pagelsn;
-	u_int32_t	newalloc;
-} __ham_metagroup_args;
-
-#define	DB___ham_groupalloc	32
-typedef struct ___ham_groupalloc_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	DB_LSN	meta_lsn;
-	db_pgno_t	start_pgno;
-	u_int32_t	num;
-	db_pgno_t	free;
-} __ham_groupalloc_args;
-
-#define	DB___ham_curadj	33
-typedef struct ___ham_curadj_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_pgno_t	pgno;
-	u_int32_t	indx;
-	u_int32_t	len;
-	u_int32_t	dup_off;
-	int	add;
-	int	is_dup;
-	u_int32_t	order;
-} __ham_curadj_args;
-
-#define	DB___ham_chgpg	34
-typedef struct ___ham_chgpg_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_ham_mode	mode;
-	db_pgno_t	old_pgno;
-	db_pgno_t	new_pgno;
-	u_int32_t	old_indx;
-	u_int32_t	new_indx;
-} __ham_chgpg_args;
-
-#endif
diff --git a/libdb/dbinc_auto/hash_ext.h b/libdb/dbinc_auto/hash_ext.h
deleted file mode 100644
index 1ee239870..000000000
--- a/libdb/dbinc_auto/hash_ext.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_hash_ext_h_
-#define	_hash_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __ham_quick_delete __P((DBC *));
-int __ham_c_init __P((DBC *));
-int __ham_c_count __P((DBC *, db_recno_t *));
-int __ham_c_dup __P((DBC *, DBC *));
-u_int32_t __ham_call_hash __P((DBC *, u_int8_t *, int32_t));
-int __ham_init_dbt __P((DB_ENV *, DBT *, u_int32_t, void **, u_int32_t *));
-int __ham_c_update __P((DBC *, u_int32_t, int, int));
-int __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
-int __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, const DBT *, const DBT *));
-int __ham_insdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_insdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_insdel_read __P((DB_ENV *, void *, __ham_insdel_args **));
-int __ham_newpage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
-int __ham_newpage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_newpage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_newpage_read __P((DB_ENV *, void *, __ham_newpage_args **));
-int __ham_splitdata_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
-int __ham_splitdata_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_splitdata_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_splitdata_read __P((DB_ENV *, void *, __ham_splitdata_args **));
-int __ham_replace_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, int32_t, const DBT *, const DBT *, u_int32_t));
-int __ham_replace_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_replace_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_replace_read __P((DB_ENV *, void *, __ham_replace_args **));
-int __ham_copypage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, const DBT *));
-int __ham_copypage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_copypage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_copypage_read __P((DB_ENV *, void *, __ham_copypage_args **));
-int __ham_metagroup_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t));
-int __ham_metagroup_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_metagroup_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_metagroup_read __P((DB_ENV *, void *, __ham_metagroup_args **));
-int __ham_groupalloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
-int __ham_groupalloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_groupalloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_groupalloc_read __P((DB_ENV *, void *, __ham_groupalloc_args **));
-int __ham_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t, int, int, u_int32_t));
-int __ham_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_curadj_read __P((DB_ENV *, void *, __ham_curadj_args **));
-int __ham_chgpg_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ham_mode, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t));
-int __ham_chgpg_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_chgpg_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_chgpg_read __P((DB_ENV *, void *, __ham_chgpg_args **));
-int __ham_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __ham_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __ham_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __ham_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __ham_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __ham_mswap __P((void *));
-int __ham_add_dup __P((DBC *, DBT *, u_int32_t, db_pgno_t *));
-int __ham_dup_convert __P((DBC *));
-int __ham_make_dup __P((DB_ENV *, const DBT *, DBT *d, void **, u_int32_t *));
-void __ham_dsearch __P((DBC *, DBT *, u_int32_t *, int *, u_int32_t));
-void __ham_cprint __P((DBC *));
-u_int32_t __ham_func2 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_func3 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_func4 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_func5 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_test __P((DB *, const void *, u_int32_t));
-int __ham_get_meta __P((DBC *));
-int __ham_release_meta __P((DBC *));
-int __ham_dirty_meta __P((DBC *));
-int __ham_db_create __P((DB *));
-int __ham_db_close __P((DB *));
-int __ham_open __P((DB *, DB_TXN *, const char * name, db_pgno_t, u_int32_t));
-int __ham_metachk __P((DB *, const char *, HMETA *));
-int __ham_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __ham_new_subdb __P((DB *, DB *, DB_TXN *));
-int __ham_item __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_reset __P((DBC *));
-void __ham_item_init __P((DBC *));
-int __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
-void __ham_putitem __P((DB *, PAGE *p, const DBT *, int));
-void __ham_reputpair  __P((DB *, PAGE *, u_int32_t, const DBT *, const DBT *));
-int __ham_del_pair __P((DBC *, int));
-int __ham_replpair __P((DBC *, DBT *, u_int32_t));
-void __ham_onpage_replace __P((DB *, PAGE *, u_int32_t, int32_t, int32_t,  DBT *));
-int __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
-int __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
-void __ham_copy_item __P((DB *, PAGE *, u_int32_t, PAGE *));
-int __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
-int __ham_get_cpage __P((DBC *, db_lockmode_t));
-int __ham_next_cpage __P((DBC *, db_pgno_t, int));
-int __ham_lock_bucket __P((DBC *, db_lockmode_t));
-void __ham_dpair __P((DB *, PAGE *, u_int32_t));
-int __ham_insdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_newpage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_replace_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_splitdata_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_copypage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_metagroup_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_groupalloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_chgpg_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_reclaim __P((DB *, DB_TXN *txn));
-int __ham_truncate __P((DB *, DB_TXN *txn, u_int32_t *));
-int __ham_stat __P((DB *, void *, u_int32_t));
-int __ham_traverse __P((DBC *, db_lockmode_t, int (*)(DB *, PAGE *, void *, int *), void *, int));
-int __ham_30_hashmeta __P((DB *, char *, u_int8_t *));
-int __ham_30_sizefix __P((DB *, DB_FH *, char *, u_int8_t *));
-int __ham_31_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __ham_31_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *, db_pgno_t, u_int32_t));
-int __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-int __ham_vrfy_hashing __P((DB *, u_int32_t, HMETA *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t (*) __P((DB *, const void *, u_int32_t))));
-int __ham_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *, void *, int (*)(void *, const void *), u_int32_t));
-int __ham_meta2pgset __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t, DB *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_hash_ext_h_ */
diff --git a/libdb/dbinc_auto/hmac_ext.h b/libdb/dbinc_auto/hmac_ext.h
deleted file mode 100644
index d161a7291..000000000
--- a/libdb/dbinc_auto/hmac_ext.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_hmac_ext_h_
-#define	_hmac_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void __db_chksum __P((u_int8_t *, size_t, u_int8_t *, u_int8_t *));
-void __db_derive_mac __P((u_int8_t *, size_t, u_int8_t *));
-int __db_check_chksum __P((DB_ENV *, DB_CIPHER *, u_int8_t *, void *, size_t, int));
-void __db_SHA1Transform __P((u_int32_t *, unsigned char *));
-void __db_SHA1Init __P((SHA1_CTX *));
-void __db_SHA1Update __P((SHA1_CTX *, unsigned char *, size_t));
-void __db_SHA1Final __P((unsigned char *, SHA1_CTX *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_hmac_ext_h_ */
diff --git a/libdb/dbinc_auto/int_def.in b/libdb/dbinc_auto/int_def.in
deleted file mode 100644
index e75e1914b..000000000
--- a/libdb/dbinc_auto/int_def.in
+++ /dev/null
@@ -1,1329 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_INT_DEF_IN_
-#define	_DB_INT_DEF_IN_
-
-#define	__crdel_metasub_log __crdel_metasub_log@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_metasub_getpgnos __crdel_metasub_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_metasub_print __crdel_metasub_print@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_metasub_read __crdel_metasub_read@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_init_print __crdel_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_init_getpgnos __crdel_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_init_recover __crdel_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__crdel_metasub_recover __crdel_metasub_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_master_open __db_master_open@DB_VERSION_UNIQUE_NAME@
-#define	__db_master_update __db_master_update@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbenv_setup __db_dbenv_setup@DB_VERSION_UNIQUE_NAME@
-#define	__db_close __db_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_close_i __db_close_i@DB_VERSION_UNIQUE_NAME@
-#define	__db_refresh __db_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__db_log_page __db_log_page@DB_VERSION_UNIQUE_NAME@
-#define	__db_backup_name __db_backup_name@DB_VERSION_UNIQUE_NAME@
-#define	__dblist_get __dblist_get@DB_VERSION_UNIQUE_NAME@
-#if CONFIG_TEST
-#define	__db_testcopy __db_testcopy@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	__db_cursor __db_cursor@DB_VERSION_UNIQUE_NAME@
-#define	__db_icursor __db_icursor@DB_VERSION_UNIQUE_NAME@
-#define	__db_cprint __db_cprint@DB_VERSION_UNIQUE_NAME@
-#define	__db_fd __db_fd@DB_VERSION_UNIQUE_NAME@
-#define	__db_get __db_get@DB_VERSION_UNIQUE_NAME@
-#define	__db_put __db_put@DB_VERSION_UNIQUE_NAME@
-#define	__db_delete __db_delete@DB_VERSION_UNIQUE_NAME@
-#define	__db_sync __db_sync@DB_VERSION_UNIQUE_NAME@
-#define	__db_associate __db_associate@DB_VERSION_UNIQUE_NAME@
-#define	__db_pget __db_pget@DB_VERSION_UNIQUE_NAME@
-#define	__db_addrem_log __db_addrem_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_addrem_getpgnos __db_addrem_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_addrem_print __db_addrem_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_addrem_read __db_addrem_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_big_log __db_big_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_big_getpgnos __db_big_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_big_print __db_big_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_big_read __db_big_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_ovref_log __db_ovref_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_ovref_getpgnos __db_ovref_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_ovref_print __db_ovref_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_ovref_read __db_ovref_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_relink_log __db_relink_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_relink_getpgnos __db_relink_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_relink_print __db_relink_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_relink_read __db_relink_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_debug_log __db_debug_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_debug_getpgnos __db_debug_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_debug_print __db_debug_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_debug_read __db_debug_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_noop_log __db_noop_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_noop_getpgnos __db_noop_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_noop_print __db_noop_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_noop_read __db_noop_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_alloc_log __db_pg_alloc_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_alloc_getpgnos __db_pg_alloc_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_alloc_print __db_pg_alloc_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_alloc_read __db_pg_alloc_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_free_log __db_pg_free_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_free_getpgnos __db_pg_free_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_free_print __db_pg_free_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_free_read __db_pg_free_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_cksum_log __db_cksum_log@DB_VERSION_UNIQUE_NAME@
-#define	__db_cksum_getpgnos __db_cksum_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_cksum_print __db_cksum_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_cksum_read __db_cksum_read@DB_VERSION_UNIQUE_NAME@
-#define	__db_init_print __db_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_init_getpgnos __db_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__db_init_recover __db_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_close __db_c_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_destroy __db_c_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_count __db_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_del __db_c_del@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_dup __db_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_idup __db_c_idup@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_newopd __db_c_newopd@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_get __db_c_get@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_put __db_c_put@DB_VERSION_UNIQUE_NAME@
-#define	__db_duperr __db_duperr@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_secondary_get __db_c_secondary_get@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_pget __db_c_pget@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_del_primary __db_c_del_primary@DB_VERSION_UNIQUE_NAME@
-#define	__db_s_first __db_s_first@DB_VERSION_UNIQUE_NAME@
-#define	__db_s_next __db_s_next@DB_VERSION_UNIQUE_NAME@
-#define	__db_s_done __db_s_done@DB_VERSION_UNIQUE_NAME@
-#define	__db_partsize __db_partsize@DB_VERSION_UNIQUE_NAME@
-#define	__db_pgin __db_pgin@DB_VERSION_UNIQUE_NAME@
-#define	__db_pgout __db_pgout@DB_VERSION_UNIQUE_NAME@
-#define	__db_metaswap __db_metaswap@DB_VERSION_UNIQUE_NAME@
-#define	__db_byteswap __db_byteswap@DB_VERSION_UNIQUE_NAME@
-#define	__db_dispatch __db_dispatch@DB_VERSION_UNIQUE_NAME@
-#define	__db_add_recovery __db_add_recovery@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_init __db_txnlist_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_add __db_txnlist_add@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_remove __db_txnlist_remove@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_ckp __db_txnlist_ckp@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_end __db_txnlist_end@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_find __db_txnlist_find@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_update __db_txnlist_update@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_gen __db_txnlist_gen@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_lsnadd __db_txnlist_lsnadd@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_lsninit __db_txnlist_lsninit@DB_VERSION_UNIQUE_NAME@
-#define	__db_add_limbo __db_add_limbo@DB_VERSION_UNIQUE_NAME@
-#define	__db_do_the_limbo __db_do_the_limbo@DB_VERSION_UNIQUE_NAME@
-#define	__db_txnlist_print __db_txnlist_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_ditem __db_ditem@DB_VERSION_UNIQUE_NAME@
-#define	__db_pitem __db_pitem@DB_VERSION_UNIQUE_NAME@
-#define	__db_relink __db_relink@DB_VERSION_UNIQUE_NAME@
-#define	__db_cursorchk __db_cursorchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_ccountchk __db_ccountchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_cdelchk __db_cdelchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_cgetchk __db_cgetchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_cputchk __db_cputchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_pgetchk __db_pgetchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_cpgetchk __db_cpgetchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_delchk __db_delchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_getchk __db_getchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_joinchk __db_joinchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_joingetchk __db_joingetchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_putchk __db_putchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_statchk __db_statchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_syncchk __db_syncchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_secondary_corrupt __db_secondary_corrupt@DB_VERSION_UNIQUE_NAME@
-#define	__db_associatechk __db_associatechk@DB_VERSION_UNIQUE_NAME@
-#define	__db_txn_auto __db_txn_auto@DB_VERSION_UNIQUE_NAME@
-#define	__db_join __db_join@DB_VERSION_UNIQUE_NAME@
-#define	__db_new __db_new@DB_VERSION_UNIQUE_NAME@
-#define	__db_free __db_free@DB_VERSION_UNIQUE_NAME@
-#define	__db_lprint __db_lprint@DB_VERSION_UNIQUE_NAME@
-#define	__db_lget __db_lget@DB_VERSION_UNIQUE_NAME@
-#define	__db_lput __db_lput@DB_VERSION_UNIQUE_NAME@
-#define	__dbh_am_chk __dbh_am_chk@DB_VERSION_UNIQUE_NAME@
-#define	__db_set_lorder __db_set_lorder@DB_VERSION_UNIQUE_NAME@
-#define	__db_open __db_open@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbopen __db_dbopen@DB_VERSION_UNIQUE_NAME@
-#define	__db_new_file __db_new_file@DB_VERSION_UNIQUE_NAME@
-#define	__db_init_subdb __db_init_subdb@DB_VERSION_UNIQUE_NAME@
-#define	__db_chk_meta __db_chk_meta@DB_VERSION_UNIQUE_NAME@
-#define	__db_meta_setup __db_meta_setup@DB_VERSION_UNIQUE_NAME@
-#define	__db_goff __db_goff@DB_VERSION_UNIQUE_NAME@
-#define	__db_poff __db_poff@DB_VERSION_UNIQUE_NAME@
-#define	__db_ovref __db_ovref@DB_VERSION_UNIQUE_NAME@
-#define	__db_doff __db_doff@DB_VERSION_UNIQUE_NAME@
-#define	__db_moff __db_moff@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_overflow __db_vrfy_overflow@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_ovfl_structure __db_vrfy_ovfl_structure@DB_VERSION_UNIQUE_NAME@
-#define	__db_safe_goff __db_safe_goff@DB_VERSION_UNIQUE_NAME@
-#define	__db_loadme __db_loadme@DB_VERSION_UNIQUE_NAME@
-#define	__db_dump __db_dump@DB_VERSION_UNIQUE_NAME@
-#define	__db_inmemdbflags __db_inmemdbflags@DB_VERSION_UNIQUE_NAME@
-#define	__db_prnpage __db_prnpage@DB_VERSION_UNIQUE_NAME@
-#define	__db_prpage __db_prpage@DB_VERSION_UNIQUE_NAME@
-#define	__db_pr __db_pr@DB_VERSION_UNIQUE_NAME@
-#define	__db_prdbt __db_prdbt@DB_VERSION_UNIQUE_NAME@
-#define	__db_prflags __db_prflags@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbtype_to_string __db_dbtype_to_string@DB_VERSION_UNIQUE_NAME@
-#define	__db_prheader __db_prheader@DB_VERSION_UNIQUE_NAME@
-#define	__db_prfooter __db_prfooter@DB_VERSION_UNIQUE_NAME@
-#define	__db_addrem_recover __db_addrem_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_big_recover __db_big_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_ovref_recover __db_ovref_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_relink_recover __db_relink_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_debug_recover __db_debug_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_noop_recover __db_noop_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_alloc_recover __db_pg_alloc_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_pg_free_recover __db_pg_free_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_cksum_recover __db_cksum_recover@DB_VERSION_UNIQUE_NAME@
-#define	__db_traverse_big __db_traverse_big@DB_VERSION_UNIQUE_NAME@
-#define	__db_reclaim_callback __db_reclaim_callback@DB_VERSION_UNIQUE_NAME@
-#define	__db_truncate_callback __db_truncate_callback@DB_VERSION_UNIQUE_NAME@
-#define	__dbenv_dbremove __dbenv_dbremove@DB_VERSION_UNIQUE_NAME@
-#define	__db_remove __db_remove@DB_VERSION_UNIQUE_NAME@
-#define	__db_remove_i __db_remove_i@DB_VERSION_UNIQUE_NAME@
-#define	__dbenv_dbrename __dbenv_dbrename@DB_VERSION_UNIQUE_NAME@
-#define	__db_rename __db_rename@DB_VERSION_UNIQUE_NAME@
-#define	__db_rename_i __db_rename_i@DB_VERSION_UNIQUE_NAME@
-#define	__db_ret __db_ret@DB_VERSION_UNIQUE_NAME@
-#define	__db_retcopy __db_retcopy@DB_VERSION_UNIQUE_NAME@
-#define	__db_truncate __db_truncate@DB_VERSION_UNIQUE_NAME@
-#define	__db_upgrade __db_upgrade@DB_VERSION_UNIQUE_NAME@
-#define	__db_lastpgno __db_lastpgno@DB_VERSION_UNIQUE_NAME@
-#define	__db_31_offdup __db_31_offdup@DB_VERSION_UNIQUE_NAME@
-#define	__db_verify __db_verify@DB_VERSION_UNIQUE_NAME@
-#define	__db_verify_callback __db_verify_callback@DB_VERSION_UNIQUE_NAME@
-#define	__db_verify_internal __db_verify_internal@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_datapage __db_vrfy_datapage@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_meta __db_vrfy_meta@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_struct_feedback __db_vrfy_struct_feedback@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_inpitem __db_vrfy_inpitem@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_duptype __db_vrfy_duptype@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_duptree __db_salvage_duptree@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_dbinfo_create __db_vrfy_dbinfo_create@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_dbinfo_destroy __db_vrfy_dbinfo_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_getpageinfo __db_vrfy_getpageinfo@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_putpageinfo __db_vrfy_putpageinfo@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_pgset __db_vrfy_pgset@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_pgset_get __db_vrfy_pgset_get@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_pgset_inc __db_vrfy_pgset_inc@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_pgset_dec __db_vrfy_pgset_dec@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_pgset_next __db_vrfy_pgset_next@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_childcursor __db_vrfy_childcursor@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_childput __db_vrfy_childput@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_ccset __db_vrfy_ccset@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_ccnext __db_vrfy_ccnext@DB_VERSION_UNIQUE_NAME@
-#define	__db_vrfy_ccclose __db_vrfy_ccclose@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_init __db_salvage_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_destroy __db_salvage_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_getnext __db_salvage_getnext@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_isdone __db_salvage_isdone@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_markdone __db_salvage_markdone@DB_VERSION_UNIQUE_NAME@
-#define	__db_salvage_markneeded __db_salvage_markneeded@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cmp __bam_cmp@DB_VERSION_UNIQUE_NAME@
-#define	__bam_defcmp __bam_defcmp@DB_VERSION_UNIQUE_NAME@
-#define	__bam_defpfx __bam_defpfx@DB_VERSION_UNIQUE_NAME@
-#define	__bam_pgin __bam_pgin@DB_VERSION_UNIQUE_NAME@
-#define	__bam_pgout __bam_pgout@DB_VERSION_UNIQUE_NAME@
-#define	__bam_mswap __bam_mswap@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cprint __bam_cprint@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_delete __bam_ca_delete@DB_VERSION_UNIQUE_NAME@
-#define	__ram_ca_delete __ram_ca_delete@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_di __bam_ca_di@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_dup __bam_ca_dup@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_undodup __bam_ca_undodup@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_rsplit __bam_ca_rsplit@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_split __bam_ca_split@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ca_undosplit __bam_ca_undosplit@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_init __bam_c_init@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_refresh __bam_c_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_count __bam_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_dup __bam_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__bam_bulk_overflow __bam_bulk_overflow@DB_VERSION_UNIQUE_NAME@
-#define	__bam_bulk_duplicates __bam_bulk_duplicates@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_rget __bam_c_rget@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ditem __bam_ditem@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adjindx __bam_adjindx@DB_VERSION_UNIQUE_NAME@
-#define	__bam_dpages __bam_dpages@DB_VERSION_UNIQUE_NAME@
-#define	__bam_db_create __bam_db_create@DB_VERSION_UNIQUE_NAME@
-#define	__bam_db_close __bam_db_close@DB_VERSION_UNIQUE_NAME@
-#define	__bam_set_flags __bam_set_flags@DB_VERSION_UNIQUE_NAME@
-#define	__ram_set_flags __ram_set_flags@DB_VERSION_UNIQUE_NAME@
-#define	__bam_open __bam_open@DB_VERSION_UNIQUE_NAME@
-#define	__bam_metachk __bam_metachk@DB_VERSION_UNIQUE_NAME@
-#define	__bam_read_root __bam_read_root@DB_VERSION_UNIQUE_NAME@
-#define	__bam_new_file __bam_new_file@DB_VERSION_UNIQUE_NAME@
-#define	__bam_new_subdb __bam_new_subdb@DB_VERSION_UNIQUE_NAME@
-#define	__bam_iitem __bam_iitem@DB_VERSION_UNIQUE_NAME@
-#define	__bam_ritem __bam_ritem@DB_VERSION_UNIQUE_NAME@
-#define	__bam_split_recover __bam_split_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rsplit_recover __bam_rsplit_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adj_recover __bam_adj_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cadjust_recover __bam_cadjust_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cdel_recover __bam_cdel_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_repl_recover __bam_repl_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_root_recover __bam_root_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_curadj_recover __bam_curadj_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rcuradj_recover __bam_rcuradj_recover@DB_VERSION_UNIQUE_NAME@
-#define	__bam_reclaim __bam_reclaim@DB_VERSION_UNIQUE_NAME@
-#define	__bam_truncate __bam_truncate@DB_VERSION_UNIQUE_NAME@
-#define	__ram_open __ram_open@DB_VERSION_UNIQUE_NAME@
-#define	__ram_append __ram_append@DB_VERSION_UNIQUE_NAME@
-#define	__ram_c_del __ram_c_del@DB_VERSION_UNIQUE_NAME@
-#define	__ram_c_get __ram_c_get@DB_VERSION_UNIQUE_NAME@
-#define	__ram_c_put __ram_c_put@DB_VERSION_UNIQUE_NAME@
-#define	__ram_ca __ram_ca@DB_VERSION_UNIQUE_NAME@
-#define	__ram_getno __ram_getno@DB_VERSION_UNIQUE_NAME@
-#define	__ram_writeback __ram_writeback@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rsearch __bam_rsearch@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adjust __bam_adjust@DB_VERSION_UNIQUE_NAME@
-#define	__bam_nrecs __bam_nrecs@DB_VERSION_UNIQUE_NAME@
-#define	__bam_total __bam_total@DB_VERSION_UNIQUE_NAME@
-#define	__bam_search __bam_search@DB_VERSION_UNIQUE_NAME@
-#define	__bam_stkrel __bam_stkrel@DB_VERSION_UNIQUE_NAME@
-#define	__bam_stkgrow __bam_stkgrow@DB_VERSION_UNIQUE_NAME@
-#define	__bam_split __bam_split@DB_VERSION_UNIQUE_NAME@
-#define	__bam_copy __bam_copy@DB_VERSION_UNIQUE_NAME@
-#define	__bam_stat __bam_stat@DB_VERSION_UNIQUE_NAME@
-#define	__bam_traverse __bam_traverse@DB_VERSION_UNIQUE_NAME@
-#define	__bam_stat_callback __bam_stat_callback@DB_VERSION_UNIQUE_NAME@
-#define	__bam_key_range __bam_key_range@DB_VERSION_UNIQUE_NAME@
-#define	__bam_30_btreemeta __bam_30_btreemeta@DB_VERSION_UNIQUE_NAME@
-#define	__bam_31_btreemeta __bam_31_btreemeta@DB_VERSION_UNIQUE_NAME@
-#define	__bam_31_lbtree __bam_31_lbtree@DB_VERSION_UNIQUE_NAME@
-#define	__bam_vrfy_meta __bam_vrfy_meta@DB_VERSION_UNIQUE_NAME@
-#define	__ram_vrfy_leaf __ram_vrfy_leaf@DB_VERSION_UNIQUE_NAME@
-#define	__bam_vrfy __bam_vrfy@DB_VERSION_UNIQUE_NAME@
-#define	__bam_vrfy_itemorder __bam_vrfy_itemorder@DB_VERSION_UNIQUE_NAME@
-#define	__bam_vrfy_structure __bam_vrfy_structure@DB_VERSION_UNIQUE_NAME@
-#define	__bam_vrfy_subtree __bam_vrfy_subtree@DB_VERSION_UNIQUE_NAME@
-#define	__bam_salvage __bam_salvage@DB_VERSION_UNIQUE_NAME@
-#define	__bam_salvage_walkdupint __bam_salvage_walkdupint@DB_VERSION_UNIQUE_NAME@
-#define	__bam_meta2pgset __bam_meta2pgset@DB_VERSION_UNIQUE_NAME@
-#define	__bam_split_log __bam_split_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_split_getpgnos __bam_split_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_split_print __bam_split_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_split_read __bam_split_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rsplit_log __bam_rsplit_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rsplit_getpgnos __bam_rsplit_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rsplit_print __bam_rsplit_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rsplit_read __bam_rsplit_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adj_log __bam_adj_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adj_getpgnos __bam_adj_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adj_print __bam_adj_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_adj_read __bam_adj_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cadjust_log __bam_cadjust_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cadjust_getpgnos __bam_cadjust_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cadjust_print __bam_cadjust_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cadjust_read __bam_cadjust_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cdel_log __bam_cdel_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cdel_getpgnos __bam_cdel_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cdel_print __bam_cdel_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_cdel_read __bam_cdel_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_repl_log __bam_repl_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_repl_getpgnos __bam_repl_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_repl_print __bam_repl_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_repl_read __bam_repl_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_root_log __bam_root_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_root_getpgnos __bam_root_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_root_print __bam_root_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_root_read __bam_root_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_curadj_log __bam_curadj_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_curadj_getpgnos __bam_curadj_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_curadj_print __bam_curadj_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_curadj_read __bam_curadj_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rcuradj_log __bam_rcuradj_log@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rcuradj_getpgnos __bam_rcuradj_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rcuradj_print __bam_rcuradj_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_rcuradj_read __bam_rcuradj_read@DB_VERSION_UNIQUE_NAME@
-#define	__bam_init_print __bam_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__bam_init_getpgnos __bam_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__bam_init_recover __bam_init_recover@DB_VERSION_UNIQUE_NAME@
-#ifndef HAVE_GETCWD
-#define	getcwd getcwd@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_GETOPT
-#define	getopt getopt@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_MEMCMP
-#define	memcmp memcmp@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_MEMCPY
-#define	memcpy memcpy@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_MEMMOVE
-#define	memmove memmove@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_RAISE
-#define	raise raise@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_SNPRINTF
-#define	snprintf snprintf@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_STRCASECMP
-#define	strcasecmp strcasecmp@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_STRCASECMP
-#define	strncasecmp strncasecmp@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_STRDUP
-#define	strdup strdup@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_STRERROR
-#define	strerror strerror@DB_VERSION_UNIQUE_NAME@
-#endif
-#ifndef HAVE_VSNPRINTF
-#define	vsnprintf vsnprintf@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	__db_isbigendian __db_isbigendian@DB_VERSION_UNIQUE_NAME@
-#define	__db_byteorder __db_byteorder@DB_VERSION_UNIQUE_NAME@
-#define	__db_fchk __db_fchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_fcchk __db_fcchk@DB_VERSION_UNIQUE_NAME@
-#define	__db_ferr __db_ferr@DB_VERSION_UNIQUE_NAME@
-#define	__db_pgerr __db_pgerr@DB_VERSION_UNIQUE_NAME@
-#define	__db_pgfmt __db_pgfmt@DB_VERSION_UNIQUE_NAME@
-#define	__db_eopnotsup __db_eopnotsup@DB_VERSION_UNIQUE_NAME@
-#ifdef DIAGNOSTIC
-#define	__db_assert __db_assert@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	__db_panic_msg __db_panic_msg@DB_VERSION_UNIQUE_NAME@
-#define	__db_panic __db_panic@DB_VERSION_UNIQUE_NAME@
-#define	__db_err __db_err@DB_VERSION_UNIQUE_NAME@
-#define	__db_errcall __db_errcall@DB_VERSION_UNIQUE_NAME@
-#define	__db_errfile __db_errfile@DB_VERSION_UNIQUE_NAME@
-#define	__db_logmsg __db_logmsg@DB_VERSION_UNIQUE_NAME@
-#define	__db_unknown_flag __db_unknown_flag@DB_VERSION_UNIQUE_NAME@
-#define	__db_unknown_type __db_unknown_type@DB_VERSION_UNIQUE_NAME@
-#define	__db_check_txn __db_check_txn@DB_VERSION_UNIQUE_NAME@
-#define	__db_not_txn_env __db_not_txn_env@DB_VERSION_UNIQUE_NAME@
-#define	__db_getlong __db_getlong@DB_VERSION_UNIQUE_NAME@
-#define	__db_getulong __db_getulong@DB_VERSION_UNIQUE_NAME@
-#define	__db_idspace __db_idspace@DB_VERSION_UNIQUE_NAME@
-#define	__db_log2 __db_log2@DB_VERSION_UNIQUE_NAME@
-#define	__db_util_arg __db_util_arg@DB_VERSION_UNIQUE_NAME@
-#define	__db_util_cache __db_util_cache@DB_VERSION_UNIQUE_NAME@
-#define	__db_util_logset __db_util_logset@DB_VERSION_UNIQUE_NAME@
-#define	__db_util_siginit __db_util_siginit@DB_VERSION_UNIQUE_NAME@
-#define	__db_util_interrupted __db_util_interrupted@DB_VERSION_UNIQUE_NAME@
-#define	__db_util_sigresend __db_util_sigresend@DB_VERSION_UNIQUE_NAME@
-#define	__aes_setup __aes_setup@DB_VERSION_UNIQUE_NAME@
-#define	__aes_adj_size __aes_adj_size@DB_VERSION_UNIQUE_NAME@
-#define	__aes_close __aes_close@DB_VERSION_UNIQUE_NAME@
-#define	__aes_decrypt __aes_decrypt@DB_VERSION_UNIQUE_NAME@
-#define	__aes_encrypt __aes_encrypt@DB_VERSION_UNIQUE_NAME@
-#define	__aes_init __aes_init@DB_VERSION_UNIQUE_NAME@
-#define	__crypto_region_init __crypto_region_init@DB_VERSION_UNIQUE_NAME@
-#define	__crypto_dbenv_close __crypto_dbenv_close@DB_VERSION_UNIQUE_NAME@
-#define	__crypto_algsetup __crypto_algsetup@DB_VERSION_UNIQUE_NAME@
-#define	__crypto_decrypt_meta __crypto_decrypt_meta@DB_VERSION_UNIQUE_NAME@
-#define	__db_generate_iv __db_generate_iv@DB_VERSION_UNIQUE_NAME@
-#define	__db_rijndaelKeySetupEnc __db_rijndaelKeySetupEnc@DB_VERSION_UNIQUE_NAME@
-#define	__db_rijndaelKeySetupDec __db_rijndaelKeySetupDec@DB_VERSION_UNIQUE_NAME@
-#define	__db_rijndaelEncrypt __db_rijndaelEncrypt@DB_VERSION_UNIQUE_NAME@
-#define	__db_rijndaelDecrypt __db_rijndaelDecrypt@DB_VERSION_UNIQUE_NAME@
-#define	__db_rijndaelEncryptRound __db_rijndaelEncryptRound@DB_VERSION_UNIQUE_NAME@
-#define	__db_rijndaelDecryptRound __db_rijndaelDecryptRound@DB_VERSION_UNIQUE_NAME@
-#define	__db_makeKey __db_makeKey@DB_VERSION_UNIQUE_NAME@
-#define	__db_cipherInit __db_cipherInit@DB_VERSION_UNIQUE_NAME@
-#define	__db_blockEncrypt __db_blockEncrypt@DB_VERSION_UNIQUE_NAME@
-#define	__db_padEncrypt __db_padEncrypt@DB_VERSION_UNIQUE_NAME@
-#define	__db_blockDecrypt __db_blockDecrypt@DB_VERSION_UNIQUE_NAME@
-#define	__db_padDecrypt __db_padDecrypt@DB_VERSION_UNIQUE_NAME@
-#define	__db_cipherUpdateRounds __db_cipherUpdateRounds@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_setup __dbreg_setup@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_teardown __dbreg_teardown@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_new_id __dbreg_new_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_assign_id __dbreg_assign_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_revoke_id __dbreg_revoke_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_close_id __dbreg_close_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_register_log __dbreg_register_log@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_register_getpgnos __dbreg_register_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_register_print __dbreg_register_print@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_register_read __dbreg_register_read@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_init_print __dbreg_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_init_getpgnos __dbreg_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_init_recover __dbreg_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_register_recover __dbreg_register_recover@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_add_dbentry __dbreg_add_dbentry@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_rem_dbentry __dbreg_rem_dbentry@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_open_files __dbreg_open_files@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_close_files __dbreg_close_files@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_nofiles __dbreg_nofiles@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_id_to_db __dbreg_id_to_db@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_id_to_db_int __dbreg_id_to_db_int@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_id_to_fname __dbreg_id_to_fname@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_fid_to_fname __dbreg_fid_to_fname@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_get_name __dbreg_get_name@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_do_open __dbreg_do_open@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_lazy_id __dbreg_lazy_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_push_id __dbreg_push_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_pop_id __dbreg_pop_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_pluck_id __dbreg_pluck_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbreg_print_dblist __dbreg_print_dblist@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_init __db_shalloc_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_size __db_shalloc_size@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc __db_shalloc@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_free __db_shalloc_free@DB_VERSION_UNIQUE_NAME@
-#define	__db_shsizeof __db_shsizeof@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_dump __db_shalloc_dump@DB_VERSION_UNIQUE_NAME@
-#define	__db_tablesize __db_tablesize@DB_VERSION_UNIQUE_NAME@
-#define	__db_hashinit __db_hashinit@DB_VERSION_UNIQUE_NAME@
-#define	__db_fileinit __db_fileinit@DB_VERSION_UNIQUE_NAME@
-#define	__db_overwrite __db_overwrite@DB_VERSION_UNIQUE_NAME@
-#define	__db_mi_env __db_mi_env@DB_VERSION_UNIQUE_NAME@
-#define	__db_mi_open __db_mi_open@DB_VERSION_UNIQUE_NAME@
-#define	__db_env_config __db_env_config@DB_VERSION_UNIQUE_NAME@
-#define	__dbenv_open __dbenv_open@DB_VERSION_UNIQUE_NAME@
-#define	__dbenv_remove __dbenv_remove@DB_VERSION_UNIQUE_NAME@
-#define	__dbenv_close __dbenv_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_appname __db_appname@DB_VERSION_UNIQUE_NAME@
-#define	__db_home __db_home@DB_VERSION_UNIQUE_NAME@
-#define	__db_apprec __db_apprec@DB_VERSION_UNIQUE_NAME@
-#define	__env_openfiles __env_openfiles@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_attach __db_e_attach@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_detach __db_e_detach@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_remove __db_e_remove@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_stat __db_e_stat@DB_VERSION_UNIQUE_NAME@
-#define	__db_r_attach __db_r_attach@DB_VERSION_UNIQUE_NAME@
-#define	__db_r_detach __db_r_detach@DB_VERSION_UNIQUE_NAME@
-#define	__fop_create_log __fop_create_log@DB_VERSION_UNIQUE_NAME@
-#define	__fop_create_getpgnos __fop_create_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__fop_create_print __fop_create_print@DB_VERSION_UNIQUE_NAME@
-#define	__fop_create_read __fop_create_read@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove_log __fop_remove_log@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove_getpgnos __fop_remove_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove_print __fop_remove_print@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove_read __fop_remove_read@DB_VERSION_UNIQUE_NAME@
-#define	__fop_write_log __fop_write_log@DB_VERSION_UNIQUE_NAME@
-#define	__fop_write_getpgnos __fop_write_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__fop_write_print __fop_write_print@DB_VERSION_UNIQUE_NAME@
-#define	__fop_write_read __fop_write_read@DB_VERSION_UNIQUE_NAME@
-#define	__fop_rename_log __fop_rename_log@DB_VERSION_UNIQUE_NAME@
-#define	__fop_rename_getpgnos __fop_rename_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__fop_rename_print __fop_rename_print@DB_VERSION_UNIQUE_NAME@
-#define	__fop_rename_read __fop_rename_read@DB_VERSION_UNIQUE_NAME@
-#define	__fop_file_remove_log __fop_file_remove_log@DB_VERSION_UNIQUE_NAME@
-#define	__fop_file_remove_getpgnos __fop_file_remove_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__fop_file_remove_print __fop_file_remove_print@DB_VERSION_UNIQUE_NAME@
-#define	__fop_file_remove_read __fop_file_remove_read@DB_VERSION_UNIQUE_NAME@
-#define	__fop_init_print __fop_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__fop_init_getpgnos __fop_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__fop_init_recover __fop_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__fop_create __fop_create@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove __fop_remove@DB_VERSION_UNIQUE_NAME@
-#define	__fop_write __fop_write@DB_VERSION_UNIQUE_NAME@
-#define	__fop_rename __fop_rename@DB_VERSION_UNIQUE_NAME@
-#define	__fop_create_recover __fop_create_recover@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove_recover __fop_remove_recover@DB_VERSION_UNIQUE_NAME@
-#define	__fop_write_recover __fop_write_recover@DB_VERSION_UNIQUE_NAME@
-#define	__fop_rename_recover __fop_rename_recover@DB_VERSION_UNIQUE_NAME@
-#define	__fop_file_remove_recover __fop_file_remove_recover@DB_VERSION_UNIQUE_NAME@
-#define	__fop_lock_handle __fop_lock_handle@DB_VERSION_UNIQUE_NAME@
-#define	__fop_file_setup __fop_file_setup@DB_VERSION_UNIQUE_NAME@
-#define	__fop_subdb_setup __fop_subdb_setup@DB_VERSION_UNIQUE_NAME@
-#define	__fop_remove_setup __fop_remove_setup@DB_VERSION_UNIQUE_NAME@
-#define	__fop_read_meta __fop_read_meta@DB_VERSION_UNIQUE_NAME@
-#define	__fop_dummy __fop_dummy@DB_VERSION_UNIQUE_NAME@
-#define	__fop_dbrename __fop_dbrename@DB_VERSION_UNIQUE_NAME@
-#define	__ham_quick_delete __ham_quick_delete@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_init __ham_c_init@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_count __ham_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_dup __ham_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__ham_call_hash __ham_call_hash@DB_VERSION_UNIQUE_NAME@
-#define	__ham_init_dbt __ham_init_dbt@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_update __ham_c_update@DB_VERSION_UNIQUE_NAME@
-#define	__ham_get_clist __ham_get_clist@DB_VERSION_UNIQUE_NAME@
-#define	__ham_insdel_log __ham_insdel_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_insdel_getpgnos __ham_insdel_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_insdel_print __ham_insdel_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_insdel_read __ham_insdel_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_newpage_log __ham_newpage_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_newpage_getpgnos __ham_newpage_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_newpage_print __ham_newpage_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_newpage_read __ham_newpage_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_splitdata_log __ham_splitdata_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_splitdata_getpgnos __ham_splitdata_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_splitdata_print __ham_splitdata_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_splitdata_read __ham_splitdata_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_replace_log __ham_replace_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_replace_getpgnos __ham_replace_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_replace_print __ham_replace_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_replace_read __ham_replace_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copypage_log __ham_copypage_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copypage_getpgnos __ham_copypage_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copypage_print __ham_copypage_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copypage_read __ham_copypage_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_metagroup_log __ham_metagroup_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_metagroup_getpgnos __ham_metagroup_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_metagroup_print __ham_metagroup_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_metagroup_read __ham_metagroup_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_groupalloc_log __ham_groupalloc_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_groupalloc_getpgnos __ham_groupalloc_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_groupalloc_print __ham_groupalloc_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_groupalloc_read __ham_groupalloc_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_curadj_log __ham_curadj_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_curadj_getpgnos __ham_curadj_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_curadj_print __ham_curadj_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_curadj_read __ham_curadj_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_chgpg_log __ham_chgpg_log@DB_VERSION_UNIQUE_NAME@
-#define	__ham_chgpg_getpgnos __ham_chgpg_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_chgpg_print __ham_chgpg_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_chgpg_read __ham_chgpg_read@DB_VERSION_UNIQUE_NAME@
-#define	__ham_init_print __ham_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__ham_init_getpgnos __ham_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__ham_init_recover __ham_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_pgin __ham_pgin@DB_VERSION_UNIQUE_NAME@
-#define	__ham_pgout __ham_pgout@DB_VERSION_UNIQUE_NAME@
-#define	__ham_mswap __ham_mswap@DB_VERSION_UNIQUE_NAME@
-#define	__ham_add_dup __ham_add_dup@DB_VERSION_UNIQUE_NAME@
-#define	__ham_dup_convert __ham_dup_convert@DB_VERSION_UNIQUE_NAME@
-#define	__ham_make_dup __ham_make_dup@DB_VERSION_UNIQUE_NAME@
-#define	__ham_dsearch __ham_dsearch@DB_VERSION_UNIQUE_NAME@
-#define	__ham_cprint __ham_cprint@DB_VERSION_UNIQUE_NAME@
-#define	__ham_func2 __ham_func2@DB_VERSION_UNIQUE_NAME@
-#define	__ham_func3 __ham_func3@DB_VERSION_UNIQUE_NAME@
-#define	__ham_func4 __ham_func4@DB_VERSION_UNIQUE_NAME@
-#define	__ham_func5 __ham_func5@DB_VERSION_UNIQUE_NAME@
-#define	__ham_test __ham_test@DB_VERSION_UNIQUE_NAME@
-#define	__ham_get_meta __ham_get_meta@DB_VERSION_UNIQUE_NAME@
-#define	__ham_release_meta __ham_release_meta@DB_VERSION_UNIQUE_NAME@
-#define	__ham_dirty_meta __ham_dirty_meta@DB_VERSION_UNIQUE_NAME@
-#define	__ham_db_create __ham_db_create@DB_VERSION_UNIQUE_NAME@
-#define	__ham_db_close __ham_db_close@DB_VERSION_UNIQUE_NAME@
-#define	__ham_open __ham_open@DB_VERSION_UNIQUE_NAME@
-#define	__ham_metachk __ham_metachk@DB_VERSION_UNIQUE_NAME@
-#define	__ham_new_file __ham_new_file@DB_VERSION_UNIQUE_NAME@
-#define	__ham_new_subdb __ham_new_subdb@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item __ham_item@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item_reset __ham_item_reset@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item_init __ham_item_init@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item_last __ham_item_last@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item_first __ham_item_first@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item_prev __ham_item_prev@DB_VERSION_UNIQUE_NAME@
-#define	__ham_item_next __ham_item_next@DB_VERSION_UNIQUE_NAME@
-#define	__ham_putitem __ham_putitem@DB_VERSION_UNIQUE_NAME@
-#define	__ham_reputpair __ham_reputpair@DB_VERSION_UNIQUE_NAME@
-#define	__ham_del_pair __ham_del_pair@DB_VERSION_UNIQUE_NAME@
-#define	__ham_replpair __ham_replpair@DB_VERSION_UNIQUE_NAME@
-#define	__ham_onpage_replace __ham_onpage_replace@DB_VERSION_UNIQUE_NAME@
-#define	__ham_split_page __ham_split_page@DB_VERSION_UNIQUE_NAME@
-#define	__ham_add_el __ham_add_el@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copy_item __ham_copy_item@DB_VERSION_UNIQUE_NAME@
-#define	__ham_add_ovflpage __ham_add_ovflpage@DB_VERSION_UNIQUE_NAME@
-#define	__ham_get_cpage __ham_get_cpage@DB_VERSION_UNIQUE_NAME@
-#define	__ham_next_cpage __ham_next_cpage@DB_VERSION_UNIQUE_NAME@
-#define	__ham_lock_bucket __ham_lock_bucket@DB_VERSION_UNIQUE_NAME@
-#define	__ham_dpair __ham_dpair@DB_VERSION_UNIQUE_NAME@
-#define	__ham_insdel_recover __ham_insdel_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_newpage_recover __ham_newpage_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_replace_recover __ham_replace_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_splitdata_recover __ham_splitdata_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copypage_recover __ham_copypage_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_metagroup_recover __ham_metagroup_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_groupalloc_recover __ham_groupalloc_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_curadj_recover __ham_curadj_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_chgpg_recover __ham_chgpg_recover@DB_VERSION_UNIQUE_NAME@
-#define	__ham_reclaim __ham_reclaim@DB_VERSION_UNIQUE_NAME@
-#define	__ham_truncate __ham_truncate@DB_VERSION_UNIQUE_NAME@
-#define	__ham_stat __ham_stat@DB_VERSION_UNIQUE_NAME@
-#define	__ham_traverse __ham_traverse@DB_VERSION_UNIQUE_NAME@
-#define	__ham_30_hashmeta __ham_30_hashmeta@DB_VERSION_UNIQUE_NAME@
-#define	__ham_30_sizefix __ham_30_sizefix@DB_VERSION_UNIQUE_NAME@
-#define	__ham_31_hashmeta __ham_31_hashmeta@DB_VERSION_UNIQUE_NAME@
-#define	__ham_31_hash __ham_31_hash@DB_VERSION_UNIQUE_NAME@
-#define	__ham_vrfy_meta __ham_vrfy_meta@DB_VERSION_UNIQUE_NAME@
-#define	__ham_vrfy __ham_vrfy@DB_VERSION_UNIQUE_NAME@
-#define	__ham_vrfy_structure __ham_vrfy_structure@DB_VERSION_UNIQUE_NAME@
-#define	__ham_vrfy_hashing __ham_vrfy_hashing@DB_VERSION_UNIQUE_NAME@
-#define	__ham_salvage __ham_salvage@DB_VERSION_UNIQUE_NAME@
-#define	__ham_meta2pgset __ham_meta2pgset@DB_VERSION_UNIQUE_NAME@
-#define	__db_chksum __db_chksum@DB_VERSION_UNIQUE_NAME@
-#define	__db_derive_mac __db_derive_mac@DB_VERSION_UNIQUE_NAME@
-#define	__db_check_chksum __db_check_chksum@DB_VERSION_UNIQUE_NAME@
-#define	__db_SHA1Transform __db_SHA1Transform@DB_VERSION_UNIQUE_NAME@
-#define	__db_SHA1Init __db_SHA1Init@DB_VERSION_UNIQUE_NAME@
-#define	__db_SHA1Update __db_SHA1Update@DB_VERSION_UNIQUE_NAME@
-#define	__db_SHA1Final __db_SHA1Final@DB_VERSION_UNIQUE_NAME@
-#define	__lock_id __lock_id@DB_VERSION_UNIQUE_NAME@
-#define	__lock_id_free __lock_id_free@DB_VERSION_UNIQUE_NAME@
-#define	__lock_vec __lock_vec@DB_VERSION_UNIQUE_NAME@
-#define	__lock_get __lock_get@DB_VERSION_UNIQUE_NAME@
-#define	__lock_put __lock_put@DB_VERSION_UNIQUE_NAME@
-#define	__lock_downgrade __lock_downgrade@DB_VERSION_UNIQUE_NAME@
-#define	__lock_addfamilylocker __lock_addfamilylocker@DB_VERSION_UNIQUE_NAME@
-#define	__lock_freefamilylocker __lock_freefamilylocker@DB_VERSION_UNIQUE_NAME@
-#define	__lock_set_timeout __lock_set_timeout@DB_VERSION_UNIQUE_NAME@
-#define	__lock_inherit_timeout __lock_inherit_timeout@DB_VERSION_UNIQUE_NAME@
-#define	__lock_getlocker __lock_getlocker@DB_VERSION_UNIQUE_NAME@
-#define	__lock_promote __lock_promote@DB_VERSION_UNIQUE_NAME@
-#define	__lock_expired __lock_expired@DB_VERSION_UNIQUE_NAME@
-#define	__lock_detect __lock_detect@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dbenv_create __lock_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dbenv_close __lock_dbenv_close@DB_VERSION_UNIQUE_NAME@
-#define	__lock_open __lock_open@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dbenv_refresh __lock_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__lock_region_destroy __lock_region_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__lock_id_set __lock_id_set@DB_VERSION_UNIQUE_NAME@
-#define	__lock_stat __lock_stat@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dump_region __lock_dump_region@DB_VERSION_UNIQUE_NAME@
-#define	__lock_printlock __lock_printlock@DB_VERSION_UNIQUE_NAME@
-#define	__lock_cmp __lock_cmp@DB_VERSION_UNIQUE_NAME@
-#define	__lock_locker_cmp __lock_locker_cmp@DB_VERSION_UNIQUE_NAME@
-#define	__lock_ohash __lock_ohash@DB_VERSION_UNIQUE_NAME@
-#define	__lock_lhash __lock_lhash@DB_VERSION_UNIQUE_NAME@
-#define	__lock_locker_hash __lock_locker_hash@DB_VERSION_UNIQUE_NAME@
-#define	__log_open __log_open@DB_VERSION_UNIQUE_NAME@
-#define	__log_find __log_find@DB_VERSION_UNIQUE_NAME@
-#define	__log_valid __log_valid@DB_VERSION_UNIQUE_NAME@
-#define	__log_dbenv_refresh __log_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__log_stat __log_stat@DB_VERSION_UNIQUE_NAME@
-#define	__log_get_cached_ckp_lsn __log_get_cached_ckp_lsn@DB_VERSION_UNIQUE_NAME@
-#define	__log_region_destroy __log_region_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__log_vtruncate __log_vtruncate@DB_VERSION_UNIQUE_NAME@
-#define	__log_is_outdated __log_is_outdated@DB_VERSION_UNIQUE_NAME@
-#define	__log_archive __log_archive@DB_VERSION_UNIQUE_NAME@
-#define	__log_cursor __log_cursor@DB_VERSION_UNIQUE_NAME@
-#define	__log_dbenv_create __log_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__log_put __log_put@DB_VERSION_UNIQUE_NAME@
-#define	__log_txn_lsn __log_txn_lsn@DB_VERSION_UNIQUE_NAME@
-#define	__log_newfile __log_newfile@DB_VERSION_UNIQUE_NAME@
-#define	__log_flush __log_flush@DB_VERSION_UNIQUE_NAME@
-#define	__log_file __log_file@DB_VERSION_UNIQUE_NAME@
-#define	__log_name __log_name@DB_VERSION_UNIQUE_NAME@
-#define	__log_rep_put __log_rep_put@DB_VERSION_UNIQUE_NAME@
-#define	__memp_alloc __memp_alloc@DB_VERSION_UNIQUE_NAME@
-#ifdef DIAGNOSTIC
-#define	__memp_check_order __memp_check_order@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	__memp_bhwrite __memp_bhwrite@DB_VERSION_UNIQUE_NAME@
-#define	__memp_pgread __memp_pgread@DB_VERSION_UNIQUE_NAME@
-#define	__memp_pg __memp_pg@DB_VERSION_UNIQUE_NAME@
-#define	__memp_bhfree __memp_bhfree@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fget __memp_fget@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fcreate __memp_fcreate@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fopen_int __memp_fopen_int@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fclose_int __memp_fclose_int@DB_VERSION_UNIQUE_NAME@
-#define	__memp_mf_discard __memp_mf_discard@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fn __memp_fn@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fns __memp_fns@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fput __memp_fput@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fset __memp_fset@DB_VERSION_UNIQUE_NAME@
-#define	__memp_dbenv_create __memp_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__memp_open __memp_open@DB_VERSION_UNIQUE_NAME@
-#define	__memp_dbenv_refresh __memp_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__mpool_region_destroy __mpool_region_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__memp_nameop __memp_nameop@DB_VERSION_UNIQUE_NAME@
-#define	__memp_register __memp_register@DB_VERSION_UNIQUE_NAME@
-#define	__memp_stat __memp_stat@DB_VERSION_UNIQUE_NAME@
-#define	__memp_dump_region __memp_dump_region@DB_VERSION_UNIQUE_NAME@
-#define	__memp_stat_hash __memp_stat_hash@DB_VERSION_UNIQUE_NAME@
-#define	__memp_sync __memp_sync@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fsync __memp_fsync@DB_VERSION_UNIQUE_NAME@
-#define	__mp_xxx_fh __mp_xxx_fh@DB_VERSION_UNIQUE_NAME@
-#define	__memp_sync_int __memp_sync_int@DB_VERSION_UNIQUE_NAME@
-#define	__memp_trickle __memp_trickle@DB_VERSION_UNIQUE_NAME@
-#define	__db_fcntl_mutex_init __db_fcntl_mutex_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_fcntl_mutex_lock __db_fcntl_mutex_lock@DB_VERSION_UNIQUE_NAME@
-#define	__db_fcntl_mutex_unlock __db_fcntl_mutex_unlock@DB_VERSION_UNIQUE_NAME@
-#define	__db_fcntl_mutex_destroy __db_fcntl_mutex_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_pthread_mutex_init __db_pthread_mutex_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_pthread_mutex_lock __db_pthread_mutex_lock@DB_VERSION_UNIQUE_NAME@
-#define	__db_pthread_mutex_unlock __db_pthread_mutex_unlock@DB_VERSION_UNIQUE_NAME@
-#define	__db_pthread_mutex_destroy __db_pthread_mutex_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_tas_mutex_init __db_tas_mutex_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_tas_mutex_lock __db_tas_mutex_lock@DB_VERSION_UNIQUE_NAME@
-#define	__db_tas_mutex_unlock __db_tas_mutex_unlock@DB_VERSION_UNIQUE_NAME@
-#define	__db_tas_mutex_destroy __db_tas_mutex_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_win32_mutex_init __db_win32_mutex_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_win32_mutex_lock __db_win32_mutex_lock@DB_VERSION_UNIQUE_NAME@
-#define	__db_win32_mutex_unlock __db_win32_mutex_unlock@DB_VERSION_UNIQUE_NAME@
-#define	__db_win32_mutex_destroy __db_win32_mutex_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_mutex_setup __db_mutex_setup@DB_VERSION_UNIQUE_NAME@
-#define	__db_mutex_free __db_mutex_free@DB_VERSION_UNIQUE_NAME@
-#define	__db_shreg_locks_clear __db_shreg_locks_clear@DB_VERSION_UNIQUE_NAME@
-#define	__db_shreg_locks_destroy __db_shreg_locks_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_shreg_mutex_init __db_shreg_mutex_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_shreg_maintinit __db_shreg_maintinit@DB_VERSION_UNIQUE_NAME@
-#define	__os_abspath __os_abspath@DB_VERSION_UNIQUE_NAME@
-#define	__os_umalloc __os_umalloc@DB_VERSION_UNIQUE_NAME@
-#define	__os_urealloc __os_urealloc@DB_VERSION_UNIQUE_NAME@
-#define	__os_ufree __os_ufree@DB_VERSION_UNIQUE_NAME@
-#define	__os_strdup __os_strdup@DB_VERSION_UNIQUE_NAME@
-#define	__os_calloc __os_calloc@DB_VERSION_UNIQUE_NAME@
-#define	__os_malloc __os_malloc@DB_VERSION_UNIQUE_NAME@
-#define	__os_realloc __os_realloc@DB_VERSION_UNIQUE_NAME@
-#define	__os_free __os_free@DB_VERSION_UNIQUE_NAME@
-#define	__ua_memcpy __ua_memcpy@DB_VERSION_UNIQUE_NAME@
-#define	__os_clock __os_clock@DB_VERSION_UNIQUE_NAME@
-#define	__os_fs_notzero __os_fs_notzero@DB_VERSION_UNIQUE_NAME@
-#define	__os_dirlist __os_dirlist@DB_VERSION_UNIQUE_NAME@
-#define	__os_dirfree __os_dirfree@DB_VERSION_UNIQUE_NAME@
-#define	__os_get_errno_ret_zero __os_get_errno_ret_zero@DB_VERSION_UNIQUE_NAME@
-#define	__os_get_errno __os_get_errno@DB_VERSION_UNIQUE_NAME@
-#define	__os_set_errno __os_set_errno@DB_VERSION_UNIQUE_NAME@
-#define	__os_fileid __os_fileid@DB_VERSION_UNIQUE_NAME@
-#define	__os_fsync __os_fsync@DB_VERSION_UNIQUE_NAME@
-#define	__os_openhandle __os_openhandle@DB_VERSION_UNIQUE_NAME@
-#define	__os_closehandle __os_closehandle@DB_VERSION_UNIQUE_NAME@
-#define	__os_id __os_id@DB_VERSION_UNIQUE_NAME@
-#define	__os_r_sysattach __os_r_sysattach@DB_VERSION_UNIQUE_NAME@
-#define	__os_r_sysdetach __os_r_sysdetach@DB_VERSION_UNIQUE_NAME@
-#define	__os_mapfile __os_mapfile@DB_VERSION_UNIQUE_NAME@
-#define	__os_unmapfile __os_unmapfile@DB_VERSION_UNIQUE_NAME@
-#define	__db_oflags __db_oflags@DB_VERSION_UNIQUE_NAME@
-#define	__db_omode __db_omode@DB_VERSION_UNIQUE_NAME@
-#define	__os_open __os_open@DB_VERSION_UNIQUE_NAME@
-#ifdef HAVE_QNX
-#define	__os_shmname __os_shmname@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	__os_r_attach __os_r_attach@DB_VERSION_UNIQUE_NAME@
-#define	__os_r_detach __os_r_detach@DB_VERSION_UNIQUE_NAME@
-#define	__os_rename __os_rename@DB_VERSION_UNIQUE_NAME@
-#define	__os_isroot __os_isroot@DB_VERSION_UNIQUE_NAME@
-#define	__db_rpath __db_rpath@DB_VERSION_UNIQUE_NAME@
-#define	__os_io __os_io@DB_VERSION_UNIQUE_NAME@
-#define	__os_read __os_read@DB_VERSION_UNIQUE_NAME@
-#define	__os_write __os_write@DB_VERSION_UNIQUE_NAME@
-#define	__os_seek __os_seek@DB_VERSION_UNIQUE_NAME@
-#define	__os_sleep __os_sleep@DB_VERSION_UNIQUE_NAME@
-#define	__os_spin __os_spin@DB_VERSION_UNIQUE_NAME@
-#define	__os_yield __os_yield@DB_VERSION_UNIQUE_NAME@
-#define	__os_exists __os_exists@DB_VERSION_UNIQUE_NAME@
-#define	__os_ioinfo __os_ioinfo@DB_VERSION_UNIQUE_NAME@
-#define	__os_tmpdir __os_tmpdir@DB_VERSION_UNIQUE_NAME@
-#define	__os_region_unlink __os_region_unlink@DB_VERSION_UNIQUE_NAME@
-#define	__os_unlink __os_unlink@DB_VERSION_UNIQUE_NAME@
-#if defined(DB_WIN32)
-#define	__os_win32_errno __os_win32_errno@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	__os_fsync __os_fsync@DB_VERSION_UNIQUE_NAME@
-#define	__os_openhandle __os_openhandle@DB_VERSION_UNIQUE_NAME@
-#define	__os_closehandle __os_closehandle@DB_VERSION_UNIQUE_NAME@
-#define	__os_io __os_io@DB_VERSION_UNIQUE_NAME@
-#define	__os_read __os_read@DB_VERSION_UNIQUE_NAME@
-#define	__os_write __os_write@DB_VERSION_UNIQUE_NAME@
-#define	__os_exists __os_exists@DB_VERSION_UNIQUE_NAME@
-#define	__os_ioinfo __os_ioinfo@DB_VERSION_UNIQUE_NAME@
-#define	__os_is_winnt __os_is_winnt@DB_VERSION_UNIQUE_NAME@
-#define	__qam_position __qam_position@DB_VERSION_UNIQUE_NAME@
-#define	__qam_pitem __qam_pitem@DB_VERSION_UNIQUE_NAME@
-#define	__qam_append __qam_append@DB_VERSION_UNIQUE_NAME@
-#define	__qam_c_dup __qam_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__qam_c_init __qam_c_init@DB_VERSION_UNIQUE_NAME@
-#define	__qam_truncate __qam_truncate@DB_VERSION_UNIQUE_NAME@
-#define	__qam_incfirst_log __qam_incfirst_log@DB_VERSION_UNIQUE_NAME@
-#define	__qam_incfirst_getpgnos __qam_incfirst_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__qam_incfirst_print __qam_incfirst_print@DB_VERSION_UNIQUE_NAME@
-#define	__qam_incfirst_read __qam_incfirst_read@DB_VERSION_UNIQUE_NAME@
-#define	__qam_mvptr_log __qam_mvptr_log@DB_VERSION_UNIQUE_NAME@
-#define	__qam_mvptr_getpgnos __qam_mvptr_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__qam_mvptr_print __qam_mvptr_print@DB_VERSION_UNIQUE_NAME@
-#define	__qam_mvptr_read __qam_mvptr_read@DB_VERSION_UNIQUE_NAME@
-#define	__qam_del_log __qam_del_log@DB_VERSION_UNIQUE_NAME@
-#define	__qam_del_getpgnos __qam_del_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__qam_del_print __qam_del_print@DB_VERSION_UNIQUE_NAME@
-#define	__qam_del_read __qam_del_read@DB_VERSION_UNIQUE_NAME@
-#define	__qam_add_log __qam_add_log@DB_VERSION_UNIQUE_NAME@
-#define	__qam_add_getpgnos __qam_add_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__qam_add_print __qam_add_print@DB_VERSION_UNIQUE_NAME@
-#define	__qam_add_read __qam_add_read@DB_VERSION_UNIQUE_NAME@
-#define	__qam_delext_log __qam_delext_log@DB_VERSION_UNIQUE_NAME@
-#define	__qam_delext_getpgnos __qam_delext_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__qam_delext_print __qam_delext_print@DB_VERSION_UNIQUE_NAME@
-#define	__qam_delext_read __qam_delext_read@DB_VERSION_UNIQUE_NAME@
-#define	__qam_init_print __qam_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__qam_init_getpgnos __qam_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__qam_init_recover __qam_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__qam_mswap __qam_mswap@DB_VERSION_UNIQUE_NAME@
-#define	__qam_pgin_out __qam_pgin_out@DB_VERSION_UNIQUE_NAME@
-#define	__qam_fprobe __qam_fprobe@DB_VERSION_UNIQUE_NAME@
-#define	__qam_fclose __qam_fclose@DB_VERSION_UNIQUE_NAME@
-#define	__qam_fremove __qam_fremove@DB_VERSION_UNIQUE_NAME@
-#define	__qam_sync __qam_sync@DB_VERSION_UNIQUE_NAME@
-#define	__qam_gen_filelist __qam_gen_filelist@DB_VERSION_UNIQUE_NAME@
-#define	__qam_extent_names __qam_extent_names@DB_VERSION_UNIQUE_NAME@
-#define	__qam_exid __qam_exid@DB_VERSION_UNIQUE_NAME@
-#define	__qam_db_create __qam_db_create@DB_VERSION_UNIQUE_NAME@
-#define	__qam_db_close __qam_db_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_prqueue __db_prqueue@DB_VERSION_UNIQUE_NAME@
-#define	__qam_remove __qam_remove@DB_VERSION_UNIQUE_NAME@
-#define	__qam_rename __qam_rename@DB_VERSION_UNIQUE_NAME@
-#define	__qam_open __qam_open@DB_VERSION_UNIQUE_NAME@
-#define	__qam_metachk __qam_metachk@DB_VERSION_UNIQUE_NAME@
-#define	__qam_new_file __qam_new_file@DB_VERSION_UNIQUE_NAME@
-#define	__qam_incfirst_recover __qam_incfirst_recover@DB_VERSION_UNIQUE_NAME@
-#define	__qam_mvptr_recover __qam_mvptr_recover@DB_VERSION_UNIQUE_NAME@
-#define	__qam_del_recover __qam_del_recover@DB_VERSION_UNIQUE_NAME@
-#define	__qam_delext_recover __qam_delext_recover@DB_VERSION_UNIQUE_NAME@
-#define	__qam_add_recover __qam_add_recover@DB_VERSION_UNIQUE_NAME@
-#define	__qam_stat __qam_stat@DB_VERSION_UNIQUE_NAME@
-#define	__qam_31_qammeta __qam_31_qammeta@DB_VERSION_UNIQUE_NAME@
-#define	__qam_32_qammeta __qam_32_qammeta@DB_VERSION_UNIQUE_NAME@
-#define	__qam_vrfy_meta __qam_vrfy_meta@DB_VERSION_UNIQUE_NAME@
-#define	__qam_vrfy_data __qam_vrfy_data@DB_VERSION_UNIQUE_NAME@
-#define	__qam_vrfy_structure __qam_vrfy_structure@DB_VERSION_UNIQUE_NAME@
-#define	__rep_dbenv_create __rep_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__rep_process_message __rep_process_message@DB_VERSION_UNIQUE_NAME@
-#define	__rep_process_txn __rep_process_txn@DB_VERSION_UNIQUE_NAME@
-#define	__rep_region_init __rep_region_init@DB_VERSION_UNIQUE_NAME@
-#define	__rep_region_destroy __rep_region_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__rep_dbenv_close __rep_dbenv_close@DB_VERSION_UNIQUE_NAME@
-#define	__rep_preclose __rep_preclose@DB_VERSION_UNIQUE_NAME@
-#define	__rep_check_alloc __rep_check_alloc@DB_VERSION_UNIQUE_NAME@
-#define	__rep_send_message __rep_send_message@DB_VERSION_UNIQUE_NAME@
-#define	__rep_new_master __rep_new_master@DB_VERSION_UNIQUE_NAME@
-#define	__rep_lockpgno_init __rep_lockpgno_init@DB_VERSION_UNIQUE_NAME@
-#define	__rep_unlockpages __rep_unlockpages@DB_VERSION_UNIQUE_NAME@
-#define	__rep_lockpages __rep_lockpages@DB_VERSION_UNIQUE_NAME@
-#define	__rep_is_client __rep_is_client@DB_VERSION_UNIQUE_NAME@
-#define	__rep_send_vote __rep_send_vote@DB_VERSION_UNIQUE_NAME@
-#define	__rep_grow_sites __rep_grow_sites@DB_VERSION_UNIQUE_NAME@
-#define	__rep_print_message __rep_print_message@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_envrpcserver __dbcl_envrpcserver@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_open_wrap __dbcl_env_open_wrap@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_open_wrap __dbcl_db_open_wrap@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_refresh __dbcl_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_retcopy __dbcl_retcopy@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_end __dbcl_txn_end@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_setup __dbcl_txn_setup@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_c_refresh __dbcl_c_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_c_setup __dbcl_c_setup@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbclose_common __dbcl_dbclose_common@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_alloc __dbcl_env_alloc@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_app_dispatch __dbcl_set_app_dispatch@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_cachesize __dbcl_env_cachesize@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_close __dbcl_env_close@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_create __dbcl_env_create@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_data_dir __dbcl_set_data_dir@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_dbremove __dbcl_env_dbremove@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_dbrename __dbcl_env_dbrename@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_encrypt __dbcl_env_encrypt@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_set_feedback __dbcl_env_set_feedback@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_flags __dbcl_env_flags@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lg_bsize __dbcl_set_lg_bsize@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lg_dir __dbcl_set_lg_dir@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lg_max __dbcl_set_lg_max@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lg_regionmax __dbcl_set_lg_regionmax@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lk_conflict __dbcl_set_lk_conflict@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lk_detect __dbcl_set_lk_detect@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lk_max __dbcl_set_lk_max@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lk_max_locks __dbcl_set_lk_max_locks@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lk_max_lockers __dbcl_set_lk_max_lockers@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_lk_max_objects __dbcl_set_lk_max_objects@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_mp_mmapsize __dbcl_set_mp_mmapsize@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_open __dbcl_env_open@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_paniccall __dbcl_env_paniccall@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_remove __dbcl_env_remove@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_shm_key __dbcl_set_shm_key@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_tas_spins __dbcl_set_tas_spins@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_timeout __dbcl_set_timeout@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_tmp_dir __dbcl_set_tmp_dir@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_tx_max __dbcl_set_tx_max@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_tx_timestamp __dbcl_set_tx_timestamp@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_set_verbose __dbcl_set_verbose@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_abort __dbcl_txn_abort@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_begin __dbcl_txn_begin@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_checkpoint __dbcl_txn_checkpoint@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_commit __dbcl_txn_commit@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_discard __dbcl_txn_discard@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_prepare __dbcl_txn_prepare@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_recover __dbcl_txn_recover@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_stat __dbcl_txn_stat@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_timeout __dbcl_txn_timeout@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_elect __dbcl_rep_elect@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_flush __dbcl_rep_flush@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_process_message __dbcl_rep_process_message@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_set_limit __dbcl_rep_set_limit@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_set_request __dbcl_rep_set_request@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_set_rep_transport __dbcl_rep_set_rep_transport@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_start __dbcl_rep_start@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_rep_stat __dbcl_rep_stat@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_alloc __dbcl_db_alloc@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_associate __dbcl_db_associate@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_bt_compare __dbcl_db_bt_compare@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_bt_maxkey __dbcl_db_bt_maxkey@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_bt_minkey __dbcl_db_bt_minkey@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_bt_prefix __dbcl_db_bt_prefix@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_set_append_recno __dbcl_db_set_append_recno@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_cache_priority __dbcl_db_cache_priority@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_cachesize __dbcl_db_cachesize@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_close __dbcl_db_close@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_create __dbcl_db_create@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_del __dbcl_db_del@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_dup_compare __dbcl_db_dup_compare@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_encrypt __dbcl_db_encrypt@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_extentsize __dbcl_db_extentsize@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_fd __dbcl_db_fd@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_feedback __dbcl_db_feedback@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_flags __dbcl_db_flags@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_get __dbcl_db_get@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_h_ffactor __dbcl_db_h_ffactor@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_h_hash __dbcl_db_h_hash@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_h_nelem __dbcl_db_h_nelem@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_key_range __dbcl_db_key_range@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_lorder __dbcl_db_lorder@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_open __dbcl_db_open@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_pagesize __dbcl_db_pagesize@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_panic __dbcl_db_panic@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_pget __dbcl_db_pget@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_put __dbcl_db_put@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_re_delim __dbcl_db_re_delim@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_re_len __dbcl_db_re_len@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_re_pad __dbcl_db_re_pad@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_re_source __dbcl_db_re_source@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_remove __dbcl_db_remove@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_rename __dbcl_db_rename@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_stat __dbcl_db_stat@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_sync __dbcl_db_sync@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_truncate __dbcl_db_truncate@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_upgrade __dbcl_db_upgrade@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_verify __dbcl_db_verify@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_cursor __dbcl_db_cursor@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_join __dbcl_db_join@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_close __dbcl_dbc_close@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_count __dbcl_dbc_count@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_del __dbcl_dbc_del@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_dup __dbcl_dbc_dup@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_get __dbcl_dbc_get@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_pget __dbcl_dbc_pget@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_put __dbcl_dbc_put@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_detect __dbcl_lock_detect@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_get __dbcl_lock_get@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_id __dbcl_lock_id@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_id_free __dbcl_lock_id_free@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_put __dbcl_lock_put@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_stat __dbcl_lock_stat@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_lock_vec __dbcl_lock_vec@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_log_archive __dbcl_log_archive@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_log_cursor __dbcl_log_cursor@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_log_file __dbcl_log_file@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_log_flush __dbcl_log_flush@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_log_put __dbcl_log_put@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_log_stat __dbcl_log_stat@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_memp_fcreate __dbcl_memp_fcreate@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_memp_register __dbcl_memp_register@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_memp_stat __dbcl_memp_stat@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_memp_sync __dbcl_memp_sync@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_memp_trickle __dbcl_memp_trickle@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_close_ret __dbcl_env_close_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_create_ret __dbcl_env_create_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_open_ret __dbcl_env_open_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_env_remove_ret __dbcl_env_remove_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_abort_ret __dbcl_txn_abort_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_begin_ret __dbcl_txn_begin_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_commit_ret __dbcl_txn_commit_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_discard_ret __dbcl_txn_discard_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_txn_recover_ret __dbcl_txn_recover_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_close_ret __dbcl_db_close_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_create_ret __dbcl_db_create_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_get_ret __dbcl_db_get_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_key_range_ret __dbcl_db_key_range_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_open_ret __dbcl_db_open_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_pget_ret __dbcl_db_pget_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_put_ret __dbcl_db_put_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_remove_ret __dbcl_db_remove_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_rename_ret __dbcl_db_rename_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_stat_ret __dbcl_db_stat_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_truncate_ret __dbcl_db_truncate_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_cursor_ret __dbcl_db_cursor_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_db_join_ret __dbcl_db_join_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_close_ret __dbcl_dbc_close_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_count_ret __dbcl_dbc_count_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_dup_ret __dbcl_dbc_dup_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_get_ret __dbcl_dbc_get_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_pget_ret __dbcl_dbc_pget_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_put_ret __dbcl_dbc_put_ret@DB_VERSION_UNIQUE_NAME@
-#define	__env_cachesize_proc __env_cachesize_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_close_proc __env_close_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_create_proc __env_create_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_dbremove_proc __env_dbremove_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_dbrename_proc __env_dbrename_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_encrypt_proc __env_encrypt_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_flags_proc __env_flags_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_open_proc __env_open_proc@DB_VERSION_UNIQUE_NAME@
-#define	__env_remove_proc __env_remove_proc@DB_VERSION_UNIQUE_NAME@
-#define	__txn_abort_proc __txn_abort_proc@DB_VERSION_UNIQUE_NAME@
-#define	__txn_begin_proc __txn_begin_proc@DB_VERSION_UNIQUE_NAME@
-#define	__txn_commit_proc __txn_commit_proc@DB_VERSION_UNIQUE_NAME@
-#define	__txn_discard_proc __txn_discard_proc@DB_VERSION_UNIQUE_NAME@
-#define	__txn_prepare_proc __txn_prepare_proc@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recover_proc __txn_recover_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_bt_maxkey_proc __db_bt_maxkey_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_associate_proc __db_associate_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_bt_minkey_proc __db_bt_minkey_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_close_proc __db_close_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_create_proc __db_create_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_del_proc __db_del_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_encrypt_proc __db_encrypt_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_extentsize_proc __db_extentsize_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_flags_proc __db_flags_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_get_proc __db_get_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_h_ffactor_proc __db_h_ffactor_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_h_nelem_proc __db_h_nelem_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_key_range_proc __db_key_range_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_lorder_proc __db_lorder_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_open_proc __db_open_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_pagesize_proc __db_pagesize_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_pget_proc __db_pget_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_put_proc __db_put_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_re_delim_proc __db_re_delim_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_re_len_proc __db_re_len_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_re_pad_proc __db_re_pad_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_remove_proc __db_remove_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_rename_proc __db_rename_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_stat_proc __db_stat_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_sync_proc __db_sync_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_truncate_proc __db_truncate_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_cursor_proc __db_cursor_proc@DB_VERSION_UNIQUE_NAME@
-#define	__db_join_proc __db_join_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_close_proc __dbc_close_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_count_proc __dbc_count_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_del_proc __dbc_del_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_dup_proc __dbc_dup_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_get_proc __dbc_get_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_pget_proc __dbc_pget_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_put_proc __dbc_put_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbsrv_settimeout __dbsrv_settimeout@DB_VERSION_UNIQUE_NAME@
-#define	__dbsrv_timeout __dbsrv_timeout@DB_VERSION_UNIQUE_NAME@
-#define	__dbclear_ctp __dbclear_ctp@DB_VERSION_UNIQUE_NAME@
-#define	__dbdel_ctp __dbdel_ctp@DB_VERSION_UNIQUE_NAME@
-#define	new_ct_ent new_ct_ent@DB_VERSION_UNIQUE_NAME@
-#define	get_tableent get_tableent@DB_VERSION_UNIQUE_NAME@
-#define	__dbsrv_sharedb __dbsrv_sharedb@DB_VERSION_UNIQUE_NAME@
-#define	__dbsrv_shareenv __dbsrv_shareenv@DB_VERSION_UNIQUE_NAME@
-#define	__dbsrv_active __dbsrv_active@DB_VERSION_UNIQUE_NAME@
-#define	__db_close_int __db_close_int@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_close_int __dbc_close_int@DB_VERSION_UNIQUE_NAME@
-#define	__dbenv_close_int __dbenv_close_int@DB_VERSION_UNIQUE_NAME@
-#define	get_home get_home@DB_VERSION_UNIQUE_NAME@
-#define	bdb_HCommand bdb_HCommand@DB_VERSION_UNIQUE_NAME@
-#if DB_DBM_HSEARCH != 0
-#define	bdb_NdbmOpen bdb_NdbmOpen@DB_VERSION_UNIQUE_NAME@
-#endif
-#if DB_DBM_HSEARCH != 0
-#define	bdb_DbmCommand bdb_DbmCommand@DB_VERSION_UNIQUE_NAME@
-#endif
-#define	ndbm_Cmd ndbm_Cmd@DB_VERSION_UNIQUE_NAME@
-#define	_DbInfoDelete _DbInfoDelete@DB_VERSION_UNIQUE_NAME@
-#define	db_Cmd db_Cmd@DB_VERSION_UNIQUE_NAME@
-#define	dbc_Cmd dbc_Cmd@DB_VERSION_UNIQUE_NAME@
-#define	env_Cmd env_Cmd@DB_VERSION_UNIQUE_NAME@
-#define	tcl_EnvRemove tcl_EnvRemove@DB_VERSION_UNIQUE_NAME@
-#define	tcl_EnvVerbose tcl_EnvVerbose@DB_VERSION_UNIQUE_NAME@
-#define	tcl_EnvAttr tcl_EnvAttr@DB_VERSION_UNIQUE_NAME@
-#define	tcl_EnvTest tcl_EnvTest@DB_VERSION_UNIQUE_NAME@
-#define	_NewInfo _NewInfo@DB_VERSION_UNIQUE_NAME@
-#define	_NameToPtr _NameToPtr@DB_VERSION_UNIQUE_NAME@
-#define	_PtrToInfo _PtrToInfo@DB_VERSION_UNIQUE_NAME@
-#define	_NameToInfo _NameToInfo@DB_VERSION_UNIQUE_NAME@
-#define	_SetInfoData _SetInfoData@DB_VERSION_UNIQUE_NAME@
-#define	_DeleteInfo _DeleteInfo@DB_VERSION_UNIQUE_NAME@
-#define	_SetListElem _SetListElem@DB_VERSION_UNIQUE_NAME@
-#define	_SetListElemInt _SetListElemInt@DB_VERSION_UNIQUE_NAME@
-#define	_SetListRecnoElem _SetListRecnoElem@DB_VERSION_UNIQUE_NAME@
-#define	_Set3DBTList _Set3DBTList@DB_VERSION_UNIQUE_NAME@
-#define	_SetMultiList _SetMultiList@DB_VERSION_UNIQUE_NAME@
-#define	_GetGlobPrefix _GetGlobPrefix@DB_VERSION_UNIQUE_NAME@
-#define	_ReturnSetup _ReturnSetup@DB_VERSION_UNIQUE_NAME@
-#define	_ErrorSetup _ErrorSetup@DB_VERSION_UNIQUE_NAME@
-#define	_ErrorFunc _ErrorFunc@DB_VERSION_UNIQUE_NAME@
-#define	_GetLsn _GetLsn@DB_VERSION_UNIQUE_NAME@
-#define	_GetUInt32 _GetUInt32@DB_VERSION_UNIQUE_NAME@
-#define	_GetFlagsList _GetFlagsList@DB_VERSION_UNIQUE_NAME@
-#define	_debug_check _debug_check@DB_VERSION_UNIQUE_NAME@
-#define	_CopyObjBytes _CopyObjBytes@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LockDetect tcl_LockDetect@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LockGet tcl_LockGet@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LockStat tcl_LockStat@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LockTimeout tcl_LockTimeout@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LockVec tcl_LockVec@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogArchive tcl_LogArchive@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogCompare tcl_LogCompare@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogFile tcl_LogFile@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogFlush tcl_LogFlush@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogGet tcl_LogGet@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogPut tcl_LogPut@DB_VERSION_UNIQUE_NAME@
-#define	tcl_LogStat tcl_LogStat@DB_VERSION_UNIQUE_NAME@
-#define	logc_Cmd logc_Cmd@DB_VERSION_UNIQUE_NAME@
-#define	_MpInfoDelete _MpInfoDelete@DB_VERSION_UNIQUE_NAME@
-#define	tcl_MpSync tcl_MpSync@DB_VERSION_UNIQUE_NAME@
-#define	tcl_MpTrickle tcl_MpTrickle@DB_VERSION_UNIQUE_NAME@
-#define	tcl_Mp tcl_Mp@DB_VERSION_UNIQUE_NAME@
-#define	tcl_MpStat tcl_MpStat@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepElect tcl_RepElect@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepFlush tcl_RepFlush@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepLimit tcl_RepLimit@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepRequest tcl_RepRequest@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepStart tcl_RepStart@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepProcessMessage tcl_RepProcessMessage@DB_VERSION_UNIQUE_NAME@
-#define	tcl_RepStat tcl_RepStat@DB_VERSION_UNIQUE_NAME@
-#define	_TxnInfoDelete _TxnInfoDelete@DB_VERSION_UNIQUE_NAME@
-#define	tcl_TxnCheckpoint tcl_TxnCheckpoint@DB_VERSION_UNIQUE_NAME@
-#define	tcl_Txn tcl_Txn@DB_VERSION_UNIQUE_NAME@
-#define	tcl_TxnStat tcl_TxnStat@DB_VERSION_UNIQUE_NAME@
-#define	tcl_TxnTimeout tcl_TxnTimeout@DB_VERSION_UNIQUE_NAME@
-#define	tcl_TxnRecover tcl_TxnRecover@DB_VERSION_UNIQUE_NAME@
-#define	bdb_RandCommand bdb_RandCommand@DB_VERSION_UNIQUE_NAME@
-#define	tcl_Mutex tcl_Mutex@DB_VERSION_UNIQUE_NAME@
-#define	__txn_begin __txn_begin@DB_VERSION_UNIQUE_NAME@
-#define	__txn_xa_begin __txn_xa_begin@DB_VERSION_UNIQUE_NAME@
-#define	__txn_compensate_begin __txn_compensate_begin@DB_VERSION_UNIQUE_NAME@
-#define	__txn_commit __txn_commit@DB_VERSION_UNIQUE_NAME@
-#define	__txn_abort __txn_abort@DB_VERSION_UNIQUE_NAME@
-#define	__txn_discard __txn_discard@DB_VERSION_UNIQUE_NAME@
-#define	__txn_prepare __txn_prepare@DB_VERSION_UNIQUE_NAME@
-#define	__txn_id __txn_id@DB_VERSION_UNIQUE_NAME@
-#define	__txn_checkpoint __txn_checkpoint@DB_VERSION_UNIQUE_NAME@
-#define	__txn_getckp __txn_getckp@DB_VERSION_UNIQUE_NAME@
-#define	__txn_activekids __txn_activekids@DB_VERSION_UNIQUE_NAME@
-#define	__txn_force_abort __txn_force_abort@DB_VERSION_UNIQUE_NAME@
-#define	__txn_preclose __txn_preclose@DB_VERSION_UNIQUE_NAME@
-#define	__txn_reset __txn_reset@DB_VERSION_UNIQUE_NAME@
-#define	__txn_updateckp __txn_updateckp@DB_VERSION_UNIQUE_NAME@
-#define	__txn_regop_log __txn_regop_log@DB_VERSION_UNIQUE_NAME@
-#define	__txn_regop_getpgnos __txn_regop_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__txn_regop_print __txn_regop_print@DB_VERSION_UNIQUE_NAME@
-#define	__txn_regop_read __txn_regop_read@DB_VERSION_UNIQUE_NAME@
-#define	__txn_ckp_log __txn_ckp_log@DB_VERSION_UNIQUE_NAME@
-#define	__txn_ckp_getpgnos __txn_ckp_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__txn_ckp_print __txn_ckp_print@DB_VERSION_UNIQUE_NAME@
-#define	__txn_ckp_read __txn_ckp_read@DB_VERSION_UNIQUE_NAME@
-#define	__txn_child_log __txn_child_log@DB_VERSION_UNIQUE_NAME@
-#define	__txn_child_getpgnos __txn_child_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__txn_child_print __txn_child_print@DB_VERSION_UNIQUE_NAME@
-#define	__txn_child_read __txn_child_read@DB_VERSION_UNIQUE_NAME@
-#define	__txn_xa_regop_log __txn_xa_regop_log@DB_VERSION_UNIQUE_NAME@
-#define	__txn_xa_regop_getpgnos __txn_xa_regop_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__txn_xa_regop_print __txn_xa_regop_print@DB_VERSION_UNIQUE_NAME@
-#define	__txn_xa_regop_read __txn_xa_regop_read@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recycle_log __txn_recycle_log@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recycle_getpgnos __txn_recycle_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recycle_print __txn_recycle_print@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recycle_read __txn_recycle_read@DB_VERSION_UNIQUE_NAME@
-#define	__txn_init_print __txn_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__txn_init_getpgnos __txn_init_getpgnos@DB_VERSION_UNIQUE_NAME@
-#define	__txn_init_recover __txn_init_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_dbenv_create __txn_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__txn_regop_recover __txn_regop_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_xa_regop_recover __txn_xa_regop_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_ckp_recover __txn_ckp_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_child_recover __txn_child_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_restore_txn __txn_restore_txn@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recycle_recover __txn_recycle_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_continue __txn_continue@DB_VERSION_UNIQUE_NAME@
-#define	__txn_map_gid __txn_map_gid@DB_VERSION_UNIQUE_NAME@
-#define	__txn_recover __txn_recover@DB_VERSION_UNIQUE_NAME@
-#define	__txn_get_prepared __txn_get_prepared@DB_VERSION_UNIQUE_NAME@
-#define	__txn_open __txn_open@DB_VERSION_UNIQUE_NAME@
-#define	__txn_dbenv_refresh __txn_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__txn_region_destroy __txn_region_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__txn_id_set __txn_id_set@DB_VERSION_UNIQUE_NAME@
-#define	__txn_stat __txn_stat@DB_VERSION_UNIQUE_NAME@
-#define	__txn_remevent __txn_remevent@DB_VERSION_UNIQUE_NAME@
-#define	__txn_lockevent __txn_lockevent@DB_VERSION_UNIQUE_NAME@
-#define	__txn_remlock __txn_remlock@DB_VERSION_UNIQUE_NAME@
-#define	__txn_doevents __txn_doevents@DB_VERSION_UNIQUE_NAME@
-#define	__db_xa_create __db_xa_create@DB_VERSION_UNIQUE_NAME@
-#define	__db_rmid_to_env __db_rmid_to_env@DB_VERSION_UNIQUE_NAME@
-#define	__db_xid_to_txn __db_xid_to_txn@DB_VERSION_UNIQUE_NAME@
-#define	__db_map_rmid __db_map_rmid@DB_VERSION_UNIQUE_NAME@
-#define	__db_unmap_rmid __db_unmap_rmid@DB_VERSION_UNIQUE_NAME@
-#define	__db_map_xid __db_map_xid@DB_VERSION_UNIQUE_NAME@
-#define	__db_unmap_xid __db_unmap_xid@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_cachesize_msg xdr___env_cachesize_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_cachesize_reply xdr___env_cachesize_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_close_msg xdr___env_close_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_close_reply xdr___env_close_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_create_msg xdr___env_create_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_create_reply xdr___env_create_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_dbremove_msg xdr___env_dbremove_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_dbremove_reply xdr___env_dbremove_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_dbrename_msg xdr___env_dbrename_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_dbrename_reply xdr___env_dbrename_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_encrypt_msg xdr___env_encrypt_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_encrypt_reply xdr___env_encrypt_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_flags_msg xdr___env_flags_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_flags_reply xdr___env_flags_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_open_msg xdr___env_open_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_open_reply xdr___env_open_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_remove_msg xdr___env_remove_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___env_remove_reply xdr___env_remove_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_abort_msg xdr___txn_abort_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_abort_reply xdr___txn_abort_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_begin_msg xdr___txn_begin_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_begin_reply xdr___txn_begin_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_commit_msg xdr___txn_commit_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_commit_reply xdr___txn_commit_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_discard_msg xdr___txn_discard_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_discard_reply xdr___txn_discard_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_prepare_msg xdr___txn_prepare_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_prepare_reply xdr___txn_prepare_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_recover_msg xdr___txn_recover_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___txn_recover_reply xdr___txn_recover_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_associate_msg xdr___db_associate_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_associate_reply xdr___db_associate_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_bt_maxkey_msg xdr___db_bt_maxkey_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_bt_maxkey_reply xdr___db_bt_maxkey_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_bt_minkey_msg xdr___db_bt_minkey_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_bt_minkey_reply xdr___db_bt_minkey_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_close_msg xdr___db_close_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_close_reply xdr___db_close_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_create_msg xdr___db_create_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_create_reply xdr___db_create_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_del_msg xdr___db_del_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_del_reply xdr___db_del_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_encrypt_msg xdr___db_encrypt_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_encrypt_reply xdr___db_encrypt_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_extentsize_msg xdr___db_extentsize_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_extentsize_reply xdr___db_extentsize_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_flags_msg xdr___db_flags_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_flags_reply xdr___db_flags_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_get_msg xdr___db_get_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_get_reply xdr___db_get_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_h_ffactor_msg xdr___db_h_ffactor_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_h_ffactor_reply xdr___db_h_ffactor_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_h_nelem_msg xdr___db_h_nelem_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_h_nelem_reply xdr___db_h_nelem_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_key_range_msg xdr___db_key_range_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_key_range_reply xdr___db_key_range_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_lorder_msg xdr___db_lorder_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_lorder_reply xdr___db_lorder_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_open_msg xdr___db_open_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_open_reply xdr___db_open_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_pagesize_msg xdr___db_pagesize_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_pagesize_reply xdr___db_pagesize_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_pget_msg xdr___db_pget_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_pget_reply xdr___db_pget_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_put_msg xdr___db_put_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_put_reply xdr___db_put_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_re_delim_msg xdr___db_re_delim_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_re_delim_reply xdr___db_re_delim_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_re_len_msg xdr___db_re_len_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_re_len_reply xdr___db_re_len_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_re_pad_msg xdr___db_re_pad_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_re_pad_reply xdr___db_re_pad_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_remove_msg xdr___db_remove_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_remove_reply xdr___db_remove_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_rename_msg xdr___db_rename_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_rename_reply xdr___db_rename_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_stat_msg xdr___db_stat_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_stat_reply xdr___db_stat_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_sync_msg xdr___db_sync_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_sync_reply xdr___db_sync_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_truncate_msg xdr___db_truncate_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_truncate_reply xdr___db_truncate_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_cursor_msg xdr___db_cursor_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_cursor_reply xdr___db_cursor_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_join_msg xdr___db_join_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___db_join_reply xdr___db_join_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_close_msg xdr___dbc_close_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_close_reply xdr___dbc_close_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_count_msg xdr___dbc_count_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_count_reply xdr___dbc_count_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_del_msg xdr___dbc_del_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_del_reply xdr___dbc_del_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_dup_msg xdr___dbc_dup_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_dup_reply xdr___dbc_dup_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_get_msg xdr___dbc_get_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_get_reply xdr___dbc_get_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_pget_msg xdr___dbc_pget_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_pget_reply xdr___dbc_pget_reply@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_put_msg xdr___dbc_put_msg@DB_VERSION_UNIQUE_NAME@
-#define xdr___dbc_put_reply xdr___dbc_put_reply@DB_VERSION_UNIQUE_NAME@
-#define __db_global_values __db_global_values@DB_VERSION_UNIQUE_NAME@
-#define __db_jump __db_jump@DB_VERSION_UNIQUE_NAME@
-
-#endif /* !_DB_INT_DEF_IN_ */
diff --git a/libdb/dbinc_auto/lock_ext.h b/libdb/dbinc_auto/lock_ext.h
deleted file mode 100644
index be6b1d06d..000000000
--- a/libdb/dbinc_auto/lock_ext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_lock_ext_h_
-#define	_lock_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __lock_id __P((DB_ENV *, u_int32_t *));
-int __lock_id_free __P((DB_ENV *, u_int32_t));
-int __lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-int __lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-int  __lock_put __P((DB_ENV *, DB_LOCK *));
-int __lock_downgrade __P((DB_ENV *, DB_LOCK *, db_lockmode_t, u_int32_t));
-int __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
-int __lock_freefamilylocker  __P((DB_LOCKTAB *, u_int32_t));
-int __lock_set_timeout __P(( DB_ENV *, u_int32_t, db_timeout_t, u_int32_t));
-int __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
-int __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, u_int32_t, int, DB_LOCKER **));
-int __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, u_int32_t));
-int __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
-int __lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
-void __lock_dbenv_create __P((DB_ENV *));
-void __lock_dbenv_close __P((DB_ENV *));
-int __lock_open __P((DB_ENV *));
-int __lock_dbenv_refresh __P((DB_ENV *));
-void __lock_region_destroy __P((DB_ENV *, REGINFO *));
-int __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-int __lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-int __lock_dump_region __P((DB_ENV *, char *, FILE *));
-void __lock_printlock __P((DB_LOCKTAB *, struct __db_lock *, int));
-int __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
-int __lock_locker_cmp __P((u_int32_t, DB_LOCKER *));
-u_int32_t __lock_ohash __P((const DBT *));
-u_int32_t __lock_lhash __P((DB_LOCKOBJ *));
-u_int32_t __lock_locker_hash __P((u_int32_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_lock_ext_h_ */
diff --git a/libdb/dbinc_auto/log_ext.h b/libdb/dbinc_auto/log_ext.h
deleted file mode 100644
index 6fc69afd2..000000000
--- a/libdb/dbinc_auto/log_ext.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_log_ext_h_
-#define	_log_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __log_open __P((DB_ENV *));
-int __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
-int __log_valid __P((DB_LOG *, u_int32_t, int, logfile_validity *));
-int __log_dbenv_refresh __P((DB_ENV *));
-int __log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-void __log_get_cached_ckp_lsn __P((DB_ENV *, DB_LSN *));
-void __log_region_destroy __P((DB_ENV *, REGINFO *));
-int __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *));
-int __log_is_outdated __P((DB_ENV *dbenv, u_int32_t fnum, int *outdatedp));
-int __log_archive __P((DB_ENV *, char **[], u_int32_t));
-int __log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
-void __log_dbenv_create __P((DB_ENV *));
-int __log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
-void __log_txn_lsn __P((DB_ENV *, DB_LSN *, u_int32_t *, u_int32_t *));
-int __log_newfile __P((DB_LOG *, DB_LSN *));
-int __log_flush __P((DB_ENV *, const DB_LSN *));
-int __log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
-int __log_name __P((DB_LOG *, u_int32_t, char **, DB_FH *, u_int32_t));
-int __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_log_ext_h_ */
diff --git a/libdb/dbinc_auto/mp_ext.h b/libdb/dbinc_auto/mp_ext.h
deleted file mode 100644
index ceadb3d9a..000000000
--- a/libdb/dbinc_auto/mp_ext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_mp_ext_h_
-#define	_mp_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __memp_alloc __P((DB_MPOOL *, REGINFO *, MPOOLFILE *, size_t, roff_t *, void *));
-#ifdef DIAGNOSTIC
-void __memp_check_order __P((DB_MPOOL_HASH *));
-#endif
-int __memp_bhwrite __P((DB_MPOOL *, DB_MPOOL_HASH *, MPOOLFILE *, BH *, int));
-int __memp_pgread __P((DB_MPOOLFILE *, DB_MUTEX *, BH *, int));
-int __memp_pg __P((DB_MPOOLFILE *, BH *, int));
-void __memp_bhfree __P((DB_MPOOL *, DB_MPOOL_HASH *, BH *, int));
-int __memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
-int __memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-int __memp_fopen_int __P((DB_MPOOLFILE *, MPOOLFILE *, const char *, u_int32_t, int, size_t));
-int __memp_fclose_int __P((DB_MPOOLFILE *, u_int32_t));
-int __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
-char * __memp_fn __P((DB_MPOOLFILE *));
-char * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
-int __memp_fput __P((DB_MPOOLFILE *, void *, u_int32_t));
-int __memp_fset __P((DB_MPOOLFILE *, void *, u_int32_t));
-void __memp_dbenv_create __P((DB_ENV *));
-int __memp_open __P((DB_ENV *));
-int __memp_dbenv_refresh __P((DB_ENV *));
-void __mpool_region_destroy __P((DB_ENV *, REGINFO *));
-int  __memp_nameop __P((DB_ENV *, u_int8_t *, const char *, const char *, const char *));
-int __memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
-int __memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-int __memp_dump_region __P((DB_ENV *, char *, FILE *));
-void __memp_stat_hash __P((REGINFO *, MPOOL *, u_int32_t *));
-int __memp_sync __P((DB_ENV *, DB_LSN *));
-int __memp_fsync __P((DB_MPOOLFILE *));
-int __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
-int __memp_sync_int __P((DB_ENV *, DB_MPOOLFILE *, int, db_sync_op, int *));
-int __memp_trickle __P((DB_ENV *, int, int *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_mp_ext_h_ */
diff --git a/libdb/dbinc_auto/mutex_ext.h b/libdb/dbinc_auto/mutex_ext.h
deleted file mode 100644
index a40f04d55..000000000
--- a/libdb/dbinc_auto/mutex_ext.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_mutex_ext_h_
-#define	_mutex_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __db_fcntl_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_fcntl_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_fcntl_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_fcntl_mutex_destroy __P((DB_MUTEX *));
-int __db_pthread_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_pthread_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_pthread_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_pthread_mutex_destroy __P((DB_MUTEX *));
-int __db_tas_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_tas_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_tas_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_tas_mutex_destroy __P((DB_MUTEX *));
-int __db_win32_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_win32_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_win32_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_win32_mutex_destroy __P((DB_MUTEX *));
-int __db_mutex_setup __P((DB_ENV *, REGINFO *, void *, u_int32_t));
-void __db_mutex_free __P((DB_ENV *, REGINFO *, DB_MUTEX *));
-void __db_shreg_locks_clear __P((DB_MUTEX *, REGINFO *, REGMAINT *));
-void __db_shreg_locks_destroy __P((REGINFO *, REGMAINT *));
-int __db_shreg_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t, u_int32_t, REGINFO *, REGMAINT *));
-void __db_shreg_maintinit __P((REGINFO *, void *addr, size_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_mutex_ext_h_ */
diff --git a/libdb/dbinc_auto/os_ext.h b/libdb/dbinc_auto/os_ext.h
deleted file mode 100644
index 0a2e5ab20..000000000
--- a/libdb/dbinc_auto/os_ext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_os_ext_h_
-#define	_os_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __os_abspath __P((const char *));
-int __os_umalloc __P((DB_ENV *, size_t, void *));
-int __os_urealloc __P((DB_ENV *, size_t, void *));
-int __os_ufree __P((DB_ENV *, void *));
-int __os_strdup __P((DB_ENV *, const char *, void *));
-int __os_calloc __P((DB_ENV *, size_t, size_t, void *));
-int __os_malloc __P((DB_ENV *, size_t, void *));
-int __os_realloc __P((DB_ENV *, size_t, void *));
-void __os_free __P((DB_ENV *, void *));
-void *__ua_memcpy __P((void *, const void *, size_t));
-int __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
-int __os_fs_notzero __P((void));
-int __os_dirlist __P((DB_ENV *, const char *, char ***, int *));
-void __os_dirfree __P((DB_ENV *, char **, int));
-int __os_get_errno_ret_zero __P((void));
-int __os_get_errno __P((void));
-void __os_set_errno __P((int));
-int __os_fileid __P((DB_ENV *, const char *, int, u_int8_t *));
-int __os_fsync __P((DB_ENV *, DB_FH *));
-int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
-int __os_closehandle __P((DB_ENV *, DB_FH *));
-void __os_id __P((u_int32_t *));
-int __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
-int __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
-int __os_mapfile __P((DB_ENV *, char *, DB_FH *, size_t, int, void **));
-int __os_unmapfile __P((DB_ENV *, void *, size_t));
-u_int32_t __db_oflags __P((int));
-int __db_omode __P((const char *));
-int __os_open __P((DB_ENV *, const char *, u_int32_t, int, DB_FH *));
-#ifdef HAVE_QNX
-int __os_shmname __P((DB_ENV *, const char *, char **));
-#endif
-int __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
-int __os_r_detach __P((DB_ENV *, REGINFO *, int));
-int __os_rename __P((DB_ENV *, const char *, const char *, u_int32_t));
-int __os_isroot __P((void));
-char *__db_rpath __P((const char *));
-int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
-int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_seek __P((DB_ENV *, DB_FH *, size_t, db_pgno_t, u_int32_t, int, DB_OS_SEEK));
-int __os_sleep __P((DB_ENV *, u_long, u_long));
-int __os_spin __P((DB_ENV *));
-void __os_yield __P((DB_ENV*, u_long));
-int __os_exists __P((const char *, int *));
-int __os_ioinfo __P((DB_ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
-int __os_tmpdir __P((DB_ENV *, u_int32_t));
-int __os_region_unlink __P((DB_ENV *, const char *));
-int __os_unlink __P((DB_ENV *, const char *));
-#if defined(DB_WIN32)
-int __os_win32_errno __P((void));
-#endif
-int __os_fsync __P((DB_ENV *, DB_FH *));
-int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
-int __os_closehandle __P((DB_ENV *, DB_FH *));
-int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
-int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_exists __P((const char *, int *));
-int __os_ioinfo __P((DB_ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
-int __os_is_winnt __P((void));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_os_ext_h_ */
diff --git a/libdb/dbinc_auto/qam_auto.h b/libdb/dbinc_auto/qam_auto.h
deleted file mode 100644
index 655c6d028..000000000
--- a/libdb/dbinc_auto/qam_auto.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__qam_AUTO_H
-#define	__qam_AUTO_H
-#define	DB___qam_incfirst	84
-typedef struct ___qam_incfirst_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	db_recno_t	recno;
-	db_pgno_t	meta_pgno;
-} __qam_incfirst_args;
-
-#define	DB___qam_mvptr	85
-typedef struct ___qam_mvptr_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	fileid;
-	db_recno_t	old_first;
-	db_recno_t	new_first;
-	db_recno_t	old_cur;
-	db_recno_t	new_cur;
-	DB_LSN	metalsn;
-	db_pgno_t	meta_pgno;
-} __qam_mvptr_args;
-
-#define	DB___qam_del	79
-typedef struct ___qam_del_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	DB_LSN	lsn;
-	db_pgno_t	pgno;
-	u_int32_t	indx;
-	db_recno_t	recno;
-} __qam_del_args;
-
-#define	DB___qam_add	80
-typedef struct ___qam_add_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	DB_LSN	lsn;
-	db_pgno_t	pgno;
-	u_int32_t	indx;
-	db_recno_t	recno;
-	DBT	data;
-	u_int32_t	vflag;
-	DBT	olddata;
-} __qam_add_args;
-
-#define	DB___qam_delext	83
-typedef struct ___qam_delext_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	int32_t	fileid;
-	DB_LSN	lsn;
-	db_pgno_t	pgno;
-	u_int32_t	indx;
-	db_recno_t	recno;
-	DBT	data;
-} __qam_delext_args;
-
-#endif
diff --git a/libdb/dbinc_auto/qam_ext.h b/libdb/dbinc_auto/qam_ext.h
deleted file mode 100644
index 16dbea79e..000000000
--- a/libdb/dbinc_auto/qam_ext.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_qam_ext_h_
-#define	_qam_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __qam_position __P((DBC *, db_recno_t *, qam_position_mode, int *));
-int __qam_pitem __P((DBC *,  QPAGE *, u_int32_t, db_recno_t, DBT *));
-int __qam_append __P((DBC *, DBT *, DBT *));
-int __qam_c_dup __P((DBC *, DBC *));
-int __qam_c_init __P((DBC *));
-int __qam_truncate __P((DB *, DB_TXN *, u_int32_t *));
-int __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_recno_t, db_pgno_t));
-int __qam_incfirst_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_incfirst_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_incfirst_read __P((DB_ENV *, void *, __qam_incfirst_args **));
-int __qam_mvptr_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_recno_t, db_recno_t, db_recno_t, db_recno_t, DB_LSN *, db_pgno_t));
-int __qam_mvptr_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_mvptr_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_mvptr_read __P((DB_ENV *, void *, __qam_mvptr_args **));
-int __qam_del_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t));
-int __qam_del_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_del_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_del_read __P((DB_ENV *, void *, __qam_del_args **));
-int __qam_add_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *, u_int32_t, const DBT *));
-int __qam_add_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_add_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_add_read __P((DB_ENV *, void *, __qam_add_args **));
-int __qam_delext_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *));
-int __qam_delext_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_delext_read __P((DB_ENV *, void *, __qam_delext_args **));
-int __qam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __qam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __qam_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __qam_mswap __P((PAGE *));
-int __qam_pgin_out __P((DB_ENV *, db_pgno_t, void *, DBT *));
-int __qam_fprobe __P((DB *, db_pgno_t, void *, qam_probe_mode, u_int32_t));
-int __qam_fclose __P((DB *, db_pgno_t));
-int __qam_fremove __P((DB *, db_pgno_t));
-int __qam_sync __P((DB *, u_int32_t));
-int __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
-int __qam_extent_names __P((DB_ENV *, char *, char ***));
-void __qam_exid __P((DB *, u_int8_t *, u_int32_t));
-int __qam_db_create __P((DB *));
-int __qam_db_close __P((DB *));
-int __db_prqueue __P((DB *, FILE *, u_int32_t));
-int __qam_remove __P((DB *, DB_TXN *, const char *, const char *, DB_LSN *));
-int __qam_rename __P((DB *, DB_TXN *, const char *, const char *, const char *));
-int __qam_open __P((DB *, DB_TXN *, const char *, db_pgno_t, int, u_int32_t));
-int __qam_metachk __P((DB *, const char *, QMETA *));
-int __qam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __qam_incfirst_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_mvptr_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_del_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_delext_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_add_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_stat __P((DB *, void *, u_int32_t));
-int __qam_31_qammeta __P((DB *, char *, u_int8_t *));
-int __qam_32_qammeta __P((DB *, char *, u_int8_t *));
-int __qam_vrfy_meta __P((DB *, VRFY_DBINFO *, QMETA *, db_pgno_t, u_int32_t));
-int __qam_vrfy_data __P((DB *, VRFY_DBINFO *, QPAGE *, db_pgno_t, u_int32_t));
-int __qam_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_qam_ext_h_ */
diff --git a/libdb/dbinc_auto/rep_ext.h b/libdb/dbinc_auto/rep_ext.h
deleted file mode 100644
index 22e2d254f..000000000
--- a/libdb/dbinc_auto/rep_ext.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_rep_ext_h_
-#define	_rep_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __rep_dbenv_create __P((DB_ENV *));
-int __rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
-int __rep_process_txn __P((DB_ENV *, DBT *));
-int __rep_region_init __P((DB_ENV *));
-int __rep_region_destroy __P((DB_ENV *));
-int __rep_dbenv_close __P((DB_ENV *));
-int __rep_preclose __P((DB_ENV *, int));
-int __rep_check_alloc __P((DB_ENV *, TXN_RECS *, int));
-int __rep_send_message __P((DB_ENV *, int, u_int32_t, DB_LSN *, const DBT *, u_int32_t));
-int __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
-int __rep_lockpgno_init __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __rep_unlockpages __P((DB_ENV *, u_int32_t));
-int __rep_lockpages __P((DB_ENV *, int (**)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t, DB_LSN *, DB_LSN *, TXN_RECS *, u_int32_t));
-int __rep_is_client __P((DB_ENV *));
-int __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int));
-int __rep_grow_sites __P((DB_ENV *dbenv, int nsites));
-void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, char *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_rep_ext_h_ */
diff --git a/libdb/dbinc_auto/rpc_client_ext.h b/libdb/dbinc_auto/rpc_client_ext.h
deleted file mode 100644
index 9634b34ab..000000000
--- a/libdb/dbinc_auto/rpc_client_ext.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_rpc_client_ext_h_
-#define	_rpc_client_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __dbcl_envrpcserver __P((DB_ENV *, void *, const char *, long, long, u_int32_t));
-int __dbcl_env_open_wrap __P((DB_ENV *, const char *, u_int32_t, int));
-int __dbcl_db_open_wrap __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
-int __dbcl_refresh __P((DB_ENV *));
-int __dbcl_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *));
-void __dbcl_txn_end __P((DB_TXN *));
-void __dbcl_txn_setup __P((DB_ENV *, DB_TXN *, DB_TXN *, u_int32_t));
-void __dbcl_c_refresh __P((DBC *));
-int __dbcl_c_setup __P((long, DB *, DBC **));
-int __dbcl_dbclose_common __P((DB *));
-int __dbcl_env_alloc __P((DB_ENV *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)));
-int __dbcl_set_app_dispatch __P((DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
-int __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
-int __dbcl_env_close __P((DB_ENV *, u_int32_t));
-int __dbcl_env_create __P((DB_ENV *, long));
-int __dbcl_set_data_dir __P((DB_ENV *, const char *));
-int __dbcl_env_dbremove __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int32_t));
-int __dbcl_env_dbrename __P((DB_ENV *, DB_TXN *, const char *, const char *, const char *, u_int32_t));
-int __dbcl_env_encrypt __P((DB_ENV *, const char *, u_int32_t));
-int __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
-int __dbcl_env_flags __P((DB_ENV *, u_int32_t, int));
-int __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lg_dir __P((DB_ENV *, const char *));
-int __dbcl_set_lg_max __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lg_regionmax __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int));
-int __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t));
-int __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t));
-int __dbcl_env_open __P((DB_ENV *, const char *, u_int32_t, int));
-int __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
-int __dbcl_env_remove __P((DB_ENV *, const char *, u_int32_t));
-int __dbcl_set_shm_key __P((DB_ENV *, long));
-int __dbcl_set_tas_spins __P((DB_ENV *, u_int32_t));
-int __dbcl_set_timeout __P((DB_ENV *, u_int32_t, u_int32_t));
-int __dbcl_set_tmp_dir __P((DB_ENV *, const char *));
-int __dbcl_set_tx_max __P((DB_ENV *, u_int32_t));
-int __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *));
-int __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int));
-int __dbcl_txn_abort __P((DB_TXN *));
-int __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-int __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-int __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
-int __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
-int __dbcl_txn_prepare __P((DB_TXN *, u_int8_t *));
-int __dbcl_txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
-int __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-int __dbcl_txn_timeout __P((DB_TXN *, u_int32_t, u_int32_t));
-int __dbcl_rep_elect __P((DB_ENV *, int, int, u_int32_t, int *));
-int __dbcl_rep_flush __P((DB_ENV *));
-int __dbcl_rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
-int __dbcl_rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
-int __dbcl_rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
-int __dbcl_rep_set_rep_transport __P((DB_ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-int __dbcl_rep_start __P((DB_ENV *, DBT *, u_int32_t));
-int __dbcl_rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
-int __dbcl_db_alloc __P((DB *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)));
-int __dbcl_db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-int __dbcl_db_bt_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
-int __dbcl_db_bt_maxkey __P((DB *, u_int32_t));
-int __dbcl_db_bt_minkey __P((DB *, u_int32_t));
-int __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *, const DBT *)));
-int __dbcl_db_set_append_recno __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
-int __dbcl_db_cache_priority __P((DB *, DB_CACHE_PRIORITY));
-int __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int));
-int __dbcl_db_close __P((DB *, u_int32_t));
-int __dbcl_db_create __P((DB *, DB_ENV *, u_int32_t));
-int __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
-int __dbcl_db_dup_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
-int __dbcl_db_encrypt __P((DB *, const char *, u_int32_t));
-int __dbcl_db_extentsize __P((DB *, u_int32_t));
-int __dbcl_db_fd __P((DB *, int *));
-int __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int)));
-int __dbcl_db_flags __P((DB *, u_int32_t));
-int __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __dbcl_db_h_ffactor __P((DB *, u_int32_t));
-int __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, const void *, u_int32_t)));
-int __dbcl_db_h_nelem __P((DB *, u_int32_t));
-int __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-int __dbcl_db_lorder __P((DB *, int));
-int __dbcl_db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
-int __dbcl_db_pagesize __P((DB *, u_int32_t));
-int __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int)));
-int __dbcl_db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-int __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __dbcl_db_re_delim __P((DB *, int));
-int __dbcl_db_re_len __P((DB *, u_int32_t));
-int __dbcl_db_re_pad __P((DB *, int));
-int __dbcl_db_re_source __P((DB *, const char *));
-int __dbcl_db_remove __P((DB *, const char *, const char *, u_int32_t));
-int __dbcl_db_rename __P((DB *, const char *, const char *, const char *, u_int32_t));
-int __dbcl_db_stat __P((DB *, void *, u_int32_t));
-int __dbcl_db_sync __P((DB *, u_int32_t));
-int __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t  *, u_int32_t));
-int __dbcl_db_upgrade __P((DB *, const char *, u_int32_t));
-int __dbcl_db_verify __P((DB *, const char *, const char *, FILE *, u_int32_t));
-int __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-int __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t));
-int __dbcl_dbc_close __P((DBC *));
-int __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
-int __dbcl_dbc_del __P((DBC *, u_int32_t));
-int __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
-int __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
-int __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
-int __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-int __dbcl_lock_id __P((DB_ENV *, u_int32_t *));
-int __dbcl_lock_id_free __P((DB_ENV *, u_int32_t));
-int __dbcl_lock_put __P((DB_ENV *, DB_LOCK *));
-int __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-int __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-int __dbcl_log_archive __P((DB_ENV *, char ***, u_int32_t));
-int __dbcl_log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
-int __dbcl_log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
-int __dbcl_log_flush __P((DB_ENV *, const DB_LSN *));
-int __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
-int __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-int __dbcl_memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-int __dbcl_memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
-int __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-int __dbcl_memp_sync __P((DB_ENV *, DB_LSN *));
-int __dbcl_memp_trickle __P((DB_ENV *, int, int *));
-int __dbcl_env_close_ret __P((DB_ENV *, u_int32_t, __env_close_reply *));
-int __dbcl_env_create_ret __P((DB_ENV *, long, __env_create_reply *));
-int __dbcl_env_open_ret __P((DB_ENV *, const char *, u_int32_t, int, __env_open_reply *));
-int __dbcl_env_remove_ret __P((DB_ENV *, const char *, u_int32_t, __env_remove_reply *));
-int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
-int __dbcl_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *));
-int __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, __txn_commit_reply *));
-int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t, __txn_discard_reply *));
-int __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t, __txn_recover_reply *));
-int __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
-int __dbcl_db_create_ret __P((DB *, DB_ENV *, u_int32_t, __db_create_reply *));
-int __dbcl_db_get_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *));
-int __dbcl_db_key_range_ret __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *));
-int __dbcl_db_open_ret __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int, __db_open_reply *));
-int __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t, __db_pget_reply *));
-int __dbcl_db_put_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *));
-int __dbcl_db_remove_ret __P((DB *, const char *, const char *, u_int32_t, __db_remove_reply *));
-int __dbcl_db_rename_ret __P((DB *, const char *, const char *, const char *, u_int32_t, __db_rename_reply *));
-int __dbcl_db_stat_ret __P((DB *, void *, u_int32_t, __db_stat_reply *));
-int __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t  *, u_int32_t, __db_truncate_reply *));
-int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
-int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
-int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
-int __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
-int __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
-int __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
-int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, __dbc_pget_reply *));
-int __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_rpc_client_ext_h_ */
diff --git a/libdb/dbinc_auto/rpc_defs.in b/libdb/dbinc_auto/rpc_defs.in
deleted file mode 100644
index cae76f560..000000000
--- a/libdb/dbinc_auto/rpc_defs.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_rpc. */
-#define	DB_RPC_SERVERPROG ((unsigned long)(351457))
-#define	DB_RPC_SERVERVERS ((unsigned long)(4001))
diff --git a/libdb/dbinc_auto/rpc_server_ext.h b/libdb/dbinc_auto/rpc_server_ext.h
deleted file mode 100644
index c0c706881..000000000
--- a/libdb/dbinc_auto/rpc_server_ext.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_rpc_server_ext_h_
-#define	_rpc_server_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void __env_cachesize_proc __P((long, u_int32_t, u_int32_t, u_int32_t, __env_cachesize_reply *));
-void __env_close_proc __P((long, u_int32_t, __env_close_reply *));
-void __env_create_proc __P((u_int32_t, __env_create_reply *));
-void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t, __env_dbremove_reply *));
-void __env_dbrename_proc __P((long, long, char *, char *, char *, u_int32_t, __env_dbrename_reply *));
-void __env_encrypt_proc __P((long, char *, u_int32_t, __env_encrypt_reply *));
-void __env_flags_proc __P((long, u_int32_t, u_int32_t, __env_flags_reply *));
-void __env_open_proc __P((long, char *, u_int32_t, u_int32_t, __env_open_reply *));
-void __env_remove_proc __P((long, char *, u_int32_t, __env_remove_reply *));
-void __txn_abort_proc __P((long, __txn_abort_reply *));
-void __txn_begin_proc __P((long, long, u_int32_t, __txn_begin_reply *));
-void __txn_commit_proc __P((long, u_int32_t, __txn_commit_reply *));
-void __txn_discard_proc __P((long, u_int32_t, __txn_discard_reply *));
-void __txn_prepare_proc __P((long, u_int8_t *, __txn_prepare_reply *));
-void __txn_recover_proc __P((long, u_int32_t, u_int32_t, __txn_recover_reply *, int *));
-void __db_bt_maxkey_proc __P((long, u_int32_t, __db_bt_maxkey_reply *));
-void __db_associate_proc __P((long, long, long, u_int32_t, __db_associate_reply *));
-void __db_bt_minkey_proc __P((long, u_int32_t, __db_bt_minkey_reply *));
-void __db_close_proc __P((long, u_int32_t, __db_close_reply *));
-void __db_create_proc __P((long, u_int32_t, __db_create_reply *));
-void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));
-void __db_encrypt_proc __P((long, char *, u_int32_t, __db_encrypt_reply *));
-void __db_extentsize_proc __P((long, u_int32_t, __db_extentsize_reply *));
-void __db_flags_proc __P((long, u_int32_t, __db_flags_reply *));
-void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_get_reply *, int *));
-void __db_h_ffactor_proc __P((long, u_int32_t, __db_h_ffactor_reply *));
-void __db_h_nelem_proc __P((long, u_int32_t, __db_h_nelem_reply *));
-void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));
-void __db_lorder_proc __P((long, u_int32_t, __db_lorder_reply *));
-void __db_open_proc __P((long, long, char *, char *, u_int32_t, u_int32_t, u_int32_t, __db_open_reply *));
-void __db_pagesize_proc __P((long, u_int32_t, __db_pagesize_reply *));
-void __db_pget_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_pget_reply *, int *));
-void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_put_reply *, int *));
-void __db_re_delim_proc __P((long, u_int32_t, __db_re_delim_reply *));
-void __db_re_len_proc __P((long, u_int32_t, __db_re_len_reply *));
-void __db_re_pad_proc __P((long, u_int32_t, __db_re_pad_reply *));
-void __db_remove_proc __P((long, char *, char *, u_int32_t, __db_remove_reply *));
-void __db_rename_proc __P((long, char *, char *, char *, u_int32_t, __db_rename_reply *));
-void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *, int *));
-void __db_sync_proc __P((long, u_int32_t, __db_sync_reply *));
-void __db_truncate_proc __P((long, long, u_int32_t, __db_truncate_reply *));
-void __db_cursor_proc __P((long, long, u_int32_t, __db_cursor_reply *));
-void __db_join_proc __P((long, u_int32_t *, u_int32_t, u_int32_t, __db_join_reply *));
-void __dbc_close_proc __P((long, __dbc_close_reply *));
-void __dbc_count_proc __P((long, u_int32_t, __dbc_count_reply *));
-void __dbc_del_proc __P((long, u_int32_t, __dbc_del_reply *));
-void __dbc_dup_proc __P((long, u_int32_t, __dbc_dup_reply *));
-void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_get_reply *, int *));
-void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_pget_reply *, int *));
-void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_put_reply *, int *));
-void __dbsrv_settimeout __P((ct_entry *, u_int32_t));
-void __dbsrv_timeout __P((int));
-void __dbclear_ctp __P((ct_entry *));
-void __dbdel_ctp __P((ct_entry *));
-ct_entry *new_ct_ent __P((int *));
-ct_entry *get_tableent __P((long));
-ct_entry *__dbsrv_sharedb __P((ct_entry *, const char *, const char *, DBTYPE, u_int32_t));
-ct_entry *__dbsrv_shareenv __P((ct_entry *, home_entry *, u_int32_t));
-void __dbsrv_active __P((ct_entry *));
-int __db_close_int __P((long, u_int32_t));
-int __dbc_close_int __P((ct_entry *));
-int __dbenv_close_int __P((long, u_int32_t, int));
-home_entry *get_home __P((char *));
-__env_cachesize_reply *__db_env_cachesize_4001  __P((__env_cachesize_msg *, struct svc_req *));
-__env_close_reply *__db_env_close_4001 __P((__env_close_msg *, struct svc_req *));
-__env_create_reply *__db_env_create_4001 __P((__env_create_msg *, struct svc_req *));
-__env_dbremove_reply *__db_env_dbremove_4001  __P((__env_dbremove_msg *, struct svc_req *));
-__env_dbrename_reply *__db_env_dbrename_4001  __P((__env_dbrename_msg *, struct svc_req *));
-__env_encrypt_reply *__db_env_encrypt_4001  __P((__env_encrypt_msg *, struct svc_req *));
-__env_flags_reply *__db_env_flags_4001 __P((__env_flags_msg *, struct svc_req *));
-__env_open_reply *__db_env_open_4001 __P((__env_open_msg *, struct svc_req *));
-__env_remove_reply *__db_env_remove_4001 __P((__env_remove_msg *, struct svc_req *));
-__txn_abort_reply *__db_txn_abort_4001 __P((__txn_abort_msg *, struct svc_req *));
-__txn_begin_reply *__db_txn_begin_4001 __P((__txn_begin_msg *, struct svc_req *));
-__txn_commit_reply *__db_txn_commit_4001 __P((__txn_commit_msg *, struct svc_req *));
-__txn_discard_reply *__db_txn_discard_4001  __P((__txn_discard_msg *, struct svc_req *));
-__txn_prepare_reply *__db_txn_prepare_4001  __P((__txn_prepare_msg *, struct svc_req *));
-__txn_recover_reply *__db_txn_recover_4001  __P((__txn_recover_msg *, struct svc_req *));
-__db_associate_reply *__db_db_associate_4001  __P((__db_associate_msg *, struct svc_req *));
-__db_bt_maxkey_reply *__db_db_bt_maxkey_4001  __P((__db_bt_maxkey_msg *, struct svc_req *));
-__db_bt_minkey_reply *__db_db_bt_minkey_4001  __P((__db_bt_minkey_msg *, struct svc_req *));
-__db_close_reply *__db_db_close_4001 __P((__db_close_msg *, struct svc_req *));
-__db_create_reply *__db_db_create_4001 __P((__db_create_msg *, struct svc_req *));
-__db_del_reply *__db_db_del_4001 __P((__db_del_msg *, struct svc_req *));
-__db_encrypt_reply *__db_db_encrypt_4001 __P((__db_encrypt_msg *, struct svc_req *));
-__db_extentsize_reply *__db_db_extentsize_4001  __P((__db_extentsize_msg *, struct svc_req *));
-__db_flags_reply *__db_db_flags_4001 __P((__db_flags_msg *, struct svc_req *));
-__db_get_reply *__db_db_get_4001 __P((__db_get_msg *, struct svc_req *));
-__db_h_ffactor_reply *__db_db_h_ffactor_4001  __P((__db_h_ffactor_msg *, struct svc_req *));
-__db_h_nelem_reply *__db_db_h_nelem_4001 __P((__db_h_nelem_msg *, struct svc_req *));
-__db_key_range_reply *__db_db_key_range_4001  __P((__db_key_range_msg *, struct svc_req *));
-__db_lorder_reply *__db_db_lorder_4001 __P((__db_lorder_msg *, struct svc_req *));
-__db_open_reply *__db_db_open_4001 __P((__db_open_msg *, struct svc_req *));
-__db_pagesize_reply *__db_db_pagesize_4001  __P((__db_pagesize_msg *, struct svc_req *));
-__db_pget_reply *__db_db_pget_4001 __P((__db_pget_msg *, struct svc_req *));
-__db_put_reply *__db_db_put_4001 __P((__db_put_msg *, struct svc_req *));
-__db_re_delim_reply *__db_db_re_delim_4001  __P((__db_re_delim_msg *, struct svc_req *));
-__db_re_len_reply *__db_db_re_len_4001 __P((__db_re_len_msg *, struct svc_req *));
-__db_re_pad_reply *__db_db_re_pad_4001 __P((__db_re_pad_msg *, struct svc_req *));
-__db_remove_reply *__db_db_remove_4001 __P((__db_remove_msg *, struct svc_req *));
-__db_rename_reply *__db_db_rename_4001 __P((__db_rename_msg *, struct svc_req *));
-__db_stat_reply *__db_db_stat_4001 __P((__db_stat_msg *, struct svc_req *));
-__db_sync_reply *__db_db_sync_4001 __P((__db_sync_msg *, struct svc_req *));
-__db_truncate_reply *__db_db_truncate_4001  __P((__db_truncate_msg *, struct svc_req *));
-__db_cursor_reply *__db_db_cursor_4001 __P((__db_cursor_msg *, struct svc_req *));
-__db_join_reply *__db_db_join_4001 __P((__db_join_msg *, struct svc_req *));
-__dbc_close_reply *__db_dbc_close_4001 __P((__dbc_close_msg *, struct svc_req *));
-__dbc_count_reply *__db_dbc_count_4001 __P((__dbc_count_msg *, struct svc_req *));
-__dbc_del_reply *__db_dbc_del_4001 __P((__dbc_del_msg *, struct svc_req *));
-__dbc_dup_reply *__db_dbc_dup_4001 __P((__dbc_dup_msg *, struct svc_req *));
-__dbc_get_reply *__db_dbc_get_4001 __P((__dbc_get_msg *, struct svc_req *));
-__dbc_pget_reply *__db_dbc_pget_4001 __P((__dbc_pget_msg *, struct svc_req *));
-__dbc_put_reply *__db_dbc_put_4001 __P((__dbc_put_msg *, struct svc_req *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_rpc_server_ext_h_ */
diff --git a/libdb/dbinc_auto/tcl_ext.h b/libdb/dbinc_auto/tcl_ext.h
deleted file mode 100644
index 619ea4a9d..000000000
--- a/libdb/dbinc_auto/tcl_ext.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_tcl_ext_h_
-#define	_tcl_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int bdb_HCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-#if DB_DBM_HSEARCH != 0
-int bdb_NdbmOpen __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBM **));
-#endif
-#if DB_DBM_HSEARCH != 0
-int bdb_DbmCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*, int, DBM *));
-#endif
-int ndbm_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-void _DbInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-int db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-int dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-int env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-int tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *));
-int tcl_EnvAttr __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-DBTCL_INFO *_NewInfo __P((Tcl_Interp *, void *, char *, enum INFOTYPE));
-void *_NameToPtr __P((CONST char *));
-DBTCL_INFO *_PtrToInfo __P((CONST void *));
-DBTCL_INFO *_NameToInfo __P((CONST char *));
-void  _SetInfoData __P((DBTCL_INFO *, void *));
-void  _DeleteInfo __P((DBTCL_INFO *));
-int _SetListElem __P((Tcl_Interp *, Tcl_Obj *, void *, int, void *, int));
-int _SetListElemInt __P((Tcl_Interp *, Tcl_Obj *, void *, int));
-int _SetListRecnoElem __P((Tcl_Interp *, Tcl_Obj *, db_recno_t, u_char *, int));
-int _Set3DBTList __P((Tcl_Interp *, Tcl_Obj *, DBT *, int, DBT *, int, DBT *));
-int _SetMultiList __P((Tcl_Interp *, Tcl_Obj *, DBT *, DBT*, int, int));
-int _GetGlobPrefix __P((char *, char **));
-int _ReturnSetup __P((Tcl_Interp *, int, int, char *));
-int _ErrorSetup __P((Tcl_Interp *, int, char *));
-void _ErrorFunc __P((CONST char *, char *));
-int _GetLsn __P((Tcl_Interp *, Tcl_Obj *, DB_LSN *));
-int _GetUInt32 __P((Tcl_Interp *, Tcl_Obj *, u_int32_t *));
-Tcl_Obj *_GetFlagsList __P((Tcl_Interp *, u_int32_t, void (*)(u_int32_t, void *, void (*)(u_int32_t, const FN *, void *))));
-void _debug_check  __P((void));
-int _CopyObjBytes  __P((Tcl_Interp *, Tcl_Obj *obj, void **, u_int32_t *, int *));
-int tcl_LockDetect __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockVec __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogArchive __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogCompare __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-int tcl_LogFile __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-void _MpInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-int tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_MpTrickle __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_Mp __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_RepElect __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepLimit __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepRequest __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepStart __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepProcessMessage __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepStat __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-void _TxnInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-int tcl_TxnCheckpoint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_Txn __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int tcl_TxnStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_TxnTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_TxnRecover __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int bdb_RandCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-int tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_tcl_ext_h_ */
diff --git a/libdb/dbinc_auto/txn_auto.h b/libdb/dbinc_auto/txn_auto.h
deleted file mode 100644
index ac841ba5b..000000000
--- a/libdb/dbinc_auto/txn_auto.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	__txn_AUTO_H
-#define	__txn_AUTO_H
-#define	DB___txn_regop	10
-typedef struct ___txn_regop_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	int32_t	timestamp;
-} __txn_regop_args;
-
-#define	DB___txn_ckp	11
-typedef struct ___txn_ckp_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DB_LSN	ckp_lsn;
-	DB_LSN	last_ckp;
-	int32_t	timestamp;
-} __txn_ckp_args;
-
-#define	DB___txn_child	12
-typedef struct ___txn_child_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	child;
-	DB_LSN	c_lsn;
-} __txn_child_args;
-
-#define	DB___txn_xa_regop	13
-typedef struct ___txn_xa_regop_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	opcode;
-	DBT	xid;
-	int32_t	formatID;
-	u_int32_t	gtrid;
-	u_int32_t	bqual;
-	DB_LSN	begin_lsn;
-} __txn_xa_regop_args;
-
-#define	DB___txn_recycle	14
-typedef struct ___txn_recycle_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	u_int32_t	min;
-	u_int32_t	max;
-} __txn_recycle_args;
-
-#endif
diff --git a/libdb/dbinc_auto/txn_ext.h b/libdb/dbinc_auto/txn_ext.h
deleted file mode 100644
index a53338d37..000000000
--- a/libdb/dbinc_auto/txn_ext.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_txn_ext_h_
-#define	_txn_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-int __txn_xa_begin __P((DB_ENV *, DB_TXN *));
-int __txn_compensate_begin __P((DB_ENV *, DB_TXN **txnp));
-int __txn_commit __P((DB_TXN *, u_int32_t));
-int __txn_abort __P((DB_TXN *));
-int __txn_discard __P((DB_TXN *, u_int32_t flags));
-int __txn_prepare __P((DB_TXN *, u_int8_t *));
-u_int32_t __txn_id __P((DB_TXN *));
-int __txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-int __txn_getckp __P((DB_ENV *, DB_LSN *));
-int __txn_activekids __P((DB_ENV *, u_int32_t, DB_TXN *));
-int __txn_force_abort __P((DB_ENV *, u_int8_t *));
-int __txn_preclose __P((DB_ENV *));
-int __txn_reset __P((DB_ENV *));
-void __txn_updateckp __P((DB_ENV *, DB_LSN *));
-int __txn_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, int32_t));
-int __txn_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_regop_read __P((DB_ENV *, void *, __txn_regop_args **));
-int __txn_ckp_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, DB_LSN *, int32_t));
-int __txn_ckp_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_ckp_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_ckp_read __P((DB_ENV *, void *, __txn_ckp_args **));
-int __txn_child_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, DB_LSN *));
-int __txn_child_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_child_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_child_read __P((DB_ENV *, void *, __txn_child_args **));
-int __txn_xa_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, int32_t, u_int32_t, u_int32_t, DB_LSN *));
-int __txn_xa_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_xa_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_xa_regop_read __P((DB_ENV *, void *, __txn_xa_regop_args **));
-int __txn_recycle_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
-int __txn_recycle_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_recycle_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_recycle_read __P((DB_ENV *, void *, __txn_recycle_args **));
-int __txn_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __txn_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __txn_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-void __txn_dbenv_create __P((DB_ENV *));
-int __txn_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_xa_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_ckp_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_child_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_restore_txn __P((DB_ENV *, DB_LSN *, __txn_xa_regop_args *));
-int __txn_recycle_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-void __txn_continue __P((DB_ENV *, DB_TXN *, TXN_DETAIL *, size_t));
-int __txn_map_gid __P((DB_ENV *, u_int8_t *, TXN_DETAIL **, size_t *));
-int __txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
-int __txn_get_prepared __P((DB_ENV *, XID *, DB_PREPLIST *, long, long *, u_int32_t));
-int __txn_open __P((DB_ENV *));
-int __txn_dbenv_refresh __P((DB_ENV *));
-void __txn_region_destroy __P((DB_ENV *, REGINFO *));
-int __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-int __txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-int __txn_remevent __P((DB_ENV *, DB_TXN *, const char *, u_int8_t*));
-int __txn_lockevent __P((DB_ENV *, DB_TXN *, DB *, DB_LOCK *, u_int32_t));
-void __txn_remlock __P((DB_ENV *, DB_TXN *, DB_LOCK *, u_int32_t));
-int __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_txn_ext_h_ */
diff --git a/libdb/dbinc_auto/xa_ext.h b/libdb/dbinc_auto/xa_ext.h
deleted file mode 100644
index e4fc9895e..000000000
--- a/libdb/dbinc_auto/xa_ext.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_xa_ext_h_
-#define	_xa_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __db_xa_create __P((DB *));
-int __db_rmid_to_env __P((int rmid, DB_ENV **envp));
-int __db_xid_to_txn __P((DB_ENV *, XID *, size_t *));
-int __db_map_rmid __P((int, DB_ENV *));
-int __db_unmap_rmid __P((int));
-int __db_map_xid __P((DB_ENV *, XID *, size_t));
-void __db_unmap_xid __P((DB_ENV *, XID *, size_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_xa_ext_h_ */