diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 4ea121492e2..22b3c052511 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -218,6 +218,7 @@ else()
   harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
   harvest(embree/include embree/include "*.h")
   harvest(embree/lib embree/lib "*.a")
+  harvest(embree/lib embree/lib "*${SHAREDLIBEXT}*")
   harvest(openpgl/include openpgl/include "*.h")
   harvest(openpgl/lib openpgl/lib "*.a")
   harvest(openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION} openpgl/lib/cmake/openpgl "*.cmake")
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 876a8307dcb..1b3f41d75d0 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1853,8 +1853,6 @@ def pyrna2sphinx(basepath):
                 fw("   %s\n\n" % operator_description)
                 for prop in op.args:
                     write_param("   ", fw, prop)
-                if op.args:
-                    fw("\n")
 
                 location = op.get_location()
                 if location != (None, None):
@@ -1865,9 +1863,12 @@ def pyrna2sphinx(basepath):
                     else:
                         url_base = API_BASEURL
 
-                    fw("   :file:`%s\\:%d <%s/%s#L%d>`_\n\n" %
+                    fw("   :File: `%s\\:%d <%s/%s#L%d>`__\n\n" %
                        (location[0], location[1], url_base, location[0], location[1]))
 
+                if op.args:
+                    fw("\n")
+
             file.close()
 
     if "bpy.ops" not in EXCLUDE_MODULES:
diff --git a/extern/cuew/include/cuew.h b/extern/cuew/include/cuew.h
index 5979f48e43d..278fb1172ee 100644
--- a/extern/cuew/include/cuew.h
+++ b/extern/cuew/include/cuew.h
@@ -127,7 +127,7 @@ typedef uint32_t cuuint32_t;
 typedef uint64_t cuuint64_t;
 #endif
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__)
 typedef unsigned long long CUdeviceptr;
 #else
 typedef unsigned int CUdeviceptr;
diff --git a/extern/hipew/include/hipew.h b/extern/hipew/include/hipew.h
index 50f6d6607ec..1333efba951 100644
--- a/extern/hipew/include/hipew.h
+++ b/extern/hipew/include/hipew.h
@@ -84,7 +84,7 @@ typedef uint32_t hipuint32_t;
 typedef uint64_t hipuint64_t;
 #endif
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__)
 typedef unsigned long long hipDeviceptr_t;
 #else
 typedef unsigned int hipDeviceptr_t;
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 60f17589fac..89181b0eb7e 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -51,6 +51,12 @@ if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
 endif()
 
 if(WITH_USD)
+  # Silence warning from USD headers using deprecated TBB header.
+  add_definitions(
+    -D__TBB_show_deprecation_message_atomic_H
+    -D__TBB_show_deprecation_message_task_H
+  )
+
   list(APPEND INC_SYS
     ${USD_INCLUDE_DIRS}
   )
diff --git a/intern/cycles/device/metal/kernel.mm b/intern/cycles/device/metal/kernel.mm
index 8e092a3ebc5..ea0fb6ef3f4 100644
--- a/intern/cycles/device/metal/kernel.mm
+++ b/intern/cycles/device/metal/kernel.mm
@@ -445,12 +445,10 @@ void MetalKernelPipeline::compile()
   const std::string function_name = std::string("cycles_metal_") +
                                     device_kernel_as_string(device_kernel);
 
-  NSString *entryPoint = [@(function_name.c_str()) copy];
-
   NSError *error = NULL;
   if (@available(macOS 11.0, *)) {
     MTLFunctionDescriptor *func_desc = [MTLIntersectionFunctionDescriptor functionDescriptor];
-    func_desc.name = entryPoint;
+    func_desc.name = [@(function_name.c_str()) copy];
 
     if (pso_type != PSO_GENERIC) {
       func_desc.constantValues = GetConstantValues(&kernel_data_);
@@ -462,8 +460,6 @@ void MetalKernelPipeline::compile()
     function = [mtlLibrary newFunctionWithDescriptor:func_desc error:&error];
   }
 
-  [entryPoint release];
-
   if (function == nil) {
     NSString *err = [error localizedDescription];
     string errors = [err UTF8String];
@@ -471,7 +467,7 @@ void MetalKernelPipeline::compile()
     return;
   }
 
-  function.label = [entryPoint copy];
+  function.label = [@(function_name.c_str()) copy];
 
   if (use_metalrt) {
     if (@available(macOS 11.0, *)) {
diff --git a/intern/cycles/hydra/CMakeLists.txt b/intern/cycles/hydra/CMakeLists.txt
index 0dde44cf8a2..c608de1a108 100644
--- a/intern/cycles/hydra/CMakeLists.txt
+++ b/intern/cycles/hydra/CMakeLists.txt
@@ -80,6 +80,12 @@ if(EXISTS ${USD_INCLUDE_DIR}/pxr/imaging/hgiGL)
   list(APPEND SRC_HD_CYCLES_HEADERS display_driver.h)
 endif()
 
+# Silence warning from USD headers using deprecated TBB header.
+add_definitions(
+  -D__TBB_show_deprecation_message_atomic_H
+  -D__TBB_show_deprecation_message_task_H
+)
+
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
diff --git a/intern/cycles/hydra/display_driver.cpp b/intern/cycles/hydra/display_driver.cpp
index df624637d8c..484d6ce06ba 100644
--- a/intern/cycles/hydra/display_driver.cpp
+++ b/intern/cycles/hydra/display_driver.cpp
@@ -4,6 +4,12 @@
 
 #ifdef _WIN32
 // Include first to avoid "NOGDI" definition set in Cycles headers
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
 #  include <Windows.h>
 #endif
 
diff --git a/intern/cycles/hydra/node_util.cpp b/intern/cycles/hydra/node_util.cpp
index 2fc16bba731..18eae5a2f8a 100644
--- a/intern/cycles/hydra/node_util.cpp
+++ b/intern/cycles/hydra/node_util.cpp
@@ -370,6 +370,16 @@ VtValue convertFromCyclesArray(const array<SrcType> &value)
   return VtValue(convertedValue);
 }
 
+template<> VtValue convertFromCyclesArray<float2, GfVec2f>(const array<float2> &value)
+{
+  VtVec2fArray convertedValue;
+  convertedValue.reserve(value.size());
+  for (const auto &element : value) {
+    convertedValue.push_back(GfVec2f(element.x, element.y));
+  }
+  return VtValue(convertedValue);
+}
+
 template<> VtValue convertFromCyclesArray<float3, GfVec3f>(const array<float3> &value)
 {
   VtVec3fArray convertedValue;
diff --git a/intern/cycles/kernel/svm/tex_coord.h b/intern/cycles/kernel/svm/tex_coord.h
index b294616603d..826b8625fdb 100644
--- a/intern/cycles/kernel/svm/tex_coord.h
+++ b/intern/cycles/kernel/svm/tex_coord.h
@@ -18,7 +18,7 @@ ccl_device_noinline int svm_node_tex_coord(KernelGlobals kg,
                                            uint4 node,
                                            int offset)
 {
-  float3 data;
+  float3 data = zero_float3();
   uint type = node.y;
   uint out_offset = node.z;
 
@@ -100,7 +100,7 @@ ccl_device_noinline int svm_node_tex_coord_bump_dx(KernelGlobals kg,
                                                    int offset)
 {
 #ifdef __RAY_DIFFERENTIALS__
-  float3 data;
+  float3 data = zero_float3();
   uint type = node.y;
   uint out_offset = node.z;
 
@@ -185,7 +185,7 @@ ccl_device_noinline int svm_node_tex_coord_bump_dy(KernelGlobals kg,
                                                    int offset)
 {
 #ifdef __RAY_DIFFERENTIALS__
-  float3 data;
+  float3 data = zero_float3();
   uint type = node.y;
   uint out_offset = node.z;
 
diff --git a/intern/cycles/scene/alembic.cpp b/intern/cycles/scene/alembic.cpp
index 672216341ba..3b88cd58f30 100644
--- a/intern/cycles/scene/alembic.cpp
+++ b/intern/cycles/scene/alembic.cpp
@@ -247,13 +247,16 @@ size_t CachedData::memory_used() const
 static M44d convert_yup_zup(const M44d &mtx, float scale_mult)
 {
   V3d scale, shear, rotation, translation;
-  extractSHRT(mtx,
-              scale,
-              shear,
-              rotation,
-              translation,
-              true,
-              IMATH_INTERNAL_NAMESPACE::Euler<double>::XZY);
+
+  if (!extractSHRT(mtx,
+                   scale,
+                   shear,
+                   rotation,
+                   translation,
+                   true,
+                   IMATH_INTERNAL_NAMESPACE::Euler<double>::XZY)) {
+    return mtx;
+  }
 
   M44d rot_mat, scale_mat, trans_mat;
   rot_mat.setEulerAngles(V3d(rotation.x, -rotation.z, rotation.y));
diff --git a/intern/cycles/scene/hair.cpp b/intern/cycles/scene/hair.cpp
index 47737baeff7..2dfa89344e3 100644
--- a/intern/cycles/scene/hair.cpp
+++ b/intern/cycles/scene/hair.cpp
@@ -531,7 +531,7 @@ PrimitiveType Hair::primitive_type() const
 
 /* Fill in coordinates for curve transparency shader evaluation on device. */
 static int fill_shader_input(const Hair *hair,
-                             const int object_index,
+                             const size_t object_index,
                              device_vector<KernelShaderEvalInput> &d_input)
 {
   int d_input_size = 0;
diff --git a/intern/cycles/scene/image.cpp b/intern/cycles/scene/image.cpp
index 441ccafd83a..3fbfcdd2c24 100644
--- a/intern/cycles/scene/image.cpp
+++ b/intern/cycles/scene/image.cpp
@@ -86,7 +86,7 @@ ImageHandle::ImageHandle(const ImageHandle &other)
     : tile_slots(other.tile_slots), manager(other.manager)
 {
   /* Increase image user count. */
-  foreach (const int slot, tile_slots) {
+  foreach (const size_t slot, tile_slots) {
     manager->add_image_user(slot);
   }
 }
@@ -97,7 +97,7 @@ ImageHandle &ImageHandle::operator=(const ImageHandle &other)
   manager = other.manager;
   tile_slots = other.tile_slots;
 
-  foreach (const int slot, tile_slots) {
+  foreach (const size_t slot, tile_slots) {
     manager->add_image_user(slot);
   }
 
@@ -111,7 +111,7 @@ ImageHandle::~ImageHandle()
 
 void ImageHandle::clear()
 {
-  foreach (const int slot, tile_slots) {
+  foreach (const size_t slot, tile_slots) {
     manager->remove_image_user(slot);
   }
 
@@ -165,7 +165,7 @@ vector<int4> ImageHandle::get_svm_slots() const
   for (size_t i = 0; i < num_nodes; i++) {
     int4 node;
 
-    int slot = tile_slots[2 * i];
+    size_t slot = tile_slots[2 * i];
     node.x = manager->images[slot]->loader->get_tile_number();
     node.y = slot;
 
@@ -387,7 +387,7 @@ void ImageManager::load_image_metadata(Image *img)
 
 ImageHandle ImageManager::add_image(const string &filename, const ImageParams &params)
 {
-  const int slot = add_image_slot(new OIIOImageLoader(filename), params, false);
+  const size_t slot = add_image_slot(new OIIOImageLoader(filename), params, false);
 
   ImageHandle handle;
   handle.tile_slots.push_back(slot);
@@ -408,13 +408,13 @@ ImageHandle ImageManager::add_image(const string &filename,
     /* Since we don't have information about the exact tile format used in this code location,
      * just attempt all replacement patterns that Blender supports. */
     if (tile != 0) {
-      string_replace(tile_filename, "<UDIM>", string_printf("%04d", tile));
+      string_replace(tile_filename, "<UDIM>", string_printf("%04d", (int)tile));
 
       int u = ((tile - 1001) % 10);
       int v = ((tile - 1001) / 10);
       string_replace(tile_filename, "<UVTILE>", string_printf("u%d_v%d", u + 1, v + 1));
     }
-    const int slot = add_image_slot(new OIIOImageLoader(tile_filename), params, false);
+    const size_t slot = add_image_slot(new OIIOImageLoader(tile_filename), params, false);
     handle.tile_slots.push_back(slot);
   }
 
@@ -425,7 +425,7 @@ ImageHandle ImageManager::add_image(ImageLoader *loader,
                                     const ImageParams &params,
                                     const bool builtin)
 {
-  const int slot = add_image_slot(loader, params, builtin);
+  const size_t slot = add_image_slot(loader, params, builtin);
 
   ImageHandle handle;
   handle.tile_slots.push_back(slot);
@@ -438,7 +438,7 @@ ImageHandle ImageManager::add_image(const vector<ImageLoader *> &loaders,
 {
   ImageHandle handle;
   for (ImageLoader *loader : loaders) {
-    const int slot = add_image_slot(loader, params, true);
+    const size_t slot = add_image_slot(loader, params, true);
     handle.tile_slots.push_back(slot);
   }
 
@@ -446,9 +446,9 @@ ImageHandle ImageManager::add_image(const vector<ImageLoader *> &loaders,
   return handle;
 }
 
-int ImageManager::add_image_slot(ImageLoader *loader,
-                                 const ImageParams &params,
-                                 const bool builtin)
+size_t ImageManager::add_image_slot(ImageLoader *loader,
+                                    const ImageParams &params,
+                                    const bool builtin)
 {
   Image *img;
   size_t slot;
@@ -492,7 +492,7 @@ int ImageManager::add_image_slot(ImageLoader *loader,
   return slot;
 }
 
-void ImageManager::add_image_user(int slot)
+void ImageManager::add_image_user(size_t slot)
 {
   thread_scoped_lock device_lock(images_mutex);
   Image *image = images[slot];
@@ -501,7 +501,7 @@ void ImageManager::add_image_user(int slot)
   image->users++;
 }
 
-void ImageManager::remove_image_user(int slot)
+void ImageManager::remove_image_user(size_t slot)
 {
   thread_scoped_lock device_lock(images_mutex);
   Image *image = images[slot];
@@ -682,7 +682,7 @@ bool ImageManager::file_load_image(Image *img, int texture_limit)
   return true;
 }
 
-void ImageManager::device_load_image(Device *device, Scene *scene, int slot, Progress *progress)
+void ImageManager::device_load_image(Device *device, Scene *scene, size_t slot, Progress *progress)
 {
   if (progress->get_cancel()) {
     return;
@@ -698,7 +698,7 @@ void ImageManager::device_load_image(Device *device, Scene *scene, int slot, Pro
   ImageDataType type = img->metadata.type;
 
   /* Name for debugging. */
-  img->mem_name = string_printf("tex_image_%s_%03d", name_from_type(type), slot);
+  img->mem_name = string_printf("tex_image_%s_%03d", name_from_type(type), (int)slot);
 
   /* Free previous texture in slot. */
   if (img->mem) {
@@ -819,7 +819,7 @@ void ImageManager::device_load_image(Device *device, Scene *scene, int slot, Pro
   img->need_load = false;
 }
 
-void ImageManager::device_free_image(Device *, int slot)
+void ImageManager::device_free_image(Device *, size_t slot)
 {
   Image *img = images[slot];
   if (img == NULL) {
@@ -874,7 +874,10 @@ void ImageManager::device_update(Device *device, Scene *scene, Progress &progres
   need_update_ = false;
 }
 
-void ImageManager::device_update_slot(Device *device, Scene *scene, int slot, Progress *progress)
+void ImageManager::device_update_slot(Device *device,
+                                      Scene *scene,
+                                      size_t slot,
+                                      Progress *progress)
 {
   Image *img = images[slot];
   assert(img != NULL);
diff --git a/intern/cycles/scene/image.h b/intern/cycles/scene/image.h
index 36bfe17a69d..e574c5acbf5 100644
--- a/intern/cycles/scene/image.h
+++ b/intern/cycles/scene/image.h
@@ -156,7 +156,7 @@ class ImageHandle {
   ImageManager *get_manager() const;
 
  protected:
-  vector<int> tile_slots;
+  vector<size_t> tile_slots;
   ImageManager *manager;
 
   friend class ImageManager;
@@ -179,7 +179,7 @@ class ImageManager {
   ImageHandle add_image(const vector<ImageLoader *> &loaders, const ImageParams &params);
 
   void device_update(Device *device, Scene *scene, Progress &progress);
-  void device_update_slot(Device *device, Scene *scene, int slot, Progress *progress);
+  void device_update_slot(Device *device, Scene *scene, size_t slot, Progress *progress);
   void device_free(Device *device);
 
   void device_load_builtin(Device *device, Scene *scene, Progress &progress);
@@ -223,17 +223,17 @@ class ImageManager {
   vector<Image *> images;
   void *osl_texture_system;
 
-  int add_image_slot(ImageLoader *loader, const ImageParams &params, const bool builtin);
-  void add_image_user(int slot);
-  void remove_image_user(int slot);
+  size_t add_image_slot(ImageLoader *loader, const ImageParams &params, const bool builtin);
+  void add_image_user(size_t slot);
+  void remove_image_user(size_t slot);
 
   void load_image_metadata(Image *img);
 
   template<TypeDesc::BASETYPE FileFormat, typename StorageType>
   bool file_load_image(Image *img, int texture_limit);
 
-  void device_load_image(Device *device, Scene *scene, int slot, Progress *progress);
-  void device_free_image(Device *device, int slot);
+  void device_load_image(Device *device, Scene *scene, size_t slot, Progress *progress);
+  void device_free_image(Device *device, size_t slot);
 
   friend class ImageHandle;
 };
diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp
index 974b2144a76..862c204ae35 100644
--- a/intern/cycles/scene/light.cpp
+++ b/intern/cycles/scene/light.cpp
@@ -264,9 +264,9 @@ void LightManager::device_update_distribution(Device *,
 
     /* Count emissive triangles. */
     Mesh *mesh = static_cast<Mesh *>(object->get_geometry());
-    size_t mesh_num_triangles = mesh->num_triangles();
+    int mesh_num_triangles = static_cast<int>(mesh->num_triangles());
 
-    for (size_t i = 0; i < mesh_num_triangles; i++) {
+    for (int i = 0; i < mesh_num_triangles; i++) {
       int shader_index = mesh->get_shader()[i];
       Shader *shader = (shader_index < mesh->get_used_shaders().size()) ?
                            static_cast<Shader *>(mesh->get_used_shaders()[shader_index]) :
diff --git a/intern/cycles/scene/mesh_displace.cpp b/intern/cycles/scene/mesh_displace.cpp
index cdd5a793530..a9f97f31df5 100644
--- a/intern/cycles/scene/mesh_displace.cpp
+++ b/intern/cycles/scene/mesh_displace.cpp
@@ -35,7 +35,7 @@ static float3 compute_face_normal(const Mesh::Triangle &t, float3 *verts)
 /* Fill in coordinates for mesh displacement shader evaluation on device. */
 static int fill_shader_input(const Scene *scene,
                              const Mesh *mesh,
-                             const int object_index,
+                             const size_t object_index,
                              device_vector<KernelShaderEvalInput> &d_input)
 {
   int d_input_size = 0;
diff --git a/intern/cycles/util/half.h b/intern/cycles/util/half.h
index 48c15872e31..9725ce509f6 100644
--- a/intern/cycles/util/half.h
+++ b/intern/cycles/util/half.h
@@ -40,7 +40,7 @@ ccl_device_inline float half_to_float(half h_in)
  * unsigned shorts. */
 class half {
  public:
-  half() : v(0) {}
+  half() = default;
   half(const unsigned short &i) : v(i) {}
   operator unsigned short()
   {
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index f1b3ec87a83..b5d3c4f16a6 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -14,62 +14,62 @@ set(INC_SYS
 )
 
 set(SRC
-  intern/GHOST_Buttons.cpp
-  intern/GHOST_C-api.cpp
-  intern/GHOST_CallbackEventConsumer.cpp
-  intern/GHOST_Context.cpp
-  intern/GHOST_ContextNone.cpp
-  intern/GHOST_DisplayManager.cpp
-  intern/GHOST_EventManager.cpp
-  intern/GHOST_ISystem.cpp
-  intern/GHOST_ISystemPaths.cpp
-  intern/GHOST_ModifierKeys.cpp
-  intern/GHOST_Path-api.cpp
-  intern/GHOST_PathUtils.cpp
-  intern/GHOST_Rect.cpp
-  intern/GHOST_System.cpp
-  intern/GHOST_TimerManager.cpp
-  intern/GHOST_Window.cpp
-  intern/GHOST_WindowManager.cpp
+  intern/GHOST_Buttons.cc
+  intern/GHOST_C-api.cc
+  intern/GHOST_CallbackEventConsumer.cc
+  intern/GHOST_Context.cc
+  intern/GHOST_ContextNone.cc
+  intern/GHOST_DisplayManager.cc
+  intern/GHOST_EventManager.cc
+  intern/GHOST_ISystem.cc
+  intern/GHOST_ISystemPaths.cc
+  intern/GHOST_ModifierKeys.cc
+  intern/GHOST_Path-api.cc
+  intern/GHOST_PathUtils.cc
+  intern/GHOST_Rect.cc
+  intern/GHOST_System.cc
+  intern/GHOST_TimerManager.cc
+  intern/GHOST_Window.cc
+  intern/GHOST_WindowManager.cc
 
   GHOST_C-api.h
-  GHOST_IContext.h
-  GHOST_IEvent.h
-  GHOST_IEventConsumer.h
-  GHOST_ISystem.h
-  GHOST_ISystemPaths.h
-  GHOST_ITimerTask.h
-  GHOST_IWindow.h
-  GHOST_Path-api.h
-  GHOST_Rect.h
+  GHOST_IContext.hh
+  GHOST_IEvent.hh
+  GHOST_IEventConsumer.hh
+  GHOST_ISystem.hh
+  GHOST_ISystemPaths.hh
+  GHOST_ITimerTask.hh
+  GHOST_IWindow.hh
+  GHOST_Path-api.hh
+  GHOST_Rect.hh
   GHOST_Types.h
 
-  intern/GHOST_Buttons.h
-  intern/GHOST_CallbackEventConsumer.h
-  intern/GHOST_Context.h
-  intern/GHOST_ContextNone.h
-  intern/GHOST_Debug.h
-  intern/GHOST_DisplayManager.h
-  intern/GHOST_Event.h
-  intern/GHOST_EventButton.h
-  intern/GHOST_EventCursor.h
-  intern/GHOST_EventDragnDrop.h
-  intern/GHOST_EventKey.h
-  intern/GHOST_EventManager.h
-  intern/GHOST_EventString.h
-  intern/GHOST_EventTrackpad.h
-  intern/GHOST_EventWheel.h
-  intern/GHOST_ModifierKeys.h
-  intern/GHOST_PathUtils.h
-  intern/GHOST_System.h
-  intern/GHOST_SystemPaths.h
-  intern/GHOST_TimerManager.h
-  intern/GHOST_TimerTask.h
-  intern/GHOST_Util.h
-  intern/GHOST_Window.h
-  intern/GHOST_WindowManager.h
-  intern/GHOST_utildefines.h
-  intern/GHOST_utildefines_variadic.h
+  intern/GHOST_Buttons.hh
+  intern/GHOST_CallbackEventConsumer.hh
+  intern/GHOST_Context.hh
+  intern/GHOST_ContextNone.hh
+  intern/GHOST_Debug.hh
+  intern/GHOST_DisplayManager.hh
+  intern/GHOST_Event.hh
+  intern/GHOST_EventButton.hh
+  intern/GHOST_EventCursor.hh
+  intern/GHOST_EventDragnDrop.hh
+  intern/GHOST_EventKey.hh
+  intern/GHOST_EventManager.hh
+  intern/GHOST_EventString.hh
+  intern/GHOST_EventTrackpad.hh
+  intern/GHOST_EventWheel.hh
+  intern/GHOST_ModifierKeys.hh
+  intern/GHOST_PathUtils.hh
+  intern/GHOST_System.hh
+  intern/GHOST_SystemPaths.hh
+  intern/GHOST_TimerManager.hh
+  intern/GHOST_TimerTask.hh
+  intern/GHOST_Util.hh
+  intern/GHOST_Window.hh
+  intern/GHOST_WindowManager.hh
+  intern/GHOST_utildefines.hh
+  intern/GHOST_utildefines_variadic.hh
 )
 
 set(LIB
@@ -78,9 +78,9 @@ set(LIB
 
 if(WITH_VULKAN_BACKEND)
   list(APPEND SRC
-    intern/GHOST_ContextVK.cpp
+    intern/GHOST_ContextVK.cc
 
-    intern/GHOST_ContextVK.h
+    intern/GHOST_ContextVK.hh
   )
 
   list(APPEND INC_SYS
@@ -98,9 +98,9 @@ endif()
 
 if(WITH_GHOST_DEBUG)
   list(APPEND SRC
-    intern/GHOST_EventPrinter.cpp
+    intern/GHOST_EventPrinter.cc
 
-    intern/GHOST_EventPrinter.h
+    intern/GHOST_EventPrinter.hh
   )
   add_definitions(-DWITH_GHOST_DEBUG)
 endif()
@@ -109,10 +109,10 @@ if(WITH_INPUT_NDOF)
   add_definitions(-DWITH_INPUT_NDOF)
 
   list(APPEND SRC
-    intern/GHOST_NDOFManager.cpp
+    intern/GHOST_NDOFManager.cc
 
-    intern/GHOST_EventNDOF.h
-    intern/GHOST_NDOFManager.h
+    intern/GHOST_EventNDOF.hh
+    intern/GHOST_NDOFManager.hh
   )
 
   list(APPEND INC_SYS
@@ -124,24 +124,24 @@ if(WITH_INPUT_NDOF)
 endif()
 
 list(APPEND SRC
-  intern/GHOST_DisplayManagerNULL.h
-  intern/GHOST_SystemHeadless.h
-  intern/GHOST_WindowNULL.h
+  intern/GHOST_DisplayManagerNULL.hh
+  intern/GHOST_SystemHeadless.hh
+  intern/GHOST_WindowNULL.hh
 )
 
 if(WITH_HEADLESS)
   add_definitions(-DWITH_HEADLESS)
 elseif(WITH_GHOST_SDL)
   list(APPEND SRC
-    intern/GHOST_ContextSDL.cpp
-    intern/GHOST_DisplayManagerSDL.cpp
-    intern/GHOST_SystemSDL.cpp
-    intern/GHOST_WindowSDL.cpp
+    intern/GHOST_ContextSDL.cc
+    intern/GHOST_DisplayManagerSDL.cc
+    intern/GHOST_SystemSDL.cc
+    intern/GHOST_WindowSDL.cc
 
-    intern/GHOST_ContextSDL.h
-    intern/GHOST_DisplayManagerSDL.h
-    intern/GHOST_SystemSDL.h
-    intern/GHOST_WindowSDL.h
+    intern/GHOST_ContextSDL.hh
+    intern/GHOST_DisplayManagerSDL.hh
+    intern/GHOST_SystemSDL.hh
+    intern/GHOST_WindowSDL.hh
   )
   add_definitions(-DWITH_GHOST_SDL)
 
@@ -167,23 +167,23 @@ elseif(APPLE AND NOT WITH_GHOST_X11)
     intern/GHOST_SystemCocoa.mm
     intern/GHOST_WindowCocoa.mm
 
-    intern/GHOST_DisplayManagerCocoa.h
-    intern/GHOST_SystemCocoa.h
-    intern/GHOST_WindowCocoa.h
-    intern/GHOST_WindowViewCocoa.h
+    intern/GHOST_DisplayManagerCocoa.hh
+    intern/GHOST_SystemCocoa.hh
+    intern/GHOST_WindowCocoa.hh
+    intern/GHOST_WindowViewCocoa.hh
   )
 
   list(APPEND SRC
     intern/GHOST_ContextCGL.mm
 
-    intern/GHOST_ContextCGL.h
+    intern/GHOST_ContextCGL.hh
   )
 
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
       intern/GHOST_NDOFManagerCocoa.mm
 
-      intern/GHOST_NDOFManagerCocoa.h
+      intern/GHOST_NDOFManagerCocoa.hh
     )
   endif()
 
@@ -199,22 +199,22 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
     )
 
     list(APPEND SRC
-      intern/GHOST_DisplayManagerX11.cpp
-      intern/GHOST_SystemX11.cpp
-      intern/GHOST_TaskbarX11.cpp
-      intern/GHOST_WindowX11.cpp
+      intern/GHOST_DisplayManagerX11.cc
+      intern/GHOST_SystemX11.cc
+      intern/GHOST_TaskbarX11.cc
+      intern/GHOST_WindowX11.cc
 
-      intern/GHOST_DisplayManagerX11.h
-      intern/GHOST_IconX11.h
-      intern/GHOST_SystemX11.h
-      intern/GHOST_TaskbarX11.h
-      intern/GHOST_WindowX11.h
+      intern/GHOST_DisplayManagerX11.hh
+      intern/GHOST_IconX11.hh
+      intern/GHOST_SystemX11.hh
+      intern/GHOST_TaskbarX11.hh
+      intern/GHOST_WindowX11.hh
     )
 
     list(APPEND SRC
-      intern/GHOST_ContextGLX.cpp
+      intern/GHOST_ContextGLX.cc
 
-      intern/GHOST_ContextGLX.h
+      intern/GHOST_ContextGLX.hh
     )
 
     if(WITH_GHOST_XDND)
@@ -229,9 +229,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       )
 
       list(APPEND SRC
-        intern/GHOST_DropTargetX11.cpp
+        intern/GHOST_DropTargetX11.cc
 
-        intern/GHOST_DropTargetX11.h
+        intern/GHOST_DropTargetX11.hh
       )
     endif()
 
@@ -336,13 +336,13 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
     endif()
 
     list(APPEND SRC
-      intern/GHOST_SystemWayland.cpp
-      intern/GHOST_WindowWayland.cpp
+      intern/GHOST_SystemWayland.cc
+      intern/GHOST_WindowWayland.cc
 
-      intern/GHOST_SystemWayland.h
-      intern/GHOST_WaylandCursorSettings.h
-      intern/GHOST_WaylandUtils.h
-      intern/GHOST_WindowWayland.h
+      intern/GHOST_SystemWayland.hh
+      intern/GHOST_WaylandCursorSettings.hh
+      intern/GHOST_WaylandUtils.hh
+      intern/GHOST_WindowWayland.hh
     )
 
     set(INC_DST ${CMAKE_CURRENT_BINARY_DIR}/libwayland)
@@ -441,9 +441,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
 
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
-      intern/GHOST_NDOFManagerUnix.cpp
+      intern/GHOST_NDOFManagerUnix.cc
 
-      intern/GHOST_NDOFManagerUnix.h
+      intern/GHOST_NDOFManagerUnix.hh
     )
   endif()
 
@@ -463,67 +463,67 @@ elseif(WIN32)
   )
 
   list(APPEND SRC
-    intern/GHOST_ContextD3D.cpp
-    intern/GHOST_DisplayManagerWin32.cpp
-    intern/GHOST_DropTargetWin32.cpp
-    intern/GHOST_SystemWin32.cpp
-    intern/GHOST_TrackpadWin32.cpp
-    intern/GHOST_WindowWin32.cpp
-    intern/GHOST_Wintab.cpp
+    intern/GHOST_ContextD3D.cc
+    intern/GHOST_DisplayManagerWin32.cc
+    intern/GHOST_DropTargetWin32.cc
+    intern/GHOST_SystemWin32.cc
+    intern/GHOST_TrackpadWin32.cc
+    intern/GHOST_WindowWin32.cc
+    intern/GHOST_Wintab.cc
 
-    intern/GHOST_ContextD3D.h
-    intern/GHOST_DisplayManagerWin32.h
-    intern/GHOST_DropTargetWin32.h
-    intern/GHOST_SystemWin32.h
-    intern/GHOST_TaskbarWin32.h
-    intern/GHOST_TrackpadWin32.h
-    intern/GHOST_WindowWin32.h
-    intern/GHOST_Wintab.h
+    intern/GHOST_ContextD3D.hh
+    intern/GHOST_DisplayManagerWin32.hh
+    intern/GHOST_DropTargetWin32.hh
+    intern/GHOST_SystemWin32.hh
+    intern/GHOST_TaskbarWin32.hh
+    intern/GHOST_TrackpadWin32.hh
+    intern/GHOST_WindowWin32.hh
+    intern/GHOST_Wintab.hh
   )
 
   list(APPEND SRC
-    intern/GHOST_ContextWGL.cpp
+    intern/GHOST_ContextWGL.cc
 
-    intern/GHOST_ContextWGL.h
+    intern/GHOST_ContextWGL.hh
   )
 
   if(WITH_INPUT_IME)
     add_definitions(-DWITH_INPUT_IME)
 
     list(APPEND SRC
-      intern/GHOST_ImeWin32.cpp
+      intern/GHOST_ImeWin32.cc
 
-      intern/GHOST_ImeWin32.h
+      intern/GHOST_ImeWin32.hh
     )
   endif()
 
   if(WITH_INPUT_NDOF)
     list(APPEND SRC
-      intern/GHOST_NDOFManagerWin32.cpp
+      intern/GHOST_NDOFManagerWin32.cc
 
-      intern/GHOST_NDOFManagerWin32.h
+      intern/GHOST_NDOFManagerWin32.hh
     )
   endif()
 endif()
 
 if(UNIX AND NOT APPLE)
   list(APPEND SRC
-    intern/GHOST_ContextEGL.cpp
+    intern/GHOST_ContextEGL.cc
 
-    intern/GHOST_ContextEGL.h
+    intern/GHOST_ContextEGL.hh
   )
 endif()
 
 if(APPLE)
   list(APPEND SRC
-    intern/GHOST_SystemPathsCocoa.h
+    intern/GHOST_SystemPathsCocoa.hh
     intern/GHOST_SystemPathsCocoa.mm
   )
 
 elseif(UNIX)
   list(APPEND SRC
-    intern/GHOST_SystemPathsUnix.cpp
-    intern/GHOST_SystemPathsUnix.h
+    intern/GHOST_SystemPathsUnix.cc
+    intern/GHOST_SystemPathsUnix.hh
   )
 
   if(NOT WITH_INSTALL_PORTABLE)
@@ -532,8 +532,8 @@ elseif(UNIX)
 
 elseif(WIN32)
   list(APPEND SRC
-    intern/GHOST_SystemPathsWin32.cpp
-    intern/GHOST_SystemPathsWin32.h
+    intern/GHOST_SystemPathsWin32.cc
+    intern/GHOST_SystemPathsWin32.hh
   )
 
   list(APPEND INC
@@ -544,25 +544,25 @@ endif()
 
 if(WITH_XR_OPENXR)
   list(APPEND SRC
-    intern/GHOST_Xr.cpp
-    intern/GHOST_XrAction.cpp
-    intern/GHOST_XrContext.cpp
-    intern/GHOST_XrControllerModel.cpp
-    intern/GHOST_XrEvent.cpp
-    intern/GHOST_XrGraphicsBinding.cpp
-    intern/GHOST_XrSession.cpp
-    intern/GHOST_XrSwapchain.cpp
+    intern/GHOST_Xr.cc
+    intern/GHOST_XrAction.cc
+    intern/GHOST_XrContext.cc
+    intern/GHOST_XrControllerModel.cc
+    intern/GHOST_XrEvent.cc
+    intern/GHOST_XrGraphicsBinding.cc
+    intern/GHOST_XrSession.cc
+    intern/GHOST_XrSwapchain.cc
 
-    GHOST_IXrContext.h
-    intern/GHOST_IXrGraphicsBinding.h
-    intern/GHOST_XrAction.h
-    intern/GHOST_XrContext.h
-    intern/GHOST_XrControllerModel.h
-    intern/GHOST_XrException.h
-    intern/GHOST_XrSession.h
-    intern/GHOST_XrSwapchain.h
-    intern/GHOST_Xr_intern.h
-    intern/GHOST_Xr_openxr_includes.h
+    GHOST_IXrContext.hh
+    intern/GHOST_IXrGraphicsBinding.hh
+    intern/GHOST_XrAction.hh
+    intern/GHOST_XrContext.hh
+    intern/GHOST_XrControllerModel.hh
+    intern/GHOST_XrException.hh
+    intern/GHOST_XrSession.hh
+    intern/GHOST_XrSwapchain.hh
+    intern/GHOST_Xr_intern.hh
+    intern/GHOST_Xr_openxr_includes.hh
 
     # Header only library.
     ../../extern/tinygltf/tiny_gltf.h
diff --git a/intern/ghost/GHOST_IContext.h b/intern/ghost/GHOST_IContext.hh
similarity index 100%
rename from intern/ghost/GHOST_IContext.h
rename to intern/ghost/GHOST_IContext.hh
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.hh
similarity index 100%
rename from intern/ghost/GHOST_IEvent.h
rename to intern/ghost/GHOST_IEvent.hh
diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.hh
similarity index 97%
rename from intern/ghost/GHOST_IEventConsumer.h
rename to intern/ghost/GHOST_IEventConsumer.hh
index eb07a3fde05..c9d111ca499 100644
--- a/intern/ghost/GHOST_IEventConsumer.h
+++ b/intern/ghost/GHOST_IEventConsumer.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IEvent.h"
+#include "GHOST_IEvent.hh"
 
 /**
  * Interface class for objects interested in receiving events.
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.hh
similarity index 98%
rename from intern/ghost/GHOST_ISystem.h
rename to intern/ghost/GHOST_ISystem.hh
index 83828fb43c6..de36dd19e93 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.hh
@@ -12,9 +12,9 @@
 
 #include <stdlib.h>
 
-#include "GHOST_IContext.h"
-#include "GHOST_ITimerTask.h"
-#include "GHOST_IWindow.h"
+#include "GHOST_IContext.hh"
+#include "GHOST_ITimerTask.hh"
+#include "GHOST_IWindow.hh"
 #include "GHOST_Types.h"
 
 class GHOST_IEventConsumer;
@@ -77,12 +77,12 @@ class GHOST_IEventConsumer;
  *
  * \subsection cplusplus_api The C++ API consists of the following files:
  *
- * - GHOST_IEvent.h
- * - GHOST_IEventConsumer.h
- * - GHOST_ISystem.h
- * - GHOST_ITimerTask.h
- * - GHOST_IWindow.h
- * - GHOST_Rect.h
+ * - GHOST_IEvent.hh
+ * - GHOST_IEventConsumer.hh
+ * - GHOST_ISystem.hh
+ * - GHOST_ITimerTask.hh
+ * - GHOST_IWindow.hh
+ * - GHOST_Rect.hh
  * - GHOST_Types.h
  *
  * For an example of using the C++-API, have a look at the GHOST_C-Test.cpp
diff --git a/intern/ghost/GHOST_ISystemPaths.h b/intern/ghost/GHOST_ISystemPaths.hh
similarity index 100%
rename from intern/ghost/GHOST_ISystemPaths.h
rename to intern/ghost/GHOST_ISystemPaths.hh
diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.hh
similarity index 100%
rename from intern/ghost/GHOST_ITimerTask.h
rename to intern/ghost/GHOST_ITimerTask.hh
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.hh
similarity index 99%
rename from intern/ghost/GHOST_IWindow.h
rename to intern/ghost/GHOST_IWindow.hh
index a8092c40ea7..dfbc3ef76c6 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Rect.h"
+#include "GHOST_Rect.hh"
 #include "GHOST_Types.h"
 
 #include <stdlib.h>
diff --git a/intern/ghost/GHOST_IXrContext.h b/intern/ghost/GHOST_IXrContext.hh
similarity index 100%
rename from intern/ghost/GHOST_IXrContext.h
rename to intern/ghost/GHOST_IXrContext.hh
diff --git a/intern/ghost/GHOST_Path-api.h b/intern/ghost/GHOST_Path-api.hh
similarity index 100%
rename from intern/ghost/GHOST_Path-api.h
rename to intern/ghost/GHOST_Path-api.hh
diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.hh
similarity index 100%
rename from intern/ghost/GHOST_Rect.h
rename to intern/ghost/GHOST_Rect.hh
diff --git a/intern/ghost/intern/GHOST_Buttons.cpp b/intern/ghost/intern/GHOST_Buttons.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_Buttons.cpp
rename to intern/ghost/intern/GHOST_Buttons.cc
index a5b3a8fb524..96aa361293b 100644
--- a/intern/ghost/intern/GHOST_Buttons.cpp
+++ b/intern/ghost/intern/GHOST_Buttons.cc
@@ -5,7 +5,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_Buttons.h"
+#include "GHOST_Buttons.hh"
 
 GHOST_Buttons::GHOST_Buttons()
 {
diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_Buttons.h
rename to intern/ghost/intern/GHOST_Buttons.hh
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_C-api.cpp
rename to intern/ghost/intern/GHOST_C-api.cc
index 00436ceb4cc..9b9d9465811 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cc
@@ -11,16 +11,16 @@
 #include <cstring>
 
 #include "GHOST_C-api.h"
-#include "GHOST_IEvent.h"
-#include "GHOST_IEventConsumer.h"
-#include "GHOST_ISystem.h"
-#include "intern/GHOST_Debug.h"
+#include "GHOST_IEvent.hh"
+#include "GHOST_IEventConsumer.hh"
+#include "GHOST_ISystem.hh"
+#include "intern/GHOST_Debug.hh"
 #ifdef WITH_XR_OPENXR
-#  include "GHOST_IXrContext.h"
-#  include "intern/GHOST_XrSession.h"
+#  include "GHOST_IXrContext.hh"
+#  include "intern/GHOST_XrSession.hh"
 #endif
-#include "intern/GHOST_CallbackEventConsumer.h"
-#include "intern/GHOST_XrException.h"
+#include "intern/GHOST_CallbackEventConsumer.hh"
+#include "intern/GHOST_XrException.hh"
 
 GHOST_SystemHandle GHOST_CreateSystem(void)
 {
diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cc
similarity index 89%
rename from intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
rename to intern/ghost/intern/GHOST_CallbackEventConsumer.cc
index 9f14d56cd9a..d47a1394306 100644
--- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
+++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cc
@@ -9,9 +9,9 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_CallbackEventConsumer.h"
+#include "GHOST_CallbackEventConsumer.hh"
 #include "GHOST_C-api.h"
-#include "GHOST_Debug.h"
+#include "GHOST_Debug.hh"
 
 GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
                                                          GHOST_TUserDataPtr userData)
diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_CallbackEventConsumer.h
rename to intern/ghost/intern/GHOST_CallbackEventConsumer.hh
index cb8676c6f2e..30b525e8d2e 100644
--- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h
+++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.hh
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "GHOST_C-api.h"
-#include "GHOST_IEventConsumer.h"
+#include "GHOST_IEventConsumer.hh"
 
 /**
  * Event consumer that will forward events to a call-back routine.
diff --git a/intern/ghost/intern/GHOST_Context.cpp b/intern/ghost/intern/GHOST_Context.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_Context.cpp
rename to intern/ghost/intern/GHOST_Context.cc
index 6a670e51deb..cb7bfa61fd8 100644
--- a/intern/ghost/intern/GHOST_Context.cpp
+++ b/intern/ghost/intern/GHOST_Context.cc
@@ -7,7 +7,7 @@
  * Definition of GHOST_Context class.
  */
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #ifdef _WIN32
 #  include <epoxy/wgl.h>
diff --git a/intern/ghost/intern/GHOST_Context.h b/intern/ghost/intern/GHOST_Context.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_Context.h
rename to intern/ghost/intern/GHOST_Context.hh
index 82972b81468..e79f2847fe8 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IContext.h"
+#include "GHOST_IContext.hh"
 #include "GHOST_Types.h"
 
 #include <epoxy/gl.h>
diff --git a/intern/ghost/intern/GHOST_ContextCGL.h b/intern/ghost/intern/GHOST_ContextCGL.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextCGL.h
rename to intern/ghost/intern/GHOST_ContextCGL.hh
index 2cc35a5d13e..f0ec062bf4b 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.h
+++ b/intern/ghost/intern/GHOST_ContextCGL.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #include <Cocoa/Cocoa.h>
 #include <Metal/Metal.h>
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index 9335dc6cd19..200e4ac2c3d 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -13,7 +13,7 @@
 #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "GHOST_ContextCGL.h"
+#include "GHOST_ContextCGL.hh"
 
 #include <Cocoa/Cocoa.h>
 #include <Metal/Metal.h>
diff --git a/intern/ghost/intern/GHOST_ContextD3D.cpp b/intern/ghost/intern/GHOST_ContextD3D.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextD3D.cpp
rename to intern/ghost/intern/GHOST_ContextD3D.cc
index 53bb73ba258..4a7bac01741 100644
--- a/intern/ghost/intern/GHOST_ContextD3D.cpp
+++ b/intern/ghost/intern/GHOST_ContextD3D.cc
@@ -12,8 +12,8 @@
 
 #include <epoxy/wgl.h>
 
-#include "GHOST_ContextD3D.h"
-#include "GHOST_ContextWGL.h" /* For shared drawing */
+#include "GHOST_ContextD3D.hh"
+#include "GHOST_ContextWGL.hh" /* For shared drawing */
 
 HMODULE GHOST_ContextD3D::s_d3d_lib = NULL;
 PFN_D3D11_CREATE_DEVICE GHOST_ContextD3D::s_D3D11CreateDeviceFn = NULL;
diff --git a/intern/ghost/intern/GHOST_ContextD3D.h b/intern/ghost/intern/GHOST_ContextD3D.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextD3D.h
rename to intern/ghost/intern/GHOST_ContextD3D.hh
index c97064d9cce..f52d34bfedb 100644
--- a/intern/ghost/intern/GHOST_ContextD3D.h
+++ b/intern/ghost/intern/GHOST_ContextD3D.hh
@@ -12,7 +12,7 @@
 
 #include <D3D11.h>
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 class GHOST_ContextD3D : public GHOST_Context {
   /* XR code needs low level graphics data to send to OpenXR. */
diff --git a/intern/ghost/intern/GHOST_ContextEGL.cpp b/intern/ghost/intern/GHOST_ContextEGL.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextEGL.cpp
rename to intern/ghost/intern/GHOST_ContextEGL.cc
index ca19a2e0e15..91f86bbd262 100644
--- a/intern/ghost/intern/GHOST_ContextEGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextEGL.cc
@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextEGL class.
  */
 
-#include "GHOST_ContextEGL.h"
+#include "GHOST_ContextEGL.hh"
 
 #include <set>
 #include <sstream>
diff --git a/intern/ghost/intern/GHOST_ContextEGL.h b/intern/ghost/intern/GHOST_ContextEGL.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_ContextEGL.h
rename to intern/ghost/intern/GHOST_ContextEGL.hh
index 931f55164f2..4fae6487d4d 100644
--- a/intern/ghost/intern/GHOST_ContextEGL.h
+++ b/intern/ghost/intern/GHOST_ContextEGL.hh
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
-#include "GHOST_System.h"
+#include "GHOST_Context.hh"
+#include "GHOST_System.hh"
 
 #include <epoxy/egl.h>
 #include <epoxy/gl.h>
diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextGLX.cpp
rename to intern/ghost/intern/GHOST_ContextGLX.cc
index d4e5c39a01e..04021d05cda 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cc
@@ -7,8 +7,8 @@
  * Definition of GHOST_ContextGLX class.
  */
 
-#include "GHOST_ContextGLX.h"
-#include "GHOST_SystemX11.h"
+#include "GHOST_ContextGLX.hh"
+#include "GHOST_SystemX11.hh"
 
 #include <vector>
 
diff --git a/intern/ghost/intern/GHOST_ContextGLX.h b/intern/ghost/intern/GHOST_ContextGLX.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextGLX.h
rename to intern/ghost/intern/GHOST_ContextGLX.hh
index 448d6c16ef4..5df74464242 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.h
+++ b/intern/ghost/intern/GHOST_ContextGLX.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #include <epoxy/glx.h>
 
diff --git a/intern/ghost/intern/GHOST_ContextNone.cpp b/intern/ghost/intern/GHOST_ContextNone.cc
similarity index 96%
rename from intern/ghost/intern/GHOST_ContextNone.cpp
rename to intern/ghost/intern/GHOST_ContextNone.cc
index 24c9deb04c8..d8cb9505200 100644
--- a/intern/ghost/intern/GHOST_ContextNone.cpp
+++ b/intern/ghost/intern/GHOST_ContextNone.cc
@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextNone class.
  */
 
-#include "GHOST_ContextNone.h"
+#include "GHOST_ContextNone.hh"
 
 GHOST_TSuccess GHOST_ContextNone::swapBuffers()
 {
diff --git a/intern/ghost/intern/GHOST_ContextNone.h b/intern/ghost/intern/GHOST_ContextNone.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_ContextNone.h
rename to intern/ghost/intern/GHOST_ContextNone.hh
index ac8b5ae6478..06983caff11 100644
--- a/intern/ghost/intern/GHOST_ContextNone.h
+++ b/intern/ghost/intern/GHOST_ContextNone.hh
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 class GHOST_ContextNone : public GHOST_Context {
  public:
diff --git a/intern/ghost/intern/GHOST_ContextSDL.cpp b/intern/ghost/intern/GHOST_ContextSDL.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextSDL.cpp
rename to intern/ghost/intern/GHOST_ContextSDL.cc
index d06ece6e75c..a0450c065dd 100644
--- a/intern/ghost/intern/GHOST_ContextSDL.cpp
+++ b/intern/ghost/intern/GHOST_ContextSDL.cc
@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextSDL class.
  */
 
-#include "GHOST_ContextSDL.h"
+#include "GHOST_ContextSDL.hh"
 
 #include <vector>
 
diff --git a/intern/ghost/intern/GHOST_ContextSDL.h b/intern/ghost/intern/GHOST_ContextSDL.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextSDL.h
rename to intern/ghost/intern/GHOST_ContextSDL.hh
index 56bc39a7e59..ad6db6b63a0 100644
--- a/intern/ghost/intern/GHOST_ContextSDL.h
+++ b/intern/ghost/intern/GHOST_ContextSDL.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 extern "C" {
 #include "SDL.h"
diff --git a/intern/ghost/intern/GHOST_ContextVK.cpp b/intern/ghost/intern/GHOST_ContextVK.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextVK.cpp
rename to intern/ghost/intern/GHOST_ContextVK.cc
index b6d64b157eb..d1dc8083955 100644
--- a/intern/ghost/intern/GHOST_ContextVK.cpp
+++ b/intern/ghost/intern/GHOST_ContextVK.cc
@@ -4,7 +4,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_ContextVK.h"
+#include "GHOST_ContextVK.hh"
 
 #ifdef _WIN32
 #  include <vulkan/vulkan_win32.h>
diff --git a/intern/ghost/intern/GHOST_ContextVK.h b/intern/ghost/intern/GHOST_ContextVK.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_ContextVK.h
rename to intern/ghost/intern/GHOST_ContextVK.hh
index 1fdf6658a82..aa8af898b1b 100644
--- a/intern/ghost/intern/GHOST_ContextVK.h
+++ b/intern/ghost/intern/GHOST_ContextVK.hh
@@ -6,16 +6,16 @@
 
 #pragma once
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #ifdef _WIN32
-#  include "GHOST_SystemWin32.h"
+#  include "GHOST_SystemWin32.hh"
 #elif defined(__APPLE__)
-#  include "GHOST_SystemCocoa.h"
+#  include "GHOST_SystemCocoa.hh"
 #else
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_SystemX11.hh"
 #  ifdef WITH_GHOST_WAYLAND
-#    include "GHOST_SystemWayland.h"
+#    include "GHOST_SystemWayland.hh"
 #  else
 #    define wl_surface void
 #    define wl_display void
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextWGL.cpp
rename to intern/ghost/intern/GHOST_ContextWGL.cc
index 3a33475d71a..dcf877106fd 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cc
@@ -7,7 +7,7 @@
  * Definition of GHOST_ContextWGL class.
  */
 
-#include "GHOST_ContextWGL.h"
+#include "GHOST_ContextWGL.hh"
 
 #include <tchar.h>
 
diff --git a/intern/ghost/intern/GHOST_ContextWGL.h b/intern/ghost/intern/GHOST_ContextWGL.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_ContextWGL.h
rename to intern/ghost/intern/GHOST_ContextWGL.hh
index 23d5382d7ac..943dba7c89a 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.h
+++ b/intern/ghost/intern/GHOST_ContextWGL.hh
@@ -9,7 +9,7 @@
 
 //#define WIN32_COMPOSITING
 
-#include "GHOST_Context.h"
+#include "GHOST_Context.hh"
 
 #include <epoxy/wgl.h>
 
diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_Debug.h
rename to intern/ghost/intern/GHOST_Debug.hh
diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_DisplayManager.cpp
rename to intern/ghost/intern/GHOST_DisplayManager.cc
index dfc1dd9aa49..42a816b645a 100644
--- a/intern/ghost/intern/GHOST_DisplayManager.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManager.cc
@@ -9,8 +9,8 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_DisplayManager.h"
-#include "GHOST_Debug.h"
+#include "GHOST_DisplayManager.hh"
+#include "GHOST_Debug.hh"
 
 GHOST_DisplayManager::GHOST_DisplayManager() : m_settingsInitialized(false) {}
 
diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_DisplayManager.h
rename to intern/ghost/intern/GHOST_DisplayManager.hh
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h b/intern/ghost/intern/GHOST_DisplayManagerCocoa.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_DisplayManagerCocoa.h
rename to intern/ghost/intern/GHOST_DisplayManagerCocoa.hh
index 7106db314ea..b68946861b0 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.hh
@@ -12,7 +12,7 @@
 #  error Apple only!
 #endif  // __APPLE__
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 /**
  * Manages system displays  (Mac OSX/Cocoa implementation).
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
index fba0795ee2b..09d8f09d956 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
+++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
@@ -3,8 +3,8 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "GHOST_Debug.h"
-#include "GHOST_DisplayManagerCocoa.h"
+#include "GHOST_Debug.hh"
+#include "GHOST_DisplayManagerCocoa.hh"
 
 // We do not support multiple monitors at the moment
 
diff --git a/intern/ghost/intern/GHOST_DisplayManagerNULL.h b/intern/ghost/intern/GHOST_DisplayManagerNULL.hh
similarity index 94%
rename from intern/ghost/intern/GHOST_DisplayManagerNULL.h
rename to intern/ghost/intern/GHOST_DisplayManagerNULL.hh
index dbef4fafd8f..9b6c39e570a 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerNULL.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerNULL.hh
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_DisplayManager.h"
-#include "GHOST_SystemHeadless.h"
+#include "GHOST_DisplayManager.hh"
+#include "GHOST_SystemHeadless.hh"
 
 class GHOST_SystemHeadless;
 
diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cc
similarity index 97%
rename from intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
rename to intern/ghost/intern/GHOST_DisplayManagerSDL.cc
index eed437adc6c..9387b716061 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cc
@@ -8,10 +8,10 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DisplayManagerSDL.h"
-#include "GHOST_SystemSDL.h"
+#include "GHOST_DisplayManagerSDL.hh"
+#include "GHOST_SystemSDL.hh"
 
-#include "GHOST_WindowManager.h"
+#include "GHOST_WindowManager.hh"
 
 GHOST_DisplayManagerSDL::GHOST_DisplayManagerSDL(GHOST_SystemSDL *system)
     : GHOST_DisplayManager(), m_system(system)
diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.h b/intern/ghost/intern/GHOST_DisplayManagerSDL.hh
similarity index 96%
rename from intern/ghost/intern/GHOST_DisplayManagerSDL.h
rename to intern/ghost/intern/GHOST_DisplayManagerSDL.hh
index 266eb9b8455..58dda0acfea 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerSDL.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 extern "C" {
 #include "SDL.h"
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
rename to intern/ghost/intern/GHOST_DisplayManagerWin32.cc
index ce107016877..69624dcf8b2 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cc
@@ -5,8 +5,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DisplayManagerWin32.h"
-#include "GHOST_Debug.h"
+#include "GHOST_DisplayManagerWin32.hh"
+#include "GHOST_Debug.hh"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.h b/intern/ghost/intern/GHOST_DisplayManagerWin32.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_DisplayManagerWin32.h
rename to intern/ghost/intern/GHOST_DisplayManagerWin32.hh
index 387867d2a5d..b1f62ab98e4 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.hh
@@ -12,7 +12,7 @@
 #  error WIN32 only!
 #endif  // WIN32
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 /**
  * Manages system displays  (WIN32 implementation).
diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp b/intern/ghost/intern/GHOST_DisplayManagerX11.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_DisplayManagerX11.cpp
rename to intern/ghost/intern/GHOST_DisplayManagerX11.cc
index 53189c6551b..a6a632a1efb 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerX11.cc
@@ -14,8 +14,8 @@
 #  include <X11/extensions/xf86vmode.h>
 #endif
 
-#include "GHOST_DisplayManagerX11.h"
-#include "GHOST_SystemX11.h"
+#include "GHOST_DisplayManagerX11.hh"
+#include "GHOST_SystemX11.hh"
 
 GHOST_DisplayManagerX11::GHOST_DisplayManagerX11(GHOST_SystemX11 *system)
     : GHOST_DisplayManager(), m_system(system)
diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_DisplayManagerX11.h
rename to intern/ghost/intern/GHOST_DisplayManagerX11.hh
index 497759cb8af..76deeac1a7d 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerX11.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerX11.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_DisplayManager.h"
+#include "GHOST_DisplayManager.hh"
 
 class GHOST_SystemX11;
 
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_DropTargetWin32.cpp
rename to intern/ghost/intern/GHOST_DropTargetWin32.cc
index c2c58d1867c..b21bd5fabad 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.cc
@@ -5,8 +5,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DropTargetWin32.h"
-#include "GHOST_Debug.h"
+#include "GHOST_DropTargetWin32.hh"
+#include "GHOST_Debug.hh"
 #include <shellapi.h>
 
 #include "utf_winfunc.h"
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_DropTargetWin32.h
rename to intern/ghost/intern/GHOST_DropTargetWin32.hh
index 03e5492fcb1..c7355baa23e 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.h
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.hh
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_SystemWin32.h"
-#include "GHOST_WindowWin32.h"
+#include "GHOST_SystemWin32.hh"
+#include "GHOST_WindowWin32.hh"
 #include <GHOST_Types.h>
 #include <string.h>
 
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.cpp b/intern/ghost/intern/GHOST_DropTargetX11.cc
similarity index 97%
rename from intern/ghost/intern/GHOST_DropTargetX11.cpp
rename to intern/ghost/intern/GHOST_DropTargetX11.cc
index 7595f31c2e1..f3b42a1da93 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetX11.cc
@@ -5,10 +5,10 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_DropTargetX11.h"
-#include "GHOST_Debug.h"
-#include "GHOST_PathUtils.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_DropTargetX11.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_PathUtils.hh"
+#include "GHOST_utildefines.hh"
 
 #include <cassert>
 #include <cctype>
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_DropTargetX11.h
rename to intern/ghost/intern/GHOST_DropTargetX11.hh
index 484c76eacbe..66d16cc655f 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.h
+++ b/intern/ghost/intern/GHOST_DropTargetX11.hh
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_SystemX11.h"
-#include "GHOST_WindowX11.h"
+#include "GHOST_SystemX11.hh"
+#include "GHOST_WindowX11.hh"
 #include <GHOST_Types.h>
 
 #include "xdnd.h"
diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_Event.h
rename to intern/ghost/intern/GHOST_Event.hh
index 1e1c428e2ae..fa7948e3f90 100644
--- a/intern/ghost/intern/GHOST_Event.h
+++ b/intern/ghost/intern/GHOST_Event.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IEvent.h"
+#include "GHOST_IEvent.hh"
 
 /**
  * Base class for events received the operating system.
diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.hh
similarity index 95%
rename from intern/ghost/intern/GHOST_EventButton.h
rename to intern/ghost/intern/GHOST_EventButton.hh
index f42805e2c6b..c62fa79387f 100644
--- a/intern/ghost/intern/GHOST_EventButton.h
+++ b/intern/ghost/intern/GHOST_EventButton.hh
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
-#include "GHOST_Window.h"
+#include "GHOST_Event.hh"
+#include "GHOST_Window.hh"
 
 /**
  * Mouse button event.
diff --git a/intern/ghost/intern/GHOST_EventCursor.h b/intern/ghost/intern/GHOST_EventCursor.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_EventCursor.h
rename to intern/ghost/intern/GHOST_EventCursor.hh
index a9e834e6531..8909ba095c8 100644
--- a/intern/ghost/intern/GHOST_EventCursor.h
+++ b/intern/ghost/intern/GHOST_EventCursor.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Cursor event.
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_EventDragnDrop.h
rename to intern/ghost/intern/GHOST_EventDragnDrop.hh
index 3e703731ced..cebbaa6fe4e 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
diff --git a/intern/ghost/intern/GHOST_EventKey.h b/intern/ghost/intern/GHOST_EventKey.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_EventKey.h
rename to intern/ghost/intern/GHOST_EventKey.hh
index f85a674be9f..aed83c9a06f 100644
--- a/intern/ghost/intern/GHOST_EventKey.h
+++ b/intern/ghost/intern/GHOST_EventKey.hh
@@ -10,7 +10,7 @@
 
 #include <string.h>
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Key event.
diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_EventManager.cpp
rename to intern/ghost/intern/GHOST_EventManager.cc
index 90897b0e54c..2daf4030104 100644
--- a/intern/ghost/intern/GHOST_EventManager.cpp
+++ b/intern/ghost/intern/GHOST_EventManager.cc
@@ -9,8 +9,8 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_EventManager.h"
-#include "GHOST_Debug.h"
+#include "GHOST_EventManager.hh"
+#include "GHOST_Debug.hh"
 #include <algorithm>
 
 GHOST_EventManager::GHOST_EventManager() {}
diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_EventManager.h
rename to intern/ghost/intern/GHOST_EventManager.hh
index 32666ff57c8..37460257242 100644
--- a/intern/ghost/intern/GHOST_EventManager.h
+++ b/intern/ghost/intern/GHOST_EventManager.hh
@@ -11,7 +11,7 @@
 #include <deque>
 #include <vector>
 
-#include "GHOST_IEventConsumer.h"
+#include "GHOST_IEventConsumer.hh"
 
 /**
  * Manages an event stack and a list of event consumers.
diff --git a/intern/ghost/intern/GHOST_EventNDOF.h b/intern/ghost/intern/GHOST_EventNDOF.hh
similarity index 96%
rename from intern/ghost/intern/GHOST_EventNDOF.h
rename to intern/ghost/intern/GHOST_EventNDOF.hh
index 79a8974a07a..b2f280019f0 100644
--- a/intern/ghost/intern/GHOST_EventNDOF.h
+++ b/intern/ghost/intern/GHOST_EventNDOF.hh
@@ -10,7 +10,7 @@
 #  error NDOF code included in non-NDOF-enabled build
 #endif
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 class GHOST_EventNDOFMotion : public GHOST_Event {
  protected:
diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_EventPrinter.cpp
rename to intern/ghost/intern/GHOST_EventPrinter.cc
index 0d7f05009ff..99a56e206b5 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.cpp
+++ b/intern/ghost/intern/GHOST_EventPrinter.cc
@@ -6,10 +6,10 @@
  * Declaration of GHOST_EventPrinter class.
  */
 
-#include "GHOST_EventPrinter.h"
-#include "GHOST_Debug.h"
-#include "GHOST_EventDragnDrop.h"
-#include "GHOST_EventKey.h"
+#include "GHOST_EventPrinter.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_EventDragnDrop.hh"
+#include "GHOST_EventKey.hh"
 #include <iostream>
 
 #include <cstdio>
diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.hh
similarity index 96%
rename from intern/ghost/intern/GHOST_EventPrinter.h
rename to intern/ghost/intern/GHOST_EventPrinter.hh
index dfa35f72026..9b8cc509975 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.h
+++ b/intern/ghost/intern/GHOST_EventPrinter.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IEventConsumer.h"
+#include "GHOST_IEventConsumer.hh"
 
 /**
  * An Event consumer that prints all the events to standard out.
diff --git a/intern/ghost/intern/GHOST_EventString.h b/intern/ghost/intern/GHOST_EventString.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_EventString.h
rename to intern/ghost/intern/GHOST_EventString.hh
index fa59462b32b..116d5057559 100644
--- a/intern/ghost/intern/GHOST_EventString.h
+++ b/intern/ghost/intern/GHOST_EventString.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Generic class for events with string data
diff --git a/intern/ghost/intern/GHOST_EventTrackpad.h b/intern/ghost/intern/GHOST_EventTrackpad.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_EventTrackpad.h
rename to intern/ghost/intern/GHOST_EventTrackpad.hh
index 4b98514eeef..0bc355e7ac5 100644
--- a/intern/ghost/intern/GHOST_EventTrackpad.h
+++ b/intern/ghost/intern/GHOST_EventTrackpad.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Trackpad (scroll, magnify, rotate, ...) event.
diff --git a/intern/ghost/intern/GHOST_EventWheel.h b/intern/ghost/intern/GHOST_EventWheel.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_EventWheel.h
rename to intern/ghost/intern/GHOST_EventWheel.hh
index 7c32d575e67..e7086f2c1e4 100644
--- a/intern/ghost/intern/GHOST_EventWheel.h
+++ b/intern/ghost/intern/GHOST_EventWheel.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
 /**
  * Mouse wheel event.
diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cc
similarity index 94%
rename from intern/ghost/intern/GHOST_ISystem.cpp
rename to intern/ghost/intern/GHOST_ISystem.cc
index 696848ce623..5b0d9c7af99 100644
--- a/intern/ghost/intern/GHOST_ISystem.cpp
+++ b/intern/ghost/intern/GHOST_ISystem.cc
@@ -11,22 +11,22 @@
 
 #include <stdexcept>
 
-#include "GHOST_ISystem.h"
-#include "GHOST_SystemHeadless.h"
+#include "GHOST_ISystem.hh"
+#include "GHOST_SystemHeadless.hh"
 
 #if defined(WITH_GHOST_X11) && defined(WITH_GHOST_WAYLAND)
-#  include "GHOST_SystemWayland.h"
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_SystemWayland.hh"
+#  include "GHOST_SystemX11.hh"
 #elif defined(WITH_GHOST_X11)
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_SystemX11.hh"
 #elif defined(WITH_GHOST_WAYLAND)
-#  include "GHOST_SystemWayland.h"
+#  include "GHOST_SystemWayland.hh"
 #elif defined(WITH_GHOST_SDL)
-#  include "GHOST_SystemSDL.h"
+#  include "GHOST_SystemSDL.hh"
 #elif defined(WIN32)
-#  include "GHOST_SystemWin32.h"
+#  include "GHOST_SystemWin32.hh"
 #elif defined(__APPLE__)
-#  include "GHOST_SystemCocoa.h"
+#  include "GHOST_SystemCocoa.hh"
 #endif
 
 GHOST_ISystem *GHOST_ISystem::m_system = nullptr;
diff --git a/intern/ghost/intern/GHOST_ISystemPaths.cpp b/intern/ghost/intern/GHOST_ISystemPaths.cc
similarity index 88%
rename from intern/ghost/intern/GHOST_ISystemPaths.cpp
rename to intern/ghost/intern/GHOST_ISystemPaths.cc
index 599a9fec681..b6359fcb5a1 100644
--- a/intern/ghost/intern/GHOST_ISystemPaths.cpp
+++ b/intern/ghost/intern/GHOST_ISystemPaths.cc
@@ -9,15 +9,15 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_ISystemPaths.h"
+#include "GHOST_ISystemPaths.hh"
 
 #ifdef WIN32
-#  include "GHOST_SystemPathsWin32.h"
+#  include "GHOST_SystemPathsWin32.hh"
 #else
 #  ifdef __APPLE__
-#    include "GHOST_SystemPathsCocoa.h"
+#    include "GHOST_SystemPathsCocoa.hh"
 #  else
-#    include "GHOST_SystemPathsUnix.h"
+#    include "GHOST_SystemPathsUnix.hh"
 #  endif
 #endif
 
diff --git a/intern/ghost/intern/GHOST_IXrGraphicsBinding.h b/intern/ghost/intern/GHOST_IXrGraphicsBinding.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_IXrGraphicsBinding.h
rename to intern/ghost/intern/GHOST_IXrGraphicsBinding.hh
index 152b6b68026..ee92f90ca5d 100644
--- a/intern/ghost/intern/GHOST_IXrGraphicsBinding.h
+++ b/intern/ghost/intern/GHOST_IXrGraphicsBinding.hh
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "GHOST_Xr_openxr_includes.h"
+#include "GHOST_Xr_openxr_includes.hh"
 
 class GHOST_IXrGraphicsBinding {
  public:
diff --git a/intern/ghost/intern/GHOST_IconX11.h b/intern/ghost/intern/GHOST_IconX11.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_IconX11.h
rename to intern/ghost/intern/GHOST_IconX11.hh
diff --git a/intern/ghost/intern/GHOST_ImeWin32.cpp b/intern/ghost/intern/GHOST_ImeWin32.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_ImeWin32.cpp
rename to intern/ghost/intern/GHOST_ImeWin32.cc
index ccc25b0ec28..54171130ca3 100644
--- a/intern/ghost/intern/GHOST_ImeWin32.cpp
+++ b/intern/ghost/intern/GHOST_ImeWin32.cc
@@ -7,9 +7,9 @@
 
 #ifdef WITH_INPUT_IME
 
-#  include "GHOST_ImeWin32.h"
+#  include "GHOST_ImeWin32.hh"
 #  include "GHOST_C-api.h"
-#  include "GHOST_WindowWin32.h"
+#  include "GHOST_WindowWin32.hh"
 #  include "utfconv.h"
 
 /* ISO_639-1 2-Letter Abbreviations. */
diff --git a/intern/ghost/intern/GHOST_ImeWin32.h b/intern/ghost/intern/GHOST_ImeWin32.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_ImeWin32.h
rename to intern/ghost/intern/GHOST_ImeWin32.hh
index cb6d8a770cf..933b0f8c5fe 100644
--- a/intern/ghost/intern/GHOST_ImeWin32.h
+++ b/intern/ghost/intern/GHOST_ImeWin32.hh
@@ -14,8 +14,8 @@
 
 #  include <string>
 
-#  include "GHOST_Event.h"
-#  include "GHOST_Rect.h"
+#  include "GHOST_Event.hh"
+#  include "GHOST_Rect.hh"
 #  include <vector>
 
 /* MSDN LOCALE_SISO639LANGNAME states maximum length of 9, including terminating null. */
diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_ModifierKeys.cpp
rename to intern/ghost/intern/GHOST_ModifierKeys.cc
index 86f483c2d14..b721182da6e 100644
--- a/intern/ghost/intern/GHOST_ModifierKeys.cpp
+++ b/intern/ghost/intern/GHOST_ModifierKeys.cc
@@ -9,8 +9,8 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_ModifierKeys.h"
-#include "GHOST_Debug.h"
+#include "GHOST_ModifierKeys.hh"
+#include "GHOST_Debug.hh"
 
 GHOST_ModifierKeys::GHOST_ModifierKeys()
 {
diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_ModifierKeys.h
rename to intern/ghost/intern/GHOST_ModifierKeys.hh
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_NDOFManager.cpp
rename to intern/ghost/intern/GHOST_NDOFManager.cc
index d0309b4bba3..05724bd88f6 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cc
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "GHOST_NDOFManager.h"
-#include "GHOST_Debug.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventNDOF.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_NDOFManager.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventNDOF.hh"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_utildefines.hh"
 
 /* Logging, use `ghost.ndof.*` prefix. */
 #include "CLG_log.h"
diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_NDOFManager.h
rename to intern/ghost/intern/GHOST_NDOFManager.hh
index 26b0138cffa..4bdcc62b75d 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.h
+++ b/intern/ghost/intern/GHOST_NDOFManager.hh
@@ -6,7 +6,7 @@
 #  error NDOF code included in non-NDOF-enabled build
 #endif
 
-#include "GHOST_System.h"
+#include "GHOST_System.hh"
 
 typedef enum {
   NDOF_UnknownDevice = 0,
diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.h b/intern/ghost/intern/GHOST_NDOFManagerCocoa.hh
similarity index 91%
rename from intern/ghost/intern/GHOST_NDOFManagerCocoa.h
rename to intern/ghost/intern/GHOST_NDOFManagerCocoa.hh
index a40406ad2d0..ec873849bc8 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
+++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.hh
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "GHOST_NDOFManager.h"
+#include "GHOST_NDOFManager.hh"
 
 // Event capture is handled within the NDOF manager on Macintosh,
 // so there's no need for SystemCocoa to look for them.
diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
index 6f8208915d8..e699fdfe330 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
+++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
@@ -2,8 +2,8 @@
 
 #define DEBUG_NDOF_DRIVER false
 
-#include "GHOST_NDOFManagerCocoa.h"
-#include "GHOST_SystemCocoa.h"
+#include "GHOST_NDOFManagerCocoa.hh"
+#include "GHOST_SystemCocoa.hh"
 
 #include <dlfcn.h>
 #include <stdint.h>
diff --git a/intern/ghost/intern/GHOST_NDOFManagerUnix.cpp b/intern/ghost/intern/GHOST_NDOFManagerUnix.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_NDOFManagerUnix.cpp
rename to intern/ghost/intern/GHOST_NDOFManagerUnix.cc
index d3b4161307e..98a3fa0786f 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerUnix.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManagerUnix.cc
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "GHOST_NDOFManagerUnix.h"
-#include "GHOST_System.h"
+#include "GHOST_NDOFManagerUnix.hh"
+#include "GHOST_System.hh"
 
 /* Logging, use `ghost.ndof.unix.*` prefix. */
 #include "CLG_log.h"
diff --git a/intern/ghost/intern/GHOST_NDOFManagerUnix.h b/intern/ghost/intern/GHOST_NDOFManagerUnix.hh
similarity index 92%
rename from intern/ghost/intern/GHOST_NDOFManagerUnix.h
rename to intern/ghost/intern/GHOST_NDOFManagerUnix.hh
index 2b98fad974f..b6d306bb561 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerUnix.h
+++ b/intern/ghost/intern/GHOST_NDOFManagerUnix.hh
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "GHOST_NDOFManager.h"
+#include "GHOST_NDOFManager.hh"
 
 /* Event capture is handled within the NDOF manager on Linux,
  * so there's no need for SystemX11 to look for them. */
diff --git a/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp b/intern/ghost/intern/GHOST_NDOFManagerWin32.cc
similarity index 91%
rename from intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
rename to intern/ghost/intern/GHOST_NDOFManagerWin32.cc
index 43f31cb2368..68819e5f391 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManagerWin32.cc
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "GHOST_NDOFManagerWin32.h"
+#include "GHOST_NDOFManagerWin32.hh"
 
 GHOST_NDOFManagerWin32::GHOST_NDOFManagerWin32(GHOST_System &sys) : GHOST_NDOFManager(sys)
 {
diff --git a/intern/ghost/intern/GHOST_NDOFManagerWin32.h b/intern/ghost/intern/GHOST_NDOFManagerWin32.hh
similarity index 85%
rename from intern/ghost/intern/GHOST_NDOFManagerWin32.h
rename to intern/ghost/intern/GHOST_NDOFManagerWin32.hh
index 1da269d23da..a1cfedcb61d 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerWin32.h
+++ b/intern/ghost/intern/GHOST_NDOFManagerWin32.hh
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "GHOST_NDOFManager.h"
+#include "GHOST_NDOFManager.hh"
 
 class GHOST_NDOFManagerWin32 : public GHOST_NDOFManager {
  public:
diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cc
similarity index 93%
rename from intern/ghost/intern/GHOST_Path-api.cpp
rename to intern/ghost/intern/GHOST_Path-api.cc
index 66ade104005..ec1cc24dabf 100644
--- a/intern/ghost/intern/GHOST_Path-api.cpp
+++ b/intern/ghost/intern/GHOST_Path-api.cc
@@ -7,10 +7,10 @@
 
 #include <cstdio>
 
-#include "GHOST_ISystemPaths.h"
-#include "GHOST_Path-api.h"
+#include "GHOST_ISystemPaths.hh"
+#include "GHOST_Path-api.hh"
 #include "GHOST_Types.h"
-#include "intern/GHOST_Debug.h"
+#include "intern/GHOST_Debug.hh"
 
 GHOST_TSuccess GHOST_CreateSystemPaths()
 {
diff --git a/intern/ghost/intern/GHOST_PathUtils.cpp b/intern/ghost/intern/GHOST_PathUtils.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_PathUtils.cpp
rename to intern/ghost/intern/GHOST_PathUtils.cc
index fb42938fb87..3856f35ee8a 100644
--- a/intern/ghost/intern/GHOST_PathUtils.cpp
+++ b/intern/ghost/intern/GHOST_PathUtils.cc
@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "GHOST_PathUtils.h"
+#include "GHOST_PathUtils.hh"
 #include "GHOST_Types.h"
 
 /* Based on: https://stackoverflow.com/a/2766963/432509 */
diff --git a/intern/ghost/intern/GHOST_PathUtils.h b/intern/ghost/intern/GHOST_PathUtils.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_PathUtils.h
rename to intern/ghost/intern/GHOST_PathUtils.hh
diff --git a/intern/ghost/intern/GHOST_Rect.cpp b/intern/ghost/intern/GHOST_Rect.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_Rect.cpp
rename to intern/ghost/intern/GHOST_Rect.cc
index c425b21cd27..db59a14b3f8 100644
--- a/intern/ghost/intern/GHOST_Rect.cpp
+++ b/intern/ghost/intern/GHOST_Rect.cc
@@ -5,7 +5,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_Rect.h"
+#include "GHOST_Rect.hh"
 
 void GHOST_Rect::inset(int32_t i)
 {
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_System.cpp
rename to intern/ghost/intern/GHOST_System.cc
index 9094e5a5b97..d146e7cee78 100644
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cc
@@ -5,19 +5,19 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_System.h"
+#include "GHOST_System.hh"
 
 #include <chrono>
 #include <cstdio> /* Just for #printf. */
 
-#include "GHOST_DisplayManager.h"
-#include "GHOST_EventManager.h"
-#include "GHOST_TimerManager.h"
-#include "GHOST_TimerTask.h"
-#include "GHOST_WindowManager.h"
+#include "GHOST_DisplayManager.hh"
+#include "GHOST_EventManager.hh"
+#include "GHOST_TimerManager.hh"
+#include "GHOST_TimerTask.hh"
+#include "GHOST_WindowManager.hh"
 
 #ifdef WITH_INPUT_NDOF
-#  include "GHOST_NDOFManager.h"
+#  include "GHOST_NDOFManager.hh"
 #endif
 
 GHOST_System::GHOST_System()
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_System.h
rename to intern/ghost/intern/GHOST_System.hh
index a319f553231..9ede2fda862 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.hh
@@ -8,14 +8,14 @@
 
 #pragma once
 
-#include "GHOST_ISystem.h"
+#include "GHOST_ISystem.hh"
 
-#include "GHOST_Buttons.h"
-#include "GHOST_Debug.h"
-#include "GHOST_EventManager.h"
-#include "GHOST_ModifierKeys.h"
+#include "GHOST_Buttons.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_EventManager.hh"
+#include "GHOST_ModifierKeys.hh"
 #ifdef WITH_GHOST_DEBUG
-#  include "GHOST_EventPrinter.h"
+#  include "GHOST_EventPrinter.hh"
 #endif  // WITH_GHOST_DEBUG
 
 class GHOST_DisplayManager;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemCocoa.h
rename to intern/ghost/intern/GHOST_SystemCocoa.hh
index 2a9056619be..af574cc4980 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.hh
@@ -14,7 +14,7 @@
 
 //#define __CARBONSOUND__
 
-#include "GHOST_System.h"
+#include "GHOST_System.hh"
 
 class GHOST_EventCursor;
 class GHOST_EventKey;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 1451f2ed62d..166f6d938ee 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1,20 +1,20 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
  * Copyright 2001-2002 NaN Holding BV. All rights reserved. */
 
-#include "GHOST_SystemCocoa.h"
+#include "GHOST_SystemCocoa.hh"
 
-#include "GHOST_DisplayManagerCocoa.h"
-#include "GHOST_EventButton.h"
-#include "GHOST_EventCursor.h"
-#include "GHOST_EventDragnDrop.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventString.h"
-#include "GHOST_EventTrackpad.h"
-#include "GHOST_EventWheel.h"
-#include "GHOST_TimerManager.h"
-#include "GHOST_TimerTask.h"
-#include "GHOST_WindowCocoa.h"
-#include "GHOST_WindowManager.h"
+#include "GHOST_DisplayManagerCocoa.hh"
+#include "GHOST_EventButton.hh"
+#include "GHOST_EventCursor.hh"
+#include "GHOST_EventDragnDrop.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventString.hh"
+#include "GHOST_EventTrackpad.hh"
+#include "GHOST_EventWheel.hh"
+#include "GHOST_TimerManager.hh"
+#include "GHOST_TimerTask.hh"
+#include "GHOST_WindowCocoa.hh"
+#include "GHOST_WindowManager.hh"
 
 /* Don't generate OpenGL deprecation warning. This is a known thing, and is not something easily
  * solvable in a short term. */
@@ -22,14 +22,14 @@
 #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "GHOST_ContextCGL.h"
+#include "GHOST_ContextCGL.hh"
 
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #ifdef WITH_INPUT_NDOF
-#  include "GHOST_NDOFManagerCocoa.h"
+#  include "GHOST_NDOFManagerCocoa.hh"
 #endif
 
 #include "AssertMacros.h"
diff --git a/intern/ghost/intern/GHOST_SystemHeadless.h b/intern/ghost/intern/GHOST_SystemHeadless.hh
similarity index 96%
rename from intern/ghost/intern/GHOST_SystemHeadless.h
rename to intern/ghost/intern/GHOST_SystemHeadless.hh
index 02a09dd6c9e..feefbe264d6 100644
--- a/intern/ghost/intern/GHOST_SystemHeadless.h
+++ b/intern/ghost/intern/GHOST_SystemHeadless.hh
@@ -8,14 +8,14 @@
 #pragma once
 
 #include "../GHOST_Types.h"
-#include "GHOST_DisplayManagerNULL.h"
-#include "GHOST_System.h"
-#include "GHOST_WindowNULL.h"
+#include "GHOST_DisplayManagerNULL.hh"
+#include "GHOST_System.hh"
+#include "GHOST_WindowNULL.hh"
 
 #ifdef __linux__
-#  include "GHOST_ContextEGL.h"
+#  include "GHOST_ContextEGL.hh"
 #endif
-#include "GHOST_ContextNone.h"
+#include "GHOST_ContextNone.hh"
 
 class GHOST_WindowNULL;
 
diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_SystemPaths.h
rename to intern/ghost/intern/GHOST_SystemPaths.hh
index 2dadcd35883..01089e86203 100644
--- a/intern/ghost/intern/GHOST_SystemPaths.h
+++ b/intern/ghost/intern/GHOST_SystemPaths.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_ISystemPaths.h"
+#include "GHOST_ISystemPaths.hh"
 
 class GHOST_SystemPaths : public GHOST_ISystemPaths {
  protected:
diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.h b/intern/ghost/intern/GHOST_SystemPathsCocoa.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_SystemPathsCocoa.h
rename to intern/ghost/intern/GHOST_SystemPathsCocoa.hh
index 3c95cb57243..95b4790ea85 100644
--- a/intern/ghost/intern/GHOST_SystemPathsCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.hh
@@ -11,7 +11,7 @@
 #  error Apple OSX only!
 #endif  // __APPLE__
 
-#include "GHOST_SystemPaths.h"
+#include "GHOST_SystemPaths.hh"
 
 class GHOST_SystemPathsCocoa : public GHOST_SystemPaths {
  public:
diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
index 7a26b40be36..e4f003d2cee 100644
--- a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
@@ -3,8 +3,8 @@
 
 #import <Foundation/Foundation.h>
 
-#include "GHOST_Debug.h"
-#include "GHOST_SystemPathsCocoa.h"
+#include "GHOST_Debug.hh"
+#include "GHOST_SystemPathsCocoa.hh"
 
 #pragma mark initialization/finalization
 
diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_SystemPathsUnix.cpp
rename to intern/ghost/intern/GHOST_SystemPathsUnix.cc
index f0392a8ec73..1c1bad320dc 100644
--- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cc
@@ -7,9 +7,9 @@
 
 #include <sstream>
 
-#include "GHOST_SystemPathsUnix.h"
+#include "GHOST_SystemPathsUnix.hh"
 
-#include "GHOST_Debug.h"
+#include "GHOST_Debug.hh"
 
 /* For timing. */
 #include <sys/time.h>
diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.h b/intern/ghost/intern/GHOST_SystemPathsUnix.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_SystemPathsUnix.h
rename to intern/ghost/intern/GHOST_SystemPathsUnix.hh
index e220faf7c2e..d9b9b5a9e05 100644
--- a/intern/ghost/intern/GHOST_SystemPathsUnix.h
+++ b/intern/ghost/intern/GHOST_SystemPathsUnix.hh
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "../GHOST_Types.h"
-#include "GHOST_SystemPaths.h"
+#include "GHOST_SystemPaths.hh"
 
 class GHOST_SystemPathsUnix : public GHOST_SystemPaths {
  public:
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_SystemPathsWin32.cpp
rename to intern/ghost/intern/GHOST_SystemPathsWin32.cc
index 636ced8d88d..c9740483803 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cc
@@ -5,8 +5,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_SystemPathsWin32.h"
-#include "GHOST_Debug.h"
+#include "GHOST_SystemPathsWin32.hh"
+#include "GHOST_Debug.hh"
 
 #ifndef _WIN32_IE
 #  define _WIN32_IE 0x0501
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_SystemPathsWin32.h
rename to intern/ghost/intern/GHOST_SystemPathsWin32.hh
index 13694e225e7..e15f1958319 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.h
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.hh
@@ -14,7 +14,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include "GHOST_SystemPaths.h"
+#include "GHOST_SystemPaths.hh"
 
 /**
  * WIN32 Implementation of GHOST_SystemPaths class.
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_SystemSDL.cpp
rename to intern/ghost/intern/GHOST_SystemSDL.cc
index 4e82f1d10c8..b99d2091054 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cc
@@ -7,16 +7,16 @@
 #include <cassert>
 #include <stdexcept>
 
-#include "GHOST_ContextSDL.h"
-#include "GHOST_SystemSDL.h"
-#include "GHOST_WindowSDL.h"
+#include "GHOST_ContextSDL.hh"
+#include "GHOST_SystemSDL.hh"
+#include "GHOST_WindowSDL.hh"
 
-#include "GHOST_WindowManager.h"
+#include "GHOST_WindowManager.hh"
 
-#include "GHOST_EventButton.h"
-#include "GHOST_EventCursor.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventWheel.h"
+#include "GHOST_EventButton.hh"
+#include "GHOST_EventCursor.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventWheel.hh"
 
 GHOST_SystemSDL::GHOST_SystemSDL() : GHOST_System()
 {
diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.hh
similarity index 93%
rename from intern/ghost/intern/GHOST_SystemSDL.h
rename to intern/ghost/intern/GHOST_SystemSDL.hh
index 261fc2d2d68..67e093f3ddd 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.h
+++ b/intern/ghost/intern/GHOST_SystemSDL.hh
@@ -8,11 +8,11 @@
 #pragma once
 
 #include "../GHOST_Types.h"
-#include "GHOST_DisplayManagerSDL.h"
-#include "GHOST_Event.h"
-#include "GHOST_System.h"
-#include "GHOST_TimerManager.h"
-#include "GHOST_WindowSDL.h"
+#include "GHOST_DisplayManagerSDL.hh"
+#include "GHOST_Event.hh"
+#include "GHOST_System.hh"
+#include "GHOST_TimerManager.hh"
+#include "GHOST_WindowSDL.hh"
 
 extern "C" {
 #include "SDL.h"
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemWayland.cpp
rename to intern/ghost/intern/GHOST_SystemWayland.cc
index 00474b38351..603b8802665 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cc
@@ -4,28 +4,28 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_SystemWayland.h"
-#include "GHOST_Event.h"
-#include "GHOST_EventButton.h"
-#include "GHOST_EventCursor.h"
-#include "GHOST_EventDragnDrop.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventTrackpad.h"
-#include "GHOST_EventWheel.h"
-#include "GHOST_PathUtils.h"
-#include "GHOST_TimerManager.h"
-#include "GHOST_WaylandUtils.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_SystemWayland.hh"
+#include "GHOST_Event.hh"
+#include "GHOST_EventButton.hh"
+#include "GHOST_EventCursor.hh"
+#include "GHOST_EventDragnDrop.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventTrackpad.hh"
+#include "GHOST_EventWheel.hh"
+#include "GHOST_PathUtils.hh"
+#include "GHOST_TimerManager.hh"
+#include "GHOST_WaylandUtils.hh"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_utildefines.hh"
 
-#include "GHOST_ContextEGL.h"
+#include "GHOST_ContextEGL.hh"
 
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #ifdef WITH_INPUT_NDOF
-#  include "GHOST_NDOFManagerUnix.h"
+#  include "GHOST_NDOFManagerUnix.hh"
 #endif
 
 #ifdef WITH_GHOST_WAYLAND_DYNLOAD
@@ -49,7 +49,7 @@
 #endif
 #include <wayland-cursor.h>
 
-#include "GHOST_WaylandCursorSettings.h"
+#include "GHOST_WaylandCursorSettings.hh"
 
 #include <xkbcommon/xkbcommon.h>
 
@@ -85,7 +85,7 @@
 #include "CLG_log.h"
 
 #ifdef USE_EVENT_BACKGROUND_THREAD
-#  include "GHOST_TimerTask.h"
+#  include "GHOST_TimerTask.hh"
 
 #  include <pthread.h>
 #endif
diff --git a/intern/ghost/intern/GHOST_SystemWayland.h b/intern/ghost/intern/GHOST_SystemWayland.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemWayland.h
rename to intern/ghost/intern/GHOST_SystemWayland.hh
index 787d0d7b7bb..4b464e2d1e7 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.h
+++ b/intern/ghost/intern/GHOST_SystemWayland.hh
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "../GHOST_Types.h"
-#include "GHOST_System.h"
-#include "GHOST_WindowWayland.h"
+#include "GHOST_System.hh"
+#include "GHOST_WindowWayland.hh"
 
 #ifdef WITH_GHOST_WAYLAND_DYNLOAD
 #  include <wayland_dynload_client.h>
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemWin32.cpp
rename to intern/ghost/intern/GHOST_SystemWin32.cc
index f49bac243f1..51a8a5d464e 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cc
@@ -5,10 +5,10 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_SystemWin32.h"
-#include "GHOST_ContextD3D.h"
-#include "GHOST_EventDragnDrop.h"
-#include "GHOST_EventTrackpad.h"
+#include "GHOST_SystemWin32.hh"
+#include "GHOST_ContextD3D.hh"
+#include "GHOST_EventDragnDrop.hh"
+#include "GHOST_EventTrackpad.hh"
 
 #ifndef _WIN32_IE
 #  define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */
@@ -26,23 +26,23 @@
 #include "utf_winfunc.h"
 #include "utfconv.h"
 
-#include "GHOST_DisplayManagerWin32.h"
-#include "GHOST_EventButton.h"
-#include "GHOST_EventCursor.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventWheel.h"
-#include "GHOST_TimerManager.h"
-#include "GHOST_TimerTask.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_WindowWin32.h"
+#include "GHOST_DisplayManagerWin32.hh"
+#include "GHOST_EventButton.hh"
+#include "GHOST_EventCursor.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventWheel.hh"
+#include "GHOST_TimerManager.hh"
+#include "GHOST_TimerTask.hh"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_WindowWin32.hh"
 
-#include "GHOST_ContextWGL.h"
+#include "GHOST_ContextWGL.hh"
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #ifdef WITH_INPUT_NDOF
-#  include "GHOST_NDOFManagerWin32.h"
+#  include "GHOST_NDOFManagerWin32.hh"
 #endif
 
 /* Key code values not found in `winuser.h`. */
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemWin32.h
rename to intern/ghost/intern/GHOST_SystemWin32.hh
index 29c35891062..f434be24448 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.hh
@@ -16,7 +16,7 @@
 #include <ole2.h> /* For drag-n-drop. */
 #include <windows.h>
 
-#include "GHOST_System.h"
+#include "GHOST_System.hh"
 
 class GHOST_EventButton;
 class GHOST_EventCursor;
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemX11.cpp
rename to intern/ghost/intern/GHOST_SystemX11.cc
index d3dab0401cc..19dfd717c04 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cc
@@ -12,32 +12,32 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#include "GHOST_DisplayManagerX11.h"
-#include "GHOST_EventButton.h"
-#include "GHOST_EventCursor.h"
-#include "GHOST_EventDragnDrop.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventWheel.h"
-#include "GHOST_SystemX11.h"
-#include "GHOST_TimerManager.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_WindowX11.h"
+#include "GHOST_DisplayManagerX11.hh"
+#include "GHOST_EventButton.hh"
+#include "GHOST_EventCursor.hh"
+#include "GHOST_EventDragnDrop.hh"
+#include "GHOST_EventKey.hh"
+#include "GHOST_EventWheel.hh"
+#include "GHOST_SystemX11.hh"
+#include "GHOST_TimerManager.hh"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_WindowX11.hh"
 #ifdef WITH_INPUT_NDOF
-#  include "GHOST_NDOFManagerUnix.h"
+#  include "GHOST_NDOFManagerUnix.hh"
 #endif
-#include "GHOST_utildefines.h"
+#include "GHOST_utildefines.hh"
 
 #ifdef WITH_XDND
-#  include "GHOST_DropTargetX11.h"
+#  include "GHOST_DropTargetX11.hh"
 #endif
 
-#include "GHOST_Debug.h"
+#include "GHOST_Debug.hh"
 
-#include "GHOST_ContextEGL.h"
-#include "GHOST_ContextGLX.h"
+#include "GHOST_ContextEGL.hh"
+#include "GHOST_ContextGLX.hh"
 
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #ifdef WITH_XF86KEYSYM
@@ -326,7 +326,7 @@ GHOST_IWindow *GHOST_SystemX11::createWindow(const char *title,
                                (glSettings.flags & GHOST_glDebugContext) != 0);
 
   if (window) {
-    /* Both are now handle in GHOST_WindowX11.cpp
+    /* Both are now handle in GHOST_WindowX11.cc
      * Focus and Delete atoms. */
 
     if (window->getValid()) {
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_SystemX11.h
rename to intern/ghost/intern/GHOST_SystemX11.hh
index a2e0f097d9f..4314063f2ba 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.hh
@@ -12,7 +12,7 @@
 #include <X11/Xlib.h>
 
 #include "../GHOST_Types.h"
-#include "GHOST_System.h"
+#include "GHOST_System.hh"
 
 /* For tablets. */
 #ifdef WITH_X11_XINPUT
diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_TaskbarWin32.h
rename to intern/ghost/intern/GHOST_TaskbarWin32.hh
diff --git a/intern/ghost/intern/GHOST_TaskbarX11.cpp b/intern/ghost/intern/GHOST_TaskbarX11.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_TaskbarX11.cpp
rename to intern/ghost/intern/GHOST_TaskbarX11.cc
index 1e568c3a2b0..139f0aa688d 100644
--- a/intern/ghost/intern/GHOST_TaskbarX11.cpp
+++ b/intern/ghost/intern/GHOST_TaskbarX11.cc
@@ -4,7 +4,7 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_TaskbarX11.h"
+#include "GHOST_TaskbarX11.hh"
 
 #include <cassert>
 #include <cstdio>
diff --git a/intern/ghost/intern/GHOST_TaskbarX11.h b/intern/ghost/intern/GHOST_TaskbarX11.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_TaskbarX11.h
rename to intern/ghost/intern/GHOST_TaskbarX11.hh
diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cc
similarity index 97%
rename from intern/ghost/intern/GHOST_TimerManager.cpp
rename to intern/ghost/intern/GHOST_TimerManager.cc
index ca881c74acd..f0541dbf447 100644
--- a/intern/ghost/intern/GHOST_TimerManager.cpp
+++ b/intern/ghost/intern/GHOST_TimerManager.cc
@@ -9,11 +9,11 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_TimerManager.h"
+#include "GHOST_TimerManager.hh"
 
 #include <algorithm>
 
-#include "GHOST_TimerTask.h"
+#include "GHOST_TimerTask.hh"
 
 GHOST_TimerManager::GHOST_TimerManager() {}
 
diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_TimerManager.h
rename to intern/ghost/intern/GHOST_TimerManager.hh
diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_TimerTask.h
rename to intern/ghost/intern/GHOST_TimerTask.hh
index 8ca8e36837e..6b39b788d9b 100644
--- a/intern/ghost/intern/GHOST_TimerTask.h
+++ b/intern/ghost/intern/GHOST_TimerTask.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_ITimerTask.h"
+#include "GHOST_ITimerTask.hh"
 
 /**
  * Implementation of a timer task.
diff --git a/intern/ghost/intern/GHOST_TrackpadWin32.cpp b/intern/ghost/intern/GHOST_TrackpadWin32.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_TrackpadWin32.cpp
rename to intern/ghost/intern/GHOST_TrackpadWin32.cc
index 4d5ce6fabe1..d19b0469123 100644
--- a/intern/ghost/intern/GHOST_TrackpadWin32.cpp
+++ b/intern/ghost/intern/GHOST_TrackpadWin32.cc
@@ -6,8 +6,8 @@
 
 #include <cmath>
 
-#include "GHOST_Debug.h"
-#include "GHOST_TrackpadWin32.h"
+#include "GHOST_Debug.hh"
+#include "GHOST_TrackpadWin32.hh"
 
 GHOST_DirectManipulationHelper::GHOST_DirectManipulationHelper(
     HWND hWnd,
diff --git a/intern/ghost/intern/GHOST_TrackpadWin32.h b/intern/ghost/intern/GHOST_TrackpadWin32.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_TrackpadWin32.h
rename to intern/ghost/intern/GHOST_TrackpadWin32.hh
diff --git a/intern/ghost/intern/GHOST_Util.h b/intern/ghost/intern/GHOST_Util.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_Util.h
rename to intern/ghost/intern/GHOST_Util.hh
diff --git a/intern/ghost/intern/GHOST_WaylandCursorSettings.h b/intern/ghost/intern/GHOST_WaylandCursorSettings.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_WaylandCursorSettings.h
rename to intern/ghost/intern/GHOST_WaylandCursorSettings.hh
diff --git a/intern/ghost/intern/GHOST_WaylandUtils.h b/intern/ghost/intern/GHOST_WaylandUtils.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_WaylandUtils.h
rename to intern/ghost/intern/GHOST_WaylandUtils.hh
diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_Window.cpp
rename to intern/ghost/intern/GHOST_Window.cc
index aeff3e8df0a..12d83180fb0 100644
--- a/intern/ghost/intern/GHOST_Window.cpp
+++ b/intern/ghost/intern/GHOST_Window.cc
@@ -9,9 +9,9 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_Window.h"
+#include "GHOST_Window.hh"
 
-#include "GHOST_ContextNone.h"
+#include "GHOST_ContextNone.hh"
 
 #include <cassert>
 
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_Window.h
rename to intern/ghost/intern/GHOST_Window.hh
index 85d7babfb56..d9d65832dfe 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_IWindow.h"
+#include "GHOST_IWindow.hh"
 
 class GHOST_Context;
 
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowCocoa.h
rename to intern/ghost/intern/GHOST_WindowCocoa.hh
index 35daa9ec2a3..36bdd314e47 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowCocoa.hh
@@ -12,9 +12,9 @@
 #  error Apple OSX only!
 #endif  // __APPLE__
 
-#include "GHOST_Window.h"
+#include "GHOST_Window.hh"
 #ifdef WITH_INPUT_IME
-#  include "GHOST_Event.h"
+#  include "GHOST_Event.hh"
 #endif
 
 @class CAMetalLayer;
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index dd25ce56cf8..58b82673735 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
  * Copyright 2001-2002 NaN Holding BV. All rights reserved. */
 
-#include "GHOST_WindowCocoa.h"
-#include "GHOST_ContextNone.h"
-#include "GHOST_Debug.h"
-#include "GHOST_SystemCocoa.h"
+#include "GHOST_WindowCocoa.hh"
+#include "GHOST_ContextNone.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_SystemCocoa.hh"
 
 /* Don't generate OpenGL deprecation warning. This is a known thing, and is not something easily
  * solvable in a short term. */
@@ -12,10 +12,10 @@
 #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "GHOST_ContextCGL.h"
+#include "GHOST_ContextCGL.hh"
 
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #include <Cocoa/Cocoa.h>
@@ -264,13 +264,13 @@
 /* NSView for handling input and drawing. */
 #define COCOA_VIEW_CLASS CocoaOpenGLView
 #define COCOA_VIEW_BASE_CLASS NSOpenGLView
-#include "GHOST_WindowViewCocoa.h"
+#include "GHOST_WindowViewCocoa.hh"
 #undef COCOA_VIEW_CLASS
 #undef COCOA_VIEW_BASE_CLASS
 
 #define COCOA_VIEW_CLASS CocoaMetalView
 #define COCOA_VIEW_BASE_CLASS NSView
-#include "GHOST_WindowViewCocoa.h"
+#include "GHOST_WindowViewCocoa.hh"
 #undef COCOA_VIEW_CLASS
 #undef COCOA_VIEW_BASE_CLASS
 
diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cc
similarity index 97%
rename from intern/ghost/intern/GHOST_WindowManager.cpp
rename to intern/ghost/intern/GHOST_WindowManager.cc
index e8785cbdb24..33a45a09669 100644
--- a/intern/ghost/intern/GHOST_WindowManager.cpp
+++ b/intern/ghost/intern/GHOST_WindowManager.cc
@@ -9,9 +9,9 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_WindowManager.h"
-#include "GHOST_Debug.h"
-#include "GHOST_Window.h"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_Debug.hh"
+#include "GHOST_Window.hh"
 #include <algorithm>
 
 GHOST_WindowManager::GHOST_WindowManager()
diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_WindowManager.h
rename to intern/ghost/intern/GHOST_WindowManager.hh
index 79645bc68ed..ece949d622d 100644
--- a/intern/ghost/intern/GHOST_WindowManager.h
+++ b/intern/ghost/intern/GHOST_WindowManager.hh
@@ -10,8 +10,8 @@
 
 #include <vector>
 
-#include "GHOST_IWindow.h"
-#include "GHOST_Rect.h"
+#include "GHOST_IWindow.hh"
+#include "GHOST_Rect.hh"
 
 /**
  * Manages system windows (platform independent implementation).
diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowNULL.h
rename to intern/ghost/intern/GHOST_WindowNULL.hh
index f9c0a593d5f..3749206d2ed 100644
--- a/intern/ghost/intern/GHOST_WindowNULL.h
+++ b/intern/ghost/intern/GHOST_WindowNULL.hh
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GHOST_Window.h"
+#include "GHOST_Window.hh"
 
 #include <map>
 
diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowSDL.cpp
rename to intern/ghost/intern/GHOST_WindowSDL.cc
index f0d5f5d93ab..5783c8005dc 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.cpp
+++ b/intern/ghost/intern/GHOST_WindowSDL.cc
@@ -4,10 +4,10 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_WindowSDL.h"
+#include "GHOST_WindowSDL.hh"
 #include "SDL_mouse.h"
 
-#include "GHOST_ContextSDL.h"
+#include "GHOST_ContextSDL.hh"
 
 #include <cassert>
 
diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_WindowSDL.h
rename to intern/ghost/intern/GHOST_WindowSDL.hh
index 49ff3ace6c3..807fb7ec72a 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.h
+++ b/intern/ghost/intern/GHOST_WindowSDL.hh
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "GHOST_SystemSDL.h"
-#include "GHOST_Window.h"
+#include "GHOST_SystemSDL.hh"
+#include "GHOST_Window.hh"
 
 #include <map>
 
diff --git a/intern/ghost/intern/GHOST_WindowViewCocoa.h b/intern/ghost/intern/GHOST_WindowViewCocoa.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_WindowViewCocoa.h
rename to intern/ghost/intern/GHOST_WindowViewCocoa.hh
diff --git a/intern/ghost/intern/GHOST_WindowWayland.cpp b/intern/ghost/intern/GHOST_WindowWayland.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowWayland.cpp
rename to intern/ghost/intern/GHOST_WindowWayland.cc
index 3108ff01799..b51cfc68635 100644
--- a/intern/ghost/intern/GHOST_WindowWayland.cpp
+++ b/intern/ghost/intern/GHOST_WindowWayland.cc
@@ -4,18 +4,18 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_WindowWayland.h"
-#include "GHOST_SystemWayland.h"
-#include "GHOST_WaylandUtils.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_WindowWayland.hh"
+#include "GHOST_SystemWayland.hh"
+#include "GHOST_WaylandUtils.hh"
+#include "GHOST_WindowManager.hh"
+#include "GHOST_utildefines.hh"
 
-#include "GHOST_Event.h"
+#include "GHOST_Event.hh"
 
-#include "GHOST_ContextEGL.h"
-#include "GHOST_ContextNone.h"
+#include "GHOST_ContextEGL.hh"
+#include "GHOST_ContextNone.hh"
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #include <wayland-client-protocol.h>
diff --git a/intern/ghost/intern/GHOST_WindowWayland.h b/intern/ghost/intern/GHOST_WindowWayland.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowWayland.h
rename to intern/ghost/intern/GHOST_WindowWayland.hh
index e04be48a5e9..150905f4649 100644
--- a/intern/ghost/intern/GHOST_WindowWayland.h
+++ b/intern/ghost/intern/GHOST_WindowWayland.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Window.h"
+#include "GHOST_Window.hh"
 
 #include <vector>
 
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowWin32.cpp
rename to intern/ghost/intern/GHOST_WindowWin32.cc
index 06d9ea939e0..b8b8e14f400 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cc
@@ -5,18 +5,18 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_WindowWin32.h"
-#include "GHOST_ContextD3D.h"
-#include "GHOST_ContextNone.h"
-#include "GHOST_DropTargetWin32.h"
-#include "GHOST_SystemWin32.h"
-#include "GHOST_WindowManager.h"
+#include "GHOST_WindowWin32.hh"
+#include "GHOST_ContextD3D.hh"
+#include "GHOST_ContextNone.hh"
+#include "GHOST_DropTargetWin32.hh"
+#include "GHOST_SystemWin32.hh"
+#include "GHOST_WindowManager.hh"
 #include "utf_winfunc.h"
 #include "utfconv.h"
 
-#include "GHOST_ContextWGL.h"
+#include "GHOST_ContextWGL.hh"
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 #include <Dwmapi.h>
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_WindowWin32.h
rename to intern/ghost/intern/GHOST_WindowWin32.hh
index 44071f0915e..cb6a11691d5 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.hh
@@ -12,12 +12,12 @@
 #  error WIN32 only!
 #endif /* WIN32 */
 
-#include "GHOST_TaskbarWin32.h"
-#include "GHOST_TrackpadWin32.h"
-#include "GHOST_Window.h"
-#include "GHOST_Wintab.h"
+#include "GHOST_TaskbarWin32.hh"
+#include "GHOST_TrackpadWin32.hh"
+#include "GHOST_Window.hh"
+#include "GHOST_Wintab.hh"
 #ifdef WITH_INPUT_IME
-#  include "GHOST_ImeWin32.h"
+#  include "GHOST_ImeWin32.hh"
 #endif
 
 #include <vector>
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_WindowX11.cpp
rename to intern/ghost/intern/GHOST_WindowX11.cc
index 3e93fdc0b08..ae91a0c3580 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cc
@@ -11,21 +11,21 @@
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 
-#include "GHOST_Debug.h"
-#include "GHOST_IconX11.h"
-#include "GHOST_SystemX11.h"
+#include "GHOST_Debug.hh"
+#include "GHOST_IconX11.hh"
+#include "GHOST_SystemX11.hh"
 #include "GHOST_Types.h"
-#include "GHOST_WindowX11.h"
-#include "GHOST_utildefines.h"
+#include "GHOST_WindowX11.hh"
+#include "GHOST_utildefines.hh"
 
 #ifdef WITH_XDND
-#  include "GHOST_DropTargetX11.h"
+#  include "GHOST_DropTargetX11.hh"
 #endif
 
-#include "GHOST_ContextEGL.h"
-#include "GHOST_ContextGLX.h"
+#include "GHOST_ContextEGL.hh"
+#include "GHOST_ContextGLX.hh"
 #ifdef WITH_VULKAN_BACKEND
-#  include "GHOST_ContextVK.h"
+#  include "GHOST_ContextVK.hh"
 #endif
 
 /* For #XIWarpPointer. */
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_WindowX11.h
rename to intern/ghost/intern/GHOST_WindowX11.hh
index f9dac3b2ac7..36cd2cbe26c 100644
--- a/intern/ghost/intern/GHOST_WindowX11.h
+++ b/intern/ghost/intern/GHOST_WindowX11.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_Window.h"
+#include "GHOST_Window.hh"
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 /* For tablets. */
@@ -16,7 +16,7 @@
 #  include <X11/extensions/XInput.h>
 #endif
 
-#include "GHOST_TaskbarX11.h"
+#include "GHOST_TaskbarX11.hh"
 
 #include <map>
 
@@ -147,7 +147,7 @@ class GHOST_WindowX11 : public GHOST_Window {
   /*
    * Need this in case that we want start the window
    * in FullScree or Maximized state.
-   * Check GHOST_WindowX11.cpp
+   * Check GHOST_WindowX11.cc
    */
   bool m_post_init;
   GHOST_TWindowState m_post_state;
diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_Wintab.cpp
rename to intern/ghost/intern/GHOST_Wintab.cc
index f7075efcbdd..784b71d21ef 100644
--- a/intern/ghost/intern/GHOST_Wintab.cpp
+++ b/intern/ghost/intern/GHOST_Wintab.cc
@@ -6,7 +6,7 @@
 
 #define _USE_MATH_DEFINES
 
-#include "GHOST_Wintab.h"
+#include "GHOST_Wintab.hh"
 
 GHOST_Wintab *GHOST_Wintab::loadWintab(HWND hwnd)
 {
diff --git a/intern/ghost/intern/GHOST_Wintab.h b/intern/ghost/intern/GHOST_Wintab.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_Wintab.h
rename to intern/ghost/intern/GHOST_Wintab.hh
diff --git a/intern/ghost/intern/GHOST_Xr.cpp b/intern/ghost/intern/GHOST_Xr.cc
similarity index 91%
rename from intern/ghost/intern/GHOST_Xr.cpp
rename to intern/ghost/intern/GHOST_Xr.cc
index f32200102cd..72e1d5a0045 100644
--- a/intern/ghost/intern/GHOST_Xr.cpp
+++ b/intern/ghost/intern/GHOST_Xr.cc
@@ -11,9 +11,9 @@
 
 #include "GHOST_C-api.h"
 
-#include "GHOST_XrContext.h"
-#include "GHOST_XrException.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_XrContext.hh"
+#include "GHOST_XrException.hh"
+#include "GHOST_Xr_intern.hh"
 
 GHOST_XrContextHandle GHOST_XrContextCreate(const GHOST_XrContextCreateInfo *create_info)
 {
diff --git a/intern/ghost/intern/GHOST_XrAction.cpp b/intern/ghost/intern/GHOST_XrAction.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_XrAction.cpp
rename to intern/ghost/intern/GHOST_XrAction.cc
index 9fbe033ade9..79ec9dfcb15 100644
--- a/intern/ghost/intern/GHOST_XrAction.cpp
+++ b/intern/ghost/intern/GHOST_XrAction.cc
@@ -9,10 +9,10 @@
 
 #include "GHOST_Types.h"
 
-#include "GHOST_XrException.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_XrException.hh"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_XrAction.h"
+#include "GHOST_XrAction.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name GHOST_XrActionSpace
diff --git a/intern/ghost/intern/GHOST_XrAction.h b/intern/ghost/intern/GHOST_XrAction.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_XrAction.h
rename to intern/ghost/intern/GHOST_XrAction.hh
index 956ff342dc4..0b1e9760026 100644
--- a/intern/ghost/intern/GHOST_XrAction.h
+++ b/intern/ghost/intern/GHOST_XrAction.hh
@@ -13,7 +13,7 @@
 #include <memory>
 #include <string>
 
-#include "GHOST_Util.h"
+#include "GHOST_Util.hh"
 
 /* -------------------------------------------------------------------- */
 
diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_XrContext.cpp
rename to intern/ghost/intern/GHOST_XrContext.cc
index 413e2670750..66ebb3c01c6 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cc
@@ -13,11 +13,11 @@
 #include <string_view>
 
 #include "GHOST_Types.h"
-#include "GHOST_XrException.h"
-#include "GHOST_XrSession.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_XrException.hh"
+#include "GHOST_XrSession.hh"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_XrContext.h"
+#include "GHOST_XrContext.hh"
 
 struct OpenXRInstanceData {
   XrInstance instance = XR_NULL_HANDLE;
diff --git a/intern/ghost/intern/GHOST_XrContext.h b/intern/ghost/intern/GHOST_XrContext.hh
similarity index 98%
rename from intern/ghost/intern/GHOST_XrContext.h
rename to intern/ghost/intern/GHOST_XrContext.hh
index 6eac4284e43..98f0991d3ff 100644
--- a/intern/ghost/intern/GHOST_XrContext.h
+++ b/intern/ghost/intern/GHOST_XrContext.hh
@@ -9,9 +9,9 @@
 #include <memory>
 #include <vector>
 
-#include "GHOST_Xr_intern.h"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_IXrContext.h"
+#include "GHOST_IXrContext.hh"
 
 struct OpenXRInstanceData;
 
diff --git a/intern/ghost/intern/GHOST_XrControllerModel.cpp b/intern/ghost/intern/GHOST_XrControllerModel.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_XrControllerModel.cpp
rename to intern/ghost/intern/GHOST_XrControllerModel.cc
index 0a8b0dcb003..55b76f51237 100644
--- a/intern/ghost/intern/GHOST_XrControllerModel.cpp
+++ b/intern/ghost/intern/GHOST_XrControllerModel.cc
@@ -10,10 +10,10 @@
 #include <Eigen/Geometry>
 
 #include "GHOST_Types.h"
-#include "GHOST_XrException.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_XrException.hh"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_XrControllerModel.h"
+#include "GHOST_XrControllerModel.hh"
 
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_STB_IMAGE
diff --git a/intern/ghost/intern/GHOST_XrControllerModel.h b/intern/ghost/intern/GHOST_XrControllerModel.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_XrControllerModel.h
rename to intern/ghost/intern/GHOST_XrControllerModel.hh
diff --git a/intern/ghost/intern/GHOST_XrEvent.cpp b/intern/ghost/intern/GHOST_XrEvent.cc
similarity index 95%
rename from intern/ghost/intern/GHOST_XrEvent.cpp
rename to intern/ghost/intern/GHOST_XrEvent.cc
index 8a251439128..8097422275a 100644
--- a/intern/ghost/intern/GHOST_XrEvent.cpp
+++ b/intern/ghost/intern/GHOST_XrEvent.cc
@@ -7,8 +7,8 @@
 #include <iostream>
 
 #include "GHOST_C-api.h"
-#include "GHOST_XrContext.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_XrContext.hh"
+#include "GHOST_Xr_intern.hh"
 
 static bool GHOST_XrEventPollNext(XrInstance instance, XrEventDataBuffer &r_event_data)
 {
diff --git a/intern/ghost/intern/GHOST_XrException.h b/intern/ghost/intern/GHOST_XrException.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_XrException.h
rename to intern/ghost/intern/GHOST_XrException.hh
diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cc
similarity index 98%
rename from intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
rename to intern/ghost/intern/GHOST_XrGraphicsBinding.cc
index d387b222538..70099ac4dcc 100644
--- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cc
@@ -9,24 +9,24 @@
 #include <sstream>
 
 #if defined(WITH_GHOST_X11)
-#  include "GHOST_ContextEGL.h"
-#  include "GHOST_ContextGLX.h"
-#  include "GHOST_SystemX11.h"
+#  include "GHOST_ContextEGL.hh"
+#  include "GHOST_ContextGLX.hh"
+#  include "GHOST_SystemX11.hh"
 #endif
 #if defined(WITH_GHOST_WAYLAND)
-#  include "GHOST_ContextEGL.h"
-#  include "GHOST_SystemWayland.h"
+#  include "GHOST_ContextEGL.hh"
+#  include "GHOST_SystemWayland.hh"
 #endif
 #if defined(WIN32)
-#  include "GHOST_ContextD3D.h"
-#  include "GHOST_ContextWGL.h"
-#  include "GHOST_SystemWin32.h"
+#  include "GHOST_ContextD3D.hh"
+#  include "GHOST_ContextWGL.hh"
+#  include "GHOST_SystemWin32.hh"
 #endif
 #include "GHOST_C-api.h"
-#include "GHOST_XrException.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_XrException.hh"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_IXrGraphicsBinding.h"
+#include "GHOST_IXrGraphicsBinding.hh"
 
 static std::optional<int64_t> choose_swapchain_format_from_candidates(
     const std::vector<int64_t> &gpu_binding_formats, const std::vector<int64_t> &runtime_formats)
diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cc
similarity index 99%
rename from intern/ghost/intern/GHOST_XrSession.cpp
rename to intern/ghost/intern/GHOST_XrSession.cc
index e8f9b96b15c..6a874a7f2c0 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cc
@@ -13,15 +13,15 @@
 
 #include "GHOST_C-api.h"
 
-#include "GHOST_IXrGraphicsBinding.h"
-#include "GHOST_XrAction.h"
-#include "GHOST_XrContext.h"
-#include "GHOST_XrControllerModel.h"
-#include "GHOST_XrException.h"
-#include "GHOST_XrSwapchain.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_IXrGraphicsBinding.hh"
+#include "GHOST_XrAction.hh"
+#include "GHOST_XrContext.hh"
+#include "GHOST_XrControllerModel.hh"
+#include "GHOST_XrException.hh"
+#include "GHOST_XrSwapchain.hh"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_XrSession.h"
+#include "GHOST_XrSession.hh"
 
 struct OpenXRSessionData {
   XrSystemId system_id = XR_NULL_SYSTEM_ID;
diff --git a/intern/ghost/intern/GHOST_XrSession.h b/intern/ghost/intern/GHOST_XrSession.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_XrSession.h
rename to intern/ghost/intern/GHOST_XrSession.hh
index 5e0cdbbc1fc..e7f7fa6db6f 100644
--- a/intern/ghost/intern/GHOST_XrSession.h
+++ b/intern/ghost/intern/GHOST_XrSession.hh
@@ -9,7 +9,7 @@
 #include <map>
 #include <memory>
 
-#include "GHOST_Xr_intern.h"
+#include "GHOST_Xr_intern.hh"
 
 class GHOST_XrContext;
 class GHOST_XrSwapchain;
diff --git a/intern/ghost/intern/GHOST_XrSwapchain.cpp b/intern/ghost/intern/GHOST_XrSwapchain.cc
similarity index 96%
rename from intern/ghost/intern/GHOST_XrSwapchain.cpp
rename to intern/ghost/intern/GHOST_XrSwapchain.cc
index 8f4514954f0..9a7116e9c1d 100644
--- a/intern/ghost/intern/GHOST_XrSwapchain.cpp
+++ b/intern/ghost/intern/GHOST_XrSwapchain.cc
@@ -8,12 +8,12 @@
 
 #include "GHOST_C-api.h"
 
-#include "GHOST_IXrGraphicsBinding.h"
-#include "GHOST_XrException.h"
-#include "GHOST_XrSession.h"
-#include "GHOST_Xr_intern.h"
+#include "GHOST_IXrGraphicsBinding.hh"
+#include "GHOST_XrException.hh"
+#include "GHOST_XrSession.hh"
+#include "GHOST_Xr_intern.hh"
 
-#include "GHOST_XrSwapchain.h"
+#include "GHOST_XrSwapchain.hh"
 
 struct OpenXRSwapchainData {
   using ImageVec = std::vector<XrSwapchainImageBaseHeader *>;
diff --git a/intern/ghost/intern/GHOST_XrSwapchain.h b/intern/ghost/intern/GHOST_XrSwapchain.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_XrSwapchain.h
rename to intern/ghost/intern/GHOST_XrSwapchain.hh
diff --git a/intern/ghost/intern/GHOST_Xr_intern.h b/intern/ghost/intern/GHOST_Xr_intern.hh
similarity index 97%
rename from intern/ghost/intern/GHOST_Xr_intern.h
rename to intern/ghost/intern/GHOST_Xr_intern.hh
index 8c542762b91..bc12604842e 100644
--- a/intern/ghost/intern/GHOST_Xr_intern.h
+++ b/intern/ghost/intern/GHOST_Xr_intern.hh
@@ -9,7 +9,7 @@
 #include <memory>
 #include <vector>
 
-#include "GHOST_Xr_openxr_includes.h"
+#include "GHOST_Xr_openxr_includes.hh"
 
 #define CHECK_XR(call, error_msg) \
   { \
diff --git a/intern/ghost/intern/GHOST_Xr_openxr_includes.h b/intern/ghost/intern/GHOST_Xr_openxr_includes.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_Xr_openxr_includes.h
rename to intern/ghost/intern/GHOST_Xr_openxr_includes.hh
diff --git a/intern/ghost/intern/GHOST_utildefines.h b/intern/ghost/intern/GHOST_utildefines.hh
similarity index 99%
rename from intern/ghost/intern/GHOST_utildefines.h
rename to intern/ghost/intern/GHOST_utildefines.hh
index ff092099c7c..4cb834514d5 100644
--- a/intern/ghost/intern/GHOST_utildefines.h
+++ b/intern/ghost/intern/GHOST_utildefines.hh
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "GHOST_utildefines_variadic.h"
+#include "GHOST_utildefines_variadic.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name Branch Prediction Macros
diff --git a/intern/ghost/intern/GHOST_utildefines_variadic.h b/intern/ghost/intern/GHOST_utildefines_variadic.hh
similarity index 100%
rename from intern/ghost/intern/GHOST_utildefines_variadic.h
rename to intern/ghost/intern/GHOST_utildefines_variadic.hh
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index 818cbc38e95..935f233cc96 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -27,11 +27,11 @@
 #  include <GL/gl.h>
 #endif  // defined(WIN32) || defined(__APPLE__)
 
-#include "GHOST_Rect.h"
+#include "GHOST_Rect.hh"
 
-#include "GHOST_IEvent.h"
-#include "GHOST_IEventConsumer.h"
-#include "GHOST_ISystem.h"
+#include "GHOST_IEvent.hh"
+#include "GHOST_IEventConsumer.hh"
+#include "GHOST_ISystem.hh"
 
 #define LEFT_EYE 0
 #define RIGHT_EYE 1
diff --git a/scripts/modules/bl_ui_utils/bug_report_url.py b/scripts/modules/bl_ui_utils/bug_report_url.py
index 16bd6692d78..ee66485a550 100644
--- a/scripts/modules/bl_ui_utils/bug_report_url.py
+++ b/scripts/modules/bl_ui_utils/bug_report_url.py
@@ -13,11 +13,21 @@ def url_prefill_from_blender(*, addon_info=None):
 
     fh.write("**System Information**\n")
     fh.write(
-        "Operating system: %s %d Bits\n" % (
+        "Operating system: %s %d Bits" % (
             platform.platform(),
             struct.calcsize("P") * 8,
         )
     )
+    # Windowing Environment (include when dynamically selectable).
+    # This lets us know if WAYLAND/X11 is in use.
+    from _bpy import _ghost_backend
+    ghost_backend = _ghost_backend()
+    if ghost_backend not in {'NONE', 'DEFAULT'}:
+        fh.write(", %s UI" % ghost_backend)
+    del _ghost_backend, ghost_backend
+
+    fh.write("\n")
+
     fh.write(
         "Graphics card: %s %s %s\n" % (
             gpu.platform.renderer_get(),
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 369404724ba..87ba54af1d7 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -25,7 +25,7 @@
 
 #include "BLT_translation.h"
 
-#include "GHOST_Path-api.h"
+#include "GHOST_Path-api.hh"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/layer_test.cc b/source/blender/blenkernel/intern/layer_test.cc
index c332c67342b..9dccef76649 100644
--- a/source/blender/blenkernel/intern/layer_test.cc
+++ b/source/blender/blenkernel/intern/layer_test.cc
@@ -19,7 +19,7 @@
 #include "RNA_access.h"
 #include "RNA_prototypes.h"
 
-#include "GHOST_Path-api.h"
+#include "GHOST_Path-api.hh"
 
 namespace blender::bke::tests {
 
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index bd794a9cc89..c3e7e53c439 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -1745,19 +1745,19 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
 
   /* Store layer names since they will be removed, used to set the active status of new layers.
    * Use intermediate #StringRef because the names can be null. */
-  const std::string active_uv = StringRef(
-      CustomData_get_active_layer_name(&mesh->ldata, CD_MLOOPUV));
-  const std::string default_uv = StringRef(
-      CustomData_get_render_layer_name(&mesh->ldata, CD_MLOOPUV));
 
-  Vector<std::string> uv_layers_to_convert;
-  for (const int uv_layer_i : IndexRange(CustomData_number_of_layers(&mesh->ldata, CD_MLOOPUV))) {
-    uv_layers_to_convert.append(CustomData_get_layer_name(&mesh->ldata, CD_MLOOPUV, uv_layer_i));
+  Array<std::string> uv_names(CustomData_number_of_layers(&mesh->ldata, CD_MLOOPUV));
+  for (const int i : uv_names.index_range()) {
+    uv_names[i] = CustomData_get_layer_name(&mesh->ldata, CD_MLOOPUV, i);
   }
+  const int active_name_i = uv_names.as_span().first_index_try(
+      StringRef(CustomData_get_active_layer_name(&mesh->ldata, CD_MLOOPUV)));
+  const int default_name_i = uv_names.as_span().first_index_try(
+      StringRef(CustomData_get_render_layer_name(&mesh->ldata, CD_MLOOPUV)));
 
-  for (const StringRefNull name : uv_layers_to_convert) {
+  for (const int i : uv_names.index_range()) {
     const MLoopUV *mloopuv = static_cast<const MLoopUV *>(
-        CustomData_get_layer_named(&mesh->ldata, CD_MLOOPUV, name.c_str()));
+        CustomData_get_layer_named(&mesh->ldata, CD_MLOOPUV, uv_names[i].c_str()));
     const uint32_t needed_boolean_attributes = threading::parallel_reduce(
         IndexRange(mesh->totloop),
         4096,
@@ -1808,41 +1808,52 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
       }
     });
 
-    CustomData_free_layer_named(&mesh->ldata, name.c_str(), mesh->totloop);
+    CustomData_free_layer_named(&mesh->ldata, uv_names[i].c_str(), mesh->totloop);
+
+    char new_name[MAX_CUSTOMDATA_LAYER_NAME];
+    BKE_id_attribute_calc_unique_name(&mesh->id, uv_names[i].c_str(), new_name);
+    uv_names[i] = new_name;
+
     CustomData_add_layer_named_with_data(
-        &mesh->ldata, CD_PROP_FLOAT2, coords, mesh->totloop, name.c_str());
+        &mesh->ldata, CD_PROP_FLOAT2, coords, mesh->totloop, new_name);
     char buffer[MAX_CUSTOMDATA_LAYER_NAME];
     if (vert_selection) {
       CustomData_add_layer_named_with_data(&mesh->ldata,
                                            CD_PROP_BOOL,
                                            vert_selection,
                                            mesh->totloop,
-                                           BKE_uv_map_vert_select_name_get(name.c_str(), buffer));
+                                           BKE_uv_map_vert_select_name_get(new_name, buffer));
     }
     if (edge_selection) {
       CustomData_add_layer_named_with_data(&mesh->ldata,
                                            CD_PROP_BOOL,
                                            edge_selection,
                                            mesh->totloop,
-                                           BKE_uv_map_edge_select_name_get(name.c_str(), buffer));
+                                           BKE_uv_map_edge_select_name_get(new_name, buffer));
     }
     if (pin) {
       CustomData_add_layer_named_with_data(&mesh->ldata,
                                            CD_PROP_BOOL,
                                            pin,
                                            mesh->totloop,
-                                           BKE_uv_map_pin_name_get(name.c_str(), buffer));
+                                           BKE_uv_map_pin_name_get(new_name, buffer));
     }
   }
 
-  CustomData_set_layer_active_index(
-      &mesh->ldata,
-      CD_PROP_FLOAT2,
-      CustomData_get_named_layer_index(&mesh->ldata, CD_PROP_FLOAT2, active_uv.c_str()));
-  CustomData_set_layer_render_index(
-      &mesh->ldata,
-      CD_PROP_FLOAT2,
-      CustomData_get_named_layer_index(&mesh->ldata, CD_PROP_FLOAT2, default_uv.c_str()));
+  if (active_name_i != -1) {
+    CustomData_set_layer_active_index(
+        &mesh->ldata,
+        CD_PROP_FLOAT2,
+        CustomData_get_named_layer_index(
+            &mesh->ldata, CD_PROP_FLOAT2, uv_names[active_name_i].c_str()));
+  }
+  if (default_name_i != -1) {
+    CustomData_set_layer_render_index(
+        &mesh->ldata,
+        CD_PROP_FLOAT2,
+        CustomData_get_named_layer_index(
+            &mesh->ldata, CD_PROP_FLOAT2, uv_names[default_name_i].c_str()));
+  }
 }
 
 /** \name Selection Attribute and Legacy Flag Conversion
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.cc b/source/blender/blenkernel/intern/subsurf_ccg.cc
index c68b963d89d..938d782c2b8 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.cc
+++ b/source/blender/blenkernel/intern/subsurf_ccg.cc
@@ -874,7 +874,6 @@ struct CopyFinalLoopArrayData {
   int grid_size;
   int *grid_offset;
   int edge_size;
-  size_t mloop_index;
 };
 
 static void copyFinalLoopArray_task_cb(void *__restrict userdata,
@@ -926,24 +925,6 @@ static void ccgDM_copyFinalCornerVertArray(DerivedMesh *dm, int *r_corner_verts)
   CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
   CCGSubSurf *ss = ccgdm->ss;
 
-  if (!ccgdm->ehash) {
-    BLI_mutex_lock(&ccgdm->loops_cache_lock);
-    if (!ccgdm->ehash) {
-      MEdge *edges;
-      EdgeHash *ehash;
-
-      ehash = BLI_edgehash_new_ex(__func__, ccgdm->dm.numEdgeData);
-      edges = ccgdm->dm.getEdgeArray((DerivedMesh *)ccgdm);
-
-      for (int i = 0; i < ccgdm->dm.numEdgeData; i++) {
-        BLI_edgehash_insert(ehash, edges[i].v1, edges[i].v2, POINTER_FROM_INT(i));
-      }
-
-      atomic_cas_ptr((void **)&ccgdm->ehash, ccgdm->ehash, ehash);
-    }
-    BLI_mutex_unlock(&ccgdm->loops_cache_lock);
-  }
-
   CopyFinalLoopArrayData data;
   data.ccgdm = ccgdm;
   data.corner_verts = r_corner_verts;
@@ -952,12 +933,6 @@ static void ccgDM_copyFinalCornerVertArray(DerivedMesh *dm, int *r_corner_verts)
   data.grid_offset = dm->getGridOffset(dm);
   data.edge_size = ccgSubSurf_getEdgeSize(ss);
 
-  /* NOTE: For a dense subdivision we've got enough work for each face and
-   * hence can dedicate whole thread to single face. For less dense
-   * subdivision we handle multiple faces per thread.
-   */
-  data.mloop_index = data.grid_size >= 5 ? 1 : 8;
-
   TaskParallelSettings settings;
   BLI_parallel_range_settings_defaults(&settings);
   settings.min_iter_per_thread = 1;
@@ -997,12 +972,6 @@ static void ccgDM_copyFinalCornerEdgeArray(DerivedMesh *dm, int *r_corner_edges)
   data.grid_offset = dm->getGridOffset(dm);
   data.edge_size = ccgSubSurf_getEdgeSize(ss);
 
-  /* NOTE: For a dense subdivision we've got enough work for each face and
-   * hence can dedicate whole thread to single face. For less dense
-   * subdivision we handle multiple faces per thread.
-   */
-  data.mloop_index = data.grid_size >= 5 ? 1 : 8;
-
   TaskParallelSettings settings;
   BLI_parallel_range_settings_defaults(&settings);
   settings.min_iter_per_thread = 1;
diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 3df7905dc29..708f842b6da 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -1036,7 +1036,7 @@ static void version_geometry_nodes_extrude_smooth_propagation(bNodeTree &ntree)
     nodeAddLink(&ntree,
                 capture_node,
                 nodeFindSocket(capture_node, SOCK_OUT, "Geometry"),
-                capture_node,
+                node,
                 geometry_in_socket);
     geometry_in_link->tonode = capture_node;
     geometry_in_link->tosock = nodeFindSocket(capture_node, SOCK_IN, "Geometry");
diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
index 6613c65c42a..4778cf5db39 100644
--- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc
+++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
@@ -39,7 +39,7 @@
 #include "WM_api.h"
 #include "wm.h"
 
-#include "GHOST_Path-api.h"
+#include "GHOST_Path-api.hh"
 
 #include "CLG_log.h"
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h b/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
index cb06ee74ec7..6503a97aab8 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
+++ b/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
@@ -25,49 +25,49 @@ typedef struct CommonUniformBlock CommonUniformBlock;
 #endif
 
 struct CommonUniformBlock {
-  mat4 pastViewProjectionMatrix;
-  vec4 hizUvScale; /* To correct mip level texel misalignment */
+  mat4 _pastViewProjectionMatrix;
+  vec4 _hizUvScale; /* To correct mip level texel misalignment */
   /* Ambient Occlusion */
-  vec4 aoParameters[2];
+  vec4 _aoParameters[2];
   /* Volumetric */
-  ivec4 volTexSize;
-  vec4 volDepthParameters; /* Parameters to the volume Z equation */
-  vec4 volInvTexSize;
-  vec4 volJitter;
-  vec4 volCoordScale; /* To convert volume uvs to screen uvs */
-  float volHistoryAlpha;
-  float volShadowSteps;
-  bool volUseLights;
-  bool volUseSoftShadows;
+  ivec4 _volTexSize;
+  vec4 _volDepthParameters; /* Parameters to the volume Z equation */
+  vec4 _volInvTexSize;
+  vec4 _volJitter;
+  vec4 _volCoordScale; /* To convert volume uvs to screen uvs */
+  float _volHistoryAlpha;
+  float _volShadowSteps;
+  bool _volUseLights;
+  bool _volUseSoftShadows;
   /* Screen Space Reflections */
-  vec4 ssrParameters;
-  float ssrBorderFac;
-  float ssrMaxRoughness;
-  float ssrFireflyFac;
-  float ssrBrdfBias;
-  bool ssrToggle;
-  bool ssrefractToggle;
+  vec4 _ssrParameters;
+  float _ssrBorderFac;
+  float _ssrMaxRoughness;
+  float _ssrFireflyFac;
+  float _ssrBrdfBias;
+  bool _ssrToggle;
+  bool _ssrefractToggle;
   /* SubSurface Scattering */
-  float sssJitterThreshold;
-  bool sssToggle;
+  float _sssJitterThreshold;
+  bool _sssToggle;
   /* Specular */
-  bool specToggle;
+  bool _specToggle;
   /* Lights */
-  int laNumLight;
+  int _laNumLight;
   /* Probes */
-  int prbNumPlanar;
-  int prbNumRenderCube;
-  int prbNumRenderGrid;
-  int prbIrradianceVisSize;
-  float prbIrradianceSmooth;
-  float prbLodCubeMax;
+  int _prbNumPlanar;
+  int _prbNumRenderCube;
+  int _prbNumRenderGrid;
+  int _prbIrradianceVisSize;
+  float _prbIrradianceSmooth;
+  float _prbLodCubeMax;
   /* Misc */
-  int rayType;
-  float rayDepth;
-  float alphaHashOffset;
-  float alphaHashScale;
-  vec4 cameraUvScaleBias;
-  vec4 planarClipPlane;
+  int _rayType;
+  float _rayDepth;
+  float _alphaHashOffset;
+  float _alphaHashScale;
+  vec4 _cameraUvScaleBias;
+  vec4 _planarClipPlane;
 };
 BLI_STATIC_ASSERT_ALIGN(CommonUniformBlock, 16)
 
@@ -102,17 +102,17 @@ struct GridData {
 BLI_STATIC_ASSERT_ALIGN(GridData, 16)
 
 struct ProbeBlock {
-  CubeData probes_data[MAX_PROBE];
+  CubeData _probes_data[MAX_PROBE];
 };
 BLI_STATIC_ASSERT_ALIGN(ProbeBlock, 16)
 
 struct GridBlock {
-  GridData grids_data[MAX_GRID];
+  GridData _grids_data[MAX_GRID];
 };
 BLI_STATIC_ASSERT_ALIGN(GridBlock, 16)
 
 struct PlanarBlock {
-  PlanarData planars_data[MAX_PLANAR];
+  PlanarData _planars_data[MAX_PLANAR];
 };
 BLI_STATIC_ASSERT_ALIGN(PlanarBlock, 16)
 
@@ -141,9 +141,9 @@ struct ShadowCascadeData {
 BLI_STATIC_ASSERT_ALIGN(ShadowCascadeData, 16)
 
 struct ShadowBlock {
-  ShadowData shadows_data[MAX_SHADOW];
-  ShadowCubeData shadows_cube_data[MAX_SHADOW_CUBE];
-  ShadowCascadeData shadows_cascade_data[MAX_SHADOW_CASCADE];
+  ShadowData _shadows_data[MAX_SHADOW];
+  ShadowCubeData _shadows_cube_data[MAX_SHADOW_CUBE];
+  ShadowCascadeData _shadows_cascade_data[MAX_SHADOW_CASCADE];
 };
 BLI_STATIC_ASSERT_ALIGN(ShadowBlock, 16)
 
@@ -159,20 +159,20 @@ struct LightData {
 BLI_STATIC_ASSERT_ALIGN(LightData, 16)
 
 struct LightBlock {
-  LightData lights_data[MAX_LIGHT];
+  LightData _lights_data[MAX_LIGHT];
 };
 BLI_STATIC_ASSERT_ALIGN(LightBlock, 16)
 
 struct RenderpassBlock {
-  bool renderPassDiffuse;
-  bool renderPassDiffuseLight;
-  bool renderPassGlossy;
-  bool renderPassGlossyLight;
-  bool renderPassEmit;
-  bool renderPassSSSColor;
-  bool renderPassEnvironment;
-  bool renderPassAOV;
-  uint renderPassAOVActive;
+  bool _renderPassDiffuse;
+  bool _renderPassDiffuseLight;
+  bool _renderPassGlossy;
+  bool _renderPassGlossyLight;
+  bool _renderPassEmit;
+  bool _renderPassSSSColor;
+  bool _renderPassEnvironment;
+  bool _renderPassAOV;
+  uint _renderPassAOVActive;
 };
 BLI_STATIC_ASSERT_ALIGN(RenderpassBlock, 16)
 
@@ -182,10 +182,10 @@ BLI_STATIC_ASSERT_ALIGN(RenderpassBlock, 16)
 #define SSS_LUT_BIAS (0.5 / float(SSS_LUT_SIZE))
 
 struct SSSProfileBlock {
-  vec4 sss_kernel[MAX_SSS_SAMPLES];
-  vec4 radii_max_radius;
-  float avg_inv_radius;
-  int sss_samples;
+  vec4 _sss_kernel[MAX_SSS_SAMPLES];
+  vec4 _radii_max_radius;
+  float _avg_inv_radius;
+  int _sss_samples;
 };
 BLI_STATIC_ASSERT_ALIGN(SSSProfileBlock, 16)
 
@@ -194,75 +194,75 @@ BLI_STATIC_ASSERT_ALIGN(SSSProfileBlock, 16)
 #  if defined(USE_GPU_SHADER_CREATE_INFO)
 
 /* Keep compatibility_with old global scope syntax. */
-#    define pastViewProjectionMatrix common_block.pastViewProjectionMatrix
-#    define hizUvScale common_block.hizUvScale
-#    define aoParameters common_block.aoParameters
-#    define volTexSize common_block.volTexSize
-#    define volDepthParameters common_block.volDepthParameters
-#    define volInvTexSize common_block.volInvTexSize
-#    define volJitter common_block.volJitter
-#    define volCoordScale common_block.volCoordScale
-#    define volHistoryAlpha common_block.volHistoryAlpha
-#    define volShadowSteps common_block.volShadowSteps
-#    define volUseLights common_block.volUseLights
-#    define volUseSoftShadows common_block.volUseSoftShadows
-#    define ssrParameters common_block.ssrParameters
-#    define ssrBorderFac common_block.ssrBorderFac
-#    define ssrMaxRoughness common_block.ssrMaxRoughness
-#    define ssrFireflyFac common_block.ssrFireflyFac
-#    define ssrBrdfBias common_block.ssrBrdfBias
-#    define ssrToggle common_block.ssrToggle
-#    define ssrefractToggle common_block.ssrefractToggle
-#    define sssJitterThreshold common_block.sssJitterThreshold
-#    define sssToggle common_block.sssToggle
-#    define specToggle common_block.specToggle
-#    define laNumLight common_block.laNumLight
-#    define prbNumPlanar common_block.prbNumPlanar
-#    define prbNumRenderCube common_block.prbNumRenderCube
-#    define prbNumRenderGrid common_block.prbNumRenderGrid
-#    define prbIrradianceVisSize common_block.prbIrradianceVisSize
-#    define prbIrradianceSmooth common_block.prbIrradianceSmooth
-#    define prbLodCubeMax common_block.prbLodCubeMax
-#    define rayType common_block.rayType
-#    define rayDepth common_block.rayDepth
-#    define alphaHashOffset common_block.alphaHashOffset
-#    define alphaHashScale common_block.alphaHashScale
-#    define cameraUvScaleBias common_block.cameraUvScaleBias
-#    define planarClipPlane common_block.planarClipPlane
+#    define pastViewProjectionMatrix common_block._pastViewProjectionMatrix
+#    define hizUvScale common_block._hizUvScale
+#    define aoParameters common_block._aoParameters
+#    define volTexSize common_block._volTexSize
+#    define volDepthParameters common_block._volDepthParameters
+#    define volInvTexSize common_block._volInvTexSize
+#    define volJitter common_block._volJitter
+#    define volCoordScale common_block._volCoordScale
+#    define volHistoryAlpha common_block._volHistoryAlpha
+#    define volShadowSteps common_block._volShadowSteps
+#    define volUseLights common_block._volUseLights
+#    define volUseSoftShadows common_block._volUseSoftShadows
+#    define ssrParameters common_block._ssrParameters
+#    define ssrBorderFac common_block._ssrBorderFac
+#    define ssrMaxRoughness common_block._ssrMaxRoughness
+#    define ssrFireflyFac common_block._ssrFireflyFac
+#    define ssrBrdfBias common_block._ssrBrdfBias
+#    define ssrToggle common_block._ssrToggle
+#    define ssrefractToggle common_block._ssrefractToggle
+#    define sssJitterThreshold common_block._sssJitterThreshold
+#    define sssToggle common_block._sssToggle
+#    define specToggle common_block._specToggle
+#    define laNumLight common_block._laNumLight
+#    define prbNumPlanar common_block._prbNumPlanar
+#    define prbNumRenderCube common_block._prbNumRenderCube
+#    define prbNumRenderGrid common_block._prbNumRenderGrid
+#    define prbIrradianceVisSize common_block._prbIrradianceVisSize
+#    define prbIrradianceSmooth common_block._prbIrradianceSmooth
+#    define prbLodCubeMax common_block._prbLodCubeMax
+#    define rayType common_block._rayType
+#    define rayDepth common_block._rayDepth
+#    define alphaHashOffset common_block._alphaHashOffset
+#    define alphaHashScale common_block._alphaHashScale
+#    define cameraUvScaleBias common_block._cameraUvScaleBias
+#    define planarClipPlane common_block._planarClipPlane
 
 /* ProbeBlock */
-#    define probes_data probe_block.probes_data
+#    define probes_data probe_block._probes_data
 
 /* GridBlock */
-#    define grids_data grid_block.grids_data
+#    define grids_data grid_block._grids_data
 
 /* PlanarBlock */
-#    define planars_data planar_block.planars_data
+#    define planars_data planar_block._planars_data
 
 /* ShadowBlock */
-#    define shadows_data shadow_block.shadows_data
-#    define shadows_cube_data shadow_block.shadows_cube_data
-#    define shadows_cascade_data shadow_block.shadows_cascade_data
+#    define shadows_data shadow_block._shadows_data
+#    define shadows_cube_data shadow_block._shadows_cube_data
+#    define shadows_cascade_data shadow_block._shadows_cascade_data
 
 /* LightBlock */
-#    define lights_data light_block.lights_data
+#    define lights_data light_block._lights_data
 
 /* RenderpassBlock */
-#    define renderPassDiffuse renderpass_block.renderPassDiffuse
-#    define renderPassDiffuseLight renderpass_block.renderPassDiffuseLight
-#    define renderPassGlossy renderpass_block.renderPassGlossy
-#    define renderPassGlossyLight renderpass_block.renderPassGlossyLight
-#    define renderPassEmit renderpass_block.renderPassEmit
-#    define renderPassSSSColor renderpass_block.renderPassSSSColor
-#    define renderPassEnvironment renderpass_block.renderPassEnvironment
-#    define renderPassAOV renderpass_block.renderPassAOV
-#    define renderPassAOVActive renderpass_block.renderPassAOVActive
+#    define renderPassDiffuse renderpass_block._renderPassDiffuse
+#    define renderPassDiffuseLight renderpass_block._renderPassDiffuseLight
+#    define renderPassGlossy renderpass_block._renderPassGlossy
+#    define renderPassGlossyLight renderpass_block._renderPassGlossyLight
+#    define renderPassEmit renderpass_block._renderPassEmit
+#    define renderPassSSSColor renderpass_block._renderPassSSSColor
+#    define renderPassEnvironment renderpass_block._renderPassEnvironment
+#    define renderPassAOV renderpass_block._renderPassAOV
+#    define renderPassAOVActive renderpass_block._renderPassAOVActive
 
 /* SSSProfileBlock */
-#    define sss_kernel sssProfile.sss_kernel
-#    define radii_max_radius sssProfile.radii_max_radius
-#    define avg_inv_radius sssProfile.avg_inv_radius
-#    define sss_samples sssProfile.sss_samples
+#    define sss_kernel sssProfile._sss_kernel
+#    define radii_max_radius sssProfile._radii_max_radius
+#    define avg_inv_radius sssProfile._avg_inv_radius
+#    define sss_samples sssProfile._sss_samples
 
 #  endif /* USE_GPU_SHADER_CREATE_INFO */
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl
index abaa814a4dc..513dbdee322 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl
@@ -118,7 +118,7 @@ void main()
   vec4 finalColor_geom[2];
 
   do_vertex_shader(out_pos0, base_vertex_id, ssPos[0], finalColor_geom[0]);
-  do_vertex_shader(out_pos1, base_vertex_id + 1, ssPos[0], finalColor_geom[0]);
+  do_vertex_shader(out_pos1, base_vertex_id + 1, ssPos[1], finalColor_geom[1]);
 
   /* Geometry shader alternative -- Output is trianglelist consisting of 6 vertices.
    * Each vertex shader invocation is one vertex in the output primitive, so outptut
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index ac92a397812..2e59bad25d5 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -219,13 +219,9 @@ int DRW_object_visibility_in_active_context(const Object *ob)
 bool DRW_object_use_hide_faces(const struct Object *ob)
 {
   if (ob->type == OB_MESH) {
-    const Mesh *me = ob->data;
-
     switch (ob->mode) {
       case OB_MODE_SCULPT:
-        return true;
       case OB_MODE_TEXTURE_PAINT:
-        return (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0;
       case OB_MODE_VERTEX_PAINT:
       case OB_MODE_WEIGHT_PAINT:
         return true;
diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc
index e890a341d62..6f1a09bb078 100644
--- a/source/blender/draw/intern/draw_manager_data.cc
+++ b/source/blender/draw/intern/draw_manager_data.cc
@@ -705,7 +705,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                    DST.dupli_source->random_id :
+                     DST.dupli_source->random_id :
                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
diff --git a/source/blender/draw/intern/shaders/common_hair_lib.glsl b/source/blender/draw/intern/shaders/common_hair_lib.glsl
index 4fea4f77990..bb9648a4d41 100644
--- a/source/blender/draw/intern/shaders/common_hair_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_hair_lib.glsl
@@ -53,7 +53,7 @@ uniform usamplerBuffer hairStrandSegBuffer; /* R16UI */
 // uniform samplerBuffer hairColBuffer; /* RGBA16 linear color */
 #  else
 #    ifndef DRW_HAIR_INFO
-#      error Ensure createInfo includes `draw_hair` for general use or `eevee_legacy_hair_lib` for EEVEE.
+#      error Ensure createInfo includes draw_hair for general use or eevee_legacy_hair_lib for EEVEE.
 #    endif
 #  endif /* !USE_GPU_SHADER_CREATE_INFO */
 
diff --git a/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl b/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl
index 9d2a6f37882..f2d857885ee 100644
--- a/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl
@@ -17,7 +17,7 @@ in vec3 nor;
 #    endif
 #  else
 #    ifndef DRW_POINTCLOUD_INFO
-#      error Ensure createInfo includes `draw_pointcloud`.
+#      error Ensure createInfo includes draw_pointcloud.
 #    endif
 #  endif /* !USE_GPU_SHADER_CREATE_INFO */
 
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc
index 1fa193096ff..6b4f978a44a 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc
@@ -416,6 +416,7 @@ struct ProjPaintState {
   blender::OffsetIndices<int> polys_eval;
   blender::Span<int> corner_verts_eval;
   const bool *select_poly_eval;
+  const bool *hide_poly_eval;
   const int *material_indices;
   const bool *sharp_faces_eval;
   blender::Span<MLoopTri> looptris_eval;
@@ -4079,6 +4080,8 @@ static bool proj_paint_state_mesh_eval_init(const bContext *C, ProjPaintState *p
   ps->corner_verts_eval = ps->me_eval->corner_verts();
   ps->select_poly_eval = (const bool *)CustomData_get_layer_named(
       &ps->me_eval->pdata, CD_PROP_BOOL, ".select_poly");
+  ps->hide_poly_eval = (const bool *)CustomData_get_layer_named(
+      &ps->me_eval->pdata, CD_PROP_BOOL, ".hide_poly");
   ps->material_indices = (const int *)CustomData_get_layer_named(
       &ps->me_eval->pdata, CD_PROP_INT32, "material_index");
   ps->sharp_faces_eval = static_cast<const bool *>(
@@ -4168,26 +4171,28 @@ static bool project_paint_clone_face_skip(ProjPaintState *ps,
 
 struct ProjPaintFaceLookup {
   const bool *select_poly_orig;
-
+  const bool *hide_poly_orig;
   const int *index_mp_to_orig;
 };
 
 static void proj_paint_face_lookup_init(const ProjPaintState *ps, ProjPaintFaceLookup *face_lookup)
 {
   memset(face_lookup, 0, sizeof(*face_lookup));
+  Mesh *orig_mesh = (Mesh *)ps->ob->data;
+  face_lookup->index_mp_to_orig = static_cast<const int *>(
+      CustomData_get_layer(&ps->me_eval->pdata, CD_ORIGINDEX));
   if (ps->do_face_sel) {
-    Mesh *orig_mesh = (Mesh *)ps->ob->data;
-    face_lookup->index_mp_to_orig = static_cast<const int *>(
-        CustomData_get_layer(&ps->me_eval->pdata, CD_ORIGINDEX));
     face_lookup->select_poly_orig = static_cast<const bool *>(
         CustomData_get_layer_named(&orig_mesh->pdata, CD_PROP_BOOL, ".select_poly"));
   }
+  face_lookup->hide_poly_orig = static_cast<const bool *>(
+      CustomData_get_layer_named(&orig_mesh->pdata, CD_PROP_BOOL, ".hide_poly"));
 }
 
-/* Return true if face should be considered selected, false otherwise */
-static bool project_paint_check_face_sel(const ProjPaintState *ps,
-                                         const ProjPaintFaceLookup *face_lookup,
-                                         const MLoopTri *lt)
+/* Return true if face should be considered paintable, false otherwise */
+static bool project_paint_check_face_paintable(const ProjPaintState *ps,
+                                               const ProjPaintFaceLookup *face_lookup,
+                                               const MLoopTri *lt)
 {
   if (ps->do_face_sel) {
     int orig_index;
@@ -4198,7 +4203,15 @@ static bool project_paint_check_face_sel(const ProjPaintState *ps,
     }
     return ps->select_poly_eval && ps->select_poly_eval[lt->poly];
   }
-  return true;
+  else {
+    int orig_index;
+
+    if ((face_lookup->index_mp_to_orig != nullptr) &&
+        ((orig_index = (face_lookup->index_mp_to_orig[lt->poly])) != ORIGINDEX_NONE)) {
+      return !(face_lookup->hide_poly_orig && face_lookup->hide_poly_orig[orig_index]);
+    }
+    return !(ps->hide_poly_eval && ps->hide_poly_eval[lt->poly]);
+  }
 }
 
 struct ProjPaintFaceCoSS {
@@ -4313,10 +4326,10 @@ static void project_paint_prepare_all_faces(ProjPaintState *ps,
   BLI_assert(ps->image_tot == 0);
 
   for (tri_index = 0; tri_index < ps->looptris_eval.size(); tri_index++) {
-    bool is_face_sel;
+    bool is_face_paintable;
     bool skip_tri = false;
 
-    is_face_sel = project_paint_check_face_sel(ps, face_lookup, &looptris[tri_index]);
+    is_face_paintable = project_paint_check_face_paintable(ps, face_lookup, &looptris[tri_index]);
 
     if (!ps->do_stencil_brush) {
       slot = project_paint_face_paint_slot(ps, tri_index);
@@ -4369,7 +4382,7 @@ static void project_paint_prepare_all_faces(ProjPaintState *ps,
 
     BLI_assert(mloopuv_base != nullptr);
 
-    if (is_face_sel && tpage) {
+    if (is_face_paintable && tpage) {
       ProjPaintFaceCoSS coSS;
       proj_paint_face_coSS_init(ps, &looptris[tri_index], &coSS);
 
diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c
index 5827ab7c469..9237e831da9 100644
--- a/source/blender/editors/space_text/text_format_py.c
+++ b/source/blender/editors/space_text/text_format_py.c
@@ -425,6 +425,49 @@ static void txtfmt_py_format_line(SpaceText *st, TextLine *line, const bool do_n
         }
         *fmt = FMT_TYPE_STRING;
       }
+      else if (ELEM(*str, 'f', 'F', 'r', 'R', 'u', 'U') && ELEM(*(str + 1), '"', '\'')) {
+        /* Strings with single letter prefixes (f-strings, raw strings, and unicode strings).
+         * Format the prefix as part of the string. */
+        *fmt = FMT_TYPE_STRING;
+        fmt++;
+        str++;
+        find = *str;
+        cont = (*str == '"') ? FMT_CONT_QUOTEDOUBLE : FMT_CONT_QUOTESINGLE;
+        if (*(str + 1) == find && *(str + 2) == find) {
+          *fmt = FMT_TYPE_STRING;
+          fmt++;
+          str++;
+          *fmt = FMT_TYPE_STRING;
+          fmt++;
+          str++;
+          cont |= FMT_CONT_TRIPLE;
+        }
+        *fmt = FMT_TYPE_STRING;
+      }
+      else if (((ELEM(*str, 'f', 'F') && ELEM(*(str + 1), 'r', 'R')) ||
+                (ELEM(*str, 'r', 'R') && ELEM(*(str + 1), 'f', 'F'))) &&
+               ELEM(*(str + 2), '"', '\'')) {
+        /* Strings with two letter prefixes (raw f-strings).
+         * Format the prefix as part of the string. */
+        *fmt = FMT_TYPE_STRING;
+        fmt++;
+        str++;
+        *fmt = FMT_TYPE_STRING;
+        fmt++;
+        str++;
+        find = *str;
+        cont = (*str == '"') ? FMT_CONT_QUOTEDOUBLE : FMT_CONT_QUOTESINGLE;
+        if (*(str + 1) == find && *(str + 2) == find) {
+          *fmt = FMT_TYPE_STRING;
+          fmt++;
+          str++;
+          *fmt = FMT_TYPE_STRING;
+          fmt++;
+          str++;
+          cont |= FMT_CONT_TRIPLE;
+        }
+        *fmt = FMT_TYPE_STRING;
+      }
       /* White-space (all white-space has been converted to spaces). */
       else if (*str == ' ') {
         *fmt = FMT_TYPE_WHITESPACE;
diff --git a/source/blender/editors/uvedit/uvedit_clipboard.cc b/source/blender/editors/uvedit/uvedit_clipboard.cc
index f542959db6e..8628cde3703 100644
--- a/source/blender/editors/uvedit/uvedit_clipboard.cc
+++ b/source/blender/editors/uvedit/uvedit_clipboard.cc
@@ -24,6 +24,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_layer.h"
 #include "BKE_mesh_mapping.h" /* UvElementMap */
+#include "BKE_report.h"
 
 #include "DEG_depsgraph.h"
 
@@ -46,7 +47,8 @@ class UV_ClipboardBuffer {
   bool find_isomorphism(UvElementMap *dest_element_map,
                         int island_index,
                         blender::Vector<int> &r_label,
-                        int cd_loop_uv_offset);
+                        int cd_loop_uv_offset,
+                        bool *r_search_abandoned);
 
   void write_uvs(UvElementMap *element_map,
                  int island_index,
@@ -63,7 +65,7 @@ static UV_ClipboardBuffer *uv_clipboard = nullptr;
 
 UV_ClipboardBuffer::~UV_ClipboardBuffer()
 {
-  for (const int index : graph.index_range()) {
+  for (const int64_t index : graph.index_range()) {
     delete graph[index];
   }
   graph.clear();
@@ -199,7 +201,8 @@ static bool find_isomorphism(UvElementMap *dest,
                              const int dest_island_index,
                              GraphISO *graph_source,
                              blender::Vector<int> &r_label,
-                             int cd_loop_uv_offset)
+                             int cd_loop_uv_offset,
+                             bool *r_search_abandoned)
 {
 
   const int island_total_unique_uvs = dest->island_total_unique_uvs[dest_island_index];
@@ -213,7 +216,7 @@ static bool find_isomorphism(UvElementMap *dest,
   int(*solution)[2] = (int(*)[2])MEM_mallocN(graph_source->n * sizeof(*solution), __func__);
   int solution_length = 0;
   const bool result = ED_uvedit_clipboard_maximum_common_subgraph(
-      graph_source, graph_dest, solution, &solution_length);
+      graph_source, graph_dest, solution, &solution_length, r_search_abandoned);
 
   /* Todo: Implement "Best Effort" / "Nearest Match" paste functionality here. */
 
@@ -236,14 +239,16 @@ static bool find_isomorphism(UvElementMap *dest,
 bool UV_ClipboardBuffer::find_isomorphism(UvElementMap *dest_element_map,
                                           int dest_island_index,
                                           blender::Vector<int> &r_label,
-                                          int cd_loop_uv_offset)
+                                          int cd_loop_uv_offset,
+                                          bool *r_search_abandoned)
 {
-  for (int source_island_index : graph.index_range()) {
+  for (const int64_t source_island_index : graph.index_range()) {
     if (::find_isomorphism(dest_element_map,
                            dest_island_index,
                            graph[source_island_index],
                            r_label,
-                           cd_loop_uv_offset)) {
+                           cd_loop_uv_offset,
+                           r_search_abandoned)) {
       const int island_total_unique_uvs =
           dest_element_map->island_total_unique_uvs[dest_island_index];
       const int island_offset = offset[source_island_index];
@@ -293,7 +298,7 @@ static int uv_copy_exec(bContext *C, wmOperator * /*op*/)
   return OPERATOR_FINISHED;
 }
 
-static int uv_paste_exec(bContext *C, wmOperator * /*op*/)
+static int uv_paste_exec(bContext *C, wmOperator *op)
 {
   /* TODO: Restore `UvClipboard` from system clipboard. */
   if (!uv_clipboard) {
@@ -306,6 +311,9 @@ static int uv_paste_exec(bContext *C, wmOperator * /*op*/)
   Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(
       scene, view_layer, ((View3D *)nullptr), &objects_len);
 
+  int result = OPERATOR_CANCELLED; /* Assume no changes. */
+  int complicated_search = 0;
+  int total_search = 0;
   for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
     Object *ob = objects[ob_index];
     BMEditMesh *em = BKE_editmesh_from_object(ob);
@@ -321,14 +329,20 @@ static int uv_paste_exec(bContext *C, wmOperator * /*op*/)
     }
 
     for (int i = 0; i < dest_element_map->total_islands; i++) {
+      total_search++;
       blender::Vector<int> label;
+      bool search_abandoned = false;
       const bool found = uv_clipboard->find_isomorphism(
-          dest_element_map, i, label, cd_loop_uv_offset);
+          dest_element_map, i, label, cd_loop_uv_offset, &search_abandoned);
       if (!found) {
+        if (search_abandoned) {
+          complicated_search++;
+        }
         continue; /* No source UVs can be found that is isomorphic to this island. */
       }
 
       uv_clipboard->write_uvs(dest_element_map, i, cd_loop_uv_offset, label);
+      result = OPERATOR_FINISHED; /* UVs were moved. */
     }
 
     BM_uv_element_map_free(dest_element_map);
@@ -336,9 +350,17 @@ static int uv_paste_exec(bContext *C, wmOperator * /*op*/)
     WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
   }
 
+  if (complicated_search) {
+    BKE_reportf(op->reports,
+                RPT_WARNING,
+                "Skipped %d of %d island(s), geometry was too complicated to detect a match",
+                complicated_search,
+                total_search);
+  }
+
   MEM_freeN(objects);
 
-  return OPERATOR_FINISHED;
+  return result;
 }
 
 void UV_OT_copy(wmOperatorType *ot)
diff --git a/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc b/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
index 4b0613aeede..edf48d9522e 100644
--- a/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
+++ b/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
@@ -304,8 +304,13 @@ static uint8_t select_next_w(uint8_t *right, uint8_t *bd)
   return idx;
 }
 
-static void maximum_common_subgraph_internal(
-    int incumbent[][2], int *inc_pos, uint8_t **adjmat0, int n0, uint8_t **adjmat1, int n1)
+static void maximum_common_subgraph_internal(int incumbent[][2],
+                                             int *inc_pos,
+                                             uint8_t **adjmat0,
+                                             int n0,
+                                             uint8_t **adjmat1,
+                                             int n1,
+                                             bool *r_search_abandoned)
 {
   int min = std::min(n0, n1);
 
@@ -332,6 +337,7 @@ static void maximum_common_subgraph_internal(
        * Can occur with moderate sized inputs where the graph has lots of symmetry, e.g. a cube
        * subdivided 3x times.
        */
+      *r_search_abandoned = true;
       *inc_pos = 0;
       break;
     }
@@ -391,7 +397,8 @@ static bool check_automorphism(const GraphISO *g0,
 bool ED_uvedit_clipboard_maximum_common_subgraph(GraphISO *g0_input,
                                                  GraphISO *g1_input,
                                                  int solution[][2],
-                                                 int *solution_length)
+                                                 int *solution_length,
+                                                 bool *r_search_abandoned)
 {
   if (check_automorphism(g0_input, g1_input, solution, solution_length)) {
     return true;
@@ -409,7 +416,8 @@ bool ED_uvedit_clipboard_maximum_common_subgraph(GraphISO *g0_input,
   GraphISO *g1 = g1_input->sort_vertices_by_degree();
 
   int sol_len = 0;
-  maximum_common_subgraph_internal(solution, &sol_len, g0->adjmat, n0, g1->adjmat, n1);
+  maximum_common_subgraph_internal(
+      solution, &sol_len, g0->adjmat, n0, g1->adjmat, n1, r_search_abandoned);
   *solution_length = sol_len;
 
   bool result = (sol_len == n0);
diff --git a/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.hh b/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.hh
index 8e9e9b683b3..bd3e9620ae7 100644
--- a/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.hh
+++ b/source/blender/editors/uvedit/uvedit_clipboard_graph_iso.hh
@@ -34,7 +34,5 @@ class GraphISO {
 /* Find the maximum common subgraph between two graphs.
  * (Can be used to find graph ismorphism.)
  */
-bool ED_uvedit_clipboard_maximum_common_subgraph(GraphISO *,
-                                                 GraphISO *,
-                                                 int solution[][2],
-                                                 int *solution_length);
+bool ED_uvedit_clipboard_maximum_common_subgraph(
+    GraphISO *, GraphISO *, int solution[][2], int *solution_length, bool *r_search_abandoned);
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 8905ddb81a0..3a6a00cc0b2 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -590,7 +590,7 @@ void BlenderStrokeRenderer::GenerateStrokeMesh(StrokeGroup *group, bool hasTex)
   int *corner_verts = (int *)CustomData_add_layer_named(
       &mesh->ldata, CD_PROP_INT32, CD_SET_DEFAULT, mesh->totloop, ".corner_vert");
   int *corner_edges = (int *)CustomData_add_layer_named(
-      &mesh->ldata, CD_PROP_INT32, CD_SET_DEFAULT, mesh->totloop, ".corner_vert");
+      &mesh->ldata, CD_PROP_INT32, CD_SET_DEFAULT, mesh->totloop, ".corner_edge");
   int *material_indices = (int *)CustomData_add_layer_named(
       &mesh->pdata, CD_PROP_INT32, CD_SET_DEFAULT, mesh->totpoly, "material_index");
   blender::float2 *loopsuv[2] = {nullptr};
diff --git a/source/blender/geometry/intern/mesh_primitive_cuboid.cc b/source/blender/geometry/intern/mesh_primitive_cuboid.cc
index 778096e4d5a..fe1d466dcc3 100644
--- a/source/blender/geometry/intern/mesh_primitive_cuboid.cc
+++ b/source/blender/geometry/intern/mesh_primitive_cuboid.cc
@@ -146,7 +146,8 @@ static void calculate_polys(const CuboidConfig &config,
       const int vert_3 = vert_2 + 1;
       const int vert_4 = vert_1 + 1;
 
-      define_quad(poly_offsets, corner_verts, poly_index, loop_index, vert_1, vert_2, vert_3, vert_4);
+      define_quad(
+          poly_offsets, corner_verts, poly_index, loop_index, vert_1, vert_2, vert_3, vert_4);
       loop_index += 4;
       poly_index++;
     }
@@ -252,7 +253,8 @@ static void calculate_polys(const CuboidConfig &config,
         vert_3 = vert_2 + 2;
       }
 
-      define_quad(poly_offsets, corner_verts, poly_index, loop_index, vert_1, vert_2, vert_3, vert_4);
+      define_quad(
+          poly_offsets, corner_verts, poly_index, loop_index, vert_1, vert_2, vert_3, vert_4);
       loop_index += 4;
       poly_index++;
     }
@@ -299,7 +301,8 @@ static void calculate_polys(const CuboidConfig &config,
         vert_4 = vert_1 + config.verts_x;
       }
 
-      define_quad(poly_offsets, corner_verts, poly_index, loop_index, vert_1, vert_4, vert_3, vert_2);
+      define_quad(
+          poly_offsets, corner_verts, poly_index, loop_index, vert_1, vert_4, vert_3, vert_2);
       loop_index += 4;
       poly_index++;
     }
diff --git a/source/blender/gpu/metal/mtl_command_buffer.mm b/source/blender/gpu/metal/mtl_command_buffer.mm
index fa57429b5d8..a10e46cdf77 100644
--- a/source/blender/gpu/metal/mtl_command_buffer.mm
+++ b/source/blender/gpu/metal/mtl_command_buffer.mm
@@ -8,7 +8,7 @@
 #include "mtl_debug.hh"
 #include "mtl_framebuffer.hh"
 
-#include "intern/GHOST_ContextCGL.h"
+#include "intern/GHOST_ContextCGL.hh"
 
 #include <fstream>
 
diff --git a/source/blender/gpu/metal/mtl_context.hh b/source/blender/gpu/metal/mtl_context.hh
index 62ea96d731c..5a782019ccb 100644
--- a/source/blender/gpu/metal/mtl_context.hh
+++ b/source/blender/gpu/metal/mtl_context.hh
@@ -18,9 +18,9 @@
 #  pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "intern/GHOST_Context.h"
-#include "intern/GHOST_ContextCGL.h"
-#include "intern/GHOST_Window.h"
+#include "intern/GHOST_Context.hh"
+#include "intern/GHOST_ContextCGL.hh"
+#include "intern/GHOST_Window.hh"
 
 #include "mtl_backend.hh"
 #include "mtl_capabilities.hh"
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc
index 471399ec30a..a1a1101e9e8 100644
--- a/source/blender/gpu/opengl/gl_shader.cc
+++ b/source/blender/gpu/opengl/gl_shader.cc
@@ -405,7 +405,7 @@ static void print_resource(std::ostream &os,
       array_offset = res.uniformbuf.name.find_first_of("[");
       name_no_array = (array_offset == -1) ? res.uniformbuf.name :
                                              StringRef(res.uniformbuf.name.c_str(), array_offset);
-      os << "uniform " << name_no_array << " { " << res.uniformbuf.type_name << " _"
+      os << "uniform _" << name_no_array << " { " << res.uniformbuf.type_name << " "
          << res.uniformbuf.name << "; };\n";
       break;
     case ShaderCreateInfo::Resource::BindType::STORAGE_BUFFER:
@@ -413,36 +413,13 @@ static void print_resource(std::ostream &os,
       name_no_array = (array_offset == -1) ? res.storagebuf.name :
                                              StringRef(res.storagebuf.name.c_str(), array_offset);
       print_qualifier(os, res.storagebuf.qualifiers);
-      os << "buffer ";
-      os << name_no_array << " { " << res.storagebuf.type_name << " _" << res.storagebuf.name
+      os << "buffer _";
+      os << name_no_array << " { " << res.storagebuf.type_name << " " << res.storagebuf.name
          << "; };\n";
       break;
   }
 }
 
-static void print_resource_alias(std::ostream &os, const ShaderCreateInfo::Resource &res)
-{
-  int64_t array_offset;
-  StringRef name_no_array;
-
-  switch (res.bind_type) {
-    case ShaderCreateInfo::Resource::BindType::UNIFORM_BUFFER:
-      array_offset = res.uniformbuf.name.find_first_of("[");
-      name_no_array = (array_offset == -1) ? res.uniformbuf.name :
-                                             StringRef(res.uniformbuf.name.c_str(), array_offset);
-      os << "#define " << name_no_array << " (_" << name_no_array << ")\n";
-      break;
-    case ShaderCreateInfo::Resource::BindType::STORAGE_BUFFER:
-      array_offset = res.storagebuf.name.find_first_of("[");
-      name_no_array = (array_offset == -1) ? res.storagebuf.name :
-                                             StringRef(res.storagebuf.name.c_str(), array_offset);
-      os << "#define " << name_no_array << " (_" << name_no_array << ")\n";
-      break;
-    default:
-      break;
-  }
-}
-
 static void print_interface(std::ostream &os,
                             const StringRefNull &prefix,
                             const StageInterfaceInfo &iface,
@@ -475,16 +452,10 @@ std::string GLShader::resources_declare(const ShaderCreateInfo &info) const
   for (const ShaderCreateInfo::Resource &res : info.pass_resources_) {
     print_resource(ss, res, info.auto_resource_location_);
   }
-  for (const ShaderCreateInfo::Resource &res : info.pass_resources_) {
-    print_resource_alias(ss, res);
-  }
   ss << "\n/* Batch Resources. */\n";
   for (const ShaderCreateInfo::Resource &res : info.batch_resources_) {
     print_resource(ss, res, info.auto_resource_location_);
   }
-  for (const ShaderCreateInfo::Resource &res : info.batch_resources_) {
-    print_resource_alias(ss, res);
-  }
   ss << "\n/* Push Constants. */\n";
   for (const ShaderCreateInfo::PushConst &uniform : info.push_constants_) {
     ss << "uniform " << to_string(uniform.type) << " " << uniform.name;
diff --git a/source/blender/gpu/opengl/gl_shader_interface.cc b/source/blender/gpu/opengl/gl_shader_interface.cc
index 0b0bd2c1ea8..99eabce794e 100644
--- a/source/blender/gpu/opengl/gl_shader_interface.cc
+++ b/source/blender/gpu/opengl/gl_shader_interface.cc
@@ -469,7 +469,8 @@ GLShaderInterface::GLShaderInterface(GLuint program, const shader::ShaderCreateI
     if (res.bind_type == ShaderCreateInfo::Resource::BindType::UNIFORM_BUFFER) {
       copy_input_name(input, res.uniformbuf.name, name_buffer_, name_buffer_offset);
       if (true || !GLContext::explicit_location_support) {
-        input->location = glGetUniformBlockIndex(program, name_buffer_ + input->name_offset);
+        std::string prefixed_name = "_" + res.uniformbuf.name;
+        input->location = glGetUniformBlockIndex(program, prefixed_name.c_str());
         glUniformBlockBinding(program, input->location, res.slot);
       }
       input->binding = res.slot;
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 6bb51b35c1b..80932511d83 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -833,9 +833,9 @@ typedef enum eNlaStrip_Flag {
 
   /* temporary editing flags */
 
- /** When transforming strips, this flag is set when the strip is placed in an invalid location
-	* such as overlapping another strip or moved to a locked track. In such cases, the strip's
-	* location must be corrected after the transform operator is done. */
+  /** When transforming strips, this flag is set when the strip is placed in an invalid location
+   * such as overlapping another strip or moved to a locked track. In such cases, the strip's
+   * location must be corrected after the transform operator is done. */
   NLASTRIP_FLAG_INVALID_LOCATION = (1 << 28),
   /** NLA strip should ignore frame range and hold settings, and evaluate at global time. */
   NLASTRIP_FLAG_NO_TIME_MAP = (1 << 29),
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 17932ea364c..0e76d3560d7 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -11342,7 +11342,8 @@ static void rna_def_node_socket_interface(BlenderRNA *brna)
   prop = RNA_def_property(srna, "bl_subtype_label", PROP_STRING, PROP_NONE);
   RNA_def_property_string_sdna(prop, NULL, "typeinfo->subtype_label");
   RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
-  RNA_def_property_ui_text(prop, "Subtype Label", "Label to display for the socket subtype in the UI");
+  RNA_def_property_ui_text(
+      prop, "Subtype Label", "Label to display for the socket subtype in the UI");
 
   func = RNA_def_function(srna, "draw", NULL);
   RNA_def_function_ui_description(func, "Draw template settings");
diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc
index c922e9d1f37..5e3decf54e6 100644
--- a/source/blender/modifiers/intern/MOD_screw.cc
+++ b/source/blender/modifiers/intern/MOD_screw.cc
@@ -458,7 +458,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
 
   /* build polygon -> edge map */
   if (totpoly) {
-    
+
     edge_poly_map = static_cast<uint *>(
         MEM_malloc_arrayN(totedge, sizeof(*edge_poly_map), __func__));
     memset(edge_poly_map, 0xff, sizeof(*edge_poly_map) * totedge);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
index d128aca133a..bff841f5b23 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
@@ -437,7 +437,7 @@ static void calculate_cone_faces(const ConeConfig &config,
                                 config.tot_quad_rings * config.circle_segments * 4;
 
   if (config.bottom_has_center_vert) {
-    poly_sizes.take_front(config.bottom_faces_len).fill(3);
+    poly_sizes.take_back(config.bottom_faces_len).fill(3);
 
     /* Bottom cone tip or center triangle fan in the fill. */
     for (const int i : IndexRange(config.circle_segments)) {
diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc
index 1c22342d077..06d49a9c776 100644
--- a/source/blender/python/mathutils/mathutils_bvhtree.cc
+++ b/source/blender/python/mathutils/mathutils_bvhtree.cc
@@ -1214,7 +1214,7 @@ static PyObject *C_BVHTree_FromObject(PyObject * /*cls*/, PyObject *args, PyObje
 /** \name Module & Type definition
  * \{ */
 
-#ifdef __GNUC__
+#if (defined(__GNUC__) && !defined(__clang__))
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
@@ -1252,7 +1252,7 @@ static PyMethodDef py_bvhtree_methods[] = {
     {nullptr, nullptr, 0, nullptr},
 };
 
-#ifdef __GNUC__
+#if (defined(__GNUC__) && !defined(__clang__))
 #  pragma GCC diagnostic pop
 #endif
 
diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc
index db46630bb2f..211a8c3e865 100644
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -103,7 +103,7 @@
 #include "ED_view3d_offscreen.h"
 
 #include "GHOST_C-api.h"
-#include "GHOST_Path-api.h"
+#include "GHOST_Path-api.hh"
 
 #include "GPU_context.h"
 
diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc
index 54b6df73954..57b07579291 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -76,7 +76,7 @@
 #endif
 
 #include "GHOST_C-api.h"
-#include "GHOST_Path-api.h"
+#include "GHOST_Path-api.hh"
 
 #include "RNA_define.h"
 
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index e17e1ae512e..467ee99b241 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -244,7 +244,7 @@ enum {
   /* *** End of keyboard codes. *** */
 
   /* NDOF (from "Space Navigator" & friends)
-   * These must be kept in sync with `GHOST_NDOFManager.h`.
+   * These must be kept in sync with `GHOST_NDOFManager.hh`.
    * Ordering matters, exact values do not. */
 
   /**
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 6d55cb57b1b..0e42c896fde 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -24,6 +24,8 @@
 
 #include "DNA_genfile.h"
 
+#include "BLI_fileops.h"
+#include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_system.h"
 #include "BLI_task.h"
@@ -577,9 +579,16 @@ int main(int argc,
     WM_exit(C);
   }
   else {
-    /* When no file is loaded, show the splash screen. */
+    /* When no file is loaded or if there is no userprefs, show the splash screen. */
     const char *blendfile_path = BKE_main_blendfile_path_from_global();
-    if (blendfile_path[0] == '\0') {
+
+    char userpref[FILE_MAX] = {0};
+    const char *const cfgdir = BKE_appdir_folder_id(BLENDER_USER_CONFIG, NULL);
+    if (cfgdir) {
+      BLI_path_join(userpref, sizeof(userpref), cfgdir, BLENDER_USERPREF_FILE);
+    }
+
+    if (blendfile_path[0] == '\0' || !BLI_exists(userpref)) {
       WM_init_splash(C);
     }
     WM_main(C);