Cleanup: unused includes in source/blender/io

Reduce dependence on Blender headers as much as possible and move closer
to an include-what-you-use setup.

- Removes unnecessary includes
- Replaces some includes with more appropriate, narrower, substitutes

Pull Request: https://projects.blender.org/blender/blender/pulls/119234

source/blender/io/alembic/exporter/abc_archive.cc

@@ -6,14 +6,18 @@
 
 #include "BKE_blender_version.h"
 #include "BKE_main.hh"
-#include "BKE_scene.hh"
-
-#include "DEG_depsgraph_query.hh"
 
 #include "DNA_scene_types.h"
 
-#include <Alembic/AbcCoreOgawa/All.h>
-#include <Alembic/AbcGeom/All.h>
+#include <Alembic/Abc/ArchiveInfo.h>
+#include <Alembic/Abc/ErrorHandler.h>
+#include <Alembic/Abc/Foundation.h>
+#include <Alembic/Abc/OArchive.h>
+#include <Alembic/AbcCoreAbstract/MetaData.h>
+#include <Alembic/AbcCoreAbstract/TimeSampling.h>
+#include <Alembic/AbcCoreAbstract/TimeSamplingType.h>
+#include <Alembic/AbcCoreOgawa/ReadWrite.h>
+#include <Alembic/AbcGeom/ArchiveBounds.h>
 
 #ifdef WIN32
 #  include "BLI_path_util.h"

source/blender/io/alembic/exporter/abc_custom_props.cc

@@ -10,13 +10,9 @@
 
 #include "abc_writer_abstract.h"
 
-#include <functional>
-#include <iostream>
-#include <memory>
 #include <string>
 
 #include <Alembic/Abc/OTypedArrayProperty.h>
-#include <Alembic/Abc/OTypedScalarProperty.h>
 
 #include "BLI_listbase.h"
 

source/blender/io/alembic/exporter/abc_custom_props.h

@@ -13,7 +13,7 @@
 
 #include "BLI_map.hh"
 
-#include <memory>
+#include <string>
 
 struct IDProperty;
 

source/blender/io/alembic/exporter/abc_export_capi.cc

@@ -13,10 +13,8 @@
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_blender_version.h"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
 #include "BKE_main.hh"
@@ -33,7 +31,6 @@
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.alembic"};
 
