diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index 2f0e8de6cc7..1cc366da94f 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -121,42 +121,42 @@ set(SRC
   usd.h
   usd.hh
 
-  intern/usd_armature_utils.h
-  intern/usd_asset_utils.h
-  intern/usd_blend_shape_utils.h
-  intern/usd_exporter_context.h
-  intern/usd_hash_types.h
-  intern/usd_hierarchy_iterator.h
-  intern/usd_hook.h
-  intern/usd_writer_abstract.h
-  intern/usd_writer_armature.h
-  intern/usd_writer_camera.h
-  intern/usd_writer_curves.h
-  intern/usd_writer_hair.h
-  intern/usd_writer_light.h
-  intern/usd_writer_material.h
-  intern/usd_writer_mesh.h
-  intern/usd_writer_metaball.h
-  intern/usd_writer_transform.h
-  intern/usd_writer_volume.h
+  intern/usd_armature_utils.hh
+  intern/usd_asset_utils.hh
+  intern/usd_blend_shape_utils.hh
+  intern/usd_exporter_context.hh
+  intern/usd_hash_types.hh
+  intern/usd_hierarchy_iterator.hh
+  intern/usd_hook.hh
+  intern/usd_writer_abstract.hh
+  intern/usd_writer_armature.hh
+  intern/usd_writer_camera.hh
+  intern/usd_writer_curves.hh
+  intern/usd_writer_hair.hh
+  intern/usd_writer_light.hh
+  intern/usd_writer_material.hh
+  intern/usd_writer_mesh.hh
+  intern/usd_writer_metaball.hh
+  intern/usd_writer_transform.hh
+  intern/usd_writer_volume.hh
 
-  intern/usd_reader_camera.h
-  intern/usd_reader_curve.h
-  intern/usd_reader_geom.h
-  intern/usd_reader_instance.h
-  intern/usd_reader_light.h
-  intern/usd_reader_material.h
-  intern/usd_reader_mesh.h
-  intern/usd_reader_nurbs.h
-  intern/usd_reader_prim.h
-  intern/usd_reader_shape.h
-  intern/usd_reader_skeleton.h
-  intern/usd_reader_stage.h
-  intern/usd_reader_volume.h
-  intern/usd_reader_xform.h
-  intern/usd_reader_pointinstancer.h
-  intern/usd_skel_convert.h
-  intern/usd_skel_root_utils.h
+  intern/usd_reader_camera.hh
+  intern/usd_reader_curve.hh
+  intern/usd_reader_geom.hh
+  intern/usd_reader_instance.hh
+  intern/usd_reader_light.hh
+  intern/usd_reader_material.hh
+  intern/usd_reader_mesh.hh
+  intern/usd_reader_nurbs.hh
+  intern/usd_reader_prim.hh
+  intern/usd_reader_shape.hh
+  intern/usd_reader_skeleton.hh
+  intern/usd_reader_stage.hh
+  intern/usd_reader_volume.hh
+  intern/usd_reader_xform.hh
+  intern/usd_reader_pointinstancer.hh
+  intern/usd_skel_convert.hh
+  intern/usd_skel_root_utils.hh
 )
 
 if(WITH_HYDRA)
@@ -236,7 +236,7 @@ blender_add_lib(bf_io_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 add_dependencies(bf_io_usd bf_rna)
 
 if(COMMAND target_precompile_headers)
-  target_precompile_headers(bf_io_usd PRIVATE intern/usd_precomp.h)
+  target_precompile_headers(bf_io_usd PRIVATE intern/usd_precomp.hh)
 endif()
 
 if(WITH_GTESTS)
@@ -245,7 +245,7 @@ if(WITH_GTESTS)
     tests/usd_export_test.cc
     tests/usd_stage_creation_test.cc
     tests/usd_usdz_export_test.cc
-    intern/usd_writer_material.h
+    intern/usd_writer_material.hh
   )
   if(USD_IMAGING_HEADERS)
     list(APPEND TEST_SRC tests/usd_imaging_test.cc)
diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc
index 0499e4fc0a9..9ef030a5178 100644
--- a/source/blender/io/usd/hydra/material.cc
+++ b/source/blender/io/usd/hydra/material.cc
@@ -33,8 +33,8 @@
 #include "hydra_scene_delegate.h"
 #include "image.h"
 
-#include "intern/usd_exporter_context.h"
-#include "intern/usd_writer_material.h"
+#include "intern/usd_exporter_context.hh"
+#include "intern/usd_writer_material.hh"
 
 #ifdef WITH_MATERIALX
 #  include "shader/materialx/node_parser.h"
diff --git a/source/blender/io/usd/intern/usd_armature_utils.cc b/source/blender/io/usd/intern/usd_armature_utils.cc
index e94efda01f7..7a583d7940f 100644
--- a/source/blender/io/usd/intern/usd_armature_utils.cc
+++ b/source/blender/io/usd/intern/usd_armature_utils.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_armature_utils.h"
+#include "usd_armature_utils.hh"
 
 #include "BKE_armature.hh"
 #include "BKE_modifier.hh"
