Cleanup: unused includes in source/blender/io/usd

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
- Removes unnecessary forward declarations

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

source/blender/io/usd/intern/usd_armature_utils.cc

@@ -6,12 +6,12 @@
 
 #include "BKE_armature.hh"
 #include "BKE_modifier.hh"
+#include "BLI_listbase.h"
+#include "BLI_vector.hh"
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
+#include "DNA_action_types.h"
 #include "DNA_armature_types.h"
-#include "ED_armature.hh"
-
-#include "WM_api.hh"
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_armature_utils.hh

@@ -12,14 +12,12 @@
 #include <pxr/base/tf/token.h>
 #include <pxr/usd/usdSkel/animation.h>
 
-#include <functional>
+#include <string>
 
 struct Bone;
 struct Depsgraph;
 struct ModifierData;
 struct Object;
-struct Scene;
-struct USDExportParams;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_asset_utils.cc

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "usd_asset_utils.hh"
+#include "usd.hh"
 
 #include <pxr/usd/ar/asset.h>
 #include <pxr/usd/ar/packageUtils.h>

source/blender/io/usd/intern/usd_asset_utils.hh

@@ -5,8 +5,6 @@
 
 #include "usd.hh"
 
-#include <pxr/usd/usd/stage.h>
-
 #include <string>
 
 namespace blender::io::usd {

source/blender/io/usd/intern/usd_blend_shape_utils.cc

@@ -3,49 +3,27 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "usd_blend_shape_utils.hh"
-#include "usd_skel_convert.hh"
 
-#include "usd.hh"
-
-#include <pxr/usd/sdf/namespaceEdit.h>
 #include <pxr/usd/usdGeom/primvarsAPI.h>
 #include <pxr/usd/usdSkel/animMapper.h>
 #include <pxr/usd/usdSkel/animation.h>
 #include <pxr/usd/usdSkel/bindingAPI.h>
 #include <pxr/usd/usdSkel/blendShape.h>
-#include <pxr/usd/usdSkel/cache.h>
-#include <pxr/usd/usdSkel/skeletonQuery.h>
-#include <pxr/usd/usdSkel/utils.h>
 
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_scene_types.h"
 
-#include "BKE_action.h"
-#include "BKE_armature.hh"
-#include "BKE_deform.hh"
-#include "BKE_fcurve.h"
 #include "BKE_key.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
-#include "BKE_object_deform.h"
+#include "DNA_object_types.h"
 
+#include "BLI_assert.h"
+#include "BLI_listbase.h"
 #include "BLI_math_vector.h"
 #include "BLI_set.hh"
-#include "BLI_span.hh"
 #include "BLI_vector.hh"
 
-#include "ED_armature.hh"
-#include "ED_keyframing.hh"
-#include "ED_mesh.hh"
-
 #include <string>
 #include <vector>
 

source/blender/io/usd/intern/usd_blend_shape_utils.hh

@@ -4,16 +4,10 @@
 #pragma once
 
 #include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/stage.h>
-#include <pxr/usd/usd/tokens.h>
 
 struct Key;
-struct Main;
 struct Mesh;
 struct Object;
-struct Scene;
-struct USDExportParams;
-struct USDImportParams;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_capi_export.cc

@@ -10,15 +10,14 @@
 #include "usd_hook.hh"
 #include "usd_private.hh"
 
-#include <pxr/base/plug/registry.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/pxr.h>
-#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/sdf/assetPath.h>
 #include <pxr/usd/usd/primRange.h>
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usdGeom/tokens.h>
 #include <pxr/usd/usdGeom/xform.h>
-#include <pxr/usd/usdUtils/dependencies.h>
+#include <pxr/usd/usdUtils/usdzPackage.h>
 
 #include "MEM_guardedalloc.h"
 

source/blender/io/usd/intern/usd_capi_import.cc

@@ -4,29 +4,21 @@
 
 #include "IO_types.hh"
 #include "usd.hh"
-#include "usd_hierarchy_iterator.hh"
 #include "usd_hook.hh"
 #include "usd_reader_geom.hh"
 #include "usd_reader_prim.hh"
 #include "usd_reader_stage.hh"
 
-#include "BKE_appdir.hh"
-#include "BKE_blender_version.h"
 #include "BKE_cachefile.hh"
-#include "BKE_cdderivedmesh.h"
+#include "BKE_collection.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
-#include "BKE_library.hh"
 #include "BKE_main.hh"
-#include "BKE_node.hh"
 #include "BKE_object.hh"
 #include "BKE_report.hh"
-#include "BKE_scene.hh"
-#include "BKE_world.h"
 
-#include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
@@ -38,13 +30,14 @@
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
-#include "DEG_depsgraph_query.hh"
 
 #include "DNA_cachefile_types.h"
 #include "DNA_collection_types.h"
-#include "DNA_node_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_listBase.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_world_types.h"
+#include "DNA_windowmanager_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -53,9 +46,7 @@
 
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usdGeom/metrics.h>
-#include <pxr/usd/usdGeom/scope.h>
 #include <pxr/usd/usdGeom/tokens.h>
-#include <pxr/usd/usdGeom/xformCommonAPI.h>
 
 #include <iostream>
 
@@ -151,7 +142,6 @@ static void find_prefix_to_skip(pxr::UsdStageRefPtr stage, ImportSettings *r_set
   }
 
   /* Treat the root as empty */
-  auto path_string = path.GetString();
   if (path == pxr::SdfPath("/")) {
     path = pxr::SdfPath();
   }

source/blender/io/usd/intern/usd_hierarchy_iterator.cc

@@ -19,25 +19,17 @@
 #include "usd_writer_transform.hh"
 #include "usd_writer_volume.hh"
 
-#include <memory>
 #include <string>
 
 #include <pxr/base/tf/stringUtils.h>
 
-#include "BKE_duplilist.hh"
+#include "BKE_main.hh"
 
 #include "BLI_assert.h"
-#include "BLI_utildefines.h"
 
-#include "DEG_depsgraph_query.hh"
-
-#include "DNA_ID.h"
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"
 
-#include "DNA_armature_types.h"
-#include "DNA_mesh_types.h"
-
 namespace blender::io::usd {
 
 USDHierarchyIterator::USDHierarchyIterator(Main *bmain,

source/blender/io/usd/intern/usd_hook.cc

@@ -16,6 +16,8 @@
 
 #include "BKE_report.hh"
 
+#include "DNA_windowmanager_types.h"
+
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
 #include "RNA_types.hh"

source/blender/io/usd/intern/usd_hook.hh

@@ -3,16 +3,12 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/common.h>
 #include <pxr/usd/usdShade/material.h>
 
-#include <string>
-
 struct Depsgraph;
-struct ExportJobData;
 struct Material;
 struct ReportList;
-struct USDExportParams;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_camera.cc

@@ -15,7 +15,6 @@
 #include "BKE_camera.h"
 #include "BKE_object.hh"
 
-#include <pxr/pxr.h>
 #include <pxr/usd/usdGeom/camera.h>
 
 namespace blender::io::usd {

source/blender/io/usd/intern/usd_reader_curve.cc

@@ -5,6 +5,7 @@
  * Modifications Copyright 2021 Tangent Animation. All rights reserved. */
 
 #include "usd_reader_curve.hh"
+#include "usd.hh"
 
 #include "BKE_attribute.hh"
 #include "BKE_curves.hh"
@@ -17,10 +18,8 @@
 #include "DNA_curves_types.h"
 #include "DNA_object_types.h"
 
-#include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
 #include <pxr/usd/usdGeom/basisCurves.h>
-#include <pxr/usd/usdGeom/curves.h>
 
 namespace blender::io::usd {
 static inline float3 to_float3(pxr::GfVec3f vec3f)

source/blender/io/usd/intern/usd_reader_curve.hh

@@ -8,9 +8,12 @@
 #include "usd.hh"
 #include "usd_reader_geom.hh"
 
-#include "pxr/usd/usdGeom/basisCurves.h"
+#include <pxr/usd/usdGeom/basisCurves.h>
 
 struct Curves;
+namespace blender::bke {
+struct GeometrySet;
+}
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_geom.cc

@@ -6,17 +6,12 @@
 
 #include "BKE_lib_id.hh"
 #include "BKE_modifier.hh"
-#include "BKE_object.hh"
 
 #include "BLI_listbase.h"
-#include "BLI_math_geom.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_cachefile_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX */
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_instance.hh

@@ -5,9 +5,8 @@
 
 #include "usd_reader_xform.hh"
 
-#include <pxr/usd/usdGeom/xform.h>
-
 struct Collection;
+struct Main;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_light.hh

@@ -6,6 +6,8 @@
 #include "usd.hh"
 #include "usd_reader_xform.hh"
 
+struct Main;
+
 namespace blender::io::usd {
 
 class USDLightReader : public USDXformReader {

source/blender/io/usd/intern/usd_reader_material.cc

@@ -24,8 +24,6 @@
 
 #include "DNA_material_types.h"
 
-#include "WM_api.hh"
-
 #include <pxr/base/gf/vec3f.h>
 #include <pxr/usd/ar/packageUtils.h>
 #include <pxr/usd/usdShade/material.h>

source/blender/io/usd/intern/usd_reader_mesh.cc

@@ -19,11 +19,10 @@
 #include "BKE_object.hh"
 #include "BKE_report.hh"
 
+#include "BLI_color.hh"
 #include "BLI_map.hh"
-#include "BLI_math_color.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_span.hh"
-#include "BLI_string.h"
 
 #include "DNA_customdata_types.h"
 #include "DNA_material_types.h"
@@ -31,15 +30,13 @@
 #include "DNA_object_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "WM_api.hh"
-
 #include "MEM_guardedalloc.h"
 
+#include <pxr/base/gf/matrix4f.h>
 #include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
 #include <pxr/base/vt/value.h>
 #include <pxr/usd/sdf/types.h>
-#include <pxr/usd/usdGeom/mesh.h>
 #include <pxr/usd/usdGeom/primvarsAPI.h>
 #include <pxr/usd/usdGeom/subset.h>
 #include <pxr/usd/usdShade/materialBindingAPI.h>

source/blender/io/usd/intern/usd_reader_mesh.hh

@@ -11,7 +11,7 @@
 #include "usd.hh"
 #include "usd_reader_geom.hh"
 
-#include "pxr/usd/usdGeom/mesh.h"
+#include <pxr/usd/usdGeom/mesh.h>
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_nurbs.cc

@@ -19,10 +19,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
-#include <pxr/base/vt/value.h>
-#include <pxr/usd/sdf/types.h>
 
 #include <pxr/usd/usdGeom/curves.h>
 

source/blender/io/usd/intern/usd_reader_nurbs.hh

@@ -10,7 +10,7 @@
 #include "usd.hh"
 #include "usd_reader_geom.hh"
 
-#include "pxr/usd/usdGeom/nurbsCurves.h"
+#include <pxr/usd/usdGeom/nurbsCurves.h>
 
 struct Curve;
 

source/blender/io/usd/intern/usd_reader_pointinstancer.cc

@@ -5,16 +5,17 @@
 #include "usd_reader_pointinstancer.hh"
 
 #include "BKE_attribute.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_modifier.hh"
+#include "BKE_node.hh"
 #include "BKE_node_runtime.hh"
 #include "BKE_node_tree_update.hh"
 #include "BKE_object.hh"
 #include "BKE_pointcloud.hh"
-#include "BLI_math_quaternion.hh"
+#include "BLI_math_quaternion_types.hh"
 #include "BLI_string.h"
 
 #include "DNA_collection_types.h"
+#include "DNA_node_types.h"
 
 #include <pxr/usd/usdGeom/pointInstancer.h>
 

source/blender/io/usd/intern/usd_reader_prim.cc

@@ -7,7 +7,7 @@
 
 #include "usd_reader_prim.hh"
 
-#include "BLI_utildefines.h"
+#include "BLI_assert.h"
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_prim.hh

@@ -22,6 +22,7 @@ struct CacheFile;
 struct Main;
 struct Material;
 struct Object;
+struct ReportList;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_shape.cc

@@ -5,16 +5,12 @@
 #include "BKE_geometry_set.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_report.hh"
 
-#include "DNA_cachefile_types.h"
 #include "DNA_object_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "WM_api.hh"
-
 #include "usd_reader_shape.hh"
 
 #include <pxr/usd/usdGeom/capsule.h>

source/blender/io/usd/intern/usd_reader_shape.hh

@@ -6,8 +6,6 @@
 
 #include "usd.hh"
 #include "usd_reader_geom.hh"
-#include "usd_reader_xform.hh"
-#include <pxr/usd/usdGeom/gprim.h>
 
 struct Mesh;
 

source/blender/io/usd/intern/usd_reader_skeleton.cc

@@ -6,16 +6,11 @@
 #include "usd_skel_convert.hh"
 
 #include "BKE_armature.hh"
-#include "BKE_idprop.h"
 #include "BKE_object.hh"
 
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 
-#include "MEM_guardedalloc.h"
-
-#include "WM_api.hh"
-
 namespace blender::io::usd {
 
 bool USDSkeletonReader::valid() const

source/blender/io/usd/intern/usd_reader_stage.cc

@@ -18,12 +18,10 @@
 #include "usd_reader_xform.hh"
 
 #include <pxr/pxr.h>
-#include <pxr/usd/usd/primRange.h>
 #include <pxr/usd/usdGeom/camera.h>
 #include <pxr/usd/usdGeom/capsule.h>
 #include <pxr/usd/usdGeom/cone.h>
 #include <pxr/usd/usdGeom/cube.h>
-#include <pxr/usd/usdGeom/curves.h>
 #include <pxr/usd/usdGeom/cylinder.h>
 #include <pxr/usd/usdGeom/mesh.h>
 #include <pxr/usd/usdGeom/nurbsCurves.h>

source/blender/io/usd/intern/usd_reader_stage.hh

@@ -3,22 +3,22 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-struct Main;
-
-#include "WM_types.hh"
-
+#include "BLI_map.hh"
 #include "BLI_set.hh"
+#include "BLI_vector.hh"
 
 #include "usd.hh"
 #include "usd_hash_types.hh"
 #include "usd_reader_prim.hh"
 
-#include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usdGeom/imageable.h>
 
 #include <string>
 
+struct Collection;
 struct ImportSettings;
+struct Main;
+struct ReportList;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_volume.hh

@@ -6,7 +6,7 @@
 #include "usd.hh"
 #include "usd_reader_xform.hh"
 
-#include "pxr/usd/usdVol/volume.h"
+#include <pxr/usd/usdVol/volume.h>
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_reader_xform.cc

@@ -9,25 +9,18 @@
 
 #include "BKE_constraint.h"
 #include "BKE_lib_id.hh"
-#include "BKE_library.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 
-#include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_space_types.h" /* for FILE_MAX */
 
-#include <pxr/base/gf/math.h>
 #include <pxr/base/gf/matrix4f.h>
 
-#include <pxr/usd/usdGeom/xform.h>
+#include <string>
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_skel_convert.cc

@@ -4,12 +4,10 @@
 
 #include "usd_skel_convert.hh"
 
-#include "usd.hh"
 #include "usd_armature_utils.hh"
 #include "usd_blend_shape_utils.hh"
 #include "usd_hash_types.hh"
 
-#include <pxr/usd/sdf/namespaceEdit.h>
 #include <pxr/usd/usdGeom/primvarsAPI.h>
 #include <pxr/usd/usdSkel/animation.h>
 #include <pxr/usd/usdSkel/bindingAPI.h>
@@ -22,20 +20,14 @@
 #include "DNA_armature_types.h"
 #include "DNA_key_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_scene_types.h"
 
 #include "BKE_action.h"
 #include "BKE_armature.hh"
-#include "BKE_attribute.hh"
 #include "BKE_deform.hh"
 #include "BKE_fcurve.h"
 #include "BKE_key.hh"
-#include "BKE_lib_id.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_modifier.hh"
-#include "BKE_object.hh"
 #include "BKE_object_deform.h"
 #include "BKE_report.hh"
 
@@ -47,7 +39,6 @@
 #include "BLI_vector.hh"
 
 #include "ED_armature.hh"
-#include "ED_keyframing.hh"
 #include "ED_mesh.hh"
 
 #include "ANIM_animdata.hh"

source/blender/io/usd/intern/usd_skel_convert.hh

@@ -6,18 +6,16 @@
 #include "BLI_map.hh"
 #include "BLI_vector.hh"
 
-#include "DNA_windowmanager_types.h"
-
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usdGeom/xformCache.h>
 #include <pxr/usd/usdSkel/bindingAPI.h>
-#include <pxr/usd/usdSkel/skeletonQuery.h>
 
 struct Depsgraph;
 struct Key;
 struct Main;
 struct Mesh;
 struct Object;
+struct ReportList;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_skel_root_utils.hh

@@ -5,7 +5,7 @@
 
 #include "usd.hh"
 
-#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/common.h>
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_writer_abstract.hh

@@ -7,21 +7,19 @@
 #include "usd_exporter_context.hh"
 
 #include <pxr/usd/sdf/path.h>
-#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usdGeom/boundable.h>
 #include <pxr/usd/usdShade/material.h>
 #include <pxr/usd/usdUtils/sparseValueWriter.h>
 
-#include <vector>
-
-#include "DEG_depsgraph_query.hh"
-
 #include "WM_types.hh"
 
 #include "DNA_material_types.h"
-#include "DNA_windowmanager_types.h"
+
+#include <string>
 
 struct Material;
+struct ReportList;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_writer_armature.cc

@@ -4,24 +4,16 @@
 
 #include "usd_writer_armature.hh"
 #include "usd_armature_utils.hh"
-#include "usd_hierarchy_iterator.hh"
-#include "usd_writer_transform.hh"
 
 #include "BKE_action.h"
-#include "BKE_armature.hh"
 
 #include "DNA_armature_types.h"
 
-#include "ED_armature.hh"
-
 #include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/gf/matrix4f.h>
 #include <pxr/usd/usdSkel/animation.h>
 #include <pxr/usd/usdSkel/bindingAPI.h>
 #include <pxr/usd/usdSkel/skeleton.h>
-#include <pxr/usd/usdSkel/tokens.h>
-
-#include <functional>
 
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.usd"};

source/blender/io/usd/intern/usd_writer_armature.hh

@@ -8,7 +8,6 @@
 #include "BLI_map.hh"
 
 struct Bone;
-struct Object;
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_writer_camera.cc

@@ -10,6 +10,8 @@
 #include "BKE_camera.h"
 #include "BLI_assert.h"
 
+#include "DEG_depsgraph_query.hh"
+
 #include "DNA_camera_types.h"
 #include "DNA_scene_types.h"
 

source/blender/io/usd/intern/usd_writer_curves.cc

@@ -21,14 +21,11 @@
 #include "BKE_material.h"
 #include "BKE_report.hh"
 
-#include "BLI_math_geom.h"
 #include "BLT_translation.hh"
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
 
-#include "WM_api.hh"
-
 namespace blender::io::usd {
 
 USDCurvesWriter::USDCurvesWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {}

source/blender/io/usd/intern/usd_writer_curves.hh

@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <memory>
-
-#include "DNA_curves_types.h"
 #include "usd_writer_abstract.hh"
 
-#include <pxr/usd/usdGeom/basisCurves.h>
+#include <pxr/usd/usdGeom/curves.h>
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_writer_light.cc

@@ -12,10 +12,8 @@
 
 #include "BLI_assert.h"
 #include "BLI_math_rotation.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_light_types.h"
-#include "DNA_object_types.h"
 
 namespace blender::io::usd {
 

source/blender/io/usd/intern/usd_writer_material.cc

@@ -4,7 +4,6 @@
 
 #include "usd_writer_material.hh"
 
-#include "usd.hh"
 #include "usd_exporter_context.hh"
 #include "usd_hook.hh"
 
@@ -18,7 +17,6 @@
 #include "IMB_colormanagement.hh"
 
 #include "BLI_fileops.h"
-#include "BLI_linklist.h"
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
 #include "BLI_memory_utils.hh"
@@ -27,14 +25,13 @@
 #include "BLI_string_utils.hh"
 
 #include "DNA_material_types.h"
+#include "DNA_node_types.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "WM_api.hh"
+#include "WM_types.hh"
 
 #include <pxr/base/tf/stringUtils.h>
-#include <pxr/pxr.h>
-#include <pxr/usd/usdGeom/scope.h>
 
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.usd"};

source/blender/io/usd/intern/usd_writer_material.hh

@@ -3,9 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include <pxr/pxr.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usdShade/material.h>
 
 #include <string>

source/blender/io/usd/intern/usd_writer_mesh.cc

@@ -5,50 +5,33 @@
 
 #include "usd_armature_utils.hh"
 #include "usd_blend_shape_utils.hh"
-#include "usd_hierarchy_iterator.hh"
 #include "usd_skel_convert.hh"
-#include "usd_writer_armature.hh"
 
-#include <pxr/usd/usdGeom/bboxCache.h>
 #include <pxr/usd/usdGeom/mesh.h>
 #include <pxr/usd/usdGeom/primvarsAPI.h>
 #include <pxr/usd/usdShade/material.h>
 #include <pxr/usd/usdShade/materialBindingAPI.h>
-#include <pxr/usd/usdSkel/animation.h>
 #include <pxr/usd/usdSkel/bindingAPI.h>
-#include <pxr/usd/usdSkel/blendShape.h>
 
 #include "BLI_array_utils.hh"
 #include "BLI_assert.h"
-#include "BLI_math_color.hh"
+#include "BLI_color.hh"
 #include "BLI_math_quaternion_types.hh"
-#include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 
-#include "BKE_armature.hh"
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
-#include "BKE_deform.hh"
-#include "BKE_key.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_runtime.hh"
 #include "BKE_mesh_wrapper.hh"
-#include "BKE_modifier.hh"
 #include "BKE_object.hh"
 #include "BKE_report.hh"
 
 #include "DEG_depsgraph.hh"
 
-#include "DNA_armature_types.h"
 #include "DNA_key_types.h"
-#include "DNA_layer_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_fluidsim_types.h"
-#include "DNA_particle_types.h"
-
-#include "WM_api.hh"
 
 #include "CLG_log.h"
 static CLG_LogRef LOG = {"io.usd"};

source/blender/io/usd/intern/usd_writer_mesh.hh

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "DNA_modifier_types.h"
 #include "usd_writer_abstract.hh"
 
 #include "BLI_map.hh"
@@ -11,6 +10,7 @@
 #include <pxr/usd/usdGeom/mesh.h>
 
 struct Key;
+struct SubsurfModifierData;
 
 namespace blender::bke {
 class AttributeIDRef;

source/blender/io/usd/intern/usd_writer_metaball.cc

@@ -2,22 +2,16 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #include "usd_writer_metaball.hh"
-#include "usd_hierarchy_iterator.hh"
+#include "usd_exporter_context.hh"
 
-#include <pxr/usd/usdGeom/mesh.h>
-#include <pxr/usd/usdShade/material.h>
-#include <pxr/usd/usdShade/materialBindingAPI.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::usd {
 

source/blender/io/usd/intern/usd_writer_transform.cc

@@ -4,6 +4,7 @@
 #include "usd_writer_transform.hh"
 #include "usd_hierarchy_iterator.hh"
 
+#include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/gf/matrix4f.h>
 #include <pxr/usd/usdGeom/xform.h>
 
@@ -11,8 +12,6 @@
 
 #include "BLI_math_matrix.h"
 
-#include "DNA_layer_types.h"
-
 namespace blender::io::usd {
 
 USDTransformWriter::USDTransformWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {}

source/blender/io/usd/intern/usd_writer_volume.cc

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "usd_writer_volume.hh"
+#include "usd_hierarchy_iterator.hh"
 
 #include <pxr/base/tf/pathUtils.h>
 #include <pxr/usd/usdVol/openVDBAsset.h>
@@ -17,13 +18,10 @@
 #include "BLI_fileops.h"
 #include "BLI_index_range.hh"
 #include "BLI_math_base.h"
+#include "BLI_math_vector_types.hh"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 
-#include "WM_api.hh"
-
-#include "usd_hierarchy_iterator.hh"
-
 namespace blender::io::usd {
 
 USDVolumeWriter::USDVolumeWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) {}

source/blender/io/usd/intern/usd_writer_volume.hh

@@ -5,7 +5,6 @@
 
 #include <optional>
 
-#include "BLI_math_vector_types.hh"
 #include "usd_writer_abstract.hh"
 
 struct Volume;

source/blender/io/usd/usd_private.hh

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/common.h>
 
 #include "usd.hh"