aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-07 08:50:03 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-07 08:50:03 +0000
commit8ef98225e34c43856287e1ff5bba67bfa473c637 (patch)
tree9d254125ad9e73a81ccfba535789820e4a7e4412
parentbcffd6cca1142cfb02daff9e0dd7456143306b55 (diff)
downloadpaludis-8ef98225e34c43856287e1ff5bba67bfa473c637.tar.gz
paludis-8ef98225e34c43856287e1ff5bba67bfa473c637.tar.xz
Standardise includes
-rw-r--r--paludis/args/args_dumper.hh4
-rw-r--r--paludis/args/args_group.hh2
-rw-r--r--paludis/args/args_handler.cc2
-rw-r--r--paludis/args/args_handler.hh4
-rw-r--r--paludis/args/args_option.hh2
-rw-r--r--paludis/args/args_visitor.cc2
-rw-r--r--paludis/args/args_visitor.hh2
-rw-r--r--paludis/category_name_part.hh2
-rw-r--r--paludis/category_name_part_TEST.cc2
-rw-r--r--paludis/config_file.cc4
-rw-r--r--paludis/config_file.hh4
-rw-r--r--paludis/config_file_TEST.cc4
-rw-r--r--paludis/default_config.cc2
-rw-r--r--paludis/default_config.hh10
-rw-r--r--paludis/default_environment.cc6
-rw-r--r--paludis/default_environment.hh2
-rw-r--r--paludis/dep_atom.hh10
-rw-r--r--paludis/dep_atom_dumper.cc2
-rw-r--r--paludis/dep_atom_dumper.hh2
-rw-r--r--paludis/dep_atom_dumper_TEST.cc4
-rw-r--r--paludis/dep_atom_flattener.cc2
-rw-r--r--paludis/dep_atom_flattener.hh6
-rw-r--r--paludis/dep_atom_pretty_printer.cc4
-rw-r--r--paludis/dep_atom_pretty_printer.hh2
-rw-r--r--paludis/dep_lexer.hh4
-rw-r--r--paludis/dep_lexer_TEST.cc4
-rw-r--r--paludis/dep_list.cc4
-rw-r--r--paludis/dep_list.hh14
-rw-r--r--paludis/dep_list_TEST.cc4
-rw-r--r--paludis/dep_parser.cc6
-rw-r--r--paludis/dep_parser.hh4
-rw-r--r--paludis/dep_parser_TEST.cc4
-rw-r--r--paludis/environment.hh6
-rw-r--r--paludis/fake_repository.cc4
-rw-r--r--paludis/match_package.hh2
-rw-r--r--paludis/match_sequence.hh2
-rw-r--r--paludis/package_database.cc2
-rw-r--r--paludis/package_database.hh6
-rw-r--r--paludis/package_name_part.hh2
-rw-r--r--paludis/package_name_part_TEST.cc2
-rw-r--r--paludis/portage_repository.hh2
-rw-r--r--paludis/qa/changelog_check.cc2
-rw-r--r--paludis/qa/check_result.hh4
-rw-r--r--paludis/qa/defaults_check.cc4
-rw-r--r--paludis/qa/defaults_check.hh2
-rw-r--r--paludis/qa/dep_flags_check.cc4
-rw-r--r--paludis/qa/dep_packages_check.cc4
-rw-r--r--paludis/qa/deps_exist_check.cc4
-rw-r--r--paludis/qa/digest_collisions_check.cc8
-rw-r--r--paludis/qa/ebuild_check.hh12
-rw-r--r--paludis/qa/ebuild_count.cc4
-rw-r--r--paludis/qa/environment.cc2
-rw-r--r--paludis/qa/extract_check.cc2
-rw-r--r--paludis/qa/file_check.hh6
-rw-r--r--paludis/qa/glep_31_check.cc2
-rw-r--r--paludis/qa/glep_31_check.hh2
-rw-r--r--paludis/qa/glep_31_check_TEST.cc2
-rw-r--r--paludis/qa/has_ebuilds_check.cc4
-rw-r--r--paludis/qa/has_misc_files_check.cc2
-rw-r--r--paludis/qa/inherits_check.cc6
-rw-r--r--paludis/qa/license_check.cc2
-rw-r--r--paludis/qa/metadata_check.cc4
-rw-r--r--paludis/qa/package_dir_check.hh6
-rw-r--r--paludis/qa/parse_deps_check.cc2
-rw-r--r--paludis/qa/pdepend_overlap_check.cc4
-rw-r--r--paludis/qa/restrict_check.cc4
-rw-r--r--paludis/qa/src_uri_check.cc2
-rw-r--r--paludis/qa/whitespace_check.cc2
-rw-r--r--paludis/qualified_package_name.hh6
-rw-r--r--paludis/qualified_package_name_TEST.cc2
-rw-r--r--paludis/repository.hh8
-rw-r--r--paludis/slot_name.hh2
-rw-r--r--paludis/test_extras.cc8
-rw-r--r--paludis/use_flag_name.hh2
-rw-r--r--paludis/util/container_entry_TEST.cc4
-rw-r--r--paludis/util/counted_ptr_TEST.cc2
-rw-r--r--paludis/util/create_insert_iterator_TEST.cc2
-rw-r--r--paludis/util/deleter_TEST.cc2
-rw-r--r--paludis/util/destringify.hh4
-rw-r--r--paludis/util/destringify_TEST.cc2
-rw-r--r--paludis/util/dir_iterator.cc4
-rw-r--r--paludis/util/dir_iterator.hh4
-rw-r--r--paludis/util/filter_insert_iterator_TEST.cc4
-rw-r--r--paludis/util/fs_entry.cc2
-rw-r--r--paludis/util/fs_entry.hh4
-rw-r--r--paludis/util/fs_entry_TEST.cc2
-rw-r--r--paludis/util/indirect_iterator.hh2
-rw-r--r--paludis/util/indirect_iterator_TEST.cc6
-rw-r--r--paludis/util/instantiation_policy_TEST.cc2
-rw-r--r--paludis/util/is_const_TEST.cc2
-rw-r--r--paludis/util/is_file_with_extension.hh2
-rw-r--r--paludis/util/is_file_with_extension_TEST.cc2
-rw-r--r--paludis/util/iterator_utilities_TEST.cc2
-rw-r--r--paludis/util/join.hh2
-rw-r--r--paludis/util/join_TEST.cc4
-rw-r--r--paludis/util/log.cc2
-rw-r--r--paludis/util/log.hh2
-rw-r--r--paludis/util/log_TEST.cc2
-rw-r--r--paludis/util/pstream.cc6
-rw-r--r--paludis/util/pstream.hh8
-rw-r--r--paludis/util/sequential_collection.hh2
-rw-r--r--paludis/util/smart_record_TEST.cc2
-rw-r--r--paludis/util/sorted_collection.hh2
-rw-r--r--paludis/util/stringify.hh2
-rw-r--r--paludis/util/stringify_TEST.cc2
-rw-r--r--paludis/util/strip.cc2
-rw-r--r--paludis/util/strip.hh2
-rw-r--r--paludis/util/strip_TEST.cc2
-rw-r--r--paludis/util/system.cc2
-rw-r--r--paludis/util/test_extras.cc8
-rw-r--r--paludis/util/tokeniser.hh2
-rw-r--r--paludis/util/tokeniser_TEST.cc2
-rw-r--r--paludis/util/transform_insert_iterator_TEST.cc2
-rw-r--r--paludis/util/virtual_constructor_TEST.cc6
-rw-r--r--paludis/util/visitor_TEST.cc4
-rw-r--r--paludis/version_metadata.cc4
-rw-r--r--paludis/version_metadata.hh8
-rw-r--r--paludis/version_operator.cc2
-rw-r--r--paludis/version_operator.hh4
-rw-r--r--paludis/version_operator_TEST.cc2
-rw-r--r--paludis/version_spec.cc4
-rw-r--r--paludis/version_spec.hh6
-rw-r--r--src/colour.cc2
-rw-r--r--src/colour.hh4
-rw-r--r--src/install.cc4
-rw-r--r--src/list.cc8
-rw-r--r--src/paludis.cc8
-rw-r--r--src/qualudis/qualudis.cc4
-rw-r--r--src/query.cc8
-rw-r--r--test/test_fail_TEST.cc2
-rw-r--r--test/test_framework.cc4
-rw-r--r--test/test_framework.hh6
-rw-r--r--test/test_pass_TEST.cc2
-rw-r--r--test/test_runner.cc2
134 files changed, 247 insertions, 247 deletions
diff --git a/paludis/args/args_dumper.hh b/paludis/args/args_dumper.hh
index 1db182abb..2f26ebfac 100644
--- a/paludis/args/args_dumper.hh
+++ b/paludis/args/args_dumper.hh
@@ -21,9 +21,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_ARGS_ARGS_DUMPER_HH
#define PALUDIS_GUARD_PALUDIS_ARGS_ARGS_DUMPER_HH 1
-#include <paludis/util/visitor.hh>
-#include <paludis/args/args_visitor.hh>
#include <ostream>
+#include <paludis/args/args_visitor.hh>
+#include <paludis/util/visitor.hh>
namespace paludis
{
diff --git a/paludis/args/args_group.hh b/paludis/args/args_group.hh
index 7f4f5b7ae..4444c4013 100644
--- a/paludis/args/args_group.hh
+++ b/paludis/args/args_group.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_ARGS_ARGS_GROUP_HH
#define PALUDIS_GUARD_ARGS_ARGS_GROUP_HH 1
-#include <paludis/args/args_option.hh>
#include <list>
+#include <paludis/args/args_option.hh>
#include <string>
/** \file
diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc
index 4e9cf7742..45b9c2fd5 100644
--- a/paludis/args/args_handler.cc
+++ b/paludis/args/args_handler.cc
@@ -19,8 +19,8 @@
#include "args.hh"
#include "args_dumper.hh"
-#include <paludis/util/system.hh>
#include <algorithm>
+#include <paludis/util/system.hh>
/** \file
* Implementation for ArgsHandler.
diff --git a/paludis/args/args_handler.hh b/paludis/args/args_handler.hh
index cce3a7a8b..ae8b56c85 100644
--- a/paludis/args/args_handler.hh
+++ b/paludis/args/args_handler.hh
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_ARGS_ARGS_HANDLER_HH
#define PALUDIS_GUARD_ARGS_ARGS_HANDLER_HH 1
+#include <map>
+#include <ostream>
#include <paludis/args/args_group.hh>
#include <paludis/util/instantiation_policy.hh>
#include <string>
-#include <ostream>
-#include <map>
/** \file
* Declaration for ArgsHandler.
diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh
index ff3cb7430..6f48e4ec4 100644
--- a/paludis/args/args_option.hh
+++ b/paludis/args/args_option.hh
@@ -22,8 +22,8 @@
#define PALUDIS_GUARD_ARGS_ARGS_OPTION_HH 1
#include <paludis/args/args_visitor.hh>
-#include <string>
#include <set>
+#include <string>
#include <vector>
/** \file
diff --git a/paludis/args/args_visitor.cc b/paludis/args/args_visitor.cc
index fcbd241f2..3b6581a2f 100644
--- a/paludis/args/args_visitor.cc
+++ b/paludis/args/args_visitor.cc
@@ -16,10 +16,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/visitor.hh>
#include "args_option.hh"
#include "bad_value.hh"
#include "missing_value.hh"
+#include <paludis/util/visitor.hh>
#include <paludis/util/destringify.hh>
diff --git a/paludis/args/args_visitor.hh b/paludis/args/args_visitor.hh
index 155d7c10f..0fcec003c 100644
--- a/paludis/args/args_visitor.hh
+++ b/paludis/args/args_visitor.hh
@@ -22,8 +22,8 @@
#define PALUDIS_GUARD_ARGS_ARGS_VISITOR_HH 1
#include <list>
-#include <string>
#include <paludis/util/visitor.hh>
+#include <string>
/** \file
* Declaration for ArgsVisitor
diff --git a/paludis/category_name_part.hh b/paludis/category_name_part.hh
index 0dfc348c2..86f845c3b 100644
--- a/paludis/category_name_part.hh
+++ b/paludis/category_name_part.hh
@@ -20,10 +20,10 @@
#ifndef PALUDIS_GUARD_PALUDIS_CATEGORY_NAME_PART_HH
#define PALUDIS_GUARD_PALUDIS_CATEGORY_NAME_PART_HH 1
-#include <paludis/util/validated.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/sorted_collection.hh>
+#include <paludis/util/validated.hh>
#include <string>
/** \file
diff --git a/paludis/category_name_part_TEST.cc b/paludis/category_name_part_TEST.cc
index a26f7a70a..1e0f50b7e 100644
--- a/paludis/category_name_part_TEST.cc
+++ b/paludis/category_name_part_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/category_name_part.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/config_file.cc b/paludis/config_file.cc
index f915614c6..58623ad5f 100644
--- a/paludis/config_file.cc
+++ b/paludis/config_file.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <fstream>
#include <paludis/config_file.hh>
-#include <paludis/util/strip.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/stringify.hh>
-#include <fstream>
+#include <paludis/util/strip.hh>
using namespace paludis;
diff --git a/paludis/config_file.hh b/paludis/config_file.hh
index aeb617e3c..a8da47f49 100644
--- a/paludis/config_file.hh
+++ b/paludis/config_file.hh
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_PALUDIS_CONFIG_FILE_HH
#define PALUDIS_GUARD_PALUDIS_CONFIG_FILE_HH 1
-#include <paludis/util/instantiation_policy.hh>
-#include <paludis/util/exception.hh>
#include <istream>
#include <list>
#include <map>
+#include <paludis/util/exception.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <string>
/** \file
diff --git a/paludis/config_file_TEST.cc b/paludis/config_file_TEST.cc
index e1ce1fda7..8e972c11a 100644
--- a/paludis/config_file_TEST.cc
+++ b/paludis/config_file_TEST.cc
@@ -17,12 +17,12 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/stringify.hh>
#include <paludis/config_file.hh>
#include <paludis/util/fs_entry.hh>
+#include <paludis/util/stringify.hh>
+#include <sstream>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <sstream>
#include <vector>
using namespace test;
diff --git a/paludis/default_config.cc b/paludis/default_config.cc
index 931b16a23..3ebc3791a 100644
--- a/paludis/default_config.cc
+++ b/paludis/default_config.cc
@@ -24,10 +24,10 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/filter_insert_iterator.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/system.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/iterator_utilities.hh>
#include <paludis/util/stringify.hh>
+#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
#include <fstream>
diff --git a/paludis/default_config.hh b/paludis/default_config.hh
index be619a370..3d79c5d30 100644
--- a/paludis/default_config.hh
+++ b/paludis/default_config.hh
@@ -20,16 +20,16 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEFAULT_CONFIG_HH
#define PALUDIS_GUARD_PALUDIS_DEFAULT_CONFIG_HH 1
+#include <paludis/dep_atom.hh>
+#include <paludis/keyword_name.hh>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/use_flag_name.hh>
+#include <paludis/use_flag_state.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/indirect_iterator.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/keyword_name.hh>
-#include <paludis/dep_atom.hh>
-#include <paludis/qualified_package_name.hh>
#include <paludis/util/smart_record.hh>
-#include <paludis/use_flag_name.hh>
-#include <paludis/use_flag_state.hh>
#include <map>
#include <vector>
diff --git a/paludis/default_environment.cc b/paludis/default_environment.cc
index 6bab4fb78..4c5a3d442 100644
--- a/paludis/default_environment.cc
+++ b/paludis/default_environment.cc
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <list>
+#include <paludis/default_config.hh>
#include <paludis/default_environment.hh>
+#include <paludis/match_package.hh>
#include <paludis/package_database.hh>
#include <paludis/repository.hh>
-#include <paludis/default_config.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/match_package.hh>
-#include <list>
#include <vector>
using namespace paludis;
diff --git a/paludis/default_environment.hh b/paludis/default_environment.hh
index daa6be508..cf94004c1 100644
--- a/paludis/default_environment.hh
+++ b/paludis/default_environment.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEFAULT_ENVIRONMENT_HH
#define PALUDIS_GUARD_PALUDIS_DEFAULT_ENVIRONMENT_HH 1
-#include <paludis/qa/environment.hh>
#include <paludis/package_database.hh>
+#include <paludis/qa/environment.hh>
/** \file
* Declarations for the DefaultEnvironment class.
diff --git a/paludis/dep_atom.hh b/paludis/dep_atom.hh
index bc1d39c3d..eeea0b788 100644
--- a/paludis/dep_atom.hh
+++ b/paludis/dep_atom.hh
@@ -20,17 +20,17 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_ATOM_HH
#define PALUDIS_GUARD_PALUDIS_DEP_ATOM_HH 1
+#include <list>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/slot_name.hh>
+#include <paludis/use_flag_name.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/composite_pattern.hh>
#include <paludis/util/counted_ptr.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/qualified_package_name.hh>
-#include <paludis/slot_name.hh>
-#include <paludis/use_flag_name.hh>
+#include <paludis/util/visitor.hh>
#include <paludis/version_operator.hh>
#include <paludis/version_spec.hh>
-#include <paludis/util/visitor.hh>
-#include <list>
/** \file
* Declarations for the DepAtom classes.
diff --git a/paludis/dep_atom_dumper.cc b/paludis/dep_atom_dumper.cc
index 51d675376..c682c77dc 100644
--- a/paludis/dep_atom_dumper.cc
+++ b/paludis/dep_atom_dumper.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/dep_atom.hh>
#include <paludis/dep_atom_dumper.hh>
-#include <algorithm>
using namespace paludis;
diff --git a/paludis/dep_atom_dumper.hh b/paludis/dep_atom_dumper.hh
index 05cc81a46..b97039142 100644
--- a/paludis/dep_atom_dumper.hh
+++ b/paludis/dep_atom_dumper.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_ATOM_DUMPER_HH
#define PALUDIS_GUARD_PALUDIS_DEP_ATOM_DUMPER_HH 1
-#include <paludis/util/instantiation_policy.hh>
#include <ostream>
+#include <paludis/util/instantiation_policy.hh>
/** \file
* Declarations for the DepAtomDumper class.
diff --git a/paludis/dep_atom_dumper_TEST.cc b/paludis/dep_atom_dumper_TEST.cc
index 0f5547698..919ceb1b7 100644
--- a/paludis/dep_atom_dumper_TEST.cc
+++ b/paludis/dep_atom_dumper_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_atom_dumper.hh>
#include <sstream>
+#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace test;
using namespace paludis;
diff --git a/paludis/dep_atom_flattener.cc b/paludis/dep_atom_flattener.cc
index 7565428b9..e826b931d 100644
--- a/paludis/dep_atom_flattener.cc
+++ b/paludis/dep_atom_flattener.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/dep_atom_flattener.hh>
#include <paludis/dep_atom.hh>
+#include <paludis/dep_atom_flattener.hh>
using namespace paludis;
diff --git a/paludis/dep_atom_flattener.hh b/paludis/dep_atom_flattener.hh
index 000d27bf1..e90a34094 100644
--- a/paludis/dep_atom_flattener.hh
+++ b/paludis/dep_atom_flattener.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_ATOM_FLATTENER_HH
#define PALUDIS_GUARD_PALUDIS_DEP_ATOM_FLATTENER_HH 1
-#include <paludis/util/attributes.hh>
+#include <list>
#include <paludis/dep_atom.hh>
+#include <paludis/package_database.hh>
#include <paludis/qa/environment.hh>
+#include <paludis/util/attributes.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/package_database.hh>
-#include <list>
namespace paludis
{
diff --git a/paludis/dep_atom_pretty_printer.cc b/paludis/dep_atom_pretty_printer.cc
index 23e461994..279f126fd 100644
--- a/paludis/dep_atom_pretty_printer.cc
+++ b/paludis/dep_atom_pretty_printer.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/dep_atom_pretty_printer.hh>
+#include <algorithm>
#include <paludis/dep_atom.hh>
+#include <paludis/dep_atom_pretty_printer.hh>
#include <paludis/util/save.hh>
-#include <algorithm>
using namespace paludis;
diff --git a/paludis/dep_atom_pretty_printer.hh b/paludis/dep_atom_pretty_printer.hh
index b9402c40b..da80624d7 100644
--- a/paludis/dep_atom_pretty_printer.hh
+++ b/paludis/dep_atom_pretty_printer.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_ATOM_PRETTY_PRINTER_HH
#define PALUDIS_GUARD_PALUDIS_DEP_ATOM_PRETTY_PRINTER_HH 1
-#include <paludis/dep_atom.hh>
#include <ostream>
+#include <paludis/dep_atom.hh>
#include <sstream>
namespace paludis
diff --git a/paludis/dep_lexer.hh b/paludis/dep_lexer.hh
index 7c70fa045..69306dc92 100644
--- a/paludis/dep_lexer.hh
+++ b/paludis/dep_lexer.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_PARSER_LEXER_HH
#define PALUDIS_GUARD_PALUDIS_DEP_PARSER_LEXER_HH 1
-#include <paludis/util/instantiation_policy.hh>
-#include <paludis/util/exception.hh>
#include <list>
+#include <paludis/util/exception.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <string>
/** \file
diff --git a/paludis/dep_lexer_TEST.cc b/paludis/dep_lexer_TEST.cc
index c130f9f5c..7cb220b38 100644
--- a/paludis/dep_lexer_TEST.cc
+++ b/paludis/dep_lexer_TEST.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
#include <paludis/dep_lexer.hh>
#include <sstream>
+#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace test;
using namespace paludis;
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index ea9c1790d..b17bce1e5 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -17,17 +17,17 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/container_entry.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_atom_flattener.hh>
#include <paludis/dep_list.hh>
#include <paludis/dep_parser.hh>
+#include <paludis/match_package.hh>
+#include <paludis/util/container_entry.hh>
#include <paludis/util/filter_insert_iterator.hh>
#include <paludis/util/indirect_iterator.hh>
#include <paludis/util/iterator_utilities.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
-#include <paludis/match_package.hh>
#include <paludis/util/save.hh>
#include <paludis/util/stringify.hh>
diff --git a/paludis/dep_list.hh b/paludis/dep_list.hh
index e626ed6e6..839581520 100644
--- a/paludis/dep_list.hh
+++ b/paludis/dep_list.hh
@@ -20,20 +20,20 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_LIST_HH
#define PALUDIS_GUARD_PALUDIS_DEP_LIST_HH 1
+#include <algorithm>
+#include <deque>
+#include <iterator>
+#include <list>
+#include <ostream>
#include <paludis/dep_atom.hh>
#include <paludis/qa/environment.hh>
-#include <paludis/util/instantiation_policy.hh>
-#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/qualified_package_name.hh>
#include <paludis/repository_name.hh>
#include <paludis/slot_name.hh>
+#include <paludis/util/instantiation_policy.hh>
+#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/smart_record.hh>
#include <paludis/version_spec.hh>
-#include <ostream>
-#include <list>
-#include <deque>
-#include <iterator>
-#include <algorithm>
namespace paludis
{
diff --git a/paludis/dep_list_TEST.cc b/paludis/dep_list_TEST.cc
index f455856dd..f2dc47b81 100644
--- a/paludis/dep_list_TEST.cc
+++ b/paludis/dep_list_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <deque>
#include <paludis/paludis.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <deque>
-#include <string>
using namespace paludis;
using namespace test;
diff --git a/paludis/dep_parser.cc b/paludis/dep_parser.cc
index 256cbb8ce..3d92a347e 100644
--- a/paludis/dep_parser.cc
+++ b/paludis/dep_parser.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/exception.hh>
-#include <paludis/util/stringify.hh>
#include <paludis/dep_atom.hh>
-#include <paludis/dep_parser.hh>
#include <paludis/dep_lexer.hh>
+#include <paludis/dep_parser.hh>
+#include <paludis/util/exception.hh>
+#include <paludis/util/stringify.hh>
#include <stack>
using namespace paludis;
diff --git a/paludis/dep_parser.hh b/paludis/dep_parser.hh
index 85caa528a..79fded952 100644
--- a/paludis/dep_parser.hh
+++ b/paludis/dep_parser.hh
@@ -21,10 +21,10 @@
#define PALUDIS_GUARD_PALUDIS_DEP_PARSER_HH 1
#include <paludis/dep_atom.hh>
+#include <paludis/dep_lexer.hh>
#include <paludis/util/counted_ptr.hh>
-#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/exception.hh>
-#include <paludis/dep_lexer.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <string>
/** \file
diff --git a/paludis/dep_parser_TEST.cc b/paludis/dep_parser_TEST.cc
index 4466dba4d..082e70366 100644
--- a/paludis/dep_parser_TEST.cc
+++ b/paludis/dep_parser_TEST.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
#include <paludis/paludis.hh>
#include <sstream>
+#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace test;
using namespace paludis;
diff --git a/paludis/environment.hh b/paludis/environment.hh
index b7d7b7190..cf055796d 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENT_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENT_HH 1
+#include <paludis/keyword_name.hh>
+#include <paludis/mask_reasons.hh>
#include <paludis/package_database.hh>
#include <paludis/use_flag_name.hh>
-#include <paludis/keyword_name.hh>
-#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/counted_ptr.hh>
-#include <paludis/mask_reasons.hh>
+#include <paludis/util/instantiation_policy.hh>
/** \file
* Declarations for the Environment class.
diff --git a/paludis/fake_repository.cc b/paludis/fake_repository.cc
index 70a48d15d..d203894b9 100644
--- a/paludis/fake_repository.cc
+++ b/paludis/fake_repository.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <map>
#include <paludis/fake_repository.hh>
-#include <paludis/version_metadata.hh>
#include <paludis/util/stringify.hh>
-#include <map>
+#include <paludis/version_metadata.hh>
using namespace paludis;
diff --git a/paludis/match_package.hh b/paludis/match_package.hh
index da708beeb..f1ca1b94b 100644
--- a/paludis/match_package.hh
+++ b/paludis/match_package.hh
@@ -11,10 +11,10 @@
* possible.
*/
-#include <paludis/util/attributes.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_list.hh>
#include <paludis/package_database.hh>
+#include <paludis/util/attributes.hh>
namespace paludis
{
diff --git a/paludis/match_sequence.hh b/paludis/match_sequence.hh
index d6f02e3bc..df2bd67b1 100644
--- a/paludis/match_sequence.hh
+++ b/paludis/match_sequence.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_MATCH_SEQUENCE_HH
#define PALUDIS_GUARD_PALUDIS_MATCH_SEQUENCE_HH 1
-#include <string>
#include <paludis/util/counted_ptr.hh>
+#include <string>
namespace paludis
{
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index f22b853d6..cddbe5512 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -18,10 +18,10 @@
*/
#include <paludis/dep_atom.hh>
+#include <paludis/match_package.hh>
#include <paludis/package_database.hh>
#include <paludis/util/indirect_iterator.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/match_package.hh>
#include <list>
#include <map>
diff --git a/paludis/package_database.hh b/paludis/package_database.hh
index 69ec702bb..230989f40 100644
--- a/paludis/package_database.hh
+++ b/paludis/package_database.hh
@@ -20,14 +20,14 @@
#ifndef PALUDIS_GUARD_PALUDIS_PACKAGE_DATABASE_HH
#define PALUDIS_GUARD_PALUDIS_PACKAGE_DATABASE_HH 1
-#include <paludis/util/counted_ptr.hh>
#include <paludis/dep_atom.hh>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/repository.hh>
+#include <paludis/util/counted_ptr.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/join.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/qualified_package_name.hh>
-#include <paludis/repository.hh>
#include <paludis/util/smart_record.hh>
#include <paludis/util/sorted_collection.hh>
#include <paludis/version_metadata.hh>
diff --git a/paludis/package_name_part.hh b/paludis/package_name_part.hh
index ff79d9257..575e62eda 100644
--- a/paludis/package_name_part.hh
+++ b/paludis/package_name_part.hh
@@ -20,10 +20,10 @@
#ifndef PALUDIS_GUARD_PALUDIS_PACKAGE_NAME_PART_HH
#define PALUDIS_GUARD_PALUDIS_PACKAGE_NAME_PART_HH 1
-#include <paludis/util/validated.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/sorted_collection.hh>
+#include <paludis/util/validated.hh>
#include <string>
/** \file
diff --git a/paludis/package_name_part_TEST.cc b/paludis/package_name_part_TEST.cc
index 80f2c1c11..094e6bea4 100644
--- a/paludis/package_name_part_TEST.cc
+++ b/paludis/package_name_part_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/package_name_part.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/portage_repository.hh b/paludis/portage_repository.hh
index ac3177f48..3b31b8b1b 100644
--- a/paludis/portage_repository.hh
+++ b/paludis/portage_repository.hh
@@ -20,10 +20,10 @@
#ifndef PALUDIS_GUARD_PALUDIS_PORTAGE_REPOSITORY_HH
#define PALUDIS_GUARD_PALUDIS_PORTAGE_REPOSITORY_HH 1
+#include <map>
#include <paludis/repository.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <map>
#include <string>
/** \file
diff --git a/paludis/qa/changelog_check.cc b/paludis/qa/changelog_check.cc
index e3a45ff1a..7cf930f78 100644
--- a/paludis/qa/changelog_check.cc
+++ b/paludis/qa/changelog_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <fstream>
#include <paludis/qa/changelog_check.hh>
#include <paludis/util/pstream.hh>
-#include <fstream>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/check_result.hh b/paludis/qa/check_result.hh
index c028e9035..ebbf6d517 100644
--- a/paludis/qa/check_result.hh
+++ b/paludis/qa/check_result.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_QA_CHECK_RESULT_HH
#define PALUDIS_GUARD_PALUDIS_QA_CHECK_RESULT_HH 1
-#include <paludis/util/fs_entry.hh>
-#include <paludis/qa/message.hh>
#include <list>
+#include <paludis/qa/message.hh>
+#include <paludis/util/fs_entry.hh>
/** \file
* Declarations for the CheckResult class.
diff --git a/paludis/qa/defaults_check.cc b/paludis/qa/defaults_check.cc
index 64e9717c9..b359b349d 100644
--- a/paludis/qa/defaults_check.cc
+++ b/paludis/qa/defaults_check.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/defaults_check.hh>
+#include <fstream>
#include <paludis/match_sequence.hh>
+#include <paludis/qa/defaults_check.hh>
#include <paludis/util/is_file_with_extension.hh>
-#include <fstream>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/defaults_check.hh b/paludis/qa/defaults_check.hh
index d2d55ec71..e209b060f 100644
--- a/paludis/qa/defaults_check.hh
+++ b/paludis/qa/defaults_check.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_QA_DEFAULTS_CHECK_HH
#define PALUDIS_GUARD_PALUDIS_QA_DEFAULTS_CHECK_HH 1
+#include <istream>
#include <paludis/qa/file_check.hh>
#include <string>
-#include <istream>
namespace paludis
{
diff --git a/paludis/qa/dep_flags_check.cc b/paludis/qa/dep_flags_check.cc
index 2f105c91e..e5dee1a56 100644
--- a/paludis/qa/dep_flags_check.cc
+++ b/paludis/qa/dep_flags_check.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/dep_flags_check.hh>
-#include <paludis/dep_parser.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_parser.hh>
+#include <paludis/dep_parser.hh>
+#include <paludis/qa/dep_flags_check.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/dep_packages_check.cc b/paludis/qa/dep_packages_check.cc
index 70756a217..539f0c817 100644
--- a/paludis/qa/dep_packages_check.cc
+++ b/paludis/qa/dep_packages_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/dep_packages_check.hh>
-#include <paludis/dep_parser.hh>
#include <paludis/dep_atom.hh>
+#include <paludis/dep_parser.hh>
+#include <paludis/qa/dep_packages_check.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/deps_exist_check.cc b/paludis/qa/deps_exist_check.cc
index b0780db63..b50a1f371 100644
--- a/paludis/qa/deps_exist_check.cc
+++ b/paludis/qa/deps_exist_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/deps_exist_check.hh>
-#include <paludis/dep_parser.hh>
#include <paludis/dep_atom.hh>
+#include <paludis/dep_parser.hh>
+#include <paludis/qa/deps_exist_check.hh>
#include <paludis/util/save.hh>
using namespace paludis;
diff --git a/paludis/qa/digest_collisions_check.cc b/paludis/qa/digest_collisions_check.cc
index 382319765..67351e845 100644
--- a/paludis/qa/digest_collisions_check.cc
+++ b/paludis/qa/digest_collisions_check.cc
@@ -17,14 +17,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <fstream>
+#include <map>
+#include <paludis/hashed_containers.hh>
#include <paludis/qa/digest_collisions_check.hh>
-#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/dir_iterator.hh>
+#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/smart_record.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/hashed_containers.hh>
-#include <map>
-#include <fstream>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/ebuild_check.hh b/paludis/qa/ebuild_check.hh
index 4cb3e3894..f055f9440 100644
--- a/paludis/qa/ebuild_check.hh
+++ b/paludis/qa/ebuild_check.hh
@@ -20,14 +20,14 @@
#ifndef PALUDIS_GUARD_PALUDIS_QA_EBUILD_CHECK_HH
#define PALUDIS_GUARD_PALUDIS_QA_EBUILD_CHECK_HH 1
-#include <paludis/util/counted_ptr.hh>
-#include <paludis/qualified_package_name.hh>
-#include <paludis/version_spec.hh>
-#include <paludis/util/virtual_constructor.hh>
-#include <paludis/util/smart_record.hh>
-#include <paludis/qa/environment.hh>
#include <paludis/qa/check.hh>
#include <paludis/qa/check_result.hh>
+#include <paludis/qa/environment.hh>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/util/counted_ptr.hh>
+#include <paludis/util/smart_record.hh>
+#include <paludis/util/virtual_constructor.hh>
+#include <paludis/version_spec.hh>
namespace paludis
{
diff --git a/paludis/qa/ebuild_count.cc b/paludis/qa/ebuild_count.cc
index be26ac6b7..0ac847e46 100644
--- a/paludis/qa/ebuild_count.cc
+++ b/paludis/qa/ebuild_count.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/qa/ebuild_count.hh>
-#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/dir_iterator.hh>
-#include <algorithm>
+#include <paludis/util/is_file_with_extension.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/environment.cc b/paludis/qa/environment.cc
index 353a949d7..27120e350 100644
--- a/paludis/qa/environment.cc
+++ b/paludis/qa/environment.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/environment.hh>
#include <map>
+#include <paludis/qa/environment.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/extract_check.cc b/paludis/qa/extract_check.cc
index 6bb6a0a88..ca8dc426e 100644
--- a/paludis/qa/extract_check.cc
+++ b/paludis/qa/extract_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/extract_check.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_parser.hh>
+#include <paludis/qa/extract_check.hh>
#include <paludis/util/tokeniser.hh>
using namespace paludis;
diff --git a/paludis/qa/file_check.hh b/paludis/qa/file_check.hh
index 39769f606..dde965a10 100644
--- a/paludis/qa/file_check.hh
+++ b/paludis/qa/file_check.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_QA_FILE_CHECK_HH
#define PALUDIS_GUARD_PALUDIS_QA_FILE_CHECK_HH 1
+#include <paludis/qa/check.hh>
+#include <paludis/qa/check_result.hh>
+#include <paludis/util/counted_ptr.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/counted_ptr.hh>
#include <paludis/util/virtual_constructor.hh>
-#include <paludis/qa/check.hh>
-#include <paludis/qa/check_result.hh>
/** \file
* Declarations for the FileCheck class.
diff --git a/paludis/qa/glep_31_check.cc b/paludis/qa/glep_31_check.cc
index 51439722f..a80137232 100644
--- a/paludis/qa/glep_31_check.cc
+++ b/paludis/qa/glep_31_check.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/glep_31_check.hh>
#include <fstream>
+#include <paludis/qa/glep_31_check.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/glep_31_check.hh b/paludis/qa/glep_31_check.hh
index 799ae2652..e263783fe 100644
--- a/paludis/qa/glep_31_check.hh
+++ b/paludis/qa/glep_31_check.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_QA_GLEP_31_CHECK_HH
#define PALUDIS_GUARD_PALUDIS_QA_GLEP_31_CHECK_HH 1
+#include <istream>
#include <paludis/qa/file_check.hh>
#include <string>
-#include <istream>
namespace paludis
{
diff --git a/paludis/qa/glep_31_check_TEST.cc b/paludis/qa/glep_31_check_TEST.cc
index 07ac1cf6b..0c8e294ff 100644
--- a/paludis/qa/glep_31_check_TEST.cc
+++ b/paludis/qa/glep_31_check_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/qa/glep_31_check.hh>
+#include <sstream>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <sstream>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/has_ebuilds_check.cc b/paludis/qa/has_ebuilds_check.cc
index e4982cba4..d47f7d56a 100644
--- a/paludis/qa/has_ebuilds_check.cc
+++ b/paludis/qa/has_ebuilds_check.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/qa/has_ebuilds_check.hh>
-#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/dir_iterator.hh>
-#include <algorithm>
+#include <paludis/util/is_file_with_extension.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/has_misc_files_check.cc b/paludis/qa/has_misc_files_check.cc
index ef5106ff8..744aeea98 100644
--- a/paludis/qa/has_misc_files_check.cc
+++ b/paludis/qa/has_misc_files_check.cc
@@ -18,8 +18,8 @@
*/
#include <paludis/qa/has_misc_files_check.hh>
-#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/dir_iterator.hh>
+#include <paludis/util/is_file_with_extension.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/inherits_check.cc b/paludis/qa/inherits_check.cc
index b8148dd9e..f0b0d6bf2 100644
--- a/paludis/qa/inherits_check.cc
+++ b/paludis/qa/inherits_check.cc
@@ -17,12 +17,12 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
+#include <iterator>
#include <paludis/qa/inherits_check.hh>
-#include <paludis/util/tokeniser.hh>
#include <paludis/util/join.hh>
+#include <paludis/util/tokeniser.hh>
#include <set>
-#include <algorithm>
-#include <iterator>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/license_check.cc b/paludis/qa/license_check.cc
index eb8c90770..8f3c84703 100644
--- a/paludis/qa/license_check.cc
+++ b/paludis/qa/license_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/license_check.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_parser.hh>
+#include <paludis/qa/license_check.hh>
#include <paludis/util/tokeniser.hh>
using namespace paludis;
diff --git a/paludis/qa/metadata_check.cc b/paludis/qa/metadata_check.cc
index 97ad21345..c3beb470b 100644
--- a/paludis/qa/metadata_check.cc
+++ b/paludis/qa/metadata_check.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <ctime>
+#include <fstream>
#include <paludis/qa/metadata_check.hh>
#include <paludis/util/pstream.hh>
#include <paludis/util/system.hh>
-#include <ctime>
-#include <fstream>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/package_dir_check.hh b/paludis/qa/package_dir_check.hh
index 659475efe..def223308 100644
--- a/paludis/qa/package_dir_check.hh
+++ b/paludis/qa/package_dir_check.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_QA_PACKAGE_DIR_CHECK_HH
#define PALUDIS_GUARD_PALUDIS_QA_PACKAGE_DIR_CHECK_HH 1
+#include <paludis/qa/check.hh>
+#include <paludis/qa/check_result.hh>
+#include <paludis/util/counted_ptr.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/counted_ptr.hh>
#include <paludis/util/virtual_constructor.hh>
-#include <paludis/qa/check.hh>
-#include <paludis/qa/check_result.hh>
/** \file
* Declarations for the PackageDirCheck class.
diff --git a/paludis/qa/parse_deps_check.cc b/paludis/qa/parse_deps_check.cc
index c9243444a..dd705dd84 100644
--- a/paludis/qa/parse_deps_check.cc
+++ b/paludis/qa/parse_deps_check.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/parse_deps_check.hh>
#include <paludis/dep_parser.hh>
+#include <paludis/qa/parse_deps_check.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/pdepend_overlap_check.cc b/paludis/qa/pdepend_overlap_check.cc
index 54bd99b4a..76f1465f8 100644
--- a/paludis/qa/pdepend_overlap_check.cc
+++ b/paludis/qa/pdepend_overlap_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/pdepend_overlap_check.hh>
-#include <paludis/dep_parser.hh>
#include <paludis/dep_atom.hh>
+#include <paludis/dep_parser.hh>
+#include <paludis/qa/pdepend_overlap_check.hh>
#include <paludis/util/join.hh>
using namespace paludis;
diff --git a/paludis/qa/restrict_check.cc b/paludis/qa/restrict_check.cc
index efd9988f8..7e4bb22c8 100644
--- a/paludis/qa/restrict_check.cc
+++ b/paludis/qa/restrict_check.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
+#include <iterator>
#include <paludis/qa/restrict_check.hh>
#include <paludis/util/tokeniser.hh>
-#include <algorithm>
#include <set>
-#include <iterator>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qa/src_uri_check.cc b/paludis/qa/src_uri_check.cc
index 724ab513a..5c4283aad 100644
--- a/paludis/qa/src_uri_check.cc
+++ b/paludis/qa/src_uri_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/qa/src_uri_check.hh>
#include <paludis/dep_atom.hh>
#include <paludis/dep_parser.hh>
+#include <paludis/qa/src_uri_check.hh>
#include <paludis/util/tokeniser.hh>
using namespace paludis;
diff --git a/paludis/qa/whitespace_check.cc b/paludis/qa/whitespace_check.cc
index 421f7b709..52a435e68 100644
--- a/paludis/qa/whitespace_check.cc
+++ b/paludis/qa/whitespace_check.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <fstream>
#include <paludis/qa/whitespace_check.hh>
#include <paludis/util/is_file_with_extension.hh>
-#include <fstream>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/qualified_package_name.hh b/paludis/qualified_package_name.hh
index 174534ca7..7b601eac8 100644
--- a/paludis/qualified_package_name.hh
+++ b/paludis/qualified_package_name.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_QUALIFIED_PACKAGE_NAME_HH
#define PALUDIS_GUARD_PALUDIS_QUALIFIED_PACKAGE_NAME_HH 1
-#include <paludis/package_name_part.hh>
+#include <ostream>
#include <paludis/category_name_part.hh>
+#include <paludis/package_name_part.hh>
+#include <paludis/util/exception.hh>
#include <paludis/util/smart_record.hh>
#include <paludis/util/sorted_collection.hh>
-#include <paludis/util/exception.hh>
-#include <ostream>
namespace paludis
{
diff --git a/paludis/qualified_package_name_TEST.cc b/paludis/qualified_package_name_TEST.cc
index 23ea440c7..e2111d97d 100644
--- a/paludis/qualified_package_name_TEST.cc
+++ b/paludis/qualified_package_name_TEST.cc
@@ -19,8 +19,8 @@
#include <paludis/qualified_package_name.hh>
#include <paludis/util/exception.hh>
-#include <test/test_runner.hh>
#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace test;
using namespace paludis;
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 127e4f68d..1840bc9fe 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -20,16 +20,16 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORY_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORY_HH 1
-#include <paludis/util/attributes.hh>
#include <paludis/category_name_part.hh>
-#include <paludis/util/counted_ptr.hh>
-#include <paludis/util/exception.hh>
#include <paludis/package_name_part.hh>
#include <paludis/repository_name.hh>
#include <paludis/use_flag_state.hh>
+#include <paludis/util/attributes.hh>
+#include <paludis/util/counted_ptr.hh>
+#include <paludis/util/exception.hh>
+#include <paludis/util/virtual_constructor.hh>
#include <paludis/version_metadata.hh>
#include <paludis/version_spec.hh>
-#include <paludis/util/virtual_constructor.hh>
#include <map>
#include <string>
diff --git a/paludis/slot_name.hh b/paludis/slot_name.hh
index ce69513b9..e2cbd5123 100644
--- a/paludis/slot_name.hh
+++ b/paludis/slot_name.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_SLOT_NAME_HH
#define PALUDIS_GUARD_PALUDIS_SLOT_NAME_HH 1
-#include <paludis/util/validated.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
+#include <paludis/util/validated.hh>
#include <string>
/** \file
diff --git a/paludis/test_extras.cc b/paludis/test_extras.cc
index 357731279..ede11e376 100644
--- a/paludis/test_extras.cc
+++ b/paludis/test_extras.cc
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <test/test_framework.hh>
-#include <paludis/util/stringify.hh>
-#include <paludis/util/exception.hh>
+#include <exception>
#include <paludis/util/attributes.hh>
+#include <paludis/util/exception.hh>
#include <paludis/util/log.hh>
-#include <exception>
+#include <paludis/util/stringify.hh>
#include <sstream>
+#include <test/test_framework.hh>
using namespace paludis;
diff --git a/paludis/use_flag_name.hh b/paludis/use_flag_name.hh
index 6f6cf3599..4092af2dc 100644
--- a/paludis/use_flag_name.hh
+++ b/paludis/use_flag_name.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_USE_FLAG_NAME_HH
#define PALUDIS_GUARD_PALUDIS_USE_FLAG_NAME_HH 1
-#include <paludis/util/validated.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
+#include <paludis/util/validated.hh>
#include <string>
/** \file
diff --git a/paludis/util/container_entry_TEST.cc b/paludis/util/container_entry_TEST.cc
index 19be4aa26..03fe12f74 100644
--- a/paludis/util/container_entry_TEST.cc
+++ b/paludis/util/container_entry_TEST.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
+#include <paludis/util/container_entry.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <paludis/util/container_entry.hh>
-#include <algorithm>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/counted_ptr_TEST.cc b/paludis/util/counted_ptr_TEST.cc
index acdca8177..c52043e86 100644
--- a/paludis/util/counted_ptr_TEST.cc
+++ b/paludis/util/counted_ptr_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/counted_ptr.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/create_insert_iterator_TEST.cc b/paludis/util/create_insert_iterator_TEST.cc
index c7c47adec..614ac045d 100644
--- a/paludis/util/create_insert_iterator_TEST.cc
+++ b/paludis/util/create_insert_iterator_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/util/create_insert_iterator.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <algorithm>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/deleter_TEST.cc b/paludis/util/deleter_TEST.cc
index 4f4568c1c..12b6762d1 100644
--- a/paludis/util/deleter_TEST.cc
+++ b/paludis/util/deleter_TEST.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/util/deleter.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <algorithm>
#include <vector>
using namespace test;
diff --git a/paludis/util/destringify.hh b/paludis/util/destringify.hh
index 5c3f32712..2eb13796e 100644
--- a/paludis/util/destringify.hh
+++ b/paludis/util/destringify.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_DESTRINGIFY_HH
#define PALUDIS_GUARD_PALUDIS_DESTRINGIFY_HH 1
-#include <string>
-#include <sstream>
#include <paludis/util/exception.hh>
+#include <sstream>
+#include <string>
/** \file
* Destringify functions.
diff --git a/paludis/util/destringify_TEST.cc b/paludis/util/destringify_TEST.cc
index 24e357bfd..945ab229c 100644
--- a/paludis/util/destringify_TEST.cc
+++ b/paludis/util/destringify_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/destringify.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/dir_iterator.cc b/paludis/util/dir_iterator.cc
index 8d7fee83a..e651c79a3 100644
--- a/paludis/util/dir_iterator.cc
+++ b/paludis/util/dir_iterator.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <dirent.h>
+#include <errno.h>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/stringify.hh>
#include <sys/types.h>
-#include <dirent.h>
-#include <errno.h>
/** \file
* Implementation of paludis::DirIterator.
diff --git a/paludis/util/dir_iterator.hh b/paludis/util/dir_iterator.hh
index 627120e59..08d16e276 100644
--- a/paludis/util/dir_iterator.hh
+++ b/paludis/util/dir_iterator.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_DIR_ITERATOR_HH
#define PALUDIS_GUARD_PALUDIS_DIR_ITERATOR_HH 1
-#include <paludis/util/fs_entry.hh>
-#include <paludis/util/counted_ptr.hh>
#include <iterator>
+#include <paludis/util/counted_ptr.hh>
+#include <paludis/util/fs_entry.hh>
#include <set>
/** \file
diff --git a/paludis/util/filter_insert_iterator_TEST.cc b/paludis/util/filter_insert_iterator_TEST.cc
index ba7ea98bc..cbc62bbf6 100644
--- a/paludis/util/filter_insert_iterator_TEST.cc
+++ b/paludis/util/filter_insert_iterator_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/util/filter_insert_iterator.hh>
+#include <set>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <set>
-#include <algorithm>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/fs_entry.cc b/paludis/util/fs_entry.cc
index f959b4b67..7278632b6 100644
--- a/paludis/util/fs_entry.cc
+++ b/paludis/util/fs_entry.cc
@@ -18,8 +18,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/fs_entry.hh>
#include <paludis/util/exception.hh>
+#include <paludis/util/fs_entry.hh>
#include <paludis/util/stringify.hh>
#include <sys/stat.h>
diff --git a/paludis/util/fs_entry.hh b/paludis/util/fs_entry.hh
index 936df8786..a746d746d 100644
--- a/paludis/util/fs_entry.hh
+++ b/paludis/util/fs_entry.hh
@@ -21,11 +21,11 @@
#ifndef PALUDIS_GUARD_PALUDIS_FS_ENTRY_HH
#define PALUDIS_GUARD_PALUDIS_FS_ENTRY_HH 1
-#include <string>
#include <ostream>
#include <paludis/util/comparison_policy.hh>
-#include <paludis/util/exception.hh>
#include <paludis/util/counted_ptr.hh>
+#include <paludis/util/exception.hh>
+#include <string>
#include <sys/stat.h>
/** \file
diff --git a/paludis/util/fs_entry_TEST.cc b/paludis/util/fs_entry_TEST.cc
index a04a20cf7..da81fa29a 100644
--- a/paludis/util/fs_entry_TEST.cc
+++ b/paludis/util/fs_entry_TEST.cc
@@ -18,10 +18,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <ctime>
#include <paludis/util/fs_entry.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <ctime>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/indirect_iterator.hh b/paludis/util/indirect_iterator.hh
index a57aec49f..affe8b6c4 100644
--- a/paludis/util/indirect_iterator.hh
+++ b/paludis/util/indirect_iterator.hh
@@ -21,8 +21,8 @@
#define PALUDIS_GUARD_PALUDIS_INDIRECT_ITERATOR_HH 1
#include <iterator>
-#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/comparison_policy.hh>
+#include <paludis/util/instantiation_policy.hh>
namespace paludis
{
diff --git a/paludis/util/indirect_iterator_TEST.cc b/paludis/util/indirect_iterator_TEST.cc
index c0e4b661c..3e983bb3e 100644
--- a/paludis/util/indirect_iterator_TEST.cc
+++ b/paludis/util/indirect_iterator_TEST.cc
@@ -17,14 +17,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/indirect_iterator.hh>
+#include <algorithm>
+#include <list>
#include <paludis/util/counted_ptr.hh>
#include <paludis/util/deleter.hh>
+#include <paludis/util/indirect_iterator.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <list>
-#include <algorithm>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/instantiation_policy_TEST.cc b/paludis/util/instantiation_policy_TEST.cc
index 23211748f..f57ab99da 100644
--- a/paludis/util/instantiation_policy_TEST.cc
+++ b/paludis/util/instantiation_policy_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/instantiation_policy.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/is_const_TEST.cc b/paludis/util/is_const_TEST.cc
index 40e67ca69..f528c9fa3 100644
--- a/paludis/util/is_const_TEST.cc
+++ b/paludis/util/is_const_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/is_const.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/is_file_with_extension.hh b/paludis/util/is_file_with_extension.hh
index e850d54bc..2d231f1ef 100644
--- a/paludis/util/is_file_with_extension.hh
+++ b/paludis/util/is_file_with_extension.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_IS_FILE_WITH_EXTENSION_HH
#define PALUDIS_GUARD_PALUDIS_IS_FILE_WITH_EXTENSION_HH 1
+#include <functional>
#include <paludis/util/fs_entry.hh>
#include <string>
-#include <functional>
/** \file
* Declarations for the IsFileWithExtension class.
diff --git a/paludis/util/is_file_with_extension_TEST.cc b/paludis/util/is_file_with_extension_TEST.cc
index 44956cff3..e1c0496c1 100644
--- a/paludis/util/is_file_with_extension_TEST.cc
+++ b/paludis/util/is_file_with_extension_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/util/is_file_with_extension.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <algorithm>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/iterator_utilities_TEST.cc b/paludis/util/iterator_utilities_TEST.cc
index 6752bb3d2..d3b12ecbc 100644
--- a/paludis/util/iterator_utilities_TEST.cc
+++ b/paludis/util/iterator_utilities_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/iterator_utilities.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
#include <vector>
using namespace test;
diff --git a/paludis/util/join.hh b/paludis/util/join.hh
index 4faec1ea2..56393f717 100644
--- a/paludis/util/join.hh
+++ b/paludis/util/join.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_JOIN_HH
#define PALUDIS_GUARD_PALUDIS_JOIN_HH 1
-#include <string>
#include <paludis/util/stringify.hh>
+#include <string>
namespace paludis
{
diff --git a/paludis/util/join_TEST.cc b/paludis/util/join_TEST.cc
index 245c99ae9..97f873101 100644
--- a/paludis/util/join_TEST.cc
+++ b/paludis/util/join_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <list>
#include <paludis/util/join.hh>
-#include <test/test_runner.hh>
#include <test/test_framework.hh>
+#include <test/test_runner.hh>
#include <vector>
-#include <list>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/log.cc b/paludis/util/log.cc
index f42c7f6ec..390b8130b 100644
--- a/paludis/util/log.cc
+++ b/paludis/util/log.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/log.hh>
#include <iostream>
+#include <paludis/util/log.hh>
using namespace paludis;
diff --git a/paludis/util/log.hh b/paludis/util/log.hh
index be1b24614..9bbfda11f 100644
--- a/paludis/util/log.hh
+++ b/paludis/util/log.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_LOG_HH
#define PALUDIS_GUARD_PALUDIS_LOG_HH 1
+#include <iosfwd>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <iosfwd>
namespace paludis
{
diff --git a/paludis/util/log_TEST.cc b/paludis/util/log_TEST.cc
index 491e5e6bb..4f1461632 100644
--- a/paludis/util/log_TEST.cc
+++ b/paludis/util/log_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/log.hh>
+#include <sstream>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <sstream>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/pstream.cc b/paludis/util/pstream.cc
index 9e075a9f2..131953034 100644
--- a/paludis/util/pstream.cc
+++ b/paludis/util/pstream.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/pstream.hh>
-#include <paludis/util/log.hh>
-#include <errno.h>
#include <cstring>
+#include <errno.h>
+#include <paludis/util/log.hh>
+#include <paludis/util/pstream.hh>
using namespace paludis;
diff --git a/paludis/util/pstream.hh b/paludis/util/pstream.hh
index 633b7f69b..93519af8b 100644
--- a/paludis/util/pstream.hh
+++ b/paludis/util/pstream.hh
@@ -20,13 +20,13 @@
#ifndef PALUDIS_GUARD_PALUDIS_PSTREAM_HH
#define PALUDIS_GUARD_PALUDIS_PSTREAM_HH 1
-#include <paludis/util/instantiation_policy.hh>
+#include <cstdio>
+#include <istream>
+#include <limits>
#include <paludis/util/exception.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <streambuf>
-#include <limits>
#include <string>
-#include <cstdio>
-#include <istream>
/** \file
* Declarations for the PStream and PStreamInBuf classes, and related
diff --git a/paludis/util/sequential_collection.hh b/paludis/util/sequential_collection.hh
index ae0153bd0..7f1db09a2 100644
--- a/paludis/util/sequential_collection.hh
+++ b/paludis/util/sequential_collection.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_SEQUENTIAL_COLLECTION_HH
#define PALUDIS_GUARD_PALUDIS_SEQUENTIAL_COLLECTION_HH 1
-#include <list>
#include <algorithm>
+#include <list>
#include <paludis/util/counted_ptr.hh>
#include <paludis/util/instantiation_policy.hh>
diff --git a/paludis/util/smart_record_TEST.cc b/paludis/util/smart_record_TEST.cc
index d6baa3f75..911621387 100644
--- a/paludis/util/smart_record_TEST.cc
+++ b/paludis/util/smart_record_TEST.cc
@@ -18,8 +18,8 @@
*/
#include <paludis/util/smart_record.hh>
-#include <test/test_runner.hh>
#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/sorted_collection.hh b/paludis/util/sorted_collection.hh
index 61a0b4e62..0b20ad591 100644
--- a/paludis/util/sorted_collection.hh
+++ b/paludis/util/sorted_collection.hh
@@ -20,10 +20,10 @@
#ifndef PALUDIS_GUARD_PALUDIS_SORTED_COLLECTION_HH
#define PALUDIS_GUARD_PALUDIS_SORTED_COLLECTION_HH 1
+#include <iterator>
#include <paludis/util/counted_ptr.hh>
#include <paludis/util/instantiation_policy.hh>
#include <set>
-#include <iterator>
namespace paludis
{
diff --git a/paludis/util/stringify.hh b/paludis/util/stringify.hh
index 7c0c7a280..bafcdd111 100644
--- a/paludis/util/stringify.hh
+++ b/paludis/util/stringify.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_STRINGIFY_HH
#define PALUDIS_GUARD_PALUDIS_STRINGIFY_HH 1
-#include <string>
#include <sstream>
+#include <string>
/** \file
* Stringify functions.
diff --git a/paludis/util/stringify_TEST.cc b/paludis/util/stringify_TEST.cc
index 23c2cf825..fe996ae09 100644
--- a/paludis/util/stringify_TEST.cc
+++ b/paludis/util/stringify_TEST.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/util/stringify.hh>
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/strip.cc b/paludis/util/strip.cc
index 62352a4b2..aa352fb09 100644
--- a/paludis/util/strip.cc
+++ b/paludis/util/strip.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/strip.hh>
#include <paludis/util/exception.hh>
+#include <paludis/util/strip.hh>
namespace paludis
{
diff --git a/paludis/util/strip.hh b/paludis/util/strip.hh
index 0ebfaf1d2..41c442347 100644
--- a/paludis/util/strip.hh
+++ b/paludis/util/strip.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_STRIP_HH
#define PALUDIS_GUARD_PALUDIS_STRIP_HH 1
-#include <string>
#include <functional>
+#include <string>
namespace paludis
{
diff --git a/paludis/util/strip_TEST.cc b/paludis/util/strip_TEST.cc
index 9a19170ca..19deefe88 100644
--- a/paludis/util/strip_TEST.cc
+++ b/paludis/util/strip_TEST.cc
@@ -18,11 +18,11 @@
*/
+#include <algorithm>
#include <paludis/util/strip.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <algorithm>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/system.cc b/paludis/util/system.cc
index 6ccea6ca5..4d4d0297a 100644
--- a/paludis/util/system.cc
+++ b/paludis/util/system.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <cstdlib>
#include <paludis/util/system.hh>
#include <sys/utsname.h>
-#include <cstdlib>
using namespace paludis;
diff --git a/paludis/util/test_extras.cc b/paludis/util/test_extras.cc
index 506094058..7155a1ea7 100644
--- a/paludis/util/test_extras.cc
+++ b/paludis/util/test_extras.cc
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <test/test_framework.hh>
-#include <paludis/util/stringify.hh>
-#include <paludis/util/exception.hh>
+#include <exception>
#include <paludis/util/attributes.hh>
+#include <paludis/util/exception.hh>
#include <paludis/util/log.hh>
-#include <exception>
+#include <paludis/util/stringify.hh>
#include <sstream>
+#include <test/test_framework.hh>
using namespace paludis;
diff --git a/paludis/util/tokeniser.hh b/paludis/util/tokeniser.hh
index 5223b23b0..e9c3541ae 100644
--- a/paludis/util/tokeniser.hh
+++ b/paludis/util/tokeniser.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_PALUDIS_TOKENISER_HH
#define PALUDIS_GUARD_PALUDIS_TOKENISER_HH 1
-#include <string>
#include <iterator>
#include <paludis/util/instantiation_policy.hh>
+#include <string>
/** \file
* Declarations for Tokeniser and related utilities.
diff --git a/paludis/util/tokeniser_TEST.cc b/paludis/util/tokeniser_TEST.cc
index 6f35803cb..0cf26f88c 100644
--- a/paludis/util/tokeniser_TEST.cc
+++ b/paludis/util/tokeniser_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <iterator>
#include <paludis/util/tokeniser.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <iterator>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/transform_insert_iterator_TEST.cc b/paludis/util/transform_insert_iterator_TEST.cc
index 4dc6c4e37..ace1bd20a 100644
--- a/paludis/util/transform_insert_iterator_TEST.cc
+++ b/paludis/util/transform_insert_iterator_TEST.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <algorithm>
#include <paludis/util/transform_insert_iterator.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <algorithm>
using namespace paludis;
using namespace test;
diff --git a/paludis/util/virtual_constructor_TEST.cc b/paludis/util/virtual_constructor_TEST.cc
index 9633d912c..ddbe1503a 100644
--- a/paludis/util/virtual_constructor_TEST.cc
+++ b/paludis/util/virtual_constructor_TEST.cc
@@ -1,10 +1,10 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-#include <paludis/util/virtual_constructor.hh>
#include <paludis/util/counted_ptr.hh>
-#include <test/test_runner.hh>
-#include <test/test_framework.hh>
+#include <paludis/util/virtual_constructor.hh>
#include <set>
+#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace test;
using namespace paludis;
diff --git a/paludis/util/visitor_TEST.cc b/paludis/util/visitor_TEST.cc
index 96d3e992b..386eb2fff 100644
--- a/paludis/util/visitor_TEST.cc
+++ b/paludis/util/visitor_TEST.cc
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/visitor.hh>
+#include <algorithm>
#include <paludis/util/deleter.hh>
#include <paludis/util/indirect_iterator.hh>
+#include <paludis/util/visitor.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <vector>
-#include <algorithm>
using namespace paludis;
using namespace test;
diff --git a/paludis/version_metadata.cc b/paludis/version_metadata.cc
index 08692bf53..01ea8ca86 100644
--- a/paludis/version_metadata.cc
+++ b/paludis/version_metadata.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/version_metadata.hh>
#include <paludis/util/create_insert_iterator.hh>
-#include <paludis/util/tokeniser.hh>
#include <paludis/util/create_insert_iterator.hh>
+#include <paludis/util/tokeniser.hh>
+#include <paludis/version_metadata.hh>
#include <vector>
using namespace paludis;
diff --git a/paludis/version_metadata.hh b/paludis/version_metadata.hh
index 5354f3129..ebf06d18a 100644
--- a/paludis/version_metadata.hh
+++ b/paludis/version_metadata.hh
@@ -20,14 +20,14 @@
#ifndef PALUDIS_GUARD_PALUDIS_VERSION_METADATA_HH
#define PALUDIS_GUARD_PALUDIS_VERSION_METADATA_HH 1
+#include <paludis/keyword_name.hh>
+#include <paludis/qualified_package_name.hh>
+#include <paludis/use_flag_name.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/version_metadata.hh>
-#include <paludis/use_flag_name.hh>
-#include <paludis/keyword_name.hh>
-#include <paludis/qualified_package_name.hh>
-#include <string>
#include <set>
+#include <string>
namespace paludis
{
diff --git a/paludis/version_operator.cc b/paludis/version_operator.cc
index 8fd64653e..39301ef7d 100644
--- a/paludis/version_operator.cc
+++ b/paludis/version_operator.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/version_operator.hh>
#include <paludis/util/stringify.hh>
+#include <paludis/version_operator.hh>
using namespace paludis;
diff --git a/paludis/version_operator.hh b/paludis/version_operator.hh
index 23075c714..670850bbc 100644
--- a/paludis/version_operator.hh
+++ b/paludis/version_operator.hh
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_PALUDIS_VERSION_OPERATOR_HH
#define PALUDIS_GUARD_PALUDIS_VERSION_OPERATOR_HH 1
+#include <ostream>
+#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/validated.hh>
#include <paludis/version_spec.hh>
-#include <paludis/util/instantiation_policy.hh>
#include <string>
-#include <ostream>
/** \file
* Declarations for the VersionOperator class.
diff --git a/paludis/version_operator_TEST.cc b/paludis/version_operator_TEST.cc
index ad94b6141..2c6d7c720 100644
--- a/paludis/version_operator_TEST.cc
+++ b/paludis/version_operator_TEST.cc
@@ -18,8 +18,8 @@
*/
#include <paludis/version_operator.hh>
-#include <test/test_runner.hh>
#include <test/test_framework.hh>
+#include <test/test_runner.hh>
using namespace test;
using namespace paludis;
diff --git a/paludis/version_spec.cc b/paludis/version_spec.cc
index 3375703c9..f7d941ec1 100644
--- a/paludis/version_spec.cc
+++ b/paludis/version_spec.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/version_spec.hh>
-#include <paludis/util/exception.hh>
#include <algorithm>
+#include <paludis/util/exception.hh>
+#include <paludis/version_spec.hh>
using namespace paludis;
diff --git a/paludis/version_spec.hh b/paludis/version_spec.hh
index a144cd14f..e4a932585 100644
--- a/paludis/version_spec.hh
+++ b/paludis/version_spec.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_VERSION_SPEC_HH
#define PALUDIS_GUARD_PALUDIS_VERSION_SPEC_HH 1
-#include <paludis/util/private_implementation_pattern.hh>
+#include <ostream>
#include <paludis/util/comparison_policy.hh>
-#include <paludis/util/sorted_collection.hh>
#include <paludis/util/exception.hh>
+#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/sorted_collection.hh>
#include <string>
-#include <ostream>
namespace paludis
{
diff --git a/src/colour.cc b/src/colour.cc
index ca2a93a3d..8ce78f472 100644
--- a/src/colour.cc
+++ b/src/colour.cc
@@ -18,8 +18,8 @@
*/
#include "colour.hh"
-#include <unistd.h>
#include <paludis/util/system.hh>
+#include <unistd.h>
bool use_colour()
{
diff --git a/src/colour.hh b/src/colour.hh
index 75ef8ef91..0c0e57da8 100644
--- a/src/colour.hh
+++ b/src/colour.hh
@@ -20,9 +20,9 @@
#ifndef PALUDIS_GUARD_SRC_COLOUR_HH
#define PALUDIS_GUARD_SRC_COLOUR_HH 1
-#include <string>
-#include <paludis/util/stringify.hh>
#include "src/command_line.hh"
+#include <paludis/util/stringify.hh>
+#include <string>
enum Colour
{
diff --git a/src/install.cc b/src/install.cc
index 3da6f1264..782dfe700 100644
--- a/src/install.cc
+++ b/src/install.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/install.hh"
#include "src/colour.hh"
-#include <paludis/paludis.hh>
+#include "src/install.hh"
#include <iostream>
+#include <paludis/paludis.hh>
/** \file
* Handle the --install action for the main paludis program.
diff --git a/src/list.cc b/src/list.cc
index 295bd2de4..979200ae3 100644
--- a/src/list.cc
+++ b/src/list.cc
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "list.hh"
#include "colour.hh"
-#include <paludis/paludis.hh>
-#include <iostream>
+#include "list.hh"
#include <iomanip>
-#include <map>
+#include <iostream>
#include <list>
+#include <map>
+#include <paludis/paludis.hh>
namespace p = paludis;
diff --git a/src/paludis.cc b/src/paludis.cc
index f7b04e935..d9ec6eab4 100644
--- a/src/paludis.cc
+++ b/src/paludis.cc
@@ -17,12 +17,12 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/paludis.hh>
-#include <paludis/util/util.hh>
-#include "src/query.hh"
+#include "src/command_line.hh"
#include "src/install.hh"
#include "src/list.hh"
-#include "src/command_line.hh"
+#include "src/query.hh"
+#include <paludis/paludis.hh>
+#include <paludis/util/util.hh>
#include <iostream>
#include <cstdlib>
diff --git a/src/qualudis/qualudis.cc b/src/qualudis/qualudis.cc
index 7e8e813ec..fa9be90bd 100644
--- a/src/qualudis/qualudis.cc
+++ b/src/qualudis/qualudis.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/paludis.hh>
-#include <paludis/util/util.hh>
#include <paludis/args/args.hh>
+#include <paludis/paludis.hh>
#include <paludis/qa/qa.hh>
+#include <paludis/util/util.hh>
#include <cstdlib>
#include <iostream>
diff --git a/src/query.cc b/src/query.cc
index 0d7db14de..f6b20876a 100644
--- a/src/query.cc
+++ b/src/query.cc
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "src/query.hh"
#include "src/colour.hh"
-#include <paludis/paludis.hh>
-#include <iostream>
+#include "src/query.hh"
+#include <functional>
#include <iomanip>
+#include <iostream>
+#include <paludis/paludis.hh>
#include <string>
-#include <functional>
/** \file
* Handle the --query action for the main paludis program.
diff --git a/test/test_fail_TEST.cc b/test/test_fail_TEST.cc
index 8c27e1298..1d86326d5 100644
--- a/test/test_fail_TEST.cc
+++ b/test/test_fail_TEST.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
diff --git a/test/test_framework.cc b/test/test_framework.cc
index 80759a243..0410d0fba 100644
--- a/test/test_framework.cc
+++ b/test/test_framework.cc
@@ -18,9 +18,9 @@
*/
#include "test_framework.hh"
-#include <paludis/util/attributes.hh>
-#include <iostream>
#include <algorithm>
+#include <iostream>
+#include <paludis/util/attributes.hh>
#include <unistd.h>
/** \file
diff --git a/test/test_framework.hh b/test/test_framework.hh
index 4b539a719..5362d3b15 100644
--- a/test/test_framework.hh
+++ b/test/test_framework.hh
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_TEST_TEST_FRAMEWORK_HH
#define PALUDIS_GUARD_TEST_TEST_FRAMEWORK_HH 1
-#include <paludis/util/stringify.hh>
-#include <string>
-#include <memory>
#include <list>
+#include <memory>
+#include <paludis/util/stringify.hh>
#include <sstream>
+#include <string>
/** \file
* Test framework class definitions.
diff --git a/test/test_pass_TEST.cc b/test/test_pass_TEST.cc
index 38b156e62..77751569f 100644
--- a/test/test_pass_TEST.cc
+++ b/test/test_pass_TEST.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
diff --git a/test/test_runner.cc b/test/test_runner.cc
index fc16736fa..1107a082f 100644
--- a/test/test_runner.cc
+++ b/test/test_runner.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "test_runner.hh"
#include "test_framework.hh"
+#include "test_runner.hh"
#include <paludis/util/stringify.hh>
#include <iostream>