diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C
index c84231f91f1b0b3d77810763f5dc353e15d89af9..c412b26523c3ec796c63bbf5d58500c414cbef4c 100644
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@@ -37,8 +37,6 @@ Description
 #include "labelPairHashes.H"
 #include "FlatOutput.H"
 
-#include <algorithm>
-
 using namespace Foam;
 
 template<class Iter>
diff --git a/applications/test/List2/Test-List2.C b/applications/test/List2/Test-List2.C
index f080ead62c7ac1596617088d134214ba3bbf9ec4..b05461784495f5b7a68e6f9b7d94e0d216240315 100644
--- a/applications/test/List2/Test-List2.C
+++ b/applications/test/List2/Test-List2.C
@@ -40,8 +40,6 @@ Description
 #include "OFstream.H"
 #include "cpuTime.H"
 
-#include <initializer_list>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 using namespace Foam;
diff --git a/applications/test/List3/Test-List3.C b/applications/test/List3/Test-List3.C
index e23b36579bea92b145e897a859ab9f1d27f0ffe7..c3aaaa4d22145aabc7a35e97dcf341f7bfc4ad16 100644
--- a/applications/test/List3/Test-List3.C
+++ b/applications/test/List3/Test-List3.C
@@ -40,8 +40,6 @@ Description
 #include "OFstream.H"
 #include "cpuTime.H"
 
-#include <initializer_list>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 using namespace Foam;
diff --git a/applications/test/base64/Test-base64Encoding.C b/applications/test/base64/Test-base64Encoding.C
index 7da1707cb871bed5bec408ed677f3809df4c009c..74dc48894a74f3afd6420a6bf9df3b26b279d350 100644
--- a/applications/test/base64/Test-base64Encoding.C
+++ b/applications/test/base64/Test-base64Encoding.C
@@ -39,7 +39,6 @@ Description
 #include "Pair.H"
 
 #include <sstream>
-#include <initializer_list>
 
 using namespace Foam;
 
diff --git a/applications/test/bitops/Test-bitops.C b/applications/test/bitops/Test-bitops.C
index 6f77af14b7d6cfe6ec23cac07dd617f672a45b23..a198ac5a51e57a8858d3c660ee0e11fafbb223d2 100644
--- a/applications/test/bitops/Test-bitops.C
+++ b/applications/test/bitops/Test-bitops.C
@@ -33,7 +33,6 @@ Description
 #include "IOstreams.H"
 #include "stdFoam.H"
 
-#include <algorithm>
 #include <type_traits>
 #include <limits>
 
diff --git a/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C b/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C
index c99686591c4dacd94a8f0e0cb8fc2060ee7760cc..0b7ad7d2f645ff3436c77c198fba04f44b1f32a4 100644
--- a/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C
+++ b/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C
@@ -43,7 +43,6 @@ Description
 #include "IOmanip.H"
 #include "EigenMatrix.H"
 #include "TestTools.H"
-#include <algorithm>
 
 using namespace Foam;
 
diff --git a/applications/test/matrices/Matrix/Test-Matrix.C b/applications/test/matrices/Matrix/Test-Matrix.C
index 43115df871371067f2ce87d5f1cf4a1905511c15..73d23b5fcedb886144ae2b113b2956bb59aa3516 100644
--- a/applications/test/matrices/Matrix/Test-Matrix.C
+++ b/applications/test/matrices/Matrix/Test-Matrix.C
@@ -32,7 +32,6 @@ License
 #include "Random.H"
 #include "SortList.H"
 #include "Switch.H"
-#include <algorithm>
 
 using namespace Foam;
 using namespace Foam::MatrixTools;
diff --git a/src/OSspecific/POSIX/regExp/regExpPosixI.H b/src/OSspecific/POSIX/regExp/regExpPosixI.H
index 4217350c694930ae5cc25fa3441e7dc8d333e0db..a7a97c80d70fa86205d6109327f90ca7b5dad5aa 100644
--- a/src/OSspecific/POSIX/regExp/regExpPosixI.H
+++ b/src/OSspecific/POSIX/regExp/regExpPosixI.H
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
+#include <utility>  // For std::swap
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
index f405624f6a26088be25ca0fd9f6bb9dd463154be..2a93ba7194928e5e295e4b7e841782b9ac92443f 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
@@ -29,7 +29,6 @@ License
 #include "treeDataCell.H"
 #include "indexedOctree.H"
 #include "polyMesh.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C
