# 
# patch "ChangeLog"
#  from [a62f5675c105c999472beea7ee82f08a5f937970]
#    to [937199b956cf78d6a0d50855cec7d32e8cec97ed]
# 
# patch "automate.cc"
#  from [646411d161574bb13a8cb76ff8f8abd28de310ba]
#    to [7492b76019ac6578ecc8e1fec67025cff1ffbc39]
# 
# patch "basic_io.hh"
#  from [b61d8da0f80ba7017e11e68e91809c95f4415b43]
#    to [ddf2b4dbcf7bedb37aa96ef1634c41d2d58a249e]
# 
# patch "cert.cc"
#  from [07be077e4c0d53abd9cac0bbdf201e808cf221a5]
#    to [0c6926cd5d66887e8449302640c57f94d95eaa00]
# 
# patch "change_set.cc"
#  from [803ba53c5e9aafcbc72169471fec66bcee20e14d]
#    to [140b7e4eaf348923275c40452cf25c0264966dfb]
# 
# patch "cryptopp/config.h"
#  from [e6a83896c58c998e79adebed9dd975cae332523d]
#    to [cffb39ab0c2b4b02984adc4f024b5192a2851a8e]
# 
# patch "cryptopp/integer.cpp"
#  from [103774f8fdc7bba70d9c8c36c12278fdfbdddff1]
#    to [f21803a0c45376b1be12f49c04cbd13cdefc4951]
# 
# patch "main.cc"
#  from [24910dffe664f34ffa8bb09e201ed03631dec629]
#    to [0f905ade02dd9188922f3c04700501c6f7d4b57d]
# 
# patch "merkle_tree.cc"
#  from [b0a8cacb8d29ab4a8500c0f2cb34509783dca4c8]
#    to [2088ec84695cc4d4290728085f3e5d7900e9a9ba]
# 
# patch "merkle_tree.hh"
#  from [79d95a4f0dc25d93faae1a64544dca80adce5d76]
#    to [aa4d5bed0d7dee09fd72c2068c626061c30a6937]
# 
# patch "monotone.cc"
#  from [6ebbe33e88767b8be841eab07a8daefb1a804b36]
#    to [21b832dddae51e882d8df1c744b159f1a7642c22]
# 
# patch "netcmd.cc"
#  from [e04a41fed951a77dcef389e94cc26d04ae12220f]
#    to [9b3a263d43423df25f0da8714741f590d4d2f41a]
# 
# patch "netsync.cc"
#  from [6ac44712dc4b51df54c5a0ab95bd0ee0211d26eb]
#    to [3251de2cb2bc135ba3576d742cbe7ae2cd5a30e2]
# 
# patch "netxx/osutil.h"
#  from [410b3050e6da00aca1cbe528773bc33cb1465060]
#    to [d852d45641d2b6a72f9627b9ef3b3517247e1693]
# 
# patch "packet.cc"
#  from [bd0eb9d56a0d3845911aa49ed31353a9e40f9fe5]
#    to [e51ed2792c8751cf45a0344503d3860c0d38d3f1]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-06-30  Patrick Mauritz  <address@hidden>
+
+	* automate.cc, basic_io.hh, cert.cc, change_set.cc,
+	cryptopp/config.h, cryptopp/integer.cpp, main.cc, merkle_tree.cc,
+	merkle_tree.hh, monotone.cc, netcmd.cc, netsync.cc,
+	netxx/osutil.h, packet.cc: Namespace and include file cleanup.
+
 2005-06-29  graydon hoare  <address@hidden>
 
 	* tests/t_cvsimport_drepper2.at: New test.
--- automate.cc
+++ automate.cc
@@ -856,7 +856,7 @@
         
   // Make the output deterministic; this is useful for the test suite, in
   // particular.
-  sort(certs.begin(), certs.end());
+  std::sort(certs.begin(), certs.end());
 
   basic_io::printer pr(output);
 
--- basic_io.hh
+++ basic_io.hh
@@ -24,7 +24,7 @@
       TOK_SYMBOL,
       TOK_STRING,
       TOK_HEX,
-      TOK_NONE,
+      TOK_NONE
     } token_type;
 
   struct 
--- cert.cc
+++ cert.cc
@@ -27,7 +27,10 @@
 #include <vector>
 
 using namespace std;
-using namespace boost;
+using boost::shared_ptr;
+using boost::get;
+using boost::tuple;
+using boost::lexical_cast;
 
 // FIXME: the bogus-cert family of functions is ridiculous
 // and needs to be replaced, or at least factored.
