diff --git a/intern/cycles/blender/device.h b/intern/cycles/blender/device.h
index fbe9e22fcb9..94e1f168a49 100644
--- a/intern/cycles/blender/device.h
+++ b/intern/cycles/blender/device.h
@@ -7,7 +7,7 @@
 
 #include "MEM_guardedalloc.h"
 #include "RNA_access.hh"
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 #include "RNA_types.hh"
 
 #include "device/device.h"
diff --git a/intern/cycles/blender/display_driver.h b/intern/cycles/blender/display_driver.h
index 24aec0123c8..f2b67180758 100644
--- a/intern/cycles/blender/display_driver.h
+++ b/intern/cycles/blender/display_driver.h
@@ -8,7 +8,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 
 #include "session/display_driver.h"
 
diff --git a/intern/cycles/blender/image.h b/intern/cycles/blender/image.h
index 694cb66cc8c..7de58d3fae3 100644
--- a/intern/cycles/blender/image.h
+++ b/intern/cycles/blender/image.h
@@ -5,7 +5,7 @@
 #ifndef __BLENDER_IMAGE_H__
 #define __BLENDER_IMAGE_H__
 
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 
 #include "scene/image.h"
 
diff --git a/intern/cycles/blender/light_linking.h b/intern/cycles/blender/light_linking.h
index ad061c42de7..3acc8320da8 100644
--- a/intern/cycles/blender/light_linking.h
+++ b/intern/cycles/blender/light_linking.h
@@ -7,7 +7,7 @@
 #include <cstdint>
 
 #include "MEM_guardedalloc.h"
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/output_driver.h b/intern/cycles/blender/output_driver.h
index 1695e912090..00b8c3dec34 100644
--- a/intern/cycles/blender/output_driver.h
+++ b/intern/cycles/blender/output_driver.h
@@ -6,7 +6,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 
 #include "session/output_driver.h"
 
diff --git a/intern/cycles/blender/session.h b/intern/cycles/blender/session.h
index c1d25ee37ff..17a290a1ebd 100644
--- a/intern/cycles/blender/session.h
+++ b/intern/cycles/blender/session.h
@@ -7,7 +7,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 
 #include "device/device.h"
 
diff --git a/intern/cycles/blender/sync.h b/intern/cycles/blender/sync.h
index 508216f0e73..e42622dd74b 100644
--- a/intern/cycles/blender/sync.h
+++ b/intern/cycles/blender/sync.h
@@ -7,7 +7,7 @@
 
 #include "MEM_guardedalloc.h"
 #include "RNA_access.hh"
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 #include "RNA_path.hh"
 #include "RNA_types.hh"
 
diff --git a/intern/cycles/blender/viewport.h b/intern/cycles/blender/viewport.h
index cb6389650b2..cc46904282f 100644
--- a/intern/cycles/blender/viewport.h
+++ b/intern/cycles/blender/viewport.h
@@ -8,7 +8,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_blender_cpp.h"
+#include "RNA_blender_cpp.hh"
 #include "RNA_types.hh"
 
 #include "scene/film.h"
diff --git a/source/blender/animrig/CMakeLists.txt b/source/blender/animrig/CMakeLists.txt
index 83fec1a9245..03e456143f9 100644
--- a/source/blender/animrig/CMakeLists.txt
+++ b/source/blender/animrig/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INC
   ../makesrna
   ../windowmanager
   ../../../extern/fmtlib/include
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
diff --git a/source/blender/animrig/intern/action.cc b/source/blender/animrig/intern/action.cc
index f030d87a27f..cc6868fb8d5 100644
--- a/source/blender/animrig/intern/action.cc
+++ b/source/blender/animrig/intern/action.cc
@@ -29,7 +29,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_keyframing.hh"
 
diff --git a/source/blender/animrig/intern/evaluation_test.cc b/source/blender/animrig/intern/evaluation_test.cc
index 7ec410a24d1..cd1e5d0ab9b 100644
--- a/source/blender/animrig/intern/evaluation_test.cc
+++ b/source/blender/animrig/intern/evaluation_test.cc
@@ -16,7 +16,7 @@
 #include "DNA_object_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLI_math_base.h"
 #include "BLI_string_utf8.h"
diff --git a/source/blender/animrig/intern/keyframing.cc b/source/blender/animrig/intern/keyframing.cc
index 0c51415eda0..149204248ab 100644
--- a/source/blender/animrig/intern/keyframing.cc
+++ b/source/blender/animrig/intern/keyframing.cc
@@ -41,7 +41,7 @@
 #include "MEM_guardedalloc.h"
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/animrig/intern/keyframing_auto.cc b/source/blender/animrig/intern/keyframing_auto.cc
index 2585fd73a9e..310a56266be 100644
--- a/source/blender/animrig/intern/keyframing_auto.cc
+++ b/source/blender/animrig/intern/keyframing_auto.cc
@@ -18,7 +18,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_keyframing.hh"
 
diff --git a/source/blender/animrig/intern/keyframing_test.cc b/source/blender/animrig/intern/keyframing_test.cc
index 31b00114c74..2e432d42902 100644
--- a/source/blender/animrig/intern/keyframing_test.cc
+++ b/source/blender/animrig/intern/keyframing_test.cc
@@ -20,7 +20,7 @@
 #include "DNA_object_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
diff --git a/source/blender/animrig/intern/visualkey.cc b/source/blender/animrig/intern/visualkey.cc
index 4c7ff9faeb2..372bb28c836 100644
--- a/source/blender/animrig/intern/visualkey.cc
+++ b/source/blender/animrig/intern/visualkey.cc
@@ -22,7 +22,7 @@
 #include "DNA_rigidbody_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender::animrig {
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index f809586769c..f24e4a20cdf 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INC
   ../../../intern/mikktspace
   ../../../intern/opensubdiv
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -829,7 +829,7 @@ endif()
 
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_blenkernel bf_rna)
 
 
@@ -863,7 +863,7 @@ if(WITH_GTESTS)
   )
   set(TEST_LIB
     ${LIB}
-    bf_rna  # RNA_prototypes.h
+    bf_rna  # RNA_prototypes.hh
   )
   blender_add_test_suite_lib(blenkernel "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
 endif()
diff --git a/source/blender/blenkernel/intern/action.cc b/source/blender/blenkernel/intern/action.cc
index 66cb1efb669..ee1c99a9e7b 100644
--- a/source/blender/blenkernel/intern/action.cc
+++ b/source/blender/blenkernel/intern/action.cc
@@ -60,7 +60,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc
index f646b1a731b..587c7e4471f 100644
--- a/source/blender/blenkernel/intern/anim_sys.cc
+++ b/source/blender/blenkernel/intern/anim_sys.cc
@@ -58,7 +58,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/callbacks.cc b/source/blender/blenkernel/intern/callbacks.cc
index dd656074ae4..a92bfb5f66a 100644
--- a/source/blender/blenkernel/intern/callbacks.cc
+++ b/source/blender/blenkernel/intern/callbacks.cc
@@ -14,7 +14,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 static ListBase callback_slots[BKE_CB_EVT_TOT] = {{nullptr}};
 
diff --git a/source/blender/blenkernel/intern/context.cc b/source/blender/blenkernel/intern/context.cc
index 0fdb2ca745d..cd042f838d7 100644
--- a/source/blender/blenkernel/intern/context.cc
+++ b/source/blender/blenkernel/intern/context.cc
@@ -44,7 +44,7 @@
 #include "RE_engine.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/fcurve_driver.cc b/source/blender/blenkernel/intern/fcurve_driver.cc
index ef2b96fc1c0..acb6967bd24 100644
--- a/source/blender/blenkernel/intern/fcurve_driver.cc
+++ b/source/blender/blenkernel/intern/fcurve_driver.cc
@@ -37,7 +37,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "atomic_ops.h"
 
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index 1fb3633c1ba..f88020dde27 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -51,7 +51,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/blenkernel/intern/layer_test.cc b/source/blender/blenkernel/intern/layer_test.cc
index 5d874d3e3c6..006ba101e34 100644
--- a/source/blender/blenkernel/intern/layer_test.cc
+++ b/source/blender/blenkernel/intern/layer_test.cc
@@ -18,7 +18,7 @@
 #include "CLG_log.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender::bke::tests {
 
diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index fe22978bf08..988d8c771ae 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -59,7 +59,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 
 #include "atomic_ops.h"
diff --git a/source/blender/blenkernel/intern/nla.cc b/source/blender/blenkernel/intern/nla.cc
index bb11cd0f3bd..092517f43ed 100644
--- a/source/blender/blenkernel/intern/nla.cc
+++ b/source/blender/blenkernel/intern/nla.cc
@@ -43,7 +43,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "nla_private.h"
 
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index f4a644d6e92..9d9fea28528 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -79,7 +79,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "NOD_common.h"
 #include "NOD_composite.hh"
diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc
index e79f744cba6..ca7d96d8720 100644
--- a/source/blender/blenkernel/intern/object_dupli.cc
+++ b/source/blender/blenkernel/intern/object_dupli.cc
@@ -59,7 +59,7 @@
 #include "NOD_geometry_nodes_log.hh"
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_nodes.hh"
 
diff --git a/source/blender/blenkernel/intern/tracking.cc b/source/blender/blenkernel/intern/tracking.cc
index 4202e063914..9b8e5e453b4 100644
--- a/source/blender/blenkernel/intern/tracking.cc
+++ b/source/blender/blenkernel/intern/tracking.cc
@@ -50,7 +50,7 @@
 #include "IMB_imbuf_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "libmv-capi.h"
 #include "tracking_private.h"
diff --git a/source/blender/blenkernel/intern/tracking_solver.cc b/source/blender/blenkernel/intern/tracking_solver.cc
index 6484c696027..8287e09a076 100644
--- a/source/blender/blenkernel/intern/tracking_solver.cc
+++ b/source/blender/blenkernel/intern/tracking_solver.cc
@@ -26,7 +26,7 @@
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "libmv-capi.h"
 #include "tracking_private.h"
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.cc b/source/blender/blenkernel/intern/tracking_stabilize.cc
index b54d6ac799f..5756fda7e0d 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.cc
+++ b/source/blender/blenkernel/intern/tracking_stabilize.cc
@@ -12,7 +12,7 @@
 
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index d22ba74fe6f..4203c21297b 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -17,7 +17,7 @@ set(INC
   ../sequencer
   ../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -96,7 +96,7 @@ endif()
 
 blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_blenloader bf_rna)
 
 if(WITH_GTESTS)
diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 11d12a3592b..0cc91b28e9c 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -84,7 +84,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLO_readfile.hh"
 
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 5516e644940..04bcde6a85f 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -23,7 +23,7 @@ if(WITH_COMPOSITOR_CPU)
     ../render
     ../render/intern
 
-    # RNA_prototypes.h
+    # RNA_prototypes.hh
     ${CMAKE_BINARY_DIR}/source/blender/makesrna
   )
 
@@ -638,7 +638,7 @@ if(WITH_COMPOSITOR_CPU)
     blender_add_test_suite_lib(compositor "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
   endif()
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   add_dependencies(bf_compositor bf_rna)
 
 # End WITH_COMPOSITOR_CPU.
diff --git a/source/blender/compositor/intern/COM_Node.cc b/source/blender/compositor/intern/COM_Node.cc
index cf06b47c49e..ea7632fc6ad 100644
--- a/source/blender/compositor/intern/COM_Node.cc
+++ b/source/blender/compositor/intern/COM_Node.cc
@@ -5,7 +5,7 @@
 #include "BKE_node.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "COM_Node.h" /* own include */
 
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 357b7db86f9..5cd755a1fb9 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../modifiers
   ../sequencer
   ../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -187,7 +187,7 @@ endif()
 blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 add_library(bf::depsgraph ALIAS bf_depsgraph)
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_depsgraph bf_rna)
 
 if(WITH_GTESTS)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 83964d0b7e3..3c3aea01351 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -24,7 +24,7 @@
 #include "BKE_collection.hh"
 #include "BKE_lib_id.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "intern/builder/deg_builder_cache.h"
 #include "intern/builder/deg_builder_remove_noop.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 87dc2e99067..851c3041b21 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -96,7 +96,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 
 #include "DEG_depsgraph.hh"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 99c5539cd05..a301fedf316 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -89,7 +89,7 @@
 #include "BKE_world.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 
 #include "ANIM_action.hh"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index 161bf14ba8a..17845a4ac90 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -31,7 +31,7 @@
 #include "BKE_constraint.h"
 #include "BKE_lib_query.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
index 0276925ccef..1c9508da0a8 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
@@ -25,7 +25,7 @@
 #include "BKE_constraint.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "intern/builder/deg_builder.h"
 #include "intern/depsgraph.hh"
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index 2174370edf6..dce0cc10a4b 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -25,7 +25,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index b580426b778..b2c24be9a71 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../sequencer
   ../../windowmanager
   ../../../../extern/fmtlib/include
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -61,7 +61,7 @@ endif()
 
 blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_animation bf_rna)
 
 if(WITH_GTESTS)
diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc
index 5730202f0cf..3fd1c380cfb 100644
--- a/source/blender/editors/animation/anim_channels_defines.cc
+++ b/source/blender/editors/animation/anim_channels_defines.cc
@@ -49,7 +49,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
diff --git a/source/blender/editors/animation/anim_ipo_utils.cc b/source/blender/editors/animation/anim_ipo_utils.cc
index 54805b378df..3fefe0d0669 100644
--- a/source/blender/editors/animation/anim_ipo_utils.cc
+++ b/source/blender/editors/animation/anim_ipo_utils.cc
@@ -24,7 +24,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_anim_api.hh"
 
diff --git a/source/blender/editors/animation/drivers.cc b/source/blender/editors/animation/drivers.cc
index 8c45bea947f..3dfad561719 100644
--- a/source/blender/editors/animation/drivers.cc
+++ b/source/blender/editors/animation/drivers.cc
@@ -38,7 +38,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ANIM_fcurve.hh"
 
diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc
index 42fe9017b6e..a9f22c729ac 100644
--- a/source/blender/editors/animation/fmodifier_ui.cc
+++ b/source/blender/editors/animation/fmodifier_ui.cc
@@ -34,7 +34,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc
index 132335f6339..287c270c849 100644
--- a/source/blender/editors/animation/keyframing.cc
+++ b/source/blender/editors/animation/keyframing.cc
@@ -62,7 +62,7 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "anim_intern.hh"
 
