Restructure the tree to ease merge.

refs #27

--HG--
branch : keith
rename : lint/fl => dist/lint/fl
rename : lint/lint.current => dist/lint/lint.current
rename : inc_posix/bitstring.h => include/bitstring.h
rename : inc_posix/btree.h => include/btree.h
rename : inc_posix/cache.h => include/cache.h
rename : inc_posix/debug.h => include/debug.h
rename : inc_posix/extern.h => include/extern.h
rename : inc_posix/fh.h => include/fh.h
rename : inc_posix/mem.h => include/mem.h
rename : inc_posix/misc.h => include/misc.h
rename : inc_posix/mutex.h => include/mutex.h
rename : inc_posix/queue.h => include/queue.h
rename : inc_posix/serial.h => include/serial.h
rename : inc_posix/stat.h => include/stat.h
rename : inc_posix/util.h => include/util.h
rename : inc_posix/walk.h => include/walk.h
rename : inc_posix/wiredtiger.in => include/wiredtiger.in
rename : inc_posix/wt_internal.in => include/wt_internal.in
rename : btree/bt_alloc.c => src/btree/bt_alloc.c
rename : btree/bt_bulk.c => src/btree/bt_bulk.c
rename : btree/bt_cache.c => src/btree/bt_cache.c
rename : btree/bt_close.c => src/btree/bt_close.c
rename : btree/bt_cmp.c => src/btree/bt_cmp.c
rename : btree/bt_debug.c => src/btree/bt_debug.c
rename : btree/bt_desc.c => src/btree/bt_desc.c
rename : btree/bt_discard.c => src/btree/bt_discard.c
rename : btree/bt_dump.c => src/btree/bt_dump.c
rename : btree/bt_evict.c => src/btree/bt_evict.c
rename : btree/bt_misc.c => src/btree/bt_misc.c
rename : btree/bt_open.c => src/btree/bt_open.c
rename : btree/bt_ovfl.c => src/btree/bt_ovfl.c
rename : btree/bt_page.c => src/btree/bt_page.c
rename : btree/bt_read.c => src/btree/bt_read.c
rename : btree/bt_reconcile.c => src/btree/bt_reconcile.c
rename : btree/bt_ret.c => src/btree/bt_ret.c
rename : btree/bt_rw.c => src/btree/bt_rw.c
rename : btree/bt_stat.c => src/btree/bt_stat.c
rename : btree/bt_sync.c => src/btree/bt_sync.c
rename : btree/bt_vrfy.c => src/btree/bt_vrfy.c
rename : btree/bt_walk.c => src/btree/bt_walk.c
rename : btree/c_drain.c => src/btree/c_drain.c
rename : btree/c_init.c => src/btree/c_init.c
rename : btree/c_page.c => src/btree/c_page.c
rename : btree/c_read.c => src/btree/c_read.c
rename : btree/col_get.c => src/btree/col_get.c
rename : btree/col_put.c => src/btree/col_put.c
rename : btree/col_srch.c => src/btree/col_srch.c
rename : btree/row_get.c => src/btree/row_get.c
rename : btree/row_put.c => src/btree/row_put.c
rename : btree/row_srch.c => src/btree/row_srch.c
rename : db/db_err.c => src/db/db_err.c
rename : db/db_getset.c => src/db/db_getset.c
rename : db/db_handle.c => src/db/db_handle.c
rename : db/db_huffman.c => src/db/db_huffman.c
rename : db/db_open.c => src/db/db_open.c
rename : db/db_stat.c => src/db/db_stat.c
rename : db/db_sync.c => src/db/db_sync.c
rename : env/env_err.c => src/env/env_err.c
rename : env/env_getset.c => src/env/env_getset.c
rename : env/env_global.c => src/env/env_global.c
rename : env/env_handle.c => src/env/env_handle.c
rename : env/env_init.c => src/env/env_init.c
rename : env/env_msg.c => src/env/env_msg.c
rename : env/env_open.c => src/env/env_open.c
rename : env/env_stat.c => src/env/env_stat.c
rename : env/env_sync.c => src/env/env_sync.c
rename : env/env_toc.c => src/env/env_toc.c
rename : env/env_workq.c => src/env/env_workq.c
rename : os_posix/os_abort.c => src/os_posix/os_abort.c
rename : os_posix/os_alloc.c => src/os_posix/os_alloc.c
rename : os_posix/os_filesize.c => src/os_posix/os_filesize.c
rename : os_posix/os_fsync.c => src/os_posix/os_fsync.c
rename : os_posix/os_mtx.c => src/os_posix/os_mtx.c
rename : os_posix/os_open.c => src/os_posix/os_open.c
rename : os_posix/os_rw.c => src/os_posix/os_rw.c
rename : os_posix/os_sleep.c => src/os_posix/os_sleep.c
rename : os_posix/os_thread.c => src/os_posix/os_thread.c
rename : os_posix/os_yield.c => src/os_posix/os_yield.c
rename : support/api.c => src/support/api.c
rename : support/cksum.c => src/support/cksum.c
rename : support/err.c => src/support/err.c
rename : support/hazard.c => src/support/hazard.c
rename : support/huffman.c => src/support/huffman.c
rename : support/pow.c => src/support/pow.c
rename : support/prime.c => src/support/prime.c
rename : support/progress.c => src/support/progress.c
rename : support/scratch.c => src/support/scratch.c
rename : support/serial.c => src/support/serial.c
rename : support/simple_setup.c => src/support/simple_setup.c
rename : support/stat.c => src/support/stat.c
rename : support/strerror.c => src/support/strerror.c
rename : support/version.c => src/support/version.c
rename : utilities/db_dump/util_dump.c => src/utilities/db_dump/util_dump.c
rename : utilities/db_load/util_load.c => src/utilities/db_load/util_load.c
rename : utilities/db_stat/util_stat.c => src/utilities/db_stat/util_stat.c
rename : utilities/db_verify/util_verify.c => src/utilities/db_verify/util_verify.c