diff --git a/source/blender/io/usd/intern/usd_armature_utils.h b/source/blender/io/usd/intern/usd_armature_utils.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_armature_utils.h
rename to source/blender/io/usd/intern/usd_armature_utils.hh
diff --git a/source/blender/io/usd/intern/usd_asset_utils.cc b/source/blender/io/usd/intern/usd_asset_utils.cc
index db824d2b38f..3ef3bd30321 100644
--- a/source/blender/io/usd/intern/usd_asset_utils.cc
+++ b/source/blender/io/usd/intern/usd_asset_utils.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_asset_utils.h"
+#include "usd_asset_utils.hh"
 
 #include <pxr/usd/ar/asset.h>
 #include <pxr/usd/ar/packageUtils.h>
diff --git a/source/blender/io/usd/intern/usd_asset_utils.h b/source/blender/io/usd/intern/usd_asset_utils.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_asset_utils.h
rename to source/blender/io/usd/intern/usd_asset_utils.hh
diff --git a/source/blender/io/usd/intern/usd_blend_shape_utils.cc b/source/blender/io/usd/intern/usd_blend_shape_utils.cc
index a5d42404e43..b4c88f98382 100644
--- a/source/blender/io/usd/intern/usd_blend_shape_utils.cc
+++ b/source/blender/io/usd/intern/usd_blend_shape_utils.cc
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_blend_shape_utils.h"
-#include "usd_skel_convert.h"
+#include "usd_blend_shape_utils.hh"
+#include "usd_skel_convert.hh"
 
 #include "usd.h"
 
diff --git a/source/blender/io/usd/intern/usd_blend_shape_utils.h b/source/blender/io/usd/intern/usd_blend_shape_utils.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_blend_shape_utils.h
rename to source/blender/io/usd/intern/usd_blend_shape_utils.hh
diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc
index 611cd6baa5d..82b6df5d65c 100644
--- a/source/blender/io/usd/intern/usd_capi_export.cc
+++ b/source/blender/io/usd/intern/usd_capi_export.cc
@@ -7,8 +7,8 @@
 #include "IO_subdiv_disabler.hh"
 #include "usd.h"
 #include "usd.hh"
-#include "usd_hierarchy_iterator.h"
-#include "usd_hook.h"
+#include "usd_hierarchy_iterator.hh"
+#include "usd_hook.hh"
 
 #include <pxr/base/plug/registry.h>
 #include <pxr/base/tf/token.h>
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index 9dc20c45f58..38bdec8d580 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -4,11 +4,11 @@
 
 #include "IO_types.hh"
 #include "usd.h"
-#include "usd_hierarchy_iterator.h"
-#include "usd_hook.h"
-#include "usd_reader_geom.h"
-#include "usd_reader_prim.h"
-#include "usd_reader_stage.h"
+#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"
diff --git a/source/blender/io/usd/intern/usd_exporter_context.h b/source/blender/io/usd/intern/usd_exporter_context.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_exporter_context.h
rename to source/blender/io/usd/intern/usd_exporter_context.hh
diff --git a/source/blender/io/usd/intern/usd_hash_types.h b/source/blender/io/usd/intern/usd_hash_types.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_hash_types.h
rename to source/blender/io/usd/intern/usd_hash_types.hh
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
index e85adbacafd..d21deb86359 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
@@ -3,21 +3,21 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #include "usd.h"
 
-#include "usd_armature_utils.h"
-#include "usd_blend_shape_utils.h"
-#include "usd_hierarchy_iterator.h"
-#include "usd_skel_convert.h"
-#include "usd_skel_root_utils.h"
-#include "usd_writer_abstract.h"
-#include "usd_writer_armature.h"
-#include "usd_writer_camera.h"
-#include "usd_writer_curves.h"
-#include "usd_writer_hair.h"
-#include "usd_writer_light.h"
-#include "usd_writer_mesh.h"
-#include "usd_writer_metaball.h"
-#include "usd_writer_transform.h"
-#include "usd_writer_volume.h"
+#include "usd_armature_utils.hh"
+#include "usd_blend_shape_utils.hh"
+#include "usd_hierarchy_iterator.hh"
+#include "usd_skel_convert.hh"
+#include "usd_skel_root_utils.hh"
+#include "usd_writer_abstract.hh"
+#include "usd_writer_armature.hh"
+#include "usd_writer_camera.hh"
+#include "usd_writer_curves.hh"
+#include "usd_writer_hair.hh"
+#include "usd_writer_light.hh"
+#include "usd_writer_mesh.hh"
+#include "usd_writer_metaball.hh"
+#include "usd_writer_transform.hh"
+#include "usd_writer_volume.hh"
 
 #include <memory>
 #include <string>
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.hh
similarity index 96%
rename from source/blender/io/usd/intern/usd_hierarchy_iterator.h
rename to source/blender/io/usd/intern/usd_hierarchy_iterator.hh
index c98e3d949fb..d4f95243bca 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.hh
@@ -5,8 +5,8 @@
 
 #include "IO_abstract_hierarchy_iterator.h"
 #include "usd.h"