index 64474327b360cc787afd76e56043cf966eeebe8b..e6f9765630265d32cccf664e8aeb655d0a3ce952 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C
@@ -28,7 +28,6 @@ License
 
 #include "treeDataEdge.H"
 #include "indexedOctree.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Bits/BitOps/BitOps.C b/src/OpenFOAM/containers/Bits/BitOps/BitOps.C
index f313812acdb51a35c227b2fe50ec912b0821aac1..da0eedc7d6cdc53f4c92454847e068fd3da008bd 100644
--- a/src/OpenFOAM/containers/Bits/BitOps/BitOps.C
+++ b/src/OpenFOAM/containers/Bits/BitOps/BitOps.C
@@ -30,7 +30,6 @@ License
 #include "HashSet.H"
 #include "List.H"
 #include "labelRange.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * * BitOps  * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Bits/BitOps/BitOps.H b/src/OpenFOAM/containers/Bits/BitOps/BitOps.H
index 1f57396c389d3a9a0c685a33e881cc4239655b72..79ae909c508528b66cdf54dde696d4ffea8340bb 100644
--- a/src/OpenFOAM/containers/Bits/BitOps/BitOps.H
+++ b/src/OpenFOAM/containers/Bits/BitOps/BitOps.H
@@ -46,13 +46,10 @@ Description
 #ifndef Foam_BitOps_H
 #define Foam_BitOps_H
 
-#include "label.H"
 #include "UList.H"
 #include "HashSet.H"
 #include "Ostream.H"
-#include <algorithm>
 #include <limits>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C b/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C
index b8bc37db865bb800b915cfba8cee153605067b37..69cc216d51bde4f0d9bd5853fe79167357d32201 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C
@@ -25,7 +25,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
 #include "FixedList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C
index abd8016acb00a5b5ff40d9d6b7a64a2e90128414..ad70f1c66069a260c271472e6435056d64791083 100644
--- a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C
+++ b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C
@@ -28,8 +28,6 @@ License
 #include "HashOps.H"
 #include "bitSet.H"
 
-#include <algorithm>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::labelHashSet Foam::HashSetOps::used(const bitSet& select)
diff --git a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H
index ba54b61440e8f1dff902afd7ee7fc859453e7a52..73a64f7af8dbcded5ab593b1de6871073f1f0d0e 100644
--- a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H
+++ b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H
@@ -40,8 +40,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef HashOps_H
-#define HashOps_H
+#ifndef Foam_HashOps_H
+#define Foam_HashOps_H
 
 #include "HashSet.H"
 #include "List.H"
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 4f2f17b49d2f7b60197d3219ae4252c8d56e8feb..2e4549e471aa27bce2380be9eed09ff6222028f9 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -84,15 +84,14 @@ SourceFiles
 #ifndef Foam_HashTable_H
 #define Foam_HashTable_H
 
+#include "stdFoam.H"
 #include "word.H"
 #include "zero.H"
 #include "Hash.H"
 #include "HashTableDetail.H"
 #include "HashTableCore.H"
 
-#include <initializer_list>
 #include <iterator>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 2f2d7b2148f86fc671e86dc7be47d5749513851b..6d172d0df4ae9093ad1c6949d38d6715118e762c 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -51,10 +51,9 @@ SourceFiles
 #include "SLListFwd.H"
 #include "ListPolicy.H"
 
-#include <initializer_list>
 #include <iterator>
-#include <type_traits>
 #include <limits>
+#include <type_traits>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index f2617b3d4e6bd9fc4f4fab6767dfd8c66a107bcc..c2718e2abaec4db2f51fb7d72a5f6a76fd7bdb5a 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -28,7 +28,6 @@ License
 
 #include "UList.H"
 #include "SLList.H"
