#
#
# patch "automate.cc"
#  from [3f693194a9de3cb8e5214dd13608103597a7f737]
#    to [9c4d225aab0e5ce122674ac2bb6921ee6b0d9f6e]
# 
# patch "database.cc"
#  from [45a853c398d98224ff998f8769cf4dcbbb0a7d40]
#    to [1cd8904da0236db3a8c5b7d49ed29e3d651ba3df]
# 
# patch "key_store.cc"
#  from [459dd9ae128419afaaa65dd6bb7d3d725a32f207]
#    to [64895846df02b282dca51a0c39512fed56212b3c]
# 
# patch "merge_conflict.cc"
#  from [bcc2018db31c73b7a6a63135e42095127217951d]
#    to [5a0307cd2d52e0fe6201428bda86121cdeea515a]
# 
# patch "merge_content.cc"
#  from [b7b36faae51fad93a1b7ba37c17eee7bb20dd5a9]
#    to [758caf01d627a675e28dd169289c9f15fa69433e]
# 
# patch "txt2c.cc"
#  from [77e55cb6174483c2e253052793a5fc15e43535d2]
#    to [b23798126943239eaff66187b8828e153ec2c8d8]
# 
# patch "unit-tests/roster.cc"
#  from [e591ab4c78e425d2ae7140eeb4103746b0bc74e9]
#    to [b97daa78753cf898ab900a2ccf53a458d108849a]
# 
# patch "unit_tester.cc"
#  from [28af6bab67aa693109a382dcd1eb35628030fb13]
#    to [4316ae3e819115403a1f305e84c05291acc43b24]
#
============================================================
--- automate.cc	3f693194a9de3cb8e5214dd13608103597a7f737
+++ automate.cc	9c4d225aab0e5ce122674ac2bb6921ee6b0d9f6e
@@ -50,6 +50,7 @@ using std::char_traits;
 using std::basic_ios;
 using std::basic_stringbuf;
 using std::char_traits;
+using std::find;
 using std::inserter;
 using std::make_pair;
 using std::map;
============================================================
--- database.cc	45a853c398d98224ff998f8769cf4dcbbb0a7d40
+++ database.cc	1cd8904da0236db3a8c5b7d49ed29e3d651ba3df
@@ -81,7 +81,9 @@ using std::pair;
 using std::multimap;
 using std::ostream;
 using std::pair;
+using std::remove_if;
 using std::set;
+using std::sort;
 using std::string;
 using std::vector;
 using std::accumulate;
@@ -98,6 +100,7 @@ using Botan::RSA_PublicKey;
 using Botan::SecureVector;
 using Botan::X509_PublicKey;
 using Botan::RSA_PublicKey;
+using Botan::get_pk_encryptor;
 
 int const one_row = 1;
 int const one_col = 1;
@@ -973,12 +976,12 @@ database::info(ostream & out, bool analy
       = max_element(counts.begin(), counts.end(), longest_number)->length();
     for(vector<string>::iterator i = counts.begin(); i != counts.end(); i++)
       if (width > i->length() && (*i)[0] != '[')
-        i->insert(0, width - i->length(), ' ');
+        i->insert(0U, width - i->length(), ' ');
 
     width = max_element(bytes.begin(), bytes.end(), longest_number)->length();
     for(vector<string>::iterator i = bytes.begin(); i != bytes.end(); i++)
       if (width > i->length() && (*i)[0] != '[')
-        i->insert(0, width - i->length(), ' ');
+        i->insert(0U, width - i->length(), ' ');
   }
 
   i18n_format form =
============================================================
--- key_store.cc	459dd9ae128419afaaa65dd6bb7d3d725a32f207
+++ key_store.cc	64895846df02b282dca51a0c39512fed56212b3c
@@ -52,6 +52,8 @@ using Botan::Pipe;
 using Botan::PK_Decryptor;
 using Botan::PK_Signer;
 using Botan::Pipe;
