#
#
# patch "src/buffer.cc"
#  from [04f719ba7d1187823244ec9312b1b25dece12cb5]
#    to [0b2c8452c5928af7218866309c67780c228c7825]
# 
# patch "src/channel.cc"
#  from [76c07f0088776688f7d9bdb8554ac654488c3c67]
#    to [7e6b6bbae6a84041ec840bedf5816bd6e116e5ea]
# 
# patch "src/forked_server_manager.cc"
#  from [50e353cd2e8f142c5bea4c1b199411d370b56514]
#    to [79917a5fa2955717ed1d09a114aeff05acde408a]
# 
# patch "src/query_client.cc"
#  from [f5a33a1e1a716d8bfd88d3b1f9a2ff632fe17bc7]
#    to [5d561fb777029f9f758d5ec27a99973997b74866]
# 
# patch "src/server.cc"
#  from [16bafa0b185392f1f2b66d076ece2eed13420d89]
#    to [507f6c7aef780079d9a8651f5e06e60af34d9731]
# 
# patch "src/server_manager.cc"
#  from [07555ae385e3faf087de1daf3895567ba5f61964]
#    to [862a39f860372d2de7d695319406bbccf18c1f1f]
# 
# patch "src/sock.cc"
#  from [252c7d0ef2a0ff126887a6994708ee177dd855af]
#    to [fc10db8666cb4b2c1e20e96680a4a04796ec870a]
# 
# patch "src/usher.cc"
#  from [e1a459e734d3e707038f8f3653a64a248fa7f746]
#    to [24ed73f0e9d84bfbf9db808c1006e9c9ffe2e90e]
#
============================================================
--- src/buffer.cc	04f719ba7d1187823244ec9312b1b25dece12cb5
+++ src/buffer.cc	0b2c8452c5928af7218866309c67780c228c7825
@@ -11,7 +11,7 @@
 
 #include <stdexcept>
 
-#include <cstring>
+#include <cstring> // memcpy
 
 buffer::buffer()
  : readpos(0), writepos(0)
============================================================
--- src/channel.cc	76c07f0088776688f7d9bdb8554ac654488c3c67
+++ src/channel.cc	7e6b6bbae6a84041ec840bedf5816bd6e116e5ea
@@ -14,11 +14,11 @@ using std::max;
 
 #include <utility>
 using std::max;
-#include <cerrno>
-#include <cstring>
 
-#include <sys/types.h>
+#include <cstring> // memcpy
 
+#include <sys/select.h> // fd_set and related
+
 #include <boost/lexical_cast.hpp>
 using boost::lexical_cast;
 
============================================================
--- src/server.cc	16bafa0b185392f1f2b66d076ece2eed13420d89
+++ src/server.cc	507f6c7aef780079d9a8651f5e06e60af34d9731
@@ -13,22 +13,18 @@
 #include "server_manager.hh"
 
 #include <iostream>
-#include <cstdio>
 using std::cerr;
 
-#include <cerrno>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <cstring>
+#include <cerrno> // errno
+#include <cstdio> // perror
+#include <sys/wait.h> // waitpid
+#include <sys/stat.h> // open
+#include <fcntl.h> // open
+#include <cstring> // memcpy
+#include <unistd.h> // read
+#include <sys/types.h> // waidpid, kill
+#include <signal.h> // kill
 
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <signal.h>
-
 #include <boost/lexical_cast.hpp>
 using boost::lexical_cast;
 
============================================================
--- src/server_manager.cc	07555ae385e3faf087de1daf3895567ba5f61964
+++ src/server_manager.cc	862a39f860372d2de7d695319406bbccf18c1f1f
@@ -16,7 +16,6 @@ using std::make_pair;
 using std::min;
 using std::make_pair;
 
-#include <cstring>
 
 #include <boost/lexical_cast.hpp>
 //#include <iostream>
============================================================
--- src/sock.cc	252c7d0ef2a0ff126887a6994708ee177dd855af
+++ src/sock.cc	fc10db8666cb4b2c1e20e96680a4a04796ec870a
@@ -11,20 +11,14 @@
 #include "buffer.hh"
 #include "errors.hh"
 
-// fcntl
-#include <unistd.h>
-#include <fcntl.h>
-// accept
-#include <sys/types.h>
-#include <sys/socket.h>
-// sockaddr_in
-#include <netinet/in.h>
-// inet_aton
-#include <arpa/inet.h>
-// strerror
-#include <cstring>
-// errno
-#include <cerrno>
+#include <unistd.h> // fcntl
+#include <fcntl.h> // fcntl
+#include <sys/types.h> // accept
+#include <sys/socket.h> // accept
+#include <netinet/in.h> // sockaddr_in
+#include <arpa/inet.h> // inet_aton
+#include <cstring> // strerror
+#include <cerrno> // errno
 
 using std::set;
 using std::string;
============================================================
--- src/usher.cc	e1a459e734d3e707038f8f3653a64a248fa7f746
+++ src/usher.cc	24ed73f0e9d84bfbf9db808c1006e9c9ffe2e90e
@@ -13,18 +13,12 @@
 #include "basic_io_serverlist_reader.hh"
 #include "query_client.hh"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include <time.h>
-#include <locale.h>
 
+#include <sys/select.h> // select
+#include <sys/time.h> // timeval
+#include <signal.h> // sigaction and related
+#include <cerrno> // errno
+
 #include <string>
 #include <list>
 #include <iostream>
============================================================
--- src/query_client.cc	f5a33a1e1a716d8bfd88d3b1f9a2ff632fe17bc7
+++ src/query_client.cc	5d561fb777029f9f758d5ec27a99973997b74866
@@ -15,7 +15,7 @@ using std::cerr;
 #include <iostream>
 using std::cerr;
 
-#include <cstring>
+#include <cstring> // memcpy
 
 string const greeting = " Hello! This is the monotone usher at localhost. What would you like?";
 
============================================================
--- src/forked_server_manager.cc	50e353cd2e8f142c5bea4c1b199411d370b56514
+++ src/forked_server_manager.cc	79917a5fa2955717ed1d09a114aeff05acde408a
@@ -15,8 +15,7 @@ using std::make_pair;
 using std::min;
 using std::make_pair;
 
-#include <cstring>
-#include <unistd.h>
+#include <unistd.h> // fork
 
 forked_server_manager::forked_server_manager(serverlist_reader &r)
  : server_manager(r)