diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index 1cc366da94f..200ce2d88ac 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -175,19 +175,19 @@ if(WITH_HYDRA)
     hydra/volume_modifier.cc
     hydra/world.cc
 
-    hydra/curves.h
-    hydra/hydra_scene_delegate.h
-    hydra/id.h
-    hydra/image.h
-    hydra/instancer.h
-    hydra/light.h
-    hydra/material.h
-    hydra/mesh.h
-    hydra/object.h
-    hydra/usd_scene_delegate.h
-    hydra/volume.h
-    hydra/volume_modifier.h
-    hydra/world.h
+    hydra/curves.hh
+    hydra/hydra_scene_delegate.hh
+    hydra/id.hh
+    hydra/image.hh
+    hydra/instancer.hh
+    hydra/light.hh
+    hydra/material.hh
+    hydra/mesh.hh
+    hydra/object.hh
+    hydra/usd_scene_delegate.hh
+    hydra/volume.hh
+    hydra/volume_modifier.hh
+    hydra/world.hh
   )
 endif()
 
diff --git a/source/blender/io/usd/hydra/curves.cc b/source/blender/io/usd/hydra/curves.cc
index 163b1c4a973..be9f39735e6 100644
--- a/source/blender/io/usd/hydra/curves.cc
+++ b/source/blender/io/usd/hydra/curves.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "curves.h"
+#include "curves.hh"
 
 #include <pxr/base/gf/vec2f.h>
 #include <pxr/imaging/hd/tokens.h>
@@ -19,7 +19,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 
-#include "hydra_scene_delegate.h"
+#include "hydra_scene_delegate.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/curves.h b/source/blender/io/usd/hydra/curves.hh
similarity index 97%
rename from source/blender/io/usd/hydra/curves.h
rename to source/blender/io/usd/hydra/curves.hh
index 279139e1fb6..d04dec983be 100644
--- a/source/blender/io/usd/hydra/curves.h
+++ b/source/blender/io/usd/hydra/curves.hh
@@ -14,8 +14,8 @@
 #include "DNA_curves_types.h"
 #include "DNA_particle_types.h"
 
-#include "material.h"
-#include "object.h"
+#include "material.hh"
+#include "object.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/hydra_scene_delegate.cc b/source/blender/io/usd/hydra/hydra_scene_delegate.cc
index fc0cc935758..5c1a38e5077 100644
--- a/source/blender/io/usd/hydra/hydra_scene_delegate.cc
+++ b/source/blender/io/usd/hydra/hydra_scene_delegate.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "hydra_scene_delegate.h"
+#include "hydra_scene_delegate.hh"
 
 #include <bitset>
 
diff --git a/source/blender/io/usd/hydra/hydra_scene_delegate.h b/source/blender/io/usd/hydra/hydra_scene_delegate.hh
similarity index 95%
rename from source/blender/io/usd/hydra/hydra_scene_delegate.h
rename to source/blender/io/usd/hydra/hydra_scene_delegate.hh
index a5f017f8e42..14aa275129d 100644
--- a/source/blender/io/usd/hydra/hydra_scene_delegate.h
+++ b/source/blender/io/usd/hydra/hydra_scene_delegate.hh
@@ -13,14 +13,14 @@
 
 #include "CLG_log.h"
 
-#include "curves.h"
-#include "instancer.h"
-#include "light.h"
-#include "mesh.h"
-#include "object.h"
-#include "volume.h"
-#include "volume_modifier.h"
-#include "world.h"
+#include "curves.hh"
+#include "instancer.hh"
+#include "light.hh"
+#include "mesh.hh"
+#include "object.hh"
+#include "volume.hh"
+#include "volume_modifier.hh"
+#include "world.hh"
 
 struct Depsgraph;
 struct Main;
diff --git a/source/blender/io/usd/hydra/id.cc b/source/blender/io/usd/hydra/id.cc
index afd0b4cb8be..2568313880f 100644
--- a/source/blender/io/usd/hydra/id.cc
+++ b/source/blender/io/usd/hydra/id.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "id.h"
+#include "id.hh"
 
 #include "BKE_lib_id.hh"
 
diff --git a/source/blender/io/usd/hydra/id.h b/source/blender/io/usd/hydra/id.hh
similarity index 100%
rename from source/blender/io/usd/hydra/id.h
rename to source/blender/io/usd/hydra/id.hh
diff --git a/source/blender/io/usd/hydra/image.cc b/source/blender/io/usd/hydra/image.cc
index 8e5def403c0..e43aead7711 100644
--- a/source/blender/io/usd/hydra/image.cc
+++ b/source/blender/io/usd/hydra/image.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "image.h"
+#include "image.hh"
 
 #include <pxr/imaging/hio/imageRegistry.h>
 