-#include "usd_exporter_context.h"
-#include "usd_skel_convert.h"
+#include "usd_exporter_context.hh"
+#include "usd_skel_convert.hh"
 
 #include <string>
 
diff --git a/source/blender/io/usd/intern/usd_hook.cc b/source/blender/io/usd/intern/usd_hook.cc
index 44b10aa99bc..d3d09edfe72 100644
--- a/source/blender/io/usd/intern/usd_hook.cc
+++ b/source/blender/io/usd/intern/usd_hook.cc
@@ -4,7 +4,7 @@
 
 #include "usd.h"
 
-#include "usd_hook.h"
+#include "usd_hook.hh"
 
 #include <boost/python/call_method.hpp>
 #include <boost/python/class.hpp>
diff --git a/source/blender/io/usd/intern/usd_hook.h b/source/blender/io/usd/intern/usd_hook.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_hook.h
rename to source/blender/io/usd/intern/usd_hook.hh
diff --git a/source/blender/io/usd/intern/usd_precomp.h b/source/blender/io/usd/intern/usd_precomp.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_precomp.h
rename to source/blender/io/usd/intern/usd_precomp.hh
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index 2b4f6f667a1..71894c80bed 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -5,7 +5,7 @@
  *
  * Adapted from the Blender Alembic importer implementation. */
 
-#include "usd_reader_camera.h"
+#include "usd_reader_camera.hh"
 
 #include "DNA_camera_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/io/usd/intern/usd_reader_camera.h b/source/blender/io/usd/intern/usd_reader_camera.hh
similarity index 96%
rename from source/blender/io/usd/intern/usd_reader_camera.h
rename to source/blender/io/usd/intern/usd_reader_camera.hh
index 435f78299f3..dd0d114a42e 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.h
+++ b/source/blender/io/usd/intern/usd_reader_camera.hh
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 6ae84e6a21d..95461efe2ef 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -4,7 +4,7 @@
  * Adapted from the Blender Alembic importer implementation. Copyright 2016 Kévin Dietrich.
  * Modifications Copyright 2021 Tangent Animation. All rights reserved. */
 
-#include "usd_reader_curve.h"
+#include "usd_reader_curve.hh"
 
 #include "BKE_curve.hh"
 #include "BKE_mesh.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h b/source/blender/io/usd/intern/usd_reader_curve.hh
similarity index 97%
rename from source/blender/io/usd/intern/usd_reader_curve.h
rename to source/blender/io/usd/intern/usd_reader_curve.hh
index 819caa61b39..138ebe73b33 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.hh
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_geom.h"
+#include "usd_reader_geom.hh"
 
 #include "pxr/usd/usdGeom/basisCurves.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index 17a36935cf4..50a83b901b9 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_geom.h"
+#include "usd_reader_geom.hh"
 
 #include "BKE_lib_id.hh"
 #include "BKE_modifier.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.hh
similarity index 96%
rename from source/blender/io/usd/intern/usd_reader_geom.h
rename to source/blender/io/usd/intern/usd_reader_geom.hh
index 8a7af0737fa..8dc1895c8ee 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.hh
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 struct Mesh;
 
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc
index b1d419fef26..317664f441d 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_instance.h"
+#include "usd_reader_instance.hh"
 
 #include "BKE_lib_id.hh"
 #include "BKE_object.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_instance.h b/source/blender/io/usd/intern/usd_reader_instance.hh
similarity index 96%
rename from source/blender/io/usd/intern/usd_reader_instance.h
rename to source/blender/io/usd/intern/usd_reader_instance.hh
index dcb35dfd2c7..6fbdc9b9634 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.h
+++ b/source/blender/io/usd/intern/usd_reader_instance.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 #include <pxr/usd/usdGeom/xform.h>
 
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index 36633ce7e0a..eaca1b0f4dd 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_light.h"
+#include "usd_reader_light.hh"
 
 #include "BLI_math_rotation.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_light.h b/source/blender/io/usd/intern/usd_reader_light.hh
similarity index 95%
rename from source/blender/io/usd/intern/usd_reader_light.h
rename to source/blender/io/usd/intern/usd_reader_light.hh
index 5ea5bfd25ab..31ad45c12ab 100644
--- a/source/blender/io/usd/intern/usd_reader_light.h
+++ b/source/blender/io/usd/intern/usd_reader_light.hh
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc
index 5c9a0e2bebc..96a28d6e38e 100644
--- a/source/blender/io/usd/intern/usd_reader_material.cc
+++ b/source/blender/io/usd/intern/usd_reader_material.cc
@@ -2,9 +2,9 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_material.h"
+#include "usd_reader_material.hh"
 