115 files changed, 117 insertions, 146 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 425697c982d..00000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bench.1
-wts
diff --git a/build_posix/.cvsignore b/build_posix/.cvsignore
deleted file mode 100644
index 2a3a2e6d9c3..00000000000
--- a/build_posix/.cvsignore
+++ /dev/null
@@ -1,23 +0,0 @@
-.deps
-COPYING
-ChangeLog
-INSTALL
-Makefile
-Makefile.am
-Makefile.in
-NEWS
-README
-aclocal.m4
-config.hin
-config.log
-config.status
-configure
-db_dump
-db_load
-db_stat
-db_verify
-mklog
-stamp-h1
-wiredtiger.h
-wiredtiger_config.h
-wt_internal.h
diff --git a/build_posix/Make.base b/build_posix/Make.base
index fcf5567a61f..1b4237c0d62 100644
--- a/build_posix/Make.base
+++ b/build_posix/Make.base
@@ -2,11 +2,11 @@ wtdir = $(prefix)/wt
 wt_LIBRARIES = libwiredtiger.a
 
 wt_PROGRAMS = db_dump db_load db_stat db_verify
-db_dump_SOURCES = ../utilities/db_dump/util_dump.c ../support/simple_setup.c
-db_load_SOURCES = ../utilities/db_load/util_load.c ../support/simple_setup.c
-db_stat_SOURCES = ../utilities/db_stat/util_stat.c ../support/simple_setup.c
-db_verify_SOURCES = ../utilities/db_verify/util_verify.c ../support/simple_setup.c
+db_dump_SOURCES = ../src/utilities/db_dump/util_dump.c ../src/support/simple_setup.c
+db_load_SOURCES = ../src/utilities/db_load/util_load.c ../src/support/simple_setup.c
+db_stat_SOURCES = ../src/utilities/db_stat/util_stat.c ../src/support/simple_setup.c
+db_verify_SOURCES = ../src/utilities/db_verify/util_verify.c ../src/support/simple_setup.c
 LDADD = libwiredtiger.a -lpthread
 
 include_HEADERS= wiredtiger.h
-INCLUDES= -I../inc_posix
+INCLUDES= -I../include
diff --git a/build_posix/configure.ac b/build_posix/configure.ac
index 2a3d76deb8e..74c47e3a860 100644
--- a/build_posix/configure.ac
+++ b/build_posix/configure.ac
@@ -71,6 +71,6 @@ AC_CHECK_FUNCS(fcntl pthread_yield)
 
 AC_CONFIG_FILES([
 	Makefile
-	wiredtiger.h:../inc_posix/wiredtiger.in
-	wt_internal.h:../inc_posix/wt_internal.in])
+	wiredtiger.h:../include/wiredtiger.in
+	wt_internal.h:../include/wt_internal.in])
 AC_OUTPUT
diff --git a/build_posix/gnu-support/.cvsignore b/build_posix/gnu-support/.cvsignore
deleted file mode 100644
index 2c9c8d3f3e3..00000000000
--- a/build_posix/gnu-support/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-depcomp
-install-sh
-missing
diff --git a/dist/api.py b/dist/api.py
index 2be7e61fa58..9af4bbf89ec 100644
--- a/dist/api.py
+++ b/dist/api.py
@@ -390,7 +390,7 @@ func_method_lockout('wt_toc', 'WT_TOC *wt_toc', tfile)
 func_method_transition('wt_toc', 'WT_TOC *wt_toc', tfile)
 
 tfile.close()
-compare_srcfile(tmp_file, '../support/api.c')
+compare_srcfile(tmp_file, '../src/support/api.c')
 
 #####################################################################
 # Update wiredtiger.in file with WT_TOC/DB methods and DB/ENV getter/setter
@@ -398,7 +398,7 @@ compare_srcfile(tmp_file, '../support/api.c')
 #####################################################################
 tfile = open(tmp_file, 'w')
 skip = 0
-for line in open('../inc_posix/wiredtiger.in', 'r'):
+for line in open('../include/wiredtiger.in', 'r'):
 	if skip:
 		if line.count('DB methods: END') or\
 		    line.count('ENV methods: END') or\
@@ -431,6 +431,6 @@ for line in open('../inc_posix/wiredtiger.in', 'r'):
 		func_struct_variable_all('env', tfile)
 
 tfile.close()
-compare_srcfile(tmp_file, '../inc_posix/wiredtiger.in')
+compare_srcfile(tmp_file, '../include/wiredtiger.in')
 
 os.remove(tmp_file)
diff --git a/dist/api_err.py b/dist/api_err.py
index 42d64207a1a..891559eef87 100644
--- a/dist/api_err.py
+++ b/dist/api_err.py
@@ -20,7 +20,7 @@ list = err_build()
 tmp_file = '__tmp'
 tfile = open(tmp_file, 'w')
 skip = 0
-for line in open('../inc_posix/wiredtiger.in', 'r'):
+for line in open('../include/wiredtiger.in', 'r'):
 	if not skip:
 		tfile.write(line)
 	if line.count('Error return section: END'):
@@ -39,7 +39,7 @@ for line in open('../inc_posix/wiredtiger.in', 'r'):
 			v -= 1
 		tfile.write('/*\n')
 tfile.close()
-compare_srcfile(tmp_file, '../inc_posix/wiredtiger.in')
+compare_srcfile(tmp_file, '../include/wiredtiger.in')
 
 # Output the wiredtiger_strerror code.
 tmp_file = '__tmp'
