Cleanup: Move remaining window manager headers to C++

2024-01-04 14:30:21 -05:00 · 2024-01-04 14:30:21 -05:00 · 15ae8c3064
parent 1ccc958150
commit 15ae8c3064
77 changed files with 116 additions and 167 deletions
--- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc
@ -58,7 +58,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/gpencil_legacy/gpencil_ops.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_ops.cc
@ -22,7 +22,7 @@
 #include "DNA_space_types.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc
@ -53,7 +53,7 @@
 #include "BKE_tracking.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/interface/interface_handlers.cc
+++ b/source/blender/editors/interface/interface_handlers.cc
@ -68,7 +68,7 @@

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"

 #ifdef WITH_INPUT_IME
 #  include "BLT_lang.h"
--- a/source/blender/editors/interface/interface_template_search_menu.cc
+++ b/source/blender/editors/interface/interface_template_search_menu.cc
@ -53,7 +53,7 @@
 #include "interface_intern.hh"

 /* For key-map item access. */
-#include "wm_event_system.h"
+#include "wm_event_system.hh"

 /* -------------------------------------------------------------------- */
 /** \name Menu Search Template Implementation
--- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc
+++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc
@ -21,7 +21,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_gizmo_utils.hh"
--- a/source/blender/editors/object/object_edit.cc
+++ b/source/blender/editors/object/object_edit.cc
@ -100,7 +100,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "object_intern.h" /* own include */
--- a/source/blender/editors/object/object_modes.cc
+++ b/source/blender/editors/object/object_modes.cc
@ -52,7 +52,7 @@
 #include "ED_undo.hh"
 #include "ED_view3d.hh"

-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "ED_object.hh" /* own include */
 #include "object_intern.h"
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@ -64,7 +64,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "UI_interface.hh"
--- a/source/blender/editors/physics/particle_edit.cc
+++ b/source/blender/editors/physics/particle_edit.cc
@ -62,7 +62,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/screen/area.cc
+++ b/source/blender/editors/screen/area.cc
@ -30,7 +30,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_asset.hh"
--- a/source/blender/editors/screen/screen_edit.cc
+++ b/source/blender/editors/screen/screen_edit.cc
@ -42,7 +42,7 @@
 #include "UI_interface.hh"

 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "DEG_depsgraph_query.hh"

--- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
@ -19,7 +19,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "ED_curves.hh"
 #include "ED_curves_sculpt.hh"
--- a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
+++ b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
@ -24,7 +24,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "grease_pencil_intern.hh"
 #include "paint_intern.hh"
--- a/source/blender/editors/sculpt_paint/paint_canvas.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas.cc
@ -11,7 +11,7 @@
 #include "BKE_material.h"
 #include "BKE_paint.hh"

-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "ED_paint.hh"

--- a/source/blender/editors/sculpt_paint/paint_image.cc
+++ b/source/blender/editors/sculpt_paint/paint_image.cc
@ -59,7 +59,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/sculpt_paint/paint_ops.cc
+++ b/source/blender/editors/sculpt_paint/paint_ops.cc
@ -40,7 +40,7 @@
 #include "ED_screen.hh"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/sculpt_paint/paint_vertex.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex.cc
@ -54,7 +54,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_image.hh"
--- a/source/blender/editors/sculpt_paint/paint_weight.cc
+++ b/source/blender/editors/sculpt_paint/paint_weight.cc
@ -49,7 +49,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_image.hh"
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@ -33,7 +33,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_object.hh"
--- a/source/blender/editors/sculpt_paint/sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc
@ -47,7 +47,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_image.hh"
--- a/source/blender/editors/space_script/script_edit.cc
+++ b/source/blender/editors/space_script/script_edit.cc
@ -19,7 +19,7 @@

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"

 #include "RNA_access.hh"
 #include "RNA_define.hh"
--- a/source/blender/editors/space_sequencer/sequencer_retiming.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc
@ -32,7 +32,7 @@
 #include "SEQ_transform.hh"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "RNA_define.hh"