-#include "usd_asset_utils.h"
+#include "usd_asset_utils.hh"
 
 #include "BKE_appdir.hh"
 #include "BKE_image.h"
diff --git a/source/blender/io/usd/intern/usd_reader_material.h b/source/blender/io/usd/intern/usd_reader_material.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_reader_material.h
rename to source/blender/io/usd/intern/usd_reader_material.hh
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 252d642b879..c0360834718 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -5,10 +5,10 @@
  * Modifications Copyright 2021 Tangent Animation and
  * NVIDIA Corporation. All rights reserved. */
 
-#include "usd_reader_mesh.h"
-#include "usd_hash_types.h"
-#include "usd_reader_material.h"
-#include "usd_skel_convert.h"
+#include "usd_reader_mesh.hh"
+#include "usd_hash_types.hh"
+#include "usd_reader_material.hh"
+#include "usd_skel_convert.hh"
 
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.hh
similarity index 99%
rename from source/blender/io/usd/intern/usd_reader_mesh.h
rename to source/blender/io/usd/intern/usd_reader_mesh.hh
index e296214f9bb..5b16fc00b80 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.hh
@@ -9,7 +9,7 @@
 #include "BLI_span.hh"
 
 #include "usd.h"
-#include "usd_reader_geom.h"
+#include "usd_reader_geom.hh"
 
 #include "pxr/usd/usdGeom/mesh.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index 16d4d8dbca0..2c4d3b63b66 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -5,7 +5,7 @@
  *
  * Adapted from the Blender Alembic importer implementation. */
 
-#include "usd_reader_nurbs.h"
+#include "usd_reader_nurbs.hh"
 
 #include "BKE_curve.hh"
 #include "BKE_mesh.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.h b/source/blender/io/usd/intern/usd_reader_nurbs.hh
similarity index 97%
rename from source/blender/io/usd/intern/usd_reader_nurbs.h
rename to source/blender/io/usd/intern/usd_reader_nurbs.hh
index 84fab3cabcf..b062872c42a 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.h
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.hh
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_geom.h"
+#include "usd_reader_geom.hh"
 
 #include "pxr/usd/usdGeom/nurbsCurves.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_pointinstancer.cc b/source/blender/io/usd/intern/usd_reader_pointinstancer.cc
index 9a7e92d6b68..0a09a779979 100644
--- a/source/blender/io/usd/intern/usd_reader_pointinstancer.cc
+++ b/source/blender/io/usd/intern/usd_reader_pointinstancer.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_pointinstancer.h"
+#include "usd_reader_pointinstancer.hh"
 
 #include "BKE_attribute.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_pointinstancer.h b/source/blender/io/usd/intern/usd_reader_pointinstancer.hh
similarity index 97%
rename from source/blender/io/usd/intern/usd_reader_pointinstancer.h
rename to source/blender/io/usd/intern/usd_reader_pointinstancer.hh
index c08a34763de..00d9a7c0e92 100644
--- a/source/blender/io/usd/intern/usd_reader_pointinstancer.h
+++ b/source/blender/io/usd/intern/usd_reader_pointinstancer.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 struct Collection;
 
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index e8ab92fc6c8..a1230ffde53 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -5,7 +5,7 @@
  *
  * Adapted from the Blender Alembic importer implementation. */
 
-#include "usd_reader_prim.h"
+#include "usd_reader_prim.hh"
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_reader_prim.h
rename to source/blender/io/usd/intern/usd_reader_prim.hh
diff --git a/source/blender/io/usd/intern/usd_reader_shape.cc b/source/blender/io/usd/intern/usd_reader_shape.cc
index 9f47aeb43ca..2af88b907b4 100644
--- a/source/blender/io/usd/intern/usd_reader_shape.cc
+++ b/source/blender/io/usd/intern/usd_reader_shape.cc
@@ -14,7 +14,7 @@
 
 #include "WM_api.hh"
 
-#include "usd_reader_shape.h"
+#include "usd_reader_shape.hh"
 
 #include <pxr/usd/usdGeom/capsule.h>
 #include <pxr/usd/usdGeom/cone.h>
diff --git a/source/blender/io/usd/intern/usd_reader_shape.h b/source/blender/io/usd/intern/usd_reader_shape.hh
similarity index 97%
rename from source/blender/io/usd/intern/usd_reader_shape.h
rename to source/blender/io/usd/intern/usd_reader_shape.hh
index 1d31b51d90e..65f3265ecdd 100644
--- a/source/blender/io/usd/intern/usd_reader_shape.h
+++ b/source/blender/io/usd/intern/usd_reader_shape.hh
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_geom.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_geom.hh"
+#include "usd_reader_xform.hh"
 #include <pxr/usd/usdGeom/gprim.h>
 
 struct Mesh;