@@ -86,7 +89,7 @@
   vector< manifest<cert> > tmp_certs;
 
   // sorry, this is a crazy data structure
-  typedef tuple< hexenc<id>, cert_name, base64<cert_value> > trust_key;
+  typedef boost::tuple< hexenc<id>, cert_name, base64<cert_value> > trust_key;
   typedef map< trust_key, pair< shared_ptr< set<rsa_keypair_id> >, it > > trust_map;
   trust_map trust;
 
--- change_set.cc
+++ change_set.cc
@@ -13,7 +13,6 @@
 #include <iostream>
 #include <list>
 #include <vector>
-#include <ext/hash_map>
 
 #include <boost/filesystem/path.hpp>
 #include <boost/shared_ptr.hpp>
--- cryptopp/config.h
+++ cryptopp/config.h
@@ -103,7 +103,7 @@
 typedef uint16_t word16;
 typedef uint32_t word32;
 
-#if defined(__GNUC__) || defined(__MWERKS__)
+#if defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_CC)
 	#define WORD64_AVAILABLE
 	typedef uint64_t word64;
 	#define W64LIT(x) x##LL
@@ -203,7 +203,7 @@
 #define CRYPTOPP_WIN32_AVAILABLE
 #endif
 
-#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__)
+#if defined(__unix__) || defined(__MACH__) || defined(__sun) || defined(__NetBSD__)
 #define CRYPTOPP_UNIX_AVAILABLE
 #endif
 
@@ -255,7 +255,7 @@
 #	define CRYPTOPP_MALLOC_ALIGNMENT_IS_16
 #endif
 
-#if defined(__linux__) || defined(__sun__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__sun) || defined(__CYGWIN__)
 #	define CRYPTOPP_MEMALIGN_AVAILABLE
 #endif
 
--- cryptopp/integer.cpp
+++ cryptopp/integer.cpp
@@ -3956,7 +3956,7 @@
 	return r;
 }
 
-word Integer::InverseMod(const word mod) const
+word Integer::InverseMod(word mod) const
 {
 	word g0 = mod, g1 = *this % mod;
 	word v0 = 0, v1 = 1;
--- main.cc
+++ main.cc
@@ -22,6 +22,8 @@
 #include <cstring>
 #include <iostream>
 #include <ui.hh>
+#include <signal.h>
+#include <setjmp.h>
 
 // Microsoft + other compatible compilers such as Intel
 #if defined(_MSC_VER) || (defined(__MWERKS__) && __MWERKS__ >= 0x3000)
--- merkle_tree.cc
+++ merkle_tree.cc
@@ -19,7 +19,7 @@
 #include "sanity.hh"
 #include "transforms.hh"
 
-using namespace boost;
+using boost::dynamic_bitset;
 using namespace std;
 using namespace CryptoPP;
 
--- merkle_tree.hh
+++ merkle_tree.hh
@@ -38,7 +38,7 @@
     key_item = 3,    
     revision_item = 4,
     cert_item = 5,
-    epoch_item = 6,
+    epoch_item = 6
   }
 netcmd_item_type;
 
--- monotone.cc
+++ monotone.cc
@@ -8,6 +8,7 @@
 
 #include "popt/popt.h"
 #include <cstdio>
+#include <strings.h>
 #include <iterator>
 #include <iostream>
 #include <fstream>
--- netcmd.cc
+++ netcmd.cc
@@ -18,7 +18,6 @@
 #include "transforms.hh"
 
 using namespace std;
-using namespace boost;
 
 static netcmd_item_type 
 read_netcmd_item_type(string const & in, 
--- netsync.cc
+++ netsync.cc
@@ -184,8 +184,9 @@
 // material that you wouldn't have a hope of typing in manually anyways)
 //
 
-using namespace boost;
 using namespace std;
+using boost::shared_ptr;
+using boost::lexical_cast;
 
 static inline void 
 require(bool check, string const & context)
--- netxx/osutil.h
+++ netxx/osutil.h
@@ -74,6 +74,10 @@
 # include <netdb.h>
 # include <fcntl.h>
 # include <errno.h>
+
+# include <string.h>
+# include <stdlib.h>
+
 #endif
 
 #include "config.h"
--- packet.cc
+++ packet.cc
@@ -18,8 +18,12 @@
 #include "sanity.hh"
 #include "transforms.hh"
 
-using namespace boost;
 using namespace std;
+using boost::shared_ptr;
+using boost::lexical_cast;
+using boost::match_default;
+using boost::match_results;
+using boost::regex;
 
 // --- packet db writer --
 //