-#include <utility>
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 427218b5f03b0cc09ce12ee507edb84f089f87dc..7286e7054ffc8b19302671d7969ca6ba69707764 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -32,7 +32,6 @@ License
 #include "PtrList.H"
 #include "SLList.H"
 #include "contiguous.H"
-#include <utility>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/List/UList.C b/src/OpenFOAM/containers/Lists/List/UList.C
index 6a75e4b6ba1ca27a3768340b7ec15c1d4277539d..b4b83b902c5009b752764adb09ad212f72ddc0ad 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.C
+++ b/src/OpenFOAM/containers/Lists/List/UList.C
@@ -31,7 +31,6 @@ License
 #include "contiguous.H"
 #include "labelRange.H"
 
-#include <algorithm>
 #include <random>
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index fa511bc9d9e062461ec5e3ab45801a3773205954..a2a7ed77c889a4e1b8d25aad5aee5ed0d1ed5588 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -56,10 +56,9 @@ SourceFiles
 #include "Hash.H"
 #include "ListPolicy.H"
 
-#include <initializer_list>
 #include <iterator>
 #include <type_traits>
-#include <vector>
+#include <vector>  // i.e, std::vector
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/UniformList/UniformList.H b/src/OpenFOAM/containers/Lists/UniformList/UniformList.H
index b3f6a370385e01017a4f0818fc5800283dad14c5..67f6041417ea6968f1eb0f1c3b7d62288b0be905 100644
--- a/src/OpenFOAM/containers/Lists/UniformList/UniformList.H
+++ b/src/OpenFOAM/containers/Lists/UniformList/UniformList.H
@@ -40,7 +40,7 @@ Note
 #define Foam_UniformList_H
 
 #include "labelFwd.H"
-#include <utility>
+#include <utility>  // For std::move
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index e22efa3a46bc0f2f9e0dc216cd4e16cd6e01b836..587bb9163b0fa6b33d639d10f2bcfbf8f383b69c 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -43,8 +43,6 @@ SourceFiles
 
 #include "PtrList.H"
 #include <type_traits>
-#include <memory>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C
index 7df86c8da32796109dd95c3571b0a11fbabe4507..0fe24b1d49f4d3a54f7fabc6492c1d771df0c81e 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C
@@ -28,7 +28,6 @@ License
 
 #include "PtrList.H"
 #include "SLPtrList.H"
-#include <utility>
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 1c0963a0b41e33f83c3833a2c56031d1e7fdf6b4..a7deaa6423b0253eac0a39d2fc87f39e7bef433c 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -48,8 +48,6 @@ SourceFiles
 
 #include "UPtrList.H"
 #include "SLPtrListFwd.H"
-#include <memory>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C
index 0b23ec6e8c134631cfa534e7da0f5a8dbee0392d..d236b19b7886be8b61671565350fe41cfc6bd4d9 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C
+++ b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C
@@ -26,7 +26,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PtrListDetail.H"
-#include <utility>
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index e863649b733190ffa7f6fa179522339ac4ae388a..fe1a535565797ff2dd9819dfa86476a66951d465 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -26,7 +26,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
+#include <utility>  // For std::move, std::swap
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldOps.C b/src/OpenFOAM/fields/Fields/Field/FieldOps.C
index 4da68f502860ea81829e36f5654133e3131f8a54..c50b64023a95b235e0de5df8e43ad25d3a4641ca 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldOps.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldOps.C
@@ -27,7 +27,6 @@ License
 
 #include "Pstream.H"
 #include "ops.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index bbf4f0f6fbe645640cd7a8cbdc53ca9cc727d3a7..ebc3bf836a396a7bd073e3b36d0b94f551cb6b26 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -96,8 +96,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef argList_H
-#define argList_H
+#ifndef Foam_argList_H
+#define Foam_argList_H
 
 #include "stringList.H"
 #include "SLList.H"
@@ -107,7 +107,6 @@ SourceFiles
 #include "ITstream.H"
 #include "dlLibraryTable.H"
 #include "OSspecific.H"