+using Botan::get_pk_decryptor;
+using Botan::get_cipher;
 
 struct key_store_state
 {
============================================================
--- merge_conflict.cc	bcc2018db31c73b7a6a63135e42095127217951d
+++ merge_conflict.cc	5a0307cd2d52e0fe6201428bda86121cdeea515a
@@ -673,7 +673,7 @@ roster_merge_result::report_invalid_name
 roster_merge_result::report_invalid_name_conflicts(roster_t const & left_roster,
                                                    roster_t const & right_roster,
                                                    content_merge_adaptor & adaptor,
-                                                   bool basic_io,
+                                                   const bool basic_io,
                                                    std::ostream & output) const
 {
   MM(left_roster);
@@ -775,7 +775,7 @@ roster_merge_result::report_directory_lo
 roster_merge_result::report_directory_loop_conflicts(roster_t const & left_roster,
                                                      roster_t const & right_roster,
                                                      content_merge_adaptor & adaptor,
-                                                     bool basic_io,
+                                                     const bool basic_io,
                                                      std::ostream & output) const
 {
   MM(left_roster);
@@ -855,7 +855,7 @@ roster_merge_result::report_orphaned_nod
 roster_merge_result::report_orphaned_node_conflicts(roster_t const & left_roster,
                                                     roster_t const & right_roster,
                                                     content_merge_adaptor & adaptor,
-                                                    bool basic_io,
+                                                    const bool basic_io,
                                                     std::ostream & output) const
 {
   MM(left_roster);
@@ -993,7 +993,7 @@ roster_merge_result::report_multiple_nam
 roster_merge_result::report_multiple_name_conflicts(roster_t const & left_roster,
                                                     roster_t const & right_roster,
                                                     content_merge_adaptor & adaptor,
-                                                    bool basic_io,
+                                                    const bool basic_io,
                                                     std::ostream & output) const
 {
   MM(left_roster);
@@ -1231,7 +1231,7 @@ roster_merge_result::report_attribute_co
 roster_merge_result::report_attribute_conflicts(roster_t const & left_roster,
                                                 roster_t const & right_roster,
                                                 content_merge_adaptor & adaptor,
-                                                bool basic_io,
+                                                const bool basic_io,
                                                 std::ostream & output) const
 {
   MM(left_roster);
@@ -1382,7 +1382,7 @@ roster_merge_result::report_file_content
                                                    roster_t const & left_roster,
                                                    roster_t const & right_roster,
                                                    content_merge_adaptor & adaptor,
-                                                   bool basic_io,
+                                                   const bool basic_io,
                                                    std::ostream & output)
 {
   MM(left_roster);
============================================================
--- merge_content.cc	b7b36faae51fad93a1b7ba37c17eee7bb20dd5a9
+++ merge_content.cc	758caf01d627a675e28dd169289c9f15fa69433e
@@ -652,7 +652,7 @@ resolve_merge_conflicts(lua_hooks & lua,
                         roster_t const & right_roster,
                         roster_merge_result & result,
                         content_merge_adaptor & adaptor,
-                        bool resolutions_given)
+                        const bool resolutions_given)
 {
   if (!result.is_clean())
     {
============================================================
--- txt2c.cc	77e55cb6174483c2e253052793a5fc15e43535d2
+++ txt2c.cc	b23798126943239eaff66187b8828e153ec2c8d8
@@ -25,6 +25,7 @@ using std::ofstream;
 using std::ostream;
 using std::ostringstream;
 using std::ofstream;
+using std::rename;
 using std::strerror;
 using std::string;
 
============================================================
--- unit-tests/roster.cc	e591ab4c78e425d2ae7140eeb4103746b0bc74e9
+++ unit-tests/roster.cc	b97daa78753cf898ab900a2ccf53a458d108849a
@@ -19,6 +19,7 @@ using std::logic_error;
 #include "constants.hh"
 
 using std::logic_error;
+using std::search;
 using boost::shared_ptr;
 
 static void
============================================================
--- unit_tester.cc	28af6bab67aa693109a382dcd1eb35628030fb13
+++ unit_tester.cc	4316ae3e819115403a1f305e84c05291acc43b24
@@ -62,7 +62,7 @@ extract_group(char const *filename, bool
   if (first_dot != string::npos)
     result.erase(first_dot, string::npos);
   if (fis)
-    result.insert(0, 1, '_');
+    result.insert(0U, 1, '_');
   return result;
 }