diff --git a/gcc.stl.headers.imp b/gcc.stl.headers.imp
index 625e448..b53e041 100644
--- a/gcc.stl.headers.imp
+++ b/gcc.stl.headers.imp
@@ -114,9 +114,7 @@
   { include: ["<tr1_impl/unordered_set>", private, "<unordered_set>", public ] },
   { include: ["<tr1_impl/utility>", private, "<tr1/utility>", public ] },
   { include: ["<tr1_impl/utility>", private, "<utility>", public ] },
-  # This didn't come from the grep, but seems to be where swap()
-  # is defined?
-  { include: ["<bits/move.h>", private, "<algorithm>", public ] },   # for swap<>()
+  { include: ["<bits/move.h>", private, "<utility>", public ] },
   # Hash and hashtable-based containers.
   { include: ["<tr1_impl/functional_hash.h>", private, "<tr1/functional>", public ] },
   { include: ["<tr1_impl/functional_hash.h>", private, "<tr1/unordered_map>", public ] },
diff --git a/iwyu_include_picker.cc b/iwyu_include_picker.cc
index 840057f..55da73a 100644
--- a/iwyu_include_picker.cc
+++ b/iwyu_include_picker.cc
@@ -662,9 +662,7 @@ const IncludeMapEntry libstdcpp_include_map[] = {
   { "<tr1_impl/unordered_set>", kPrivate, "<unordered_set>", kPublic },
   { "<tr1_impl/utility>", kPrivate, "<tr1/utility>", kPublic },
   { "<tr1_impl/utility>", kPrivate, "<utility>", kPublic },
-  // This didn't come from the grep, but seems to be where swap()
-  // is defined?
-  { "<bits/move.h>", kPrivate, "<algorithm>", kPublic },   // for swap<>()
+  { "<bits/move.h>", kPrivate, "<utility>", kPublic },
   // Hash and hashtable-based containers.
   { "<tr1_impl/functional_hash.h>", kPrivate, "<tr1/functional>", kPublic },
   { "<tr1_impl/functional_hash.h>", kPrivate, "<tr1/unordered_map>", kPublic },
diff --git a/libcxx.imp b/libcxx.imp
index 7b1b61c..b65202a 100644
--- a/libcxx.imp
+++ b/libcxx.imp
@@ -4,7 +4,7 @@
   { include: ["<__mutex_base>", private, "<mutex>", public ] },
   { symbol: [ "std::declval", private, "<utility>", public ] },
   { symbol: [ "std::forward", private, "<utility>", public ] },
-  { symbol: [ "std::move", private, "<algorithm>", public ] },
+  { symbol: [ "std::move", private, "<utility>", public ] },
   { symbol: [ "std::nullptr_t", private, "<cstddef>", public ] },
   { symbol: [ "std::string", private, "<string>", public ] },
 ]