#
#
# add_file "audit-includes"
#  content [1779cfc4a2dd88c53d5f48692cc88bdcb838b160]
# 
# add_file "base.hh"
#  content [32b62952e1b697f79191de3c0cf74a58f73f0f51]
# 
# patch "HACKING"
#  from [8e322b6697a91dc479e0a6fc46ee33ed0a305fc8]
#    to [a2b7b94f93272c8441c87f3c35c1cd1cfc6fd4f0]
# 
# patch "Makefile.am"
#  from [744f13784390967521794d7a989d504103a89f2b]
#    to [48daf094e8337fabfe244d6c9f8deea847f0380d]
# 
# patch "adler32.hh"
#  from [62eac472350e07bfc51ff98f12d603fb934a1b82]
#    to [7d209e5bfab115bd173679fc129799a44be15931]
# 
# patch "annotate.cc"
#  from [a152991b3936bd8b49e9392fd908e882a7c13c4b]
#    to [38d8ad417471d7ac2724e477eaafd1a59581ca8a]
# 
# patch "app_state.cc"
#  from [4534848fd6ec5d06db4e6b389bfa0dbc8764f975]
#    to [74425b52934112d6f23c222e36516a69aee2bb29]
# 
# patch "asciik.cc"
#  from [26ea78a6485ea8e5f99e4f419da6954d213ca6ff]
#    to [eaf25ac9f4e1187c7ce02559dc2ff196e82d8f74]
# 
# patch "asciik.hh"
#  from [d6dd7b177951094276a62ed2ee144de738c5a078]
#    to [9822c026c2b57802ea1d1872670f017315151c78]
# 
# patch "automate.cc"
#  from [7f9e5ead627f71b092a15b9919bd3f2f721dfb85]
#    to [2f3e314c08cb2d2f49e7c3af16fd5c5777982a86]
# 
# patch "basic_io.cc"
#  from [16c713cad58a621d6acd778daa7065f94173f8fc]
#    to [c229de5420267b08ab3a751c60f7aa4bcb099cef]
# 
# patch "basic_io.hh"
#  from [0b2e48ab437ab4d2c66ef412fa2328ead6c84d19]
#    to [d843284e57239ab9616400b179882b56ffc5fcb1]
# 
# patch "cert.cc"
#  from [034d63fdfa5faab80bfde1adc8a5c42d152b325a]
#    to [933a1fcb6c13e927cc06754f7c24207b8fae3dc6]
# 
# patch "charset.cc"
#  from [744a0592671f2e19acf1fbfeab2e72897aecbac9]
#    to [0b6229965f7158b3f67b981f8e22f0636532859e]
# 
# patch "cmd.hh"
#  from [a35952c265bbeaf6590cdcd8b32369adbf50fefc]
#    to [07466afc53548ca1d2180ac78afd32e1737f96e0]
# 
# patch "cmd_automate.cc"
#  from [d16e5b85dcc63badef4da21a9bcf4ed7416337fc]
#    to [1328e65fc98bd88779b701ef3423d33ac246150e]
# 
# patch "cmd_db.cc"
#  from [cf45b65ee1746c70f1b310177790ea4ba09b5bf5]
#    to [f07d0fd04917a29d7bcbc9bfa4a676872107c339]
# 
# patch "cmd_diff_log.cc"
#  from [82af527afc535dbae3f3fc2bb18f994a072448f1]
#    to [830761c6afbd89c8f69ad88e6b7756f2dd41f31c]
# 
# patch "cmd_files.cc"
#  from [5c754bd725507628a28b4e526d6a7b5cc6c455e6]
#    to [ff7991447d28bb03fd6c47568dda0b4b967846f9]
# 
# patch "cmd_key_cert.cc"
#  from [f08ca3adea1285dcd4c734a84b26a2d16f9f3a87]
#    to [dbcf20766cb5dfbe2a47182a100e2e8a488148a4]
# 
# patch "cmd_list.cc"
#  from [9ecdfc62f2c06ccbf08599a34317edcec06d8e2d]
#    to [5889034eb41568c36016cbd8617133c6a1065c48]
# 
# patch "cmd_merging.cc"
#  from [8ffdc93fea885aef53e7208d9220a60bd17cee03]
#    to [5aae4e08cd5bd2ef6f25247cb7798e5df7cdb904]
# 
# patch "cmd_netsync.cc"
#  from [74d3bfea91a937a9e72f6d595fe2b58e71189cca]
#    to [fe74ba809d95febb94f85a2d2ed9f761c93e25bd]
# 
# patch "cmd_othervcs.cc"
#  from [a645d9d2fd6c0c738dbbfaafddd1c622a8751bc0]
#    to [be662f2013d7eaa93a8729606e160c2c4c7b2512]
# 
# patch "cmd_packet.cc"
#  from [207c42e08dc0accce2740d090c484d706a00d9cc]
#    to [a9eec81d3b605490ebc848f488b1c33060ed052a]
# 
# patch "cmd_ws_commit.cc"
#  from [1b33fbd6f0a59bce2ece592676754bccdfa06683]
#    to [3c9a3fe225e7c79ebadbdbf484cd535109792c70]
# 
# patch "commands.cc"
#  from [ded65727f05f111afe1a0f5b13a3a451590d0ed5]
#    to [4c4a322cca8c3eb6760a289639a4b9a6f6819bf7]
# 
# patch "commands.hh"
#  from [d2d27b5304bb815af7dacb768fdb548f66016a48]
#    to [255a1ffe65f28f2a88c6526092f9a63c78ef11ac]
# 
# patch "constants.cc"
#  from [94319b46e450459cee4702561bfb16646838b667]
#    to [b5f0369dd3251ff7df856e501b090125e643f46a]
# 
# patch "constants.hh"
#  from [b9bc0cea940b4be75380a952b9988329af48f397]
#    to [2e604bcfdaa15840dc2a565088bd93f82c5f81ff]
# 
# patch "contrib/usher.cc"
#  from [6ebc1e6b5d4b44e048dc3a9b3ec788d522b43b62]
#    to [8789b3564e3a7c8a3d33f1b47891ffa505e899fc]
# 
# patch "crypto_tests.cc"
#  from [8b029399da90cc38a8ac11f3d0aa058f00111a99]
#    to [e9e0a323f735f61f2072d0c5d4932778a719ecc8]
# 
# patch "cset.cc"
#  from [00c69570bb60a3c49337e350ab39816741f6764a]
#    to [a4ac264727cff85b96a1c001979c0d606b826bd2]
# 
# patch "cset.hh"
#  from [eedb0328724138427340bbd88a8ebc48f2f29273]
#    to [f3b8151d71b350a6a9751649752da75c316b4ec2]
# 
# patch "current_exception.hh"
#  from [b54a2fcf1a92314df33ccd16da0b147686451102]
#    to [3b0be7b7f888fc02ef96db80b17b0fae2c9c83bd]
# 
# patch "database.cc"
#  from [671178b4ec75c99172da57c7f1898fa6746afe8a]
#    to [834b1fbe31327949d71019c6140849e42c6be092]
# 
# patch "database.hh"
#  from [954a78c55234b282b7c047569cc5cc6ca9014341]
#    to [df490ba6c815f5afca05231b2e8077b917ef9e14]
# 
# patch "database_check.cc"
#  from [011488d738d65307ae76e194cb1da287077cd94f]
#    to [8b0cc536cac18b700af8121d9348e44ba848e8b2]
# 
# patch "dates.cc"
#  from [5789e3191fc9b2e3db219007aef810dd1d00e9da]
#    to [487b11923395a767fc568429290469ca83a00fc9]
# 
# patch "dates.hh"
#  from [b9a3db81cbf8cccada51b1e337a60fbe30ae3d71]
#    to [a7f141455c581d29547f76c495cfbac204b0be0d]
# 
# patch "diff_patch.cc"
#  from [965f22af1e86ee242cb4a578e19d0f9bf3675852]
#    to [45f3c5a93b2dab477bc06a307883d40f5b43ca63]
# 
# patch "diff_patch.hh"
#  from [d481b1cf53caed0381272a18713c357880d3bd03]
#    to [681984533e6cb27a293e72d159ec24457f7cf804]
# 
# patch "enumerator.cc"
#  from [eec6cead8d287bcb00376bb9f2ed8a48fad7f229]
#    to [763790c1ded956c5bb680a3b9b3e70453d2826c4]
# 
# patch "epoch.cc"
#  from [acc8e97b3406db8d5ee3720648f46703d922f84a]
#    to [c9f85974e9799b788d75863843977c8fc405d38d]
# 
# patch "epoch.hh"
#  from [cca55b456104aba914581f7bda839d1b303ffb13]
#    to [9d4366878bee862bbdf1f04b107e780e1225a340]
# 
# patch "file_io.cc"
#  from [955fd8ec2d758969fa18f2bc6eb4f6b70c7a3825]
#    to [75b7e2bb594f959afb17378d571088ed11d588ee]
# 
# patch "globish.cc"
#  from [9d9680696d2be391787e6697214a544fe955c016]
#    to [1ffa504207d3631c43dd18ecb0e2cd57f5fe359a]
# 
# patch "globish.hh"
#  from [a09c59d14a2425049d00b50a963e22543939c366]
#    to [7b0d071f31a91efa626ee0da5c07263d5ea1abf1]
# 
# patch "graph.cc"
#  from [fe7d75cef96fe2f2fa3fcc10d3a863a2b384ff0e]
#    to [2d934cb225b5639919fec3eda0cbec615cf2f903]
# 
# patch "graph.hh"
#  from [9791121bb0fb8d3063c97b32329fa513b51cd216]
#    to [dfb30a026f9dcbb139d13d96eadc7ed591e09aaf]
# 
# patch "hash_map.hh"
#  from [ab59b629e8912041310f4e1371441a40dd236de4]
#    to [1354e46d7ae2f17c40f5262c7b7be6666d197d64]
# 
# patch "hmac.cc"
#  from [9bc643f4d32b5ee52adaca6e9cb5e0a656a3d5d9]
#    to [115a8c2bd6e81ea28d4628e77e4ad4dfae8e00a9]
# 
# patch "hmac.hh"
#  from [7f747cf86041201ba86b56f718bd67ab9673bc2c]
#    to [6953e20a8a307882b42c317e31714a53f8dae510]
# 
# patch "inodeprint.cc"
#  from [7b40801a0c24b79e31875a985b2b657fcef408ae]
#    to [55d87b3491db66b55912371406b89163fa4f6264]
# 
# patch "interner.hh"
#  from [4a79c399b9b450749e9efcaf55ff54795a82b037]
#    to [cbf57f9a888faf417eb9bb0cba373a18589b7c5b]
# 
# patch "key_store.cc"
#  from [5baf95cf24e95172f259319f64c683560ecbcd17]
#    to [27bf014bed826d2dffc53b3358295c6c376e7fdc]
# 
# patch "keys.cc"
#  from [aec2f1b3cab5149ce6be1db4e771f5d6708b8316]
#    to [5f4a21d06375393f85b4568ffdcdb790d024d711]
# 
# patch "keys.hh"
#  from [b70145327a961277459565f4a510cba802fa75af]
#    to [fd38e60039af1d54054755514fdab2dee6340c3b]
# 
# patch "lcs.cc"
#  from [959d45c33b49c9cc0be495e4a556d25d52a8dd8b]
#    to [3e6a13b291a0d7cd12b700ad3c13fe5d527c841f]
# 
# patch "legacy.cc"
#  from [6867f219f457fa5df90b2801871c1e1f61a451f0]
#    to [69f6bdba408d0787bd51919fb99a296b0865e65c]
# 
# patch "legacy.hh"
#  from [158f7db6cbe333fe695d3a8dcd335ad0abc47e7d]
#    to [5482280179c002d9243f6e7be145e49b7847b5ce]
# 
# patch "lua.cc"
#  from [987982ec6fae322b0fe836aaff25ccc1fdc4f973]
#    to [549417b24694d4668d02e6b3143bc9f9cd806a10]
# 
# patch "lua.hh"
#  from [94050b961bd34d473e74a066e0b4c956546c863c]
#    to [b5de15e16dc12874e8dec56a883800252e05eb22]
# 
# patch "lua_hooks.cc"
#  from [b2d0a25544aa0fa6683a9a17e7cd9afc029bc6d7]
#    to [1d95c581d5880c74fd9c941fd69e2564d624d2e2]
# 
# patch "lua_hooks.hh"
#  from [042f2b10a20616bf449b2b1326f9f2a8c293d19b]
#    to [0968f4973ed14ccd60fb411de351f30008f7da7e]
# 
# patch "luaext_globish.cc"
#  from [72dd38c8bfcd89d9af8bb2a9a3562867f97175c0]
#    to [8dd1a45c7545658b03a8c59ef2bd1ab28fcabd75]
# 
# patch "luaext_guess_binary.cc"
#  from [06faa80ca58ba8d777c673d5c92f39b61e872c8c]
#    to [09db7e9178b79f92386ce6e61975e6cd6b7d23c2]
# 
# patch "luaext_mkstemp.cc"
#  from [9a455c9939d673cac97959fe2df64609a4ad05d3]
#    to [5e899a98dc801948c4937fd66fcf5b6d82838388]
# 
# patch "luaext_parse_basic_io.cc"
#  from [4b49379b989c0b3d72156bdfbf1099fd59af8d23]
#    to [e0dd6eaf52ad9523b67eae29bf67b26afd09f628]
# 
# patch "luaext_platform.cc"
#  from [2ce777d5ba2573e64f08e7d68ee8c24b2ddaa770]
#    to [8fdc0fafb4bd0c497865778b8f9e951a21293376]
# 
# patch "merge.cc"
#  from [1a06c3dfc96557c0608d1450917ca071dc4795b2]
#    to [5bba69d0c107e0661d91dca8a7a06b6e4f5fbbe6]
# 
# patch "merkle_tree.cc"
#  from [d508737f2f16ecc274ad032fd07de8fdb3cc4204]
#    to [d72fe6c6455467112af82ad961abe1b916df86a2]
# 
# patch "merkle_tree.hh"
#  from [1bdeaecf058eafd70ae8b71835c8076f51594961]
#    to [40e3ce0f83ba3a41bcca9a4896792d52627f0955]
# 
# patch "mkstemp.cc"
#  from [ae0cfcdb3bdf668c7a8028ffac329fc791343896]
#    to [7ac9cc944cc7c836aaa1ebfe0233214f47e6d2d6]
# 
# patch "mkstemp.hh"
#  from [47393d19432c5dc5a9150df10fdb853540551800]
#    to [368bf10bb8da79f070c54f3e8484efeacbf24e4f]
# 
# patch "monotone.cc"
#  from [611d1d85a05112ff1bc59ff2268aa8c8d3054458]
#    to [1ed64f254e054895819383b34106cf1f2ebec2d0]
# 
# patch "mt_version.cc"
#  from [41449ae39ddbeb3c8b689d91e345289f84044707]
#    to [72c6a402aaeb10deb10b914775b3c90a461042fa]
# 
# patch "mt_version.hh"
#  from [2bc42386f5f5b0f6e6dbc7b794a9db41e51a9d0f]
#    to [0637d55ddff99fd51dab3e0214a1abd8df0d2668]
# 
# patch "mtn-sanity.cc"
#  from [245d3726f06c950455e311f45d076545a0f3e083]
#    to [ea5f2fd3b7316af14a196018aabc27c30a571882]
# 
# patch "netcmd.cc"
#  from [a29ffe66940d6ee0d176339e6c7b85cf8bdee159]
#    to [eaf56a9400d6bc15eccb6114c19cc7ce5cde9622]
# 
# patch "netcmd.hh"
#  from [086951d7f8531e3ee22bf223a6f59d6bcda9fb62]
#    to [91da5034baab3bc9dec528c24ca5b8b2ff484d5c]
# 
# patch "netsync.cc"
#  from [93ebea4aca4d92fc925111c041c52b93fd6306d1]
#    to [f7087adf6385b4b330004ed99fd6548e74a71799]
# 
# patch "netxx_pipe.cc"
#  from [66d4dcf236cc6c230626cec1ea10aa97b838543c]
#    to [5f30a3b9ca8f26b81c874cfeeca4d286130e3ea5]
# 
# patch "netxx_pipe.hh"
#  from [f4d50d5b3f45a9483c2102edf21268841bae7534]
#    to [a20357be17876b21d53d2bf237e0a0024d716018]
# 
# patch "numeric_vocab.cc"
#  from [8b580fad4110886915a411fd9aba336f81a28beb]
#    to [06d6f875e2eb934eb15879bd2e07d5ba4e396476]
# 
# patch "option.cc"
#  from [75b60fa96a8aefab50c6b0a1a16b255bf40b9933]
#    to [4196e8cd69e0338d7d99da072e8daa94cb1a6731]
# 
# patch "option.hh"
#  from [5a85259c5bc4da778c3a5555ab236f4e6aac5a70]
#    to [b84098e030a8b5982930a0d6c093958792d38f13]
# 
# patch "options.cc"
#  from [fdb77217c55e97a3c36428f18a7a54cd82e6b149]
#    to [b0531b13b04640f7f8cbbade6dc72451f461b20b]
# 
# patch "outdated_indicator.cc"
#  from [f1b81dda2764ff8a6bae829ec88e68cde1f8b580]
#    to [ce466c0d56715e28dc365c25c1caf0afa0359587]
# 
# patch "packet.cc"
#  from [df0fa7f0af5b79f300c3bdc63940be1940af92e2]
#    to [d6b09f9e7b3a9c3e4c2858468fb345cb0aa5d051]
# 
# patch "packet.hh"
#  from [e28b0bb77a6505bf4daf75d0f6f655d5b3f28e4d]
#    to [b58fd00b0eae10d3f7508da73a29d7730feb88de]
# 
# patch "parallel_iter.hh"
#  from [ba07dec38610a667e9320188f0f80d064f41612c]
#    to [2ee45ae23e10ab433da7101315ad4ea52435f706]
# 
# patch "paths.cc"
#  from [a8844c3a2e7cd54b181e8b900832c52037d85343]
#    to [587d50eb530e1cd8533fd00271c03889f20f789c]
# 
# patch "paths.hh"
#  from [95e2d4782ab7e04859e292f8b92aad4ead046b83]
#    to [2e1b350cedd3e4c1cfd48f5fd47a3934cb64f296]
# 
# patch "platform.hh"
#  from [8d9be396f1a2d884491c63d92cf5c517145cab13]
#    to [0e346b8659597da7289519e5df1f0a886776b99d]
# 
# patch "project.cc"
#  from [f64755c9f3508c82ba5717115171d2ac657b6f5c]
#    to [9ecb5f265fcd7d41708c9c316b68c9bb5df13b4d]
# 
# patch "project.hh"
#  from [5da24a7e4b1f31ec1e36a351aab0047123aebc2b]
#    to [b9dcc29acb8d05085dcbdda44ed6dabdaed85d9f]
# 
# patch "randomfile.hh"
#  from [22836a0c103b43d0a388706e7b36bfc9398c098c]
#    to [10edb3699a38484b52912a8ef33cc937a0a9f520]
# 
# patch "randomizer.cc"
#  from [144210adc11503d17d44152dec7e1779d0426c16]
#    to [481e038efea222577cb47f22c3bb3614d7d7d9d5]
# 
# patch "rcs_file.cc"
#  from [3846fcd9f03c09140267d0da6e9ac3aacce284ff]
#    to [73064ea1d3e228d0cd5c811973c492b4657e14a6]
# 
# patch "rcs_file.hh"
#  from [46a3d0c025c5fc85ae2d0f8e79c1b7653564b08a]
#    to [1cc24800d1d2c57e32cc8e2fc89c5cbb3faa8a1f]
# 
# patch "rcs_import.cc"
#  from [f77665e03e8ca727897dd9f35c644f09e0c460a0]
#    to [7ad1789b968f59343d8809634358075fc45d92a5]
# 
# patch "refiner.cc"
#  from [ce1343babc5e7b22067afd8dd3de444a442c1e71]
#    to [52fe54a2aae857ec18ab790a4637b6aa825895ac]
# 
# patch "restrictions.cc"
#  from [9c67575a229df8b944b5da5a7a6721c40588f92d]
#    to [addbcf5050291f5a6da670e3bbeec7959c8da3d1]
# 
# patch "rev_height.cc"
#  from [a44fcd6a6619cd1b8b187674abdd07793f146023]
#    to [7330d685fb6f60b4425d2e9f6be2211c2785eb71]
# 
# patch "rev_height.hh"
#  from [448eee2ee56b8ba3f25e3116ed624b258fd0ed89]
#    to [b1e48b09b2982ee038344cddfe54768c4f3675a8]
# 
# patch "revision.cc"
#  from [df17f8e950d6c5167382fcdedddb5ce5cab87b5c]
#    to [0413d7e63a44fe549471910712312314620018dc]
# 
# patch "revision.hh"
#  from [c8ba22a180653cff9231e65e3fbe936abc46e8b7]
#    to [11085059e347c4e47ea631169b70231d3db5a180]
# 
# patch "roster.cc"
#  from [2d66e04b7ca82b71b11f9aa3d8263ff0a193c013]
#    to [72ca4319326e37ae810cc2a9956acba33b0e09e4]
# 
# patch "roster_delta.cc"
#  from [97bbe4959ff58789934e4e9a9bb7add980772738]
#    to [dc0b4bc54afd8cca8a3f1364597c0f469d90eaee]
# 
# patch "roster_merge.cc"
#  from [b17a6717d58bf2e10022ac4a1a1ec607d6f6fc65]
#    to [bdc6e0a6da2807e45bf45796d3519881f22052ad]
# 
# patch "roster_merge.hh"
#  from [b7bea7e59fb7b2e51a0c0ef5644524f29b07a4cf]
#    to [2aa1838992962f0872e44b2c133bca54311f97a5]
# 
# patch "sanity.cc"
#  from [95ceb279d0048f096cbf59e66f0143eb2038df84]
#    to [9fc53db75a289a176bfdc7ee88b58d505cc6936d]
# 
# patch "sanity.hh"
#  from [13909caa9bed8e38bc4c433f0f9a3e93bef08cfd]
#    to [c6a31bb3c9b988803a91dbe258e2acb83ddf73ed]
# 
# patch "schema_migration.cc"
#  from [f3c0a9dabc833154a3f07795f243d561b23d985c]
#    to [df656cc76752a897bf10249886044e5aed28c36d]
# 
# patch "schema_migration.hh"
#  from [75ea83a18e754dc5f3a7302bfa95de9eadbd643a]
#    to [28378b9f52084c15026e2cd9cba011256cdec0ab]
# 
# patch "selectors.cc"
#  from [4dfc19bef7db1186ea36424cb158a578425c690b]
#    to [87df1393159bdc637059d9dfa9dfc52d50236326]
# 
# patch "selectors.hh"
#  from [f3f93e168438c3dd49111a2e4aff5a444e01994d]
#    to [83f7e51e0ae9c30864e8f39eeef0368ab1000315]
# 
# patch "sha1.cc"
#  from [ecdaa4a3c79dbb948c0dfc1178bd859b61fd58ed]
#    to [a63699d0eae30164c447c33cc632a6c768d6ec2b]
# 
# patch "sha1_engine.hh"
#  from [0c4acbe18d65d59f3ecac0c62b79c3d9eb8b67b9]
#    to [501948b43bba5a7b2dfdd8452070ec785fb736c9]
# 
# patch "simplestring_xform.cc"
#  from [eb98a7a93a9593dcf13ae3cb9200e4ad9a3b6267]
#    to [fcab8ef2e68fc2f2d24685320430d6aa2a6fa126]
# 
# patch "simplestring_xform.hh"
#  from [b6d122d8ba5d74603711bb9ffd5d0041e523fa28]
#    to [501041263b4eb2b04c61e753b5bc636276716040]
# 
# patch "specialized_lexical_cast.cc"
#  from [1b0e3823a5e110c00a139a889b71d93e5546058d]
#    to [21b197949d6fea0426a7e22a61baf4c2fceff758]
# 
# patch "ssh_agent.cc"
#  from [076be79143413545723375da8e3d833a0fad88df]
#    to [ad754cf6299b789436bd1a2679c6001821b4cfd2]
# 
# patch "string_queue.cc"
#  from [3c8ba74dc7770c6fd3e6f8934190d097338a238f]
#    to [34880af1af20cae04a527f370db60dd94ac6e97f]
# 
# patch "string_queue.hh"
#  from [39b28624d0689105d55b462cb20beb57ba499378]
#    to [1326b1642a49c87e22c5dc727ea019c502213ca0]
# 
# patch "tester.cc"
#  from [d1ad2241f29ecf11fca85ae573fc8bff4d942a87]
#    to [4c5874c632c629d252c04b56ad7fb0902a81c6e7]
# 
# patch "transforms.cc"
#  from [a6e23fbd561ca7ed18e71908e3829e29b0c94c5b]
#    to [91ed3086b19a25d7d28258a984bcdd8a32a8a549]
# 
# patch "ui.cc"
#  from [f4704e07c8544b0c01a45d476c3d61c0b98deb45]
#    to [4de898f353d62cc49f8cb22330527983f589277e]
# 
# patch "ui.hh"
#  from [9e12d78e6a03647b90d790c0abb0fbfa86da7c6e]
#    to [ad79ebfa9e7e5935b75230d47e85684da844b30b]
# 
# patch "unit_tests.cc"
#  from [3950a1e595ac694d5d80c47198c31b450eec8152]
#    to [67d62056df1c88797eb0e2c2b2503a839e4532c8]
# 
# patch "unix/cputime.cc"
#  from [0b8b1d1452cc0227a85e88470a4f1ff3f4a640d2]
#    to [2a024eb642dfbedba1197dc0658977d09b57f8c9]
# 
# patch "unix/fs.cc"
#  from [055f4ea9d5cebea09815aadc3369833cb9b7a5fd]
#    to [01f02a8c225f793ed279763ae048ad3d7cec4782]
# 
# patch "unix/get_system_flavour.cc"
#  from [de33a20261af04c652ce6b3b29b24fb37cbb0e8e]
#    to [7df61b0f0d15f4b4d31721f7f68e7336e8a81b0a]
# 
# patch "unix/inodeprint.cc"
#  from [48bc2b8e2cad96d674c219803447b76c2fde7c88]
#    to [0d38c64a84cc6aa60ef42a2cef10257972eec035]
# 
# patch "unix/main.cc"
#  from [89e8f53237ace2b9ccfafba9877babfcd76761ee]
#    to [b6956b0c0279129162d29ddcca82098c9bf53b12]
# 
# patch "unix/os_strerror.cc"
#  from [4d01ac42c4f549f5e72f95a9ab05b097fda60553]
#    to [83f07b118dc8d51dcf9d07044b8b7183f14e7b55]
# 
# patch "unix/process.cc"
#  from [5d7d05a81a24a4556143f1570ffda45441140fa5]
#    to [28d73bfc23b693e7d6297c32295c5e13935a7455]
# 
# patch "unix/read_password.cc"
#  from [800251ef5cdc0a0786e39c37e254dcc830fea6ba]
#    to [fc7956632728a871f4de6f547171ac397d1b8489]
# 
# patch "unix/ssh_agent_platform.cc"
#  from [5ab58e41b3c08bd9fcd3dc33d5b00970930a6f18]
#    to [50796ebd56e4d4c6d01d6a6230d3ca44599bf7a7]
# 
# patch "unix/terminal.cc"
#  from [6c74e08827b0af102aca85d63116e1642a31541e]
#    to [56d529ca9f0ad44c02edda732677cccd257318aa]
# 
# patch "update.cc"
#  from [4fbfba5e989b8174915ae52e22a808b9a80eff83]
#    to [0bb59dfbee3507f85c6e200792174425d2a9073f]
# 
# patch "uri.cc"
#  from [3fd42bc9b1453ba09c349a8b9561831e7d37d6c6]
#    to [5ba02d7c1e5b8ec85d8ab585ce9cc6e3a2a3d9ad]
# 
# patch "uri.hh"
#  from [1fbd694d8b1dbb0dc6f0bfae3e6a41a4cf88a9c5]
#    to [89da230f5b5652f1f79cb03dda5408b27846a401]
# 
# patch "vocab.cc"
#  from [05c0e03920108f99c1f89b9438a516736cc1b857]
#    to [1ec554d99e89823b9d9458fd6b5926ae99c98a15]
# 
# patch "vocab.hh"
#  from [b8f1323d7543251906e9e64a651239ed32e7afac]
#    to [8c831a796771018eb1b2d28f56dc8e2f9b4d4e55]
# 
# patch "win32/cputime.cc"
#  from [f9005d04f968a7cd2320630bebb77406c3c4b095]
#    to [1039e1fabada328afce0aeb6abd903a5a6a05576]
# 
# patch "win32/fs.cc"
#  from [071bf4410e2a0c847afdd3b29c95149cf1f5a7ef]
#    to [5db737615ca0b21af0f2d62d3c05dc96783d4901]
# 
# patch "win32/get_system_flavour.cc"
#  from [7c8b65354bd8a234fecf77594cfa181c1c2eba2d]
#    to [df4829cf15d2a0ec0c4a63c60f9cef2b15496168]
# 
# patch "win32/inodeprint.cc"
#  from [82da4037e96a12f19c6d314a44850b2f02fa4376]
#    to [187f90f531d8c05d1000cccccc826b0f7542b9b8]
# 
# patch "win32/main.cc"
#  from [2d76d1742f6b1e3a81903915b1f00b8d392ea2f6]
#    to [07f70610c22db2e515eccd7111c14536ded5f99a]
# 
# patch "win32/make_io_binary.cc"
#  from [12928c4a066284e2a8c236bc4b4c8efc64ee5fac]
#    to [184845c1a84f925fca74cf69c1853af811ebacf2]
# 
# patch "win32/os_strerror.cc"
#  from [0f8146e9197f2060203ace7c3908424ba0b95530]
#    to [5753db7a97adb234f801c2cc3b2512f19bb31b8b]
# 
# patch "win32/process.cc"
#  from [cd9dc0730fa7e5f12f96355371b2f266267efebf]
#    to [097e18737531f5b702b62c55a7b98899bab4f7ac]
# 
# patch "win32/read_password.cc"
#  from [7d985a945f4b6fa3ba0cfc50bb4492ab457a4149]
#    to [8b6380a4788c7ce6b75c2497abc159e466c37d36]
# 
# patch "win32/ssh_agent_platform.cc"
#  from [07c869fdf5126125dcb44a12d5e8521ec1b9297e]
#    to [030848729e09a9805430b724a20a85483a0903b9]
# 
# patch "win32/terminal.cc"
#  from [e9a2867e9a06ac947bb941c992ac5b8de03ad149]
#    to [f1c5d626b33b20a2598717dae3498308adbe965a]
# 
# patch "work.cc"
#  from [66159e9dae0264bfc4b066b87f8cf6888900cfb5]
#    to [3da14c43b331e2c4a42e7ca6d63dda5072b21c6e]
# 
# patch "work.hh"
#  from [8797491e6dd9884bbbb4a76dc00e87b5dfd9f7f9]
#    to [68746df2afeb55260599b230c2a2d90b7a5e98b3]
# 
# patch "work_migration.cc"
#  from [54b77de811bcb46ab2e6ea7101f260abb6b0b23d]
#    to [ca32f50c101e495b3c549168a21926304a266fdd]
# 
# patch "xdelta.cc"
#  from [62598b3546340ead92754e868ac579292550a32a]
#    to [3f540c8b573608425e174ded788c6597e8b77a1b]
# 
# patch "xdelta.hh"
#  from [0f6d001db821dedbaae752dc342dfa6634edaea6]
#    to [de21a784eef8cf890418f3e9685a47005742763e]
#
============================================================
--- audit-includes	1779cfc4a2dd88c53d5f48692cc88bdcb838b160
+++ audit-includes	1779cfc4a2dd88c53d5f48692cc88bdcb838b160
@@ -0,0 +1,94 @@
+#! /bin/sh
+
+egrep -H "$(printf '^[ \t]*#[ \t]*include\\>')" "$@" |
+  sed -e "$(printf 's/:[ \t]*#[ \t]*include[ \t]*[<\"]/ /')" -e 's/[>"]$//' |
+  {
+    current=""
+    lack_base_hh=""
+    late_base_hh=""
+    shouldnt_base_hh=""
+    shouldnt_config_h=""
+    shouldnt_string=""
+    shouldnt_iosfwd=""
+    found_base_hh=f
+
+    while read file header; do
+      if [ "$file" != "$current" ]; then
+        if [ "$current" != "" ] && [ $found_base_hh = f ]; then
+	  lack_base_hh="$lack_base_hh $current"
+	fi
+	case $file in
+	  (*.hh|*.h) found_base_hh=skip ;;
+	  (*)        found_base_hh=f ;;
+	esac
+      fi	
+
+      case "$header" in
+        # The rules for base.hh are:
+	# No header file should include base.hh.
+	# All source files should include base.hh, as their very first
+	# inclusion.
+        
+        (base.hh)
+	  case "$file" in
+	    (*.hh|*.h) shouldnt_base_hh="$shouldnt_base_hh $file" ;;
+	    ($current) late_base_hh="$late_base_hh $file"
+	               found_base_hh=t ;;
+	    (*)        found_base_hh=t ;;
+	  esac
+	;;
+
+	# The rules for these are simple: nobody should include them
+	# (except base.hh itself).
+	(config.h)
+	  if [ "$file" != "base.hh" ]
+	  then shouldnt_config_h="$shouldnt_config_h $file"
+	  fi;;
+	(string)
+	  if [ "$file" != "base.hh" ]
+	  then shouldnt_string="$shouldnt_string $file"
+	  fi;;
+	(iosfwd)
+	  if [ "$file" != "base.hh" ]
+	  then shouldnt_iosfwd="$shouldnt_iosfwd $file"
+	  fi;;
+      esac
+      current="$file"
+    done
+    if [ $found_base_hh = f ]; then
+      lack_base_hh="$lack_base_hh $current"
+    fi
+
+    status=0
+    if [ -n "$lack_base_hh" ]; then
+      echo "*** Missing #include \"base.hh\":"
+      echo "$lack_base_hh" | tr -s ' ' | fmt | sed 's/^/   /'
+      status=1
+    fi
+    if [ -n "$late_base_hh" ]; then
+      echo "*** Late #include \"base.hh\":"
+      echo "$late_base_hh" | tr -s ' ' | fmt | sed 's/^/   /'
+      status=1
+    fi
+    if [ -n "$shouldnt_base_hh" ]; then
+      echo "*** Unwanted #include \"base.hh\":"
+      echo "$shouldnt_base_hh" | tr -s ' ' | fmt | sed 's/^/   /'
+      status=1
+    fi
+    if [ -n "$shouldnt_config_h" ]; then
+      echo "*** Unwanted #include \"config.h\":"
+      echo "$shouldnt_config_h" | tr -s ' ' | fmt | sed 's/^/   /'
+      status=1
+    fi
+    if [ -n "$shouldnt_string" ]; then
+      echo "*** Unwanted #include <string>:"
+      echo "$shouldnt_string" | tr -s ' ' | fmt | sed 's/^/   /'
+      status=1
+    fi
+    if [ -n "$shouldnt_iosfwd" ]; then
+      echo "*** Unwanted #include <iosfwd>:"
+      echo "$shouldnt_iosfwd" | tr -s ' ' | fmt | sed 's/^/   /'
+      status=1
+    fi
+    exit $status
+  }
============================================================
--- base.hh	32b62952e1b697f79191de3c0cf74a58f73f0f51
+++ base.hh	32b62952e1b697f79191de3c0cf74a58f73f0f51
@@ -0,0 +1,61 @@
+#ifndef __BASE_HH__
+#define __BASE_HH__
+
+// Copyright (C) 2007 Zack Weinberg <address@hidden>
+//
+// This program is made available under the GNU GPL version 2.0 or
+// greater. See the accompanying file COPYING for details.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the
+// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE.
+
+// This file contains a small number of inclusions and declarations that
+// should be visible to the entire program.  Include it first.
+
+// Configuration directives
+#include "config.h"
+
+#define NDEBUG
+#define BOOST_DISABLE_THREADS
+#define BOOST_SP_DISABLE_THREADS
+#define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+
+#include <iosfwd>
+#include <string>  // it would be nice if there were a <stringfwd>
+
+// this template must be specialized for each type you want to dump
+// (or apply MM() to -- see sanity.hh).  there are a few stock dumpers
+// in appropriate places.
+template <typename T>
+void dump(T const &, std::string &)
+{
+  // the compiler will evaluate this somewhat odd construct (and issue an
+  // error) if and only if this base template is instantiated.  we do not
+  // use BOOST_STATIC_ASSERT mainly to avoid dragging it in everywhere;
+  // also we get better diagnostics this way (the error tells you what is
+  // wrong, not just that there's an assertion failure).
+  enum dummy { d = (sizeof(struct dump_must_be_specialized_for_this_type)
+                    == sizeof(T)) };
+}
+
+// NORETURN(void function()); declares a function that will never return
+// in the normal fashion. a function that invariably throws an exception
+// counts as NORETURN.
+#if defined(__GNUC__)
+#define NORETURN(x) x __attribute__((noreturn))
+#elif defined(_MSC_VER)
+#define NORETURN(x) __declspec(noreturn) x
+#else
+#define NORETURN(x) x
+#endif
+
+// Local Variables:
+// mode: C++
+// fill-column: 76
+// c-file-style: "gnu"
+// indent-tabs-mode: nil
+// End:
+// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
+
+#endif
============================================================
--- HACKING	8e322b6697a91dc479e0a6fc46ee33ed0a305fc8
+++ HACKING	a2b7b94f93272c8441c87f3c35c1cd1cfc6fd4f0
@@ -39,6 +39,16 @@ versions into monotone.
 developer needs to send our fixes upstream or wants to import new upstream
 versions into monotone.
 
