Use correct C++11 header for std::swap()

Github-Pull: #17634
Rebased-From: 98fbd1cdff

src/cuckoocache.h

@@ -6,11 +6,11 @@
 #define BITCOIN_CUCKOOCACHE_H
 
 #include <array>
-#include <algorithm>
 #include <atomic>
-#include <cstring>
 #include <cmath>
+#include <cstring>
 #include <memory>
+#include <utility>
 #include <vector>
 
 

src/prevector.h

@@ -14,6 +14,7 @@
 #include <cstddef>
 #include <iterator>
 #include <type_traits>
+#include <utility>
 
 #pragma pack(push, 1)
 /** Implements a drop-in replacement for std::vector<T> which stores up to N

src/qt/bantablemodel.cpp

@@ -10,7 +10,7 @@
 #include <sync.h>
 #include <util/time.h>
 
-#include <algorithm>
+#include <utility>
 
 #include <QDebug>
 #include <QList>

src/qt/peertablemodel.cpp

@@ -11,7 +11,7 @@
 #include <interfaces/node.h>
 #include <sync.h>
 
-#include <algorithm>
+#include <utility>
 
 #include <QDebug>
 #include <QList>

src/test/checkqueue_tests.cpp

@@ -18,6 +18,7 @@
 #include <condition_variable>
 
 #include <unordered_set>
+#include <utility>
 
 // BasicTestingSetup not sufficient because nScriptCheckThreads is not set
 // otherwise.

src/validation.h

@@ -22,7 +22,6 @@
 #include <txdb.h>
 #include <versionbits.h>
 
-#include <algorithm>
 #include <atomic>
 #include <exception>
 #include <map>