#
#
# patch "app_state.hh"
#  from [757e3a3d3587f8328a8b917753270103054617a1]
#    to [af86dae3f210c378aa1e2f07af9ed544b6fa12c8]
# 
# patch "database.cc"
#  from [d0da4979961345a3f6f4b68769910f3ba3943f81]
#    to [d24ce5995a6d6f859afd4779cb567ae8267d6c0c]
# 
# patch "database.hh"
#  from [40e06a31c4d18cf50a9a3f3f46bb2d14df06fe68]
#    to [d52122d8aa928e01819d8f0911e2bec7800d587c]
# 
# patch "file_io.cc"
#  from [e18d07679c2d210a40f18b67ed0b4b96f5a2c21a]
#    to [eb6d69994365dd3552f4dc49cb02c03b0816d3e2]
# 
# patch "hmac.cc"
#  from [da58d8141987a07675d0a8aaf8ab70b60d53ac90]
#    to [0e9e11fc7f8143da251aa6523a65a35d59da7961]
# 
# patch "hmac.hh"
#  from [38920db37f7ac41a26c51b97a9fb2a394d0f37ff]
#    to [df0392000b74ac3553d40c39d851e4144eda1aef]
# 
# patch "inodeprint.cc"
#  from [1482e819fc5fd5e4d7ac52c025b3a6b85ab6c12f]
#    to [7e31f6184ade2f0a1d48ba90492973ff7d69b995]
# 
# patch "key_store.cc"
#  from [095e0f70f5ad787dacbd72f8db73f7057548818d]
#    to [692c7a2a0c359a55ae0654900ef1e9594962acc3]
# 
# patch "key_store.hh"
#  from [33a62cd00bd4d89c37a0cb35bbd5944b550e6960]
#    to [9e813fd91c0bbbcb675c80918094d0817170f868]
# 
# patch "lua.hh"
#  from [b5de15e16dc12874e8dec56a883800252e05eb22]
#    to [4e12c9e24a521a4820a50e1f410ebbc25a4f8424]
# 
# patch "lua_hooks.cc"
#  from [0476cf2512e471ca31d9a3b185968487fbeb9e8e]
#    to [8e29fa0e7e3c8bbc54fd8895fd443ab7211bc20a]
# 
# patch "m4/pcre.m4"
#  from [69b51a3c7bd9fbfe877649f0b6d88631068be3c4]
#    to [3efce0ef6d442d2f239fff1880779037dde687cc]
# 
# patch "merkle_tree.cc"
#  from [8dbfd8363164b2ed5046419012ca689a4e51c6c2]
#    to [96073f3cba094463efe64969c0d331bdea06228a]
# 
# patch "mkstemp.cc"
#  from [83fe46123ee92b6033ae641e5b1210190ece0119]
#    to [776ee10bb54b88cdba8c3c6b90ce718b575723f2]
# 
# patch "monotone.cc"
#  from [c675c913e89752c4e38fc3e0410a40e7157f42ef]
#    to [c703b34e55b5245c4aa31fe8202c0514107b7ea3]
# 
# patch "netsync.cc"
#  from [d7f4ca1ce02f6b40069058f857ed59293aac4ac5]
#    to [c200f32af29925de88211de8e7d35c9cac3c9020]
# 
# patch "revision.cc"
#  from [77e9097ab359fa100476dd86924c6ab62d3387fc]
#    to [8d2399e41819f46ed01e60d12c4e884060c30d55]
# 
# patch "ssh_agent.cc"
#  from [a2a0e96fd30804230e181747f36dcae3be34fd26]
#    to [8b784abe7028a9ca2eb6477d9f6775bce9cda8b5]
# 
# patch "tester.cc"
#  from [7d7860782ceb19fec915b63ab6d7b3bebf829502]
#    to [78be5e1eb365778c055143c871d108290f032ff8]
# 
# patch "transforms.cc"
#  from [2092c216aedf25334650b90041aaafd22cefb243]
#    to [86f8a618773e713ec6d3bd5920bea45b35b0a0ef]
# 
# patch "unit_tests.cc"
#  from [5baf8acaed8b1a76321a7b8e95de47414bf97de7]
#    to [6ffe084d7ba17c2ef5629a228b03a0b68b42b822]
#
============================================================
--- app_state.hh	757e3a3d3587f8328a8b917753270103054617a1
+++ app_state.hh	af86dae3f210c378aa1e2f07af9ed544b6fa12c8
@@ -11,7 +11,7 @@
 // PURPOSE.
 
 #include <boost/shared_ptr.hpp>
-#include "botan/rng.h"
+#include <botan/rng.h>
 
 #include "options.hh"
 #include "lua_hooks.hh"
============================================================
--- database.cc	d0da4979961345a3f6f4b68769910f3ba3943f81
+++ database.cc	d24ce5995a6d6f859afd4779cb567ae8267d6c0c
@@ -20,6 +20,12 @@
 #include <string.h>
 
 #include <boost/shared_ptr.hpp>
