iwyu: Fix OSX specific issues

Source/CPack/OSXScriptLauncher.cxx

@@ -3,8 +3,10 @@
 #include <cmsys/FStream.hxx>
 #include <cmsys/Process.h>
 #include <cmsys/SystemTools.hxx>
-
 #include <iostream>
+#include <stddef.h>
+#include <string>
+#include <vector>
 
 #include <CoreFoundation/CoreFoundation.h>
 

Source/CPack/cmCPackBundleGenerator.cxx

@@ -2,11 +2,12 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackBundleGenerator.h"
 
+#include <sstream>
+#include <vector>
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 
-#include <cmsys/RegularExpression.hxx>
-
 cmCPackBundleGenerator::cmCPackBundleGenerator()
 {
 }

Source/CPack/cmCPackBundleGenerator.h

@@ -3,7 +3,11 @@
 #ifndef cmCPackBundleGenerator_h
 #define cmCPackBundleGenerator_h
 
+#include <cmConfigure.h>
+#include <string>
+
 #include "cmCPackDragNDropGenerator.h"
+#include "cmCPackGenerator.h"
 
 /** \class cmCPackBundleGenerator
  * \brief A generator for OSX bundles

Source/CPack/cmCPackDragNDropGenerator.cxx

@@ -2,14 +2,16 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackDragNDropGenerator.h"
 
+#include "cmCPackGenerator.h"
 #include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 
 #include <cmsys/FStream.hxx>
 #include <cmsys/RegularExpression.hxx>
-
 #include <iomanip>
+#include <map>
+#include <stdlib.h>
 
 #include <CoreFoundation/CoreFoundation.h>
 

Source/CPack/cmCPackDragNDropGenerator.h

@@ -3,6 +3,12 @@
 #ifndef cmCPackDragNDropGenerator_h
 #define cmCPackDragNDropGenerator_h
 
+#include <cmConfigure.h>
+#include <sstream>
+#include <stddef.h>
+#include <string>
+#include <vector>
+
 #include "cmCPackGenerator.h"
 
 class cmGeneratedFileStream;

Source/CPack/cmCPackOSXX11Generator.cxx

@@ -2,16 +2,13 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackOSXX11Generator.h"
 
+#include <sstream>
+#include <sys/stat.h>
+
+#include "cmCPackGenerator.h"
 #include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
-#include "cmGlobalGenerator.h"
-#include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmake.h"
-
-#include <cmsys/Glob.hxx>
-#include <cmsys/SystemTools.hxx>
-#include <sys/stat.h>
 
 cmCPackOSXX11Generator::cmCPackOSXX11Generator()
 {

Source/CPack/cmCPackOSXX11Generator.h

@@ -3,6 +3,9 @@
 #ifndef cmCPackOSXX11Generator_h
 #define cmCPackOSXX11Generator_h
 
+#include <cmConfigure.h>
+#include <string>
+
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackOSXX11Generator

Source/CPack/cmCPackPKGGenerator.cxx

@@ -2,18 +2,13 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackPKGGenerator.h"
 
+#include <vector>
+
 #include "cmCPackComponentGroup.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackLog.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
-#include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
-#include "cmake.h"
-
-#include <cmsys/Glob.hxx>
-#include <cmsys/SystemTools.hxx>
 
 cmCPackPKGGenerator::cmCPackPKGGenerator()
 {

Source/CPack/cmCPackPKGGenerator.h

@@ -5,10 +5,12 @@
 
 #include <cmConfigure.h>
 #include <set>
+#include <sstream>
+#include <string>
 
+#include "cmCPackComponentGroup.h"
 #include "cmCPackGenerator.h"
 
-class cmCPackComponent;
 class cmXMLWriter;
 
 /** \class cmCPackPKGGenerator

Source/CPack/cmCPackPackageMakerGenerator.cxx

@@ -2,20 +2,20 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackPackageMakerGenerator.h"
 
+#include <assert.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
+#include <map>
+#include <sstream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+
 #include "cmCPackComponentGroup.h"
 #include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
-#include "cmGlobalGenerator.h"
-#include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
-#include "cmake.h"
-
-#include <cmsys/FStream.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/SystemTools.hxx>
-
-#include <assert.h>
 
 static inline unsigned int getVersion(unsigned int major, unsigned int minor)
 {

Source/CPack/cmCPackPackageMakerGenerator.h

@@ -3,6 +3,9 @@
 #ifndef cmCPackPackageMakerGenerator_h
 #define cmCPackPackageMakerGenerator_h
 
+#include <cmConfigure.h>
+
+#include "cmCPackGenerator.h"
 #include "cmCPackPKGGenerator.h"
 
 class cmCPackComponent;

Source/CPack/cmCPackProductBuildGenerator.cxx

@@ -2,17 +2,14 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackProductBuildGenerator.h"
 
+#include <map>
+#include <sstream>
+#include <stddef.h>
+
 #include "cmCPackComponentGroup.h"
 #include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
-#include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
-#include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmake.h"
-
-#include <cmsys/Glob.hxx>
-#include <cmsys/SystemTools.hxx>
 
 cmCPackProductBuildGenerator::cmCPackProductBuildGenerator()
 {

Source/CPack/cmCPackProductBuildGenerator.h

@@ -3,6 +3,10 @@
 #ifndef cmCPackProductBuildGenerator_h
 #define cmCPackProductBuildGenerator_h
 
+#include <cmConfigure.h>
+#include <string>
+
+#include "cmCPackGenerator.h"
 #include "cmCPackPKGGenerator.h"
 
 class cmCPackComponent;

Source/cmGlobalXCodeGenerator.cxx

@@ -2,20 +2,35 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmGlobalXCodeGenerator.h"
 
-#include "cmAlgorithms.h"
+#include <assert.h>
+#include <cmsys/RegularExpression.hxx>
+#include <iomanip>
+#include <sstream>
+#include <stdio.h>
+#include <string.h>
+
 #include "cmComputeLinkInformation.h"
 #include "cmCustomCommandGenerator.h"
+#include "cmDocumentationEntry.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpression.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalGeneratorFactory.h"
+#include "cmLocalGenerator.h"
 #include "cmLocalXCodeGenerator.h"
 #include "cmMakefile.h"
+#include "cmOutputConverter.h"
 #include "cmSourceFile.h"
+#include "cmSourceGroup.h"
+#include "cmStateTypes.h"
+#include "cmSystemTools.h"
+#include "cmTarget.h"
 #include "cmXCode21Object.h"
 #include "cmXCodeObject.h"
+#include "cm_auto_ptr.hxx"
 #include "cmake.h"
 
-#include <cm_auto_ptr.hxx>
+struct cmLinkImplementation;
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include "cmXMLParser.h"

Source/cmGlobalXCodeGenerator.h

@@ -3,13 +3,25 @@
 #ifndef cmGlobalXCodeGenerator_h
 #define cmGlobalXCodeGenerator_h
 
-#include "cmGlobalGenerator.h"
+#include <cmConfigure.h>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
 
-#include "cmCustomCommand.h"
+#include "cmGlobalGenerator.h"
 #include "cmXCodeObject.h"
+
+class cmCustomCommand;
+class cmGeneratorTarget;
 class cmGlobalGeneratorFactory;
+class cmLocalGenerator;
+class cmMakefile;
 class cmSourceFile;
 class cmSourceGroup;
+class cmake;
+struct cmDocumentationEntry;
 
 /** \class cmGlobalXCodeGenerator
  * \brief Write a Unix makefiles.

Source/cmLocalXCodeGenerator.cxx

@@ -4,9 +4,12 @@
 
 #include "cmGeneratorTarget.h"
 #include "cmGlobalXCodeGenerator.h"
-#include "cmMakefile.h"
 #include "cmSourceFile.h"
 
+class cmGeneratorTarget;
+class cmGlobalGenerator;
+class cmMakefile;
+
 cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg,
                                              cmMakefile* mf)
   : cmLocalGenerator(gg, mf)

Source/cmLocalXCodeGenerator.h

@@ -3,8 +3,17 @@
 #ifndef cmLocalXCodeGenerator_h
 #define cmLocalXCodeGenerator_h
 
+#include <cmConfigure.h> // IWYU pragma: keep
+#include <map>
+#include <string>
+
 #include "cmLocalGenerator.h"
 
+class cmGeneratorTarget;
+class cmGlobalGenerator;
+class cmMakefile;
+class cmSourceFile;
+
 /** \class cmLocalXCodeGenerator
  * \brief Write a local Xcode project
  *

Source/cmMachO.cxx

@@ -1,10 +1,12 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
-#include "cmStandardIncludes.h" // to get CMAKE_USE_MACH_PARSER first
-
 #include "cmMachO.h"
 
+#include <algorithm>
 #include <cmsys/FStream.hxx>
+#include <stddef.h>
+#include <string>
+#include <vector>
 
 // Include the Mach-O format information system header.
 #include <mach-o/fat.h>

Source/cmMachO.h

@@ -3,6 +3,11 @@
 #ifndef cmMachO_h
 #define cmMachO_h
 
+#include <cmConfigure.h>
+
+#include <iosfwd>
+#include <string>
+
 #if !defined(CMAKE_USE_MACH_PARSER)
 #error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
 #endif

Source/cmXCode21Object.cxx

@@ -2,6 +2,9 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmXCode21Object.h"
 
+#include <ostream>
+#include <string>
+
 #include "cmSystemTools.h"
 
 cmXCode21Object::cmXCode21Object(PBXType ptype, Type type)

Source/cmXCode21Object.h

@@ -3,6 +3,11 @@
 #ifndef cmXCode21Object_h
 #define cmXCode21Object_h
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <iosfwd>
+#include <vector>
+
 #include "cmXCodeObject.h"
 
 class cmXCode21Object : public cmXCodeObject

Source/cmXCodeObject.cxx

@@ -2,9 +2,10 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmXCodeObject.h"
 
-#include "cmSystemTools.h"
+#include <CoreFoundation/CoreFoundation.h>
+#include <ostream>
 
-#include <CoreFoundation/CoreFoundation.h> // CFUUIDCreate
+#include "cmSystemTools.h"
 
 const char* cmXCodeObject::PBXTypeNames[] = {
   /* clang-format needs this comment to break after the opening brace */

Source/cmXCodeObject.h

@@ -3,9 +3,14 @@
 #ifndef cmXCodeObject_h
 #define cmXCodeObject_h
 
-#include <cmConfigure.h>
+#include <cmConfigure.h> // IWYU pragma: keep
 
-#include "cmStandardIncludes.h"
+#include <algorithm>
+#include <iosfwd>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 class cmGeneratorTarget;
 

Source/cmakexbuild.cxx

@@ -1,9 +1,14 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
-#include "cmStandardIncludes.h"
 
-#include "cmSystemTools.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
 #include <cmsys/Process.h>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "cmSystemTools.h"
 
 // This is a wrapper program for xcodebuild
 // it calls xcodebuild, and does two things

Tests/CMakeLib/run_compile_commands.cxx

@@ -1,4 +1,4 @@
-#include "cmSystemTools.h"
+#include <cmConfigure.h>
 
 #include <cmsys/FStream.hxx>
 #include <iostream>
@@ -8,6 +8,8 @@
 #include <utility>
 #include <vector>
 
+#include "cmSystemTools.h"
+
 class CompileCommandParser
 {
 public: