diff --git a/CMakeLists.txt b/CMakeLists.txt
index be34333785c..56dc13bd25a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1334,7 +1334,7 @@ endif()
 # Check if Sub-modules are Cloned
 
 if(WITH_PYTHON)
-  # While we have this as an '#error' in 'bpy_capi_utils.h',
+  # While we have this as an '#error' in 'bpy_capi_utils.hh',
   # upgrading Python tends to cause confusion for users who build.
   # Give the error message early to make this more obvious.
   #
diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc
index 2fbfbc89b73..0ffa9c56191 100644
--- a/source/blender/editors/interface/interface_ops.cc
+++ b/source/blender/editors/interface/interface_ops.cc
@@ -2056,9 +2056,7 @@ static bool ui_editsource_uibut_match(uiBut *but_a, uiBut *but_b)
   return false;
 }
 
-extern "C" {
-void PyC_FileAndNum_Safe(const char **r_filename, int *r_lineno);
-}
+extern void PyC_FileAndNum_Safe(const char **r_filename, int *r_lineno);
 
 void UI_editsource_active_but_test(uiBut *but)
 {
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 72b5ffd0eb4..9b3d065a287 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -67,7 +67,7 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include "generic/python_utildefines.h"
+#include "generic/python_utildefines.hh"
 #include "mathutils/mathutils.hh"
 
 //==============================
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 909159acfd7..724fa92edf5 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -40,7 +40,7 @@
 #include "RNA_prototypes.hh"
 #include "bpy_rna.hh" /* pyrna_struct_CreatePyObject() */
 
-#include "../generic/py_capi_utils.h" /* #PyC_UnicodeFromBytes */
+#include "../generic/py_capi_utils.hh" /* #PyC_UnicodeFromBytes */
 
 #include "BKE_colorband.hh"  /* BKE_colorband_evaluate() */
 #include "BKE_colortools.hh" /* BKE_curvemapping_evaluateF() */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
index 79e9bbfb10b..802721ac48f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
@@ -10,7 +10,7 @@
 
 #include "../../stroke/BasicStrokeShaders.h"
 
-#include "../../../../python/generic/py_capi_utils.h"
+#include "../../../../python/generic/py_capi_utils.hh"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index 49d37f2bd30..8a630bfc758 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -21,7 +21,7 @@
 
 #include "BPY_extern_run.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 
 namespace Freestyle {
 
diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc
index ba970685607..1fa3488ccb1 100644
--- a/source/blender/makesrna/intern/rna_access.cc
+++ b/source/blender/makesrna/intern/rna_access.cc
@@ -6707,7 +6707,7 @@ bool RNA_property_assign_default(PointerRNA *ptr, PropertyRNA *prop)
 }
 
 #ifdef WITH_PYTHON
-extern "C" void PyC_LineSpit(void);
+extern void PyC_LineSpit(void);
 #endif
 
 void _RNA_warning(const char *format, ...)
diff --git a/source/blender/python/bmesh/bmesh_py_api.cc b/source/blender/python/bmesh/bmesh_py_api.cc
index 680330bb032..62c64f6bc7f 100644
--- a/source/blender/python/bmesh/bmesh_py_api.cc
+++ b/source/blender/python/bmesh/bmesh_py_api.cc
@@ -28,7 +28,7 @@
 
 #include "DNA_mesh_types.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "bmesh_py_api.h" /* own include */
 
diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.cc b/source/blender/python/bmesh/bmesh_py_ops_call.cc
index 839dca61578..1014ee861e3 100644
--- a/source/blender/python/bmesh/bmesh_py_ops_call.cc
+++ b/source/blender/python/bmesh/bmesh_py_ops_call.cc
@@ -22,8 +22,8 @@
 
 #include "bmesh_py_types.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 BLI_STATIC_ASSERT(sizeof(PyC_FlagSet) == sizeof(BMO_FlagSet), "size mismatch");
 
diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc
index ee3ac8dc95e..79cd55eb31d 100644
--- a/source/blender/python/bmesh/bmesh_py_types.cc
+++ b/source/blender/python/bmesh/bmesh_py_types.cc
@@ -33,8 +33,8 @@
 
 #include "../mathutils/mathutils.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "bmesh_py_types.h" /* own include */
 #include "bmesh_py_types_customdata.h"
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.cc b/source/blender/python/bmesh/bmesh_py_types_customdata.cc
index 2fad5170dfa..c8c0aa02e1c 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.cc
@@ -20,8 +20,8 @@
 #include "bmesh_py_types_customdata.h"
 #include "bmesh_py_types_meshdata.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 #include "../mathutils/mathutils.hh"
 
 #include "BKE_customdata.hh"
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc
index 32cbde32021..218ad010936 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc
@@ -35,8 +35,8 @@
 #include "bmesh.hh"
 #include "bmesh_py_types_meshdata.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 /* Mesh Loop UV
  * ************ */
diff --git a/source/blender/python/bmesh/bmesh_py_types_select.cc b/source/blender/python/bmesh/bmesh_py_types_select.cc
index df4ac8fe2cd..b07aeff5fc2 100644
--- a/source/blender/python/bmesh/bmesh_py_types_select.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_select.cc
@@ -22,7 +22,7 @@
 #include "bmesh_py_types.h"
 #include "bmesh_py_types_select.h"
 
-#include "../generic/python_utildefines.h"
+#include "../generic/python_utildefines.hh"
 
 PyDoc_STRVAR(
     /* Wrap. */
diff --git a/source/blender/python/bmesh/bmesh_py_utils.cc b/source/blender/python/bmesh/bmesh_py_utils.cc
index 695cf9ac435..22e3b4e9c4a 100644
--- a/source/blender/python/bmesh/bmesh_py_utils.cc
+++ b/source/blender/python/bmesh/bmesh_py_utils.cc
@@ -22,8 +22,8 @@
 #include "bmesh_py_types.h"
 #include "bmesh_py_utils.h" /* own include */
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 PyDoc_STRVAR(
     /* Wrap. */
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 15126d56968..5024a087618 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -25,17 +25,17 @@ set(SRC
   py_capi_utils.cc
 
   bgl.h
-  bl_math_py_api.h
-  blf_py_api.h
-  idprop_py_api.h
-  idprop_py_ui_api.h
-  imbuf_py_api.h
-  py_capi_rna.h
-  py_capi_utils.h
+  bl_math_py_api.hh
+  blf_py_api.hh
+  idprop_py_api.hh
+  idprop_py_ui_api.hh
+  imbuf_py_api.hh
+  py_capi_rna.hh
+  py_capi_utils.hh
 
   # header-only
-  python_compat.h
-  python_utildefines.h
+  python_compat.hh
+  python_utildefines.hh
 )
 
 set(LIB
diff --git a/source/blender/python/generic/bgl.cc b/source/blender/python/generic/bgl.cc
index cd085875061..dc5fedf6e5a 100644
--- a/source/blender/python/generic/bgl.cc
+++ b/source/blender/python/generic/bgl.cc
@@ -22,7 +22,7 @@
 #include "GPU_context.hh"
 #include "GPU_state.hh"
 
-#include "py_capi_utils.h"
+#include "py_capi_utils.hh"
 
 #include "BKE_global.hh"
 
diff --git a/source/blender/python/generic/bl_math_py_api.cc b/source/blender/python/generic/bl_math_py_api.cc
index f208b02a3ab..0eaaadff385 100644
--- a/source/blender/python/generic/bl_math_py_api.cc
+++ b/source/blender/python/generic/bl_math_py_api.cc
@@ -13,7 +13,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "bl_math_py_api.h"
+#include "bl_math_py_api.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Module Doc String
diff --git a/source/blender/python/generic/bl_math_py_api.h b/source/blender/python/generic/bl_math_py_api.hh
similarity index 58%
rename from source/blender/python/generic/bl_math_py_api.h
rename to source/blender/python/generic/bl_math_py_api.hh
index 5ad719d934e..b2b914f1b9d 100644
--- a/source/blender/python/generic/bl_math_py_api.h
+++ b/source/blender/python/generic/bl_math_py_api.hh
@@ -9,12 +9,4 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyMODINIT_FUNC BPyInit_bl_math(void);
-
-#ifdef __cplusplus
-}
-#endif
+PyMODINIT_FUNC BPyInit_bl_math();
diff --git a/source/blender/python/generic/blf_py_api.cc b/source/blender/python/generic/blf_py_api.cc
index 24de2f68445..e3764244694 100644
--- a/source/blender/python/generic/blf_py_api.cc
+++ b/source/blender/python/generic/blf_py_api.cc
@@ -11,9 +11,9 @@
 /* Future-proof, See https://docs.python.org/3/c-api/arg.html#strings-and-buffers */
 #define PY_SSIZE_T_CLEAN
 
-#include "blf_py_api.h"
+#include "blf_py_api.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include <Python.h>
 
@@ -21,7 +21,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "python_utildefines.h"
+#include "python_utildefines.hh"
 
 PyDoc_STRVAR(
     /* Wrap. */
diff --git a/source/blender/python/generic/blf_py_api.h b/source/blender/python/generic/blf_py_api.hh
similarity index 74%
rename from source/blender/python/generic/blf_py_api.h
rename to source/blender/python/generic/blf_py_api.hh
index 0047484f36c..cbce2339c31 100644
--- a/source/blender/python/generic/blf_py_api.h
+++ b/source/blender/python/generic/blf_py_api.hh
@@ -10,12 +10,4 @@
 
 #include <Python.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 PyObject *BPyInit_blf(void);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/python/generic/idprop_py_api.cc b/source/blender/python/generic/idprop_py_api.cc
index 40794f3f082..c5ec9e383a7 100644
--- a/source/blender/python/generic/idprop_py_api.cc
+++ b/source/blender/python/generic/idprop_py_api.cc
@@ -14,8 +14,8 @@
 
 #include "BLI_utildefines.h"
 
-#include "idprop_py_api.h"
-#include "idprop_py_ui_api.h"
+#include "idprop_py_api.hh"
+#include "idprop_py_ui_api.hh"
 
 #include "BKE_idprop.hh"
 
@@ -24,10 +24,10 @@
 #define USE_STRING_COERCE
 
 #ifdef USE_STRING_COERCE
-#  include "py_capi_utils.h"
+#  include "py_capi_utils.hh"
 #endif
 
-#include "python_utildefines.h"
+#include "python_utildefines.hh"
 
 extern bool pyrna_id_FromPyObject(PyObject *obj, ID **id);
 extern PyObject *pyrna_id_CreatePyObject(ID *id);
diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.hh
similarity index 72%
rename from source/blender/python/generic/idprop_py_api.h
rename to source/blender/python/generic/idprop_py_api.hh
index aed1d55b205..acf1ebceb8d 100644
--- a/source/blender/python/generic/idprop_py_api.h
+++ b/source/blender/python/generic/idprop_py_api.hh
@@ -8,10 +8,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct BPy_IDGroup_Iter;
 struct ID;
 struct IDProperty;
@@ -46,20 +42,20 @@ extern PyTypeObject BPy_IDGroup_IterItems_Type;
 #define BPy_IDGroup_IterItems_Check(v) (PyObject_TypeCheck(v, &BPy_IDGroup_IterItems_Type))
 #define BPy_IDGroup_IterItems_CheckExact(v) (Py_TYPE(v) == &BPy_IDGroup_IterItems_Type)
 
-typedef struct BPy_IDProperty {
+struct BPy_IDProperty {
   PyObject_VAR_HEAD
   struct ID *owner_id;     /* can be NULL */
   struct IDProperty *prop; /* must be second member */
   struct IDProperty *parent;
-} BPy_IDProperty;
+};
 
-typedef struct BPy_IDArray {
+struct BPy_IDArray {
   PyObject_VAR_HEAD
   struct ID *owner_id;     /* can be NULL */
   struct IDProperty *prop; /* must be second member */
-} BPy_IDArray;
+};
 
-typedef struct BPy_IDGroup_Iter {
+struct BPy_IDGroup_Iter {
   PyObject_VAR_HEAD
   BPy_IDProperty *group;
   struct IDProperty *cur;
@@ -67,43 +63,39 @@ typedef struct BPy_IDGroup_Iter {
   int len_init;
   /** Iterate in the reverse direction. */
   bool reversed;
-} BPy_IDGroup_Iter;
+};
 
 /** Use to implement `IDPropertyGroup.keys/values/items` */
-typedef struct BPy_IDGroup_View {
+struct BPy_IDGroup_View {
   PyObject_VAR_HEAD
   /** This will be NULL when accessing keys on data that has no ID properties. */
   BPy_IDProperty *group;
   bool reversed;
-} BPy_IDGroup_View;
+};
 
-PyObject *BPy_Wrap_GetKeys(struct IDProperty *prop);
-PyObject *BPy_Wrap_GetValues(struct ID *id, struct IDProperty *prop);
-PyObject *BPy_Wrap_GetItems(struct ID *id, struct IDProperty *prop);
+PyObject *BPy_Wrap_GetKeys(IDProperty *prop);
+PyObject *BPy_Wrap_GetValues(ID *id, IDProperty *prop);
+PyObject *BPy_Wrap_GetItems(ID *id, IDProperty *prop);
 
-PyObject *BPy_Wrap_GetKeys_View_WithID(struct ID *id, struct IDProperty *prop);
-PyObject *BPy_Wrap_GetValues_View_WithID(struct ID *id, struct IDProperty *prop);
-PyObject *BPy_Wrap_GetItems_View_WithID(struct ID *id, struct IDProperty *prop);
+PyObject *BPy_Wrap_GetKeys_View_WithID(ID *id, IDProperty *prop);
+PyObject *BPy_Wrap_GetValues_View_WithID(ID *id, IDProperty *prop);
+PyObject *BPy_Wrap_GetItems_View_WithID(ID *id, IDProperty *prop);
 
-int BPy_Wrap_SetMapItem(struct IDProperty *prop, PyObject *key, PyObject *val);
+int BPy_Wrap_SetMapItem(IDProperty *prop, PyObject *key, PyObject *val);
 
 /**
  * For simple, non nested types this is the same as #BPy_IDGroup_WrapData.
  */
-PyObject *BPy_IDGroup_MapDataToPy(struct IDProperty *prop);
-PyObject *BPy_IDGroup_WrapData(struct ID *id, struct IDProperty *prop, struct IDProperty *parent);
+PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop);
+PyObject *BPy_IDGroup_WrapData(ID *id, IDProperty *prop, IDProperty *parent);
 /**
  * \note group can be a pointer array or a group.
  * assume we already checked key is a string.
  *
  * \return success.
  */
-bool BPy_IDProperty_Map_ValidateAndCreate(PyObject *key, struct IDProperty *group, PyObject *ob);
+bool BPy_IDProperty_Map_ValidateAndCreate(PyObject *key, IDProperty *group, PyObject *ob);
 
-void IDProp_Init_Types(void);
+void IDProp_Init_Types();
 
-PyObject *BPyInit_idprop(void);
-
-#ifdef __cplusplus
-}
-#endif
+PyObject *BPyInit_idprop();
diff --git a/source/blender/python/generic/idprop_py_ui_api.cc b/source/blender/python/generic/idprop_py_ui_api.cc
index 10201ba06eb..d93396923b2 100644
--- a/source/blender/python/generic/idprop_py_ui_api.cc
+++ b/source/blender/python/generic/idprop_py_ui_api.cc
@@ -13,7 +13,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "idprop_py_ui_api.h"
+#include "idprop_py_ui_api.hh"
 
 #include "BKE_idprop.hh"
 
@@ -25,11 +25,11 @@
 #define USE_STRING_COERCE
 
 #ifdef USE_STRING_COERCE
-#  include "py_capi_utils.h"
+#  include "py_capi_utils.hh"
 #endif
-#include "py_capi_rna.h"
+#include "py_capi_rna.hh"
 
-#include "python_utildefines.h"
+#include "python_utildefines.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name UI Data Update
diff --git a/source/blender/python/generic/idprop_py_ui_api.h b/source/blender/python/generic/idprop_py_ui_api.hh
similarity index 53%
rename from source/blender/python/generic/idprop_py_ui_api.h
rename to source/blender/python/generic/idprop_py_ui_api.hh
index fc63ca31290..8b24605d267 100644
--- a/source/blender/python/generic/idprop_py_ui_api.h
+++ b/source/blender/python/generic/idprop_py_ui_api.hh
@@ -8,21 +8,13 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct IDProperty;
 
 extern PyTypeObject BPy_IDPropertyUIManager_Type;
 
-typedef struct BPy_IDPropertyUIManager {
+struct BPy_IDPropertyUIManager {
   PyObject_VAR_HEAD
-  struct IDProperty *property;
-} BPy_IDPropertyUIManager;
+  IDProperty *property;
+};
 
-void IDPropertyUIData_Init_Types(void);
-
-#ifdef __cplusplus
-}
-#endif
+void IDPropertyUIData_Init_Types();
diff --git a/source/blender/python/generic/imbuf_py_api.cc b/source/blender/python/generic/imbuf_py_api.cc
index b328597e586..10e574cde91 100644
--- a/source/blender/python/generic/imbuf_py_api.cc
+++ b/source/blender/python/generic/imbuf_py_api.cc
@@ -14,12 +14,12 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "py_capi_utils.h"
+#include "py_capi_utils.hh"
 
-#include "python_compat.h"
-#include "python_utildefines.h"
+#include "python_compat.hh"
+#include "python_utildefines.hh"
 
-#include "imbuf_py_api.h" /* own include */
+#include "imbuf_py_api.hh" /* own include */
 
 #include "../../imbuf/IMB_imbuf.hh"
 #include "../../imbuf/IMB_imbuf_types.hh"
diff --git a/source/blender/python/generic/imbuf_py_api.h b/source/blender/python/generic/imbuf_py_api.hh
similarity index 64%
rename from source/blender/python/generic/imbuf_py_api.h
rename to source/blender/python/generic/imbuf_py_api.hh
index 5ee03c1f1be..c5f2024906b 100644
--- a/source/blender/python/generic/imbuf_py_api.h
+++ b/source/blender/python/generic/imbuf_py_api.hh
@@ -8,14 +8,6 @@
  * \ingroup pygen
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyObject *BPyInit_imbuf(void);
+PyObject *BPyInit_imbuf();
 
 extern PyTypeObject Py_ImBuf_Type;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/python/generic/py_capi_rna.cc b/source/blender/python/generic/py_capi_rna.cc
index 681c1933a6f..11827fa0836 100644
--- a/source/blender/python/generic/py_capi_rna.cc
+++ b/source/blender/python/generic/py_capi_rna.cc
@@ -15,7 +15,7 @@
 
 #include <Python.h>
 
-#include "py_capi_rna.h"
+#include "py_capi_rna.hh"
 
 #include "BLI_bitmap.h"
 #include "BLI_dynstr.h"
diff --git a/source/blender/python/generic/py_capi_rna.h b/source/blender/python/generic/py_capi_rna.hh
similarity index 80%
rename from source/blender/python/generic/py_capi_rna.h
rename to source/blender/python/generic/py_capi_rna.hh
index b4845037035..e8eb807a69b 100644
--- a/source/blender/python/generic/py_capi_rna.h
+++ b/source/blender/python/generic/py_capi_rna.hh
@@ -11,22 +11,18 @@
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct EnumPropertyItem;
 
 /**
  * Convert all items into a single comma separated string.
  * Use for creating useful error messages.
  */
-char *pyrna_enum_repr(const struct EnumPropertyItem *item);
+char *pyrna_enum_repr(const EnumPropertyItem *item);
 
 /**
  * Same as #RNA_enum_value_from_id, but raises an exception.
  */
-int pyrna_enum_value_from_id(const struct EnumPropertyItem *item,
+int pyrna_enum_value_from_id(const EnumPropertyItem *item,
                              const char *identifier,
                              int *r_value,
                              const char *error_prefix);
@@ -39,7 +35,7 @@ int pyrna_enum_value_from_id(const struct EnumPropertyItem *item,
  * \param type_convert_sign: Maps signed to unsigned range,
  * needed when we want to use the full range of a signed short/char.
  */
-unsigned int *pyrna_enum_bitmap_from_set(const struct EnumPropertyItem *items,
+unsigned int *pyrna_enum_bitmap_from_set(const EnumPropertyItem *items,
                                          PyObject *value,
                                          int type_size,
                                          bool type_convert_sign,
@@ -49,19 +45,19 @@ unsigned int *pyrna_enum_bitmap_from_set(const struct EnumPropertyItem *items,
 /**
  * 'value' _must_ be a set type, error check before calling.
  */
-int pyrna_enum_bitfield_from_set(const struct EnumPropertyItem *items,
+int pyrna_enum_bitfield_from_set(const EnumPropertyItem *items,
                                  PyObject *value,
                                  int *r_value,
                                  const char *error_prefix);
 
-PyObject *pyrna_enum_bitfield_as_set(const struct EnumPropertyItem *items, int value);
+PyObject *pyrna_enum_bitfield_as_set(const EnumPropertyItem *items, int value);
 
 /**
  * Data for #pyrna_enum_value_parse_string & #pyrna_enum_bitfield_parse_set parsing utilities.
  * Use with #PyArg_ParseTuple's `O&` formatting.
  */
 struct BPy_EnumProperty_Parse {
-  const struct EnumPropertyItem *items;
+  const EnumPropertyItem *items;
   /**
    * Set when the value was successfully parsed.
    * Useful if the input ever needs to be included in an error message.
@@ -80,7 +76,3 @@ int pyrna_enum_value_parse_string(PyObject *o, void *p);
  * Use with #PyArg_ParseTuple's `O&` formatting.
  */
 int pyrna_enum_bitfield_parse_set(PyObject *o, void *p);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/python/generic/py_capi_utils.cc b/source/blender/python/generic/py_capi_utils.cc
index c7d550be267..b0d40ebd4b1 100644
--- a/source/blender/python/generic/py_capi_utils.cc
+++ b/source/blender/python/generic/py_capi_utils.cc
@@ -21,9 +21,9 @@
 
 #include "BLI_utildefines.h" /* for bool */
 
-#include "py_capi_utils.h"
+#include "py_capi_utils.hh"
 
-#include "python_utildefines.h"
+#include "python_utildefines.hh"
 
 #ifndef MATH_STANDALONE
 #  include "MEM_guardedalloc.h"
diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.hh
similarity index 91%
rename from source/blender/python/generic/py_capi_utils.h
rename to source/blender/python/generic/py_capi_utils.hh
index 05d9125e8c1..4a641f78471 100644
--- a/source/blender/python/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.hh
@@ -6,18 +6,15 @@
  * \ingroup pygen
  */
 
-/* Use a define instead of `#pragma once` because of `bmesh_py_types.h` */
-#ifndef __PY_CAPI_UTILS_H__
-#define __PY_CAPI_UTILS_H__
+#pragma once
+
+#include <string>
 
 #include "BLI_compiler_attrs.h"
+#include "BLI_span.hh"
 #include "BLI_sys_types.h"
 #include "BLI_utildefines_variadic.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** Useful to print Python objects while debugging. */
 void PyC_ObSpit(const char *name, PyObject *var);
 /**
@@ -25,8 +22,8 @@ void PyC_ObSpit(const char *name, PyObject *var);
  * Use for logging.
  */
 void PyC_ObSpitStr(char *result, size_t result_maxncpy, PyObject *var);
-void PyC_LineSpit(void);
-void PyC_StackSpit(void);
+void PyC_LineSpit();
+void PyC_StackSpit();
 
 /**
  * Return a string containing the full stack trace.
@@ -37,14 +34,14 @@ void PyC_StackSpit(void);
  * - `SystemExit` exceptions will exit (so `sys.exit(..)` works, matching `PyErr_Print` behavior).
  * - The always returns a Python string (unless exiting where the function doesn't return).
  */
-PyObject *PyC_ExceptionBuffer(void) ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
+PyObject *PyC_ExceptionBuffer() ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
 /**
  * A version of #PyC_ExceptionBuffer that returns the last exception only.
  *
  * Useful for error messages from evaluating numeric expressions for e.g.
  * where a full multi-line stack-trace isn't needed and doesn't format well in the status-bar.
  */
-PyObject *PyC_ExceptionBuffer_Simple(void) ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
+PyObject *PyC_ExceptionBuffer_Simple() ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
 
 PyObject *PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...);
 PyObject *PyC_FrozenSetFromStrings(const char **strings);
@@ -145,11 +142,11 @@ const char *PyC_UnicodeAsBytesAndSize(PyObject *py_str, Py_ssize_t *r_size, PyOb
  * - Always `Py_XDECREF(value_coerce)` before returning,
  *   after this `value` must not be accessed.
  */
-typedef struct PyC_UnicodeAsBytesAndSize_Data {
+struct PyC_UnicodeAsBytesAndSize_Data {
   PyObject *value_coerce;
   const char *value;
   Py_ssize_t value_len;
-} PyC_UnicodeAsBytesAndSize_Data;
+};
 
 /**
  * Use with PyArg_ParseTuple's "O&" formatting.
@@ -195,7 +192,7 @@ bool PyC_NameSpace_ImportArray(PyObject *py_dict, const char *imports[]);
 PyObject *PyC_MainModule_Backup() ATTR_WARN_UNUSED_RESULT;
 void PyC_MainModule_Restore(PyObject *main_mod);
 
-bool PyC_IsInterpreterActive(void);
+bool PyC_IsInterpreterActive();
 
 /**
  * Generic function to avoid depending on RNA.
@@ -203,10 +200,10 @@ bool PyC_IsInterpreterActive(void);
 void *PyC_RNA_AsPointer(PyObject *value, const char *type_name);
 
 /* flag / set --- interchange */
-typedef struct PyC_FlagSet {
+struct PyC_FlagSet {
   int value;
   const char *identifier;
-} PyC_FlagSet;
+};
 
 PyObject *PyC_FlagSet_AsString(const PyC_FlagSet *item);
 int PyC_FlagSet_ValueFromID_int(const PyC_FlagSet *item, const char *identifier, int *r_value);
@@ -356,15 +353,6 @@ bool PyC_StructFmt_type_is_int_any(char format);
 bool PyC_StructFmt_type_is_byte(char format);
 bool PyC_StructFmt_type_is_bool(char format);
 
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#  include "BLI_span.hh"
-
-#  include <string>
-
 /**
  * Create a `str` from `std::string`, wraps #PyC_UnicodeFromBytesAndSize.
  */
@@ -390,20 +378,3 @@ inline PyObject *PyC_Tuple_Pack_Bool(const blender::Span<bool> values)
 {
   return PyC_Tuple_PackArray_Bool(values.data(), values.size());
 }
-
-#else
-
-#  define PyC_Tuple_Pack_F32(...) \
-    PyC_Tuple_PackArray_F32(((const float[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__))
-#  define PyC_Tuple_Pack_F64(...) \
-    PyC_Tuple_PackArray_F64(((const double[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__))
-#  define PyC_Tuple_Pack_I32(...) \
-    PyC_Tuple_PackArray_I32(((const int[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__))
-#  define PyC_Tuple_Pack_I32FromBool(...) \
-    PyC_Tuple_PackArray_I32FromBool(((const int[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__))
-#  define PyC_Tuple_Pack_Bool(...) \
-    PyC_Tuple_PackArray_Bool(((const bool[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__))
-
-#endif
-
-#endif /* __PY_CAPI_UTILS_H__ */
diff --git a/source/blender/python/generic/python_compat.h b/source/blender/python/generic/python_compat.hh
similarity index 84%
rename from source/blender/python/generic/python_compat.h
rename to source/blender/python/generic/python_compat.hh
index df4eedc445b..f18d0fb59b3 100644
--- a/source/blender/python/generic/python_compat.h
+++ b/source/blender/python/generic/python_compat.hh
@@ -9,17 +9,9 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Add `intialized` member for Python 3.12+. */
 #if PY_VERSION_HEX >= 0x030c0000
 #  define PY_ARG_PARSER_HEAD_COMPAT() 0,
 #else
 #  define PY_ARG_PARSER_HEAD_COMPAT()
 #endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/python/generic/python_utildefines.h b/source/blender/python/generic/python_utildefines.hh
similarity index 86%
rename from source/blender/python/generic/python_utildefines.h
rename to source/blender/python/generic/python_utildefines.hh
index bcc0079605b..3dbbfcdd432 100644
--- a/source/blender/python/generic/python_utildefines.h
+++ b/source/blender/python/generic/python_utildefines.hh
@@ -5,15 +5,11 @@
 /** \file
  * \ingroup pygen
  * \brief header-only utilities
- * \note light addition to Python.h, use py_capi_utils.h for larger features.
+ * \note light addition to Python.h, use py_capi_utils.hh for larger features.
  */
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define PyTuple_SET_ITEMS(op_arg, ...) \
   { \
     PyTupleObject *op = (PyTupleObject *)op_arg; \
@@ -44,7 +40,3 @@ Py_LOCAL_INLINE(int) PyList_APPEND(PyObject *op, PyObject *v)
   Py_DecRef(v);
   return ret;
 }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/python/gpu/gpu_py.cc b/source/blender/python/gpu/gpu_py.cc
index 59bf0de08ea..bedb489420c 100644
--- a/source/blender/python/gpu/gpu_py.cc
+++ b/source/blender/python/gpu/gpu_py.cc
@@ -15,7 +15,7 @@
 #include "GPU_primitive.hh"
 #include "GPU_texture.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "gpu_py.hh" /* own include */
 
diff --git a/source/blender/python/gpu/gpu_py.hh b/source/blender/python/gpu/gpu_py.hh
index 51ad52d6049..eb4f1f31914 100644
--- a/source/blender/python/gpu/gpu_py.hh
+++ b/source/blender/python/gpu/gpu_py.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 extern struct PyC_StringEnumItems bpygpu_primtype_items[];
 extern struct PyC_StringEnumItems bpygpu_dataformat_items[];
diff --git a/source/blender/python/gpu/gpu_py_batch.cc b/source/blender/python/gpu/gpu_py_batch.cc
index a5fee03817e..0845472ebc9 100644
--- a/source/blender/python/gpu/gpu_py_batch.cc
+++ b/source/blender/python/gpu/gpu_py_batch.cc
@@ -18,8 +18,8 @@
 
 #include "GPU_batch.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_element.hh"
diff --git a/source/blender/python/gpu/gpu_py_buffer.cc b/source/blender/python/gpu/gpu_py_buffer.cc
index e1d4ca3a23e..f9800b8d400 100644
--- a/source/blender/python/gpu/gpu_py_buffer.cc
+++ b/source/blender/python/gpu/gpu_py_buffer.cc
@@ -19,7 +19,7 @@
 
 #include "GPU_texture.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "gpu_py.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_compute.cc b/source/blender/python/gpu/gpu_py_compute.cc
index 11506f99286..2e3b19ec36d 100644
--- a/source/blender/python/gpu/gpu_py_compute.cc
+++ b/source/blender/python/gpu/gpu_py_compute.cc
@@ -17,7 +17,7 @@
 #include "GPU_compute.hh"
 #include "GPU_state.hh"
 
-#include "../generic/python_compat.h"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_compute.hh" /* own include */
diff --git a/source/blender/python/gpu/gpu_py_element.cc b/source/blender/python/gpu/gpu_py_element.cc
index 12728a6fc6d..6a81ac58069 100644
--- a/source/blender/python/gpu/gpu_py_element.cc
+++ b/source/blender/python/gpu/gpu_py_element.cc
@@ -15,8 +15,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_element.hh" /* own include */
diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc
index a158f940089..899ad21f770 100644
--- a/source/blender/python/gpu/gpu_py_framebuffer.cc
+++ b/source/blender/python/gpu/gpu_py_framebuffer.cc
@@ -18,9 +18,9 @@
 #include "GPU_framebuffer.hh"
 #include "GPU_init_exit.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "../mathutils/mathutils.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_matrix.cc b/source/blender/python/gpu/gpu_py_matrix.cc
index 1c3cf046725..be01c92c621 100644
--- a/source/blender/python/gpu/gpu_py_matrix.cc
+++ b/source/blender/python/gpu/gpu_py_matrix.cc
@@ -20,7 +20,7 @@
 
 #include "../mathutils/mathutils.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #define USE_GPU_PY_MATRIX_API
 #include "GPU_matrix.hh"
diff --git a/source/blender/python/gpu/gpu_py_offscreen.cc b/source/blender/python/gpu/gpu_py_offscreen.cc
index a7214794dd8..b732633079b 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.cc
+++ b/source/blender/python/gpu/gpu_py_offscreen.cc
@@ -32,8 +32,8 @@
 
 #include "../mathutils/mathutils.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_texture.hh"
diff --git a/source/blender/python/gpu/gpu_py_select.cc b/source/blender/python/gpu/gpu_py_select.cc
index 0f58d0a4d7a..18a0dc0f9ef 100644
--- a/source/blender/python/gpu/gpu_py_select.cc
+++ b/source/blender/python/gpu/gpu_py_select.cc
@@ -18,7 +18,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "GPU_select.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_shader.cc b/source/blender/python/gpu/gpu_py_shader.cc
index e487d3003ef..08f2e4e9ac4 100644
--- a/source/blender/python/gpu/gpu_py_shader.cc
+++ b/source/blender/python/gpu/gpu_py_shader.cc
@@ -17,9 +17,9 @@
 #include "GPU_texture.hh"
 #include "GPU_uniform_buffer.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "../mathutils/mathutils.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_shader.hh b/source/blender/python/gpu/gpu_py_shader.hh
index 8fb27bf6776..dd90a1fdd79 100644
--- a/source/blender/python/gpu/gpu_py_shader.hh
+++ b/source/blender/python/gpu/gpu_py_shader.hh
@@ -9,7 +9,7 @@
 #pragma once
 
 #ifndef __cplusplus
-#  include "../generic/py_capi_utils.h"
+#  include "../generic/py_capi_utils.hh"
 #endif
 
 struct GPUShaderCreateInfo;
diff --git a/source/blender/python/gpu/gpu_py_shader_create_info.cc b/source/blender/python/gpu/gpu_py_shader_create_info.cc
index d3e905847c4..fd3e83e4330 100644
--- a/source/blender/python/gpu/gpu_py_shader_create_info.cc
+++ b/source/blender/python/gpu/gpu_py_shader_create_info.cc
@@ -16,8 +16,8 @@
 #include "GPU_shader.hh"
 #include "intern/gpu_shader_create_info.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_shader.hh" /* own include */
diff --git a/source/blender/python/gpu/gpu_py_state.cc b/source/blender/python/gpu/gpu_py_state.cc
index ab8101f5ea2..0afe7333d44 100644
--- a/source/blender/python/gpu/gpu_py_state.cc
+++ b/source/blender/python/gpu/gpu_py_state.cc
@@ -16,8 +16,8 @@
 #include "GPU_framebuffer.hh"
 #include "GPU_state.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_framebuffer.hh"
diff --git a/source/blender/python/gpu/gpu_py_texture.cc b/source/blender/python/gpu/gpu_py_texture.cc
index e45d633b05c..55e533d4e16 100644
--- a/source/blender/python/gpu/gpu_py_texture.cc
+++ b/source/blender/python/gpu/gpu_py_texture.cc
@@ -22,8 +22,8 @@
 
 #include "BKE_image.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_buffer.hh"
diff --git a/source/blender/python/gpu/gpu_py_uniformbuffer.cc b/source/blender/python/gpu/gpu_py_uniformbuffer.cc
index b5cb00605b6..6fb756f9ee6 100644
--- a/source/blender/python/gpu/gpu_py_uniformbuffer.cc
+++ b/source/blender/python/gpu/gpu_py_uniformbuffer.cc
@@ -18,7 +18,7 @@
 #include "GPU_context.hh"
 #include "GPU_uniform_buffer.hh"
 
-#include "../generic/python_compat.h"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_uniformbuffer.hh" /* own include */
diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.cc b/source/blender/python/gpu/gpu_py_vertex_buffer.cc
index 38bde5c12c9..19af8e3e096 100644
--- a/source/blender/python/gpu/gpu_py_vertex_buffer.cc
+++ b/source/blender/python/gpu/gpu_py_vertex_buffer.cc
@@ -15,9 +15,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_vertex_buffer.hh" /* own include */
diff --git a/source/blender/python/gpu/gpu_py_vertex_format.cc b/source/blender/python/gpu/gpu_py_vertex_format.cc
index d51a0224c1d..8fde494f31c 100644
--- a/source/blender/python/gpu/gpu_py_vertex_format.cc
+++ b/source/blender/python/gpu/gpu_py_vertex_format.cc
@@ -11,8 +11,8 @@
 
 #include <Python.h>
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "gpu_py.hh"
 #include "gpu_py_vertex_format.hh" /* own include */
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index ceaae60d74a..f4bd78520fb 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -87,7 +87,7 @@ set(SRC
   bpy_app_timers.hh
   bpy_app_translations.hh
   bpy_app_usd.hh
-  bpy_capi_utils.h
+  bpy_capi_utils.hh
   bpy_cli_command.hh
   bpy_driver.hh
   bpy_gizmo_wrap.hh
diff --git a/source/blender/python/intern/bpy.cc b/source/blender/python/intern/bpy.cc
index dee0fffdc03..e96fea6623a 100644
--- a/source/blender/python/intern/bpy.cc
+++ b/source/blender/python/intern/bpy.cc
@@ -46,13 +46,13 @@
 #include "bpy_utils_previews.hh"
 #include "bpy_utils_units.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 /* external util modules */
-#include "../generic/idprop_py_api.h"
-#include "../generic/idprop_py_ui_api.h"
+#include "../generic/idprop_py_api.hh"
+#include "../generic/idprop_py_ui_api.hh"
 #include "bpy_msgbus.hh"
 
 #ifdef WITH_FREESTYLE
diff --git a/source/blender/python/intern/bpy_app.cc b/source/blender/python/intern/bpy_app.cc
index 278004f8959..6cf9a133450 100644
--- a/source/blender/python/intern/bpy_app.cc
+++ b/source/blender/python/intern/bpy_app.cc
@@ -54,10 +54,10 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #ifdef BUILD_DATE
 extern "C" char build_date[];
diff --git a/source/blender/python/intern/bpy_app_alembic.cc b/source/blender/python/intern/bpy_app_alembic.cc
index c7322a08e8a..a603ba17ab8 100644
--- a/source/blender/python/intern/bpy_app_alembic.cc
+++ b/source/blender/python/intern/bpy_app_alembic.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_alembic.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_ALEMBIC
 #  include "ABC_alembic.h"
diff --git a/source/blender/python/intern/bpy_app_ffmpeg.cc b/source/blender/python/intern/bpy_app_ffmpeg.cc
index 08472658eaa..70f95360054 100644
--- a/source/blender/python/intern/bpy_app_ffmpeg.cc
+++ b/source/blender/python/intern/bpy_app_ffmpeg.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_ffmpeg.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_FFMPEG
 extern "C" {
diff --git a/source/blender/python/intern/bpy_app_handlers.cc b/source/blender/python/intern/bpy_app_handlers.cc
index 4e97d3c8b2a..68d146251ef 100644
--- a/source/blender/python/intern/bpy_app_handlers.cc
+++ b/source/blender/python/intern/bpy_app_handlers.cc
@@ -20,7 +20,7 @@
 #include "bpy_app_handlers.hh"
 #include "bpy_rna.hh"
 
-#include "../generic/python_utildefines.h"
+#include "../generic/python_utildefines.hh"
 
 #include "BPY_extern.h"
 
diff --git a/source/blender/python/intern/bpy_app_icons.cc b/source/blender/python/intern/bpy_app_icons.cc
index ecb7f0c581e..d4983bf1cea 100644
--- a/source/blender/python/intern/bpy_app_icons.cc
+++ b/source/blender/python/intern/bpy_app_icons.cc
@@ -16,8 +16,8 @@
 
 #include "BKE_icons.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "bpy_app_icons.hh"
 
diff --git a/source/blender/python/intern/bpy_app_ocio.cc b/source/blender/python/intern/bpy_app_ocio.cc
index d0eba7297f0..39cc0f2c492 100644
--- a/source/blender/python/intern/bpy_app_ocio.cc
+++ b/source/blender/python/intern/bpy_app_ocio.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_ocio.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_OCIO
 #  include "ocio_capi.h"
diff --git a/source/blender/python/intern/bpy_app_oiio.cc b/source/blender/python/intern/bpy_app_oiio.cc
index 5ec92551e1e..5722864bcb7 100644
--- a/source/blender/python/intern/bpy_app_oiio.cc
+++ b/source/blender/python/intern/bpy_app_oiio.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_oiio.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "openimageio_api.h"
 
diff --git a/source/blender/python/intern/bpy_app_opensubdiv.cc b/source/blender/python/intern/bpy_app_opensubdiv.cc
index 469ec6b2b10..9f82b4870c9 100644
--- a/source/blender/python/intern/bpy_app_opensubdiv.cc
+++ b/source/blender/python/intern/bpy_app_opensubdiv.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_opensubdiv.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_OPENSUBDIV
 #  include "opensubdiv_capi.hh"
diff --git a/source/blender/python/intern/bpy_app_openvdb.cc b/source/blender/python/intern/bpy_app_openvdb.cc
index 3c2cef589f0..e0cde7e95d6 100644
--- a/source/blender/python/intern/bpy_app_openvdb.cc
+++ b/source/blender/python/intern/bpy_app_openvdb.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_openvdb.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_OPENVDB
 #  include "openvdb_capi.h"
diff --git a/source/blender/python/intern/bpy_app_sdl.cc b/source/blender/python/intern/bpy_app_sdl.cc
index b9e57a4f2bc..b86ce4e34ab 100644
--- a/source/blender/python/intern/bpy_app_sdl.cc
+++ b/source/blender/python/intern/bpy_app_sdl.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_sdl.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_SDL
 /* SDL force defines __SSE__ and __SSE2__ flags, which generates warnings
diff --git a/source/blender/python/intern/bpy_app_timers.cc b/source/blender/python/intern/bpy_app_timers.cc
index 642e0cca238..a8bbe9b53ed 100644
--- a/source/blender/python/intern/bpy_app_timers.cc
+++ b/source/blender/python/intern/bpy_app_timers.cc
@@ -12,7 +12,7 @@
 
 #include "bpy_app_timers.hh"
 
-#include "../generic/python_compat.h"
+#include "../generic/python_compat.hh"
 
 static double handle_returned_value(PyObject *function, PyObject *ret)
 {
diff --git a/source/blender/python/intern/bpy_app_translations.cc b/source/blender/python/intern/bpy_app_translations.cc
index 18e80750ac6..8fd6b6c7653 100644
--- a/source/blender/python/intern/bpy_app_translations.cc
+++ b/source/blender/python/intern/bpy_app_translations.cc
@@ -26,7 +26,7 @@
 
 #include "RNA_types.hh"
 
-#include "../generic/python_utildefines.h"
+#include "../generic/python_utildefines.hh"
 
 #ifdef WITH_INTERNATIONAL
 #  include "BLI_ghash.h"
diff --git a/source/blender/python/intern/bpy_app_usd.cc b/source/blender/python/intern/bpy_app_usd.cc
index 97e815e5ead..3cb9fc7e696 100644
--- a/source/blender/python/intern/bpy_app_usd.cc
+++ b/source/blender/python/intern/bpy_app_usd.cc
@@ -11,7 +11,7 @@
 
 #include "bpy_app_usd.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifdef WITH_USD
 #  include "usd.hh"
diff --git a/source/blender/python/intern/bpy_capi_utils.cc b/source/blender/python/intern/bpy_capi_utils.cc
index 7a84307c773..651c49e7b3e 100644
--- a/source/blender/python/intern/bpy_capi_utils.cc
+++ b/source/blender/python/intern/bpy_capi_utils.cc
@@ -14,13 +14,13 @@
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 
 #include "MEM_guardedalloc.h"
 
 #include "BKE_report.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 short BPy_reports_to_error(ReportList *reports, PyObject *exception, const bool clear)
 {
diff --git a/source/blender/python/intern/bpy_capi_utils.h b/source/blender/python/intern/bpy_capi_utils.hh
similarity index 100%
rename from source/blender/python/intern/bpy_capi_utils.h
rename to source/blender/python/intern/bpy_capi_utils.hh
diff --git a/source/blender/python/intern/bpy_cli_command.cc b/source/blender/python/intern/bpy_cli_command.cc
index 5610a174308..e4e8f92001d 100644
--- a/source/blender/python/intern/bpy_cli_command.cc
+++ b/source/blender/python/intern/bpy_cli_command.cc
@@ -11,15 +11,15 @@
 
 #include "BLI_utildefines.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 
 #include "MEM_guardedalloc.h"
 
 #include "BKE_blender_cli_command.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "bpy_cli_command.hh" /* Own include. */
 
diff --git a/source/blender/python/intern/bpy_gizmo_wrap.cc b/source/blender/python/intern/bpy_gizmo_wrap.cc
index 8e3051cca64..b3d679abdd4 100644
--- a/source/blender/python/intern/bpy_gizmo_wrap.cc
+++ b/source/blender/python/intern/bpy_gizmo_wrap.cc
@@ -28,8 +28,8 @@
 #include "bpy_intern_string.hh"
 #include "bpy_rna.hh"
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/python_compat.hh"
 
 /* we may want to add, but not now */
 
diff --git a/source/blender/python/intern/bpy_interface.cc b/source/blender/python/intern/bpy_interface.cc
index 67287afb10e..ce96651e9aa 100644
--- a/source/blender/python/intern/bpy_interface.cc
+++ b/source/blender/python/intern/bpy_interface.cc
@@ -34,7 +34,7 @@
 #include "RNA_types.hh"
 
 #include "bpy.hh"
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_intern_string.hh"
 #include "bpy_path.hh"
 #include "bpy_props.hh"
@@ -59,15 +59,15 @@
 #include "BPY_extern_python.h"
 #include "BPY_extern_run.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 /* `inittab` initialization functions. */
 #include "../bmesh/bmesh_py_api.h"
 #include "../generic/bgl.h"
-#include "../generic/bl_math_py_api.h"
-#include "../generic/blf_py_api.h"
-#include "../generic/idprop_py_api.h"
-#include "../generic/imbuf_py_api.h"
+#include "../generic/bl_math_py_api.hh"
+#include "../generic/blf_py_api.hh"
+#include "../generic/idprop_py_api.hh"
+#include "../generic/imbuf_py_api.hh"
 #include "../gpu/gpu_py_api.hh"
 #include "../mathutils/mathutils.hh"
 
diff --git a/source/blender/python/intern/bpy_interface_atexit.cc b/source/blender/python/intern/bpy_interface_atexit.cc
index e2a196c5ad2..9d815e2f282 100644
--- a/source/blender/python/intern/bpy_interface_atexit.cc
+++ b/source/blender/python/intern/bpy_interface_atexit.cc
@@ -15,7 +15,7 @@
 #include "BLI_utildefines.h"
 
 #include "bpy.hh" /* own include */
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 
 #include "WM_api.hh"
 
diff --git a/source/blender/python/intern/bpy_interface_run.cc b/source/blender/python/intern/bpy_interface_run.cc
index 58d5d96d473..9da71df8382 100644
--- a/source/blender/python/intern/bpy_interface_run.cc
+++ b/source/blender/python/intern/bpy_interface_run.cc
@@ -26,11 +26,11 @@
 
 #include "BPY_extern_run.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_intern_string.hh"
 #include "bpy_traceback.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Private Utilities
diff --git a/source/blender/python/intern/bpy_library_load.cc b/source/blender/python/intern/bpy_library_load.cc
index 52b881fdf38..28d091cbe04 100644
--- a/source/blender/python/intern/bpy_library_load.cc
+++ b/source/blender/python/intern/bpy_library_load.cc
@@ -34,12 +34,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_library.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 /* nifty feature. swap out strings for RNA data */
 #define USE_RNA_DATABLOCKS
diff --git a/source/blender/python/intern/bpy_library_write.cc b/source/blender/python/intern/bpy_library_write.cc
index fab7c9f1aaa..5366ada4b3d 100644
--- a/source/blender/python/intern/bpy_library_write.cc
+++ b/source/blender/python/intern/bpy_library_write.cc
@@ -28,12 +28,12 @@
 
 #include "RNA_types.hh"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_library.hh" /* Declaration for #BPY_library_load_method_def */
 #include "bpy_rna.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 using namespace blender::bke::blendfile;
 
diff --git a/source/blender/python/intern/bpy_msgbus.cc b/source/blender/python/intern/bpy_msgbus.cc
index c845ec9cd20..02d60967013 100644
--- a/source/blender/python/intern/bpy_msgbus.cc
+++ b/source/blender/python/intern/bpy_msgbus.cc
@@ -9,10 +9,10 @@
 
 #include <Python.h>
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "../mathutils/mathutils.hh"
 
@@ -24,7 +24,7 @@
 
 #include "RNA_access.hh"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_rna.hh"
 
 #include "bpy_msgbus.hh" /* own include */
diff --git a/source/blender/python/intern/bpy_operator.cc b/source/blender/python/intern/bpy_operator.cc
index 940530481e5..8d97953835a 100644
--- a/source/blender/python/intern/bpy_operator.cc
+++ b/source/blender/python/intern/bpy_operator.cc
@@ -20,13 +20,13 @@
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "BPY_extern.h"
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_operator.hh"
 #include "bpy_operator_wrap.hh"
 #include "bpy_rna.hh" /* for setting argument properties & type method `get_rna_type`. */
diff --git a/source/blender/python/intern/bpy_path.cc b/source/blender/python/intern/bpy_path.cc
index f2106351e2b..981838c318d 100644
--- a/source/blender/python/intern/bpy_path.cc
+++ b/source/blender/python/intern/bpy_path.cc
@@ -14,7 +14,7 @@
 
 #include "bpy_path.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 /* #include "IMB_imbuf_types.hh" */
 extern const char *imb_ext_image[];
diff --git a/source/blender/python/intern/bpy_props.cc b/source/blender/python/intern/bpy_props.cc
index 8a641ff7e50..da8fb4b1e2f 100644
--- a/source/blender/python/intern/bpy_props.cc
+++ b/source/blender/python/intern/bpy_props.cc
@@ -23,7 +23,7 @@
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_props.hh"
 #include "bpy_rna.hh"
 
@@ -36,9 +36,9 @@
 
 #include "DNA_ID.h" /* MAX_IDPROP_NAME */
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 using blender::Array;
 
diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
index efb2f4bbb22..82b6244f4ea 100644
--- a/source/blender/python/intern/bpy_rna.cc
+++ b/source/blender/python/intern/bpy_rna.cc
@@ -30,7 +30,7 @@
 #include "BPY_extern.h"
 #include "BPY_extern_clog.h"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_intern_string.hh"
 #include "bpy_props.hh"
 #include "bpy_rna.hh"
@@ -62,12 +62,12 @@
 
 #include "DEG_depsgraph_query.hh"
 
-#include "../generic/idprop_py_api.h" /* For IDprop lookups. */
-#include "../generic/idprop_py_ui_api.h"
-#include "../generic/py_capi_rna.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/idprop_py_api.hh" /* For IDprop lookups. */
+#include "../generic/idprop_py_ui_api.hh"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
+#include "../generic/python_utildefines.hh"
 
 #define USE_PEDANTIC_WRITE
 #define USE_MATHUTILS
diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc
index 4b16c5bb539..0fabc4f7f00 100644
--- a/source/blender/python/intern/bpy_rna_anim.cc
+++ b/source/blender/python/intern/bpy_rna_anim.cc
@@ -41,12 +41,12 @@
 #include "WM_api.hh"
 #include "WM_types.hh"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_rna.hh"
 #include "bpy_rna_anim.hh"
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/python/intern/bpy_rna_array.cc b/source/blender/python/intern/bpy_rna_array.cc
index e08355d2988..0c358c00c2c 100644
--- a/source/blender/python/intern/bpy_rna_array.cc
+++ b/source/blender/python/intern/bpy_rna_array.cc
@@ -24,7 +24,7 @@
 
 #include "BPY_extern_clog.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #define USE_MATHUTILS
 
diff --git a/source/blender/python/intern/bpy_rna_callback.cc b/source/blender/python/intern/bpy_rna_callback.cc
index 5bac2df1e9c..d655cc510ae 100644
--- a/source/blender/python/intern/bpy_rna_callback.cc
+++ b/source/blender/python/intern/bpy_rna_callback.cc
@@ -11,8 +11,8 @@
 
 #include <Python.h>
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "DNA_space_types.h"
 
@@ -28,7 +28,7 @@
 
 #include "BPY_extern.h" /* For public API. */
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_rna.hh"
 #include "bpy_rna_callback.hh" /* Own include. */
 
diff --git a/source/blender/python/intern/bpy_rna_context.cc b/source/blender/python/intern/bpy_rna_context.cc
index c6ed3b8e322..683e6bb8db4 100644
--- a/source/blender/python/intern/bpy_rna_context.cc
+++ b/source/blender/python/intern/bpy_rna_context.cc
@@ -23,7 +23,7 @@
 
 #include "bpy_rna_context.hh"
 
-#include "../generic/python_compat.h"
+#include "../generic/python_compat.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
diff --git a/source/blender/python/intern/bpy_rna_data.cc b/source/blender/python/intern/bpy_rna_data.cc
index 35c28b43ad0..359b83f76d4 100644
--- a/source/blender/python/intern/bpy_rna_data.cc
+++ b/source/blender/python/intern/bpy_rna_data.cc
@@ -16,8 +16,8 @@
 #include <Python.h>
 #include <cstddef>
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/python/intern/bpy_rna_gizmo.cc b/source/blender/python/intern/bpy_rna_gizmo.cc
index edd5b5b455d..09d05e03ace 100644
--- a/source/blender/python/intern/bpy_rna_gizmo.cc
+++ b/source/blender/python/intern/bpy_rna_gizmo.cc
@@ -18,11 +18,11 @@
 
 #include "WM_types.hh"
 
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 #include "bpy_rna_gizmo.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.hh"
diff --git a/source/blender/python/intern/bpy_rna_id_collection.cc b/source/blender/python/intern/bpy_rna_id_collection.cc
index 93d314c19ba..0be1862ecc3 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.cc
+++ b/source/blender/python/intern/bpy_rna_id_collection.cc
@@ -30,9 +30,9 @@
 
 #include "bpy_rna_id_collection.hh"
 
-#include "../generic/py_capi_rna.h"
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_rna.hh"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "RNA_enum_types.hh"
 
diff --git a/source/blender/python/intern/bpy_rna_operator.cc b/source/blender/python/intern/bpy_rna_operator.cc
index 973be37584f..177036b5dc9 100644
--- a/source/blender/python/intern/bpy_rna_operator.cc
+++ b/source/blender/python/intern/bpy_rna_operator.cc
@@ -14,10 +14,10 @@
 
 #include "BKE_context.hh"
 
-#include "../generic/python_utildefines.h"
+#include "../generic/python_utildefines.hh"
 
 #include "BPY_extern.h"
-#include "bpy_capi_utils.h"
+#include "bpy_capi_utils.hh"
 
 #include "bpy_rna_operator.hh" /* Own include, #BPY_rna_operator_poll_message_set_method_def. */
 
diff --git a/source/blender/python/intern/bpy_rna_text.cc b/source/blender/python/intern/bpy_rna_text.cc
index c16d37e178d..4f9fbf8b8f7 100644
--- a/source/blender/python/intern/bpy_rna_text.cc
+++ b/source/blender/python/intern/bpy_rna_text.cc
@@ -18,7 +18,7 @@
 
 #include "BKE_text.h"
 
-#include "../generic/python_compat.h"
+#include "../generic/python_compat.hh"
 
 #include "bpy_rna.hh"
 #include "bpy_rna_text.hh" /* Declare #BPY_rna_region_as_string_method_def. */
diff --git a/source/blender/python/intern/bpy_rna_types_capi.cc b/source/blender/python/intern/bpy_rna_types_capi.cc
index e6571f9bd7b..34644f272cf 100644
--- a/source/blender/python/intern/bpy_rna_types_capi.cc
+++ b/source/blender/python/intern/bpy_rna_types_capi.cc
@@ -33,7 +33,7 @@
 
 #include "bpy_rna_operator.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "RNA_prototypes.hh"
 
diff --git a/source/blender/python/intern/bpy_rna_ui.cc b/source/blender/python/intern/bpy_rna_ui.cc
index 058334c8b53..a168c5e67e0 100644
--- a/source/blender/python/intern/bpy_rna_ui.cc
+++ b/source/blender/python/intern/bpy_rna_ui.cc
@@ -12,7 +12,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "UI_interface.hh"
 
diff --git a/source/blender/python/intern/bpy_utils_previews.cc b/source/blender/python/intern/bpy_utils_previews.cc
index 95f0d298e6c..bfef4bf26c6 100644
--- a/source/blender/python/intern/bpy_utils_previews.cc
+++ b/source/blender/python/intern/bpy_utils_previews.cc
@@ -22,7 +22,7 @@
 #include "bpy_rna.hh"
 #include "bpy_utils_previews.hh"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/python/intern/bpy_utils_units.cc b/source/blender/python/intern/bpy_utils_units.cc
index dbbf45a584f..68eb19e46c2 100644
--- a/source/blender/python/intern/bpy_utils_units.cc
+++ b/source/blender/python/intern/bpy_utils_units.cc
@@ -20,8 +20,8 @@
 
 #include "bpy_utils_units.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_compat.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_compat.hh"
 
 #include "BKE_unit.hh"
 
diff --git a/source/blender/python/mathutils/mathutils.cc b/source/blender/python/mathutils/mathutils.cc
index 977da6e85f0..ce88254400d 100644
--- a/source/blender/python/mathutils/mathutils.cc
+++ b/source/blender/python/mathutils/mathutils.cc
@@ -14,8 +14,8 @@
 #include "BLI_math_rotation.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #ifndef MATH_STANDALONE
 #  include "BLI_dynstr.h"
diff --git a/source/blender/python/mathutils/mathutils_Color.cc b/source/blender/python/mathutils/mathutils_Color.cc
index ddceb44d2aa..6737bd32b46 100644
--- a/source/blender/python/mathutils/mathutils_Color.cc
+++ b/source/blender/python/mathutils/mathutils_Color.cc
@@ -14,8 +14,8 @@
 
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #ifndef MATH_STANDALONE
 #  include "IMB_colormanagement.hh"
diff --git a/source/blender/python/mathutils/mathutils_Euler.cc b/source/blender/python/mathutils/mathutils_Euler.cc
index 2f97378188f..fa8a44fbfe8 100644
--- a/source/blender/python/mathutils/mathutils_Euler.cc
+++ b/source/blender/python/mathutils/mathutils_Euler.cc
@@ -12,8 +12,8 @@
 
 #include "mathutils.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
diff --git a/source/blender/python/mathutils/mathutils_Matrix.cc b/source/blender/python/mathutils/mathutils_Matrix.cc
index 711c7ae7d63..86530d598e2 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.cc
+++ b/source/blender/python/mathutils/mathutils_Matrix.cc
@@ -17,8 +17,8 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #ifndef MATH_STANDALONE
 #  include "BLI_dynstr.h"
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.cc b/source/blender/python/mathutils/mathutils_Quaternion.cc
index f50a6af463a..fb1769894bd 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.cc
+++ b/source/blender/python/mathutils/mathutils_Quaternion.cc
@@ -18,8 +18,8 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #ifndef MATH_STANDALONE
 #  include "BLI_dynstr.h"
diff --git a/source/blender/python/mathutils/mathutils_Vector.cc b/source/blender/python/mathutils/mathutils_Vector.cc
index 0b006c55282..3ddeaaed944 100644
--- a/source/blender/python/mathutils/mathutils_Vector.cc
+++ b/source/blender/python/mathutils/mathutils_Vector.cc
@@ -18,7 +18,7 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #ifndef MATH_STANDALONE
 #  include "BLI_dynstr.h"
diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc
index d8727a49fd3..33f30d0280a 100644
--- a/source/blender/python/mathutils/mathutils_bvhtree.cc
+++ b/source/blender/python/mathutils/mathutils_bvhtree.cc
@@ -24,8 +24,8 @@
 
 #include "BKE_bvhutils.hh"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "mathutils.hh"
 #include "mathutils_bvhtree.hh" /* own include */
diff --git a/source/blender/python/mathutils/mathutils_geometry.cc b/source/blender/python/mathutils/mathutils_geometry.cc
index 5e18ff0eed5..c5ddb069460 100644
--- a/source/blender/python/mathutils/mathutils_geometry.cc
+++ b/source/blender/python/mathutils/mathutils_geometry.cc
@@ -26,8 +26,8 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 /*-------------------------DOC STRINGS ---------------------------*/
 PyDoc_STRVAR(
diff --git a/source/blender/python/mathutils/mathutils_kdtree.cc b/source/blender/python/mathutils/mathutils_kdtree.cc
index 4231cbee402..3efa15da5f8 100644
--- a/source/blender/python/mathutils/mathutils_kdtree.cc
+++ b/source/blender/python/mathutils/mathutils_kdtree.cc
@@ -16,8 +16,8 @@
 #include "BLI_kdtree.h"
 #include "BLI_utildefines.h"
 
-#include "../generic/py_capi_utils.h"
-#include "../generic/python_utildefines.h"
+#include "../generic/py_capi_utils.hh"
+#include "../generic/python_utildefines.hh"
 
 #include "mathutils.hh"
 #include "mathutils_kdtree.hh" /* own include */
diff --git a/source/blender/python/mathutils/mathutils_noise.cc b/source/blender/python/mathutils/mathutils_noise.cc
index b3ddde5b38e..9b6b2533fa9 100644
--- a/source/blender/python/mathutils/mathutils_noise.cc
+++ b/source/blender/python/mathutils/mathutils_noise.cc
@@ -21,7 +21,7 @@
 
 #include "DNA_texture_types.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 
 #include "mathutils.hh"
 #include "mathutils_noise.hh"
diff --git a/source/blender/render/hydra/python.cc b/source/blender/render/hydra/python.cc
index 8c5f5ea3c6f..1ce7e4ebf22 100644
--- a/source/blender/render/hydra/python.cc
+++ b/source/blender/render/hydra/python.cc
@@ -10,7 +10,7 @@
 
 #include "RE_engine.h"
 
-#include "../generic/py_capi_utils.h"
+#include "../generic/py_capi_utils.hh"
 #include "bpy_rna.hh"
 
 #include "BKE_context.hh"