-#include <utility>
 
 // Transitional features - older style access (including 1712 release)
 #define Foam_argList_1712
diff --git a/src/OpenFOAM/include/stdFoam.H b/src/OpenFOAM/include/stdFoam.H
index 103de7ce45672868404504fefec37198caa73f9a..877c5ef96803a1e56ba68a90e11b3216f0b51b5a 100644
--- a/src/OpenFOAM/include/stdFoam.H
+++ b/src/OpenFOAM/include/stdFoam.H
@@ -32,6 +32,7 @@ Description
 #ifndef Foam_stdFoam_H
 #define Foam_stdFoam_H
 
+#include <algorithm>
 #include <initializer_list>
 #include <memory>
 #include <utility>
diff --git a/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H b/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H
index 619f88a5fed10fce0bc7a6ca6d7fb985cd1a2e7f..aa4a02562fc065b2ccf7ea108e00b6daed49e01b 100644
--- a/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H
+++ b/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H
@@ -137,14 +137,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef EigenMatrix_H
-#define EigenMatrix_H
+#ifndef Foam_EigenMatrix_H
+#define Foam_EigenMatrix_H
 
 #include "scalarMatrices.H"
 #include "DiagonalMatrix.H"
 #include "SquareMatrix.H"
 #include "complex.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 0ba6168888428ee34a199c22e2374a50c2b8ebd2..a0234a9d391ebd58f175a398a5be516f954a7bc3 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -28,7 +28,6 @@ License
 
 #include "Matrix.H"
 #include <functional>
-#include <algorithm>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index eb34e064d31dd36cace4fd1fc451f6fa35407e24..235625db3da1f0c0fae7ed75957b7793874bcb67 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -47,8 +47,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Matrix_H
-#define Matrix_H
+#ifndef Foam_Matrix_H
+#define Foam_Matrix_H
 
 #include "uLabel.H"
 #include "Pair.H"
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index cc3446be1ad69c8f573b624cb65e351eafa801d4..b937e5e393efe0d7c7684db14f0579845b0e44fa 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -32,7 +32,6 @@ License
 #include "token.H"
 #include "contiguous.H"
 #include "ListPolicy.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index f1fe690f301675d10d99a2d5c520fcf1390dcdd6..470e4b7b4767aa4a9c3523bd6da9a2aac99296bc 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -31,7 +31,6 @@ License
 #include "triangle.H"
 #include "mathematicalConstants.H"
 #include "Circulator.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index fecdf95beec23d24b441e5f99ece4988ab73616a..ea0698f070c3a395b348f5f691dd506449cb208a 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -28,7 +28,6 @@ License
 
 #include "IOstreams.H"
 #include "face.H"
-#include <algorithm>  // For std::swap
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C
index bf96a5dd4819827e60a025626a370b32c909af30..c9f47203e528e1ee0c1db67e0e1965ce2469ad83 100644
--- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C
+++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C
@@ -29,7 +29,6 @@ License
 #include "FixedList.H"
 #include "List.H"
 #include "token.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H
index d2445381fe1f19e7ba6e9106fad03877d3a6a9e0..b2ae2c151bac8a6ac4daac7b7370c7c37ab85d2b 100644
--- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H
+++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H
@@ -25,8 +25,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline constexpr Foam::sliceRange::sliceRange() noexcept
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.C b/src/OpenFOAM/primitives/strings/keyType/keyType.C
index 6749afe42df6b93514846172f58895b3e63af9bd..15decfb7715f04954997f5fa75871ca0d0caaba4 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyType.C
+++ b/src/OpenFOAM/primitives/strings/keyType/keyType.C
@@ -30,7 +30,7 @@ License
 #include "regExp.H"
 #include "token.H"
 #include "IOstreams.H"
-#include <algorithm>  // For swap
+#include <utility>  // For std::swap
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 0f646b5d7f784e679269d4b3d26dc62d148ab5d5..7947676d9833a288fa29968e692d388f82186dee 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -33,7 +33,6 @@ License
 #include "StringStream.H"
 #include "OSstream.H"
 #include "OSspecific.H"