-#include <algorithm>
 #include <memory>
 
 struct ExportJobData {

source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc

@@ -19,9 +19,6 @@
 
 #include "BLI_assert.h"
 
-#include "DEG_depsgraph_query.hh"
-
-#include "DNA_ID.h"
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"
 

source/blender/io/alembic/exporter/abc_hierarchy_iterator.h

@@ -10,7 +10,6 @@
 
 #include <string>
 
-#include <Alembic/Abc/OArchive.h>
 #include <Alembic/Abc/OObject.h>
 
 struct Depsgraph;

source/blender/io/alembic/exporter/abc_writer_abstract.cc

@@ -4,14 +4,8 @@
 #include "abc_writer_abstract.h"
 #include "abc_hierarchy_iterator.h"
 
-#include "BKE_animsys.h"
-#include "BKE_key.hh"
 #include "BKE_object.hh"
 
-#include "DNA_modifier_types.h"
-
-#include "DEG_depsgraph.hh"
-
 #include <Alembic/AbcGeom/Visibility.h>
 
 #include "CLG_log.h"

source/blender/io/alembic/exporter/abc_writer_abstract.h

@@ -8,10 +8,8 @@
 #include "abc_hierarchy_iterator.h"
 
 #include <Alembic/Abc/OObject.h>
-#include <vector>
 
-#include "DEG_depsgraph_query.hh"
-#include "DNA_material_types.h"
+#include <memory>
 
 struct IDProperty;
 struct Object;

source/blender/io/alembic/exporter/abc_writer_camera.cc

@@ -9,10 +9,9 @@
 #include "abc_writer_camera.h"
 #include "abc_hierarchy_iterator.h"
 
-#include "BKE_camera.h"
 #include "BKE_scene.hh"
 
-#include "BLI_assert.h"
+#include "DEG_depsgraph_query.hh"
 
 #include "DNA_camera_types.h"
 #include "DNA_scene_types.h"

source/blender/io/alembic/exporter/abc_writer_hair.cc

@@ -9,19 +9,14 @@
 #include "abc_writer_hair.h"
 #include "intern/abc_axis_conversion.h"
 
-#include <cstdio>
-
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
 #include "BKE_customdata.hh"
-#include "BKE_mesh.hh"
 #include "BKE_mesh_legacy_convert.hh"
 #include "BKE_mesh_runtime.hh"
 #include "BKE_object.hh"

source/blender/io/alembic/exporter/abc_writer_mball.cc

@@ -9,16 +9,14 @@
 #include "abc_writer_mball.h"
 #include "abc_hierarchy_iterator.h"
 
-#include "BLI_assert.h"
-
-#include "BKE_displist.h"
 #include "BKE_lib_id.hh"
 #include "BKE_mball.hh"
 #include "BKE_mesh.hh"
 #include "BKE_object.hh"
 
+#include "DEG_depsgraph_query.hh"
+
 #include "DNA_mesh_types.h"
-#include "DNA_meta_types.h"
 
 namespace blender::io::alembic {
 

source/blender/io/alembic/exporter/abc_writer_mesh.cc

@@ -10,28 +10,21 @@
 #include "abc_hierarchy_iterator.h"
 #include "intern/abc_axis_conversion.h"
 
-#include "BLI_array_utils.hh"
-#include "BLI_assert.h"
 #include "BLI_math_vector.h"
 
 #include "BKE_attribute.hh"
-#include "BKE_customdata.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 
 #include "bmesh.hh"
 #include "bmesh_tools.hh"
 
-#include "DEG_depsgraph.hh"
-
-#include "DNA_layer_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_fluidsim_types.h"
-#include "DNA_particle_types.h"
 
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.alembic"};

source/blender/io/alembic/exporter/abc_writer_nurbs.h

@@ -9,6 +9,9 @@
 
 #include "abc_writer_abstract.h"
 #include "abc_writer_mesh.h"
+
+#include <Alembic/AbcGeom/ONuPatch.h>
+
 #include <vector>
 
 namespace blender::io::alembic {

source/blender/io/alembic/exporter/abc_writer_points.cc

@@ -14,7 +14,6 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "BKE_lattice.hh"
 #include "BKE_particle.h"
 
 #include "DEG_depsgraph_query.hh"

source/blender/io/alembic/exporter/abc_writer_transform.cc

@@ -16,8 +16,6 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 
-#include "DNA_layer_types.h"
-
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.alembic"};
 

source/blender/io/alembic/exporter/abc_writer_transform.h

@@ -9,8 +9,6 @@
 
 #include "abc_writer_abstract.h"
 
-#include <memory>
-
 #include <Alembic/AbcGeom/OXform.h>
 
 namespace blender::io::alembic {

source/blender/io/alembic/intern/abc_axis_conversion.cc

@@ -9,7 +9,6 @@
 #include "abc_axis_conversion.h"
 
 #include "BLI_assert.h"
-#include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"

source/blender/io/alembic/intern/abc_customdata.cc

@@ -9,16 +9,22 @@
 #include "abc_customdata.h"
 #include "abc_axis_conversion.h"
 
-#include <Alembic/AbcGeom/All.h>
-#include <algorithm>
-#include <unordered_map>
+#include <Alembic/Abc/ICompoundProperty.h>
+#include <Alembic/Abc/ISampleSelector.h>
+#include <Alembic/Abc/OCompoundProperty.h>
+#include <Alembic/Abc/TypedArraySample.h>
+#include <Alembic/AbcCoreAbstract/PropertyHeader.h>
+#include <Alembic/AbcGeom/GeometryScope.h>
+#include <Alembic/AbcGeom/IGeomParam.h>
+#include <Alembic/AbcGeom/OGeomParam.h>
 
 #include "DNA_customdata_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "BLI_math_base.h"
-#include "BLI_math_geom.h"
+#include "BLI_math_vector.h"
+#include "BLI_math_vector_types.hh"
 #include "BLI_utildefines.h"
 
 #include "BKE_attribute.hh"

source/blender/io/alembic/intern/abc_customdata.h

@@ -9,12 +9,18 @@
 
 #include "BLI_math_vector_types.hh"
 
-#include <Alembic/Abc/All.h>
-#include <Alembic/AbcGeom/All.h>
+#include <Alembic/Abc/ICompoundProperty.h>
+#include <Alembic/Abc/ISampleSelector.h>
+#include <Alembic/Abc/OCompoundProperty.h>
+#include <Alembic/Abc/TypedArraySample.h>
+#include <Alembic/AbcCoreAbstract/Foundation.h>
+#include <Alembic/AbcGeom/GeometryScope.h>
+#include <Alembic/AbcGeom/OGeomParam.h>
 
+#include <cstdint>
 #include <map>
-
-#include "BLI_math_vector_types.hh"
+#include <string>
+#include <vector>
 
 struct CustomData;
 struct Mesh;

source/blender/io/alembic/intern/abc_reader_archive.cc

@@ -9,6 +9,7 @@
 #include "abc_reader_archive.h"
 
 #include "Alembic/AbcCoreLayer/Read.h"
+#include "Alembic/AbcCoreOgawa/ReadWrite.h"
 
 #include "BKE_main.hh"
 
@@ -20,6 +21,7 @@
 #endif
 
 #include <fstream>
+#include <vector>
 
 using Alembic::Abc::ErrorHandler;
 using Alembic::Abc::Exception;

source/blender/io/alembic/intern/abc_reader_archive.h

@@ -7,10 +7,11 @@
  * \ingroup balembic
  */
 
-#include <Alembic/Abc/All.h>
-#include <Alembic/AbcCoreOgawa/All.h>
+#include <Alembic/Abc/IArchive.h>
+#include <Alembic/Abc/IObject.h>
 
 #include <fstream>
+#include <vector>
 
 struct Main;
 

source/blender/io/alembic/intern/abc_reader_camera.cc

@@ -7,7 +7,6 @@
  */
 
 #include "abc_reader_camera.h"
-#include "abc_reader_transform.h"
 #include "abc_util.h"
 
 #include "DNA_camera_types.h"

source/blender/io/alembic/intern/abc_reader_camera.h

@@ -9,6 +9,8 @@
 
 #include "abc_reader_object.h"
 
+#include <Alembic/AbcGeom/ICamera.h>
+
 namespace blender::io::alembic {
 
 class AbcCameraReader final : public AbcObjectReader {

source/blender/io/alembic/intern/abc_reader_curves.cc

@@ -16,7 +16,6 @@
 #include "DNA_object_types.h"
 
 #include "BKE_attribute.hh"
-#include "BKE_curve.hh"
 #include "BKE_curves.hh"
 #include "BKE_geometry_set.hh"
 #include "BKE_object.hh"

source/blender/io/alembic/intern/abc_reader_curves.h

@@ -7,9 +7,10 @@
  * \ingroup balembic
  */
 
-#include "abc_reader_mesh.h"
 #include "abc_reader_object.h"
 
+#include <Alembic/AbcGeom/ICurves.h>
+
 struct Curves;
 
 #define ABC_CURVE_RESOLUTION_U_PROPNAME "blender:resolution"

source/blender/io/alembic/intern/abc_reader_mesh.cc

@@ -8,38 +8,33 @@
 
 #include "abc_reader_mesh.h"
 #include "abc_axis_conversion.h"
-#include "abc_reader_transform.h"
+#include "abc_customdata.h"
 #include "abc_util.h"
 
-#include <algorithm>
-
-#include "MEM_guardedalloc.h"
-
 #include "DNA_customdata_types.h"
 #include "DNA_material_types.h"
+#include "DNA_modifier_types.h"
+
 #include "DNA_object_types.h"
 
 #include "BLI_compiler_compat.h"
-#include "BLI_index_range.hh"
 #include "BLI_listbase.h"
-#include "BLI_math_geom.h"
+#include "BLI_map.hh"
+#include "BLI_math_vector.h"
 #include "BLI_ordered_edge.hh"
 
 #include "BLT_translation.hh"
 
-#include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_geometry_set.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 
 using Alembic::Abc::FloatArraySamplePtr;
 using Alembic::Abc::Int32ArraySamplePtr;
-using Alembic::Abc::IV3fArrayProperty;
 using Alembic::Abc::P3fArraySamplePtr;
 using Alembic::Abc::PropertyHeader;
 using Alembic::Abc::V3fArraySamplePtr;

source/blender/io/alembic/intern/abc_reader_mesh.h

@@ -9,9 +9,11 @@
 
 #include "BLI_span.hh"
 
-#include "abc_customdata.h"
 #include "abc_reader_object.h"
 
+#include <Alembic/AbcGeom/IPolyMesh.h>
+#include <Alembic/AbcGeom/ISubD.h>
+
 struct Mesh;
 
 namespace blender::io::alembic {

source/blender/io/alembic/intern/abc_reader_nurbs.cc

@@ -8,7 +8,6 @@
 
 #include "abc_reader_nurbs.h"
 #include "abc_axis_conversion.h"
-#include "abc_reader_transform.h"
 #include "abc_util.h"
 
 #include "MEM_guardedalloc.h"
@@ -17,7 +16,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
-#include "BLI_string.h"
 
 #include "BLT_translation.hh"
 

source/blender/io/alembic/intern/abc_reader_nurbs.h

@@ -9,6 +9,8 @@
 
 #include "abc_reader_object.h"
 
+#include <Alembic/AbcGeom/INuPatch.h>
+
 namespace blender::io::alembic {
 
 class AbcNurbsReader final : public AbcObjectReader {

source/blender/io/alembic/intern/abc_reader_object.cc

@@ -13,7 +13,7 @@
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX */
+#include "DNA_object_types.h"
 
 #include "BKE_constraint.h"
 #include "BKE_lib_id.hh"
@@ -22,12 +22,10 @@
 #include "BKE_object_types.hh"
 
 #include "BLI_listbase.h"
-#include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 using Alembic::AbcGeom::IObject;
 using Alembic::AbcGeom::IXform;

source/blender/io/alembic/intern/abc_reader_object.h

@@ -7,10 +7,14 @@
  * \ingroup balembic
  */
 
-#include <Alembic/Abc/All.h>
-#include <Alembic/AbcGeom/All.h>
+#include <Alembic/Abc/IObject.h>
+#include <Alembic/Abc/ISampleSelector.h>
+#include <Alembic/AbcCoreAbstract/Foundation.h>
+#include <Alembic/AbcCoreAbstract/ObjectHeader.h>
+#include <Alembic/AbcGeom/IXform.h>
 
-#include "DNA_ID.h"
+#include <string>
+#include <vector>
 
 struct CacheFile;
 struct Main;

source/blender/io/alembic/intern/abc_reader_points.cc

@@ -8,20 +8,14 @@
 
 #include "abc_reader_points.h"
 #include "abc_axis_conversion.h"
-#include "abc_reader_mesh.h"
-#include "abc_reader_transform.h"
 #include "abc_util.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_pointcloud_types.h"
 
 #include "BLT_translation.hh"
 
-#include "BKE_customdata.hh"
 #include "BKE_geometry_set.hh"
-#include "BKE_mesh.hh"
 #include "BKE_object.hh"
 #include "BKE_pointcloud.hh"
 

source/blender/io/alembic/intern/abc_reader_points.h

@@ -7,9 +7,10 @@
  * \ingroup balembic
  */
 
-#include "abc_customdata.h"
 #include "abc_reader_object.h"
 
+#include <Alembic/AbcGeom/IPoints.h>
+
 namespace blender::io::alembic {
 
 class AbcPointsReader final : public AbcObjectReader {

source/blender/io/alembic/intern/abc_reader_transform.cc

@@ -11,8 +11,6 @@
 
 #include "DNA_object_types.h"
 
-#include "BLI_utildefines.h"
-
 #include "BLT_translation.hh"
 
 #include "BKE_object.hh"

source/blender/io/alembic/intern/abc_reader_transform.h

@@ -9,7 +9,12 @@
 
 #include "abc_reader_object.h"
 
-#include <Alembic/AbcGeom/All.h>
+#include <Alembic/Abc/IObject.h>
+#include <Alembic/Abc/ISampleSelector.h>
+#include <Alembic/AbcCoreAbstract/ObjectHeader.h>
+#include <Alembic/AbcGeom/IXform.h>
+
+struct Object;
 
 namespace blender::io::alembic {
 

source/blender/io/alembic/intern/abc_util.cc

@@ -8,21 +8,20 @@
 
 #include "abc_util.h"
 
-#include "abc_axis_conversion.h"
 #include "abc_reader_camera.h"
 #include "abc_reader_curves.h"
 #include "abc_reader_mesh.h"
-#include "abc_reader_nurbs.h"
 #include "abc_reader_points.h"
 #include "abc_reader_transform.h"
 
+#include <Alembic/AbcGeom/ILight.h>
+#include <Alembic/AbcGeom/INuPatch.h>
 #include <Alembic/AbcMaterial/IMaterial.h>
 
 #include <algorithm>
 
 #include "DNA_object_types.h"
 
-#include "BLI_math_geom.h"
 #include "BLI_time.h"
 
 using Alembic::Abc::IV3fArrayProperty;
@@ -125,7 +124,8 @@ V3fArraySamplePtr get_velocity_prop(const Alembic::Abc::ICompoundProperty &schem
     const PropertyHeader &header = schema.getPropertyHeader(i);
 
     if (header.isCompound()) {
-      const ICompoundProperty &prop = ICompoundProperty(schema, header.getName());
+      const Alembic::Abc::ICompoundProperty &prop = Alembic::Abc::ICompoundProperty(
+          schema, header.getName());
 
       if (has_property(prop, name)) {
         /* Header cannot be null here, as its presence is checked via has_property, so it is safe

source/blender/io/alembic/intern/abc_util.h

@@ -7,10 +7,21 @@
  * \ingroup balembic
  */
 
-#include <Alembic/Abc/All.h>
-#include <Alembic/AbcGeom/All.h>
+#include "abc_reader_object.h"
 
+#include <Alembic/Abc/Foundation.h>
+#include <Alembic/Abc/ICompoundProperty.h>
+#include <Alembic/Abc/IObject.h>
+#include <Alembic/Abc/ISampleSelector.h>
+#include <Alembic/Abc/TypedArraySample.h>
+#include <Alembic/AbcCoreAbstract/Foundation.h>
+#include <Alembic/AbcCoreAbstract/TimeSampling.h>
+#include <Alembic/AbcGeom/IXform.h>
+
+#include <fstream>
 #include <optional>
+#include <string>
+#include <vector>
 
 using Alembic::Abc::chrono_t;
 using Alembic::Abc::V3fArraySamplePtr;

source/blender/io/alembic/intern/alembic_capi.cc

@@ -9,6 +9,7 @@
 #include "../ABC_alembic.h"
 #include "IO_types.hh"
 
+#include <Alembic/AbcGeom/ILight.h>
 #include <Alembic/AbcMaterial/IMaterial.h>
 
 #include "abc_axis_conversion.h"
@@ -25,20 +26,15 @@
 
 #include "DNA_cachefile_types.h"
 #include "DNA_collection_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_cachefile.hh"
 #include "BKE_context.hh"
-#include "BKE_curve.hh"
 #include "BKE_global.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_object.hh"
-#include "BKE_scene.hh"
-#include "BKE_screen.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
@@ -46,8 +42,6 @@
 #include "ED_undo.hh"
 
 #include "BLI_compiler_compat.h"
-#include "BLI_fileops.h"
-#include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 #include "BLI_path_util.h"

source/blender/io/common/intern/object_identifier.cc

@@ -5,12 +5,6 @@
 
 #include "BKE_duplilist.hh"
 
-extern "C" {
-#include <climits> /* For INT_MAX. */
-}
-#include <cstring>
-#include <sstream>
-
 namespace blender::io {
 
 ObjectIdentifier::ObjectIdentifier(Object *object,

source/blender/io/ply/IO_ply.hh

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "BKE_context.hh"
-
 #include "BLI_path_util.h"
-#include "DNA_windowmanager_types.h"
 #include "IO_orientation.hh"
 
+struct bContext;
+struct ReportList;
+
 enum ePLYVertexColorMode {
   PLY_VERTEX_COLOR_NONE = 0,
   PLY_VERTEX_COLOR_SRGB = 1,

source/blender/io/ply/exporter/ply_export.cc

@@ -8,14 +8,9 @@
 
 #include <cstdio>
 
-#include "BKE_layer.hh"
+#include "BKE_context.hh"
 #include "BKE_report.hh"
 
-#include "DNA_collection_types.h"
-#include "DNA_scene_types.h"
-
-#include "BKE_context.hh"
-#include "BLI_memory_utils.hh"
 #include "IO_ply.hh"
 
 #include "ply_data.hh"

source/blender/io/ply/exporter/ply_export_load_plydata.cc

@@ -14,19 +14,21 @@
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_object.hh"
+#include "BLI_color.hh"
 #include "BLI_hash.hh"
-#include "BLI_math_color.hh"
 #include "BLI_math_matrix.h"
-#include "BLI_math_quaternion.hh"
+#include "BLI_math_quaternion_types.hh"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_vector.hh"
+
 #include "DEG_depsgraph_query.hh"
+
+#include "DNA_customdata_types.h"
 #include "DNA_layer_types.h"
 
 #include "bmesh.hh"
-#include "bmesh_tools.hh"
-#include <tools/bmesh_triangulate.hh>
+#include "tools/bmesh_triangulate.hh"
 
 namespace blender::io::ply {
 

source/blender/io/ply/exporter/ply_file_buffer.cc

@@ -8,7 +8,10 @@
 
 #include "ply_file_buffer.hh"
 
+#include "BLI_fileops.hh"
+
 #include <iostream>
+#include <system_error>
 
 namespace blender::io::ply {
 

source/blender/io/ply/exporter/ply_file_buffer.hh

@@ -10,8 +10,6 @@
 
 #include <type_traits>
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_fileops.h"
 #include "BLI_string_ref.hh"
 #include "BLI_utility_mixins.hh"
 #include "BLI_vector.hh"

source/blender/io/ply/importer/ply_import.cc

@@ -8,7 +8,6 @@
 
 #include "BKE_context.hh"
 #include "BKE_layer.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_object.hh"
 #include "BKE_report.hh"
@@ -20,7 +19,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
-#include "BLI_memory_utils.hh"
+#include "BLI_span.hh"
 #include "BLI_string.h"
 
 #include "DEG_depsgraph.hh"

source/blender/io/ply/importer/ply_import.hh

@@ -11,6 +11,11 @@
 #include "IO_ply.hh"
 #include "ply_data.hh"
 
+struct bContext;
+struct Main;
+struct Scene;
+struct ViewLayer;
+
 namespace blender::io::ply {
 
 class PlyReadBuffer;

source/blender/io/ply/importer/ply_import_buffer.cc

@@ -6,6 +6,7 @@
 
 #include "BLI_fileops.h"
 
+#include <cstdio>
 #include <cstring>
 #include <stdexcept>
 

source/blender/io/ply/importer/ply_import_buffer.hh

@@ -8,8 +8,7 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "BLI_array.hh"
 #include "BLI_span.hh"

source/blender/io/ply/importer/ply_import_data.cc

@@ -15,7 +15,6 @@
 
 #include "fast_float.h"
 
-#include <algorithm>
 #include <charconv>
 
 static bool is_whitespace(char c)

source/blender/io/ply/importer/ply_import_mesh.cc

@@ -7,15 +7,15 @@
  */
 
 #include "BKE_attribute.hh"
-#include "BKE_customdata.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
 #include "BKE_mesh_runtime.hh"
 
 #include "GEO_mesh_merge_by_distance.hh"
 
-#include "BLI_math_color.hh"
+#include "BLI_color.hh"
 #include "BLI_math_vector.h"
+#include "BLI_span.hh"
 
 #include "ply_import_mesh.hh"
 

source/blender/io/ply/importer/ply_import_mesh.hh

@@ -11,6 +11,8 @@
 #include "IO_ply.hh"
 #include "ply_data.hh"
 
+struct Mesh;
+
 namespace blender::io::ply {
 
 /**

source/blender/io/ply/intern/ply_data.hh

@@ -8,6 +8,9 @@
 
 #pragma once
 
+#include <string>
+#include <utility>
+
 #include "BLI_math_vector_types.hh"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"

source/blender/io/ply/tests/io_ply_exporter_test.cc

@@ -5,6 +5,7 @@
 #include "testing/testing.h"
 #include "tests/blendfile_loading_base_test.h"
 
+#include "BLI_fileops.h"
 #include "BLI_string.h"
 
 #include "BKE_appdir.hh"

source/blender/io/stl/IO_stl.hh

@@ -8,10 +8,12 @@
 
 #pragma once
 
-#include "BKE_context.hh"
 #include "BLI_path_util.h"
 #include "IO_orientation.hh"
 
+struct bContext;
+struct ReportList;
+
 struct STLImportParams {
   /** Full path to the source STL file to import. */
   char filepath[FILE_MAX];

source/blender/io/stl/exporter/stl_export.cc

@@ -11,7 +11,6 @@
 #include <string>
 
 #include "BKE_context.hh"
-#include "BKE_mesh.hh"
 #include "BKE_object.hh"
 #include "BKE_report.hh"
 
@@ -19,11 +18,11 @@
 
 #include "DEG_depsgraph_query.hh"
 
+#include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
-#include "BLI_math_vector.h"
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"
 

source/blender/io/stl/exporter/stl_export.hh

@@ -10,6 +10,9 @@
 
 #include "IO_stl.hh"
 
+struct bContext;
+struct Depsgraph;
+
 namespace blender::io::stl {
 
 void exporter_main(bContext *C, const STLExportParams &export_params);

source/blender/io/stl/importer/stl_import.cc

@@ -21,7 +21,6 @@
 #include "BLI_fileops.hh"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
-#include "BLI_math_vector.h"
 #include "BLI_memory_utils.hh"
 #include "BLI_string.h"
 

source/blender/io/stl/importer/stl_import.hh

@@ -10,6 +10,11 @@
 
 #include "IO_stl.hh"
 
+struct bContext;
+struct Main;
+struct Scene;
+struct ViewLayer;
+
 namespace blender::io::stl {
 
 void stl_import_report_error(FILE *file);

source/blender/io/stl/importer/stl_import_ascii_reader.cc

@@ -6,14 +6,11 @@
  * \ingroup stl
  */
 
-#include <cstdint>
 #include <cstdio>
-
-#include "BKE_mesh.hh"
+#include <system_error>
 
 #include "BLI_fileops.hh"
 #include "BLI_memory_utils.hh"
-#include "BLI_string_ref.hh"
 
 #include "DNA_mesh_types.h"
 
@@ -25,7 +22,6 @@
  * the minimum spec, use an external library. */
 #include "fast_float.h"
 
-#include "stl_import.hh"
 #include "stl_import_ascii_reader.hh"
 #include "stl_import_mesh.hh"
 

source/blender/io/stl/importer/stl_import_ascii_reader.hh

@@ -8,11 +8,7 @@
 
 #pragma once
 
-#include <cstdio>
-
-#include "BKE_mesh.h"
-
-#include "stl_import.hh"
+struct Mesh;
 
 /**
  * ASCII STL spec:

source/blender/io/stl/importer/stl_import_binary_reader.cc

@@ -9,11 +9,9 @@
 #include <cstdint>
 #include <cstdio>
 
-#include "BKE_main.hh"
 #include "BKE_mesh.hh"
 
 #include "BLI_array.hh"
-#include "BLI_memory_utils.hh"
 
 #include "DNA_mesh_types.h"
 

source/blender/io/stl/importer/stl_import_binary_reader.hh

@@ -10,17 +10,17 @@
 
 #include <cstdio>
 
-#include "BKE_mesh.h"
+struct Mesh;
 
 /*  Binary STL spec.:
- *   UINT8[80]    – Header                  - 80 bytes
- *   UINT32       – Number of triangles     - 4 bytes
+ *   UINT8[80]    - Header                  - 80 bytes
+ *   UINT32       - Number of triangles     - 4 bytes
  *   For each triangle                      - 50 bytes:
- *     REAL32[3]   – Normal vector          - 12 bytes
- *     REAL32[3]   – Vertex 1               - 12 bytes
- *     REAL32[3]   – Vertex 2               - 12 bytes
- *     REAL32[3]   – Vertex 3               - 12 bytes
- *     UINT16      – Attribute byte count   -  2 bytes
+ *     REAL32[3]   - Normal vector          - 12 bytes
+ *     REAL32[3]   - Vertex 1               - 12 bytes
+ *     REAL32[3]   - Vertex 2               - 12 bytes
+ *     REAL32[3]   - Vertex 3               - 12 bytes
+ *     UINT16      - Attribute byte count   -  2 bytes
  */
 
 namespace blender::io::stl {

source/blender/io/stl/importer/stl_import_mesh.cc

@@ -8,16 +8,10 @@
 
 #include <iostream>
 
-#include "BKE_customdata.hh"
-#include "BKE_lib_id.hh"
-#include "BKE_main.hh"
 #include "BKE_mesh.hh"
 
-#include "BLI_array.hh"
 #include "BLI_array_utils.hh"
-#include "BLI_math_vector.h"
-#include "BLI_math_vector.hh"
-#include "BLI_task.hh"
+#include "BLI_math_vector_types.hh"
 
 #include "stl_import_mesh.hh"
 

source/blender/io/stl/importer/stl_import_mesh.hh

@@ -11,7 +11,6 @@
 #include <cstdint>
 
 #include "BLI_math_vector_types.hh"
-#include "BLI_set.hh"
 #include "BLI_vector.hh"
 #include "BLI_vector_set.hh"
 

source/blender/io/wavefront_obj/IO_wavefront_obj.hh

@@ -10,13 +10,14 @@
 
 #include "BLI_path_util.h"
 
-#include "BKE_context.hh"
-
 #include "DEG_depsgraph.hh"
 
 #include "IO_orientation.hh"
 #include "IO_path_util_types.hh"
 
+struct bContext;
+struct ReportList;
+
 struct OBJExportParams {
   /** Full path to the destination .OBJ file. */
   char filepath[FILE_MAX];

source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc

@@ -14,7 +14,6 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
-#include "BLI_set.hh"
 
 #include "DNA_object_types.h"
 
@@ -22,6 +21,8 @@
 
 #include "importer_mesh_utils.hh"
 
+#include <numeric>
+
 namespace blender::io::obj {
 
 Vector<Vector<int>> fixup_invalid_face(Span<float3> vert_positions, Span<int> face_verts)

source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc

@@ -8,9 +8,10 @@
 
 #include "BKE_report.hh"
 
+#include "BLI_fileops.hh"
 #include "BLI_map.hh"
-#include "BLI_math_color.h"
 #include "BLI_math_vector.h"
+#include "BLI_math_vector_types.hh"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"

source/blender/io/wavefront_obj/importer/obj_import_file_reader.hh

@@ -8,13 +8,17 @@
 
 #pragma once
 
-#include "BLI_fileops.hh"
 #include "IO_wavefront_obj.hh"
-#include "obj_import_mtl.hh"
+
+#include "BLI_map.hh"
+#include "BLI_vector.hh"
+
 #include "obj_import_objects.hh"
 
 namespace blender::io::obj {
 
+struct MTLMaterial;
+
 /* NOTE: the OBJ parser implementation is planned to get fairly large changes "soon",
  * so don't read too much into current implementation... */
 class OBJParser {

source/blender/io/wavefront_obj/importer/obj_import_mesh.cc

@@ -8,13 +8,13 @@
 
 #include <iostream>
 
+#include "DNA_customdata_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_scene_types.h"
 
 #include "BKE_attribute.hh"
-#include "BKE_customdata.hh"
 #include "BKE_deform.hh"
+#include "BKE_lib_id.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
 #include "BKE_node_tree_update.hh"

source/blender/io/wavefront_obj/importer/obj_import_mesh.hh

@@ -8,14 +8,14 @@
 
 #pragma once
 
-#include "BKE_lib_id.hh"
-
 #include "BLI_utility_mixins.hh"
 
 #include "obj_import_mtl.hh"
 #include "obj_import_objects.hh"
 
+struct Main;
 struct Material;
+struct Object;
 
 namespace blender::io::obj {
 

source/blender/io/wavefront_obj/importer/obj_import_mtl.cc

@@ -10,7 +10,6 @@
 #include "BKE_main.hh"
 #include "BKE_node.hh"
 
-#include "BLI_map.hh"
 #include "BLI_math_vector.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
@@ -22,7 +21,6 @@
 
 #include "obj_export_mtl.hh"
 #include "obj_import_mtl.hh"
-#include "obj_import_string_utils.hh"
 
 #include <iostream>
 

source/blender/io/wavefront_obj/importer/obj_import_mtl.hh

@@ -4,8 +4,7 @@
 
 #pragma once
 
-#include "DNA_node_types.h"
-
+struct bNodeTree;
 struct Main;
 struct Material;
 

source/blender/io/wavefront_obj/importer/obj_import_objects.hh

@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "BKE_lib_id.hh"
-
 #include "BLI_map.hh"
 #include "BLI_math_base.hh"
 #include "BLI_math_vector_types.hh"

source/blender/io/wavefront_obj/importer/obj_importer.cc

@@ -9,7 +9,6 @@
 #include <string>
 
 #include "BLI_map.hh"
-#include "BLI_math_vector_types.hh"
 #include "BLI_set.hh"
 #include "BLI_sort.hh"
 #include "BLI_string.h"
@@ -17,7 +16,6 @@
 
 #include "BKE_context.hh"
 #include "BKE_layer.hh"
-#include "BKE_scene.hh"
 
 #include "DEG_depsgraph_build.hh"
 

source/blender/io/wavefront_obj/tests/obj_mtl_parser_tests.cc

@@ -4,6 +4,8 @@
 
 #include <gtest/gtest.h>
 
+#include "BLI_fileops.h"
+
 #include "BKE_appdir.hh"
 
 #include "testing/testing.h"