From 03b2a9a5acc9c8790f615863de0c1ba134850b83 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Thu, 12 Nov 2009 18:45:23 +0000
Subject: [PATCH] stl_algobase.h: Include the full <utility>, per UK-300.

2009-11-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/stl_algobase.h: Include the full <utility>, per
	UK-300.
	* include/bits/stl_algo.h: Tweak includes.

From-SVN: r154126
---
 libstdc++-v3/ChangeLog                   | 6 ++++++
 libstdc++-v3/include/bits/stl_algo.h     | 2 --
 libstdc++-v3/include/bits/stl_algobase.h | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2721405a424..9357038cf84 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/stl_algobase.h: Include the full <utility>, per
+	UK-300.
+	* include/bits/stl_algo.h: Tweak includes.
+
 2009-11-11  Jason Merrill  <jason@redhat.com>
 
 	* testsuite/Makefile.am: Remove use of baseline_file.
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 9b6f2afb9ec..088414d097f 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -61,8 +61,6 @@
 #include <bits/algorithmfwd.h>
 #include <bits/stl_heap.h>
 #include <bits/stl_tempbuf.h>  // for _Temporary_buffer
-#include <debug/debug.h>
-#include <initializer_list>
 
 // See concept_check.h for the __glibcxx_*_requires macros.
 
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index f9c3ab2b428..5feeebebc2d 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -63,13 +63,12 @@
 #include <bits/cpp_type_traits.h>
 #include <ext/type_traits.h>
 #include <ext/numeric_traits.h>
-#include <bits/stl_pair.h>
 #include <bits/stl_iterator_base_types.h>
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_iterator.h>
 #include <bits/concept_check.h>
 #include <debug/debug.h>
-#include <bits/move.h> // For std::swap and _GLIBCXX_MOVE
+#include <utility> // UK-300.
 
 _GLIBCXX_BEGIN_NAMESPACE(std)