aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-11 19:59:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-11 19:59:59 +0000
commitb30a00890304ea65263aa50dd65b598b5a6f9947 (patch)
tree8af16d5cb54cdc46967114f1bf1240486818cef8
parent7d90b508b22284628e64ee4fe3d8e40d58780d89 (diff)
downloadpaludis-b30a00890304ea65263aa50dd65b598b5a6f9947.tar.gz
paludis-b30a00890304ea65263aa50dd65b598b5a6f9947.tar.xz
Move output manager out of util
-rw-r--r--paludis/action.hh2
-rw-r--r--paludis/environment.hh2
-rw-r--r--paludis/environments/no_config/no_config_environment.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc2
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/environments/test/test_environment.cc2
-rw-r--r--paludis/files.m43
-rw-r--r--paludis/install_task.cc1
-rw-r--r--paludis/ndbam_merger.cc2
-rw-r--r--paludis/ndbam_merger.hh2
-rw-r--r--paludis/ndbam_unmerger.cc2
-rw-r--r--paludis/ndbam_unmerger.hh2
-rw-r--r--paludis/output_manager-fwd.hh (renamed from paludis/util/output_manager-fwd.hh)6
-rw-r--r--paludis/output_manager.cc (renamed from paludis/util/output_manager.cc)4
-rw-r--r--paludis/output_manager.hh (renamed from paludis/util/output_manager.hh)6
-rw-r--r--paludis/output_manager.se (renamed from paludis/util/output_manager.se)0
-rw-r--r--paludis/output_manager_factory-fwd.hh (renamed from paludis/util/output_manager_factory-fwd.hh)4
-rw-r--r--paludis/output_manager_factory.cc (renamed from paludis/util/output_manager_factory.cc)2
-rw-r--r--paludis/output_manager_factory.hh (renamed from paludis/util/output_manager_factory.hh)8
-rw-r--r--paludis/repositories/accounts/accounts_id.cc2
-rw-r--r--paludis/repositories/accounts/dummy_accounts_handler.cc2
-rw-r--r--paludis/repositories/accounts/passwd_accounts_handler.cc2
-rw-r--r--paludis/repositories/cran/cran_repository.cc2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc4
-rw-r--r--paludis/repositories/e/e_repository_entries.hh2
-rw-r--r--paludis/repositories/e/e_stripper.cc2
-rw-r--r--paludis/repositories/e/e_stripper.hh2
-rw-r--r--paludis/repositories/e/ebuild.cc2
-rw-r--r--paludis/repositories/e/ebuild_entries.cc2
-rw-r--r--paludis/repositories/e/ebuild_entries.hh2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc2
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/fetch_visitor.cc2
-rw-r--r--paludis/repositories/e/fetch_visitor.hh2
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc2
-rw-r--r--paludis/repositories/e/pipe_command_handler.hh2
-rw-r--r--paludis/repositories/e/vdb_merger.cc2
-rw-r--r--paludis/repositories/e/vdb_merger.hh2
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh2
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.hh2
-rw-r--r--paludis/repository.hh2
-rw-r--r--paludis/standard_output_manager-fwd.hh (renamed from paludis/util/standard_output_manager-fwd.hh)4
-rw-r--r--paludis/standard_output_manager.cc (renamed from paludis/util/standard_output_manager.cc)2
-rw-r--r--paludis/standard_output_manager.hh (renamed from paludis/util/standard_output_manager.hh)8
-rw-r--r--paludis/syncer.cc2
-rw-r--r--paludis/syncer.hh2
-rw-r--r--paludis/util/files.m43
-rw-r--r--python/action.cc2
-rw-r--r--python/environment.cc2
-rw-r--r--ruby/action.cc2
-rw-r--r--src/clients/accerso/accerso.cc2
-rw-r--r--src/clients/appareo/appareo.cc2
-rw-r--r--src/clients/cave/cmd_sync.cc2
68 files changed, 81 insertions, 82 deletions
diff --git a/paludis/action.hh b/paludis/action.hh
index c638920..fd1f436 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -30,7 +30,7 @@
#include <paludis/util/sequence-fwd.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/util/type_list.hh>
#include <tr1/functional>
diff --git a/paludis/environment.hh b/paludis/environment.hh
index 670a25a..48c431b 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -26,7 +26,7 @@
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/tribool-fwd.hh>
#include <paludis/util/simple_visitor.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/name-fwd.hh>
#include <paludis/hook-fwd.hh>
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index eb07ec5..9c5af10 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -35,7 +35,7 @@
#include <paludis/util/graph-impl.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/member_iterator-impl.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/distribution.hh>
#include <paludis/package_database.hh>
#include <paludis/hook.hh>
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 2f72d38..efe095a 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -55,7 +55,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/tribool.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <tr1/functional>
#include <functional>
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 6de6167..8248c1d 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -37,7 +37,7 @@
#include <paludis/util/config_file.hh>
#include <paludis/util/tribool.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/hooker.hh>
#include <paludis/hook.hh>
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 57e52fc..983a9dc 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -29,7 +29,7 @@
#include <paludis/util/destringify.hh>
#include <paludis/util/system.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/package_database.hh>
#include <paludis/package_id.hh>
#include <paludis/hook.hh>
diff --git a/paludis/files.m4 b/paludis/files.m4
index 1f5ad46..bc22126 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -54,6 +54,8 @@ add(`name', `hh', `cc', `fwd', `test')
add(`ndbam', `hh', `cc', `fwd')
add(`ndbam_merger', `hh', `cc')
add(`ndbam_unmerger', `hh', `cc')
+add(`output_manager', `hh', `fwd', `cc', `se')
+add(`output_manager_factory', `hh', `fwd', `cc')
add(`override_functions', `hh', `cc')
add(`package_database', `hh', `cc', `fwd', `test')
add(`package_dep_spec_properties', `hh', `cc', `fwd')
@@ -72,6 +74,7 @@ add(`set_file', `hh', `cc', `se', `test', `testscript')
add(`show_suggest_visitor', `hh', `cc')
add(`slot_requirement', `hh', `fwd', `cc')
add(`spec_tree', `hh', `fwd', `cc')
+add(`standard_output_manager', `hh', `cc', `fwd')
add(`stringify_formatter', `hh', `cc', `fwd', `impl', `test')
add(`stripper', `hh', `cc', `fwd', `test', `testscript')
add(`syncer', `hh', `cc')
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 8f74cc6..31565da 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -49,7 +49,6 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/accept_visitor.hh>
-#include <paludis/util/standard_output_manager.hh>
#include <paludis/handled_information.hh>
#include <paludis/create_output_manager_info.hh>
#include <tr1/functional>
diff --git a/paludis/ndbam_merger.cc b/paludis/ndbam_merger.cc
index fc28381..3b60761 100644
--- a/paludis/ndbam_merger.cc
+++ b/paludis/ndbam_merger.cc
@@ -28,7 +28,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/options.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/hook.hh>
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 8eb4e9b..bad12bc 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -23,7 +23,7 @@
#include <paludis/merger.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/util/named_value.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <tr1/functional>
namespace paludis
diff --git a/paludis/ndbam_unmerger.cc b/paludis/ndbam_unmerger.cc
index a371330..0a78659 100644
--- a/paludis/ndbam_unmerger.cc
+++ b/paludis/ndbam_unmerger.cc
@@ -37,7 +37,7 @@
#include <paludis/util/strip.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/metadata_key.hh>
#include <tr1/functional>
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index dcbe2a3..2652ed3 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -23,7 +23,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/unmerger.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
diff --git a/paludis/util/output_manager-fwd.hh b/paludis/output_manager-fwd.hh
index 3c650aa..72fb38f 100644
--- a/paludis/util/output_manager-fwd.hh
+++ b/paludis/output_manager-fwd.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_FWD_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_FWD_HH
+#define PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_FWD_HH 1
#include <paludis/util/attributes.hh>
#include <iosfwd>
@@ -26,7 +26,7 @@
namespace paludis
{
-#include <paludis/util/output_manager-se.hh>
+#include <paludis/output_manager-se.hh>
class OutputManager;
}
diff --git a/paludis/util/output_manager.cc b/paludis/output_manager.cc
index 0b77326..7692dd8 100644
--- a/paludis/util/output_manager.cc
+++ b/paludis/output_manager.cc
@@ -17,14 +17,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/exception.hh>
#include <ostream>
using namespace paludis;
-#include <paludis/util/output_manager-se.cc>
+#include <paludis/output_manager-se.cc>
OutputManager::~OutputManager()
{
diff --git a/paludis/util/output_manager.hh b/paludis/output_manager.hh
index f399dc6..8c0dfa9 100644
--- a/paludis/util/output_manager.hh
+++ b/paludis/output_manager.hh
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_HH
+#define PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_HH 1
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/instantiation_policy.hh>
#include <iosfwd>
diff --git a/paludis/util/output_manager.se b/paludis/output_manager.se
index 6169844..6169844 100644
--- a/paludis/util/output_manager.se
+++ b/paludis/output_manager.se
diff --git a/paludis/util/output_manager_factory-fwd.hh b/paludis/output_manager_factory-fwd.hh
index cc7006c..853017e 100644
--- a/paludis/util/output_manager_factory-fwd.hh
+++ b/paludis/output_manager_factory-fwd.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_FACTORY_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_FACTORY_FWD_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_FACTORY_FWD_HH
+#define PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_FACTORY_FWD_HH 1
namespace paludis
{
diff --git a/paludis/util/output_manager_factory.cc b/paludis/output_manager_factory.cc
index 05fcb8e..4422820 100644
--- a/paludis/util/output_manager_factory.cc
+++ b/paludis/output_manager_factory.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/output_manager_factory.hh>
+#include <paludis/output_manager_factory.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/instantiation_policy-impl.hh>
#include <paludis/util/member_iterator-impl.hh>
diff --git a/paludis/util/output_manager_factory.hh b/paludis/output_manager_factory.hh
index 972576b..124a26d 100644
--- a/paludis/util/output_manager_factory.hh
+++ b/paludis/output_manager_factory.hh
@@ -17,15 +17,15 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_FACTORY_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_OUTPUT_MANAGER_FACTORY_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_FACTORY_HH
+#define PALUDIS_GUARD_PALUDIS_OUTPUT_MANAGER_FACTORY_HH 1
-#include <paludis/util/output_manager_factory-fwd.hh>
+#include <paludis/output_manager_factory-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/util/set-fwd.hh>
#include <tr1/functional>
#include <tr1/memory>
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 4920f8c..a306a69 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -29,7 +29,7 @@
#include <paludis/util/tokeniser.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
#include <paludis/literal_metadata_key.hh>
diff --git a/paludis/repositories/accounts/dummy_accounts_handler.cc b/paludis/repositories/accounts/dummy_accounts_handler.cc
index 3072a0a..8bba557 100644
--- a/paludis/repositories/accounts/dummy_accounts_handler.cc
+++ b/paludis/repositories/accounts/dummy_accounts_handler.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/accounts/dummy_accounts_handler.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/package_id.hh>
#include <paludis/repository.hh>
#include <ostream>
diff --git a/paludis/repositories/accounts/passwd_accounts_handler.cc b/paludis/repositories/accounts/passwd_accounts_handler.cc
index 83407db..6001331 100644
--- a/paludis/repositories/accounts/passwd_accounts_handler.cc
+++ b/paludis/repositories/accounts/passwd_accounts_handler.cc
@@ -25,7 +25,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/join.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/action.hh>
#include <paludis/repository.hh>
#include <paludis/metadata_key.hh>
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 1f63e2e..ba1c2bf 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -46,7 +46,7 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/syncer.hh>
#include <tr1/unordered_map>
#include <tr1/functional>
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index 9f29650..2f69de2 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -45,7 +45,7 @@
#include <paludis/util/indirect_iterator.hh>
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/safe_ifstream.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <algorithm>
#include <list>
#include <set>
diff --git a/paludis/repositories/e/check_fetched_files_visitor.hh b/paludis/repositories/e/check_fetched_files_visitor.hh
index 1e0707a..90f4b49 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.hh
+++ b/paludis/repositories/e/check_fetched_files_visitor.hh
@@ -24,7 +24,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/spec_tree.hh>
#include <paludis/package_id-fwd.hh>
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 9044747..5cac0e3 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -42,7 +42,7 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/safe_ifstream.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/literal_metadata_key.hh>
#include <iterator>
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index d68d4d9..2c152c5 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -32,7 +32,7 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/set.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index fe3eae6..8dccca8 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -32,8 +32,8 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/set.hh>
-#include <paludis/util/output_manager.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
#include <paludis/action.hh>
diff --git a/paludis/repositories/e/e_repository_entries.hh b/paludis/repositories/e/e_repository_entries.hh
index c81dc07..3e18f60 100644
--- a/paludis/repositories/e/e_repository_entries.hh
+++ b/paludis/repositories/e/e_repository_entries.hh
@@ -27,7 +27,7 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/repositories/e/e_repository_profile.hh>
#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/repositories/e/e_repository_id.hh>
diff --git a/paludis/repositories/e/e_stripper.cc b/paludis/repositories/e/e_stripper.cc
index 5b6ecfe..5522543 100644
--- a/paludis/repositories/e/e_stripper.cc
+++ b/paludis/repositories/e/e_stripper.cc
@@ -21,7 +21,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <ostream>
using namespace paludis;
diff --git a/paludis/repositories/e/e_stripper.hh b/paludis/repositories/e/e_stripper.hh
index d0ac489..695cac1 100644
--- a/paludis/repositories/e/e_stripper.hh
+++ b/paludis/repositories/e/e_stripper.hh
@@ -23,7 +23,7 @@
#include <paludis/stripper.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <tr1/memory>
namespace paludis
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 866fabf..eab93f3 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -40,7 +40,7 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/cookie.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/about.hh>
#include <paludis/environment.hh>
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 84a5215..3d7b0b3 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -56,7 +56,7 @@
#include <paludis/util/instantiation_policy-impl.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <tr1/functional>
#include <list>
#include <set>
diff --git a/paludis/repositories/e/ebuild_entries.hh b/paludis/repositories/e/ebuild_entries.hh
index 582076c..0868d17 100644
--- a/paludis/repositories/e/ebuild_entries.hh
+++ b/paludis/repositories/e/ebuild_entries.hh
@@ -23,7 +23,7 @@
#include <paludis/repositories/e/e_repository_entries.hh>
#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
/** \file
* Declaration for the EbuildEntries class.
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 926d676..f76d413 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -36,8 +36,8 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/system.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
+#include <paludis/output_manager.hh>
#include <paludis/distribution.hh>
#include <paludis/environment.hh>
#include <paludis/ndbam.hh>
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index 376b97b..71c81dd 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -26,7 +26,7 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/action.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/generator.hh>
diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc
index 8765978..53d9975 100644
--- a/paludis/repositories/e/fetch_visitor.cc
+++ b/paludis/repositories/e/fetch_visitor.cc
@@ -35,7 +35,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <list>
using namespace paludis;
diff --git a/paludis/repositories/e/fetch_visitor.hh b/paludis/repositories/e/fetch_visitor.hh
index f341657..a62799c 100644
--- a/paludis/repositories/e/fetch_visitor.hh
+++ b/paludis/repositories/e/fetch_visitor.hh
@@ -24,7 +24,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/dep_spec.hh>
#include <paludis/spec_tree-fwd.hh>
#include <paludis/package_id-fwd.hh>
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 18c60dd..41e4f9a 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -25,7 +25,7 @@
#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/package_database.hh>
#include <paludis/user_dep_spec.hh>
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index 7851880..91ffc3c 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -33,7 +33,7 @@
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/indirect_iterator.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/package_id.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/e/pipe_command_handler.hh b/paludis/repositories/e/pipe_command_handler.hh
index 8d5630f..abdc7c4 100644
--- a/paludis/repositories/e/pipe_command_handler.hh
+++ b/paludis/repositories/e/pipe_command_handler.hh
@@ -22,7 +22,7 @@
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <tr1/functional>
#include <string>
diff --git a/paludis/repositories/e/vdb_merger.cc b/paludis/repositories/e/vdb_merger.cc
index af4af9b..3acbd94 100644
--- a/paludis/repositories/e/vdb_merger.cc
+++ b/paludis/repositories/e/vdb_merger.cc
@@ -29,7 +29,7 @@
#include <paludis/util/strip.hh>
#include <paludis/util/options.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/hook.hh>
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index 958d0bb..880b9d5 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -23,7 +23,7 @@
#include <paludis/merger.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
namespace paludis
{
diff --git a/paludis/repositories/e/vdb_merger_TEST.cc b/paludis/repositories/e/vdb_merger_TEST.cc
index 67637e3..9bcb1bb 100644
--- a/paludis/repositories/e/vdb_merger_TEST.cc
+++ b/paludis/repositories/e/vdb_merger_TEST.cc
@@ -23,8 +23,8 @@
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/standard_output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
+#include <paludis/standard_output_manager.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index b388094..e500317 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -69,7 +69,7 @@
#include <paludis/util/create_iterator-impl.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/util/safe_ofstream.hh>
#include <tr1/unordered_map>
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 8c1368c..8af7aec 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -27,7 +27,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/generator.hh>
#include <paludis/filter.hh>
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index c5d1ef0..4e87f47 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -39,7 +39,7 @@ using namespace paludis;
#include <paludis/util/tokeniser.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/util/safe_ifstream.hh>
#include <list>
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index 02f432b..68cb763 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -21,7 +21,7 @@
#include <paludis/environments/test/test_environment.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 195550e..adb5a56 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -34,7 +34,7 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/safe_ifstream.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index e84dd1b..f70c16e 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -25,7 +25,7 @@
#include <paludis/action-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/ndbam-fwd.hh>
#include <tr1/memory>
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index e376034..649e0de 100644
--- a/paludis/repositories/unpackaged/installed_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc
@@ -33,7 +33,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/options.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <algorithm>
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 5aeb8ba..64468b3 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -30,7 +30,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index 9f82de2..c5c02cd 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
@@ -33,7 +33,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.cc b/paludis/repositories/unpackaged/unpackaged_stripper.cc
index 3a98284..ccfe4a7 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.cc
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.cc
@@ -21,7 +21,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <ostream>
using namespace paludis;
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.hh b/paludis/repositories/unpackaged/unpackaged_stripper.hh
index 8f6917e..4d289e2 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.hh
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.hh
@@ -22,7 +22,7 @@
#include <paludis/stripper.hh>
#include <paludis/package_id-fwd.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <tr1/memory>
namespace paludis
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 2d2e25a..9ccd40f 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -33,7 +33,7 @@
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/util/options.hh>
#include <paludis/util/named_value.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/version_spec.hh>
#include <paludis/metadata_key-fwd.hh>
#include <paludis/metadata_key_holder.hh>
diff --git a/paludis/util/standard_output_manager-fwd.hh b/paludis/standard_output_manager-fwd.hh
index 4d6a2db..b85c14d 100644
--- a/paludis/util/standard_output_manager-fwd.hh
+++ b/paludis/standard_output_manager-fwd.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_STANDARD_OUTPUT_MANAGER_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_STANDARD_OUTPUT_MANAGER_FWD_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_STANDARD_OUTPUT_MANAGER_FWD_HH
+#define PALUDIS_GUARD_PALUDIS_STANDARD_OUTPUT_MANAGER_FWD_HH 1
namespace paludis
{
diff --git a/paludis/util/standard_output_manager.cc b/paludis/standard_output_manager.cc
index 7416f8d..2716ca4 100644
--- a/paludis/util/standard_output_manager.cc
+++ b/paludis/standard_output_manager.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <iostream>
using namespace paludis;
diff --git a/paludis/util/standard_output_manager.hh b/paludis/standard_output_manager.hh
index afe2fbc..82bd73a 100644
--- a/paludis/util/standard_output_manager.hh
+++ b/paludis/standard_output_manager.hh
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_STANDARD_OUTPUT_MANAGER_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_STANDARD_OUTPUT_MANAGER_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_STANDARD_OUTPUT_MANAGER_HH
+#define PALUDIS_GUARD_PALUDIS_STANDARD_OUTPUT_MANAGER_HH 1
-#include <paludis/util/standard_output_manager-fwd.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/standard_output_manager-fwd.hh>
+#include <paludis/output_manager.hh>
namespace paludis
{
diff --git a/paludis/syncer.cc b/paludis/syncer.cc
index 49b8c7a..cf8e914 100644
--- a/paludis/syncer.cc
+++ b/paludis/syncer.cc
@@ -28,7 +28,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <list>
using namespace paludis;
diff --git a/paludis/syncer.hh b/paludis/syncer.hh
index 98892b5..5ce7ecf 100644
--- a/paludis/syncer.hh
+++ b/paludis/syncer.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_SYNCER_HH 1
#include <paludis/util/exception.hh>
-#include <paludis/util/output_manager-fwd.hh>
+#include <paludis/output_manager-fwd.hh>
#include <paludis/repository.hh>
#include <string>
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index abbd5a0..b4faa42 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -46,8 +46,6 @@ add(`named_value', `hh', `cc', `fwd')
add(`no_type', `hh')
add(`operators', `hh')
add(`options', `hh', `fwd', `cc', `test')
-add(`output_manager', `hh', `fwd', `cc', `se')
-add(`output_manager_factory', `hh', `fwd', `cc')
add(`output_wrapper', `test', `testscript')
add(`pipe', `hh', `cc')
add(`pretty_print', `hh', `cc', `test')
@@ -66,7 +64,6 @@ add(`sha256', `hh', `cc', `test')
add(`simple_parser', `hh', `cc')
add(`simple_visitor', `hh', `cc', `fwd', `impl')
add(`simple_visitor_cast', `hh', `cc', `fwd')
-add(`standard_output_manager', `hh', `cc', `fwd')
add(`stringify', `hh', `test')
add(`strip', `hh', `cc', `test')
add(`system', `hh', `cc', `test', `testscript')
diff --git a/python/action.cc b/python/action.cc
index 1f32528..d84166a 100644
--- a/python/action.cc
+++ b/python/action.cc
@@ -23,7 +23,7 @@
#include <paludis/action.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/repository.hh>
#include <tr1/memory>
diff --git a/python/environment.cc b/python/environment.cc
index 7c7a4af..fcac437 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -35,7 +35,7 @@
#include <paludis/util/tribool.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/ruby/action.cc b/ruby/action.cc
index 88acbf1..f058ffb 100644
--- a/ruby/action.cc
+++ b/ruby/action.cc
@@ -22,7 +22,7 @@
#include <paludis/action.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <ruby.h>
using namespace paludis;
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc
index 70b49ff..2a05ffe 100644
--- a/src/clients/accerso/accerso.cc
+++ b/src/clients/accerso/accerso.cc
@@ -31,7 +31,7 @@
#include <paludis/util/map.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/create_output_manager_info.hh>
#include <paludis/environments/no_config/no_config_environment.hh>
diff --git a/src/clients/appareo/appareo.cc b/src/clients/appareo/appareo.cc
index 319b9f4..29e9387 100644
--- a/src/clients/appareo/appareo.cc
+++ b/src/clients/appareo/appareo.cc
@@ -32,7 +32,7 @@
#include <paludis/util/map.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/standard_output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <paludis/environments/no_config/no_config_environment.hh>
#include <paludis/selection.hh>
#include <paludis/generator.hh>
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index d25d138..e84bba1 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -29,7 +29,7 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/condition_variable.hh>
#include <paludis/util/thread.hh>
-#include <paludis/util/output_manager.hh>
+#include <paludis/output_manager.hh>
#include <paludis/repository.hh>
#include <paludis/environment.hh>
#include <paludis/hook.hh>