#
#
# patch "database.hh"
#  from [806b33e75ca02f48aa08181ccce62f4f96aabb87]
#    to [a59e6f0275fc542e51ed9bd7fd3383e54dfad8fe]
# 
# patch "key_store.hh"
#  from [86c48762abf384ec608d0235b4173ffb72aab178]
#    to [ab3846f0e3952ee97f995c434185a05953c1c838]
# 
# patch "keys.hh"
#  from [20459245774ad7410220fe28dd5c9025987bf287]
#    to [fb6af28ca0d5f3b8e63427e8c3f485730e767ce0]
# 
# patch "packet.cc"
#  from [ef7079554bc2b0a4be3e0fec17b820b18b9d1762]
#    to [64ffd5b38c960abe0577ed2ea0d2941804680cb5]
# 
# patch "packet.hh"
#  from [c20147b757445b462c674190add9606835573603]
#    to [d3119983e2dc5164a6dd1ca161382c211eab5db1]
# 
# patch "vocab.hh"
#  from [8c831a796771018eb1b2d28f56dc8e2f9b4d4e55]
#    to [555a09708e44a231cca9f0d8e808e88e45e05bf1]
#
============================================================
--- database.hh	806b33e75ca02f48aa08181ccce62f4f96aabb87
+++ database.hh	a59e6f0275fc542e51ed9bd7fd3383e54dfad8fe
@@ -24,6 +24,8 @@ class rev_height;
 class outdated_indicator;
 class rev_height;
 
+typedef std::pair<var_domain, var_name> var_key;
+
 // this file defines a public, typed interface to the database.
 // the database class encapsulates all knowledge about sqlite,
 // the schema, and all SQL statements used to access the schema.
============================================================
--- key_store.hh	86c48762abf384ec608d0235b4173ffb72aab178
+++ key_store.hh	ab3846f0e3952ee97f995c434185a05953c1c838
@@ -1,7 +1,6 @@
 #ifndef __KEY_STORE_H__
 #define __KEY_STORE_H__
 
-#include <iosfwd>
 #include <boost/scoped_ptr.hpp>
 #include "vector.hh"
 #include "vocab.hh"
@@ -11,6 +10,18 @@ class database;
 struct globish;
 class database;
 
+struct keypair
+{
+  base64<rsa_pub_key> pub;
+  base64<rsa_priv_key> priv;
+  keypair()
+  {}
+  keypair(base64<rsa_pub_key> const & a,
+          base64<rsa_priv_key> const & b)
+   : pub(a), priv(b)
+  {}
+};
+
 struct key_store_state;
 
 class key_store
============================================================
--- keys.hh	20459245774ad7410220fe28dd5c9025987bf287
+++ keys.hh	fb6af28ca0d5f3b8e63427e8c3f485730e767ce0
@@ -16,6 +16,7 @@ class database;
 class lua_hooks;
 class key_store;
 class database;
+struct keypair;
 
 // keys.{hh,cc} does all the "delicate" crypto (meaning: that which needs
 // to read passphrases and manipulate raw, decrypted private keys). it
============================================================
--- packet.cc	ef7079554bc2b0a4be3e0fec17b820b18b9d1762
+++ packet.cc	64ffd5b38c960abe0577ed2ea0d2941804680cb5
@@ -18,6 +18,7 @@
 #include "transforms.hh"
 #include "simplestring_xform.hh"
 #include "cert.hh"
+#include "key_store.hh" // for keypair
 
 using std::istream;
 using std::istringstream;
============================================================
--- packet.hh	c20147b757445b462c674190add9606835573603
+++ packet.hh	d3119983e2dc5164a6dd1ca161382c211eab5db1
@@ -13,6 +13,7 @@ struct cert;
 #include "vocab.hh"
 
 struct cert;
+struct keypair;
 
 // the idea here is that monotone can produce and consume "packet streams",
 // where each packet is *informative* rather than transactional. that is to
============================================================
--- vocab.hh	8c831a796771018eb1b2d28f56dc8e2f9b4d4e55
+++ vocab.hh	555a09708e44a231cca9f0d8e808e88e45e05bf1
@@ -10,7 +10,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <utility>
 #include <boost/shared_ptr.hpp>
 
 // the purpose of this file is to wrap things which are otherwise strings
@@ -30,7 +29,7 @@ class immutable_string
 class immutable_string
 {
   boost::shared_ptr<std::string> _rep;
-  
+
 public:
   immutable_string()
   {}
@@ -118,29 +117,8 @@ typedef     file< delta >      file_delt
 typedef manifest< delta >  manifest_delta;
 typedef     file< delta >      file_delta;
 
-typedef std::pair<var_domain, var_name> var_key;
-
-
-struct keypair
-{
-  base64<rsa_pub_key> pub;
-  base64<rsa_priv_key> priv;
-  keypair()
-  {}
-  keypair(base64<rsa_pub_key> const & a,
-          base64<rsa_priv_key> const & b)
-   : pub(a), priv(b)
-  {}
-};
-
-// fs::path is our "generic" safe path type, pointing potentially anywhere
-// in the filesystem. if you want to *define* or work with any of these you
-// need to include boost/filesystem/path.hpp.
-
-//namespace boost { namespace filesystem { class path; } }
-//namespace fs = boost::filesystem;
-
-// diff type
+// diff type; this is here and not diff_patch.hh, because options_list.hh
+// needs to refer to it
 enum diff_type
 {
   unified_diff,