# 
# 
# patch "cmd_diff_log.cc"
#  from [a0514434ea598eb39edc0f17550fcd88b7f92a1a]
#    to [e2385e1ed0749bc39b3ec537e74156b726e19359]
# 
# patch "database.hh"
#  from [2fef07493929d29e0fc5c5d5b1e7a0e96d3a7233]
#    to [ea6f156a45cccbf101e7f6befe00c77b8496def5]
# 
============================================================
--- cmd_diff_log.cc	a0514434ea598eb39edc0f17550fcd88b7f92a1a
+++ cmd_diff_log.cc	e2385e1ed0749bc39b3ec537e74156b726e19359
@@ -20,6 +20,7 @@
 #include "revision.hh"
 #include "simplestring_xform.hh"
 #include "transforms.hh"
+#include "rev_height.hh"
 
 using std::cout;
 using std::deque;
============================================================
--- database.hh	2fef07493929d29e0fc5c5d5b1e7a0e96d3a7233
+++ database.hh	ea6f156a45cccbf101e7f6befe00c77b8496def5
@@ -15,24 +15,20 @@ int sqlite3_finalize(sqlite3_stmt *);
 struct cert;
 int sqlite3_finalize(sqlite3_stmt *);
 
-#include <stdarg.h>
-
 #include <vector>
 #include <set>
 #include <map>
 #include <string>
 
-#include "cset.hh"
 #include "numeric_vocab.hh"
+#include "vocab.hh"
 #include "paths.hh"
 #include "cleanup.hh"
 #include "roster.hh"
 #include "selectors.hh"
-#include "outdated_indicator.hh"
-#include "vocab.hh"
-#include "rev_height.hh"
 
 // FIXME: would be better not to include this everywhere
+#include "outdated_indicator.hh"
 #include "lru_writeback_cache.hh"
 
 // this file defines a public, typed interface to the database.
@@ -75,10 +71,10 @@ class transaction_guard;
 // the program. I don't know if there's any way to make it clearer.
 
 class transaction_guard;
-struct posting;
 class app_state;
 struct revision_t;
 struct query;
+class rev_height;
 
 class database
 {