IWYU: Fix handling of <memory> standard header

An old workaround for `std::allocator_traits<>::value_type` lints from
IWYU on `std::vector<>` usage breaks IWYU's handling of `<memory>`.
Convert the workaround to use the same approach we already use for a
workaround of `std::__decay_and_strip<>::::__type` lints.  Then update
the `<memory>` inclusions to follow the now-correct IWYU lints.

Source/CPack/cmCPackGenerator.cxx

@@ -7,7 +7,7 @@
 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
 #include <cstring>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <utility>
 
 #include "cmCPackComponentGroup.h"

Source/CPack/cpack.cxx

@@ -5,7 +5,6 @@
 #include "cmsys/Encoding.hxx"
 #include <iostream>
 #include <map>
-#include <memory> // IWYU pragma: keep
 #include <sstream>
 #include <stddef.h>
 #include <string>

Source/CTest/cmCTestLaunch.cxx

@@ -6,7 +6,6 @@
 #include "cmsys/Process.h"
 #include "cmsys/RegularExpression.hxx"
 #include <iostream>
-#include <memory> // IWYU pragma: keep
 #include <stdlib.h>
 #include <string.h>
 

Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -29,11 +29,13 @@
 #include <iostream>
 #include <list>
 #include <math.h>
+#include <memory>
 #include <sstream>
 #include <stack>
 #include <stdlib.h>
 #include <unordered_map>
 #include <utility>