-#include <algorithm>
 #include <cctype>
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
index 29d26b2beeb5e06c521fe480aeb6189ea410a297..14f9c743cec28ea1d50ccd12b9fa887fd387a8c1 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringOps_H
-#define stringOps_H
+#ifndef Foam_stringOps_H
+#define Foam_stringOps_H
 
 #include "scalar.H"
 #include "string.H"
@@ -48,7 +48,6 @@ SourceFiles
 #include "stringOpsSort.H"
 #include "stringOpsEvaluate.H"
 #include "wordRes.H"
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/tuples/Pair.H b/src/OpenFOAM/primitives/tuples/Pair.H
index eaaf3a93ef00deaffc3b2018758423116f81eea9..9548289ac77c1b0e5c966c6d93620203b4a9adcf 100644
--- a/src/OpenFOAM/primitives/tuples/Pair.H
+++ b/src/OpenFOAM/primitives/tuples/Pair.H
@@ -44,7 +44,7 @@ See also
 
 #include "FixedList.H"
 #include "Istream.H"
-#include <utility>
+#include <utility>  // For std::move
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/conversion/vtk/adaptor/foamVtkTools.H b/src/conversion/vtk/adaptor/foamVtkTools.H
index 6a20fe1c74b49102cb4746ad7522072e45290423..4a1a1b3641a7a59fb2faf59b05b9cd2800b94f78 100644
--- a/src/conversion/vtk/adaptor/foamVtkTools.H
+++ b/src/conversion/vtk/adaptor/foamVtkTools.H
@@ -61,8 +61,6 @@ SourceFiles
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-#include <utility>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Forward Declarations
diff --git a/src/fileFormats/abaqus/ABAQUSCore.C b/src/fileFormats/abaqus/ABAQUSCore.C
index 056a1891c65bcdc8ecf9e13816739e14f7369e89..bc478cfa066114102c08362009c354d051c7b309 100644
--- a/src/fileFormats/abaqus/ABAQUSCore.C
+++ b/src/fileFormats/abaqus/ABAQUSCore.C
@@ -31,7 +31,6 @@ License
 #include "stringOps.H"
 #include "UIListStream.H"
 #include "cellModel.H"
-#include <algorithm>
 #include <cctype>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C b/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C
index 59cde08c01e15755855457cdaec8c37e000e44d6..fd738efbcbe85d006bf814232f6fba159eb4344f 100644
--- a/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C
+++ b/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C
@@ -31,7 +31,6 @@ License
 #include "MinMax.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index d410b52094f3fe0a8f92ea71304b9b7bb81aadbf..7be1099a8651bf73302e88f6fcfabc9063cb085c 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -29,7 +29,6 @@ License
 #include "treeDataFace.H"
 #include "polyMesh.H"
 #include "triangle.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 62fac283e6c819cf521932f2585728f25d2d8f5a..74d7a76448508698d5054c55d7ee6c5b271ffd98 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -31,7 +31,6 @@ License
 #include "triangle.H"
 #include "triSurfaceTools.H"
 #include "triFace.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C b/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C
index 2f51ee0383b9472f5fe79f8ade3b39159519a81b..14030e120504f36c7aaf203750362535106e7a50 100644
--- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C
+++ b/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C
@@ -30,7 +30,6 @@ License
 #include "argList.H"
 #include "Time.H"
 #include "addToRunTimeSelectionTable.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C
index 84940997381e255e8043b4dcea37048432b47b93..66b7bb226b568f8e530cbc36337465d098f0d7e8 100644
--- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C
+++ b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C
@@ -29,7 +29,6 @@ License
 #include "rawIOField.H"
 #include "argList.H"
 #include "Time.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C b/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C
index 5c78be00cc8cc0e53ca98be74a10aa449100f058..0a5ba420df51e21d43258dc45e6de40e05520e32 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C
@@ -45,7 +45,6 @@ Note
 #include "lumpedPointTools.H"
 #include "lumpedPointState.H"
 #include "lumpedPointIOMovement.H"
-#include <algorithm>
 
 using namespace Foam;