+There is a special header file, base.hh, that should be the very first
+#include in every .cc file, without exception.  It makes a small
+number of inclusions and declarations that we want to be globally
+visible.  Do not include this header in any other header file;
+however, in header files, assume the contents of base.hh are already
+visible.  "make distcheck" will verify that these rules are followed.
+If you modify base.hh, make sure you keep the "audit-includes" script
+consistent with it.  Try not to add things to base.hh; it's intended
+to be a minimal set of declarations that really do need to be visible
+everywhere.
 
 Dialect issues
 --------------
@@ -83,10 +93,19 @@ continued to adhere to the dialect we wr
   - if you have a const, put that _after_ the main type, but before
     any * or &.  Example: "set<revision_id> const & foo".
 
-  - put the name of a function in the first column of the line it
-    occurs on. the visibility and return type go on the preceeding
-    line.
+  - if you are declaring a static array, be aware of a quirk of the
+    language: "foo const * arrayname[]" declares a _non-constant_
+    array of pointers to constant foo.  if the array itself will never
+    be modified (true in most cases) you should put a second "const"
+    modifier _after_ the *.  this most often comes up with arrays of
+    string constants: write "char const * const arrayname[]" unless
+    you really mean the array to be modifiable.
 
+  - when defining a function, put a carriage return right before the
+    function name, so that the visibility and return type go on the
+    preceeding line. this makes it possible to grep for "^functionname"
+    to find the function definition without its uses.
+
   - use enums rather than magic constants, if you can.
 
   - magic constants, when needed, go in constants.{cc,hh}.