+#include <vector>
 
 namespace cmsys {
 class RegularExpression;

Source/CTest/cmCTestRunTest.h

@@ -5,6 +5,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <memory>
 #include <set>
 #include <stddef.h>
 #include <string>
@@ -12,7 +13,7 @@
 
 #include "cmCTestTestHandler.h"
 #include "cmDuration.h"
-#include "cmProcess.h" // IWYU pragma: keep (for unique_ptr)
+#include "cmProcess.h"
 
 class cmCTest;
 class cmCTestMultiProcessHandler;

Source/CTest/cmCTestTestHandler.cxx

@@ -11,7 +11,7 @@
 #include <functional>
 #include <iomanip>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <sstream>
 #include <stdio.h>

Source/CTest/cmCTestUpdateHandler.cxx

@@ -18,7 +18,7 @@
 #include "cmXMLWriter.h"
 
 #include <chrono>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 
 static const char* cmCTestUpdateHandlerUpdateStrings[] = {

Source/cmBinUtilsLinuxELFLinker.h

@@ -9,7 +9,7 @@
 #include "cmLDConfigTool.h"
 #include "cmStateTypes.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmBinUtilsMacOSMachOLinker.h

@@ -8,7 +8,7 @@
 #include "cmBinUtilsMacOSMachOGetRuntimeDependenciesTool.h"
 #include "cmStateTypes.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmBinUtilsWindowsPELinker.h

@@ -8,7 +8,7 @@
 #include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h"
 #include "cmStateTypes.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 
 class cmRuntimeDependencyArchive;

Source/cmCTest.cxx

@@ -15,7 +15,7 @@
 #include <ctype.h>
 #include <iostream>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>

Source/cmCTest.h

@@ -10,7 +10,7 @@
 
 #include <chrono>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <string>
 #include <time.h>

Source/cmComputeLinkDepends.h

@@ -10,6 +10,7 @@
 #include "cmTargetLinkLibraryType.h"
 
 #include <map>
+#include <memory>
 #include <queue>
 #include <set>
 #include <string>

Source/cmCryptoHash.cxx

@@ -8,7 +8,7 @@
 #include "cmsys/FStream.hxx"
 #include <string.h>
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 
 static unsigned int const cmCryptoHashAlgoToId[] = {
   /* clang-format needs this comment to break after the opening brace */

Source/cmCryptoHash.h

@@ -5,7 +5,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <stddef.h>
 #include <string>
 #include <vector>

Source/cmCustomCommandGenerator.cxx

@@ -12,7 +12,7 @@
 #include "cmStateTypes.h"
 #include "cmSystemTools.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <stddef.h>
 #include <utility>
 

Source/cmELF.cxx

@@ -6,7 +6,7 @@
 #include "cm_kwiml.h"
 #include "cmsys/FStream.hxx"
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stddef.h>
 #include <utility>

Source/cmExecuteProcessCommand.cxx

@@ -4,10 +4,13 @@
 
 #include "cm_static_string_view.hxx"
 #include "cmsys/Process.h"
+
 #include <algorithm>
 #include <ctype.h> /* isspace */
 #include <iostream>
+#include <memory>
 #include <stdio.h>
+#include <vector>
 
 #include "cmAlgorithms.h"
 #include "cmArgumentParser.h"

Source/cmExportBuildAndroidMKGenerator.cxx

@@ -3,7 +3,6 @@
 #include "cmExportBuildAndroidMKGenerator.h"
 
 #include <algorithm>
-#include <memory> // IWYU pragma: keep
 #include <sstream>
 #include <utility>
 

Source/cmExportFileGenerator.cxx

@@ -20,7 +20,7 @@
 
 #include "cmsys/FStream.hxx"
 #include <assert.h>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <string.h>
 #include <utility>

Source/cmExportLibraryDependenciesCommand.cxx

@@ -4,7 +4,7 @@
 
 #include "cmsys/FStream.hxx"
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <utility>
 
 #include "cmAlgorithms.h"

Source/cmExportTryCompileFileGenerator.cxx

@@ -13,7 +13,7 @@
 #include "cmTarget.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <utility>
 
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(

Source/cmFileAPI.h

@@ -10,7 +10,7 @@
 #include "cm_jsoncpp_writer.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <unordered_set>
 #include <vector>

Source/cmFileAPICodemodel.cxx

@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <cassert>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>

Source/cmFileCommand.cxx

@@ -13,7 +13,7 @@
 #include <cmath>
 #include <ctype.h>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <sstream>
 #include <stdio.h>

Source/cmFileTimes.h

@@ -5,7 +5,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 
 /** \class cmFileTimes

Source/cmFindPackageCommand.cxx

@@ -13,7 +13,7 @@
 #include <deque>
 #include <functional>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <string.h>

Source/cmForEachCommand.cxx

@@ -2,7 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmForEachCommand.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>

Source/cmGeneratorExpression.cxx

@@ -3,7 +3,7 @@
 #include "cmGeneratorExpression.h"
 
 #include "cmsys/RegularExpression.hxx"
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <utility>
 
 #include "assert.h"

Source/cmGeneratorExpression.h

@@ -8,7 +8,7 @@
 #include "cmListFileCache.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <utility>

Source/cmGeneratorExpressionEvaluationFile.cxx

@@ -3,7 +3,7 @@
 #include "cmGeneratorExpressionEvaluationFile.h"
 
 #include "cmsys/FStream.hxx"
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <utility>
 

Source/cmGeneratorExpressionEvaluationFile.h

@@ -6,7 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmGeneratorExpressionNode.cxx

@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <iterator>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <sstream>
 #include <stdlib.h>

Source/cmGeneratorTarget.cxx

@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <queue>
 #include <sstream>
 #include <stdio.h>

Source/cmGhsMultiTargetGenerator.cxx

@@ -22,9 +22,11 @@
 #include "cmTarget.h"
 
 #include <algorithm>
+#include <memory>
 #include <ostream>
 #include <set>
 #include <utility>
+#include <vector>
 
 cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget* target)
   : GeneratorTarget(target)

Source/cmGlobalGenerator.h

@@ -7,6 +7,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>

Source/cmGlobalNinjaGenerator.cxx

@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 

Source/cmGlobalNinjaGenerator.h

@@ -7,7 +7,7 @@
 
 #include <iosfwd>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>

Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <memory>
 #include <sstream>
 #include <utility>
 

Source/cmGlobalXCodeGenerator.cxx

@@ -5,7 +5,7 @@
 #include "cmsys/RegularExpression.hxx"
 #include <assert.h>
 #include <iomanip>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <string.h>

Source/cmGraphVizWriter.cxx

@@ -4,7 +4,7 @@
 
 #include <cstddef>
 #include <iostream>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <utility>
 

Source/cmIfCommand.cxx

@@ -11,7 +11,7 @@
 #include "cmSystemTools.h"
 #include "cmake.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 
 static std::string cmIfCommandError(
   std::vector<cmExpandedCommandArgument> const& args)

Source/cmInstallDirectoryGenerator.cxx

@@ -8,7 +8,7 @@
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 
 cmInstallDirectoryGenerator::cmInstallDirectoryGenerator(
   std::vector<std::string> const& dirs, const char* dest,

Source/cmInstallFilesGenerator.cxx

@@ -6,7 +6,7 @@
 #include "cmInstallType.h"
 #include "cmSystemTools.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 
 class cmLocalGenerator;
 

Source/cmInstallScriptGenerator.cxx

@@ -2,6 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmInstallScriptGenerator.h"
 
+#include <memory>
 #include <ostream>
 #include <vector>
 

Source/cmInstallTargetGenerator.cxx

@@ -4,6 +4,7 @@
 
 #include <assert.h>
 #include <map>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <utility>

Source/cmInstalledFile.h

@@ -8,7 +8,7 @@
 #include "cmGeneratorExpression.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmJsonObjects.cxx

@@ -31,6 +31,7 @@
 #include <functional>
 #include <limits>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>

Source/cmListCommand.cxx

@@ -7,12 +7,14 @@
 #include <assert.h>
 #include <functional>
 #include <iterator>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h> // required for atoi
 #include <utility>
+#include <vector>
 
 #include "cmAlgorithms.h"
 #include "cmGeneratorExpression.h"

Source/cmListFileCache.h

@@ -6,7 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <iosfwd>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <stddef.h>
 #include <string>
 #include <utility>

Source/cmLocalGenerator.cxx

@@ -26,22 +26,24 @@
 #include "cmTestGenerator.h"
 #include "cmVersion.h"
 #include "cmake.h"
+#include "cmsys/RegularExpression.hxx"
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #  define CM_LG_ENCODE_OBJECT_NAMES
 #  include "cmCryptoHash.h"
 #endif
 
-#include "cmsys/RegularExpression.hxx"
 #include <algorithm>
 #include <assert.h>
 #include <initializer_list>
 #include <iterator>
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
 #if defined(__HAIKU__)
 #  include <FindDirectory.h>

Source/cmLocalNinjaGenerator.cxx

@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <assert.h>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <utility>

Source/cmLocalUnixMakefileGenerator3.cxx

@@ -5,7 +5,7 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/Terminal.h"
 #include <algorithm>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <utility>

Source/cmLocalVisualStudioGenerator.h

@@ -6,7 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 
 #include "cmGlobalVisualStudioGenerator.h"

Source/cmMakefile.cxx

@@ -9,7 +9,7 @@
 #include <cstring>
 #include <ctype.h>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>

Source/cmMakefile.h

@@ -8,7 +8,7 @@
 #include "cmsys/RegularExpression.hxx"
 #include <deque>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <stack>
 #include <stddef.h>

Source/cmMakefileExecutableTargetGenerator.cxx

@@ -2,7 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMakefileExecutableTargetGenerator.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <sstream>
 #include <string>

Source/cmMakefileLibraryTargetGenerator.cxx

@@ -2,7 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMakefileLibraryTargetGenerator.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <sstream>
 #include <stddef.h>

Source/cmMakefileTargetGenerator.cxx

@@ -2,7 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMakefileTargetGenerator.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <utility>

Source/cmMakefileTargetGenerator.h

@@ -7,6 +7,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

Source/cmMakefileUtilityTargetGenerator.cxx

@@ -2,6 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMakefileUtilityTargetGenerator.h"
 
+#include <memory>
 #include <ostream>
 #include <string>
 #include <utility>

Source/cmNinjaNormalTargetGenerator.cxx

@@ -6,7 +6,7 @@
 #include <assert.h>
 #include <iterator>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <sstream>
 #include <utility>

Source/cmNinjaTargetGenerator.cxx

@@ -8,7 +8,7 @@
 #include <assert.h>
 #include <iterator>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <ostream>
 #include <utility>
 

Source/cmNinjaTargetGenerator.h

@@ -13,7 +13,7 @@
 #include "cmOSXBundleGenerator.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

Source/cmOrderDirectories.cxx

@@ -13,6 +13,7 @@
 #include <assert.h>
 #include <functional>
 #include <sstream>
+#include <vector>
 
 /*
 Directory ordering computation.

Source/cmQtAutoGen.h

@@ -5,7 +5,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmQtAutoGenGlobalInitializer.h

@@ -8,7 +8,7 @@
 #include "cmQtAutoGen.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>

Source/cmQtAutoGenInitializer.h

@@ -8,7 +8,7 @@
 #include "cmQtAutoGen.h"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <ostream>
 #include <set>
 #include <string>

Source/cmQtAutoGenerator.cxx

@@ -14,6 +14,8 @@
 #include "cmSystemTools.h"
 #include "cmake.h"
 
+#include <memory>
+
 cmQtAutoGenerator::Logger::Logger()
 {
   // Initialize logger

Source/cmQtAutoMocUic.h

@@ -14,7 +14,7 @@
 #include <atomic>
 #include <cstddef>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>

Source/cmRuntimeDependencyArchive.h

@@ -9,7 +9,7 @@
 #include "cmsys/RegularExpression.hxx"
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

Source/cmServer.h

@@ -10,7 +10,7 @@
 
 #include "cmUVHandlePtr.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmState.h

@@ -6,6 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>

Source/cmStateDirectory.cxx

@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <assert.h>
 #include <iterator>
+#include <vector>
 
 #include "cmAlgorithms.h"
 #include "cmProperty.h"

Source/cmStringCommand.cxx

@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>

Source/cmTarget.h

@@ -6,7 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <iosfwd>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <utility>

Source/cmTestGenerator.cxx

@@ -2,8 +2,10 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmTestGenerator.h"
 
+#include <memory>
 #include <ostream>
 #include <utility>
+#include <vector>
 
 #include "cmGeneratorExpression.h"
 #include "cmGeneratorTarget.h"

Source/cmUVProcessChain.h

@@ -7,7 +7,7 @@
 
 #include <array>
 #include <iosfwd>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmVariableWatch.h

@@ -6,7 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <string>
 #include <vector>
 

Source/cmVisualStudio10TargetGenerator.cxx

@@ -19,7 +19,7 @@
 #include "windows.h"
 
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 
 static void ConvertToWindowsSlash(std::string& s);

Source/cmWhileCommand.cxx

@@ -9,7 +9,7 @@
 #include "cmMessageType.h"
 #include "cmSystemTools.h"
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 
 cmWhileFunctionBlocker::cmWhileFunctionBlocker(cmMakefile* mf)
   : Makefile(mf)

Source/cmWorkerPool.h

@@ -7,7 +7,7 @@
 
 #include "cmAlgorithms.h" // IWYU pragma: keep
 
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <stdint.h>
 #include <string>
 #include <utility>

Source/cmake.cxx

@@ -104,7 +104,7 @@
 #include <cstring>
 #include <initializer_list>
 #include <iostream>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>

Source/cmake.h

@@ -7,7 +7,7 @@
 
 #include <functional>
 #include <map>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_set>

Source/cmcmd.cxx

@@ -41,7 +41,7 @@
 #include <array>
 #include <iostream>
 #include <iterator>
-#include <memory> // IWYU pragma: keep
+#include <memory>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>

Tests/CMakeLib/testUVProcessChain.cxx

@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <functional>
 #include <iostream>
+#include <memory>
 #include <sstream>
 #include <string>
 #include <vector>

Tests/CMakeServerLib/testServerBuffering.cpp

@@ -1,6 +1,8 @@
 #include "cmConnection.h"
 #include "cmServerConnection.h"
+
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
 

Utilities/IWYU/mapping.imp

@@ -42,10 +42,17 @@
   { symbol: [ "std::istringstream", private, "<sstream>", public ] },
   { symbol: [ "std::ostringstream", private, "<sstream>", public ] },
 
-  # HACK: iwyu suggests those two files each time vector[] is used.
+  # HACK: iwyu suggests <ext/alloc_traits.h> and <memory> each time vector[] is used.
   # https://github.com/include-what-you-use/include-what-you-use/issues/166
   { include: [ "<ext/alloc_traits.h>", private, "<vector>", public ] },
-  { include: [ "<memory>", public, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<cmComputeComponentGraph::TarjanEntry> >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<cmFortranFile> >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<cmGraphEdgeList> >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<cmOrderDirectories::ConflictList> >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<cmStateSnapshot> >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<std::basic_string<char> > >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > > > >::value_type", private, "<vector>", public ] },
+  { symbol: [ "std::allocator_traits<std::allocator<uv_stdio_container_s> >::value_type", private, "<vector>", public ] },
 
   # TODO: enable this block and remove some <utility> includes?
   #{ symbol: [ "std::pair", private, "<utility>", public ] },