@@ -20,7 +20,7 @@
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
-#include "hydra_scene_delegate.h"
+#include "hydra_scene_delegate.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/image.h b/source/blender/io/usd/hydra/image.hh
similarity index 100%
rename from source/blender/io/usd/hydra/image.h
rename to source/blender/io/usd/hydra/image.hh
diff --git a/source/blender/io/usd/hydra/instancer.cc b/source/blender/io/usd/hydra/instancer.cc
index 9415587cc2d..c84acacbddd 100644
--- a/source/blender/io/usd/hydra/instancer.cc
+++ b/source/blender/io/usd/hydra/instancer.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "instancer.h"
+#include "instancer.hh"
 
 #include <pxr/base/gf/vec2f.h>
 #include <pxr/imaging/hd/light.h>
@@ -16,7 +16,7 @@
 
 #include "DNA_particle_types.h"
 
-#include "hydra_scene_delegate.h"
+#include "hydra_scene_delegate.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/instancer.h b/source/blender/io/usd/hydra/instancer.hh
similarity index 99%
rename from source/blender/io/usd/hydra/instancer.h
rename to source/blender/io/usd/hydra/instancer.hh
index 1145671776a..22494549b37 100644
--- a/source/blender/io/usd/hydra/instancer.h
+++ b/source/blender/io/usd/hydra/instancer.hh
@@ -7,7 +7,7 @@
 #include "BLI_map.hh"
 #include "BLI_set.hh"
 
-#include "mesh.h"
+#include "mesh.hh"
 
 struct ParticleSystem;
 
diff --git a/source/blender/io/usd/hydra/light.cc b/source/blender/io/usd/hydra/light.cc
index 6cb96b6e35f..d9db32a32ae 100644
--- a/source/blender/io/usd/hydra/light.cc
+++ b/source/blender/io/usd/hydra/light.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "light.h"
+#include "light.hh"
 
 #include <pxr/imaging/hd/light.h>
 #include <pxr/imaging/hd/tokens.h>
@@ -12,7 +12,7 @@
 
 #include "BLI_math_rotation.h"
 
-#include "hydra_scene_delegate.h"
+#include "hydra_scene_delegate.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/light.h b/source/blender/io/usd/hydra/light.hh
similarity index 97%
rename from source/blender/io/usd/hydra/light.h
rename to source/blender/io/usd/hydra/light.hh
index 5d94b2a82dc..2867fc7572f 100644
--- a/source/blender/io/usd/hydra/light.h
+++ b/source/blender/io/usd/hydra/light.hh
@@ -10,7 +10,7 @@
 
 #include "BKE_light.h"
 
-#include "object.h"
+#include "object.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc
index 9ef030a5178..c343c383458 100644
--- a/source/blender/io/usd/hydra/material.cc
+++ b/source/blender/io/usd/hydra/material.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "material.h"
+#include "material.hh"
 
 #include <Python.h>
 #include <unicodeobject.h>
@@ -30,8 +30,8 @@
 
 #include "bpy_rna.h"
 
-#include "hydra_scene_delegate.h"
-#include "image.h"
+#include "hydra_scene_delegate.hh"
+#include "image.hh"
 
 #include "intern/usd_exporter_context.hh"
 #include "intern/usd_writer_material.hh"
diff --git a/source/blender/io/usd/hydra/material.h b/source/blender/io/usd/hydra/material.hh
similarity index 98%
rename from source/blender/io/usd/hydra/material.h
rename to source/blender/io/usd/hydra/material.hh
index c2797e852ef..ddbde17e95e 100644
--- a/source/blender/io/usd/hydra/material.h
+++ b/source/blender/io/usd/hydra/material.hh
@@ -12,7 +12,7 @@
 
 #include "BLI_map.hh"
 
-#include "id.h"
+#include "id.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/mesh.cc b/source/blender/io/usd/hydra/mesh.cc
index 2171478ebc7..2fa5b3405b2 100644
--- a/source/blender/io/usd/hydra/mesh.cc
+++ b/source/blender/io/usd/hydra/mesh.cc
@@ -16,8 +16,8 @@
 #include "BKE_mesh.hh"
 #include "BKE_mesh_runtime.hh"
 