diff --git a/source/blender/editors/animation/time_scrub_ui.cc b/source/blender/editors/animation/time_scrub_ui.cc
index 4029cf02792..43f9025d99f 100644
--- a/source/blender/editors/animation/time_scrub_ui.cc
+++ b/source/blender/editors/animation/time_scrub_ui.cc
@@ -30,7 +30,7 @@
 #include "BLI_timecode.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 void ED_time_scrub_region_rect_get(const ARegion *region, rcti *rect)
 {
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index b9fd675abe0..5325406ed6f 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
   ../../../../intern/eigen
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -56,5 +56,5 @@ set(LIB
 
 blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_armature bf_rna)
diff --git a/source/blender/editors/armature/armature_edit.cc b/source/blender/editors/armature/armature_edit.cc
index 4e2dfc7d8d0..4346ab97575 100644
--- a/source/blender/editors/armature/armature_edit.cc
+++ b/source/blender/editors/armature/armature_edit.cc
@@ -35,7 +35,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface_icons.hh"
 
diff --git a/source/blender/editors/armature/pose_edit.cc b/source/blender/editors/armature/pose_edit.cc
index 7914ea16c9b..d91066b46da 100644
--- a/source/blender/editors/armature/pose_edit.cc
+++ b/source/blender/editors/armature/pose_edit.cc
@@ -32,7 +32,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc
index 99c42e9fd22..7e1cd335c22 100644
--- a/source/blender/editors/armature/pose_lib_2.cc
+++ b/source/blender/editors/armature/pose_lib_2.cc
@@ -33,7 +33,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc
index c22c256b699..d5e446d424f 100644
--- a/source/blender/editors/armature/pose_slide.cc
+++ b/source/blender/editors/armature/pose_slide.cc
@@ -53,7 +53,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc
index 2218b13e197..4675efd070a 100644
--- a/source/blender/editors/armature/pose_transform.cc
+++ b/source/blender/editors/armature/pose_transform.cc
@@ -37,7 +37,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/armature/pose_utils.cc b/source/blender/editors/armature/pose_utils.cc
index a8047331d37..023c377a144 100644
--- a/source/blender/editors/armature/pose_utils.cc
+++ b/source/blender/editors/armature/pose_utils.cc
@@ -28,7 +28,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt
index ecc1a6fd4c2..411b1ca8e3d 100644
--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../../windowmanager
   # dna_type_offsets.h
   ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -66,5 +66,5 @@ set(LIB
 
 blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_asset bf_rna)
diff --git a/source/blender/editors/asset/intern/asset_catalog.cc b/source/blender/editors/asset/intern/asset_catalog.cc
index 5c2e932c627..9d58559999d 100644
--- a/source/blender/editors/asset/intern/asset_catalog.cc
+++ b/source/blender/editors/asset/intern/asset_catalog.cc
@@ -16,7 +16,7 @@
 #include "BLI_string_utils.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_asset_catalog.hh"
 
diff --git a/source/blender/editors/asset/intern/asset_mark_clear.cc b/source/blender/editors/asset/intern/asset_mark_clear.cc
index 18478bd32f2..d4d9a84b48d 100644
--- a/source/blender/editors/asset/intern/asset_mark_clear.cc
+++ b/source/blender/editors/asset/intern/asset_mark_clear.cc
@@ -20,7 +20,7 @@
 
 #include "UI_interface_icons.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_asset_list.hh"
 #include "ED_asset_mark_clear.hh"
diff --git a/source/blender/editors/asset/intern/asset_menu_utils.cc b/source/blender/editors/asset/intern/asset_menu_utils.cc
index d04694da8ca..6e04f776f97 100644
--- a/source/blender/editors/asset/intern/asset_menu_utils.cc
+++ b/source/blender/editors/asset/intern/asset_menu_utils.cc
@@ -21,7 +21,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_asset_list.hh"
 #include "ED_asset_menu_utils.hh"
diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc
index 2f6d9406e7a..33da4c9e5d1 100644
--- a/source/blender/editors/asset/intern/asset_ops.cc
+++ b/source/blender/editors/asset/intern/asset_ops.cc
@@ -29,7 +29,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/asset/intern/asset_shelf.cc b/source/blender/editors/asset/intern/asset_shelf.cc
index 28a40b1c00a..e1c12abd607 100644
--- a/source/blender/editors/asset/intern/asset_shelf.cc
+++ b/source/blender/editors/asset/intern/asset_shelf.cc
@@ -28,7 +28,7 @@
 #include "ED_screen.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/asset/intern/asset_shelf_asset_view.cc b/source/blender/editors/asset/intern/asset_shelf_asset_view.cc
index 97262b8295a..b69b440fb42 100644
--- a/source/blender/editors/asset/intern/asset_shelf_asset_view.cc
+++ b/source/blender/editors/asset/intern/asset_shelf_asset_view.cc
@@ -29,7 +29,7 @@
 #include "UI_interface.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc
index a15881f6899..07083d6ff7b 100644
--- a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc
+++ b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc
@@ -24,7 +24,7 @@
 #include "ED_asset_list.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_tree_view.hh"
diff --git a/source/blender/editors/asset/intern/asset_shelf_popover.cc b/source/blender/editors/asset/intern/asset_shelf_popover.cc
index 2d7c6c78991..e57fdd5c9c2 100644
--- a/source/blender/editors/asset/intern/asset_shelf_popover.cc
+++ b/source/blender/editors/asset/intern/asset_shelf_popover.cc
@@ -22,7 +22,7 @@
 #include "ED_asset_shelf.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index 4a98c70e2af..dc64af326a2 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -9,7 +9,7 @@ set(INC
   ../../gpu
   ../../makesrna
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -55,5 +55,5 @@ endif()
 
 blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_curve bf_rna)
diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc
index 57ba8c32dc4..5551e6be8e4 100644
--- a/source/blender/editors/curve/editcurve_paint.cc
+++ b/source/blender/editors/curve/editcurve_paint.cc
@@ -44,7 +44,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "RNA_enum_types.hh"
 
diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt
index 643a4c8bd6c..9ddac358cf3 100644
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
diff --git a/source/blender/editors/curves/intern/curves_draw.cc b/source/blender/editors/curves/intern/curves_draw.cc
index dbdbff0f2f1..9fe4fe729b3 100644
--- a/source/blender/editors/curves/intern/curves_draw.cc
+++ b/source/blender/editors/curves/intern/curves_draw.cc
@@ -35,7 +35,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 extern "C" {
 #include "curve_fit_nd.h"
diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc
index daee11227f1..f1d31fb6766 100644
--- a/source/blender/editors/curves/intern/curves_ops.cc
+++ b/source/blender/editors/curves/intern/curves_ops.cc
@@ -58,7 +58,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt
index f7eafe92c4b..17631417061 100644
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../../nodes
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -41,5 +41,5 @@ set(LIB
 
 blender_add_lib(bf_editor_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_geometry bf_rna)
diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
index ed2b11a1b18..fb8f21bbcce 100644
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
   ../../../../intern/eigen
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -49,5 +49,5 @@ set(LIB
 
 blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_gizmo_library bf_rna)
diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc
index ba6fc5d5001..99c1209b7f1 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc
@@ -25,7 +25,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt
index f751adfb3cd..80488f7f0ed 100644
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../imbuf
   ../../makesrna
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -81,5 +81,5 @@ endif()
 
 blender_add_lib(bf_editor_gpencil_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_gpencil_legacy bf_rna)
diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc
index 78980c22247..302ae9fc4bf 100644
--- a/source/blender/editors/gpencil_legacy/annotate_paint.cc
+++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc
@@ -46,7 +46,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc
index 30add9ae5f2..06b1ed25def 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc
@@ -47,7 +47,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_gpencil_legacy.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc
index fe283984eb8..33529135f46 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc
@@ -60,7 +60,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc
index 04548eb45e8..6b7b0937a1a 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc
@@ -53,7 +53,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_view2d.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc
index 13450452e38..d19144d4f98 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc
@@ -60,7 +60,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_resources.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc
index 19e35d197c4..4595c4dc7dd 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc
@@ -32,7 +32,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_view2d.hh"
 
diff --git a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc
index 65a39f3e08d..f1a6cba0514 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc
@@ -39,7 +39,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_view2d.hh"
 
diff --git a/source/blender/editors/grease_pencil/CMakeLists.txt b/source/blender/editors/grease_pencil/CMakeLists.txt
index 713ca6e332c..28572750100 100644
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INC
   ../../../../extern/curve_fit_nd
   ../../geometry
   ../sculpt_paint
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 177bb033fa6..cf24f228c6a 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -21,7 +21,7 @@ set(INC
   ../../windowmanager
   ../../../../intern/ghost
   ../../bmesh
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -128,7 +128,7 @@ endif()
 
 blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_interface bf_rna)
 
 if(WITH_GTESTS)
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
index 1fc48061c07..588e82cc86b 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
@@ -35,7 +35,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
index dde0063c447..1dab3d82acc 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
@@ -27,7 +27,7 @@
 #include "BKE_context.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
index 6df05026cee..5174f012ebd 100644
--- a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
+++ b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
@@ -31,7 +31,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc
index f688565e758..a75a90f7ecd 100644
--- a/source/blender/editors/interface/interface_context_menu.cc
+++ b/source/blender/editors/interface/interface_context_menu.cc
@@ -38,7 +38,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
diff --git a/source/blender/editors/interface/interface_context_path.cc b/source/blender/editors/interface/interface_context_path.cc
index 0b39d46262c..4baba7daae2 100644
--- a/source/blender/editors/interface/interface_context_path.cc
+++ b/source/blender/editors/interface/interface_context_path.cc
@@ -13,7 +13,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender::ui {
 
diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc
index 9eeacfe27fd..dccd0a6bf8f 100644
--- a/source/blender/editors/interface/interface_dropboxes.cc
+++ b/source/blender/editors/interface/interface_dropboxes.cc
@@ -18,7 +18,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc
index 4a43ecf537c..a7a739ea132 100644
--- a/source/blender/editors/interface/interface_handlers.cc
+++ b/source/blender/editors/interface/interface_handlers.cc
@@ -64,7 +64,7 @@
 #include "interface_intern.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc
index 99f1a7bf0bf..b330cde4251 100644
--- a/source/blender/editors/interface/interface_icons.cc
+++ b/source/blender/editors/interface/interface_icons.cc
@@ -23,7 +23,7 @@
 #include "DNA_space_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_context.hh"
 #include "BKE_global.hh"
diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc
index 93f300ea2a5..c4eb61088b3 100644
--- a/source/blender/editors/interface/interface_layout.cc
+++ b/source/blender/editors/interface/interface_layout.cc
@@ -36,7 +36,7 @@
 #include "BKE_screen.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc
index c581cdb5199..4753932ec31 100644
--- a/source/blender/editors/interface/interface_ops.cc
+++ b/source/blender/editors/interface/interface_ops.cc
@@ -46,7 +46,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_abstract_view.hh"
 #include "UI_interface.hh"
diff --git a/source/blender/editors/interface/interface_ops_test.cc b/source/blender/editors/interface/interface_ops_test.cc
index 63a84101908..41380573469 100644
--- a/source/blender/editors/interface/interface_ops_test.cc
+++ b/source/blender/editors/interface/interface_ops_test.cc
@@ -15,7 +15,7 @@
 #include "DNA_anim_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
diff --git a/source/blender/editors/interface/regions/interface_region_menu_pie.cc b/source/blender/editors/interface/regions/interface_region_menu_pie.cc
index a96ce98ba5c..b027dba1ab8 100644
--- a/source/blender/editors/interface/regions/interface_region_menu_pie.cc
+++ b/source/blender/editors/interface/regions/interface_region_menu_pie.cc
@@ -28,7 +28,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/regions/interface_region_tooltip.cc b/source/blender/editors/interface/regions/interface_region_tooltip.cc
index b4db79c95e2..1b157c311a8 100644
--- a/source/blender/editors/interface/regions/interface_region_tooltip.cc
+++ b/source/blender/editors/interface/regions/interface_region_tooltip.cc
@@ -60,7 +60,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/templates/interface_template_asset_shelf_popover.cc b/source/blender/editors/interface/templates/interface_template_asset_shelf_popover.cc
index 4ae4dfa369a..199f1049b13 100644
--- a/source/blender/editors/interface/templates/interface_template_asset_shelf_popover.cc
+++ b/source/blender/editors/interface/templates/interface_template_asset_shelf_popover.cc
@@ -12,7 +12,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_interface_c.hh"
diff --git a/source/blender/editors/interface/templates/interface_template_asset_view.cc b/source/blender/editors/interface/templates/interface_template_asset_view.cc
index a3cc67c8f89..623a4bf8d4e 100644
--- a/source/blender/editors/interface/templates/interface_template_asset_view.cc
+++ b/source/blender/editors/interface/templates/interface_template_asset_view.cc
@@ -22,7 +22,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/interface/templates/interface_template_bone_collection_tree.cc b/source/blender/editors/interface/templates/interface_template_bone_collection_tree.cc
index e1d2f70f672..add71c37d7b 100644
--- a/source/blender/editors/interface/templates/interface_template_bone_collection_tree.cc
+++ b/source/blender/editors/interface/templates/interface_template_bone_collection_tree.cc
@@ -17,7 +17,7 @@
 #include "UI_tree_view.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_armature.hh"
 #include "ED_undo.hh"
diff --git a/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc b/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
index 553da041b0f..57d6c746254 100644
--- a/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
+++ b/source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
@@ -17,7 +17,7 @@
 #include "UI_tree_view.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_undo.hh"
 
diff --git a/source/blender/editors/interface/templates/interface_template_light_linking.cc b/source/blender/editors/interface/templates/interface_template_light_linking.cc
index 30945dc7fd9..69b4a8dffdc 100644
--- a/source/blender/editors/interface/templates/interface_template_light_linking.cc
+++ b/source/blender/editors/interface/templates/interface_template_light_linking.cc
@@ -22,7 +22,7 @@
 #include "BKE_light_linking.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/interface/templates/interface_template_list.cc b/source/blender/editors/interface/templates/interface_template_list.cc
index 09cb8ce187a..a770853e179 100644
--- a/source/blender/editors/interface/templates/interface_template_list.cc
+++ b/source/blender/editors/interface/templates/interface_template_list.cc
@@ -27,7 +27,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/interface/templates/interface_template_node_inputs.cc b/source/blender/editors/interface/templates/interface_template_node_inputs.cc
index 20fe348c691..209412a2122 100644
--- a/source/blender/editors/interface/templates/interface_template_node_inputs.cc
+++ b/source/blender/editors/interface/templates/interface_template_node_inputs.cc
@@ -18,7 +18,7 @@
 #include "NOD_node_declaration.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc b/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc
index 175f149e8d7..7fef596989c 100644
--- a/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc
+++ b/source/blender/editors/interface/templates/interface_template_node_tree_interface.cc
@@ -21,7 +21,7 @@
 #include "ED_undo.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/interface/templates/interface_template_search_menu.cc b/source/blender/editors/interface/templates/interface_template_search_menu.cc
index 1be23f863f0..90d31706118 100644
--- a/source/blender/editors/interface/templates/interface_template_search_menu.cc
+++ b/source/blender/editors/interface/templates/interface_template_search_menu.cc
@@ -39,7 +39,7 @@
 #include "ED_screen.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/interface/templates/interface_templates.cc b/source/blender/editors/interface/templates/interface_templates.cc
index 9e12bcaf5a2..d3ca2b4973e 100644
--- a/source/blender/editors/interface/templates/interface_templates.cc
+++ b/source/blender/editors/interface/templates/interface_templates.cc
@@ -90,7 +90,7 @@
 #include "RE_engine.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/io/io_drop_import_file.cc b/source/blender/editors/io/io_drop_import_file.cc
index 04ec760f812..82a6cb3c1ec 100644
--- a/source/blender/editors/io/io_drop_import_file.cc
+++ b/source/blender/editors/io/io_drop_import_file.cc
@@ -15,7 +15,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/io/io_utils.cc b/source/blender/editors/io/io_utils.cc
index f0124edbf90..fc3abe9a2cd 100644
--- a/source/blender/editors/io/io_utils.cc
+++ b/source/blender/editors/io/io_utils.cc
@@ -13,7 +13,7 @@
 #include "DNA_space_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 12efd559990..e9fa7d85a05 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
   ../../makesrna
   ../../render
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -99,5 +99,5 @@ endif()
 
 blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_mesh bf_rna)
diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc
index d972461a4a2..3f17333d48b 100644
--- a/source/blender/editors/mesh/editmesh_bevel.cc
+++ b/source/blender/editors/mesh/editmesh_bevel.cc
@@ -26,7 +26,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc
index 180277a9b0a..415a5051cfd 100644
--- a/source/blender/editors/mesh/editmesh_tools.cc
+++ b/source/blender/editors/mesh/editmesh_tools.cc
@@ -55,7 +55,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index 3be8e54f980..daba95d2fe3 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -26,7 +26,7 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 5fcc9b43bdd..37e57b4c597 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -21,7 +21,7 @@ set(INC
   ../../shader_fx
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -89,5 +89,5 @@ endif()
 
 blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_object bf_rna)
diff --git a/source/blender/editors/object/object_collection.cc b/source/blender/editors/object/object_collection.cc
index 3ba505dbcd2..8b6487cc587 100644
--- a/source/blender/editors/object/object_collection.cc
+++ b/source/blender/editors/object/object_collection.cc
@@ -41,7 +41,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_interface_icons.hh"
diff --git a/source/blender/editors/object/object_constraint.cc b/source/blender/editors/object/object_constraint.cc
index 70d3bfc12e1..0bbda99244c 100644
--- a/source/blender/editors/object/object_constraint.cc
+++ b/source/blender/editors/object/object_constraint.cc
@@ -54,7 +54,7 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_object.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/object/object_data_transfer.cc b/source/blender/editors/object/object_data_transfer.cc
index 36b7aa8fe82..e42c2252b12 100644
--- a/source/blender/editors/object/object_data_transfer.cc
+++ b/source/blender/editors/object/object_data_transfer.cc
@@ -31,7 +31,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/object/object_gpencil_modifier.cc b/source/blender/editors/object/object_gpencil_modifier.cc
index 05719b6fc42..88d817f99cb 100644
--- a/source/blender/editors/object/object_gpencil_modifier.cc
+++ b/source/blender/editors/object/object_gpencil_modifier.cc
@@ -37,7 +37,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_object.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc
index 7f05a818506..850e352e52d 100644
--- a/source/blender/editors/object/object_hook.cc
+++ b/source/blender/editors/object/object_hook.cc
@@ -41,7 +41,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_curve.hh"
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/object/object_light_linking_ops.cc b/source/blender/editors/object/object_light_linking_ops.cc
index 298bf150570..2a51b700d47 100644
--- a/source/blender/editors/object/object_light_linking_ops.cc
+++ b/source/blender/editors/object/object_light_linking_ops.cc
@@ -23,7 +23,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender::ed::object {
 
diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc
index c6a44225617..451ee078f1b 100644
--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@@ -86,7 +86,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_armature.hh"
 #include "ED_mesh.hh"
diff --git a/source/blender/editors/object/object_shader_fx.cc b/source/blender/editors/object/object_shader_fx.cc
index 9f643d31ed8..3d77cbe3579 100644
--- a/source/blender/editors/object/object_shader_fx.cc
+++ b/source/blender/editors/object/object_shader_fx.cc
@@ -37,7 +37,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_object.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index f0fb526e957..7cc5808b801 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -10,7 +10,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
   ../../../../intern/mantaflow/extern
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -60,5 +60,5 @@ endif()
 
 blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_physics bf_rna)
diff --git a/source/blender/editors/physics/particle_boids.cc b/source/blender/editors/physics/particle_boids.cc
index 43bd168e714..bd9330abefb 100644
--- a/source/blender/editors/physics/particle_boids.cc
+++ b/source/blender/editors/physics/particle_boids.cc
@@ -24,7 +24,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc
index 3bf2d920dbd..55e6d57dab4 100644
--- a/source/blender/editors/physics/particle_object.cc
+++ b/source/blender/editors/physics/particle_object.cc
@@ -43,7 +43,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/physics/physics_pointcache.cc b/source/blender/editors/physics/physics_pointcache.cc
index c79734796f7..7b38346e5ff 100644
--- a/source/blender/editors/physics/physics_pointcache.cc
+++ b/source/blender/editors/physics/physics_pointcache.cc
@@ -27,7 +27,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "physics_intern.hh"
 
diff --git a/source/blender/editors/physics/rigidbody_object.cc b/source/blender/editors/physics/rigidbody_object.cc
index c21fd343494..18501e96f4b 100644
--- a/source/blender/editors/physics/rigidbody_object.cc
+++ b/source/blender/editors/physics/rigidbody_object.cc
@@ -27,7 +27,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index 20eab2ce2ee..4e8bdc17d19 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
   ../../render
   ../../sequencer
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -73,5 +73,5 @@ endif()
 
 blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_render bf_rna)
diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc
index 9c032ed8fd6..d1a21c8bcc9 100644
--- a/source/blender/editors/render/render_shading.cc
+++ b/source/blender/editors/render/render_shading.cc
@@ -87,7 +87,7 @@
 #include "ED_screen.hh"
 
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 5ff6c515ac9..4af66fa7d0a 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
   ../../sequencer
   ../../windowmanager
   ../../../../extern/fmtlib/include
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -60,5 +60,5 @@ endif()
 
 blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_screen bf_rna)