@@ -82,4 +82,4 @@ tfile.write('\t(void)snprintf(errbuf, sizeof(errbuf), ' +\
 tfile.write('\treturn (errbuf);\n')
 tfile.write('}\n')
 tfile.close()
-compare_srcfile(tmp_file, '../support/strerror.c')
+compare_srcfile(tmp_file, '../src/support/strerror.c')
diff --git a/dist/api_flags.py b/dist/api_flags.py
index c514b880550..90c714523d8 100644
--- a/dist/api_flags.py
+++ b/dist/api_flags.py
@@ -44,8 +44,7 @@ for f in sorted(flag_cnt.items(),\
 	for m in flag_name[f[0]]:
 		mask &= ~name_mask[m]
 	if mask == 0:
-		print("api_flags: ran out of flags at " + m + " method",
-		    file=sys.stderr)
+		print >>sys.stder, "api_flags: ran out of flags at " + m + " method",
 		sys.exit(1)
 	for b in bits:
 		if mask & b:
@@ -77,7 +76,7 @@ for f in sorted(name_mask.items()):
 tmp_file = '__tmp'
 tfile = open(tmp_file, 'w')
 skip = 0
-for line in open('../inc_posix/wiredtiger.in', 'r'):
+for line in open('../include/wiredtiger.in', 'r'):
 	if skip:
 		if line.count('API flags section: END'):
 			tfile.write('/*\n' + line)
@@ -89,6 +88,6 @@ for line in open('../inc_posix/wiredtiger.in', 'r'):
 		tfile.write(' */\n')
 		tfile.write(flag_info)
 tfile.close()
-compare_srcfile(tmp_file, '../inc_posix/wiredtiger.in')
+compare_srcfile(tmp_file, '../include/wiredtiger.in')
 
 os.remove(tmp_file)
diff --git a/dist/filelist b/dist/filelist
index 77420910847..21518d5acbb 100644
--- a/dist/filelist
+++ b/dist/filelist
@@ -3,72 +3,72 @@
 #
 # $Id$
 
-btree/bt_alloc.c
-btree/bt_bulk.c
-btree/bt_cache.c
-btree/bt_close.c
-btree/bt_cmp.c
-btree/bt_debug.c
-btree/bt_desc.c
-btree/bt_discard.c
-btree/bt_dump.c
-btree/bt_evict.c
-btree/bt_misc.c
-btree/bt_open.c
-btree/bt_ovfl.c
-btree/bt_page.c
-btree/bt_read.c
-btree/bt_reconcile.c
-btree/bt_ret.c
-btree/bt_rw.c
-btree/bt_stat.c
-btree/bt_sync.c
-btree/bt_vrfy.c
-btree/bt_walk.c
-btree/col_get.c
-btree/col_put.c
-btree/col_srch.c
-btree/row_get.c
-btree/row_put.c
-btree/row_srch.c
-db/db_err.c
-db/db_getset.c
-db/db_handle.c
-db/db_huffman.c
-db/db_open.c
-db/db_stat.c
-db/db_sync.c
-env/env_err.c
-env/env_getset.c
-env/env_global.c
-env/env_handle.c
-env/env_init.c
-env/env_msg.c
-env/env_open.c
-env/env_stat.c
-env/env_sync.c
-env/env_toc.c
-env/env_workq.c
-os_posix/os_abort.c
-os_posix/os_alloc.c
-os_posix/os_filesize.c
-os_posix/os_fsync.c
-os_posix/os_mtx.c
-os_posix/os_open.c
-os_posix/os_rw.c
-os_posix/os_sleep.c
-os_posix/os_thread.c
-os_posix/os_yield.c
-support/api.c
-support/cksum.c
-support/err.c
-support/hazard.c
-support/huffman.c
-support/pow.c
-support/prime.c
-support/progress.c
-support/scratch.c
-support/serial.c
-support/stat.c
-support/strerror.c
-support/version.c
+src/btree/bt_alloc.c
+src/btree/bt_bulk.c
+src/btree/bt_cache.c
+src/btree/bt_close.c
+src/btree/bt_cmp.c
+src/btree/bt_debug.c
+src/btree/bt_desc.c
+src/btree/bt_discard.c
+src/btree/bt_dump.c
+src/btree/bt_evict.c
+src/btree/bt_misc.c
+src/btree/bt_open.c
+src/btree/bt_ovfl.c
+src/btree/bt_page.c
+src/btree/bt_read.c
+src/btree/bt_reconcile.c
+src/btree/bt_ret.c
+src/btree/bt_rw.c
+src/btree/bt_stat.c
+src/btree/bt_sync.c
+src/btree/bt_vrfy.c
+src/btree/bt_walk.c
+src/btree/col_get.c
+src/btree/col_put.c
+src/btree/col_srch.c
+src/btree/row_get.c
+src/btree/row_put.c
+src/btree/row_srch.c
+src/db/db_err.c
+src/db/db_getset.c
+src/db/db_handle.c
+src/db/db_huffman.c
+src/db/db_open.c
+src/db/db_stat.c
+src/db/db_sync.c
+src/env/env_err.c
+src/env/env_getset.c
+src/env/env_global.c
+src/env/env_handle.c
+src/env/env_init.c
+src/env/env_msg.c
+src/env/env_open.c
+src/env/env_stat.c
+src/env/env_sync.c
+src/env/env_toc.c
+src/env/env_workq.c
+src/os_posix/os_abort.c
+src/os_posix/os_alloc.c
+src/os_posix/os_filesize.c
+src/os_posix/os_fsync.c
+src/os_posix/os_mtx.c
+src/os_posix/os_open.c
+src/os_posix/os_rw.c
+src/os_posix/os_sleep.c
+src/os_posix/os_thread.c
+src/os_posix/os_yield.c
+src/support/api.c
+src/support/cksum.c
+src/support/err.c
+src/support/hazard.c
+src/support/huffman.c
+src/support/pow.c
+src/support/prime.c
+src/support/progress.c
+src/support/scratch.c
+src/support/serial.c
+src/support/stat.c
+src/support/strerror.c
+src/support/version.c
diff --git a/lint/fl b/dist/lint/fl
index d9e7505374d..19b68e2ef31 100644
--- a/lint/fl
+++ b/dist/lint/fl
@@ -19,9 +19,9 @@ f()
 	    "-esym(534,fprintf,memcpy,memset)" \
 	    "-function(exit,__wt_abort)" \
 	    "-libdir(.)" \
-	    "-libdir(../inc_posix)" \
+	    "-libdir(../include)" \
 	    "-wlib(0)" \
-	     "-i../build_posix" "-i../inc_posix" "-i/usr/include" $1
+	     "-i../build_posix" "-i../include" "-i/usr/include" $1
 }
 
 update=0
@@ -36,11 +36,11 @@ while :
 done
 
 # List of source files.
-l="../btree/*.c ../db/*.c ../env/*.c ../os_posix/*.c ../support/*.c"
+l="../../src/btree/*.c ../../src/db/*.c ../../src/env/*.c ../../src/os_posix/*.c ../../src/support/*.c"
 
 # Don't lint all of them.
 l=`echo $l |
-    sed -e 's/\.\.\/support\/simple_setup.c//'`
+    grep -v '../src/support/simple_setup.c/'`
 l=`ls $l`
 
 if [ $# -ne 0 ]; then
diff --git a/lint/lint.current b/dist/lint/lint.current
index 8d27084afa8..8d27084afa8 100644
--- a/lint/lint.current
+++ b/dist/lint/lint.current
diff --git a/dist/s_copyright b/dist/s_copyright
index 893047a98c3..a38df188ece 100644
--- a/dist/s_copyright
+++ b/dist/s_copyright
@@ -25,14 +25,16 @@ check()
 	fi
 
 	# Check for a correct copyright header.
-	if `sed -e 6q ../$1 | diff - $t > /dev/null`; then
+	if `sed -e 6q ../$1 | diff - $t > /dev/null` &&
+	    `sed -e 7q -e d ../$1 | \
+	    egrep '^ \* \\$\Id' > /dev/null`; then
 		return;
 	fi
 
 	echo "$1: copyright information is incorrect"
 }
 
-l="`cd .. && echo inc_posix/*.h inc_posix/*.in`"
+l="`cd .. && echo include/*.h include/*.in`"
 l="$l `sed -e 's/^add	\(.*\)/\1/p' -e d s_copyright.lst`"
 for i in $l `sed -e '/^[a-z]/! d' filelist`; do
 	check $i
diff --git a/dist/s_copyright.lst b/dist/s_copyright.lst
index dde118fd933..02380c4f290 100644
--- a/dist/s_copyright.lst
+++ b/dist/s_copyright.lst
@@ -1,8 +1,8 @@
 add	LICENSE
-skip	inc_posix/bitstring.h
-skip	inc_posix/extern.h
-skip	inc_posix/queue.h
-skip	inc_posix/serial.h
-skip	support/api.c
-skip	support/stat.c
-skip	support/strerror.c
+skip	include/bitstring.h
+skip	include/extern.h
+skip	include/queue.h
+skip	include/serial.h
+skip	src/support/api.c
+skip	src/support/stat.c
+skip	src/support/strerror.c
diff --git a/dist/s_define b/dist/s_define
index bb3b6dd50da..781c499a36f 100644
--- a/dist/s_define
+++ b/dist/s_define
@@ -8,19 +8,19 @@ trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
 # List of files to search.
 l="\
-	../btree/*.c\
-	../db/*.c\
-	../env/*.c\
-	../os_posix/*.c\
-	../support/*.c\
-	../utilities/*/*.c"
+	../src/btree/*.c\
+	../src/db/*.c\
+	../src/env/*.c\
+	../src/os_posix/*.c\
+	../src/support/*.c\
+	../src/utilities/*/*.c"
 
 (
 # Copy out the list of #defines we don't use, but it's OK.
 sed -e '/^$/d' -e '/^#/d' < s_define.list
 
 for i in \
-    `cat ../inc_posix/*.h ../inc_posix/*.in |
+    `cat ../include/*.h ../include/*.in |
      egrep '^#define' |
      sed 's/#define[	 ][	 ]*\([A-Za-z_]*\).*/\1/' |
      sort -u`; do
@@ -42,7 +42,7 @@ done
 
 l=`echo $l | sed -e 's/\.\.\/support\/stat.c//'`
 for i in \
-    `cat ../inc_posix/stat.h |
+    `cat ../include/stat.h |
      egrep '^#define' |
      sed -e 's/#define[	 ][	 ]*\([A-Za-z_]*\).*/\1/' \
 	 -e '/^WT_STAT_INCR$/d' \
diff --git a/dist/s_prototypes b/dist/s_prototypes
index 4786b6fd28a..7184fc21e08 100755
--- a/dist/s_prototypes
+++ b/dist/s_prototypes
@@ -24,6 +24,6 @@ for i in `sed -e '/^[a-z]/! d' filelist`; do
 	    < ../$i
 done) > $t
 
-f=../inc_posix/extern.h
+f=../include/extern.h
 cmp $t $f > /dev/null 2>&1 ||
     (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f)
diff --git a/dist/s_tags b/dist/s_tags
index a7862e5a6a2..621fc3d591c 100644
--- a/dist/s_tags
+++ b/dist/s_tags
@@ -18,13 +18,13 @@ for i in -d -t -w; do
 done
 
 rm -f tags
-ctags $flags ../inc_*/*.in ../*/*.[ch] 2>/dev/null
+ctags $flags ../include/*.in ../src/*/*.[ch] 2>/dev/null
 chmod 444 tags
 
 # Link to the tags file from standard build and source directories.
 dirs="build_posix `python -c\
      'from dist import directory_files;\
      directory_files();'`"
-for i in $dirs inc_posix; do
+for i in $dirs include; do
 	(cd ../$i && rm -f tags && ln -s ../dist/tags .)
 done
diff --git a/dist/s_types b/dist/s_types
index 03cb77e975b..7ded5593d4a 100644
--- a/dist/s_types
+++ b/dist/s_types
@@ -3,7 +3,7 @@
 t=__wt.$$
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-l="`cd .. && echo inc_posix/*.h inc_posix/*.in`"
+l="`cd .. && echo include/*.h include/*.in`"
 l="$l `sed -e '/^[a-z]/! d' filelist`"
 
 (cd .. &&
diff --git a/dist/s_whitespace b/dist/s_whitespace
index 61417d2e2d5..a6f780e1cfb 100644
--- a/dist/s_whitespace
+++ b/dist/s_whitespace
@@ -6,7 +6,7 @@
 t=__wt.$$
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-inc=`cd .. && echo inc_posix/*.h inc_posix/*.in dist/*.py dist/s_*`
+inc=`cd .. && echo include/*.h include/*.in dist/*.py dist/s_*`
 (
 for f in `sed -e '/^[a-z]/! d' filelist` $inc; do
 	f="../$f"
diff --git a/dist/serial.py b/dist/serial.py
index 023817457da..00e0e59da7e 100644
--- a/dist/serial.py
+++ b/dist/serial.py
@@ -93,6 +93,6 @@ tfile = open(tmp_file, 'w')
 tfile.write('/* DO NOT EDIT: automatically built by dist/serial.py. */\n')
 func_serial(tfile)
 tfile.close()
-compare_srcfile(tmp_file, '../inc_posix/serial.h')
+compare_srcfile(tmp_file, '../include/serial.h')
 
 os.remove(tmp_file)
diff --git a/dist/stat.py b/dist/stat.py
index 4c852e25a62..a00c570c4da 100644
--- a/dist/stat.py
+++ b/dist/stat.py
@@ -48,7 +48,7 @@ def print_def(title, list):
 tmp_file = '__tmp'
 f = open(tmp_file, 'w')
 skip = 0
-for line in open('../inc_posix/stat.h', 'r'):
+for line in open('../include/stat.h', 'r'):
 	if not skip:
 		f.write(line)
 	if line.count('Statistics section: END'):
@@ -64,7 +64,7 @@ for line in open('../inc_posix/stat.h', 'r'):
 		print_def('FH handle', stat_class.fh_stats)
 		print_def('Methods', method_stats)
 f.close()
-compare_srcfile(tmp_file, '../inc_posix/stat.h')
+compare_srcfile(tmp_file, '../include/stat.h')
 
 # print_func --
 #	Print the functions for the stat.c file.
@@ -114,4 +114,4 @@ print_func('METHOD', method_stats)
 
 f.close()
 
-compare_srcfile(tmp_file, '../support/stat.c')
+compare_srcfile(tmp_file, '../src/support/stat.c')
diff --git a/inc_posix/bitstring.h b/include/bitstring.h
index 55f1feb6bb2..55f1feb6bb2 100644
--- a/inc_posix/bitstring.h
+++ b/include/bitstring.h
diff --git a/inc_posix/btree.h b/include/btree.h
index b16c43a76ff..b16c43a76ff 100644
--- a/inc_posix/btree.h
+++ b/include/btree.h
diff --git a/inc_posix/cache.h b/include/cache.h
index 221ca0a3df8..221ca0a3df8 100644
--- a/inc_posix/cache.h
+++ b/include/cache.h
diff --git a/inc_posix/debug.h b/include/debug.h
index 9d4a47a779f..9d4a47a779f 100644
--- a/inc_posix/debug.h
+++ b/include/debug.h
diff --git a/inc_posix/extern.h b/include/extern.h
index 4e945e8a643..4e945e8a643 100644
--- a/inc_posix/extern.h
+++ b/include/extern.h
diff --git a/inc_posix/fh.h b/include/fh.h
index 27ba53508ee..27ba53508ee 100644
--- a/inc_posix/fh.h
+++ b/include/fh.h
diff --git a/inc_posix/mem.h b/include/mem.h
index b7541be4fbf..b7541be4fbf 100644
--- a/inc_posix/mem.h
+++ b/include/mem.h
diff --git a/inc_posix/misc.h b/include/misc.h
index fdf90e8687e..fdf90e8687e 100644
--- a/inc_posix/misc.h
+++ b/include/misc.h
diff --git a/inc_posix/mutex.h b/include/mutex.h
index 1775e2c8fa8..1775e2c8fa8 100644
--- a/inc_posix/mutex.h
+++ b/include/mutex.h
diff --git a/inc_posix/queue.h b/include/queue.h
index d76f2019f6f..d76f2019f6f 100644
--- a/inc_posix/queue.h
+++ b/include/queue.h
diff --git a/inc_posix/serial.h b/include/serial.h
index af6c87e83c1..af6c87e83c1 100644
--- a/inc_posix/serial.h
+++ b/include/serial.h
diff --git a/inc_posix/stat.h b/include/stat.h
index 6679aebe3cd..6679aebe3cd 100644
--- a/inc_posix/stat.h
+++ b/include/stat.h
diff --git a/inc_posix/util.h b/include/util.h
index cef941843be..cef941843be 100644
--- a/inc_posix/util.h
+++ b/include/util.h
diff --git a/inc_posix/walk.h b/include/walk.h
index b97978e5ace..b97978e5ace 100644
--- a/inc_posix/walk.h
+++ b/include/walk.h
diff --git a/inc_posix/wiredtiger.in b/include/wiredtiger.in
index 0d23ce9b235..0d23ce9b235 100644
--- a/inc_posix/wiredtiger.in
+++ b/include/wiredtiger.in
diff --git a/inc_posix/wt_internal.in b/include/wt_internal.in
index baea94548a9..baea94548a9 100644
--- a/inc_posix/wt_internal.in
+++ b/include/wt_internal.in
diff --git a/lint/.cvsignore b/lint/.cvsignore
deleted file mode 100644
index 16008a9ba09..00000000000
--- a/lint/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.cvsignore
-lint.tmp
diff --git a/btree/bt_alloc.c b/src/btree/bt_alloc.c
index 4477ce4e0f9..4477ce4e0f9 100644
--- a/btree/bt_alloc.c
+++ b/src/btree/bt_alloc.c
diff --git a/btree/bt_bulk.c b/src/btree/bt_bulk.c
index f88c0d5e8ae..f88c0d5e8ae 100644
--- a/btree/bt_bulk.c
+++ b/src/btree/bt_bulk.c
diff --git a/btree/bt_cache.c b/src/btree/bt_cache.c
index 43d4f7e6596..43d4f7e6596 100644
--- a/btree/bt_cache.c
+++ b/src/btree/bt_cache.c
diff --git a/btree/bt_close.c b/src/btree/bt_close.c
index 6bf58e98d7e..6bf58e98d7e 100644
--- a/btree/bt_close.c
+++ b/src/btree/bt_close.c
diff --git a/btree/bt_cmp.c b/src/btree/bt_cmp.c
index 8cfddc0496a..8cfddc0496a 100644
--- a/btree/bt_cmp.c
+++ b/src/btree/bt_cmp.c
diff --git a/btree/bt_debug.c b/src/btree/bt_debug.c
index e27607aba6a..e27607aba6a 100644
--- a/btree/bt_debug.c
+++ b/src/btree/bt_debug.c
diff --git a/btree/bt_desc.c b/src/btree/bt_desc.c
index 2fc024d1e8c..2fc024d1e8c 100644
--- a/btree/bt_desc.c
+++ b/src/btree/bt_desc.c
diff --git a/btree/bt_discard.c b/src/btree/bt_discard.c
index 8e189204ce0..8e189204ce0 100644
--- a/btree/bt_discard.c
+++ b/src/btree/bt_discard.c
diff --git a/btree/bt_dump.c b/src/btree/bt_dump.c
index 4d46fceff27..4d46fceff27 100644
--- a/btree/bt_dump.c
+++ b/src/btree/bt_dump.c
diff --git a/btree/bt_evict.c b/src/btree/bt_evict.c
index cd4cb87bfb4..cd4cb87bfb4 100644
--- a/btree/bt_evict.c
+++ b/src/btree/bt_evict.c
diff --git a/btree/bt_misc.c b/src/btree/bt_misc.c
index c0f58002522..c0f58002522 100644
--- a/btree/bt_misc.c
+++ b/src/btree/bt_misc.c
diff --git a/btree/bt_open.c b/src/btree/bt_open.c
index c746782221e..c746782221e 100644
--- a/btree/bt_open.c
+++ b/src/btree/bt_open.c
diff --git a/btree/bt_ovfl.c b/src/btree/bt_ovfl.c
index 09eac77264b..09eac77264b 100644
--- a/btree/bt_ovfl.c
+++ b/src/btree/bt_ovfl.c
diff --git a/btree/bt_page.c b/src/btree/bt_page.c
index 915d038751b..915d038751b 100644
--- a/btree/bt_page.c
+++ b/src/btree/bt_page.c
diff --git a/btree/bt_read.c b/src/btree/bt_read.c
index f7e594d2217..f7e594d2217 100644
--- a/btree/bt_read.c
+++ b/src/btree/bt_read.c
diff --git a/btree/bt_reconcile.c b/src/btree/bt_reconcile.c
index 7a57cfe4a97..7a57cfe4a97 100644
--- a/btree/bt_reconcile.c
+++ b/src/btree/bt_reconcile.c
diff --git a/btree/bt_ret.c b/src/btree/bt_ret.c
index 8cdf8d90ce1..8cdf8d90ce1 100644
--- a/btree/bt_ret.c
+++ b/src/btree/bt_ret.c
diff --git a/btree/bt_rw.c b/src/btree/bt_rw.c
index ad8f12482b1..ad8f12482b1 100644
--- a/btree/bt_rw.c
+++ b/src/btree/bt_rw.c
diff --git a/btree/bt_stat.c b/src/btree/bt_stat.c
index 5beb931f578..5beb931f578 100644
--- a/btree/bt_stat.c
+++ b/src/btree/bt_stat.c
diff --git a/btree/bt_sync.c b/src/btree/bt_sync.c
index af5a9d65258..af5a9d65258 100644
--- a/btree/bt_sync.c
+++ b/src/btree/bt_sync.c
diff --git a/btree/bt_vrfy.c b/src/btree/bt_vrfy.c
index 19e9fccb82a..19e9fccb82a 100644
--- a/btree/bt_vrfy.c
+++ b/src/btree/bt_vrfy.c
diff --git a/btree/bt_walk.c b/src/btree/bt_walk.c
index f5ef9674f9b..f5ef9674f9b 100644
--- a/btree/bt_walk.c
+++ b/src/btree/bt_walk.c
diff --git a/btree/c_drain.c b/src/btree/c_drain.c
index c213f652e75..c213f652e75 100644
--- a/btree/c_drain.c
+++ b/src/btree/c_drain.c
diff --git a/btree/c_init.c b/src/btree/c_init.c
index 641f90d9a56..641f90d9a56 100644
--- a/btree/c_init.c
+++ b/src/btree/c_init.c
diff --git a/btree/c_page.c b/src/btree/c_page.c
index cd71c0b4ebf..cd71c0b4ebf 100644
--- a/btree/c_page.c
+++ b/src/btree/c_page.c
diff --git a/btree/c_read.c b/src/btree/c_read.c
index 1578b5ee642..1578b5ee642 100644
--- a/btree/c_read.c
+++ b/src/btree/c_read.c
diff --git a/btree/col_get.c b/src/btree/col_get.c
index 7ab2f242a35..7ab2f242a35 100644
--- a/btree/col_get.c
+++ b/src/btree/col_get.c
diff --git a/btree/col_put.c b/src/btree/col_put.c
index e7e76778fe3..e7e76778fe3 100644
--- a/btree/col_put.c
+++ b/src/btree/col_put.c
diff --git a/btree/col_srch.c b/src/btree/col_srch.c
index 81c24e3d54f..81c24e3d54f 100644
--- a/btree/col_srch.c
+++ b/src/btree/col_srch.c
diff --git a/btree/row_get.c b/src/btree/row_get.c
index 03f2cce44bc..03f2cce44bc 100644
--- a/btree/row_get.c
+++ b/src/btree/row_get.c
diff --git a/btree/row_put.c b/src/btree/row_put.c
index 3ac4304ccec..3ac4304ccec 100644
--- a/btree/row_put.c
+++ b/src/btree/row_put.c
diff --git a/btree/row_srch.c b/src/btree/row_srch.c
index a8ff78dc380..a8ff78dc380 100644
--- a/btree/row_srch.c
+++ b/src/btree/row_srch.c
diff --git a/db/db_err.c b/src/db/db_err.c
index 1ba46e06a69..1ba46e06a69 100644
--- a/db/db_err.c
+++ b/src/db/db_err.c
diff --git a/db/db_getset.c b/src/db/db_getset.c
index 6c133a0a3fb..6c133a0a3fb 100644
--- a/db/db_getset.c
+++ b/src/db/db_getset.c
diff --git a/db/db_handle.c b/src/db/db_handle.c
index b9e244d5ea9..b9e244d5ea9 100644
--- a/db/db_handle.c
+++ b/src/db/db_handle.c
diff --git a/db/db_huffman.c b/src/db/db_huffman.c
index ae9fe7fccde..ae9fe7fccde 100644
--- a/db/db_huffman.c
+++ b/src/db/db_huffman.c
diff --git a/db/db_open.c b/src/db/db_open.c
index 1cdf04c1288..1cdf04c1288 100644
--- a/db/db_open.c
+++ b/src/db/db_open.c
diff --git a/db/db_stat.c b/src/db/db_stat.c
index 84ac9960860..84ac9960860 100644
--- a/db/db_stat.c
+++ b/src/db/db_stat.c
diff --git a/db/db_sync.c b/src/db/db_sync.c
index eec5026f0c2..eec5026f0c2 100644
--- a/db/db_sync.c
+++ b/src/db/db_sync.c
diff --git a/env/env_err.c b/src/env/env_err.c
index b5bc0ca5966..b5bc0ca5966 100644
--- a/env/env_err.c
+++ b/src/env/env_err.c
diff --git a/env/env_getset.c b/src/env/env_getset.c
index 6786c87b41d..6786c87b41d 100644
--- a/env/env_getset.c
+++ b/src/env/env_getset.c
diff --git a/env/env_global.c b/src/env/env_global.c
index e41a7bccfad..e41a7bccfad 100644
--- a/env/env_global.c
+++ b/src/env/env_global.c
diff --git a/env/env_handle.c b/src/env/env_handle.c
index 1c02675041f..1c02675041f 100644
--- a/env/env_handle.c
+++ b/src/env/env_handle.c
diff --git a/env/env_init.c b/src/env/env_init.c
index 26c7062d63f..26c7062d63f 100644
--- a/env/env_init.c
+++ b/src/env/env_init.c
diff --git a/env/env_msg.c b/src/env/env_msg.c
index 9dcfdec9514..9dcfdec9514 100644
--- a/env/env_msg.c
+++ b/src/env/env_msg.c
diff --git a/env/env_open.c b/src/env/env_open.c
index a6f95838ede..a6f95838ede 100644
--- a/env/env_open.c
+++ b/src/env/env_open.c
diff --git a/env/env_stat.c b/src/env/env_stat.c
index 997d9080f31..997d9080f31 100644
--- a/env/env_stat.c
+++ b/src/env/env_stat.c
diff --git a/env/env_sync.c b/src/env/env_sync.c
index 4c40b52ad1c..4c40b52ad1c 100644
--- a/env/env_sync.c
+++ b/src/env/env_sync.c
diff --git a/env/env_toc.c b/src/env/env_toc.c
index 46d132707b5..46d132707b5 100644
--- a/env/env_toc.c
+++ b/src/env/env_toc.c
diff --git a/env/env_workq.c b/src/env/env_workq.c
index 76a00b0dce5..76a00b0dce5 100644
--- a/env/env_workq.c
+++ b/src/env/env_workq.c
diff --git a/os_posix/os_abort.c b/src/os_posix/os_abort.c
index 68106636831..68106636831 100644
--- a/os_posix/os_abort.c
+++ b/src/os_posix/os_abort.c
diff --git a/os_posix/os_alloc.c b/src/os_posix/os_alloc.c
index dbbb915822a..dbbb915822a 100644
--- a/os_posix/os_alloc.c
+++ b/src/os_posix/os_alloc.c
diff --git a/os_posix/os_filesize.c b/src/os_posix/os_filesize.c
index 604d963f8e6..604d963f8e6 100644
--- a/os_posix/os_filesize.c
+++ b/src/os_posix/os_filesize.c
diff --git a/os_posix/os_fsync.c b/src/os_posix/os_fsync.c
index e6ecfd95a21..e6ecfd95a21 100644
--- a/os_posix/os_fsync.c
+++ b/src/os_posix/os_fsync.c
diff --git a/os_posix/os_mtx.c b/src/os_posix/os_mtx.c
index fb58784ec2d..fb58784ec2d 100644
--- a/os_posix/os_mtx.c
+++ b/src/os_posix/os_mtx.c
diff --git a/os_posix/os_open.c b/src/os_posix/os_open.c
index 971fe47f11b..971fe47f11b 100644
--- a/os_posix/os_open.c
+++ b/src/os_posix/os_open.c
diff --git a/os_posix/os_rw.c b/src/os_posix/os_rw.c
index 1ce48f3ec56..1ce48f3ec56 100644
--- a/os_posix/os_rw.c
+++ b/src/os_posix/os_rw.c
diff --git a/os_posix/os_sleep.c b/src/os_posix/os_sleep.c
index 74b86a30d42..74b86a30d42 100644
--- a/os_posix/os_sleep.c
+++ b/src/os_posix/os_sleep.c
diff --git a/os_posix/os_thread.c b/src/os_posix/os_thread.c
index 3fb62a482d8..3fb62a482d8 100644
--- a/os_posix/os_thread.c
+++ b/src/os_posix/os_thread.c
diff --git a/os_posix/os_yield.c b/src/os_posix/os_yield.c
index a13b407150d..a13b407150d 100644
--- a/os_posix/os_yield.c
+++ b/src/os_posix/os_yield.c
diff --git a/support/api.c b/src/support/api.c
index cb7b48a7d69..cb7b48a7d69 100644
--- a/support/api.c
+++ b/src/support/api.c
diff --git a/support/cksum.c b/src/support/cksum.c
index 06b0e625b0d..06b0e625b0d 100644
--- a/support/cksum.c
+++ b/src/support/cksum.c
diff --git a/support/err.c b/src/support/err.c
index dc8eac01189..dc8eac01189 100644
--- a/support/err.c
+++ b/src/support/err.c
diff --git a/support/hazard.c b/src/support/hazard.c
index 5bef0731aa5..5bef0731aa5 100644
--- a/support/hazard.c
+++ b/src/support/hazard.c
diff --git a/support/huffman.c b/src/support/huffman.c
index 2a0fcfde218..2a0fcfde218 100644
--- a/support/huffman.c
+++ b/src/support/huffman.c
diff --git a/support/pow.c b/src/support/pow.c
index 3a6b6b1d686..3a6b6b1d686 100644
--- a/support/pow.c
+++ b/src/support/pow.c
diff --git a/support/prime.c b/src/support/prime.c
index 8abe43158b2..8abe43158b2 100644
--- a/support/prime.c
+++ b/src/support/prime.c
diff --git a/support/progress.c b/src/support/progress.c
index 480699cbdd1..480699cbdd1 100644
--- a/support/progress.c
+++ b/src/support/progress.c
diff --git a/support/scratch.c b/src/support/scratch.c
index 9b20ea963f3..9b20ea963f3 100644
--- a/support/scratch.c
+++ b/src/support/scratch.c
diff --git a/support/serial.c b/src/support/serial.c
index 9974f1f6b38..9974f1f6b38 100644
--- a/support/serial.c
+++ b/src/support/serial.c
diff --git a/support/simple_setup.c b/src/support/simple_setup.c
index a4464fead69..a4464fead69 100644
--- a/support/simple_setup.c
+++ b/src/support/simple_setup.c
diff --git a/support/stat.c b/src/support/stat.c
index bf08a95b12f..bf08a95b12f 100644
--- a/support/stat.c
+++ b/src/support/stat.c
diff --git a/support/strerror.c b/src/support/strerror.c
index 17a4653438a..17a4653438a 100644
--- a/support/strerror.c
+++ b/src/support/strerror.c
diff --git a/support/version.c b/src/support/version.c
index dbd60162c16..dbd60162c16 100644
--- a/support/version.c
+++ b/src/support/version.c
diff --git a/utilities/db_dump/util_dump.c b/src/utilities/db_dump/util_dump.c
index 68cc6d69061..68cc6d69061 100644
--- a/utilities/db_dump/util_dump.c
+++ b/src/utilities/db_dump/util_dump.c
diff --git a/utilities/db_load/util_load.c b/src/utilities/db_load/util_load.c
index 6ededed7c28..6ededed7c28 100644
--- a/utilities/db_load/util_load.c
+++ b/src/utilities/db_load/util_load.c
diff --git a/utilities/db_stat/util_stat.c b/src/utilities/db_stat/util_stat.c
index afb2f94cba8..afb2f94cba8 100644
--- a/utilities/db_stat/util_stat.c
+++ b/src/utilities/db_stat/util_stat.c
diff --git a/utilities/db_verify/util_verify.c b/src/utilities/db_verify/util_verify.c
index 5c5bd02407f..5c5bd02407f 100644
--- a/utilities/db_verify/util_verify.c
+++ b/src/utilities/db_verify/util_verify.c