-#include "hydra_scene_delegate.h"
-#include "mesh.h"
+#include "hydra_scene_delegate.hh"
+#include "mesh.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/mesh.h b/source/blender/io/usd/hydra/mesh.hh
similarity index 97%
rename from source/blender/io/usd/hydra/mesh.h
rename to source/blender/io/usd/hydra/mesh.hh
index 29dbd74a102..5daf125a6ae 100644
--- a/source/blender/io/usd/hydra/mesh.h
+++ b/source/blender/io/usd/hydra/mesh.hh
@@ -11,8 +11,8 @@
 
 #include "BKE_duplilist.h"
 
-#include "material.h"
-#include "object.h"
+#include "material.hh"
+#include "object.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/object.cc b/source/blender/io/usd/hydra/object.cc
index aecd52d449f..5349022a219 100644
--- a/source/blender/io/usd/hydra/object.cc
+++ b/source/blender/io/usd/hydra/object.cc
@@ -4,12 +4,12 @@
 
 #include "DEG_depsgraph_query.hh"
 
-#include "curves.h"
-#include "hydra_scene_delegate.h"
-#include "light.h"
-#include "mesh.h"
-#include "object.h"
-#include "volume.h"
+#include "curves.hh"
+#include "hydra_scene_delegate.hh"
+#include "light.hh"
+#include "mesh.hh"
+#include "object.hh"
+#include "volume.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/object.h b/source/blender/io/usd/hydra/object.hh
similarity index 97%
rename from source/blender/io/usd/hydra/object.h
rename to source/blender/io/usd/hydra/object.hh
index a81f812d3f4..04335fe825d 100644
--- a/source/blender/io/usd/hydra/object.h
+++ b/source/blender/io/usd/hydra/object.hh
@@ -15,8 +15,8 @@
 #include "BKE_layer.hh"
 #include "BKE_object.hh"
 
-#include "id.h"
-#include "material.h"
+#include "id.hh"
+#include "material.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/usd_scene_delegate.cc b/source/blender/io/usd/hydra/usd_scene_delegate.cc
index 0ef04f0d399..31e6d7e6e9b 100644
--- a/source/blender/io/usd/hydra/usd_scene_delegate.cc
+++ b/source/blender/io/usd/hydra/usd_scene_delegate.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "usd_scene_delegate.h"
+#include "usd_scene_delegate.hh"
 
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
diff --git a/source/blender/io/usd/hydra/usd_scene_delegate.h b/source/blender/io/usd/hydra/usd_scene_delegate.hh
similarity index 100%
rename from source/blender/io/usd/hydra/usd_scene_delegate.h
rename to source/blender/io/usd/hydra/usd_scene_delegate.hh
diff --git a/source/blender/io/usd/hydra/volume.cc b/source/blender/io/usd/hydra/volume.cc
index 03f5abccdfb..06c372a9368 100644
--- a/source/blender/io/usd/hydra/volume.cc
+++ b/source/blender/io/usd/hydra/volume.cc
@@ -14,8 +14,8 @@
 #include "BLI_index_range.hh"
 #include "DNA_volume_types.h"
 
-#include "hydra_scene_delegate.h"
-#include "volume.h"
+#include "hydra_scene_delegate.hh"
+#include "volume.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/volume.h b/source/blender/io/usd/hydra/volume.hh
similarity index 97%
rename from source/blender/io/usd/hydra/volume.h
rename to source/blender/io/usd/hydra/volume.hh
index 2d5a68532ae..90650f889c7 100644
--- a/source/blender/io/usd/hydra/volume.h
+++ b/source/blender/io/usd/hydra/volume.hh
@@ -6,7 +6,7 @@
 
 #include <pxr/imaging/hd/sceneDelegate.h>
 
-#include "object.h"
+#include "object.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/volume_modifier.cc b/source/blender/io/usd/hydra/volume_modifier.cc
index 02e9008beeb..04da4c78cce 100644
--- a/source/blender/io/usd/hydra/volume_modifier.cc
+++ b/source/blender/io/usd/hydra/volume_modifier.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "volume_modifier.h"
+#include "volume_modifier.hh"
 
 #include <pxr/usdImaging/usdVolImaging/tokens.h>
 
@@ -15,7 +15,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.hh"
 
-#include "hydra_scene_delegate.h"
+#include "hydra_scene_delegate.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/volume_modifier.h b/source/blender/io/usd/hydra/volume_modifier.hh
similarity index 97%
rename from source/blender/io/usd/hydra/volume_modifier.h
rename to source/blender/io/usd/hydra/volume_modifier.hh
index 4772f211d21..cdf3083ce1c 100644
--- a/source/blender/io/usd/hydra/volume_modifier.h
+++ b/source/blender/io/usd/hydra/volume_modifier.hh
@@ -6,7 +6,7 @@
 
 #include "DNA_fluid_types.h"
 