@@ -141,10 +160,6 @@ continued to adhere to the dialect we wr
   - prefer character constants ('x') to single-character strings ("x") in
     formatted output sequences.
 
-  - return type and function qualifiers should be placed on the line above
-    the function name, so that the function name sits flush with the first
-    column.  this makes grepping for function definitions easier.
-
 Interfacing with Lua
 --------------------
 
============================================================
--- Makefile.am	744f13784390967521794d7a989d504103a89f2b
+++ Makefile.am	48daf094e8337fabfe244d6c9f8deea847f0380d
@@ -7,7 +7,7 @@ SANITY_CORE_SOURCES =							\
 	cmd_othervcs.cc cmd_automate.cc cmd_files.cc
 
 SANITY_CORE_SOURCES =							\
-	sanity.cc sanity.hh quick_alloc.hh				\
+	sanity.cc sanity.hh quick_alloc.hh base.hh			\
 	simplestring_xform.cc simplestring_xform.hh 			\
 	constants.cc constants.hh numeric_vocab.hh 			\
 	platform.hh numeric_vocab.cc
@@ -345,8 +345,8 @@ AM_CPPFLAGS =
 SUFFIXES = .gch
 
 AM_CPPFLAGS =
-AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DSQLITE_OMIT_CURSOR -DSQLITE_OMIT_LOAD_EXTENSION -DTHREADSAFE=0 -DSQLITE_THREAD_OVERRIDE_LOCK=-1 $(SQLITE_CPPFLAGS)
-AM_CXXFLAGS = $(AM_CPPFLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DSQLITE_OMIT_CURSOR -DSQLITE_OMIT_LOAD_EXTENSION -DTHREADSAFE=0 -DSQLITE_THREAD_OVERRIDE_LOCK=-1 $(SQLITE_CPPFLAGS)
+AM_CXXFLAGS = $(AM_CPPFLAGS)
 AM_LDFLAGS = 
 
 lib3rdparty_a_CPPFLAGS =
@@ -442,7 +442,7 @@ EXTRA_DIST = $(PDF_FIGURES) $(PNG_FIGURE
 	contrib/get_stdio.pl contrib/ciabot_monotone_hookversion.py		\
 	$(wildcard $(srcdir)/contrib/*.lua) contrib/usher.cc $(wildcard		\
 	$(srcdir)/examples/*) win32/monotone.iss win32/modpath.iss		\
-	$(wildcard $(srcdir)/debian/*)
+	$(wildcard $(srcdir)/debian/*) audit-includes
 
 MAKEINFOFLAGS=-I $(top_builddir)
 
@@ -654,6 +654,13 @@ distcleancheck_listfiles = find . -type 
 # line does is tell 'distcheck' to shut up and ignore those two files.
 distcleancheck_listfiles = find . -type f -a ! -name package_revision.txt -a ! -name package_full_revision_dist.txt
 
+# the distcheck-hook checks for errors in the use of base.hh
+distcheck-hook:
+	cd $(srcdir) && $(SHELL) audit-includes \
+		$(sort $(mtn_SOURCES) $(unit_tests_SOURCES) $(tester_SOURCES) \
+                       $(UNIX_PLATFORM_SOURCES) $(WIN32_PLATFORM_SOURCES) \
+                       win32/main.cc unix/main.cc)
+
 # automake doesn't build html docs
 
 CHECK_SRCDIR_EQ_BUILDDIR=[ "`cd \"$(srcdir)\"; pwd`" = "`pwd`" -a -f ./monotone.texi ]
============================================================
--- adler32.hh	62eac472350e07bfc51ff98f12d603fb934a1b82
+++ adler32.hh	7d209e5bfab115bd173679fc129799a44be15931
@@ -14,7 +14,6 @@
 // entirely clear that this matters; it is what rsync and xdelta both do
 // and it seems to work.
 
-#include <string>
 #include "numeric_vocab.hh"
 #include "sanity.hh"
 
============================================================
--- annotate.cc	a152991b3936bd8b49e9392fd908e882a7c13c4b
+++ annotate.cc	38d8ad417471d7ac2724e477eaafd1a59581ca8a
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <set>
-#include <string>
 #include <iostream>
 
 #include <boost/shared_ptr.hpp>
============================================================
--- app_state.cc	4534848fd6ec5d06db4e6b389bfa0dbc8764f975
+++ app_state.cc	74425b52934112d6f23c222e36516a69aee2bb29
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <cstdlib>              // for strtoul()
-#include <string>
 #include <vector>
 
 #include "botan/pubkey.h"
============================================================
--- asciik.cc	26ea78a6485ea8e5f99e4f419da6954d213ca6ff
+++ asciik.cc	eaf25ac9f4e1187c7ce02559dc2ff196e82d8f74
@@ -106,6 +106,7 @@ Loop:
   Having found a layout that works, we draw lines connecting things!  Yay.
 */
 
+#include "base.hh"
 #include <algorithm>
 #include <iostream>
 #include <iterator>
============================================================
--- asciik.hh	d6dd7b177951094276a62ed2ee144de738c5a078
+++ asciik.hh	9822c026c2b57802ea1d1872670f017315151c78
@@ -1,8 +1,7 @@
 #ifndef __ASCIIK_HH__
 #define __ASCIIK_HH__
 
 #include <set>
-#include <string>
 #include <vector>
 
 #include "revision.hh"
============================================================
--- automate.cc	7f9e5ead627f71b092a15b9919bd3f2f721dfb85
+++ automate.cc	2f3e314c08cb2d2f49e7c3af16fd5c5777982a86
@@ -7,10 +7,10 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <iterator>
 #include <sstream>
-#include <string>
 #include <unistd.h>
 #include <vector>
 
============================================================
--- basic_io.cc	16c713cad58a621d6acd778daa7065f94173f8fc
+++ basic_io.cc	c229de5420267b08ab3a751c60f7aa4bcb099cef
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <sstream>
-#include <string>
 #include <cctype>
 #include <cstdlib>
 
============================================================
--- basic_io.hh	0b2e48ab437ab4d2c66ef412fa2328ead6c84d19
+++ basic_io.hh	d843284e57239ab9616400b179882b56ffc5fcb1
@@ -11,8 +11,6 @@
 // PURPOSE.
 
 
-#include <iosfwd>
-#include <string>
 #include <vector>
 #include <map>
 
============================================================
--- cert.cc	034d63fdfa5faab80bfde1adc8a5c42d152b325a
+++ cert.cc	933a1fcb6c13e927cc06754f7c24207b8fae3dc6
@@ -7,9 +7,9 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <limits>
 #include <sstream>
-#include <string>
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
============================================================
--- charset.cc	744a0592671f2e19acf1fbfeab2e72897aecbac9
+++ charset.cc	0b6229965f7158b3f67b981f8e22f0636532859e
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <vector>
 
 #include <boost/tokenizer.hpp>
============================================================
--- cmd.hh	a35952c265bbeaf6590cdcd8b32369adbf50fefc
+++ cmd.hh	07466afc53548ca1d2180ac78afd32e1737f96e0
@@ -12,7 +12,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 #include "commands.hh"
 #include "options.hh"
============================================================
--- cmd_automate.cc	d16e5b85dcc63badef4da21a9bcf4ed7416337fc
+++ cmd_automate.cc	1328e65fc98bd88779b701ef3423d33ac246150e
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 #include <map>
 
============================================================
--- cmd_db.cc	cf45b65ee1746c70f1b310177790ea4ba09b5bf5
+++ cmd_db.cc	f07d0fd04917a29d7bcbc9bfa4a676872107c339
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 #include <utility>
 
============================================================
--- cmd_diff_log.cc	82af527afc535dbae3f3fc2bb18f994a072448f1
+++ cmd_diff_log.cc	830761c6afbd89c8f69ad88e6b7756f2dd41f31c
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <deque>
 #include <map>
 #include <iostream>
============================================================
--- cmd_files.cc	5c754bd725507628a28b4e526d6a7b5cc6c455e6
+++ cmd_files.cc	ff7991447d28bb03fd6c47568dda0b4b967846f9
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 
 #include "annotate.hh"
============================================================
--- cmd_key_cert.cc	f08ca3adea1285dcd4c734a84b26a2d16f9f3a87
+++ cmd_key_cert.cc	dbcf20766cb5dfbe2a47182a100e2e8a488148a4
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 #include <sstream>
 #include <fstream>
============================================================
--- cmd_list.cc	9ecdfc62f2c06ccbf08599a34317edcec06d8e2d
+++ cmd_list.cc	5889034eb41568c36016cbd8617133c6a1065c48
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <map>
 #include <utility>
============================================================
--- cmd_merging.cc	8ffdc93fea885aef53e7208d9220a60bd17cee03
+++ cmd_merging.cc	5aae4e08cd5bd2ef6f25247cb7798e5df7cdb904
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <cstring>
 #include <iostream>
 #include <iomanip>
============================================================
--- cmd_netsync.cc	74d3bfea91a937a9e72f6d595fe2b58e71189cca
+++ cmd_netsync.cc	fe74ba809d95febb94f85a2d2ed9f761c93e25bd
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include "cmd.hh"
 
 #include "diff_patch.hh"
============================================================
--- cmd_othervcs.cc	a645d9d2fd6c0c738dbbfaafddd1c622a8751bc0
+++ cmd_othervcs.cc	be662f2013d7eaa93a8729606e160c2c4c7b2512
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "cmd.hh"
 #include "app_state.hh"
 #include "rcs_import.hh"
============================================================
--- cmd_packet.cc	207c42e08dc0accce2740d090c484d706a00d9cc
+++ cmd_packet.cc	a9eec81d3b605490ebc848f488b1c33060ed052a
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 #include <sstream>
 
============================================================
--- cmd_ws_commit.cc	1b33fbd6f0a59bce2ece592676754bccdfa06683
+++ cmd_ws_commit.cc	3c9a3fe225e7c79ebadbdbf484cd535109792c70
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 #include <map>
 
============================================================
--- commands.cc	ded65727f05f111afe1a0f5b13a3a451590d0ed5
+++ commands.cc	4c4a322cca8c3eb6760a289639a4b9a6f6819bf7
@@ -8,6 +8,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
 #include <algorithm>
 #include <iostream>
============================================================
--- commands.hh	d2d27b5304bb815af7dacb768fdb548f66016a48
+++ commands.hh	255a1ffe65f28f2a88c6526092f9a63c78ef11ac
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <vector>
 #include "options.hh"
 class app_state;
============================================================
--- constants.cc	94319b46e450459cee4702561bfb16646838b667
+++ constants.cc	b5f0369dd3251ff7df856e501b090125e643f46a
@@ -10,6 +10,7 @@
 // this file contains magic constants which you could, in theory, tweak.
 // probably best not to tweak them though.
 
+#include "base.hh"
 #include "constants.hh"
 #include "numeric_vocab.hh"
 
============================================================
--- constants.hh	b9bc0cea940b4be75380a952b9988329af48f397
+++ constants.hh	2e604bcfdaa15840dc2a565088bd93f82c5f81ff
@@ -11,7 +11,6 @@
 // PURPOSE.
 
 #include <unistd.h>
-#include <string>
 #include "numeric_vocab.hh"
 #include "vocab.hh"
 
============================================================
--- contrib/usher.cc	6ebc1e6b5d4b44e048dc3a9b3ec788d522b43b62
+++ contrib/usher.cc	8789b3564e3a7c8a3d33f1b47891ffa505e899fc
@@ -122,6 +122,10 @@
 // and will not be given until the config file has been reloaded.
 //
 
+#define NDEBUG
+#define BOOST_DISABLE_THREADS
+#define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
============================================================
--- crypto_tests.cc	8b029399da90cc38a8ac11f3d0aa058f00111a99
+++ crypto_tests.cc	e9e0a323f735f61f2072d0c5d4932778a719ecc8
@@ -8,9 +8,9 @@
 // PURPOSE.
 
 #ifdef BUILD_UNIT_TESTS
+#include "base.hh"
 #include "unit_tests.hh"
 
-#include <string>
 
 #include "transforms.hh"
 #include "sanity.hh"
============================================================
--- cset.cc	00c69570bb60a3c49337e350ab39816741f6764a
+++ cset.cc	a4ac264727cff85b96a1c001979c0d606b826bd2
@@ -7,9 +7,9 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
 #include <set>
-#include <string>
 
 #include "basic_io.hh"
 #include "cset.hh"
============================================================
--- cset.hh	eedb0328724138427340bbd88a8ebc48f2f29273
+++ cset.hh	f3b8151d71b350a6a9751649752da75c316b4ec2
@@ -12,7 +12,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 #include <vector>
 
 #include "numeric_vocab.hh"
============================================================
--- current_exception.hh	b54a2fcf1a92314df33ccd16da0b147686451102
+++ current_exception.hh	3b0be7b7f888fc02ef96db80b17b0fae2c9c83bd
@@ -10,7 +10,6 @@
 #ifndef CURRENT_EXCEPTION_HH
 #define CURRENT_EXCEPTION_HH
 
-#include "config.h"
 #include <typeinfo>
 
 // Add #ifdeffage here as appropriate for other compiler-specific ways to
============================================================
--- database.cc	671178b4ec75c99172da57c7f1898fa6746afe8a
+++ database.cc	834b1fbe31327949d71019c6140849e42c6be092
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <deque>
 #include <fstream>
============================================================
--- database.hh	954a78c55234b282b7c047569cc5cc6ca9014341
+++ database.hh	df490ba6c815f5afca05231b2e8077b917ef9e14
@@ -18,7 +18,6 @@ int sqlite3_finalize(sqlite3_stmt *);
 #include <vector>
 #include <set>
 #include <map>
-#include <string>
 
 #include "numeric_vocab.hh"
 #include "vocab.hh"
============================================================
--- database_check.cc	011488d738d65307ae76e194cb1da287077cd94f
+++ database_check.cc	8b0cc536cac18b700af8121d9348e44ba848e8b2
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
 #include <set>
 
============================================================
--- dates.cc	5789e3191fc9b2e3db219007aef810dd1d00e9da
+++ dates.cc	487b11923395a767fc568429290469ca83a00fc9
@@ -7,11 +7,11 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "dates.hh"
 
 #include <ctime>
 #include <climits>
-#include <string>
 
 using std::string;
 
============================================================
--- dates.hh	b9a3db81cbf8cccada51b1e337a60fbe30ae3d71
+++ dates.hh	a7f141455c581d29547f76c495cfbac204b0be0d
@@ -16,8 +16,6 @@
 
 #include "numeric_vocab.hh"
 #include "sanity.hh"
-#include <string>
-#include <iosfwd>
 
 struct date_t
 {
============================================================
--- diff_patch.cc	965f22af1e86ee242cb4a578e19d0f9bf3675852
+++ diff_patch.cc	45f3c5a93b2dab477bc06a307883d40f5b43ca63
@@ -7,12 +7,11 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include "config.h"
 
+#include "base.hh"
 #include <algorithm>
 #include <iterator>
 #include <map>
-#include <string>
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
============================================================
--- diff_patch.hh	d481b1cf53caed0381272a18713c357880d3bd03
+++ diff_patch.hh	681984533e6cb27a293e72d159ec24457f7cf804
@@ -16,7 +16,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include <map>
-#include <string>
 #include <vector>
 
 class app_state;
============================================================
--- enumerator.cc	eec6cead8d287bcb00376bb9f2ed8a48fad7f229
+++ enumerator.cc	763790c1ded956c5bb680a3b9b3e70453d2826c4
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <deque>
 #include <map>
 #include <set>
============================================================
--- epoch.cc	acc8e97b3406db8d5ee3720648f46703d922f84a
+++ epoch.cc	c9f85974e9799b788d75863843977c8fc405d38d
@@ -7,12 +7,12 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "epoch.hh"
 #include "netio.hh"
 #include "constants.hh"
 #include "transforms.hh"
 
-#include <string>
 
 using std::string;
 
============================================================
--- epoch.hh	cca55b456104aba914581f7bda839d1b303ffb13
+++ epoch.hh	9d4366878bee862bbdf1f04b107e780e1225a340
@@ -12,7 +12,6 @@
 
 #include "vocab.hh"
 
-#include <string>
 
 // epochs are pairs (branch name, random data)
 
============================================================
--- file_io.cc	955fd8ec2d758969fa18f2bc6eb4f6b70c7a3825
+++ file_io.cc	75b7e2bb594f959afb17378d571088ed11d588ee
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <iostream>
 #include <fstream>
 #include <boost/filesystem/path.hpp>
============================================================
--- globish.cc	9d9680696d2be391787e6697214a544fe955c016
+++ globish.cc	1ffa504207d3631c43dd18ecb0e2cd57f5fe359a
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "sanity.hh"
 #include "globish.hh"
 
============================================================
--- globish.hh	a09c59d14a2425049d00b50a963e22543939c366
+++ globish.hh	7b0d071f31a91efa626ee0da5c07263d5ea1abf1
@@ -29,7 +29,6 @@
 // it's nice to have some way to say "don't exclude anything", for instance.
 
 #include <set>
-#include <string>
 #include <boost/regex.hpp>
 
 #include "vocab.hh"
============================================================
--- graph.cc	fe7d75cef96fe2f2fa3fcc10d3a863a2b384ff0e
+++ graph.cc	2d934cb225b5639919fec3eda0cbec615cf2f903
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include <map>
 #include <utility>
 #include <list>
============================================================
--- graph.hh	9791121bb0fb8d3063c97b32329fa513b51cd216
+++ graph.hh	dfb30a026f9dcbb139d13d96eadc7ed591e09aaf
@@ -17,7 +17,6 @@
 // (e.g., in revision.cc); FIXME it would be good to move them in here as
 // opportunity permits.
 
-#include <string>
 #include <set>
 #include <vector>
 #include <utility>
============================================================
--- hash_map.hh	ab59b629e8912041310f4e1371441a40dd236de4
+++ hash_map.hh	1354e46d7ae2f17c40f5262c7b7be6666d197d64
@@ -1,7 +1,6 @@
 #ifndef __HASHMAP_HH
 #define __HASHMAP_HH
 
-#include "config.h"
 
 #include <functional>
 namespace hashmap {
@@ -84,7 +83,6 @@ namespace hashmap {
 #define HASHMAP_PRESENT
 #include <ext/hash_map>
 #include <ext/hash_set>
-#include <string>
 
 namespace hashmap {
   template<>
@@ -123,7 +121,6 @@ namespace hashmap {
 #define HASHMAP_PRESENT
 #include <hash_map>
 #include <hash_set>
-#include <string>
 
 namespace hashmap {
   template<>
============================================================
--- hmac.cc	9bc643f4d32b5ee52adaca6e9cb5e0a656a3d5d9
+++ hmac.cc	115a8c2bd6e81ea28d4628e77e4ad4dfae8e00a9
@@ -1,5 +1,5 @@
-#include <string>
 
+#include "base.hh"
 #include "botan/botan.h"
 
 #include "sanity.hh"
============================================================
--- hmac.hh	7f747cf86041201ba86b56f718bd67ab9673bc2c
+++ hmac.hh	6953e20a8a307882b42c317e31714a53f8dae510
@@ -1,7 +1,6 @@
 #ifndef __HMAC_HH__
 #define __HMAC_HH__
 
-#include <string>
 
 #include "botan/botan.h"
 #include "vocab.hh"
============================================================
--- inodeprint.cc	7b40801a0c24b79e31875a985b2b657fcef408ae
+++ inodeprint.cc	55d87b3491db66b55912371406b89163fa4f6264
@@ -7,7 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
+#include "base.hh"
 #include <iterator>
 #include <sstream>
 #include <algorithm>
============================================================
--- interner.hh	4a79c399b9b450749e9efcaf55ff54795a82b037
+++ interner.hh	cbf57f9a888faf417eb9bb0cba373a18589b7c5b
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
 #include "hash_map.hh"
 #include "sanity.hh"
============================================================
--- key_store.cc	5baf95cf24e95172f259319f64c683560ecbcd17
+++ key_store.cc	27bf014bed826d2dffc53b3358295c6c376e7fdc
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include <sstream>
 
 #include "key_store.hh"
============================================================
--- keys.cc	aec2f1b3cab5149ce6be1db4e771f5d6708b8316
+++ keys.cc	5f4a21d06375393f85b4568ffdcdb790d024d711
@@ -7,7 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
+#include "base.hh"
 #include <map>
 #include <iostream>
 #include <unistd.h>
============================================================
--- keys.hh	b70145327a961277459565f4a510cba802fa75af
+++ keys.hh	fd38e60039af1d54054755514fdab2dee6340c3b
@@ -13,7 +13,6 @@
 #include "vocab.hh"
 #include "botan/rsa.h"
 #include <boost/shared_ptr.hpp>
-#include <string>
 
 using Botan::RSA_PrivateKey;
 using boost::shared_ptr;
============================================================
--- lcs.cc	959d45c33b49c9cc0be495e4a556d25d52a8dd8b
+++ lcs.cc	3e6a13b291a0d7cd12b700ad3c13fe5d527c841f
@@ -38,6 +38,7 @@
 
 */
 
+#include "base.hh"
 #include <algorithm>
 #include <vector>
 
============================================================
--- legacy.cc	6867f219f457fa5df90b2801871c1e1f61a451f0
+++ legacy.cc	69f6bdba408d0787bd51919fb99a296b0865e65c
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "legacy.hh"
 #include "basic_io.hh"
 #include "app_state.hh"
============================================================
--- legacy.hh	158f7db6cbe333fe695d3a8dcd335ad0abc47e7d
+++ legacy.hh	5482280179c002d9243f6e7be145e49b7847b5ce
@@ -13,7 +13,6 @@
 // old code needed for reading legacy data (so we can then convert it)
 
 #include <map>
-#include <string>
 
 #include "paths.hh"
 
============================================================
--- lua.cc	987982ec6fae322b0fe836aaff25ccc1fdc4f973
+++ lua.cc	549417b24694d4668d02e6b3143bc9f9cd806a10
@@ -1,12 +1,11 @@
 
-#include "config.h"
 
+#include "base.hh"
 #include "lua.hh"
 
 #include "globish.hh"
 #include "sanity.hh"
 
-#include <string>
 #include <set>
 #include <vector>
 #include <utility>
============================================================
--- lua.hh	94050b961bd34d473e74a066e0b4c956546c863c
+++ lua.hh	b5de15e16dc12874e8dec56a883800252e05eb22
@@ -7,7 +7,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 struct lua_State;
 
============================================================
--- lua_hooks.cc	b2d0a25544aa0fa6683a9a17e7cd9afc029bc6d7
+++ lua_hooks.cc	1d95c581d5880c74fd9c941fd69e2564d624d2e2
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include "config.h"
 
+#include "base.hh"
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"
============================================================
--- lua_hooks.hh	042f2b10a20616bf449b2b1326f9f2a8c293d19b
+++ lua_hooks.hh	0968f4973ed14ccd60fb411de351f30008f7da7e
@@ -13,7 +13,6 @@
 // this file defines a typed C++ interface to the various hooks
 // we expose to the user as lua functions or variables
 
-#include <string>
 #include <set>
 #include <map>
 #include "file_io.hh"
============================================================
--- luaext_globish.cc	72dd38c8bfcd89d9af8bb2a9a3562867f97175c0
+++ luaext_globish.cc	8dd1a45c7545658b03a8c59ef2bd1ab28fcabd75
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include "lua.hh"
 
 #include "globish.hh"
============================================================
--- luaext_guess_binary.cc	06faa80ca58ba8d777c673d5c92f39b61e872c8c
+++ luaext_guess_binary.cc	09db7e9178b79f92386ce6e61975e6cd6b7d23c2
@@ -1,4 +1,5 @@
 
+#include "base.hh"
 #include "lua.hh"
 
 #include <fstream>
============================================================
--- luaext_mkstemp.cc	9a455c9939d673cac97959fe2df64609a4ad05d3
+++ luaext_mkstemp.cc	5e899a98dc801948c4937fd66fcf5b6d82838388
@@ -1,4 +1,5 @@
 
+#include "base.hh"
 #include "lua.hh"
 #include "mkstemp.hh"
 
============================================================
--- luaext_parse_basic_io.cc	4b49379b989c0b3d72156bdfbf1099fd59af8d23
+++ luaext_parse_basic_io.cc	e0dd6eaf52ad9523b67eae29bf67b26afd09f628
@@ -1,4 +1,5 @@
 
+#include "base.hh"
 #include "lua.hh"
 
 #include "basic_io.hh"
============================================================
--- luaext_platform.cc	2ce777d5ba2573e64f08e7d68ee8c24b2ddaa770
+++ luaext_platform.cc	8fdc0fafb4bd0c497865778b8f9e951a21293376
@@ -1,4 +1,5 @@
 
+#include "base.hh"
 #include "lua.hh"
 
 #include <signal.h>
============================================================
--- merge.cc	1a06c3dfc96557c0608d1450917ca071dc4795b2
+++ merge.cc	5bba69d0c107e0661d91dca8a7a06b6e4f5fbbe6
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <set>
 
 #include <boost/shared_ptr.hpp>
============================================================
--- merkle_tree.cc	d508737f2f16ecc274ad032fd07de8fdb3cc4204
+++ merkle_tree.cc	d72fe6c6455467112af82ad961abe1b916df86a2
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
-#include <string>
 #include <sstream>
 
 #include <boost/dynamic_bitset.hpp>
============================================================
--- merkle_tree.hh	1bdeaecf058eafd70ae8b71835c8076f51594961
+++ merkle_tree.hh	40e3ce0f83ba3a41bcca9a4896792d52627f0955
@@ -12,7 +12,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/dynamic_bitset.hpp>
============================================================
--- mkstemp.cc	ae0cfcdb3bdf668c7a8028ffac329fc791343896
+++ mkstemp.cc	7ac9cc944cc7c836aaa1ebfe0233214f47e6d2d6
@@ -8,8 +8,8 @@
 // some of its text into this file and am relicensing my derivative work
 // (this file) copyright (C) 2004 graydon hoare, as LGPL also.
 
-#include "config.h"
 
+#include "base.hh"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
============================================================
--- mkstemp.hh	47393d19432c5dc5a9150df10fdb853540551800
+++ mkstemp.hh	368bf10bb8da79f070c54f3e8484efeacbf24e4f
@@ -1,7 +1,6 @@
 #ifndef __MKSTEMP_HH__
 #define __MKSTEMP_HH__
 
-#include <string>
 
 bool
 monotone_mkstemp(std::string &tmpl);
============================================================
--- monotone.cc	611d1d85a05112ff1bc59ff2268aa8c8d3054458
+++ monotone.cc	1ed64f254e054895819383b34106cf1f2ebec2d0
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include "config.h"
 
+#include "base.hh"
 #include <iterator>
 #include <iostream>
 #include <fstream>
============================================================
--- mt_version.cc	41449ae39ddbeb3c8b689d91e345289f84044707
+++ mt_version.cc	72c6a402aaeb10deb10b914775b3c90a461042fa
@@ -11,8 +11,8 @@
 // the only .cc file that depends on the revision/full_revision header files,
 // which change constantly.
 
-#include "config.h"
 
+#include "base.hh"
 #include <iostream>
 #include <sstream>
 
============================================================
--- mt_version.hh	2bc42386f5f5b0f6e6dbc7b794a9db41e51a9d0f
+++ mt_version.hh	0637d55ddff99fd51dab3e0214a1abd8df0d2668
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
 void get_version(std::string & out);
 void print_version();
============================================================
--- mtn-sanity.cc	245d3726f06c950455e311f45d076545a0f3e083
+++ mtn-sanity.cc	ea5f2fd3b7316af14a196018aabc27c30a571882
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include "mtn-sanity.hh"
 #include "ui.hh"
 #include "mt_version.hh"
============================================================
--- netcmd.cc	a29ffe66940d6ee0d176339e6c7b85cf8bdee159
+++ netcmd.cc	eaf56a9400d6bc15eccb6114c19cc7ce5cde9622
@@ -7,7 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
+#include "base.hh"
 #include <vector>
 #include <utility>
 
============================================================
--- netcmd.hh	086951d7f8531e3ee22bf223a6f59d6bcda9fb62
+++ netcmd.hh	91da5034baab3bc9dec528c24ca5b8b2ff484d5c
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <vector>
 #include <utility>
 
============================================================
--- netsync.cc	93ebea4aca4d92fc925111c041c52b93fd6306d1
+++ netsync.cc	f7087adf6385b4b330004ed99fd6548e74a71799
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
-#include <string>
 #include <cstdlib>
 #include <memory>
 #include <list>
============================================================
--- netxx_pipe.cc	66d4dcf236cc6c230626cec1ea10aa97b838543c
+++ netxx_pipe.cc	5f30a3b9ca8f26b81c874cfeeca4d286130e3ea5
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <netxx_pipe.hh>
 #include "sanity.hh"
 #include "platform.hh"
============================================================
--- netxx_pipe.hh	f4d50d5b3f45a9483c2102edf21268841bae7534
+++ netxx_pipe.hh	a20357be17876b21d53d2bf237e0a0024d716018
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <vector>
 #include <netxx/socket.h>
 #include <netxx/streambase.h>
============================================================
--- numeric_vocab.cc	8b580fad4110886915a411fd9aba336f81a28beb
+++ numeric_vocab.cc	06d6f875e2eb934eb15879bd2e07d5ba4e396476
@@ -11,6 +11,7 @@
 
 #ifdef BUILD_UNIT_TESTS
 
+#include "base.hh"
 #include "unit_tests.hh"
 #include "sanity.hh"
 #include "numeric_vocab.hh"
============================================================
--- option.cc	75b60fa96a8aefab50c6b0a1a16b255bf40b9933
+++ option.cc	4196e8cd69e0338d7d99da072e8daa94cb1a6731
@@ -1,4 +1,5 @@
 
+#include "base.hh"
 #include "file_io.hh"
 #include "option.hh"
 #include "sanity.hh"
============================================================
--- option.hh	5a85259c5bc4da778c3a5555ab236f4e6aac5a70
+++ option.hh	b84098e030a8b5982930a0d6c093958792d38f13
@@ -1,10 +1,9 @@
 #ifndef __OPTION_HH__
 #define __OPTION_HH__
 
 #include <stdexcept>
 #include <map>
 #include <set>
-#include <string>
 #include <vector>
 
 #include <boost/function.hpp>
============================================================
--- options.cc	fdb77217c55e97a3c36428f18a7a54cd82e6b149
+++ options.cc	b0531b13b04640f7f8cbbade6dc72451f461b20b
@@ -1,4 +1,5 @@
 
+#include "base.hh"
 #include <algorithm>
 
 #include "charset.hh"
============================================================
--- outdated_indicator.cc	f1b81dda2764ff8a6bae829ec88e68cde1f8b580
+++ outdated_indicator.cc	ce466c0d56715e28dc365c25c1caf0afa0359587
@@ -1,6 +1,7 @@
 // 2007 Timothy Brownawell <address@hidden>
 // GNU GPL V2 or later
 
+#include "base.hh"
 #include "outdated_indicator.hh"
 #include "sanity.hh"
 
============================================================
--- packet.cc	df0fa7f0af5b79f300c3bdc63940be1940af92e2
+++ packet.cc	d6b09f9e7b3a9c3e4c2858468fb345cb0aa5d051
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
+#include "base.hh"
 #include <boost/regex.hpp>
 #include "lexical_cast.hh"
 
============================================================
--- packet.hh	e28b0bb77a6505bf4daf75d0f6f655d5b3f28e4d
+++ packet.hh	b58fd00b0eae10d3f7508da73a29d7730feb88de
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iosfwd>
 #include "vocab.hh"
 
 class app_state;
============================================================
--- parallel_iter.hh	ba07dec38610a667e9320188f0f80d064f41612c
+++ parallel_iter.hh	2ee45ae23e10ab433da7101315ad4ea52435f706
@@ -35,7 +35,6 @@
 // for maps, but it will only work on maps that use the default (std::less)
 // sort order.
 
-#include <string>
 
 #include "lexical_cast.hh"
 
============================================================
--- paths.cc	a8844c3a2e7cd54b181e8b900832c52037d85343
+++ paths.cc	587d50eb530e1cd8533fd00271c03889f20f789c
@@ -7,7 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
+#include "base.hh"
 #include <sstream>
 
 #include <boost/version.hpp>
============================================================
--- paths.hh	95e2d4782ab7e04859e292f8b92aad4ead046b83
+++ paths.hh	2e1b350cedd3e4c1cfd48f5fd47a3934cb64f296
@@ -103,8 +103,6 @@
 // into file_path's.
 
 
-#include <iosfwd>
-#include <string>
 #include <vector>
 #include <set>
 
============================================================
--- platform.hh	8d9be396f1a2d884491c63d92cf5c517145cab13
+++ platform.hh	0e346b8659597da7289519e5df1f0a886776b99d
@@ -13,9 +13,7 @@
 // this describes functions to be found, alternatively, in win32/* or unix/*
 // directories.
 
-#include "config.h"
 
-#include <string>
 #include <stdio.h>
 
 void read_password(std::string const & prompt, char * buf, size_t bufsz);
============================================================
--- project.cc	f64755c9f3508c82ba5717115171d2ac657b6f5c
+++ project.cc	9ecb5f265fcd7d41708c9c316b68c9bb5df13b4d
@@ -1,6 +1,7 @@
 // 2007 Timothy Brownawell <address@hidden>
 // GNU GPL V2 or later
 
+#include "base.hh"
 #include <vector>
 
 #include "app_state.hh"
============================================================
--- project.hh	5da24a7e4b1f31ec1e36a351aab0047123aebc2b
+++ project.hh	b9dcc29acb8d05085dcbdda44ed6dabdaed85d9f
@@ -6,7 +6,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 #include "cert.hh"
 #include "outdated_indicator.hh"
============================================================
--- randomfile.hh	22836a0c103b43d0a388706e7b36bfc9398c098c
+++ randomfile.hh	10edb3699a38484b52912a8ef33cc937a0a9f520
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <vector>
 #include "lexical_cast.hh"
 
============================================================
--- randomizer.cc	144210adc11503d17d44152dec7e1779d0426c16
+++ randomizer.cc	481e038efea222577cb47f22c3bb3614d7d7d9d5
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "randomizer.hh"
 #include <boost/random/uniform_int.hpp>
 #include <boost/random/bernoulli_distribution.hpp>
============================================================
--- rcs_file.cc	3846fcd9f03c09140267d0da6e9ac3aacce284ff
+++ rcs_file.cc	73064ea1d3e228d0cd5c811973c492b4657e14a6
@@ -7,10 +7,9 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include "config.h"
 
+#include "base.hh"
 #include <fstream>
-#include <string>
 #include <vector>
 
 #ifdef WIN32
============================================================
--- rcs_file.hh	46a3d0c025c5fc85ae2d0f8e79c1b7653564b08a
+++ rcs_file.hh	1cc24800d1d2c57e32cc8e2fc89c5cbb3faa8a1f
@@ -11,7 +11,6 @@
 // PURPOSE.
 
 #include <vector>
-#include <string>
 #include <map>
 #include <boost/shared_ptr.hpp>
 
============================================================
--- rcs_import.cc	f77665e03e8ca727897dd9f35c644f09e0c460a0
+++ rcs_import.cc	7ad1789b968f59343d8809634358075fc45d92a5
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <iterator>
 #include <list>
@@ -15,7 +16,6 @@
 #include <sstream>
 #include <stack>
 #include <stdexcept>
-#include <string>
 #include <vector>
 
 #include <unistd.h>
============================================================
--- refiner.cc	ce1343babc5e7b22067afd8dd3de444a442c1e71
+++ refiner.cc	52fe54a2aae857ec18ab790a4637b6aa825895ac
@@ -7,9 +7,9 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <set>
-#include <string>
 #include <utility>
 
 #include <boost/shared_ptr.hpp>
============================================================
--- restrictions.cc	9c67575a229df8b944b5da5a7a6721c40588f92d
+++ restrictions.cc	addbcf5050291f5a6da670e3bbeec7959c8da3d1
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
-#include <string>
 #include <vector>
 
 #include "restrictions.hh"
============================================================
--- rev_height.cc	a44fcd6a6619cd1b8b187674abdd07793f146023
+++ rev_height.cc	7330d685fb6f60b4425d2e9f6be2211c2785eb71
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <sstream>
 
 #include "sanity.hh"
============================================================
--- rev_height.hh	448eee2ee56b8ba3f25e3116ed624b258fd0ed89
+++ rev_height.hh	b1e48b09b2982ee038344cddfe54768c4f3675a8
@@ -10,8 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iosfwd>
-#include <string>
 #include "numeric_vocab.hh"
 
 class rev_height
============================================================
--- revision.cc	df17f8e950d6c5167382fcdedddb5ce5cab87b5c
+++ revision.cc	0413d7e63a44fe549471910712312314620018dc
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <cctype>
 #include <cstdlib>
 #include <map>
@@ -14,7 +15,6 @@
 #include <set>
 #include <sstream>
 #include <stack>
-#include <string>
 #include <iterator>
 #include <functional>
 #include <list>
============================================================
--- revision.hh	c8ba22a180653cff9231e65e3fbe936abc46e8b7
+++ revision.hh	11085059e347c4e47ea631169b70231d3db5a180
@@ -11,7 +11,6 @@
 // PURPOSE.
 
 #include <set>
-#include <string>
 
 #include <boost/shared_ptr.hpp>
 
============================================================
--- roster.cc	2d66e04b7ca82b71b11f9aa3d8263ff0a193c013
+++ roster.cc	72ca4319326e37ae810cc2a9956acba33b0e09e4
@@ -7,10 +7,10 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <stack>
 #include <set>
-#include <string>
 #include <vector>
 #include <sstream>
 
@@ -2777,7 +2777,6 @@ void calculate_ident(roster_t const & ro
 
 #include "roster_delta.hh"
 
-#include <string>
 #include <cstdlib>
 #include <boost/lexical_cast.hpp>
 
============================================================
--- roster_delta.cc	97bbe4959ff58789934e4e9a9bb7add980772738
+++ roster_delta.cc	dc0b4bc54afd8cca8a3f1364597c0f469d90eaee
@@ -10,6 +10,7 @@
 // This file contains "diff"/"patch" code that operates directly on rosters
 // (with their associated markings).
 
+#include "base.hh"
 #include <set>
 #include <map>
 
============================================================
--- roster_merge.cc	b17a6717d58bf2e10022ac4a1a1ec607d6f6fc65
+++ roster_merge.cc	bdc6e0a6da2807e45bf45796d3519881f22052ad
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <set>
 
 #include "vocab.hh"
============================================================
--- roster_merge.hh	b7bea7e59fb7b2e51a0c0ef5644524f29b07a4cf
+++ roster_merge.hh	2aa1838992962f0872e44b2c133bca54311f97a5
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
 #include "vocab.hh"
 #include "roster.hh"
============================================================
--- sanity.cc	95ceb279d0048f096cbf59e66f0143eb2038df84
+++ sanity.cc	9fc53db75a289a176bfdc7ee88b58d505cc6936d
@@ -7,11 +7,11 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <iterator>
 #include <iostream>
 #include <fstream>
-#include <string>
 #include <vector>
 #include <sstream>
 
============================================================
--- sanity.hh	13909caa9bed8e38bc4c433f0f9a3e93bef08cfd
+++ sanity.hh	c6a31bb3c9b988803a91dbe258e2acb83ddf73ed
@@ -10,11 +10,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include "config.h" // Required for ENABLE_NLS
-
-#include <iosfwd>
 #include <stdexcept>
-#include <string>
 #include <vector>
 
 #include "boost/circular_buffer.hpp"
@@ -24,14 +20,6 @@
 #include "mt-stdint.h"
 #include "quick_alloc.hh" // to get the QA() macro
 
-#if defined(__GNUC__)
-#define NORETURN(x) x __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define NORETURN(x) __declspec(noreturn) x
-#else
-#define NORETURN(x) x
-#endif
-
 // our assertion / sanity / error logging system *was* based on GNU Nana,
 // but we're only using a small section of it, and have anyways rewritten
 // that to use typesafe boost-formatter stuff.
============================================================
--- schema_migration.cc	f3c0a9dabc833154a3f07795f243d561b23d985c
+++ schema_migration.cc	df656cc76752a897bf10249886044e5aed28c36d
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <boost/tokenizer.hpp>
 #include "lexical_cast.hh"
 #include <sqlite3.h>
============================================================
--- schema_migration.hh	75ea83a18e754dc5f3a7302bfa95de9eadbd643a
+++ schema_migration.hh	28378b9f52084c15026e2cd9cba011256cdec0ab
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
 // this file knows how to migrate schema databases. the general strategy is
 // to hash each schema we ever use, and make a list of the SQL commands
============================================================
--- selectors.cc	4dfc19bef7db1186ea36424cb158a578425c690b
+++ selectors.cc	87df1393159bdc637059d9dfa9dfc52d50236326
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "selectors.hh"
 #include "sanity.hh"
 #include "app_state.hh"
============================================================
--- selectors.hh	f3f93e168438c3dd49111a2e4aff5a444e01994d
+++ selectors.hh	83f7e51e0ae9c30864e8f39eeef0368ab1000315
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <vector>
 #include <algorithm>
 #include <set>
============================================================
--- sha1.cc	ecdaa4a3c79dbb948c0dfc1178bd859b61fd58ed
+++ sha1.cc	a63699d0eae30164c447c33cc632a6c768d6ec2b
@@ -10,7 +10,7 @@
 // This file holds a registry of different SHA-1 implementations, and lets us
 // benchmark them.
 
-#include <string>
+#include "base.hh"
 #include <map>
 #include <botan/engine.h>
 #include <botan/libstate.h>
============================================================
--- sha1_engine.hh	0c4acbe18d65d59f3ecac0c62b79c3d9eb8b67b9
+++ sha1_engine.hh	501948b43bba5a7b2dfdd8452070ec785fb736c9
@@ -13,7 +13,6 @@
 // This file defines the interface needed to implement a new SHA-1 engine,
 // which we will hook into Botan.
 
-#include <string>
 #include <botan/base.h>
 
 typedef Botan::HashFunction * sha1_maker();
============================================================
--- simplestring_xform.cc	eb98a7a93a9593dcf13ae3cb9200e4ad9a3b6267
+++ simplestring_xform.cc	fcab8ef2e68fc2f2d24685320430d6aa2a6fa126
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include "simplestring_xform.hh"
 #include "sanity.hh"
 #include "constants.hh"
============================================================
--- simplestring_xform.hh	b6d122d8ba5d74603711bb9ffd5d0041e523fa28
+++ simplestring_xform.hh	501041263b4eb2b04c61e753b5bc636276716040
@@ -1,8 +1,7 @@
 #ifndef __SIMPLESTRING_XFORM_HH__
 #define __SIMPLESTRING_XFORM_HH__
 
 #include <vector>
-#include <string>
 
 std::string uppercase(std::string const & in);
 std::string lowercase(std::string const & in);
============================================================
--- specialized_lexical_cast.cc	1b0e3823a5e110c00a139a889b71d93e5546058d
+++ specialized_lexical_cast.cc	21b197949d6fea0426a7e22a61baf4c2fceff758
@@ -8,6 +8,7 @@
 // PURPOSE.
 
 
+#include "base.hh"
 #include "lexical_cast.hh"
 
 template<>
============================================================
--- ssh_agent.cc	076be79143413545723375da8e3d833a0fad88df
+++ ssh_agent.cc	ad754cf6299b789436bd1a2679c6001821b4cfd2
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <stdlib.h>
 
 #include "ssh_agent.hh"
============================================================
--- string_queue.cc	3c8ba74dc7770c6fd3e6f8934190d097338a238f
+++ string_queue.cc	34880af1af20cae04a527f370db60dd94ac6e97f
@@ -1,7 +1,7 @@
 // unit tests for string_queue
 
-#include <string>
 
+#include "base.hh"
 #include "string_queue.hh"
 
 #ifdef BUILD_UNIT_TESTS
============================================================
--- string_queue.hh	39b28624d0689105d55b462cb20beb57ba499378
+++ string_queue.hh	1326b1642a49c87e22c5dc727ea019c502213ca0
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <cstring>
 #include <cstdlib>
 
============================================================
--- tester.cc	d1ad2241f29ecf11fca85ae573fc8bff4d942a87
+++ tester.cc	4c5874c632c629d252c04b56ad7fb0902a81c6e7
@@ -1,3 +1,4 @@
+#include "base.hh"
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"
============================================================
--- transforms.cc	a6e23fbd561ca7ed18e71908e3829e29b0c94c5b
+++ transforms.cc	91ed3086b19a25d7d28258a984bcdd8a32a8a549
@@ -7,12 +7,12 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <algorithm>
 #include <cctype>
 #include <functional>
 #include <iterator>
 #include <sstream>
-#include <string>
 #include <vector>
 
 
============================================================
--- ui.cc	f4704e07c8544b0c01a45d476c3d61c0b98deb45
+++ ui.cc	4de898f353d62cc49f8cb22330527983f589277e
@@ -11,8 +11,8 @@
 // interface. the global user_interface object 'ui' owns clog, so no
 // writing to it directly!
 
-#include "config.h"
 
+#include "base.hh"
 #include "platform.hh"
 #include "sanity.hh"
 #include "ui.hh"
============================================================
--- ui.hh	9e12d78e6a03647b90d790c0abb0fbfa86da7c6e
+++ ui.hh	ad79ebfa9e7e5935b75230d47e85684da844b30b
@@ -16,7 +16,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 #include "paths.hh"
 #include "sanity.hh"
============================================================
--- unit_tests.cc	3950a1e595ac694d5d80c47198c31b450eec8152
+++ unit_tests.cc	67d62056df1c88797eb0e2c2b2503a839e4532c8
@@ -7,9 +7,9 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <map>
 #include <vector>
-#include <string>
 #include <iostream>
 #include <fstream>
 #include <iomanip>
============================================================
--- unix/cputime.cc	0b8b1d1452cc0227a85e88470a4f1ff3f4a640d2
+++ unix/cputime.cc	2a024eb642dfbedba1197dc0658977d09b57f8c9
@@ -1,8 +1,9 @@
 // copyright (C) 2006 Nathaniel Smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <time.h>
 
 double
============================================================
--- unix/fs.cc	055f4ea9d5cebea09815aadc3369833cb9b7a5fd
+++ unix/fs.cc	01f02a8c225f793ed279763ae048ad3d7cec4782
@@ -1,14 +1,14 @@
 // copyright (C) 2005 nathaniel smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
-#include "config.h"
 
 #ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif
 
+#include "base.hh"
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
============================================================
--- unix/get_system_flavour.cc	de33a20261af04c652ce6b3b29b24fb37cbb0e8e
+++ unix/get_system_flavour.cc	7df61b0f0d15f4b4d31721f7f68e7336e8a81b0a
@@ -1,8 +1,9 @@
 // copyright (C) 2004 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <sys/utsname.h>
 #include "sanity.hh"
 
============================================================
--- unix/inodeprint.cc	48bc2b8e2cad96d674c219803447b76c2fde7c88
+++ unix/inodeprint.cc	0d38c64a84cc6aa60ef42a2cef10257972eec035
@@ -1,8 +1,9 @@
 // copyright (C) 2005 nathaniel smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <sys/stat.h>
 #include <time.h>
 
============================================================
--- unix/main.cc	89e8f53237ace2b9ccfafba9877babfcd76761ee
+++ unix/main.cc	b6956b0c0279129162d29ddcca82098c9bf53b12
@@ -38,8 +38,8 @@
 // stdio or iostreams.  strsignal() should be safe, but it is conceivable it
 // would allocate memory; should it cause trouble, out it goes.
 
-#include "config.h"
 
+#include "base.hh"
 #include <signal.h>
 #include <time.h>
 #include <string.h>
============================================================
--- unix/os_strerror.cc	4d01ac42c4f549f5e72f95a9ab05b097fda60553
+++ unix/os_strerror.cc	83f07b118dc8d51dcf9d07044b8b7183f14e7b55
@@ -1,8 +1,9 @@
 // Copyright (C) 2006  Matthew Gregan <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <string.h>
 
 #include "sanity.hh"
============================================================
--- unix/process.cc	5d7d05a81a24a4556143f1570ffda45441140fa5
+++ unix/process.cc	28d73bfc23b693e7d6297c32295c5e13935a7455
@@ -1,8 +1,9 @@
 // copyright (C) 2005 Jon Bright <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
============================================================
--- unix/read_password.cc	800251ef5cdc0a0786e39c37e254dcc830fea6ba
+++ unix/read_password.cc	fc7956632728a871f4de6f547171ac397d1b8489
@@ -1,13 +1,13 @@
 /* read_password.c: retrieve the password
  * Nico Schottelius (address@hidden)
  * 13-May-2004
  */
 
+#include "base.hh"
 #include <unistd.h>
 #include <string.h>
 #include <termios.h>
 #include <iostream>
-#include <string>
 
 #include "sanity.hh"
 
============================================================
--- unix/ssh_agent_platform.cc	5ab58e41b3c08bd9fcd3dc33d5b00970930a6f18
+++ unix/ssh_agent_platform.cc	50796ebd56e4d4c6d01d6a6230d3ca44599bf7a7
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/socket.h>
============================================================
--- unix/terminal.cc	6c74e08827b0af102aca85d63116e1642a31541e
+++ unix/terminal.cc	56d529ca9f0ad44c02edda732677cccd257318aa
@@ -1,15 +1,15 @@
 // copyright (C) 2005 derek scherger <address@hidden>
 // copyright (C) 2005 nathaniel smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <termios.h>
 
-#include <string>
 
 #include "platform.hh"
 
============================================================
--- update.cc	4fbfba5e989b8174915ae52e22a808b9a80eff83
+++ update.cc	0bb59dfbee3507f85c6e200792174425d2a9073f
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <set>
 #include <map>
 #include <vector>
============================================================
--- uri.cc	3fd42bc9b1453ba09c349a8b9561831e7d37d6c6
+++ uri.cc	5ba02d7c1e5b8ec85d8ab585ce9cc6e3a2a3d9ad
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
+#include "base.hh"
 #include <boost/regex.hpp>
 
 #include "sanity.hh"
============================================================
--- uri.hh	1fbd694d8b1dbb0dc6f0bfae3e6a41a4cf88a9c5
+++ uri.hh	89da230f5b5652f1f79cb03dda5408b27846a401
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
 struct uri
 {
============================================================
--- vocab.cc	05c0e03920108f99c1f89b9438a516736cc1b857
+++ vocab.cc	1ec554d99e89823b9d9458fd6b5926ae99c98a15
@@ -7,8 +7,8 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 
+#include "base.hh"
 #include "constants.hh"
 #include "hash_map.hh"
 #include "sanity.hh"
============================================================
--- vocab.hh	b8f1323d7543251906e9e64a651239ed32e7afac
+++ vocab.hh	8c831a796771018eb1b2d28f56dc8e2f9b4d4e55
@@ -10,12 +10,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include "config.h"
-
 #include <utility>
-#include <string>
-#include <iosfwd>
-
 #include <boost/shared_ptr.hpp>
 
 // the purpose of this file is to wrap things which are otherwise strings
@@ -23,20 +18,6 @@
 // generally describe the "vocabulary" (nouns anyways) that modules in this
 // program use.
 
-// this template must be specialized for each type you want to dump.
-// there are a few stock dumpers in appropriate places.
-template <typename T>
-void dump(T const &, std::string &)
-{
-  // the compiler will evaluate this somewhat odd construct (and issue an
-  // error) if and only if this base template is instantiated.  we do not
-  // use BOOST_STATIC_ASSERT mainly to avoid dragging it in everywhere;
-  // also we get better diagnostics this way (the error tells you what is
-  // wrong, not just that there's an assertion failure).
-  enum dummy { d = (sizeof(struct dump_must_be_specialized_for_this_type)
-                    == sizeof(T)) };
-}
-
 // For some reason, shared_ptr copy is about a hundred times faster
 // than string refcopy on my system (g++ 4). This only happens because
 // we tell Boost not to worry about threads... but I don't recognize any
============================================================
--- win32/cputime.cc	f9005d04f968a7cd2320630bebb77406c3c4b095
+++ win32/cputime.cc	1039e1fabada328afce0aeb6abd903a5a6a05576
@@ -1,8 +1,9 @@
 // copyright (C) 2006 Nathaniel Smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <cstdlib>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
============================================================
--- win32/fs.cc	071bf4410e2a0c847afdd3b29c95149cf1f5a7ef
+++ win32/fs.cc	5db737615ca0b21af0f2d62d3c05dc96783d4901
@@ -1,11 +1,11 @@
 // copyright (C) 2005 nathaniel smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
-#include "config.h"
 
 #define WIN32_LEAN_AND_MEAN
+#include "base.hh"
 #include <io.h>
 #include <errno.h>
 #include <windows.h>
============================================================
--- win32/get_system_flavour.cc	7c8b65354bd8a234fecf77594cfa181c1c2eba2d
+++ win32/get_system_flavour.cc	df4829cf15d2a0ec0c4a63c60f9cef2b15496168
@@ -1,11 +1,11 @@
 // copyright (C) 2004 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include "sanity.hh"
 
-#include <string>
 #include <windows.h>
 
 struct table_entry
============================================================
--- win32/inodeprint.cc	82da4037e96a12f19c6d314a44850b2f02fa4376
+++ win32/inodeprint.cc	187f90f531d8c05d1000cccccc826b0f7542b9b8
@@ -1,8 +1,9 @@
 // copyright (C) 2005 nathaniel smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <sys/stat.h>
 #include <windows.h>
 
============================================================
--- win32/main.cc	2d76d1742f6b1e3a81903915b1f00b8d392ea2f6
+++ win32/main.cc	07f70610c22db2e515eccd7111c14536ded5f99a
@@ -28,9 +28,9 @@
 // data structures, so we use the lowest-level API that appears to be
 // available (GetStdHandle()/WriteFile()).
 
-#include "config.h"
 
 #define WIN32_LEAN_AND_MEAN
+#include "base.hh"
 #include <windows.h>
 #include <string.h>
 
============================================================
--- win32/make_io_binary.cc	12928c4a066284e2a8c236bc4b4c8efc64ee5fac
+++ win32/make_io_binary.cc	184845c1a84f925fca74cf69c1853af811ebacf2
@@ -1,4 +1,5 @@
 #define WIN32_LEAN_AND_MEAN
+#include "base.hh"
 #include <windows.h>
 #include <fcntl.h>
 #include <io.h>
============================================================
--- win32/os_strerror.cc	0f8146e9197f2060203ace7c3908424ba0b95530
+++ win32/os_strerror.cc	5753db7a97adb234f801c2cc3b2512f19bb31b8b
@@ -1,9 +1,10 @@
 // Copyright (C) 2006  Matthew Gregan <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
 #define WIN32_LEAN_AND_MEAN
+#include "base.hh"
 #include <windows.h>
 
 #include "sanity.hh"
============================================================
--- win32/process.cc	cd9dc0730fa7e5f12f96355371b2f266267efebf
+++ win32/process.cc	097e18737531f5b702b62c55a7b98899bab4f7ac
@@ -1,10 +1,10 @@
 // copyright (C) 2005 Jon Bright <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <iostream>
-#include <string>
 #include <sstream>
 #include <windows.h>
 
============================================================
--- win32/read_password.cc	7d985a945f4b6fa3ba0cfc50bb4492ab457a4149
+++ win32/read_password.cc	8b6380a4788c7ce6b75c2497abc159e466c37d36
@@ -1,12 +1,12 @@
 /* read_password.c: retrieve the password
  * Nico Schottelius (address@hidden)
  * 13-May-2004
  */
 
+#include "base.hh"
 #include <unistd.h>
 #include <string.h>
 #include <iostream>
-#include <string>
 #include <windows.h>
 
 #include "sanity.hh"
============================================================
--- win32/ssh_agent_platform.cc	07c869fdf5126125dcb44a12d5e8521ec1b9297e
+++ win32/ssh_agent_platform.cc	030848729e09a9805430b724a20a85483a0903b9
@@ -7,7 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
+#include "base.hh"
 #include "ssh_agent_platform.hh"
 
 using std::string;
============================================================
--- win32/terminal.cc	e9a2867e9a06ac947bb941c992ac5b8de03ad149
+++ win32/terminal.cc	f1c5d626b33b20a2598717dae3498308adbe965a
@@ -1,13 +1,13 @@
 // copyright (C) 2005 derek scherger <address@hidden>
 // copyright (C) 2005 nathaniel smith <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "base.hh"
 #include <windows.h>
 #include <io.h>
 
-#include <string>
 
 #include "platform.hh"
 
============================================================
--- work.cc	66159e9dae0264bfc4b066b87f8cf6888900cfb5
+++ work.cc	3da14c43b331e2c4a42e7ca6d63dda5072b21c6e
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include <sstream>
 #include <cstring>
 #include <cerrno>
============================================================
--- work.hh	8797491e6dd9884bbbb4a76dc00e87b5dfd9f7f9
+++ work.hh	68746df2afeb55260599b230c2a2d90b7a5e98b3
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <set>
 #include <map>
 
============================================================
--- work_migration.cc	54b77de811bcb46ab2e6ea7101f260abb6b0b23d
+++ work_migration.cc	ca32f50c101e495b3c549168a21926304a266fdd
@@ -7,6 +7,7 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
+#include "base.hh"
 #include "sanity.hh"
 #include "ui.hh"
 #include "simplestring_xform.hh"
============================================================
--- xdelta.cc	62598b3546340ead92754e868ac579292550a32a
+++ xdelta.cc	3f540c8b573608425e174ded788c6597e8b77a1b
@@ -24,10 +24,10 @@
 // if you want to *read* a patch, you will like unidiff format much better.
 // take a look in diff_patch.(cc|hh) for a nice interface to that.
 
+#include "base.hh"
 #include <algorithm>
 #include <vector>
 #include <set>
-#include <string>
 #include <sstream>
 
 #include <boost/shared_ptr.hpp>
============================================================
--- xdelta.hh	0f6d001db821dedbaae752dc342dfa6634edaea6
+++ xdelta.hh	de21a784eef8cf890418f3e9685a47005742763e
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <string>
 #include <boost/shared_ptr.hpp>
 
 void