diff --git a/source/blender/io/usd/intern/usd_reader_skeleton.cc b/source/blender/io/usd/intern/usd_reader_skeleton.cc
index df8120f62b2..163cd2ed897 100644
--- a/source/blender/io/usd/intern/usd_reader_skeleton.cc
+++ b/source/blender/io/usd/intern/usd_reader_skeleton.cc
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_skeleton.h"
-#include "usd_skel_convert.h"
+#include "usd_reader_skeleton.hh"
+#include "usd_skel_convert.hh"
 
 #include "BKE_armature.hh"
 #include "BKE_idprop.h"
diff --git a/source/blender/io/usd/intern/usd_reader_skeleton.h b/source/blender/io/usd/intern/usd_reader_skeleton.hh
similarity index 96%
rename from source/blender/io/usd/intern/usd_reader_skeleton.h
rename to source/blender/io/usd/intern/usd_reader_skeleton.hh
index abc6b08e306..13349fe8755 100644
--- a/source/blender/io/usd/intern/usd_reader_skeleton.h
+++ b/source/blender/io/usd/intern/usd_reader_skeleton.hh
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 #include <pxr/usd/usdSkel/skeleton.h>
 
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index 11e9841fa3b..3d4d5947ba3 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -2,20 +2,20 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_stage.h"
-#include "usd_reader_camera.h"
-#include "usd_reader_curve.h"
-#include "usd_reader_instance.h"
-#include "usd_reader_light.h"
-#include "usd_reader_material.h"
-#include "usd_reader_mesh.h"
-#include "usd_reader_nurbs.h"
-#include "usd_reader_pointinstancer.h"
-#include "usd_reader_prim.h"
-#include "usd_reader_shape.h"
-#include "usd_reader_skeleton.h"
-#include "usd_reader_volume.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_stage.hh"
+#include "usd_reader_camera.hh"
+#include "usd_reader_curve.hh"
+#include "usd_reader_instance.hh"
+#include "usd_reader_light.hh"
+#include "usd_reader_material.hh"
+#include "usd_reader_mesh.hh"
+#include "usd_reader_nurbs.hh"
+#include "usd_reader_pointinstancer.hh"
+#include "usd_reader_prim.hh"
+#include "usd_reader_shape.hh"
+#include "usd_reader_skeleton.hh"
+#include "usd_reader_volume.hh"
+#include "usd_reader_xform.hh"
 
 #include <pxr/pxr.h>
 #include <pxr/usd/usd/primRange.h>
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.hh
similarity index 98%
rename from source/blender/io/usd/intern/usd_reader_stage.h
rename to source/blender/io/usd/intern/usd_reader_stage.hh
index d4bdeaea76d..d0ec7536912 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.hh
@@ -10,8 +10,8 @@ struct Main;
 #include "BLI_set.hh"
 
 #include "usd.h"
-#include "usd_hash_types.h"
-#include "usd_reader_prim.h"
+#include "usd_hash_types.hh"
+#include "usd_reader_prim.hh"
 
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usdGeom/imageable.h>
diff --git a/source/blender/io/usd/intern/usd_reader_volume.cc b/source/blender/io/usd/intern/usd_reader_volume.cc
index a0826a8803f..b3f46bb8e08 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.cc
+++ b/source/blender/io/usd/intern/usd_reader_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_reader_volume.h"
+#include "usd_reader_volume.hh"
 
 #include "BLI_string.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_volume.h b/source/blender/io/usd/intern/usd_reader_volume.hh
similarity index 96%
rename from source/blender/io/usd/intern/usd_reader_volume.h
rename to source/blender/io/usd/intern/usd_reader_volume.hh
index 6f08b211226..f5252876c23 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.h
+++ b/source/blender/io/usd/intern/usd_reader_volume.hh
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 #include "pxr/usd/usdVol/volume.h"
 
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 068028446a9..c984143097b 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -5,7 +5,7 @@
  *
  * Adapted from the Blender Alembic importer implementation. */
 
-#include "usd_reader_xform.h"
+#include "usd_reader_xform.hh"
 
 #include "BKE_constraint.h"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_xform.h b/source/blender/io/usd/intern/usd_reader_xform.hh
similarity index 98%
rename from source/blender/io/usd/intern/usd_reader_xform.h
rename to source/blender/io/usd/intern/usd_reader_xform.hh
index d7fbf93b923..b9b6b59ebb2 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.h
+++ b/source/blender/io/usd/intern/usd_reader_xform.hh
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "usd.h"
-#include "usd_reader_prim.h"
+#include "usd_reader_prim.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc
index e0a81380328..60ec5d5a9dc 100644
--- a/source/blender/io/usd/intern/usd_skel_convert.cc
+++ b/source/blender/io/usd/intern/usd_skel_convert.cc
@@ -2,12 +2,12 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_skel_convert.h"
+#include "usd_skel_convert.hh"
 
 #include "usd.h"