+#include <botan/botan.h>
+#include <botan/rsa.h>
+#include <botan/keypair.h>
+#include <botan/pem.h>
+#include <botan/look_pk.h>
+
 #include "lexical_cast.hh"
 
 #include "sqlite/sqlite3.h"
@@ -54,11 +60,6 @@
 #include "outdated_indicator.hh"
 #include "lru_writeback_cache.hh"
 
-#include "botan/botan.h"
-#include "botan/rsa.h"
-#include "botan/keypair.h"
-#include "botan/pem.h"
-
 // defined in schema.c, generated from schema.sql:
 extern char const schema_constant[];
 
============================================================
--- database.hh	40e06a31c4d18cf50a9a3f3f46bb2d14df06fe68
+++ database.hh	d52122d8aa928e01819d8f0911e2bec7800d587c
@@ -13,7 +13,7 @@
 #include "vector.hh"
 #include <set>
 #include <boost/shared_ptr.hpp>
-#include "botan/rng.h"
+#include <botan/rng.h>
 
 #include "rev_types.hh"
 #include "cert.hh"
============================================================
--- file_io.cc	e18d07679c2d210a40f18b67ed0b4b96f5a2c21a
+++ file_io.cc	eb6d69994365dd3552f4dc49cb02c03b0816d3e2
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "botan/botan.h"
+#include <botan/botan.h>
 #include "botan_pipe_cache.hh"
 
 #include "file_io.hh"
============================================================
--- hmac.cc	da58d8141987a07675d0a8aaf8ab70b60d53ac90
+++ hmac.cc	0e9e11fc7f8143da251aa6523a65a35d59da7961
@@ -1,6 +1,6 @@
 
 #include "base.hh"
-#include "botan/botan.h"
+#include <botan/botan.h>
 
 #include "sanity.hh"
 #include "hmac.hh"
============================================================
--- hmac.hh	38920db37f7ac41a26c51b97a9fb2a394d0f37ff
+++ hmac.hh	df0392000b74ac3553d40c39d851e4144eda1aef
@@ -2,7 +2,8 @@
 #define __HMAC_HH__
 
 
-#include "botan/botan.h"
+#include <botan/botan.h>
+
 #include "vocab.hh"
 #include "constants.hh"
 #include "string_queue.hh"
============================================================
--- inodeprint.cc	1482e819fc5fd5e4d7ac52c025b3a6b85ab6c12f
+++ inodeprint.cc	7e31f6184ade2f0a1d48ba90492973ff7d69b995
@@ -13,6 +13,9 @@
 #include <algorithm>
 #include <iterator>
 
+#include <botan/botan.h>
+#include <botan/sha160.h>
+
 #include "inodeprint.hh"
 #include "sanity.hh"
 #include "platform.hh"
@@ -20,9 +23,6 @@
 #include "constants.hh"
 #include "basic_io.hh"
 
-#include "botan/botan.h"
-#include "botan/sha160.h"
-
 using std::ostream;
 using std::ostringstream;
 using std::string;
============================================================
--- key_store.cc	095e0f70f5ad787dacbd72f8db73f7057548818d
+++ key_store.cc	692c7a2a0c359a55ae0654900ef1e9594962acc3
@@ -5,6 +5,7 @@
 #include <botan/rsa.h>
 #include <botan/keypair.h>
 #include <botan/pem.h>
+#include <botan/look_pk.h>
 
 #include "key_store.hh"
 #include "file_io.hh"
============================================================
--- key_store.hh	33a62cd00bd4d89c37a0cb35bbd5944b550e6960
+++ key_store.hh	9e813fd91c0bbbcb675c80918094d0817170f868
@@ -2,7 +2,8 @@
 #define __KEY_STORE_H__
 
 #include <boost/scoped_ptr.hpp>
-#include "botan/rng.h"
+#include <botan/rng.h>
+
 #include "vector.hh"
 #include "vocab.hh"
 #include "paths.hh"
============================================================
--- lua.hh	b5de15e16dc12874e8dec56a883800252e05eb22
+++ lua.hh	4e12c9e24a521a4820a50e1f410ebbc25a4f8424
@@ -1,9 +1,7 @@
 #ifndef __LUA_HH__
 #define __LUA_HH__
 
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lua.hpp>
 
 #include <map>
 #include <set>
============================================================
--- lua_hooks.cc	0476cf2512e471ca31d9a3b185968487fbeb9e8e
+++ lua_hooks.cc	8e29fa0e7e3c8bbc54fd8895fd443ab7211bc20a
@@ -10,9 +10,6 @@
 
 
 #include "base.hh"
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
 
 #include <set>
 #include <map>