--- a/source/blender/editors/space_sequencer/sequencer_select.cc
+++ b/source/blender/editors/space_sequencer/sequencer_select.cc
@ -24,7 +24,7 @@
 #include "BKE_report.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_define.hh"
--- a/source/blender/editors/space_view3d/space_view3d.cc
+++ b/source/blender/editors/space_view3d/space_view3d.cc
@ -71,7 +71,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RE_engine.h"
--- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
@ -48,7 +48,7 @@
 #include "RNA_access.hh"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "DEG_depsgraph_query.hh"
--- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc
+++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc
@ -27,7 +27,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "view3d_intern.h" /* own include */
--- a/source/blender/editors/space_view3d/view3d_placement.cc
+++ b/source/blender/editors/space_view3d/view3d_placement.cc
@ -23,7 +23,7 @@
 #include "RNA_enum_types.hh"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "ED_gizmo_utils.hh"
 #include "ED_screen.hh"
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@ -66,7 +66,7 @@
 #include "BKE_workspace.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc
+++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc
@ -21,7 +21,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_gizmo_library.hh"
--- a/source/blender/editors/transform/transform_ops.cc
+++ b/source/blender/editors/transform/transform_ops.cc
@ -29,7 +29,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "UI_interface.hh"
--- a/source/blender/editors/undo/ed_undo.cc
+++ b/source/blender/editors/undo/ed_undo.cc
@ -44,7 +44,7 @@
 #include "ED_undo.hh"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "RNA_access.hh"
--- a/source/blender/editors/util/gizmo_utils.cc
+++ b/source/blender/editors/util/gizmo_utils.cc
@ -17,7 +17,7 @@
 #include "DNA_workspace_types.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_gizmo_utils.hh"
--- a/source/blender/makesrna/intern/rna_ui.cc
+++ b/source/blender/makesrna/intern/rna_ui.cc
@ -26,7 +26,7 @@

 #include "UI_interface.hh"

-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 /* see WM_types.hh */
--- a/source/blender/makesrna/intern/rna_workspace.cc
+++ b/source/blender/makesrna/intern/rna_workspace.cc
@ -38,7 +38,7 @@

 #  include "RNA_access.hh"

-#  include "WM_toolsystem.h"
+#  include "WM_toolsystem.hh"

 static void rna_window_update_all(Main * /*bmain*/, Scene * /*scene*/, PointerRNA * /*ptr*/)
 {
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@ -74,23 +74,23 @@ set(SRC
  WM_api.hh
  WM_keymap.hh
  WM_message.hh
-  WM_toolsystem.h
+  WM_toolsystem.hh
  WM_types.hh
  wm.hh
  wm_cursors.hh
  wm_draw.hh
-  wm_event_system.h
+  wm_event_system.hh
  wm_event_types.hh
  wm_files.hh
  wm_surface.hh
  wm_window.hh
-  intern/wm_platform_support.h
-  intern/wm_window_private.h
-  gizmo/WM_gizmo_api.h
-  gizmo/WM_gizmo_types.h
-  gizmo/wm_gizmo_fn.h
-  gizmo/wm_gizmo_wmapi.h
-  gizmo/intern/wm_gizmo_intern.h
+  intern/wm_platform_support.hh
+  intern/wm_window_private.hh
+  gizmo/WM_gizmo_api.hh
+  gizmo/WM_gizmo_types.hh
+  gizmo/wm_gizmo_fn.hh
+  gizmo/wm_gizmo_wmapi.hh
+  gizmo/intern/wm_gizmo_intern.hh
  message_bus/intern/wm_message_bus_intern.hh
  message_bus/wm_message_bus.hh
 )
@ -201,8 +201,8 @@ if(WITH_XR_OPENXR)
    xr/intern/wm_xr_operators.cc
    xr/intern/wm_xr_session.cc

-    xr/wm_xr.h
-    xr/intern/wm_xr_intern.h
+    xr/wm_xr.hh
+    xr/intern/wm_xr_intern.hh
  )
 endif()