-#include "volume.h"
+#include "volume.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/io/usd/hydra/world.cc b/source/blender/io/usd/hydra/world.cc
index f9237dca74c..b4a94ba7271 100644
--- a/source/blender/io/usd/hydra/world.cc
+++ b/source/blender/io/usd/hydra/world.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "world.h"
+#include "world.hh"
 
 #include <pxr/base/gf/rotation.h>
 #include <pxr/base/gf/vec2f.h>
@@ -24,8 +24,8 @@
 
 #include "NOD_shader.h"
 
-#include "hydra_scene_delegate.h"
-#include "image.h"
+#include "hydra_scene_delegate.hh"
+#include "image.hh"
 
 /* TODO: add custom `tftoken` "transparency"? */
 
diff --git a/source/blender/io/usd/hydra/world.h b/source/blender/io/usd/hydra/world.hh
similarity index 97%
rename from source/blender/io/usd/hydra/world.h
rename to source/blender/io/usd/hydra/world.hh
index 8430ed7d3e0..73efbf35b45 100644
--- a/source/blender/io/usd/hydra/world.h
+++ b/source/blender/io/usd/hydra/world.hh
@@ -15,7 +15,7 @@
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 
-#include "light.h"
+#include "light.hh"
 
 namespace blender::io::hydra {
 
diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt
index d9740ef1231..ed9f3f3b027 100644
--- a/source/blender/render/hydra/CMakeLists.txt
+++ b/source/blender/render/hydra/CMakeLists.txt
@@ -83,14 +83,14 @@ set(SRC
   render_task_delegate.cc
   viewport_engine.cc
 
-  camera.h
-  engine.h
-  final_engine.h
-  light_tasks_delegate.h
-  preview_engine.h
-  render_task_delegate.h
-  settings.h
-  viewport_engine.h
+  camera.hh
+  engine.hh
+  final_engine.hh
+  light_tasks_delegate.hh
+  preview_engine.hh
+  render_task_delegate.hh
+  settings.hh
+  viewport_engine.hh
 )
 
 blender_add_lib(bf_render_hydra "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/render/hydra/camera.cc b/source/blender/render/hydra/camera.cc
index 605a286e2ef..0fcf2c88c63 100644
--- a/source/blender/render/hydra/camera.cc
+++ b/source/blender/render/hydra/camera.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "camera.h"
+#include "camera.hh"
 
 #include "BKE_camera.h"
 
@@ -10,7 +10,7 @@
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
-#include "hydra/object.h"
+#include "hydra/object.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/camera.h b/source/blender/render/hydra/camera.hh
similarity index 100%
rename from source/blender/render/hydra/camera.h
rename to source/blender/render/hydra/camera.hh
diff --git a/source/blender/render/hydra/engine.cc b/source/blender/render/hydra/engine.cc
index 287106be07a..43094a70491 100644
--- a/source/blender/render/hydra/engine.cc
+++ b/source/blender/render/hydra/engine.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "engine.h"
+#include "engine.hh"
 
 #include <pxr/base/plug/plugin.h>
 #include <pxr/base/plug/registry.h>
diff --git a/source/blender/render/hydra/engine.h b/source/blender/render/hydra/engine.hh
similarity index 91%
rename from source/blender/render/hydra/engine.h
rename to source/blender/render/hydra/engine.hh
index 989a06c895f..072ccad2b83 100644
--- a/source/blender/render/hydra/engine.h
+++ b/source/blender/render/hydra/engine.hh
@@ -15,12 +15,12 @@
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usdImaging/usdImaging/delegate.h>
 
-#include "hydra/hydra_scene_delegate.h"
-#include "hydra/settings.h"
-#include "hydra/usd_scene_delegate.h"
+#include "hydra/hydra_scene_delegate.hh"
+#include "hydra/settings.hh"
+#include "hydra/usd_scene_delegate.hh"
 
-#include "light_tasks_delegate.h"
-#include "render_task_delegate.h"
+#include "light_tasks_delegate.hh"
+#include "render_task_delegate.hh"
 
 struct bContext;
 struct RenderEngine;
diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc
index 85c70915314..13648148df6 100644
--- a/source/blender/render/hydra/final_engine.cc
+++ b/source/blender/render/hydra/final_engine.cc
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "final_engine.h"
-#include "camera.h"
+#include "final_engine.hh"
+#include "camera.hh"
 
 #include <pxr/imaging/hd/light.h>
 #include <pxr/imaging/hd/renderBuffer.h>
diff --git a/source/blender/render/hydra/final_engine.h b/source/blender/render/hydra/final_engine.hh
similarity index 96%
rename from source/blender/render/hydra/final_engine.h
rename to source/blender/render/hydra/final_engine.hh
index 9ad9ddb6326..9576d81321d 100644
--- a/source/blender/render/hydra/final_engine.h
+++ b/source/blender/render/hydra/final_engine.hh
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "engine.h"
+#include "engine.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/light_tasks_delegate.cc b/source/blender/render/hydra/light_tasks_delegate.cc
index 4bd064a8271..3c4330f1fcf 100644
--- a/source/blender/render/hydra/light_tasks_delegate.cc
+++ b/source/blender/render/hydra/light_tasks_delegate.cc
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "light_tasks_delegate.h"
-#include "engine.h"
+#include "light_tasks_delegate.hh"
+#include "engine.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/light_tasks_delegate.h b/source/blender/render/hydra/light_tasks_delegate.hh
similarity index 100%
rename from source/blender/render/hydra/light_tasks_delegate.h
rename to source/blender/render/hydra/light_tasks_delegate.hh
diff --git a/source/blender/render/hydra/preview_engine.cc b/source/blender/render/hydra/preview_engine.cc
index bc5df06e0ab..cefc552163d 100644
--- a/source/blender/render/hydra/preview_engine.cc
+++ b/source/blender/render/hydra/preview_engine.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "preview_engine.h"
+#include "preview_engine.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/preview_engine.h b/source/blender/render/hydra/preview_engine.hh
similarity index 93%
rename from source/blender/render/hydra/preview_engine.h
rename to source/blender/render/hydra/preview_engine.hh
index c2b4510295d..34ca01925b6 100644
--- a/source/blender/render/hydra/preview_engine.h
+++ b/source/blender/render/hydra/preview_engine.hh
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "final_engine.h"
+#include "final_engine.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/python.cc b/source/blender/render/hydra/python.cc
index cbe3bdbdd45..6fb249f2e92 100644
--- a/source/blender/render/hydra/python.cc
+++ b/source/blender/render/hydra/python.cc
@@ -2,9 +2,9 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "final_engine.h"
-#include "preview_engine.h"
-#include "viewport_engine.h"
+#include "final_engine.hh"
+#include "preview_engine.hh"
+#include "viewport_engine.hh"
 
 #include <Python.h>
 
@@ -19,7 +19,7 @@
 
 #include "RNA_prototypes.h"
 
-#include "hydra/image.h"
+#include "hydra/image.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/render_task_delegate.cc b/source/blender/render/hydra/render_task_delegate.cc
index 70b30e73cc0..fc42ec90f18 100644
--- a/source/blender/render/hydra/render_task_delegate.cc
+++ b/source/blender/render/hydra/render_task_delegate.cc
@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "render_task_delegate.h"
+#include "render_task_delegate.hh"
 
 #include <epoxy/gl.h>
 
@@ -16,7 +16,7 @@
 
 #include "Eigen/Core"
 
-#include "engine.h"
+#include "engine.hh"
 
 namespace blender::render::hydra {
 
diff --git a/source/blender/render/hydra/render_task_delegate.h b/source/blender/render/hydra/render_task_delegate.hh
similarity index 100%
rename from source/blender/render/hydra/render_task_delegate.h
rename to source/blender/render/hydra/render_task_delegate.hh
diff --git a/source/blender/render/hydra/settings.h b/source/blender/render/hydra/settings.hh
similarity index 100%
rename from source/blender/render/hydra/settings.h
rename to source/blender/render/hydra/settings.hh
diff --git a/source/blender/render/hydra/viewport_engine.cc b/source/blender/render/hydra/viewport_engine.cc
index 4449b947770..3bb6afcff92 100644
--- a/source/blender/render/hydra/viewport_engine.cc
+++ b/source/blender/render/hydra/viewport_engine.cc
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "viewport_engine.h"
-#include "camera.h"
+#include "viewport_engine.hh"
+#include "camera.hh"
 
 #include <pxr/base/gf/camera.h>
 #include <pxr/imaging/glf/drawTarget.h>
diff --git a/source/blender/render/hydra/viewport_engine.h b/source/blender/render/hydra/viewport_engine.hh
similarity index 97%
rename from source/blender/render/hydra/viewport_engine.h
rename to source/blender/render/hydra/viewport_engine.hh
index b73e97dfde7..368a6339492 100644
--- a/source/blender/render/hydra/viewport_engine.h
+++ b/source/blender/render/hydra/viewport_engine.hh
@@ -10,7 +10,7 @@
 #include "GPU_shader.h"
 #include "GPU_texture.h"
 
-#include "engine.h"
+#include "engine.hh"
 
 namespace blender::render::hydra {