# 
# 
# patch "ChangeLog"
#  from [faac11b71a153b40f710c8005d8360b9ecb93f80]
#    to [acdacdfcdef2fdbfd97f084f021386acfcd6d284]
# 
# patch "diff_patch.cc"
#  from [f29007e22f47cba1649cb511c7e0b1eaf950d6fb]
#    to [19ff8e2684824322dd72775736cb3b1accae4566]
# 
# patch "hash_map.hh"
#  from [93f57aa66711b5db2adf1d62e50bd1e9596b5406]
#    to [3485ec0bd41210543b7b415c188f5ef6f21a16dd]
# 
# patch "lua/lua.h"
#  from [c3a0e6e3a9be2bc2bf469752879f1378275659b1]
#    to [248cfdf0907ff4626256496e3c38210314baa0d5]
# 
# patch "mkstemp.cc"
#  from [03865df03f56044431e1ce1e2eebb27e73e5c248]
#    to [a58750be73db167658f8b3df2993d0dec8648a5c]
# 
# patch "monotone.cc"
#  from [32e0dec22f6beac4ab8271c51ff29cd7caefb5a3]
#    to [9c425630c8859c6392cfa04afba11aa538f211fc]
# 
# patch "platform.hh"
#  from [0219de39c44ef3898973d9568b5ce26593dbca7c]
#    to [3241dae2d6166846db8badebcb2296d34c10348c]
# 
# patch "rcs_file.cc"
#  from [8f2bc1920dfa4a94fd265b03e081da13b3a171a8]
#    to [ae0f12cfaa2788a212bc9d3f1ec843ce8ba49cc8]
# 
# patch "sanity.hh"
#  from [88009f27365f17c86b8dd104021fbcc1cc08a497]
#    to [f8046e3979bfeaee7e412a99893fb04dc257f7b9]
# 
# patch "ui.cc"
#  from [7bef43275fba7bdf4c2dc03ee191776dc2a57834]
#    to [478cca39afb58e076cae2e7180f071f4fedc6ffc]
# 
# patch "vocab.hh"
#  from [018407f5255129c875a8ccdfaae93c2645d1ac05]
#    to [7006a57c4c46903491fa38bcbbb86fee078dec10]
# 
============================================================
--- ChangeLog	faac11b71a153b40f710c8005d8360b9ecb93f80
+++ ChangeLog	acdacdfcdef2fdbfd97f084f021386acfcd6d284
@@ -1,5 +1,10 @@
 2006-03-25  Matthew Gregan  <address@hidden>
 
+	* diff_patch.cc, hash_map.hh, lua/lua.h, mkstemp.cc, monotone.cc,
+	platform.hh, rcs_file.cc, sanity.hh, ui.cc, vocab.hh: config.h
+	cleanups--ensure it is included before any other includes, and
+	that we use "", rather than <>.
+
 	* idna/version.c: Use STRINGPREP_VERSION rather than VERSION,
 	which just happens to be defined to the monotone version number.
 
============================================================
--- diff_patch.cc	f29007e22f47cba1649cb511c7e0b1eaf950d6fb
+++ diff_patch.cc	19ff8e2684824322dd72775736cb3b1accae4566
@@ -5,6 +5,8 @@
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "config.h"
+
 #include <algorithm>
 #include <iostream>
 #include <iterator>
@@ -13,8 +15,6 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
-
-#include "config.h"
 #include "diff_patch.hh"
 #include "interner.hh"
 #include "lcs.hh"
============================================================
--- hash_map.hh	93f57aa66711b5db2adf1d62e50bd1e9596b5406
+++ hash_map.hh	3485ec0bd41210543b7b415c188f5ef6f21a16dd
@@ -1,7 +1,7 @@
 #ifndef __HASHMAP_HH
 #define __HASHMAP_HH
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_GNUCXX_HASHMAP
 #define HASHMAP_PRESENT
============================================================
--- lua/lua.h	c3a0e6e3a9be2bc2bf469752879f1378275659b1
+++ lua/lua.h	248cfdf0907ff4626256496e3c38210314baa0d5
@@ -11,7 +11,7 @@
 #define lua_h
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <stdarg.h>
============================================================
--- mkstemp.cc	03865df03f56044431e1ce1e2eebb27e73e5c248
+++ mkstemp.cc	a58750be73db167658f8b3df2993d0dec8648a5c
@@ -8,7 +8,8 @@
 // some of its text into this file and am relicensing my derivative work
 // (this file) copyright (C) 2004 graydon hoare, as LGPL also.
 
-#include <config.h>
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
============================================================
--- monotone.cc	32e0dec22f6beac4ab8271c51ff29cd7caefb5a3
+++ monotone.cc	9c425630c8859c6392cfa04afba11aa538f211fc
@@ -1,10 +1,10 @@
 // -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil -*-
 // copyright (C) 2002, 2003 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
-#include <config.h>
+#include "config.h"
 
 #include "popt/popt.h"
 #include <cstdio>
============================================================
--- platform.hh	0219de39c44ef3898973d9568b5ce26593dbca7c
+++ platform.hh	3241dae2d6166846db8badebcb2296d34c10348c
@@ -9,10 +9,11 @@
 // this describes functions to be found, alternatively, in win32/* or unix/*
 // directories.
 
+#include "config.h"
+
 #include <string>
 
 #include "vocab.hh"
-#include "config.h"
 #include "paths.hh"
 
 void read_password(std::string const & prompt, char * buf, size_t bufsz);
============================================================
--- rcs_file.cc	8f2bc1920dfa4a94fd265b03e081da13b3a171a8
+++ rcs_file.cc	ae0f12cfaa2788a212bc9d3f1ec843ce8ba49cc8
@@ -1,8 +1,10 @@
 // copyright (C) 2002, 2003 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "config.h"
+
 #include <fstream>
 #include <iostream>
 #include <string>
@@ -24,7 +26,6 @@
 #include <fcntl.h>
 #endif
 
-#include "config.h"
 #include "rcs_file.hh"
 #include "sanity.hh"
 
============================================================
--- sanity.hh	88009f27365f17c86b8dd104021fbcc1cc08a497
+++ sanity.hh	f8046e3979bfeaee7e412a99893fb04dc257f7b9
@@ -7,6 +7,8 @@
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "config.h" // Required for ENABLE_NLS
+
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -16,7 +18,6 @@
 #include "boost/circular_buffer.hpp"
 #include "boost/current_function.hpp"
 
-#include <config.h> // Required for ENABLE_NLS
 #include "i18n.h"
 
 #include "quick_alloc.hh" // to get the QA() macro
============================================================
--- ui.cc	7bef43275fba7bdf4c2dc03ee191776dc2a57834
+++ ui.cc	478cca39afb58e076cae2e7180f071f4fedc6ffc
@@ -9,6 +9,7 @@
 // writing to it directly!
 
 #include "config.h"
+
 #include "platform.hh"
 #include "sanity.hh"
 #include "ui.hh"
============================================================
--- vocab.hh	018407f5255129c875a8ccdfaae93c2645d1ac05
+++ vocab.hh	7006a57c4c46903491fa38bcbbb86fee078dec10
@@ -6,12 +6,12 @@
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include "config.h"
+
 #include <utility>
 #include <string>
 #include <iosfwd>
 
-#include <config.h>
-
 // the purpose of this file is to wrap things which are otherwise strings
 // in a bit of typesafety, set up enumerations and tuple-types, and
 // generally describe the "vocabulary" (nouns anyways) that modules in this