-#include "usd_armature_utils.h"
-#include "usd_blend_shape_utils.h"
-#include "usd_hash_types.h"
+#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>
diff --git a/source/blender/io/usd/intern/usd_skel_convert.h b/source/blender/io/usd/intern/usd_skel_convert.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_skel_convert.h
rename to source/blender/io/usd/intern/usd_skel_convert.hh
diff --git a/source/blender/io/usd/intern/usd_skel_root_utils.cc b/source/blender/io/usd/intern/usd_skel_root_utils.cc
index 9c47bb380f6..dedbb8cfde2 100644
--- a/source/blender/io/usd/intern/usd_skel_root_utils.cc
+++ b/source/blender/io/usd/intern/usd_skel_root_utils.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_skel_root_utils.h"
+#include "usd_skel_root_utils.hh"
 
 #include <pxr/usd/usd/primRange.h>
 #include <pxr/usd/usdGeom/xform.h>
diff --git a/source/blender/io/usd/intern/usd_skel_root_utils.h b/source/blender/io/usd/intern/usd_skel_root_utils.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_skel_root_utils.h
rename to source/blender/io/usd/intern/usd_skel_root_utils.hh
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc
index a5781950d9f..22e1a299027 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.cc
+++ b/source/blender/io/usd/intern/usd_writer_abstract.cc
@@ -1,8 +1,8 @@
 /* SPDX-FileCopyrightText: 2019 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_abstract.h"
-#include "usd_writer_material.h"
+#include "usd_writer_abstract.hh"
+#include "usd_writer_material.hh"
 
 #include <pxr/base/tf/stringUtils.h>
 #include <pxr/usd/usdGeom/bboxCache.h>
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.hh
similarity index 99%
rename from source/blender/io/usd/intern/usd_writer_abstract.h
rename to source/blender/io/usd/intern/usd_writer_abstract.hh
index 94f5c2224c7..9f4ec5347da 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.h
+++ b/source/blender/io/usd/intern/usd_writer_abstract.hh
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "IO_abstract_hierarchy_iterator.h"
-#include "usd_exporter_context.h"
+#include "usd_exporter_context.hh"
 
 #include <pxr/usd/sdf/path.h>
 #include <pxr/usd/usd/stage.h>
diff --git a/source/blender/io/usd/intern/usd_writer_armature.cc b/source/blender/io/usd/intern/usd_writer_armature.cc
index ae6979a63dc..efddcf3839b 100644
--- a/source/blender/io/usd/intern/usd_writer_armature.cc
+++ b/source/blender/io/usd/intern/usd_writer_armature.cc
@@ -2,10 +2,10 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_writer_armature.h"
-#include "usd_armature_utils.h"
-#include "usd_hierarchy_iterator.h"
-#include "usd_writer_transform.h"
+#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"
diff --git a/source/blender/io/usd/intern/usd_writer_armature.h b/source/blender/io/usd/intern/usd_writer_armature.hh
similarity index 94%
rename from source/blender/io/usd/intern/usd_writer_armature.h
rename to source/blender/io/usd/intern/usd_writer_armature.hh
index 4fe35b68f95..fac03426a03 100644
--- a/source/blender/io/usd/intern/usd_writer_armature.h
+++ b/source/blender/io/usd/intern/usd_writer_armature.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 #include "BLI_map.hh"
 
diff --git a/source/blender/io/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc
index 173ea4c4fc4..e080b9c6790 100644
--- a/source/blender/io/usd/intern/usd_writer_camera.cc
+++ b/source/blender/io/usd/intern/usd_writer_camera.cc
@@ -1,8 +1,8 @@
 /* SPDX-FileCopyrightText: 2019 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_camera.h"
-#include "usd_hierarchy_iterator.h"
+#include "usd_writer_camera.hh"
+#include "usd_hierarchy_iterator.hh"
 
 #include <pxr/usd/usdGeom/camera.h>
 #include <pxr/usd/usdGeom/tokens.h>
diff --git a/source/blender/io/usd/intern/usd_writer_camera.h b/source/blender/io/usd/intern/usd_writer_camera.hh
similarity index 93%
rename from source/blender/io/usd/intern/usd_writer_camera.h
rename to source/blender/io/usd/intern/usd_writer_camera.hh
index b5754b9b15b..2daa4d73b77 100644
--- a/source/blender/io/usd/intern/usd_writer_camera.h
+++ b/source/blender/io/usd/intern/usd_writer_camera.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_writer_curves.cc b/source/blender/io/usd/intern/usd_writer_curves.cc
index 6c19270f6aa..6f871c2db97 100644
--- a/source/blender/io/usd/intern/usd_writer_curves.cc
+++ b/source/blender/io/usd/intern/usd_writer_curves.cc
@@ -11,8 +11,8 @@
 #include <pxr/usd/usdShade/material.h>
 #include <pxr/usd/usdShade/materialBindingAPI.h>
 
-#include "usd_hierarchy_iterator.h"
-#include "usd_writer_curves.h"
+#include "usd_hierarchy_iterator.hh"
+#include "usd_writer_curves.hh"
 
 #include "BKE_attribute.hh"
 #include "BKE_curve_legacy_convert.hh"
diff --git a/source/blender/io/usd/intern/usd_writer_curves.h b/source/blender/io/usd/intern/usd_writer_curves.hh
similarity index 97%
rename from source/blender/io/usd/intern/usd_writer_curves.h
rename to source/blender/io/usd/intern/usd_writer_curves.hh
index 431ce9ad7cd..a1a46cbcac5 100644
--- a/source/blender/io/usd/intern/usd_writer_curves.h
+++ b/source/blender/io/usd/intern/usd_writer_curves.hh
@@ -6,7 +6,7 @@
 #include <memory>
 
 #include "DNA_curves_types.h"
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 #include <pxr/usd/usdGeom/basisCurves.h>
 
diff --git a/source/blender/io/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc
index 161ac28367f..b1b23d70f7d 100644
--- a/source/blender/io/usd/intern/usd_writer_hair.cc
+++ b/source/blender/io/usd/intern/usd_writer_hair.cc
@@ -1,8 +1,8 @@
 /* SPDX-FileCopyrightText: 2019 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_hair.h"
-#include "usd_hierarchy_iterator.h"
+#include "usd_writer_hair.hh"
+#include "usd_hierarchy_iterator.hh"
 
 #include <pxr/usd/usdGeom/basisCurves.h>
 #include <pxr/usd/usdGeom/tokens.h>
diff --git a/source/blender/io/usd/intern/usd_writer_hair.h b/source/blender/io/usd/intern/usd_writer_hair.hh
similarity index 93%
rename from source/blender/io/usd/intern/usd_writer_hair.h
rename to source/blender/io/usd/intern/usd_writer_hair.hh
index 6dc40cf402e..4799955b309 100644
--- a/source/blender/io/usd/intern/usd_writer_hair.h
+++ b/source/blender/io/usd/intern/usd_writer_hair.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc
index b32ca2a44c0..5d8c07d2dec 100644
--- a/source/blender/io/usd/intern/usd_writer_light.cc
+++ b/source/blender/io/usd/intern/usd_writer_light.cc
@@ -1,8 +1,8 @@
 /* SPDX-FileCopyrightText: 2019 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_light.h"
-#include "usd_hierarchy_iterator.h"
+#include "usd_writer_light.hh"
+#include "usd_hierarchy_iterator.hh"
 
 #include <pxr/usd/usdLux/diskLight.h>
 #include <pxr/usd/usdLux/distantLight.h>
diff --git a/source/blender/io/usd/intern/usd_writer_light.h b/source/blender/io/usd/intern/usd_writer_light.hh
similarity index 92%
rename from source/blender/io/usd/intern/usd_writer_light.h
rename to source/blender/io/usd/intern/usd_writer_light.hh
index dc1b5b606f5..f3583ed52fc 100644
--- a/source/blender/io/usd/intern/usd_writer_light.h
+++ b/source/blender/io/usd/intern/usd_writer_light.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc
index 2f0833fccf4..96e2de4dfb0 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -2,11 +2,11 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_writer_material.h"
+#include "usd_writer_material.hh"
 
 #include "usd.h"
-#include "usd_exporter_context.h"
-#include "usd_hook.h"
+#include "usd_exporter_context.hh"
+#include "usd_hook.hh"
 
 #include "BKE_image.h"
 #include "BKE_image_format.h"
diff --git a/source/blender/io/usd/intern/usd_writer_material.h b/source/blender/io/usd/intern/usd_writer_material.hh
similarity index 100%
rename from source/blender/io/usd/intern/usd_writer_material.h
rename to source/blender/io/usd/intern/usd_writer_material.hh
diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc
index 86e8c3a1562..93a5c958fe3 100644
--- a/source/blender/io/usd/intern/usd_writer_mesh.cc
+++ b/source/blender/io/usd/intern/usd_writer_mesh.cc
@@ -1,13 +1,13 @@
 /* SPDX-FileCopyrightText: 2019 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_mesh.h"
+#include "usd_writer_mesh.hh"
 
-#include "usd_armature_utils.h"
-#include "usd_blend_shape_utils.h"
-#include "usd_hierarchy_iterator.h"
-#include "usd_skel_convert.h"
-#include "usd_writer_armature.h"
+#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>
diff --git a/source/blender/io/usd/intern/usd_writer_mesh.h b/source/blender/io/usd/intern/usd_writer_mesh.hh
similarity index 99%
rename from source/blender/io/usd/intern/usd_writer_mesh.h
rename to source/blender/io/usd/intern/usd_writer_mesh.hh
index 38b401a226c..8c482cfa79a 100644
--- a/source/blender/io/usd/intern/usd_writer_mesh.h
+++ b/source/blender/io/usd/intern/usd_writer_mesh.hh
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "DNA_modifier_types.h"
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 #include "BLI_map.hh"
 
diff --git a/source/blender/io/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc
index bafd44ef131..b69b69fa053 100644
--- a/source/blender/io/usd/intern/usd_writer_metaball.cc
+++ b/source/blender/io/usd/intern/usd_writer_metaball.cc
@@ -1,8 +1,8 @@
 /* SPDX-FileCopyrightText: 2020 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_metaball.h"
-#include "usd_hierarchy_iterator.h"
+#include "usd_writer_metaball.hh"
+#include "usd_hierarchy_iterator.hh"
 
 #include <pxr/usd/usdGeom/mesh.h>
 #include <pxr/usd/usdShade/material.h>
diff --git a/source/blender/io/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.hh
similarity index 95%
rename from source/blender/io/usd/intern/usd_writer_metaball.h
rename to source/blender/io/usd/intern/usd_writer_metaball.hh
index 081774fa826..7b198bd3fdc 100644
--- a/source/blender/io/usd/intern/usd_writer_metaball.h
+++ b/source/blender/io/usd/intern/usd_writer_metaball.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_writer_mesh.h"
+#include "usd_writer_mesh.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_writer_transform.cc b/source/blender/io/usd/intern/usd_writer_transform.cc
index 7be47e85e5a..2f68da36bb5 100644
--- a/source/blender/io/usd/intern/usd_writer_transform.cc
+++ b/source/blender/io/usd/intern/usd_writer_transform.cc
@@ -1,8 +1,8 @@
 /* SPDX-FileCopyrightText: 2019 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
-#include "usd_writer_transform.h"
-#include "usd_hierarchy_iterator.h"
+#include "usd_writer_transform.hh"
+#include "usd_hierarchy_iterator.hh"
 
 #include <pxr/base/gf/matrix4f.h>
 #include <pxr/usd/usdGeom/xform.h>
diff --git a/source/blender/io/usd/intern/usd_writer_transform.h b/source/blender/io/usd/intern/usd_writer_transform.hh
similarity index 93%
rename from source/blender/io/usd/intern/usd_writer_transform.h
rename to source/blender/io/usd/intern/usd_writer_transform.hh
index d8c7328d1fd..17ce735a425 100644
--- a/source/blender/io/usd/intern/usd_writer_transform.h
+++ b/source/blender/io/usd/intern/usd_writer_transform.hh
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
 
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 #include <pxr/usd/usdGeom/xform.h>
 
diff --git a/source/blender/io/usd/intern/usd_writer_volume.cc b/source/blender/io/usd/intern/usd_writer_volume.cc
index 7a7663b9ffb..d6e80e6cfda 100644
--- a/source/blender/io/usd/intern/usd_writer_volume.cc
+++ b/source/blender/io/usd/intern/usd_writer_volume.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_writer_volume.h"
+#include "usd_writer_volume.hh"
 
 #include <pxr/base/tf/pathUtils.h>
 #include <pxr/usd/usdVol/openVDBAsset.h>
@@ -22,7 +22,7 @@
 
 #include "WM_api.hh"
 
-#include "usd_hierarchy_iterator.h"
+#include "usd_hierarchy_iterator.hh"
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_writer_volume.h b/source/blender/io/usd/intern/usd_writer_volume.hh
similarity index 97%
rename from source/blender/io/usd/intern/usd_writer_volume.h
rename to source/blender/io/usd/intern/usd_writer_volume.hh
index fe4704085bd..c37ca3f6fe8 100644
--- a/source/blender/io/usd/intern/usd_writer_volume.h
+++ b/source/blender/io/usd/intern/usd_writer_volume.hh
@@ -6,7 +6,7 @@
 #include <optional>
 
 #include "BLI_math_vector_types.hh"
-#include "usd_writer_abstract.h"
+#include "usd_writer_abstract.hh"
 
 struct Volume;
 
diff --git a/source/blender/io/usd/tests/usd_export_test.cc b/source/blender/io/usd/tests/usd_export_test.cc
index 8bc8be87d8f..438aa012bf0 100644
--- a/source/blender/io/usd/tests/usd_export_test.cc
+++ b/source/blender/io/usd/tests/usd_export_test.cc
@@ -37,7 +37,7 @@
 #include "WM_api.hh"
 
 #include "usd.h"
-#include "usd_writer_material.h"
+#include "usd_writer_material.hh"
 
 namespace blender::io::usd {