============================================================
--- m4/pcre.m4	69b51a3c7bd9fbfe877649f0b6d88631068be3c4
+++ m4/pcre.m4	3efce0ef6d442d2f239fff1880779037dde687cc
@@ -73,7 +73,7 @@ AC_DEFUN([MTN_FIND_PCRE],
    CFLAGS="$CFLAGS $PCRE_CFLAGS"
    AC_PREPROC_IFELSE([
 #include "conftest.h"
-#include "pcre.h"
+#include <pcre.h>
 #if PCRE_MAJOR < REQUIRED_PCRE_MAJOR || \
     (PCRE_MAJOR == REQUIRED_PCRE_MAJOR && PCRE_MINOR < REQUIRED_PCRE_MINOR)
 #error out of date
============================================================
--- merkle_tree.cc	8dbfd8363164b2ed5046419012ca689a4e51c6c2
+++ merkle_tree.cc	96073f3cba094463efe64969c0d331bdea06228a
@@ -12,10 +12,9 @@
 #include <sstream>
 
 #include <boost/dynamic_bitset.hpp>
+#include <botan/botan.h>
+#include <botan/sha160.h>
 
-#include "botan/botan.h"
-#include "botan/sha160.h"
-
 #include "constants.hh"
 #include "merkle_tree.hh"
 #include "netio.hh"
============================================================
--- mkstemp.cc	83fe46123ee92b6033ae641e5b1210190ece0119
+++ mkstemp.cc	776ee10bb54b88cdba8c3c6b90ce718b575723f2
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <boost/shared_ptr.hpp>
-#include "botan/rng.h"
+#include <botan/rng.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
============================================================
--- monotone.cc	c675c913e89752c4e38fc3e0410a40e7157f42ef
+++ monotone.cc	c703b34e55b5245c4aa31fe8202c0514107b7ea3
@@ -16,7 +16,6 @@
 #include <locale.h>
 #include <stdlib.h>
 
-#include "botan/botan.h"
 #include "i18n.h"
 #include "app_state.hh"
 #include "botan_pipe_cache.hh"
============================================================
--- netsync.cc	d7f4ca1ce02f6b40069058f857ed59293aac4ac5
+++ netsync.cc	c200f32af29925de88211de8e7d35c9cac3c9020
@@ -23,6 +23,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 
+#include <botan/botan.h>
+
 #include "lua_hooks.hh"
 #include "key_store.hh"
 #include "project.hh"
@@ -49,8 +51,6 @@
 #include "uri.hh"
 #include "options.hh"
 
-#include "botan/botan.h"
-
 #include "netxx/address.h"
 #include "netxx/peer.h"
 #include "netxx/probe.h"
============================================================
--- revision.cc	77e9097ab359fa100476dd86924c6ab62d3387fc
+++ revision.cc	8d2399e41819f46ed01e60d12c4e884060c30d55
@@ -21,7 +21,7 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "botan/botan.h"
+#include <botan/botan.h>
 
 #include "basic_io.hh"
 #include "cert.hh"
============================================================
--- ssh_agent.cc	a2a0e96fd30804230e181747f36dcae3be34fd26
+++ ssh_agent.cc	8b784abe7028a9ca2eb6477d9f6775bce9cda8b5
@@ -10,15 +10,16 @@
 #include "base.hh"
 #include <stdlib.h>
 
+#include <boost/shared_ptr.hpp>
+#include <botan/botan.h>
+#include <botan/rsa.h>
+
 #include "ssh_agent.hh"
 #include "sanity.hh"
 #include "netio.hh"
 #include "botan/numthry.h"
 #include "numeric_vocab.hh"
 #include "netxx/stream.h"
-#include "botan/rsa.h"
-#include "botan/bigint.h"
-#include <boost/shared_ptr.hpp>
 #include "platform.hh"
 #include "key_store.hh"
 
============================================================
--- tester.cc	7d7860782ceb19fec915b63ab6d7b3bebf829502
+++ tester.cc	78be5e1eb365778c055143c871d108290f032ff8
@@ -1,4 +1,7 @@
 #include "base.hh"
+#include <botan/botan.h>
+#include "botan_pipe_cache.hh"
+
 #include "lua.hh"
 #include "paths.hh"
 #include "platform.hh"
@@ -6,8 +9,6 @@
 #include "tester-plaf.hh"
 #include "vector.hh"
 #include "sanity.hh"
-#include "botan/botan.h"
-#include "botan_pipe_cache.hh"
 #include "lexical_cast.hh"
 #include <cstring>
 
============================================================
--- transforms.cc	2092c216aedf25334650b90041aaafd22cefb243
+++ transforms.cc	86f8a618773e713ec6d3bd5920bea45b35b0a0ef
@@ -9,9 +9,10 @@
 
 #include "base.hh"
 #include <iterator>
+#include <botan/botan.h>
+#include <botan/sha160.h>
+
 #include "botan_pipe_cache.hh"
-#include "botan/botan.h"
-#include "botan/sha160.h"
 #include "gzip.hh"
 
 #include "transforms.hh"
============================================================
--- unit_tests.cc	5baf8acaed8b1a76321a7b8e95de47414bf97de7
+++ unit_tests.cc	6ffe084d7ba17c2ef5629a228b03a0b68b42b822
@@ -18,8 +18,8 @@
 #include <cerrno>
 
 #include <boost/function.hpp>
+#include <botan/botan.h>
 
-#include "botan/botan.h"
 #include "option.hh"
 #include "unit_tests.hh"
 #include "sanity.hh"