--- a/source/blender/windowmanager/WM_toolsystem.hh
+++ b/source/blender/windowmanager/WM_toolsystem.hh
--- a/source/blender/windowmanager/WM_types.hh
+++ b/source/blender/windowmanager/WM_types.hh
@ -119,12 +119,12 @@ struct wmWindowManager;
 #include "RNA_types.hh"

 /* exported types for WM */
-#include "gizmo/WM_gizmo_types.h"
+#include "gizmo/WM_gizmo_types.hh"
 #include "wm_cursors.hh"
 #include "wm_event_types.hh"

 /* Include external gizmo API's */
-#include "gizmo/WM_gizmo_api.h"
+#include "gizmo/WM_gizmo_api.hh"

 namespace blender::asset_system {
 class AssetRepresentation;
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.hh
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.hh
@ -34,11 +34,7 @@ struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
 struct wmWindowManager;

-#include "wm_gizmo_fn.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "wm_gizmo_fn.hh"

 /* -------------------------------------------------------------------- */
 /* wmGizmo */
@ -513,7 +509,3 @@ void WM_gizmo_group_tag_remove(struct wmGizmoGroup *gzgroup);

 bool WM_gizmo_group_type_poll(const struct bContext *C, const struct wmGizmoGroupType *gzgt);
 void WM_gizmo_group_refresh(const struct bContext *C, struct wmGizmoGroup *gzgroup);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/gizmo/WM_gizmo_types.hh
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.hh
@ -16,6 +16,8 @@
 #include "BLI_compiler_attrs.h"
 #include "BLI_utildefines.h"

+#include "DNA_listBase.h"
+
 struct wmGizmo;
 struct wmGizmoGroup;
 struct wmGizmoGroupType;
@ -23,12 +25,6 @@ struct wmGizmoMapType;
 struct wmGizmoProperty;
 struct wmKeyConfig;

-#include "DNA_listBase.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------- */
 /* Enum Typedef's */

@ -195,7 +191,7 @@ typedef enum {
  WM_GIZMO_TWEAK_SNAP = (1 << 1),
 } eWM_GizmoFlagTweak;

-#include "wm_gizmo_fn.h"
+#include "wm_gizmo_fn.hh"

 typedef struct wmGizmoOpElem {
  struct wmOperatorType *type;
@ -513,7 +509,3 @@ typedef enum eWM_GizmoFlagMapDrawStep {
  WM_GIZMOMAP_DRAWSTEP_3D,
 } eWM_GizmoFlagMapDrawStep;
 #define WM_GIZMOMAP_DRAWSTEP_MAX 2
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc
@ -24,7 +24,7 @@
 #include "BKE_main.hh"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "ED_screen.hh"
@ -40,8 +40,8 @@
 #include "wm.hh"

 /* own includes */
-#include "wm_gizmo_intern.h"
-#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.hh"
+#include "wm_gizmo_wmapi.hh"

 static void wm_gizmo_register(wmGizmoGroup *gzgroup, wmGizmo *gz);

--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc
@ -31,14 +31,14 @@

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"

 #include "ED_screen.hh"
 #include "ED_undo.hh"

 /* own includes */
-#include "wm_gizmo_intern.h"
-#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.hh"
+#include "wm_gizmo_wmapi.hh"

 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.cc
@ -26,8 +26,8 @@
 #include "wm.hh"

 /* own includes */
-#include "wm_gizmo_intern.h"
-#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.hh"
+#include "wm_gizmo_wmapi.hh"

 /* -------------------------------------------------------------------- */
 /** \name GizmoGroup Type Append
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.hh
@ -12,7 +12,7 @@ struct BLI_Buffer;
 struct wmGizmoMap;
 struct wmKeyConfig;

-#include "wm_gizmo_fn.h"
+#include "wm_gizmo_fn.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
@ -35,7 +35,7 @@

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"

 /* for tool-tips */
 #include "UI_interface.hh"
@ -43,8 +43,8 @@
 #include "DEG_depsgraph.hh"

 /* own includes */
-#include "wm_gizmo_intern.h"
-#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.hh"
+#include "wm_gizmo_wmapi.hh"

 /**
 * Store all gizmo-maps here. Anyone who wants to register a gizmo for a certain
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc
@ -27,8 +27,8 @@
 #include "ANIM_keyframing.hh"

 /* own includes */
-#include "wm_gizmo_intern.h"
-#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.hh"
+#include "wm_gizmo_wmapi.hh"

 /* -------------------------------------------------------------------- */
 /** \name Property Definition
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_type.cc
@ -33,8 +33,8 @@
 #include "wm.hh"

 /* own includes */
-#include "wm_gizmo_intern.h"
-#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.hh"
+#include "wm_gizmo_wmapi.hh"

 /* -------------------------------------------------------------------- */
 /** \name Gizmo Type Append
--- a/source/blender/windowmanager/gizmo/wm_gizmo_fn.hh
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.hh
@ -14,10 +14,6 @@

 struct wmMsgBus;

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* wmGizmoGroup */
 typedef bool (*wmGizmoGroupFnPoll)(const struct bContext *,
                                   struct wmGizmoGroupType *) ATTR_WARN_UNUSED_RESULT;
@ -78,7 +74,3 @@ typedef struct wmGizmoPropertyFnParams {
  wmGizmoPropertyFnFree free_fn;
  void *user_data;
 } wmGizmoPropertyFnParams;
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.hh
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.hh
@ -20,10 +20,6 @@ struct wmEventHandler_Op;
 struct wmGizmoMap;
 struct wmOperatorType;

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------- */
 /** \name #wmGizmo
 * \{ */
@ -113,7 +109,3 @@ struct ListBase *wm_gizmomap_groups_get(wmGizmoMap *gzmap);
 void wm_gizmomaptypes_free(void);

 /** \} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/intern/wm.cc
+++ b/source/blender/windowmanager/intern/wm.cc
@ -44,10 +44,10 @@
 #include "WM_types.hh"
 #include "wm.hh"
 #include "wm_draw.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_window.hh"
 #ifdef WITH_XR_OPENXR
-#  include "wm_xr.h"
+#  include "wm_xr.hh"
 #endif

 #include "BKE_undo_system.h"
--- a/source/blender/windowmanager/intern/wm_dragdrop.cc
+++ b/source/blender/windowmanager/intern/wm_dragdrop.cc
@ -57,7 +57,7 @@

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_window.hh"

 #include <fmt/format.h>
--- a/source/blender/windowmanager/intern/wm_draw.cc
+++ b/source/blender/windowmanager/intern/wm_draw.cc
@ -53,11 +53,11 @@
 #include "RE_engine.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"
 #include "wm.hh"
 #include "wm_draw.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_surface.hh"
 #include "wm_window.hh"

--- a/source/blender/windowmanager/intern/wm_event_query.cc
+++ b/source/blender/windowmanager/intern/wm_event_query.cc
@ -29,7 +29,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"

-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_event_types.hh"

 #include "RNA_enum_types.hh"
--- a/source/blender/windowmanager/intern/wm_event_system.cc
+++ b/source/blender/windowmanager/intern/wm_event_system.cc
@ -66,15 +66,15 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "wm.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_event_types.hh"
 #include "wm_surface.hh"
 #include "wm_window.hh"
-#include "wm_window_private.h"
+#include "wm_window_private.hh"

 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@ -128,11 +128,11 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"
 #include "WM_types.hh"

 #include "wm.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_files.hh"
 #include "wm_window.hh"

--- a/source/blender/windowmanager/intern/wm_gesture_ops.cc
+++ b/source/blender/windowmanager/intern/wm_gesture_ops.cc
@ -26,7 +26,7 @@
 #include "WM_types.hh"

 #include "wm.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_event_types.hh"

 #include "ED_screen.hh"
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@ -82,9 +82,9 @@

 #include "wm.hh"
 #include "wm_cursors.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_files.hh"
-#include "wm_platform_support.h"
+#include "wm_platform_support.hh"
 #include "wm_surface.hh"
 #include "wm_window.hh"

--- a/source/blender/windowmanager/intern/wm_keymap.cc
+++ b/source/blender/windowmanager/intern/wm_keymap.cc
@ -42,7 +42,7 @@

 #include "WM_api.hh"
 #include "WM_types.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_event_types.hh"

 #include "ED_screen.hh"
--- a/source/blender/windowmanager/intern/wm_operator_type.cc
+++ b/source/blender/windowmanager/intern/wm_operator_type.cc
@ -36,7 +36,7 @@
 #include "WM_types.hh"

 #include "wm.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"

 #define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)")

--- a/source/blender/windowmanager/intern/wm_operators.cc
+++ b/source/blender/windowmanager/intern/wm_operators.cc
@ -97,12 +97,12 @@

 #include "wm.hh"
 #include "wm_draw.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_event_types.hh"
 #include "wm_files.hh"
 #include "wm_window.hh"
 #ifdef WITH_XR_OPENXR
-#  include "wm_xr.h"
+#  include "wm_xr.hh"
 #endif

 #define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)")
--- a/source/blender/windowmanager/intern/wm_platform_support.cc
+++ b/source/blender/windowmanager/intern/wm_platform_support.cc
@ -5,8 +5,8 @@
 /** \file
 * \ingroup wm
 */
-#include "wm_platform_support.h"
-#include "wm_window_private.h"
+#include "wm_platform_support.hh"
+#include "wm_window_private.hh"

 #include <cstring>

--- a/source/blender/windowmanager/intern/wm_platform_support.hh
+++ b/source/blender/windowmanager/intern/wm_platform_support.hh
@ -9,12 +9,4 @@

 #include "BLI_sys_types.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 bool WM_platform_support_perform_checks(void);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/intern/wm_playanim.cc
+++ b/source/blender/windowmanager/intern/wm_playanim.cc
@ -64,7 +64,7 @@

 #include "DEG_depsgraph.hh"

-#include "wm_window_private.h"
+#include "wm_window_private.hh"

 #include "WM_api.hh" /* Only for #WM_main_playanim. */

--- a/source/blender/windowmanager/intern/wm_toolsystem.cc
+++ b/source/blender/windowmanager/intern/wm_toolsystem.cc
@ -39,7 +39,7 @@

 #include "WM_api.hh"
 #include "WM_message.hh"
-#include "WM_toolsystem.h" /* own include */
+#include "WM_toolsystem.hh" /* own include */
 #include "WM_types.hh"

 static void toolsystem_reinit_with_toolref(bContext *C, WorkSpace * /*workspace*/, bToolRef *tref);
--- a/source/blender/windowmanager/intern/wm_window.cc
+++ b/source/blender/windowmanager/intern/wm_window.cc
@ -50,13 +50,13 @@
 #include "WM_types.hh"
 #include "wm.hh"
 #include "wm_draw.hh"
-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_files.hh"
-#include "wm_platform_support.h"
+#include "wm_platform_support.hh"
 #include "wm_window.hh"
-#include "wm_window_private.h"
+#include "wm_window_private.hh"
 #ifdef WITH_XR_OPENXR
-#  include "wm_xr.h"
+#  include "wm_xr.hh"
 #endif

 #include "ED_anim_api.hh"
--- a/source/blender/windowmanager/intern/wm_window_private.hh
+++ b/source/blender/windowmanager/intern/wm_window_private.hh
@ -13,10 +13,6 @@

 #include "GPU_context.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct bContext;

 /* *************** Message box *************** */
@ -35,7 +31,3 @@ void WM_ghost_show_message_box(const char *title,
 GHOST_TDrawingContextType wm_ghost_drawing_context_type(const eGPUBackendType gpu_backend);

 void wm_test_opengl_deprecation_warning(struct bContext *C);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/wm.hh
+++ b/source/blender/windowmanager/wm.hh
@ -10,7 +10,7 @@

 struct wmWindow;

-#include "gizmo/wm_gizmo_wmapi.h"
+#include "gizmo/wm_gizmo_wmapi.hh"

 struct wmPaintCursor {
  wmPaintCursor *next, *prev;
--- a/source/blender/windowmanager/wm_event_system.hh
+++ b/source/blender/windowmanager/wm_event_system.hh
@ -8,9 +8,15 @@

 #pragma once

+#include "WM_api.hh"
+
 struct ARegion;
+struct bToolRef;
 struct GHOST_TabletData;
 struct ScrArea;
+struct wmEvent;
+struct wmKeyMap;
+struct wmKeyMapItem;
 enum wmOperatorCallContext;

 #ifdef WITH_XR_OPENXR
--- a/source/blender/windowmanager/xr/intern/wm_xr.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr.cc
@ -31,7 +31,7 @@
 #include "WM_api.hh"

 #include "wm_surface.hh"
-#include "wm_xr_intern.h"
+#include "wm_xr_intern.hh"

 struct wmXrErrorHandlerData {
  wmWindowManager *wm;
--- a/source/blender/windowmanager/xr/intern/wm_xr_action.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_action.cc
@ -24,7 +24,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"

-#include "wm_xr_intern.h"
+#include "wm_xr_intern.hh"

 #include <cstring>

--- a/source/blender/windowmanager/xr/intern/wm_xr_actionmap.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_actionmap.cc
@ -26,7 +26,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"

-#include "wm_xr_intern.h"
+#include "wm_xr_intern.hh"

 #define WM_XR_ACTIONMAP_STR_DEFAULT "actionmap"
 #define WM_XR_ACTIONMAP_ITEM_STR_DEFAULT "action"
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc
@ -31,7 +31,7 @@
 #include "WM_api.hh"

 #include "wm_surface.hh"
-#include "wm_xr_intern.h"
+#include "wm_xr_intern.hh"

 void wm_xr_pose_to_mat(const GHOST_XrPose *pose, float r_mat[4][4])
 {
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.hh
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.hh
@ -10,12 +10,14 @@

 #include "CLG_log.h"

-#include "wm_xr.h"
+#include "GHOST_Types.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "DNA_listBase.h"
+#include "DNA_xr_types.h"

+#include "wm_xr.hh"
+
+struct Object;
 struct wmXrActionSet;

 typedef struct wmXrSessionState {
@ -240,7 +242,3 @@ void wm_xr_pose_scale_to_imat(const GHOST_XrPose *pose, float scale, float r_ima
 */
 void wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view, void *customdata);
 void wm_xr_draw_controllers(const struct bContext *C, struct ARegion *region, void *customdata);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc
@ -43,7 +43,7 @@
 #include "WM_api.hh"
 #include "WM_types.hh"

-#include "wm_xr_intern.h"
+#include "wm_xr_intern.hh"

 /* -------------------------------------------------------------------- */
 /** \name Operator Conditions
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc
@ -43,10 +43,10 @@
 #include "WM_api.hh"
 #include "WM_types.hh"

-#include "wm_event_system.h"
+#include "wm_event_system.hh"
 #include "wm_surface.hh"
 #include "wm_window.hh"
-#include "wm_xr_intern.h"
+#include "wm_xr_intern.hh"

 static wmSurface *g_xr_surface = nullptr;
 static CLG_LogRef LOG = {"wm.xr"};
--- a/source/blender/windowmanager/xr/wm_xr.hh
+++ b/source/blender/windowmanager/xr/wm_xr.hh
@ -8,10 +8,7 @@

 #pragma once

-#ifdef __cplusplus
-extern "C" {
-#endif
-
+struct wmWindow;
 struct wmWindowManager;
 struct wmXrData;

@ -27,7 +24,3 @@ bool wm_xr_events_handle(wmWindowManager *wm);
 /* `wm_xr_operators.cc` */

 void wm_xr_operatortypes_register(void);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/creator/creator.cc
+++ b/source/creator/creator.cc
@ -65,7 +65,7 @@
 #include "ED_datafiles.h"

 #include "WM_api.hh"
-#include "WM_toolsystem.h"
+#include "WM_toolsystem.hh"

 #include "RNA_define.hh"