diff --git a/source/blender/editors/screen/screen_context.cc b/source/blender/editors/screen/screen_context.cc
index 65ba40e257d..c4b25e0be36 100644
--- a/source/blender/editors/screen/screen_context.cc
+++ b/source/blender/editors/screen/screen_context.cc
@@ -37,7 +37,7 @@
 #include "BKE_tracking.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_anim_api.hh"
 #include "ED_armature.hh"
diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc
index 7c196421fc3..ccf2d267e53 100644
--- a/source/blender/editors/screen/screen_ops.cc
+++ b/source/blender/editors/screen/screen_ops.cc
@@ -67,7 +67,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/screen/screen_user_menu.cc b/source/blender/editors/screen/screen_user_menu.cc
index 3f5b0fe670e..9bd8b0e7bb4 100644
--- a/source/blender/editors/screen/screen_user_menu.cc
+++ b/source/blender/editors/screen/screen_user_menu.cc
@@ -36,7 +36,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Internal Utilities
diff --git a/source/blender/editors/screen/screendump.cc b/source/blender/editors/screen/screendump.cc
index 0124a7d24fe..8019bc7d0d7 100644
--- a/source/blender/editors/screen/screendump.cc
+++ b/source/blender/editors/screen/screendump.cc
@@ -33,7 +33,7 @@
 #include "BLT_translation.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index b58a93cfb04..a48234feeb0 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -24,7 +24,7 @@ set(INC
   ../../render
   ../../windowmanager
   ../../../../intern/eigen
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -182,7 +182,7 @@ if(WITH_GTESTS)
   )
   set(TEST_LIB
     ${LIB}
-    bf_rna  # RNA_prototypes.h
+    bf_rna  # RNA_prototypes.hh
   )
   blender_add_test_suite_lib(editor_sculpt_paint "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
 endif()
@@ -194,5 +194,5 @@ if(WITH_TBB AND MSVC_CLANG)
 endif()
 
 blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_sculpt_paint bf_rna)
diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc
index 890aa926f04..03f8200b27c 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.cc
+++ b/source/blender/editors/sculpt_paint/paint_utils.cc
@@ -46,7 +46,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "IMB_imbuf_types.hh"
 #include "IMB_interp.hh"
diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc
index f8b964d416f..9413f28478b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_detail.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc
@@ -43,7 +43,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
index 6564bd14273..31d7eb47bfe 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
@@ -43,7 +43,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index b30edcfadb8..777157150f0 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -8,7 +8,7 @@ set(INC
   ../../makesrna
   ../../sequencer
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -56,5 +56,5 @@ endif()
 
 blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_sound bf_rna)
diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc
index e0ec5f64952..c3dc6327464 100644
--- a/source/blender/editors/sound/sound_ops.cc
+++ b/source/blender/editors/sound/sound_ops.cc
@@ -35,7 +35,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "SEQ_iterator.hh"
 
diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 61b48b7dd9c..f7be190c398 100644
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INC
   ../../modifiers
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -47,5 +47,5 @@ endif()
 
 blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_action bf_rna)
diff --git a/source/blender/editors/space_action/action_data.cc b/source/blender/editors/space_action/action_data.cc
index a7bdb429095..3058599f4b5 100644
--- a/source/blender/editors/space_action/action_data.cc
+++ b/source/blender/editors/space_action/action_data.cc
@@ -22,7 +22,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_action.h"
 #include "BKE_context.hh"
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index 809afdc6425..15790580c48 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -46,5 +46,5 @@ endif()
 
 blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_buttons bf_rna)
diff --git a/source/blender/editors/space_buttons/buttons_context.cc b/source/blender/editors/space_buttons/buttons_context.cc
index 596ee15623f..9c9449f7102 100644
--- a/source/blender/editors/space_buttons/buttons_context.cc
+++ b/source/blender/editors/space_buttons/buttons_context.cc
@@ -38,7 +38,7 @@
 #include "BKE_screen.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_buttons.hh"
 #include "ED_physics.hh"
diff --git a/source/blender/editors/space_buttons/buttons_ops.cc b/source/blender/editors/space_buttons/buttons_ops.cc
index 3ce1d8cbaaf..7b4d9059001 100644
--- a/source/blender/editors/space_buttons/buttons_ops.cc
+++ b/source/blender/editors/space_buttons/buttons_ops.cc
@@ -33,7 +33,7 @@
 #include "ED_undo.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_buttons/buttons_texture.cc b/source/blender/editors/space_buttons/buttons_texture.cc
index 4b4c8a179e6..75b01e27ba1 100644
--- a/source/blender/editors/space_buttons/buttons_texture.cc
+++ b/source/blender/editors/space_buttons/buttons_texture.cc
@@ -39,7 +39,7 @@
 #include "BKE_particle.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index 9bc924d5998..b958b3b4357 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -67,5 +67,5 @@ endif()
 
 blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_space_clip bf_rna)
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.cc b/source/blender/editors/space_clip/clip_dopesheet_draw.cc
index 36d0b64b562..2dc8ea85851 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_draw.cc
+++ b/source/blender/editors/space_clip/clip_dopesheet_draw.cc
@@ -27,7 +27,7 @@
 #include "BLF_api.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "GPU_immediate.hh"
 #include "GPU_state.hh"
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index 0651ccac233..81ca6866837 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -15,7 +15,7 @@ set(INC
   ../../render
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -87,5 +87,5 @@ endif()
 
 blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_file bf_rna)
diff --git a/source/blender/editors/space_file/file_context.cc b/source/blender/editors/space_file/file_context.cc
index d781ecc6f58..1c79f81caae 100644
--- a/source/blender/editors/space_file/file_context.cc
+++ b/source/blender/editors/space_file/file_context.cc
@@ -11,7 +11,7 @@
 #include "ED_fileselect.hh"
 #include "ED_screen.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "file_intern.hh"
 #include "filelist.hh"
diff --git a/source/blender/editors/space_file/file_draw.cc b/source/blender/editors/space_file/file_draw.cc
index 7794f090f48..a2d1f92d49a 100644
--- a/source/blender/editors/space_file/file_draw.cc
+++ b/source/blender/editors/space_file/file_draw.cc
@@ -47,7 +47,7 @@
 #include "DNA_windowmanager_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_fileselect.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/space_file/file_panels.cc b/source/blender/editors/space_file/file_panels.cc
index e15e1120123..1d88c5682d2 100644
--- a/source/blender/editors/space_file/file_panels.cc
+++ b/source/blender/editors/space_file/file_panels.cc
@@ -22,7 +22,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_fileselect.hh"
 
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index 50d5306a626..bcd3d0dadbd 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -60,5 +60,5 @@ endif()
 
 blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_graph bf_rna)
diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc
index 8836eb2cda2..a99473d2ae1 100644
--- a/source/blender/editors/space_graph/graph_buttons.cc
+++ b/source/blender/editors/space_graph/graph_buttons.cc
@@ -42,7 +42,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_anim_api.hh"
 #include "ED_screen.hh"
diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc
index c4f0f9931cb..3334abb26b2 100644
--- a/source/blender/editors/space_graph/graph_edit.cc
+++ b/source/blender/editors/space_graph/graph_edit.cc
@@ -29,7 +29,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLT_translation.hh"
 
diff --git a/source/blender/editors/space_graph/graph_utils.cc b/source/blender/editors/space_graph/graph_utils.cc
index 6ae92ae55c9..27c296b7596 100644
--- a/source/blender/editors/space_graph/graph_utils.cc
+++ b/source/blender/editors/space_graph/graph_utils.cc
@@ -25,7 +25,7 @@
 #include "ED_screen.hh"
 #include "UI_interface.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "graph_intern.hh" /* own include */
 
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 973661e13d3..f38ccbd8811 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
   ../../render
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -76,5 +76,5 @@ endif()
 
 blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_image bf_rna)
diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc
index 5fd9f9fdfc3..a1b1ed612c8 100644
--- a/source/blender/editors/space_image/image_ops.cc
+++ b/source/blender/editors/space_image/image_ops.cc
@@ -59,7 +59,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_image.hh"
 #include "ED_mask.hh"
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index 49df2011f40..e02632a6ff3 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -43,5 +43,5 @@ set(LIB
 
 blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_info bf_rna)
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt
index 5fc001c1434..c2210e93fb2 100644
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -45,5 +45,5 @@ endif()
 
 blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_nla bf_rna)
diff --git a/source/blender/editors/space_nla/nla_buttons.cc b/source/blender/editors/space_nla/nla_buttons.cc
index b2f147dd03c..7599d04d4b8 100644
--- a/source/blender/editors/space_nla/nla_buttons.cc
+++ b/source/blender/editors/space_nla/nla_buttons.cc
@@ -30,7 +30,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_anim_api.hh"
 
diff --git a/source/blender/editors/space_nla/nla_edit.cc b/source/blender/editors/space_nla/nla_edit.cc
index fbfb8efa9ab..91aa7aa82f6 100644
--- a/source/blender/editors/space_nla/nla_edit.cc
+++ b/source/blender/editors/space_nla/nla_edit.cc
@@ -35,7 +35,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface_icons.hh"
 
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 6837d0af611..ecf62127f7d 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -21,7 +21,7 @@ set(INC
   ../../render
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -107,5 +107,5 @@ endif()
 
 blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_node bf_rna)
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 6da5e2f1955..17b28d81eaa 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -48,7 +48,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_node.hh"
 #include "ED_space_api.hh"
diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index 4e3a8548879..043fe4bb5bd 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -44,7 +44,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_node/node_context_path.cc b/source/blender/editors/space_node/node_context_path.cc
index 64bc5fd2f35..98283f902b8 100644
--- a/source/blender/editors/space_node/node_context_path.cc
+++ b/source/blender/editors/space_node/node_context_path.cc
@@ -15,7 +15,7 @@
 #include "BKE_material.h"
 #include "BKE_object.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_screen.hh"
 
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index a63aaa0891a..4522681b921 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -82,7 +82,7 @@
 #include "UI_view2d.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "NOD_geometry_exec.hh"
 #include "NOD_geometry_nodes_gizmos.hh"
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index d862d0fa231..58352892df3 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -50,7 +50,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_node/node_gizmo.cc b/source/blender/editors/space_node/node_gizmo.cc
index 4caea29102d..e41b78248df 100644
--- a/source/blender/editors/space_node/node_gizmo.cc
+++ b/source/blender/editors/space_node/node_gizmo.cc
@@ -24,7 +24,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc
index 8b1cb2c3410..ae5ed518580 100644
--- a/source/blender/editors/space_node/node_group.cc
+++ b/source/blender/editors/space_node/node_group.cc
@@ -44,7 +44,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index 7055d9fb858..dbde39d0ac1 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -27,7 +27,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_node/node_shader_preview.cc b/source/blender/editors/space_node/node_shader_preview.cc
index 44ce3900f13..19f15fd4465 100644
--- a/source/blender/editors/space_node/node_shader_preview.cc
+++ b/source/blender/editors/space_node/node_shader_preview.cc
@@ -29,7 +29,7 @@
 #include "DNA_world_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_colortools.hh"
 #include "BKE_compute_contexts.hh"
diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc
index 6f6da4900b3..e365512ccbe 100644
--- a/source/blender/editors/space_node/node_templates.cc
+++ b/source/blender/editors/space_node/node_templates.cc
@@ -30,7 +30,7 @@
 #include "BKE_node_tree_update.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "NOD_node_declaration.hh"
 #include "NOD_socket.hh"
diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc
index 356b3def43b..34bb1eb7f38 100644
--- a/source/blender/editors/space_node/space_node.cc
+++ b/source/blender/editors/space_node/space_node.cc
@@ -52,7 +52,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index cd45045e901..7a52526c2a7 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
 
   ../../../../extern/fmtlib/include
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -146,5 +146,5 @@ set(LIB
 
 blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_outliner bf_rna)
diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc
index 012b73d854f..422432b9351 100644
--- a/source/blender/editors/space_outliner/outliner_select.cc
+++ b/source/blender/editors/space_outliner/outliner_select.cc
@@ -63,7 +63,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ANIM_bone_collections.hh"
 
diff --git a/source/blender/editors/space_outliner/tree/common.cc b/source/blender/editors/space_outliner/tree/common.cc
index 2c60444f7c1..7b4ff7bf280 100644
--- a/source/blender/editors/space_outliner/tree/common.cc
+++ b/source/blender/editors/space_outliner/tree/common.cc
@@ -17,7 +17,7 @@
 #include "DNA_outliner_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "../outliner_intern.hh"
 #include "common.hh"
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 34a9764877a..b39b0de6c48 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INC
   ../../sequencer
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -89,5 +89,5 @@ endif()
 
 blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_sequencer bf_rna)
diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc
index b947dcc773d..8766f74c197 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.cc
+++ b/source/blender/editors/space_sequencer/sequencer_add.cc
@@ -34,7 +34,7 @@
 
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "SEQ_add.hh"
 #include "SEQ_effects.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
index a81d369f25b..cbb50c6e412 100644
--- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc
@@ -22,7 +22,7 @@
 #include "GPU_matrix.hh"
 #include "GPU_vertex_buffer.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "SEQ_channels.hh"
 #include "SEQ_sequencer.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc
index b1e16a33056..e95c612dd06 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.cc
+++ b/source/blender/editors/space_sequencer/sequencer_edit.cc
@@ -47,7 +47,7 @@
 
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 /* For menu, popup, icons, etc. */
 #include "ED_fileselect.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
index 712cb5b1396..d0258a4e596 100644
--- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
@@ -34,7 +34,7 @@
 #include "ED_space_api.hh"
 #include "ED_time_scrub_ui.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "SEQ_channels.hh"
 #include "SEQ_effects.hh"
diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt
index 3cdf5f99d11..47a658e9e78 100644
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INC
   ../../nodes
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -72,5 +72,5 @@ endif()
 
 blender_add_lib(bf_editor_space_spreadsheet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_spreadsheet bf_rna)
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc b/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc
index 9465aaa70b9..36e9ae8c91b 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc
@@ -13,7 +13,7 @@
 #include "BKE_volume.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_tree_view.hh"
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index be101b66bcb..2c22ddb8b41 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -14,7 +14,7 @@
 #include "BKE_screen.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt
index 88c021fcf26..2237598fbe5 100644
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -32,5 +32,5 @@ set(LIB
 
 blender_add_lib(bf_editor_space_statusbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_statusbar bf_rna)
diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt
index 84458fc7c12..fba5bd6d5cd 100644
--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -32,5 +32,5 @@ set(LIB
 blender_add_lib(bf_editor_space_topbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 
-# RNA_prototypes.h dna_type_offsets.h
+# RNA_prototypes.hh dna_type_offsets.h
 add_dependencies(bf_editor_space_topbar bf_rna)
diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt
index 6e8b7aff86a..e5150ee279e 100644
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -10,7 +10,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -35,5 +35,5 @@ set(LIB
 
 blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_space_userpref bf_rna)
diff --git a/source/blender/editors/space_userpref/userpref_ops.cc b/source/blender/editors/space_userpref/userpref_ops.cc
index be6bf607c7f..a617cf3b9de 100644
--- a/source/blender/editors/space_userpref/userpref_ops.cc
+++ b/source/blender/editors/space_userpref/userpref_ops.cc
@@ -33,7 +33,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 
 #include "UI_interface.hh"
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 9e39c9aded0..56b5daacb6b 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -21,7 +21,7 @@ set(INC
   ../../windowmanager
   ../../../../intern/mantaflow/extern
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -120,5 +120,5 @@ endif()
 
 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_space_view3d bf_rna)
diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc
index d221dc18d44..0509cf67a8b 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.cc
+++ b/source/blender/editors/space_view3d/view3d_buttons.cc
@@ -53,7 +53,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_mesh.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc
index 05e60376e17..326eb28f40e 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc
@@ -21,7 +21,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc b/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc
index c3ca6dc8312..01179c4e272 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_geometry_nodes.cc
@@ -33,7 +33,7 @@
 #include "BLI_math_vector.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "NOD_geometry_nodes_gizmos.hh"
 #include "NOD_geometry_nodes_log.hh"
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.cc b/source/blender/editors/space_view3d/view3d_gizmo_light.cc
index 5ba1c8bc002..9a2b3ee9986 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_light.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_light.cc
@@ -26,7 +26,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/space_view3d/view3d_header.cc b/source/blender/editors/space_view3d/view3d_header.cc
index 6b5a0f1e2ac..195cd6c4cf3 100644
--- a/source/blender/editors/space_view3d/view3d_header.cc
+++ b/source/blender/editors/space_view3d/view3d_header.cc
@@ -24,7 +24,7 @@
 #include "DEG_depsgraph.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index be78f8586d2..1433c5656e1 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../../render
   ../../sequencer
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 set(INC_SYS
@@ -142,5 +142,5 @@ endif()
 
 blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_transform bf_rna)
diff --git a/source/blender/editors/transform/transform_convert_nla.cc b/source/blender/editors/transform/transform_convert_nla.cc
index 8ac35e4ba9f..90344fcbcbe 100644
--- a/source/blender/editors/transform/transform_convert_nla.cc
+++ b/source/blender/editors/transform/transform_convert_nla.cc
@@ -27,7 +27,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "transform.hh"
 #include "transform_convert.hh"
diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.cc b/source/blender/editors/transform/transform_convert_sequencer_image.cc
index 6d143e924ee..c921d15d701 100644
--- a/source/blender/editors/transform/transform_convert_sequencer_image.cc
+++ b/source/blender/editors/transform/transform_convert_sequencer_image.cc
@@ -26,7 +26,7 @@
 #include "ANIM_keyframing.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "transform.hh"
 #include "transform_convert.hh"
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 6297803e523..a96b167395b 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INC
   ../../makesrna
   ../../sequencer
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -127,5 +127,5 @@ endif()
 
 blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_util bf_rna)
diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc
index 5ab8d9519f8..79758a0eadf 100644
--- a/source/blender/editors/util/ed_util_ops.cc
+++ b/source/blender/editors/util/ed_util_ops.cc
@@ -28,7 +28,7 @@
 #include "ED_util.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 34d257880af..a9b131e2d96 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INC
   ../../makesrna
   ../../windowmanager
   ../../../../intern/eigen
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -47,5 +47,5 @@ set(LIB
 
 blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_editor_uvedit bf_rna)
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc
index 69898c504ee..f5e44a1d996 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc
@@ -46,7 +46,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt
index b2cd7a51347..abdbd004eae 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -551,7 +551,7 @@ set(INC
   ../render
   ../render/intern
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -582,5 +582,5 @@ if(COMMAND target_precompile_headers)
   target_precompile_headers(bf_freestyle PRIVATE FRS_precomp.h)
 endif()
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_freestyle bf_rna)
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 9644eb78c40..ed014a836c6 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -14,7 +14,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 
 #include "DNA_camera_types.h"
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 1fdbec98a1f..a22d624cbfb 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -37,7 +37,7 @@
 #include "DNA_scene_types.h"
 #include "FRS_freestyle.h"
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "bpy_rna.h" /* pyrna_struct_CreatePyObject() */
 
 #include "../generic/py_capi_utils.h" /* #PyC_UnicodeFromBytes */
diff --git a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
index 8d1fed163e9..98f6c509e3c 100644
--- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
   ../../../intern/eigen
   ../geometry
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -97,5 +97,5 @@ set(LIB
 
 blender_add_lib(bf_gpencil_modifiers_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_gpencil_modifiers_legacy bf_rna)
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc
index 9fa593cfa19..528e65b1e96 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc
@@ -35,7 +35,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLT_translation.hh"
 
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc
index 99a1981126c..5ff10b1196a 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc
@@ -31,7 +31,7 @@
 #include "BKE_screen.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_gpencil_legacy_ui_common.h"
 
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc
index fbca72ac378..1a84b613726 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc
@@ -27,7 +27,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index 0379ef1a19d..99420972e92 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -75,7 +75,7 @@ set(INC
   ../../python/intern
   ../../windowmanager
   ../../../../intern/utfconv
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -253,7 +253,7 @@ endif()
 
 blender_add_lib(bf_io_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_io_usd bf_rna)
 
 if(COMMAND target_precompile_headers)
diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc
index 730dd2fb078..8e7e4a43af3 100644
--- a/source/blender/io/usd/hydra/material.cc
+++ b/source/blender/io/usd/hydra/material.cc
@@ -25,7 +25,7 @@
 #include "BKE_material.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/io/usd/intern/usd_hook.cc b/source/blender/io/usd/intern/usd_hook.cc
index 7b4fc6bc648..37e47f45e13 100644
--- a/source/blender/io/usd/intern/usd_hook.cc
+++ b/source/blender/io/usd/intern/usd_hook.cc
@@ -19,7 +19,7 @@
 #include "DNA_windowmanager_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 #include "bpy_rna.h"
 
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 6ad23ab71e6..93a3c440f76 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -141,13 +141,15 @@ set(APISRC
   rna_workspace_api.cc
 )
 
-string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
+string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).cc" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.cc" GENSRC "${DEFSRC}")
 list(APPEND GENSRC
-  "${CMAKE_CURRENT_BINARY_DIR}/rna_prototypes_gen.h"
-  "${CMAKE_CURRENT_BINARY_DIR}/../RNA_prototypes.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/rna_prototypes_gen.hh"
+  "${CMAKE_CURRENT_BINARY_DIR}/../RNA_prototypes.hh"
 )
 set_source_files_properties(${GENSRC} PROPERTIES GENERATED TRUE)
 
+# TODO: Remove the `GENSRC_C` flags and data, there are no C files anymore here.
+
 # --------------------------
 # CFLAGS for Generated Files
 #
@@ -256,7 +258,7 @@ set(INC
   ../../../../intern/mantaflow/extern
 
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_CURRENT_BINARY_DIR}/../../makesrna/
 )
 
@@ -456,7 +458,7 @@ if(WIN32 AND NOT UNIX)
   endif()
 endif()
 
-# Output `rna_*_gen.c`.
+# Output `rna_*_gen.cc`.
 # NOTE: (Linux only): with crashes try add this after COMMAND:
 # `valgrind --leak-check=full --track-origins=yes`
 add_custom_command(
@@ -473,7 +475,7 @@ set(SRC
   ${GENSRC}
 
   ${SRC_RNA_INC}
-  rna_access_internal.h
+  rna_access_internal.hh
   rna_internal.hh
   rna_internal_types.hh
   rna_mesh_utils.hh
diff --git a/source/blender/makesrna/intern/makesrna.cc b/source/blender/makesrna/intern/makesrna.cc
index 7b9a786c7f2..0d5f498a627 100644
--- a/source/blender/makesrna/intern/makesrna.cc
+++ b/source/blender/makesrna/intern/makesrna.cc
@@ -785,7 +785,7 @@ static char *rna_def_property_get_func(
     case PROP_STRING: {
       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
       UNUSED_VARS_NDEBUG(sprop);
-      fprintf(f, "RNA_EXTERN_C void %s(PointerRNA *ptr, char *value)\n", func);
+      fprintf(f, "extern void %s(PointerRNA *ptr, char *value)\n", func);
       fprintf(f, "{\n");
       if (manualfunc) {
         fprintf(f, "    PropStringGetFunc fn = %s;\n", manualfunc);
@@ -824,7 +824,7 @@ static char *rna_def_property_get_func(
       break;
     }
     case PROP_POINTER: {
-      fprintf(f, "RNA_EXTERN_C PointerRNA %s(PointerRNA *ptr)\n", func);
+      fprintf(f, "extern PointerRNA %s(PointerRNA *ptr)\n", func);
       fprintf(f, "{\n");
       if (manualfunc) {
         fprintf(f, "    PropPointerGetFunc fn = %s;\n", manualfunc);
@@ -876,14 +876,11 @@ static char *rna_def_property_get_func(
     default:
       if (prop->arraydimension) {
         if (prop->flag & PROP_DYNAMIC) {
-          fprintf(f,
-                  "RNA_EXTERN_C void %s(PointerRNA *ptr, %s values[])\n",
-                  func,
-                  rna_type_type(prop));
+          fprintf(f, "extern void %s(PointerRNA *ptr, %s values[])\n", func, rna_type_type(prop));
         }
         else {
           fprintf(f,
-                  "RNA_EXTERN_C void %s(PointerRNA *ptr, %s values[%u])\n",
+                  "extern void %s(PointerRNA *ptr, %s values[%u])\n",
                   func,
                   rna_type_type(prop),
                   prop->totarraylength);
@@ -979,7 +976,7 @@ static char *rna_def_property_get_func(
         fprintf(f, "}\n\n");
       }
       else {
-        fprintf(f, "RNA_EXTERN_C %s %s(PointerRNA *ptr)\n", rna_type_type(prop), func);
+        fprintf(f, "extern %s %s(PointerRNA *ptr)\n", rna_type_type(prop), func);
         fprintf(f, "{\n");
 
         if (manualfunc) {
@@ -1167,7 +1164,7 @@ static char *rna_def_property_search_func(
   func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "search");
 
   fprintf(f,
-          "RNA_EXTERN_C void %s("
+          "extern void %s("
           "const bContext *C, "
           "PointerRNA *ptr, "
           "PropertyRNA *prop, "
@@ -1208,7 +1205,7 @@ static char *rna_def_property_set_func(
   switch (prop->type) {
     case PROP_STRING: {
       StringPropertyRNA *sprop = (StringPropertyRNA *)prop;
-      fprintf(f, "RNA_EXTERN_C void %s(PointerRNA *ptr, const char *value)\n", func);
+      fprintf(f, "extern void %s(PointerRNA *ptr, const char *value)\n", func);
       fprintf(f, "{\n");
       if (manualfunc) {
         fprintf(f, "    PropStringSetFunc fn = %s;\n", manualfunc);
@@ -1257,10 +1254,9 @@ static char *rna_def_property_set_func(
       break;
     }
     case PROP_POINTER: {
-      fprintf(
-          f,
-          "RNA_EXTERN_C void %s(PointerRNA *ptr, PointerRNA value, struct ReportList *reports)\n",
-          func);
+      fprintf(f,
+              "extern void %s(PointerRNA *ptr, PointerRNA value, struct ReportList *reports)\n",
+              func);
       fprintf(f, "{\n");
       if (manualfunc) {
         fprintf(f, "    PropPointerSetFunc fn = %s;\n", manualfunc);
@@ -1314,13 +1310,13 @@ static char *rna_def_property_set_func(
       if (prop->arraydimension) {
         if (prop->flag & PROP_DYNAMIC) {
           fprintf(f,
-                  "RNA_EXTERN_C void %s(PointerRNA *ptr, const %s values[])\n",
+                  "extern void %s(PointerRNA *ptr, const %s values[])\n",
                   func,
                   rna_type_type(prop));
         }
         else {
           fprintf(f,
-                  "RNA_EXTERN_C void %s(PointerRNA *ptr, const %s values[%u])\n",
+                  "extern void %s(PointerRNA *ptr, const %s values[%u])\n",
                   func,
                   rna_type_type(prop),
                   prop->totarraylength);
@@ -1432,7 +1428,7 @@ static char *rna_def_property_set_func(
         fprintf(f, "}\n\n");
       }
       else {
-        fprintf(f, "RNA_EXTERN_C void %s(PointerRNA *ptr, %s value)\n", func, rna_type_type(prop));
+        fprintf(f, "extern void %s(PointerRNA *ptr, %s value)\n", func, rna_type_type(prop));
         fprintf(f, "{\n");
 
         if (manualfunc) {
@@ -1531,7 +1527,7 @@ static char *rna_def_property_length_func(
 
     func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "length");
 
-    fprintf(f, "RNA_EXTERN_C int %s(PointerRNA *ptr)\n", func);
+    fprintf(f, "extern int %s(PointerRNA *ptr)\n", func);
     fprintf(f, "{\n");
     if (manualfunc) {
       fprintf(f, "    PropStringLengthFunc fn = %s;\n", manualfunc);
@@ -1566,7 +1562,7 @@ static char *rna_def_property_length_func(
 
     func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "length");
 
-    fprintf(f, "RNA_EXTERN_C int %s(PointerRNA *ptr)\n", func);
+    fprintf(f, "extern int %s(PointerRNA *ptr)\n", func);
     fprintf(f, "{\n");
     if (manualfunc) {
       fprintf(f, "    PropCollectionLengthFunc fn = %s;\n", manualfunc);
@@ -1616,7 +1612,7 @@ static char *rna_def_property_begin_func(
 
   func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "begin");
 
-  fprintf(f, "RNA_EXTERN_C void %s(CollectionPropertyIterator *iter, PointerRNA *ptr)\n", func);
+  fprintf(f, "extern void %s(CollectionPropertyIterator *iter, PointerRNA *ptr)\n", func);
   fprintf(f, "{\n");
 
   if (!manualfunc) {
@@ -1707,7 +1703,7 @@ static char *rna_def_property_lookup_int_func(FILE *f,
 
   func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "lookup_int");
 
-  fprintf(f, "RNA_EXTERN_C bool %s(PointerRNA *ptr, int index, PointerRNA *r_ptr)\n", func);
+  fprintf(f, "extern bool %s(PointerRNA *ptr, int index, PointerRNA *r_ptr)\n", func);
   fprintf(f, "{\n");
 
   if (manualfunc) {
@@ -1853,20 +1849,20 @@ static char *rna_def_property_lookup_string_func(FILE *f,
   func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "lookup_string");
 
   if (!manualfunc) {
-    /* XXX extern declaration could be avoid by including RNA_blender.h, but this has lots of
+    /* XXX extern declaration could be avoid by including RNA_blender.hh, but this has lots of
      * unknown DNA types in functions, leading to conflicting function signatures.
      */
     fprintf(f,
-            "RNA_EXTERN_C int %s_%s_length(PointerRNA *);\n",
+            "extern int %s_%s_length(PointerRNA *);\n",
             item_name_base->identifier,
             rna_safe_id(item_name_prop->identifier));
     fprintf(f,
-            "RNA_EXTERN_C void %s_%s_get(PointerRNA *, char *);\n\n",
+            "extern void %s_%s_get(PointerRNA *, char *);\n\n",
             item_name_base->identifier,
             rna_safe_id(item_name_prop->identifier));
   }
 
-  fprintf(f, "RNA_EXTERN_C bool %s(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)\n", func);
+  fprintf(f, "extern bool %s(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)\n", func);
   fprintf(f, "{\n");
 
   if (manualfunc) {
@@ -1942,7 +1938,7 @@ static char *rna_def_property_next_func(
 
   func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "next");
 
-  fprintf(f, "RNA_EXTERN_C void %s(CollectionPropertyIterator *iter)\n", func);
+  fprintf(f, "extern void %s(CollectionPropertyIterator *iter)\n", func);
   fprintf(f, "{\n");
   fprintf(f, "    PropCollectionNextFunc fn = %s;\n", manualfunc);
   fprintf(f, "    fn(iter);\n");
@@ -1969,7 +1965,7 @@ static char *rna_def_property_end_func(
 
   func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "end");
 
-  fprintf(f, "RNA_EXTERN_C void %s(CollectionPropertyIterator *iter)\n", func);
+  fprintf(f, "extern void %s(CollectionPropertyIterator *iter)\n", func);
   fprintf(f, "{\n");
   if (manualfunc) {
     fprintf(f, "    PropCollectionEndFunc fn = %s;\n", manualfunc);
@@ -3056,7 +3052,7 @@ static void rna_def_property_wrapper_funcs(FILE *f, StructDefRNA *dsrna, Propert
     char funcname[2048];
     rna_construct_wrapper_function_name(
         funcname, sizeof(funcname), dsrna->srna->identifier, dp->prop->identifier, "get_length");
-    fprintf(f, "RNA_EXTERN_C int %s(PointerRNA *ptr, int *arraylen)\n", funcname);
+    fprintf(f, "extern int %s(PointerRNA *ptr, int *arraylen)\n", funcname);
     fprintf(f, "{\n");
     fprintf(f, "\treturn %s(ptr, arraylen);\n", rna_function_string(dp->prop->getlength));
     fprintf(f, "}\n\n");
@@ -3079,7 +3075,7 @@ static void rna_def_function_wrapper_funcs(FILE *f, StructDefRNA *dsrna, Functio
   rna_construct_wrapper_function_name(
       funcname, sizeof(funcname), srna->identifier, func->identifier, "func");
 
-  fprintf(f, "RNA_EXTERN_C ");
+  fprintf(f, "extern ");
   rna_generate_static_parameter_prototypes(f, srna, dfunc, funcname, 0);
 
   fprintf(f, "\n{\n");
@@ -3736,7 +3732,7 @@ static void rna_generate_external_property_prototypes(BlenderRNA *brna, FILE *f)
        srna = static_cast<StructRNA *>(srna->cont.next))
   {
     LISTBASE_FOREACH (PropertyRNA *, prop, &srna->cont.properties) {
-      fprintf(f, "extern struct PropertyRNA *rna_%s_%s;\n", srna->identifier, prop->identifier);
+      fprintf(f, "extern PropertyRNA *rna_%s_%s;\n", srna->identifier, prop->identifier);
     }
     fprintf(f, "\n");
   }
@@ -3754,10 +3750,7 @@ static void rna_generate_internal_property_prototypes(BlenderRNA * /*brna*/,
   while (base) {
     fprintf(f, "\n");
     LISTBASE_FOREACH (PropertyRNA *, prop, &base->cont.properties) {
-      fprintf(f,
-              "RNA_EXTERN_C_OR_EXTERN PropertyRNA *rna_%s_%s;\n",
-              base->identifier,
-              prop->identifier);
+      fprintf(f, "extern PropertyRNA *rna_%s_%s;\n", base->identifier, prop->identifier);
     }
     base = base->base;
   }
@@ -3767,7 +3760,7 @@ static void rna_generate_internal_property_prototypes(BlenderRNA * /*brna*/,
   }
 
   LISTBASE_FOREACH (PropertyRNA *, prop, &srna->cont.properties) {
-    fprintf(f, "RNA_EXTERN_C PropertyRNA *rna_%s_%s;\n", srna->identifier, prop->identifier);
+    fprintf(f, "extern PropertyRNA *rna_%s_%s;\n", srna->identifier, prop->identifier);
   }
   fprintf(f, "\n");
 }
@@ -4908,7 +4901,7 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
   fprintf(f, "#include \"rna_internal.hh\"\n\n");
 
   /* include the generated prototypes header */
-  fprintf(f, "#include \"rna_prototypes_gen.h\"\n\n");
+  fprintf(f, "#include \"rna_prototypes_gen.hh\"\n\n");
 
   if (filename) {
     fprintf(f, "#include \"%s\"\n", filename);
@@ -4917,13 +4910,6 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
     fprintf(f, "#include \"%s\"\n", api_filename);
   }
   fprintf(f, "\n");
-  fprintf(f, "#ifdef __cplusplus\n");
-  fprintf(f, "#  define RNA_EXTERN_C extern \"C\"\n");
-  fprintf(f, "#  define RNA_EXTERN_C_OR_EXTERN extern \"C\"\n");
-  fprintf(f, "#else\n");
-  fprintf(f, "#  define RNA_EXTERN_C\n");
-  fprintf(f, "#  define RNA_EXTERN_C_OR_EXTERN extern\n");
-  fprintf(f, "#endif\n");
 
 /* we want the included C files to have warnings enabled but for the generated code
  * ignore unused-parameter warnings which are hard to prevent */
@@ -5010,8 +4996,6 @@ static void rna_generate_header(BlenderRNA * /*brna*/, FILE *f)
   fprintf(f, "#include \"RNA_types.hh\"\n\n");
   fprintf(f, "#include \"DNA_node_types.h\"\n\n");
 
-  fprintf(f, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n");
-
   fprintf(f, "#define FOREACH_BEGIN(property, sptr, itemptr) \\\n");
   fprintf(f, "    { \\\n");
   fprintf(f, "        CollectionPropertyIterator rna_macro_iter; \\\n");
@@ -5049,8 +5033,6 @@ static void rna_generate_header(BlenderRNA * /*brna*/, FILE *f)
     }
   }
 
-  fprintf(f, "#ifdef __cplusplus\n}\n#endif\n\n");
-
   fprintf(f, "#endif /* __RNA_BLENDER_H__ */\n\n");
 }
 
@@ -5477,7 +5459,7 @@ static void rna_generate_header_cpp(BlenderRNA * /*brna*/, FILE *f)
           "/* Automatically generated classes for the Data API.\n"
           " * Do not edit manually, changes will be overwritten. */\n\n");
 
-  fprintf(f, "#include \"RNA_blender.h\"\n");
+  fprintf(f, "#include \"RNA_blender.hh\"\n");
   fprintf(f, "#include \"RNA_types.hh\"\n");
   fprintf(f, "#include \"RNA_access.hh\"\n");
   fprintf(f, "#include \"DNA_node_types.h\"\n");
@@ -5558,9 +5540,7 @@ static void rna_generate_header_cpp(BlenderRNA * /*brna*/, FILE *f)
   fprintf(f, "\n");
 
   fprintf(f, "/* Structure prototypes */\n\n");
-  fprintf(f, "extern \"C\" {\n");
   rna_generate_struct_prototypes(f);
-  fprintf(f, "}\n\n");
 
   fprintf(f, "namespace BL {\n");
 
@@ -5649,8 +5629,8 @@ static int rna_preprocess(const char *outfile, const char *public_header_outfile
     status = EXIT_FAILURE;
   }
 
-  /* Create external rna struct prototype header file RNA_prototypes.h. */
-  SNPRINTF(deffile, "%s%s", public_header_outfile, "RNA_prototypes.h" TMP_EXT);
+  /* Create external rna struct prototype header file RNA_prototypes.hh. */
+  SNPRINTF(deffile, "%s%s", public_header_outfile, "RNA_prototypes.hh" TMP_EXT);
   if (status != EXIT_SUCCESS) {
     make_bad_file(deffile, __LINE__);
   }
@@ -5668,9 +5648,7 @@ static int rna_preprocess(const char *outfile, const char *public_header_outfile
             " */\n\n");
 
     fprintf(file, "#pragma once\n\n");
-    fprintf(file, "#ifdef __cplusplus\n  extern \"C\" {\n#endif\n\n");
     rna_generate_external_property_prototypes(brna, file);
-    fprintf(file, "#ifdef __cplusplus\n  }\n#endif\n");
     fclose(file);
     if (DefRNA.error) {
       status = EXIT_FAILURE;
@@ -5679,7 +5657,7 @@ static int rna_preprocess(const char *outfile, const char *public_header_outfile
   }
 
   /* create internal rna struct prototype header file */
-  SNPRINTF(deffile, "%s%s", outfile, "rna_prototypes_gen.h" TMP_EXT);
+  SNPRINTF(deffile, "%s%s", outfile, "rna_prototypes_gen.hh" TMP_EXT);
   if (status != EXIT_SUCCESS) {
     make_bad_file(deffile, __LINE__);
   }
@@ -5692,9 +5670,7 @@ static int rna_preprocess(const char *outfile, const char *public_header_outfile
     fprintf(file,
             "/* Automatically generated function declarations for the Data API.\n"
             " * Do not edit manually, changes will be overwritten.              */\n\n");
-    fprintf(file, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n");
     rna_generate_struct_rna_prototypes(brna, file);
-    fprintf(file, "#ifdef __cplusplus\n}\n#endif\n");
     fclose(file);
     replace_if_different(deffile, nullptr);
     if (DefRNA.error) {
@@ -5740,8 +5716,8 @@ static int rna_preprocess(const char *outfile, const char *public_header_outfile
     replace_if_different(deffile, deps);
   }
 
-  /* Create `RNA_blender_cpp.h`. */
-  SNPRINTF(deffile, "%s%s", outfile, "RNA_blender_cpp.h" TMP_EXT);
+  /* Create `RNA_blender_cpp.hh`. */
+  SNPRINTF(deffile, "%s%s", outfile, "RNA_blender_cpp.hh" TMP_EXT);
 
   if (status != EXIT_SUCCESS) {
     make_bad_file(deffile, __LINE__);
@@ -5766,8 +5742,8 @@ static int rna_preprocess(const char *outfile, const char *public_header_outfile
 
   rna_sort(brna);
 
-  /* Create `RNA_blender.h`. */
-  SNPRINTF(deffile, "%s%s", outfile, "RNA_blender.h" TMP_EXT);
+  /* Create `RNA_blender.hh`. */
+  SNPRINTF(deffile, "%s%s", outfile, "RNA_blender.hh" TMP_EXT);
 
   if (status != EXIT_SUCCESS) {
     make_bad_file(deffile, __LINE__);
diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc
index bfd995f7a5c..5cb8e7b1f5d 100644
--- a/source/blender/makesrna/intern/rna_access.cc
+++ b/source/blender/makesrna/intern/rna_access.cc
@@ -63,7 +63,7 @@
 #include "DNA_object_types.h"
 #include "WM_types.hh"
 
-#include "rna_access_internal.h"
+#include "rna_access_internal.hh"
 #include "rna_internal.hh"
 
 static CLG_LogRef LOG = {"rna.access"};
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.cc b/source/blender/makesrna/intern/rna_access_compare_override.cc
index fc332f5430b..a47099cee56 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.cc
+++ b/source/blender/makesrna/intern/rna_access_compare_override.cc
@@ -44,9 +44,9 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
-#include "rna_access_internal.h"
+#include "rna_access_internal.hh"
 #include "rna_internal.hh"
 
 static CLG_LogRef LOG = {"rna.access_compare_override"};
diff --git a/source/blender/makesrna/intern/rna_access_internal.h b/source/blender/makesrna/intern/rna_access_internal.hh
similarity index 100%
rename from source/blender/makesrna/intern/rna_access_internal.h
rename to source/blender/makesrna/intern/rna_access_internal.hh
diff --git a/source/blender/makesrna/intern/rna_path.cc b/source/blender/makesrna/intern/rna_path.cc
index da793db7f4a..09268213159 100644
--- a/source/blender/makesrna/intern/rna_path.cc
+++ b/source/blender/makesrna/intern/rna_path.cc
@@ -29,9 +29,9 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
-#include "rna_access_internal.h"
+#include "rna_access_internal.hh"
 #include "rna_internal.hh"
 
 bool operator==(const RNAPath &left, const RNAPath &right)
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index bb0ba90a3d5..2c2b1b5aa12 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -23,7 +23,7 @@ set(INC
   ../gpencil_modifiers_legacy/intern
   ../gpencil_modifiers_legacy/intern/lineart
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -251,5 +251,5 @@ endif()
 
 blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_modifiers bf_rna)
diff --git a/source/blender/modifiers/intern/MOD_armature.cc b/source/blender/modifiers/intern/MOD_armature.cc
index 1136326a276..319c83b1098 100644
--- a/source/blender/modifiers/intern/MOD_armature.cc
+++ b/source/blender/modifiers/intern/MOD_armature.cc
@@ -29,7 +29,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc
index 9893e386e9e..67348f175ec 100644
--- a/source/blender/modifiers/intern/MOD_array.cc
+++ b/source/blender/modifiers/intern/MOD_array.cc
@@ -39,7 +39,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc
index 9facf0746af..941d6f5d883 100644
--- a/source/blender/modifiers/intern/MOD_bevel.cc
+++ b/source/blender/modifiers/intern/MOD_bevel.cc
@@ -29,7 +29,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc
index eab7800b700..2aa5b3c2bcd 100644
--- a/source/blender/modifiers/intern/MOD_boolean.cc
+++ b/source/blender/modifiers/intern/MOD_boolean.cc
@@ -38,7 +38,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_build.cc b/source/blender/modifiers/intern/MOD_build.cc
index 83579b73832..fdf028aa237 100644
--- a/source/blender/modifiers/intern/MOD_build.cc
+++ b/source/blender/modifiers/intern/MOD_build.cc
@@ -32,7 +32,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_cast.cc b/source/blender/modifiers/intern/MOD_cast.cc
index d065dd82735..584c1382d02 100644
--- a/source/blender/modifiers/intern/MOD_cast.cc
+++ b/source/blender/modifiers/intern/MOD_cast.cc
@@ -26,7 +26,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc
index 3e4f9622a46..aa2efb49795 100644
--- a/source/blender/modifiers/intern/MOD_cloth.cc
+++ b/source/blender/modifiers/intern/MOD_cloth.cc
@@ -37,7 +37,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_physics.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc
index 5ad7d88c501..427299e5a0e 100644
--- a/source/blender/modifiers/intern/MOD_collision.cc
+++ b/source/blender/modifiers/intern/MOD_collision.cc
@@ -29,7 +29,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
index c55c2fa4751..401434a10b8 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
@@ -30,7 +30,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_curve.cc b/source/blender/modifiers/intern/MOD_curve.cc
index abece5c7c50..bda5d39258f 100644
--- a/source/blender/modifiers/intern/MOD_curve.cc
+++ b/source/blender/modifiers/intern/MOD_curve.cc
@@ -26,7 +26,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc
index 93b7ecb1cf7..e13b2737d8a 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.cc
+++ b/source/blender/modifiers/intern/MOD_datatransfer.cc
@@ -29,7 +29,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc
index c17a4b2ab62..988185eaeef 100644
--- a/source/blender/modifiers/intern/MOD_decimate.cc
+++ b/source/blender/modifiers/intern/MOD_decimate.cc
@@ -26,7 +26,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc
index 2f79881833c..ba60d05faff 100644
--- a/source/blender/modifiers/intern/MOD_displace.cc
+++ b/source/blender/modifiers/intern/MOD_displace.cc
@@ -32,7 +32,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.cc b/source/blender/modifiers/intern/MOD_dynamicpaint.cc
index 20e9d55325b..e5677877cd3 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.cc
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.cc
@@ -27,7 +27,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc
index 8c9475bf80d..78266e5f2cd 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.cc
+++ b/source/blender/modifiers/intern/MOD_edgesplit.cc
@@ -27,7 +27,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bmesh.hh"
 #include "bmesh_tools.hh"
diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc
index 2ed5cdca584..2c97b5d992d 100644
--- a/source/blender/modifiers/intern/MOD_explode.cc
+++ b/source/blender/modifiers/intern/MOD_explode.cc
@@ -38,7 +38,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_fluid.cc b/source/blender/modifiers/intern/MOD_fluid.cc
index 5876f85b0ff..cb93b65f983 100644
--- a/source/blender/modifiers/intern/MOD_fluid.cc
+++ b/source/blender/modifiers/intern/MOD_fluid.cc
@@ -27,7 +27,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc b/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc
index b6f8e3447a0..1960a323bc1 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc
@@ -39,7 +39,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_array.cc b/source/blender/modifiers/intern/MOD_grease_pencil_array.cc
index 76db89a1987..1e5a694c2de 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_array.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_array.cc
@@ -35,7 +35,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_build.cc b/source/blender/modifiers/intern/MOD_grease_pencil_build.cc
index d4fe557e605..f3c4c1ec6c5 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_build.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_build.cc
@@ -37,7 +37,7 @@
 #include "MOD_ui_common.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "GEO_reorder.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_color.cc b/source/blender/modifiers/intern/MOD_grease_pencil_color.cc
index 784fa0c7838..a83555d82a4 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_color.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_color.cc
@@ -36,7 +36,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_dash.cc b/source/blender/modifiers/intern/MOD_grease_pencil_dash.cc
index 1dd91c76f3f..2ba7d405a2b 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_dash.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_dash.cc
@@ -32,7 +32,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc b/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc
index 345ee7ed95d..d3a0bd8961b 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc
@@ -32,7 +32,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_hook.cc b/source/blender/modifiers/intern/MOD_grease_pencil_hook.cc
index 9ac2a9a6abc..4f188910172 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_hook.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_hook.cc
@@ -36,7 +36,7 @@
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_lattice.cc b/source/blender/modifiers/intern/MOD_grease_pencil_lattice.cc
index b912aa7396a..dda1aab126a 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_lattice.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_lattice.cc
@@ -25,7 +25,7 @@
 
 #include "WM_types.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_length.cc b/source/blender/modifiers/intern/MOD_grease_pencil_length.cc
index e41843439db..99f371a7d1a 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_length.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_length.cc
@@ -33,7 +33,7 @@
 #include "MOD_ui_common.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "GEO_extend_curves.hh"
 #include "GEO_trim_curves.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc b/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc
index ee29e1af183..e80287f8912 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_mirror.cc
@@ -27,7 +27,7 @@
 
 #include "WM_types.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc b/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc
index e5aa4445705..45caf159ab4 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc
@@ -40,7 +40,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_noise.cc b/source/blender/modifiers/intern/MOD_grease_pencil_noise.cc
index a5ea160af82..f1c3c2070d9 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_noise.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_noise.cc
@@ -28,7 +28,7 @@
 #include "MOD_ui_common.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc b/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc
index 46f1bb5865f..a7072027285 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc
@@ -30,7 +30,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc b/source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc
index 3837643f263..427830f8bef 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc
@@ -25,7 +25,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc b/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc
index 4f9ea13b5a2..05e7b569ff7 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc
@@ -46,7 +46,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc
index f89b45cb7f4..14042219d69 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc
@@ -39,7 +39,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_simplify.cc b/source/blender/modifiers/intern/MOD_grease_pencil_simplify.cc
index 76a7b6ec0d9..7d38f071be5 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_simplify.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_simplify.cc
@@ -33,7 +33,7 @@
 #include "MOD_ui_common.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_smooth.cc b/source/blender/modifiers/intern/MOD_grease_pencil_smooth.cc
index 00a4331a935..9ad94b67d55 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_smooth.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_smooth.cc
@@ -31,7 +31,7 @@
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_subdiv.cc b/source/blender/modifiers/intern/MOD_grease_pencil_subdiv.cc
index b861e633ef4..945dfe0429e 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_subdiv.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_subdiv.cc
@@ -28,7 +28,7 @@
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc b/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc
index a635edf0263..2dcd01f2a4d 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_texture.cc
@@ -34,7 +34,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_thickness.cc b/source/blender/modifiers/intern/MOD_grease_pencil_thickness.cc
index b3b758eea69..8082a0c8da6 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_thickness.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_thickness.cc
@@ -30,7 +30,7 @@
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_time.cc b/source/blender/modifiers/intern/MOD_grease_pencil_time.cc
index dd754ce0909..54cd9575f49 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_time.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_time.cc
@@ -37,7 +37,7 @@
 #include "WM_types.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc b/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc
index 14b87f9c56c..4d26e2f7816 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc
@@ -37,7 +37,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_grease_pencil_util.hh"
 #include "MOD_modifiertypes.hh"
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc
index db7a11099f9..97e79eedc2f 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc
@@ -27,7 +27,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc b/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
index ccdd6e6fc8b..fc111083c55 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_weight_angle.cc
@@ -33,7 +33,7 @@
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc b/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc
index 6effa96b2f9..8f959d62225 100644
--- a/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc
+++ b/source/blender/modifiers/intern/MOD_grease_pencil_weight_proximity.cc
@@ -33,7 +33,7 @@
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 namespace blender {
 
diff --git a/source/blender/modifiers/intern/MOD_hook.cc b/source/blender/modifiers/intern/MOD_hook.cc
index fa03ffc7c34..83607decb59 100644
--- a/source/blender/modifiers/intern/MOD_hook.cc
+++ b/source/blender/modifiers/intern/MOD_hook.cc
@@ -35,7 +35,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.cc b/source/blender/modifiers/intern/MOD_laplaciandeform.cc
index ec3257998d8..f3473e54318 100644
--- a/source/blender/modifiers/intern/MOD_laplaciandeform.cc
+++ b/source/blender/modifiers/intern/MOD_laplaciandeform.cc
@@ -31,7 +31,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc
index 1775ea7fc9f..93da00914e7 100644
--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc
@@ -24,7 +24,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_lattice.cc b/source/blender/modifiers/intern/MOD_lattice.cc
index 5a5ef953ef2..d333540778c 100644
--- a/source/blender/modifiers/intern/MOD_lattice.cc
+++ b/source/blender/modifiers/intern/MOD_lattice.cc
@@ -24,7 +24,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_lineart.cc b/source/blender/modifiers/intern/MOD_lineart.cc
index bf6051be447..e788f5aec63 100644
--- a/source/blender/modifiers/intern/MOD_lineart.cc
+++ b/source/blender/modifiers/intern/MOD_lineart.cc
@@ -33,7 +33,7 @@
 #include "MOD_ui_common.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc
index 23d504efd9f..a05d69630cb 100644
--- a/source/blender/modifiers/intern/MOD_mask.cc
+++ b/source/blender/modifiers/intern/MOD_mask.cc
@@ -34,7 +34,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
index ff9011ead48..5be8e092678 100644
--- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
+++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
@@ -35,7 +35,7 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_span.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 static void init_data(ModifierData *md)
 {
diff --git a/source/blender/modifiers/intern/MOD_meshcache.cc b/source/blender/modifiers/intern/MOD_meshcache.cc
index 85cce66ff3d..6ae330e150f 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.cc
+++ b/source/blender/modifiers/intern/MOD_meshcache.cc
@@ -34,7 +34,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc
index 937df1efc1f..7044a2ea4f1 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.cc
+++ b/source/blender/modifiers/intern/MOD_meshdeform.cc
@@ -32,7 +32,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc
index d6917118d33..c8da7d196d9 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc
@@ -34,7 +34,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc
index 2b0fd8a4680..00a22ea0850 100644
--- a/source/blender/modifiers/intern/MOD_mirror.cc
+++ b/source/blender/modifiers/intern/MOD_mirror.cc
@@ -23,7 +23,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc
index bbb93d0bf5d..049a5c1326a 100644
--- a/source/blender/modifiers/intern/MOD_multires.cc
+++ b/source/blender/modifiers/intern/MOD_multires.cc
@@ -35,7 +35,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh" /* For subdivide operator UI. */
 
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index e403fc1ace5..2d48cbbe550 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -73,7 +73,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_none.cc b/source/blender/modifiers/intern/MOD_none.cc
index 77af2737943..001b89ca9c6 100644
--- a/source/blender/modifiers/intern/MOD_none.cc
+++ b/source/blender/modifiers/intern/MOD_none.cc
@@ -12,7 +12,7 @@
 
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 /* We only need to define is_disabled; because it always returns 1,
  * no other functions will be called
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc
index dd4d6169dd4..69d453c9ec8 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.cc
+++ b/source/blender/modifiers/intern/MOD_normal_edit.cc
@@ -34,7 +34,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc
index 92843e0fae1..d28010820cc 100644
--- a/source/blender/modifiers/intern/MOD_ocean.cc
+++ b/source/blender/modifiers/intern/MOD_ocean.cc
@@ -30,7 +30,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh" /* For UI free bake operator. */
 
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.cc b/source/blender/modifiers/intern/MOD_particleinstance.cc
index ef1faeaeb17..cbbfedef906 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.cc
+++ b/source/blender/modifiers/intern/MOD_particleinstance.cc
@@ -34,7 +34,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc
index 5adc3ff434d..ef0bd70e0f8 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.cc
+++ b/source/blender/modifiers/intern/MOD_particlesystem.cc
@@ -27,7 +27,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_remesh.cc b/source/blender/modifiers/intern/MOD_remesh.cc
index bec3d171375..947bdec363c 100644
--- a/source/blender/modifiers/intern/MOD_remesh.cc
+++ b/source/blender/modifiers/intern/MOD_remesh.cc
@@ -26,7 +26,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc
index 7410cbf280a..b18b57b197c 100644
--- a/source/blender/modifiers/intern/MOD_screw.cc
+++ b/source/blender/modifiers/intern/MOD_screw.cc
@@ -35,7 +35,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_shapekey.cc b/source/blender/modifiers/intern/MOD_shapekey.cc
index a3bb9b58809..847f2c90f34 100644
--- a/source/blender/modifiers/intern/MOD_shapekey.cc
+++ b/source/blender/modifiers/intern/MOD_shapekey.cc
@@ -16,7 +16,7 @@
 
 #include "BKE_key.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_shrinkwrap.cc
index fc26855cb49..51f546aead9 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.cc
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.cc
@@ -24,7 +24,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_query.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.cc b/source/blender/modifiers/intern/MOD_simpledeform.cc
index cb93c12f904..9559b3771ad 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.cc
+++ b/source/blender/modifiers/intern/MOD_simpledeform.cc
@@ -24,7 +24,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_skin.cc b/source/blender/modifiers/intern/MOD_skin.cc
index a002a9a7651..740dc19db1a 100644
--- a/source/blender/modifiers/intern/MOD_skin.cc
+++ b/source/blender/modifiers/intern/MOD_skin.cc
@@ -68,7 +68,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh" /* For skin mark clear operator UI. */
 
diff --git a/source/blender/modifiers/intern/MOD_smooth.cc b/source/blender/modifiers/intern/MOD_smooth.cc
index 5aea27baefb..4f3642bd550 100644
--- a/source/blender/modifiers/intern/MOD_smooth.cc
+++ b/source/blender/modifiers/intern/MOD_smooth.cc
@@ -23,7 +23,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_softbody.cc b/source/blender/modifiers/intern/MOD_softbody.cc
index 2256cb1ffd4..58d23219e4e 100644
--- a/source/blender/modifiers/intern/MOD_softbody.cc
+++ b/source/blender/modifiers/intern/MOD_softbody.cc
@@ -20,7 +20,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/modifiers/intern/MOD_solidify.cc b/source/blender/modifiers/intern/MOD_solidify.cc
index 5d4200328d7..24e35b51db8 100644
--- a/source/blender/modifiers/intern/MOD_solidify.cc
+++ b/source/blender/modifiers/intern/MOD_solidify.cc
@@ -25,7 +25,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc
index 2e3c4d680e3..bd182fdd9b2 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.cc
+++ b/source/blender/modifiers/intern/MOD_subsurf.cc
@@ -40,7 +40,7 @@
 #include "RE_engine.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_surface.cc b/source/blender/modifiers/intern/MOD_surface.cc
index 211688d534f..52e8bb02cdc 100644
--- a/source/blender/modifiers/intern/MOD_surface.cc
+++ b/source/blender/modifiers/intern/MOD_surface.cc
@@ -24,7 +24,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.cc b/source/blender/modifiers/intern/MOD_surfacedeform.cc
index 94022cdb838..100cfc55342 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.cc
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.cc
@@ -31,7 +31,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_triangulate.cc b/source/blender/modifiers/intern/MOD_triangulate.cc
index dca8e45b8d7..b59601e06db 100644
--- a/source/blender/modifiers/intern/MOD_triangulate.cc
+++ b/source/blender/modifiers/intern/MOD_triangulate.cc
@@ -23,7 +23,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bmesh.hh"
 #include "bmesh_tools.hh"
diff --git a/source/blender/modifiers/intern/MOD_ui_common.cc b/source/blender/modifiers/intern/MOD_ui_common.cc
index a7c51bebfcc..9cb391e954f 100644
--- a/source/blender/modifiers/intern/MOD_ui_common.cc
+++ b/source/blender/modifiers/intern/MOD_ui_common.cc
@@ -27,7 +27,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc
index dcfcb4df796..61baf8f9bc1 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.cc
+++ b/source/blender/modifiers/intern/MOD_uvproject.cc
@@ -32,7 +32,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc
index ad021bba805..295edabfafb 100644
--- a/source/blender/modifiers/intern/MOD_uvwarp.cc
+++ b/source/blender/modifiers/intern/MOD_uvwarp.cc
@@ -33,7 +33,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_ui_common.hh"
 #include "MOD_util.hh"
diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc
index d1eba3d7cec..357b4d60f02 100644
--- a/source/blender/modifiers/intern/MOD_volume_displace.cc
+++ b/source/blender/modifiers/intern/MOD_volume_displace.cc
@@ -32,7 +32,7 @@
 
 #include "RE_texture.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLI_math_vector.h"
 
diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
index f3fae579511..f688ed2733f 100644
--- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
+++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
@@ -26,7 +26,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLI_math_matrix_types.hh"
 #include "BLI_span.hh"
diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc
index d71c01c0a3d..97f36b12c6a 100644
--- a/source/blender/modifiers/intern/MOD_warp.cc
+++ b/source/blender/modifiers/intern/MOD_warp.cc
@@ -34,7 +34,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "RE_texture.h"
 
diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc
index f9ea554f88b..ddd181d048f 100644
--- a/source/blender/modifiers/intern/MOD_wave.cc
+++ b/source/blender/modifiers/intern/MOD_wave.cc
@@ -26,7 +26,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc
index fd2c09b88b6..bc5f6ba83d0 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.cc
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc
@@ -34,7 +34,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc
index 0f76856db36..417765d5867 100644
--- a/source/blender/modifiers/intern/MOD_weightvgedit.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc
@@ -38,7 +38,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc
index 204ae620e66..76c159125b2 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc
@@ -29,7 +29,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc
index 8306fbcd3d1..fb80d817dfb 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc
@@ -41,7 +41,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc
index 97a186ad7fc..c881d1a06f6 100644
--- a/source/blender/modifiers/intern/MOD_weld.cc
+++ b/source/blender/modifiers/intern/MOD_weld.cc
@@ -39,7 +39,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "DEG_depsgraph.hh"
 
diff --git a/source/blender/modifiers/intern/MOD_wireframe.cc b/source/blender/modifiers/intern/MOD_wireframe.cc
index 6cfd76d12e8..8fa4a2ab89a 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.cc
+++ b/source/blender/modifiers/intern/MOD_wireframe.cc
@@ -24,7 +24,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 933a2fdfe5e..31ebf363dfb 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -68,7 +68,7 @@ set(INC
   ../render
   ../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -207,5 +207,5 @@ endif()
 
 blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_nodes bf_rna)
diff --git a/source/blender/nodes/NOD_socket_items_ops.hh b/source/blender/nodes/NOD_socket_items_ops.hh
index 70ee5bc0b5e..179f6c1f284 100644
--- a/source/blender/nodes/NOD_socket_items_ops.hh
+++ b/source/blender/nodes/NOD_socket_items_ops.hh
@@ -14,7 +14,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_node.hh"
 
diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt
index 8dc340e7330..107c1343786 100644
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -19,7 +19,7 @@ set(INC
   ../../compositor/realtime_compositor/algorithms
   ../../compositor/realtime_compositor/cached_resources
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -173,5 +173,5 @@ blender_add_lib(bf_nodes_composite "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 blender_set_target_unity_build(bf_nodes_composite 10)
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_nodes_composite bf_rna)
diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc
index dfadbe4f743..c06520af9ad 100644
--- a/source/blender/nodes/composite/node_composite_tree.cc
+++ b/source/blender/nodes/composite/node_composite_tree.cc
@@ -27,7 +27,7 @@
 
 #include "node_common.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "NOD_composite.hh"
 #include "node_composite_util.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_file_output.cc b/source/blender/nodes/composite/nodes/node_composite_file_output.cc
index 2b64245ad73..34a990a4c22 100644
--- a/source/blender/nodes/composite/nodes/node_composite_file_output.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_file_output.cc
@@ -32,7 +32,7 @@
 #include "BKE_scene.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
index 7086921278f..15830df8cbf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
@@ -22,7 +22,7 @@
 #include "GPU_texture.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
index 107826d2ffc..90fbf77758e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
@@ -21,7 +21,7 @@
 #include "BKE_tracking.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc
index b4a95fb7dd1..c43baac9739 100644
--- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc
@@ -20,7 +20,7 @@
 #include "BKE_tracking.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index bdec27f6d81..e13ba1376c2 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -23,7 +23,7 @@ set(INC
   ../../io/common
   ../../io/stl
   ../../io/wavefront_obj
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -340,5 +340,5 @@ target_link_libraries(bf_nodes_geometry_generated bf_nodes_geometry)
 
 blender_set_target_unity_build(bf_nodes_geometry 10)
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_nodes_geometry bf_rna)
diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc
index ceb8e997634..57f1f42535c 100644
--- a/source/blender/nodes/geometry/node_geometry_tree.cc
+++ b/source/blender/nodes/geometry/node_geometry_tree.cc
@@ -19,7 +19,7 @@
 #include "DNA_node_types.h"
 #include "DNA_space_types.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_resources.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_bake.cc b/source/blender/nodes/geometry/nodes/node_geo_bake.cc
index fa2332048b5..82eb672c85e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_bake.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_bake.cc
@@ -25,7 +25,7 @@
 #include "DNA_modifier_types.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_nodes.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_index_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_index_switch.cc
index c61828488f9..81f455aff07 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_index_switch.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_index_switch.cc
@@ -14,7 +14,7 @@
 #include "NOD_socket_search_link.hh"
 
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BLO_read_write.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
index 1202d4a65c9..34679a610b6 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_menu_switch.cc
@@ -24,7 +24,7 @@
 #include "BLO_read_write.hh"
 
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_screen.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_repeat.cc b/source/blender/nodes/geometry/nodes/node_geo_repeat.cc
index e9bbb1dd41f..61bcfc921d2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_repeat.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_repeat.cc
@@ -14,7 +14,7 @@
 #include "BLI_string_utils.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_screen.hh"
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
index 6a9dbe7e8e6..9e8a9dd827f 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
@@ -45,7 +45,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MOD_nodes.hh"
 
diff --git a/source/blender/nodes/intern/node_util.cc b/source/blender/nodes/intern/node_util.cc
index 4782cb65c25..10d789b3235 100644
--- a/source/blender/nodes/intern/node_util.cc
+++ b/source/blender/nodes/intern/node_util.cc
@@ -26,7 +26,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index ddbae55fe3a..b1715b2c35c 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -16,7 +16,7 @@ set(INC
   ../../render
   ../../windowmanager
   ../../../../intern/sky/include
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -189,5 +189,5 @@ blender_add_lib(bf_nodes_shader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 blender_set_target_unity_build(bf_nodes_shader 10)
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_nodes_shader bf_rna)
diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc
index 506ba6059ad..3bd695609a5 100644
--- a/source/blender/nodes/shader/node_shader_tree.cc
+++ b/source/blender/nodes/shader/node_shader_tree.cc
@@ -37,7 +37,7 @@
 #include "BKE_node_tree_update.hh"
 #include "BKE_scene.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_resources.hh"
 
diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt
index 71734e76e2b..f388da15c0a 100644
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INC
   ../../makesrna
   ../../render
   ../../windowmanager
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -66,5 +66,5 @@ set(LIB
 
 blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_nodes_texture bf_rna)
diff --git a/source/blender/nodes/texture/node_texture_tree.cc b/source/blender/nodes/texture/node_texture_tree.cc
index 264833dffae..6ae525bd586 100644
--- a/source/blender/nodes/texture/node_texture_tree.cc
+++ b/source/blender/nodes/texture/node_texture_tree.cc
@@ -31,7 +31,7 @@
 #include "node_texture_util.hh"
 #include "node_util.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_resources.hh"
 
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index f9ef226b4b6..13c20e36b20 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -15,7 +15,7 @@ set(INC
   ../../windowmanager
   ../../../../intern/mantaflow/extern
   ../../../../intern/opencolorio
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -393,5 +393,5 @@ endif()
 
 blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_python bf_rna)
diff --git a/source/blender/python/intern/bpy.cc b/source/blender/python/intern/bpy.cc
index d23092d29e5..b5beda92640 100644
--- a/source/blender/python/intern/bpy.cc
+++ b/source/blender/python/intern/bpy.cc
@@ -26,7 +26,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "GPU_state.hh"
 
diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc
index c5860c01d30..44137bb5338 100644
--- a/source/blender/python/intern/bpy_driver.cc
+++ b/source/blender/python/intern/bpy_driver.cc
@@ -24,7 +24,7 @@
 #include "BKE_idtype.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bpy_rna_driver.h" /* For #pyrna_driver_get_variable_value. */
 
diff --git a/source/blender/python/intern/bpy_operator.cc b/source/blender/python/intern/bpy_operator.cc
index e98803d1888..294e55a6204 100644
--- a/source/blender/python/intern/bpy_operator.cc
+++ b/source/blender/python/intern/bpy_operator.cc
@@ -33,7 +33,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/python/intern/bpy_operator_wrap.cc b/source/blender/python/intern/bpy_operator_wrap.cc
index 1444553a8aa..abceadd5ea5 100644
--- a/source/blender/python/intern/bpy_operator_wrap.cc
+++ b/source/blender/python/intern/bpy_operator_wrap.cc
@@ -20,7 +20,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bpy_intern_string.h"
 #include "bpy_operator_wrap.h" /* own include */
diff --git a/source/blender/python/intern/bpy_props.cc b/source/blender/python/intern/bpy_props.cc
index ba5974d1a6a..72e86ac0f5b 100644
--- a/source/blender/python/intern/bpy_props.cc
+++ b/source/blender/python/intern/bpy_props.cc
@@ -30,7 +30,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh" /* for defining our own rna */
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
index 5707b14be63..c06789f7ed7 100644
--- a/source/blender/python/intern/bpy_rna.cc
+++ b/source/blender/python/intern/bpy_rna.cc
@@ -44,7 +44,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh" /* RNA_def_property_free_identifier */
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc
index ff7339f53cb..186197bb855 100644
--- a/source/blender/python/intern/bpy_rna_anim.cc
+++ b/source/blender/python/intern/bpy_rna_anim.cc
@@ -36,7 +36,7 @@
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/python/intern/bpy_rna_callback.cc b/source/blender/python/intern/bpy_rna_callback.cc
index 345bf7a7d25..be85f8aea81 100644
--- a/source/blender/python/intern/bpy_rna_callback.cc
+++ b/source/blender/python/intern/bpy_rna_callback.cc
@@ -18,7 +18,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_screen.hh"
 
diff --git a/source/blender/python/intern/bpy_rna_context.cc b/source/blender/python/intern/bpy_rna_context.cc
index b6eded92488..9927d5b1dec 100644
--- a/source/blender/python/intern/bpy_rna_context.cc
+++ b/source/blender/python/intern/bpy_rna_context.cc
@@ -26,7 +26,7 @@
 #include "../generic/python_compat.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bpy_rna.h"
 
diff --git a/source/blender/python/intern/bpy_rna_data.cc b/source/blender/python/intern/bpy_rna_data.cc
index f0b9a68ad32..2de699f5b21 100644
--- a/source/blender/python/intern/bpy_rna_data.cc
+++ b/source/blender/python/intern/bpy_rna_data.cc
@@ -26,7 +26,7 @@
 #include "BKE_main.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bpy_rna.h"
 #include "bpy_rna_data.h"
diff --git a/source/blender/python/intern/bpy_rna_gizmo.cc b/source/blender/python/intern/bpy_rna_gizmo.cc
index f8d64e2b092..b41ffbf54f8 100644
--- a/source/blender/python/intern/bpy_rna_gizmo.cc
+++ b/source/blender/python/intern/bpy_rna_gizmo.cc
@@ -25,7 +25,7 @@
 #include "../generic/python_compat.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bpy_rna.h"
 
diff --git a/source/blender/python/intern/bpy_rna_types_capi.cc b/source/blender/python/intern/bpy_rna_types_capi.cc
index aab00b8cd70..74c54939de7 100644
--- a/source/blender/python/intern/bpy_rna_types_capi.cc
+++ b/source/blender/python/intern/bpy_rna_types_capi.cc
@@ -35,7 +35,7 @@
 
 #include "../generic/py_capi_utils.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/python/intern/bpy_utils_previews.cc b/source/blender/python/intern/bpy_utils_previews.cc
index 076a2de6b52..d55b2ff4602 100644
--- a/source/blender/python/intern/bpy_utils_previews.cc
+++ b/source/blender/python/intern/bpy_utils_previews.cc
@@ -17,7 +17,7 @@
 #include "BLI_utildefines.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "bpy_rna.h"
 #include "bpy_utils_previews.h"
diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt
index ec93be00e97..89a3a3d8c80 100644
--- a/source/blender/render/hydra/CMakeLists.txt
+++ b/source/blender/render/hydra/CMakeLists.txt
@@ -53,7 +53,7 @@ set(INC
   ../../gpu
   ../../gpu/intern
   ../../python/intern
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
   ..
 )
@@ -101,5 +101,5 @@ set(SRC
 
 blender_add_lib(bf_render_hydra "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_render_hydra bf_rna)
diff --git a/source/blender/render/hydra/python.cc b/source/blender/render/hydra/python.cc
index 6fb249f2e92..11a4522645a 100644
--- a/source/blender/render/hydra/python.cc
+++ b/source/blender/render/hydra/python.cc
@@ -17,7 +17,7 @@
 
 #include "RE_engine.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "hydra/image.hh"
 
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 8679d41d05b..692aed7d4d5 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../render
   ../windowmanager
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -107,5 +107,5 @@ endif()
 
 blender_add_lib(bf_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_sequencer bf_rna)
diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc
index a70b73c4638..2aae9c55e64 100644
--- a/source/blender/sequencer/intern/effects.cc
+++ b/source/blender/sequencer/intern/effects.cc
@@ -43,7 +43,7 @@
 
 #include "BLI_math_color_blend.h"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "RE_pipeline.h"
 
diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc
index adf684f5d27..9058376a2cd 100644
--- a/source/blender/sequencer/intern/render.cc
+++ b/source/blender/sequencer/intern/render.cc
@@ -47,7 +47,7 @@
 #include "IMB_imbuf_types.hh"
 #include "IMB_metadata.hh"
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index 702de035fae..bf99b0e8419 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INC
   ../render
   ../windowmanager
   ../../../intern/eigen
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 
@@ -51,5 +51,5 @@ set(LIB
 
 blender_add_lib(bf_shader_fx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_shader_fx bf_rna)
diff --git a/source/blender/shader_fx/intern/FX_ui_common.cc b/source/blender/shader_fx/intern/FX_ui_common.cc
index 9712726e30a..29f108da38b 100644
--- a/source/blender/shader_fx/intern/FX_ui_common.cc
+++ b/source/blender/shader_fx/intern/FX_ui_common.cc
@@ -29,7 +29,7 @@
 #include "UI_resources.hh"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 6fffc6417b3..142127967a3 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -22,7 +22,7 @@ set(INC
   ../../../intern/memutil
   ../bmesh
 
-  # RNA_prototypes.h
+  # RNA_prototypes.hh
   ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
 set(INC_SYS
@@ -210,7 +210,7 @@ endif()
 
 blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
-# RNA_prototypes.h
+# RNA_prototypes.hh
 add_dependencies(bf_windowmanager bf_rna)
 
 if(WITH_GTESTS)
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
index 87268350473..a15a9d62551 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
@@ -17,7 +17,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "BKE_global.hh"
 #include "BKE_idprop.hh"
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
index 5912849b96a..d04b90134b5 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
@@ -15,7 +15,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
index f9a5b13ac27..73814654fe4 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
@@ -21,7 +21,7 @@
 
 #include "RNA_access.hh"
 #include "RNA_define.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_types.hh"
 
diff --git a/source/blender/windowmanager/intern/wm_operator_props.cc b/source/blender/windowmanager/intern/wm_operator_props.cc
index 0ee9d8985c1..3724c2427af 100644
--- a/source/blender/windowmanager/intern/wm_operator_props.cc
+++ b/source/blender/windowmanager/intern/wm_operator_props.cc
@@ -23,7 +23,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "ED_select_utils.hh"
 
diff --git a/source/blender/windowmanager/intern/wm_operator_type.cc b/source/blender/windowmanager/intern/wm_operator_type.cc
index 5979519ece5..ffba6de0004 100644
--- a/source/blender/windowmanager/intern/wm_operator_type.cc
+++ b/source/blender/windowmanager/intern/wm_operator_type.cc
@@ -30,7 +30,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc
index 1a284da9eae..595f4ad51d2 100644
--- a/source/blender/windowmanager/intern/wm_operators.cc
+++ b/source/blender/windowmanager/intern/wm_operators.cc
@@ -92,7 +92,7 @@
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
 #include "RNA_path.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "UI_interface.hh"
 #include "UI_interface_icons.hh"
diff --git a/source/blender/windowmanager/intern/wm_stereo.cc b/source/blender/windowmanager/intern/wm_stereo.cc
index 486ecde11c5..00ab52df5c3 100644
--- a/source/blender/windowmanager/intern/wm_stereo.cc
+++ b/source/blender/windowmanager/intern/wm_stereo.cc
@@ -12,7 +12,7 @@
 #include "DNA_listBase.h"
 
 #include "RNA_access.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc
index 3ca1dc08d60..64d9d83d16b 100644
--- a/source/blender/windowmanager/intern/wm_window.cc
+++ b/source/blender/windowmanager/intern/wm_window.cc
@@ -46,7 +46,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 #include "RNA_enum_types.hh"
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 
 #include "WM_api.hh"
 #include "WM_types.hh"
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.hh b/source/blender/windowmanager/message_bus/wm_message_bus.hh
index e9ac44c1526..3add92f6b94 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.hh
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "RNA_prototypes.h"
+#include "RNA_prototypes.hh"
 #include "RNA_types.hh"
 #include <stdio.h>