diff --git a/source/blender/animrig/intern/action.cc b/source/blender/animrig/intern/action.cc
index 9e4de3c55aa..3768b0258e0 100644
--- a/source/blender/animrig/intern/action.cc
+++ b/source/blender/animrig/intern/action.cc
@@ -8,7 +8,7 @@
 
 #include "ANIM_action.hh"
 #include "BKE_action.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "DEG_depsgraph_build.hh"
diff --git a/source/blender/animrig/intern/animdata.cc b/source/blender/animrig/intern/animdata.cc
index 4588154dbea..3034f4f0e15 100644
--- a/source/blender/animrig/intern/animdata.cc
+++ b/source/blender/animrig/intern/animdata.cc
@@ -10,7 +10,7 @@
 
 #include "BKE_action.h"
 #include "BKE_anim_data.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_lib_id.hh"
 
 #include "BLI_listbase.h"
diff --git a/source/blender/animrig/intern/fcurve.cc b/source/blender/animrig/intern/fcurve.cc
index 02792e1a929..6a57c1f9dd7 100644
--- a/source/blender/animrig/intern/fcurve.cc
+++ b/source/blender/animrig/intern/fcurve.cc
@@ -11,7 +11,7 @@
 
 #include "ANIM_animdata.hh"
 #include "ANIM_fcurve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BLI_math_vector_types.hh"
 #include "DNA_anim_types.h"
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/animrig/intern/keyframing.cc b/source/blender/animrig/intern/keyframing.cc
index 43826b920d8..74c6e2c3bda 100644
--- a/source/blender/animrig/intern/keyframing.cc
+++ b/source/blender/animrig/intern/keyframing.cc
@@ -20,7 +20,7 @@
 #include "BKE_action.h"
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_nla.h"
diff --git a/source/blender/animrig/intern/keyframing_auto.cc b/source/blender/animrig/intern/keyframing_auto.cc
index 06c40e8a964..f92ac73e8b3 100644
--- a/source/blender/animrig/intern/keyframing_auto.cc
+++ b/source/blender/animrig/intern/keyframing_auto.cc
@@ -8,7 +8,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_scene.hh"
 
 #include "BLI_listbase.h"
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.hh
similarity index 71%
rename from source/blender/blenkernel/BKE_fcurve.h
rename to source/blender/blenkernel/BKE_fcurve.hh
index f0bb5a1696f..499f7a7e5ee 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.hh
@@ -1,4 +1,4 @@
-/* SPDX-FileCopyrightText: 2009 Blender Authors, Joshua Leung. All rights reserved.
+/* SPDX-FileCopyrightText: 2024 Blender Authors
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
@@ -11,14 +11,11 @@
 #include "BLI_math_vector_types.hh"
 #include "DNA_curve_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ChannelDriver;
 struct FCM_EnvelopeData;
 struct FCurve;
 struct FModifier;
+struct FCurvePathCache;
 
 struct AnimData;
 struct AnimationEvalContext;
@@ -47,7 +44,7 @@ struct bContext;
  * \warning it is not too advisable to reorder order of members of this struct,
  * as you'll have to edit quite a few (#FMODIFIER_NUM_TYPES) of these structs.
  */
-typedef struct FModifierTypeInfo {
+struct FModifierTypeInfo {
   /* Admin/identity. */
   /** #FMODIFIER_TYPE_* */
   short type;
@@ -66,27 +63,27 @@ typedef struct FModifierTypeInfo {
 
   /* data management function pointers - special handling */
   /** Free any data that is allocated separately (optional). */
-  void (*free_data)(struct FModifier *fcm);
+  void (*free_data)(FModifier *fcm);
   /** Copy any special data that is allocated separately (optional). */
-  void (*copy_data)(struct FModifier *fcm, const struct FModifier *src);
+  void (*copy_data)(FModifier *fcm, const FModifier *src);
   /**
    * Set settings for data that will be used for FCuModifier.data
    * (memory already allocated using #MEM_callocN). */
   void (*new_data)(void *mdata);
   /** Verifies that the modifier settings are valid */
-  void (*verify_data)(struct FModifier *fcm);
+  void (*verify_data)(FModifier *fcm);
 
   /* evaluation */
   /** Evaluate time that the modifier requires the F-Curve to be evaluated at */
   float (*evaluate_modifier_time)(
-      struct FCurve *fcu, struct FModifier *fcm, float cvalue, float evaltime, void *storage);
+      FCurve *fcu, FModifier *fcm, float cvalue, float evaltime, void *storage);
   /** Evaluate the modifier for the given time and 'accumulated' value */
   void (*evaluate_modifier)(
-      struct FCurve *fcu, struct FModifier *fcm, float *cvalue, float evaltime, void *storage);
-} FModifierTypeInfo;
+      FCurve *fcu, FModifier *fcm, float *cvalue, float evaltime, void *storage);
+};
 
 /* Values which describe the behavior of a FModifier Type */
-typedef enum eFMI_Action_Types {
+enum eFMI_Action_Types {
   /* modifier only modifies values outside of data range */
   FMI_TYPE_EXTRAPOLATION = 0,
   /* modifier leaves data-points alone, but adjusts the interpolation between and around them */
@@ -95,10 +92,10 @@ typedef enum eFMI_Action_Types {
   FMI_TYPE_REPLACE_VALUES,
   /* modifier generates a curve regardless of what came before */
   FMI_TYPE_GENERATE_CURVE,
-} eFMI_Action_Types;
+};
 
 /* Flags for the requirements of a FModifier Type */
-typedef enum eFMI_Requirement_Flags {
+enum eFMI_Requirement_Flags {
   /* modifier requires original data-points (kind of beats the purpose of a modifier stack?) */
   FMI_REQUIRES_ORIGINAL_DATA = (1 << 0),
   /* modifier doesn't require on any preceding data (i.e. it will generate a curve).
@@ -107,7 +104,7 @@ typedef enum eFMI_Requirement_Flags {
   FMI_REQUIRES_NOTHING = (1 << 1),
   /* refer to modifier instance */
   FMI_REQUIRES_RUNTIME_CHECK = (1 << 2),
-} eFMI_Requirement_Flags;
+};
 
 /* Function Prototypes for FModifierTypeInfo's */
 
@@ -115,7 +112,7 @@ typedef enum eFMI_Requirement_Flags {
  * This function should always be used to get the appropriate type-info,
  * as it has checks which prevent segfaults in some weird cases.
  */
-const FModifierTypeInfo *fmodifier_get_typeinfo(const struct FModifier *fcm);
+const FModifierTypeInfo *fmodifier_get_typeinfo(const FModifier *fcm);
 /**
  * This function should be used for getting the appropriate type-info when only
  * a F-Curve modifier type is known.
@@ -127,11 +124,11 @@ const FModifierTypeInfo *get_fmodifier_typeinfo(int type);
 /**
  * Add a new F-Curve Modifier to the given F-Curve of a certain type.
  */
-struct FModifier *add_fmodifier(ListBase *modifiers, int type, struct FCurve *owner_fcu);
+FModifier *add_fmodifier(ListBase *modifiers, int type, FCurve *owner_fcu);
 /**
  * Make a copy of the specified F-Modifier.
  */
-struct FModifier *copy_fmodifier(const struct FModifier *src);
+FModifier *copy_fmodifier(const FModifier *src);
 /**
  * Duplicate all of the F-Modifiers in the Modifier stacks.
  */
@@ -139,7 +136,7 @@ void copy_fmodifiers(ListBase *dst, const ListBase *src);
 /**
  * Remove and free the given F-Modifier from the given stack.
  */
-bool remove_fmodifier(ListBase *modifiers, struct FModifier *fcm);
+bool remove_fmodifier(ListBase *modifiers, FModifier *fcm);
 /**
  * Remove all of a given F-Curve's modifiers.
  */
@@ -148,11 +145,11 @@ void free_fmodifiers(ListBase *modifiers);
 /**
  * Find the active F-Modifier.
  */
-struct FModifier *find_active_fmodifier(ListBase *modifiers);
+FModifier *find_active_fmodifier(ListBase *modifiers);
 /**
  * Set the active F-Modifier.
  */
-void set_active_fmodifier(ListBase *modifiers, struct FModifier *fcm);
+void set_active_fmodifier(ListBase *modifiers, FModifier *fcm);
 
 /**
  * Do we have any modifiers which match certain criteria.
@@ -162,11 +159,11 @@ void set_active_fmodifier(ListBase *modifiers, struct FModifier *fcm);
  */
 bool list_has_suitable_fmodifier(const ListBase *modifiers, int mtype, short acttype);
 
-typedef struct FModifiersStackStorage {
+struct FModifiersStackStorage {
   uint modifier_count;
   uint size_per_modifier;
   void *buffer;
-} FModifiersStackStorage;
+};
 
 uint evaluate_fmodifiers_storage_size_per_modifier(ListBase *modifiers);
 /**
@@ -184,7 +181,7 @@ uint evaluate_fmodifiers_storage_size_per_modifier(ListBase *modifiers);
  */
 float evaluate_time_fmodifiers(FModifiersStackStorage *storage,
                                ListBase *modifiers,
-                               struct FCurve *fcu,
+                               FCurve *fcu,
                                float cvalue,
                                float evaltime);
 /**
@@ -193,7 +190,7 @@ float evaluate_time_fmodifiers(FModifiersStackStorage *storage,
  */
 void evaluate_value_fmodifiers(FModifiersStackStorage *storage,
                                ListBase *modifiers,
-                               struct FCurve *fcu,
+                               FCurve *fcu,
                                float *cvalue,
                                float evaltime);
 
@@ -201,9 +198,9 @@ void evaluate_value_fmodifiers(FModifiersStackStorage *storage,
  * Bake modifiers for given F-Curve to curve sample data, in the frame range defined
  * by start and end (inclusive).
  */
-void fcurve_bake_modifiers(struct FCurve *fcu, int start, int end);
+void fcurve_bake_modifiers(FCurve *fcu, int start, int end);
 
-int BKE_fcm_envelope_find_index(struct FCM_EnvelopeData *array,
+int BKE_fcm_envelope_find_index(FCM_EnvelopeData *array,
                                 float frame,
                                 int arraylen,
                                 bool *r_exists);
@@ -215,15 +212,15 @@ int BKE_fcm_envelope_find_index(struct FCM_EnvelopeData *array,
 #define BEZT_BINARYSEARCH_THRESH 0.01f /* was 0.00001, but giving errors */
 
 /* -------- Data Management  -------- */
-struct FCurve *BKE_fcurve_create(void);
+FCurve *BKE_fcurve_create(void);
 /**
  * Frees the F-Curve itself too, so make sure #BLI_remlink is called before calling this.
  */
-void BKE_fcurve_free(struct FCurve *fcu);
+void BKE_fcurve_free(FCurve *fcu);
 /**
  * Duplicate a F-Curve.
  */
-struct FCurve *BKE_fcurve_copy(const struct FCurve *fcu);
+FCurve *BKE_fcurve_copy(const FCurve *fcu);
 /**
  * Frees a list of F-Curves.
  */
@@ -235,30 +232,30 @@ void BKE_fcurves_copy(ListBase *dst, ListBase *src);
 
 /* Set fcurve modifier name and ensure uniqueness.
  * Pass new name string when it's been edited otherwise pass empty string. */
-void BKE_fmodifier_name_set(struct FModifier *fcm, const char *name);
+void BKE_fmodifier_name_set(FModifier *fcm, const char *name);
 
 /**
  * Callback used by lib_query to walk over all ID usages
  * (mimics `foreach_id` callback of #IDTypeInfo structure).
  */
-void BKE_fmodifiers_foreach_id(struct ListBase *fmodifiers, struct LibraryForeachIDData *data);
+void BKE_fmodifiers_foreach_id(ListBase *fmodifiers, LibraryForeachIDData *data);
 
 /**
  * Callback used by lib_query to walk over all ID usages
  * (mimics `foreach_id` callback of #IDTypeInfo structure).
  */
-void BKE_fcurve_foreach_id(struct FCurve *fcu, struct LibraryForeachIDData *data);
+void BKE_fcurve_foreach_id(FCurve *fcu, LibraryForeachIDData *data);
 
 /**
  * Find the F-Curve affecting the given RNA-access path + index,
  * in the list of F-Curves provided.
  */
-struct FCurve *BKE_fcurve_find(ListBase *list, const char rna_path[], int array_index);
+FCurve *BKE_fcurve_find(ListBase *list, const char rna_path[], int array_index);
 
 /**
  * Quick way to loop over all f-curves of a given 'path'.
  */
-struct FCurve *BKE_fcurve_iter_step(struct FCurve *fcu_iter, const char rna_path[]);
+FCurve *BKE_fcurve_iter_step(FCurve *fcu_iter, const char rna_path[]);
 
 /**
  * High level function to get an f-curve from C without having the RNA.
@@ -275,8 +272,8 @@ struct FCurve *BKE_fcurve_iter_step(struct FCurve *fcu_iter, const char rna_path
  * - Animated with driver: returns `NULL` and `*r_driven = true`.
  * - Not animated: returns `NULL` and `*r_driven = false`.
  */
-struct FCurve *id_data_find_fcurve(
-    ID *id, void *data, struct StructRNA *type, const char *prop_name, int index, bool *r_driven);
+FCurve *id_data_find_fcurve(
+    ID *id, void *data, StructRNA *type, const char *prop_name, int index, bool *r_driven);
 
 /**
  * Get list of LinkData's containing pointers to the F-Curves
@@ -306,22 +303,22 @@ int BKE_fcurves_filter(ListBase *dst, ListBase *src, const char *dataPrefix, con
  * \note Return pointer parameters (`r_action`, `r_driven` and `r_special`) are all optional and
  * may be NULL.
  */
-struct FCurve *BKE_animadata_fcurve_find_by_rna_path(struct AnimData *animdata,
-                                                     const char *rna_path,
-                                                     const int rna_index,
-                                                     struct bAction **r_action,
-                                                     bool *r_driven);
+FCurve *BKE_animadata_fcurve_find_by_rna_path(AnimData *animdata,
+                                              const char *rna_path,
+                                              const int rna_index,
+                                              bAction **r_action,
+                                              bool *r_driven);
 
 /**
  * Find an f-curve based on an rna property.
  */
-struct FCurve *BKE_fcurve_find_by_rna(struct PointerRNA *ptr,
-                                      struct PropertyRNA *prop,
-                                      int rnaindex,
-                                      struct AnimData **r_adt,
-                                      struct bAction **r_action,
-                                      bool *r_driven,
-                                      bool *r_special);
+FCurve *BKE_fcurve_find_by_rna(PointerRNA *ptr,
+                               PropertyRNA *prop,
+                               int rnaindex,
+                               AnimData **r_adt,
+                               bAction **r_action,
+                               bool *r_driven,
+                               bool *r_special);
 /**
  * Same as above, but takes a context data,
  * temp hack needed for complex paths like texture ones.
@@ -329,20 +326,20 @@ struct FCurve *BKE_fcurve_find_by_rna(struct PointerRNA *ptr,
  * \param r_special: Optional, ignored when NULL. Set to `true` if the given RNA `ptr` is a NLA
  * strip, and the returned F-curve comes from this NLA strip.
  */
-struct FCurve *BKE_fcurve_find_by_rna_context_ui(struct bContext *C,
-                                                 const struct PointerRNA *ptr,
-                                                 struct PropertyRNA *prop,
-                                                 int rnaindex,
-                                                 struct AnimData **r_animdata,
-                                                 struct bAction **r_action,
-                                                 bool *r_driven,
-                                                 bool *r_special);
+FCurve *BKE_fcurve_find_by_rna_context_ui(bContext *C,
+                                          const PointerRNA *ptr,
+                                          PropertyRNA *prop,
+                                          int rnaindex,
+                                          AnimData **r_animdata,
+                                          bAction **r_action,
+                                          bool *r_driven,
+                                          bool *r_special);
 
 /**
  * Binary search algorithm for finding where to 'insert' #BezTriple with given frame number.
  * Returns the index to insert at (data already at that index will be offset if replace is 0)
  */
-int BKE_fcurve_bezt_binarysearch_index(const struct BezTriple array[],
+int BKE_fcurve_bezt_binarysearch_index(const BezTriple array[],
                                        float frame,
                                        int arraylen,
                                        bool *r_replace);
@@ -352,30 +349,24 @@ int BKE_fcurve_bezt_binarysearch_index(const struct BezTriple array[],
 /**
  * Cached f-curve look-ups, use when this needs to be done many times.
  */
-struct FCurvePathCache;
-struct FCurvePathCache *BKE_fcurve_pathcache_create(ListBase *list);
-void BKE_fcurve_pathcache_destroy(struct FCurvePathCache *fcache);
-struct FCurve *BKE_fcurve_pathcache_find(struct FCurvePathCache *fcache,
-                                         const char rna_path[],
-                                         int array_index);
+FCurvePathCache *BKE_fcurve_pathcache_create(ListBase *list);
+void BKE_fcurve_pathcache_destroy(FCurvePathCache *fcache);
+FCurve *BKE_fcurve_pathcache_find(FCurvePathCache *fcache, const char rna_path[], int array_index);
 /**
  * Fill in an array of F-Curve, leave NULL when not found.
  *
  * \return The number of F-Curves found.
  */
-int BKE_fcurve_pathcache_find_array(struct FCurvePathCache *fcache,
+int BKE_fcurve_pathcache_find_array(FCurvePathCache *fcache,
                                     const char *rna_path,
-                                    struct FCurve **fcurve_result,
+                                    FCurve **fcurve_result,
                                     int fcurve_result_len);
 
 /**
  * Calculate the x range of the given F-Curve's data.
  * \return true if a range has been found.
  */
-bool BKE_fcurve_calc_range(const struct FCurve *fcu,
-                           float *r_min,
-                           float *r_max,
-                           bool selected_keys_only);
+bool BKE_fcurve_calc_range(const FCurve *fcu, float *r_min, float *r_max, bool selected_keys_only);
 
 /**
  * Calculate the x and y extents of F-Curve's data.
@@ -383,11 +374,11 @@ bool BKE_fcurve_calc_range(const struct FCurve *fcu,
  * Does the full range if NULL.
  * \return true if the bounds have been found.
  */
-bool BKE_fcurve_calc_bounds(const struct FCurve *fcu,
+bool BKE_fcurve_calc_bounds(const FCurve *fcu,
                             bool selected_keys_only,
                             bool include_handles,
                             const float frame_range[2],
-                            struct rctf *r_bounds);
+                            rctf *r_bounds);
 
 /**
  * Return an array of keyed frames, rounded to `interval`.
@@ -397,11 +388,11 @@ bool BKE_fcurve_calc_bounds(const struct FCurve *fcu,
  * \note An interval of zero could be supported (this implies no rounding at all),
  * however this risks very small differences in float values being treated as separate keyframes.
  */
-float *BKE_fcurves_calc_keyed_frames_ex(struct FCurve **fcurve_array,
+float *BKE_fcurves_calc_keyed_frames_ex(FCurve **fcurve_array,
                                         int fcurve_array_len,
                                         float interval,
                                         int *r_frames_len);
-float *BKE_fcurves_calc_keyed_frames(struct FCurve **fcurve_array,
+float *BKE_fcurves_calc_keyed_frames(FCurve **fcurve_array,
                                      int fcurve_array_len,
                                      int *r_frames_len);
 
@@ -409,18 +400,18 @@ float *BKE_fcurves_calc_keyed_frames(struct FCurve **fcurve_array,
  * Set the index that stores the FCurve's active keyframe, assuming that \a active_bezt
  * is already part of `fcu->bezt`. If NULL, set active keyframe index to "none."
  */
-void BKE_fcurve_active_keyframe_set(struct FCurve *fcu, const struct BezTriple *active_bezt);
+void BKE_fcurve_active_keyframe_set(FCurve *fcu, const BezTriple *active_bezt);
 /**
  * Get the active keyframe index, with sanity checks for point bounds.
  */
-int BKE_fcurve_active_keyframe_index(const struct FCurve *fcu);
+int BKE_fcurve_active_keyframe_index(const FCurve *fcu);
 
 /**
  * Move the indexed keyframe to the given value,
  * and move the handles with it to ensure the slope remains the same.
  */
 void BKE_fcurve_keyframe_move_time_with_handles(BezTriple *keyframe, const float new_time);
-void BKE_fcurve_keyframe_move_value_with_handles(struct BezTriple *keyframe, float new_value);
+void BKE_fcurve_keyframe_move_value_with_handles(BezTriple *keyframe, float new_value);
 
 /* .............. */
 
@@ -429,25 +420,25 @@ void BKE_fcurve_keyframe_move_value_with_handles(struct BezTriple *keyframe, flo
  * Usability of keyframes refers to whether they should be displayed,
  * and also whether they will have any influence on the final result.
  */
-bool BKE_fcurve_are_keyframes_usable(const struct FCurve *fcu);
+bool BKE_fcurve_are_keyframes_usable(const FCurve *fcu);
 
 /**
  * Can keyframes be added to F-Curve?
  * Keyframes can only be added if they are already visible.
  */
-bool BKE_fcurve_is_keyframable(const struct FCurve *fcu);
-bool BKE_fcurve_is_protected(const struct FCurve *fcu);
+bool BKE_fcurve_is_keyframable(const FCurve *fcu);
+bool BKE_fcurve_is_protected(const FCurve *fcu);
 
 /**
  * Are any of the keyframe control points selected on the F-Curve?
  */
-bool BKE_fcurve_has_selected_control_points(const struct FCurve *fcu);
+bool BKE_fcurve_has_selected_control_points(const FCurve *fcu);
 
 /**
  * Checks if the F-Curve has a Cycles modifier with simple settings
  * that warrant transition smoothing.
  */
-bool BKE_fcurve_is_cyclic(const struct FCurve *fcu);
+bool BKE_fcurve_is_cyclic(const FCurve *fcu);
 
 /* Type of infinite cycle for a curve. */
 typedef enum eFCU_Cycle_Type {
@@ -461,7 +452,7 @@ typedef enum eFCU_Cycle_Type {
 /**
  * Checks if the F-Curve has a Cycles modifier, and returns the type of the cycle behavior.
  */
-eFCU_Cycle_Type BKE_fcurve_get_cycle_type(const struct FCurve *fcu);
+eFCU_Cycle_Type BKE_fcurve_get_cycle_type(const FCurve *fcu);
 
 /**
  * Recompute bezier handles of all three given BezTriples, so that `bezt` can be inserted between
@@ -471,9 +462,9 @@ eFCU_Cycle_Type BKE_fcurve_get_cycle_type(const struct FCurve *fcu);
  * position.
  * \return Whether the split was successful.
  */
-bool BKE_fcurve_bezt_subdivide_handles(struct BezTriple *bezt,
-                                       struct BezTriple *prev,
-                                       struct BezTriple *next,
+bool BKE_fcurve_bezt_subdivide_handles(BezTriple *bezt,
+                                       BezTriple *prev,
+                                       BezTriple *next,
                                        float *r_pdelta);
 
 /**
@@ -482,7 +473,7 @@ bool BKE_fcurve_bezt_subdivide_handles(struct BezTriple *bezt,
  * \param new_totvert: new number of elements in the FCurve's `bezt` array.
  * Constraint: `0 <= new_totvert <= fcu->totvert`
  */
-void BKE_fcurve_bezt_shrink(struct FCurve *fcu, int new_totvert);
+void BKE_fcurve_bezt_shrink(FCurve *fcu, int new_totvert);
 
 /**
  * Merge the two given BezTriple arrays `a` and `b` into a newly allocated BezTriple array of size
@@ -499,7 +490,7 @@ BezTriple *BKE_bezier_array_merge(
 /**
  * Delete a keyframe from an F-curve at a specific index.
  */
-void BKE_fcurve_delete_key(struct FCurve *fcu, int index);
+void BKE_fcurve_delete_key(FCurve *fcu, int index);
 
 /** Delete an index range of keyframes from an F-curve. This is more performant than individually
  * removing keys.
@@ -512,12 +503,12 @@ void BKE_fcurve_delete_keys(FCurve *fcu, blender::uint2 index_range);
 /**
  * Delete selected keyframes from an F-curve.
  */
-bool BKE_fcurve_delete_keys_selected(struct FCurve *fcu);
+bool BKE_fcurve_delete_keys_selected(FCurve *fcu);
 
 /**
  * Delete all keyframes from an F-curve.
  */
-void BKE_fcurve_delete_keys_all(struct FCurve *fcu);
+void BKE_fcurve_delete_keys_all(FCurve *fcu);
 
 /**
  * Called during transform/snapping to make sure selected keyframes replace
@@ -527,9 +518,7 @@ void BKE_fcurve_delete_keys_all(struct FCurve *fcu);
  *                  but may want to use a different one at times (if caller does not operate on
  *                  selection).
  */
-void BKE_fcurve_merge_duplicate_keys(struct FCurve *fcu,
-                                     const int sel_flag,
-                                     const bool use_handle);
+void BKE_fcurve_merge_duplicate_keys(FCurve *fcu, const int sel_flag, const bool use_handle);
 
 /**
  * Ensure the FCurve is a proper function, such that every X-coordinate of the
@@ -544,7 +533,7 @@ void BKE_fcurve_merge_duplicate_keys(struct FCurve *fcu,
  *
  * After deduplication, call `BKE_fcurve_handles_recalc(fcu);`
  */
-void BKE_fcurve_deduplicate_keys(struct FCurve *fcu);
+void BKE_fcurve_deduplicate_keys(FCurve *fcu);
 
 /* -------- Curve Sanity -------- */
 
@@ -554,7 +543,7 @@ void BKE_fcurve_deduplicate_keys(struct FCurve *fcu);
  *
  * If the BezTriples have been rearranged, sort them first before using this.
  */
-void BKE_fcurve_handles_recalc(struct FCurve *fcu);
+void BKE_fcurve_handles_recalc(FCurve *fcu);
 /**
  * Variant of #BKE_fcurve_handles_recalc() that allows calculating based on a different select
  * flag.
@@ -563,7 +552,7 @@ void BKE_fcurve_handles_recalc(struct FCurve *fcu);
  * Usually `SELECT`, but may want to use a different one at times
  * (if caller does not operate on selection).
  */
-void BKE_fcurve_handles_recalc_ex(struct FCurve *fcu, eBezTriple_Flag handle_sel_flag);
+void BKE_fcurve_handles_recalc_ex(FCurve *fcu, eBezTriple_Flag handle_sel_flag);
 /**
  * Update handles, making sure the handle-types are valid (e.g. correctly deduced from an "Auto"
  * type), and recalculating their position vectors.
@@ -574,16 +563,16 @@ void BKE_fcurve_handles_recalc_ex(struct FCurve *fcu, eBezTriple_Flag handle_sel
  * \param use_handle: Check selection state of individual handles, otherwise always update both
  * handles if the key is selected.
  */
-void testhandles_fcurve(struct FCurve *fcu, eBezTriple_Flag sel_flag, bool use_handle);
+void testhandles_fcurve(FCurve *fcu, eBezTriple_Flag sel_flag, bool use_handle);
 /**
  * This function sorts BezTriples so that they are arranged in chronological order,
  * as tools working on F-Curves expect that the BezTriples are in order.
  */
-void sort_time_fcurve(struct FCurve *fcu);
+void sort_time_fcurve(FCurve *fcu);
 /**
  * This function tests if any BezTriples are out of order, thus requiring a sort.
  */
-bool test_time_fcurve(struct FCurve *fcu);
+bool test_time_fcurve(FCurve *fcu);
 
 /**
  * The length of each handle is not allowed to be more
@@ -598,23 +587,23 @@ void BKE_fcurve_correct_bezpart(const float v1[2], float v2[2], float v3[2], con
 /* -------- Evaluation -------- */
 
 /* evaluate fcurve */
-float evaluate_fcurve(struct FCurve *fcu, float evaltime);
-float evaluate_fcurve_only_curve(struct FCurve *fcu, float evaltime);
-float evaluate_fcurve_driver(struct PathResolvedRNA *anim_rna,
-                             struct FCurve *fcu,
-                             struct ChannelDriver *driver_orig,
-                             const struct AnimationEvalContext *anim_eval_context);
+float evaluate_fcurve(FCurve *fcu, float evaltime);
+float evaluate_fcurve_only_curve(FCurve *fcu, float evaltime);
+float evaluate_fcurve_driver(PathResolvedRNA *anim_rna,
+                             FCurve *fcu,
+                             ChannelDriver *driver_orig,
+                             const AnimationEvalContext *anim_eval_context);
 /**
  * Checks if the curve has valid keys, drivers or modifiers that produce an actual curve.
  */
-bool BKE_fcurve_is_empty(const struct FCurve *fcu);
+bool BKE_fcurve_is_empty(const FCurve *fcu);
 /**
  * Calculate the value of the given F-Curve at the given frame,
  * and store it's value in #FCurve.curval.
  */
-float calculate_fcurve(struct PathResolvedRNA *anim_rna,
-                       struct FCurve *fcu,
-                       const struct AnimationEvalContext *anim_eval_context);
+float calculate_fcurve(PathResolvedRNA *anim_rna,
+                       FCurve *fcu,
+                       const AnimationEvalContext *anim_eval_context);
 
 /* ************* F-Curve Samples API ******************** */
 
@@ -626,7 +615,7 @@ float calculate_fcurve(struct PathResolvedRNA *anim_rna,
  * \param fcu: the F-Curve being operated on.
  * \param data: pointer to some specific data that may be used by one of the callbacks.
  */
-typedef float (*FcuSampleFunc)(struct FCurve *fcu, void *data, float evaltime);
+typedef float (*FcuSampleFunc)(FCurve *fcu, void *data, float evaltime);
 
 /* ----- Sampling Callbacks ------ */
 
@@ -634,7 +623,7 @@ typedef float (*FcuSampleFunc)(struct FCurve *fcu, void *data, float evaltime);
  * Basic sampling callback which acts as a wrapper for #evaluate_fcurve()
  * 'data' arg here is unneeded here.
  */
-float fcurve_samplingcb_evalcurve(struct FCurve *fcu, void *data, float evaltime);
+float fcurve_samplingcb_evalcurve(FCurve *fcu, void *data, float evaltime);
 
 /* -------- Main Methods -------- */
 
@@ -642,31 +631,24 @@ float fcurve_samplingcb_evalcurve(struct FCurve *fcu, void *data, float evaltime
  * Main API function for creating a set of sampled curve data, given some callback function
  * used to retrieve the values to store.
  */
-void fcurve_store_samples(
-    struct FCurve *fcu, void *data, int start, int end, FcuSampleFunc sample_cb);
+void fcurve_store_samples(FCurve *fcu, void *data, int start, int end, FcuSampleFunc sample_cb);
 
 /**
  * Convert baked/sampled f-curves into bezt/regular f-curves.
  */
-void fcurve_samples_to_keyframes(struct FCurve *fcu, int start, int end);
+void fcurve_samples_to_keyframes(FCurve *fcu, int start, int end);
 
 /* ************* F-Curve .blend file API ******************** */
 
-void BKE_fmodifiers_blend_write(struct BlendWriter *writer, struct ListBase *fmodifiers);
-void BKE_fmodifiers_blend_read_data(struct BlendDataReader *reader,
-                                    ListBase *fmodifiers,
-                                    struct FCurve *curve);
+void BKE_fmodifiers_blend_write(BlendWriter *writer, ListBase *fmodifiers);
+void BKE_fmodifiers_blend_read_data(BlendDataReader *reader, ListBase *fmodifiers, FCurve *curve);
 
 /**
  * Write the FCurve's data to the writer.
  * If this is used to write an FCurve, be sure to call `BLO_write_struct(writer, FCurve, fcurve);`
  * before calling this function.
  */
-void BKE_fcurve_blend_write_data(struct BlendWriter *writer, struct FCurve *fcurve);
-void BKE_fcurve_blend_write_listbase(struct BlendWriter *writer, struct ListBase *fcurves);
+void BKE_fcurve_blend_write_data(BlendWriter *writer, FCurve *fcurve);
+void BKE_fcurve_blend_write_listbase(BlendWriter *writer, ListBase *fcurves);
 void BKE_fcurve_blend_read_data(BlendDataReader *reader, FCurve *fcu);
-void BKE_fcurve_blend_read_data_listbase(struct BlendDataReader *reader, struct ListBase *fcurves);
-
-#ifdef __cplusplus
-}
-#endif
+void BKE_fcurve_blend_read_data_listbase(BlendDataReader *reader, ListBase *fcurves);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c409c52e9d3..1b69bcc2eb0 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -390,7 +390,7 @@ set(SRC
   BKE_editmesh_cache.hh
   BKE_editmesh_tangent.hh
   BKE_effect.h
-  BKE_fcurve.h
+  BKE_fcurve.hh
   BKE_fcurve_driver.h
   BKE_file_handler.hh
   BKE_fluid.h
diff --git a/source/blender/blenkernel/intern/action.cc b/source/blender/blenkernel/intern/action.cc
index b1d8936ef8e..87aa3d03390 100644
--- a/source/blender/blenkernel/intern/action.cc
+++ b/source/blender/blenkernel/intern/action.cc
@@ -42,7 +42,7 @@
 #include "BKE_asset.hh"
 #include "BKE_constraint.h"
 #include "BKE_deform.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/blenkernel/intern/action_mirror.cc b/source/blender/blenkernel/intern/action_mirror.cc
index 5c833741d25..9f547075feb 100644
--- a/source/blender/blenkernel/intern/action_mirror.cc
+++ b/source/blender/blenkernel/intern/action_mirror.cc
@@ -25,7 +25,7 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 #include "DEG_depsgraph.hh"
 
diff --git a/source/blender/blenkernel/intern/anim_data.cc b/source/blender/blenkernel/intern/anim_data.cc
index ed872a93484..1811c58bd65 100644
--- a/source/blender/blenkernel/intern/anim_data.cc
+++ b/source/blender/blenkernel/intern/anim_data.cc
@@ -13,7 +13,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.hh"
 #include "BKE_idtype.hh"
diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc
index 96c12a403c2..8ac5231e8ce 100644
--- a/source/blender/blenkernel/intern/anim_sys.cc
+++ b/source/blender/blenkernel/intern/anim_sys.cc
@@ -40,7 +40,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
diff --git a/source/blender/blenkernel/intern/armature_update.cc b/source/blender/blenkernel/intern/armature_update.cc
index 957121ee0cc..f09ab3954cb 100644
--- a/source/blender/blenkernel/intern/armature_update.cc
+++ b/source/blender/blenkernel/intern/armature_update.cc
@@ -24,7 +24,7 @@
 #include "BKE_anim_path.h"
 #include "BKE_armature.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_object_types.hh"
 #include "BKE_scene.hh"
 
diff --git a/source/blender/blenkernel/intern/colortools.cc b/source/blender/blenkernel/intern/colortools.cc
index e492040e310..7122ca1d6c5 100644
--- a/source/blender/blenkernel/intern/colortools.cc
+++ b/source/blender/blenkernel/intern/colortools.cc
@@ -24,7 +24,7 @@
 
 #include "BKE_colortools.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 #include "IMB_colormanagement.hh"
 #include "IMB_imbuf_types.hh"
diff --git a/source/blender/blenkernel/intern/fcurve.cc b/source/blender/blenkernel/intern/fcurve.cc
index 2b08f158616..47b835fcefd 100644
--- a/source/blender/blenkernel/intern/fcurve.cc
+++ b/source/blender/blenkernel/intern/fcurve.cc
@@ -32,7 +32,7 @@
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.hh"
 #include "BKE_idprop.h"
diff --git a/source/blender/blenkernel/intern/fcurve_cache.cc b/source/blender/blenkernel/intern/fcurve_cache.cc
index 47829e9f752..fbbafb035ff 100644
--- a/source/blender/blenkernel/intern/fcurve_cache.cc
+++ b/source/blender/blenkernel/intern/fcurve_cache.cc
@@ -18,7 +18,7 @@
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name F-Curve Path Cache
diff --git a/source/blender/blenkernel/intern/fcurve_test.cc b/source/blender/blenkernel/intern/fcurve_test.cc
index 07c0cb9a727..5f397bfac3c 100644
--- a/source/blender/blenkernel/intern/fcurve_test.cc
+++ b/source/blender/blenkernel/intern/fcurve_test.cc
@@ -5,7 +5,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 #include "ANIM_fcurve.hh"
 
diff --git a/source/blender/blenkernel/intern/fmodifier.cc b/source/blender/blenkernel/intern/fmodifier.cc
index 301af997763..f3e1eac3bfd 100644
--- a/source/blender/blenkernel/intern/fmodifier.cc
+++ b/source/blender/blenkernel/intern/fmodifier.cc
@@ -28,7 +28,7 @@
 #include "BLI_noise.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idprop.h"
 
 static CLG_LogRef LOG = {"bke.fmodifier"};
diff --git a/source/blender/blenkernel/intern/ipo.cc b/source/blender/blenkernel/intern/ipo.cc
index 9128ab29a9d..8490bf9ca6c 100644
--- a/source/blender/blenkernel/intern/ipo.cc
+++ b/source/blender/blenkernel/intern/ipo.cc
@@ -45,7 +45,7 @@
 
 #include "BKE_action.h"
 #include "BKE_anim_data.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.hh"
 #include "BKE_idtype.hh"
diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index e8ddc384410..d0927375f16 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -29,7 +29,7 @@
 #include "BKE_armature.hh"
 #include "BKE_blender.hh"
 #include "BKE_collection.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_key.hh"
diff --git a/source/blender/blenkernel/intern/nla.cc b/source/blender/blenkernel/intern/nla.cc
index 70fc4dfe581..56c1d10cd3c 100644
--- a/source/blender/blenkernel/intern/nla.cc
+++ b/source/blender/blenkernel/intern/nla.cc
@@ -31,7 +31,7 @@
 #include "DNA_speaker_types.h"
 
 #include "BKE_action.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index 82be8e1ce8d..18c15d74b92 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -85,7 +85,7 @@
 #include "BKE_editmesh.hh"
 #include "BKE_editmesh_cache.hh"
 #include "BKE_effect.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_geometry_set.hh"
 #include "BKE_geometry_set_instances.hh"
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index cc117c9b083..adb52594082 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -61,7 +61,7 @@
 #include "BKE_duplilist.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_effect.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
 #include "BKE_image.h"
diff --git a/source/blender/blenkernel/intern/tracking.cc b/source/blender/blenkernel/intern/tracking.cc
index 60b839c06b2..4564041ea4a 100644
--- a/source/blender/blenkernel/intern/tracking.cc
+++ b/source/blender/blenkernel/intern/tracking.cc
@@ -38,7 +38,7 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_movieclip.h"
diff --git a/source/blender/blenkernel/intern/tracking_solver.cc b/source/blender/blenkernel/intern/tracking_solver.cc
index 3434f85ec77..aa6239872b0 100644
--- a/source/blender/blenkernel/intern/tracking_solver.cc
+++ b/source/blender/blenkernel/intern/tracking_solver.cc
@@ -22,7 +22,7 @@
 
 #include "BLT_translation.hh"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.cc b/source/blender/blenkernel/intern/tracking_stabilize.cc
index d3d9b0bdeaa..9b5b03cc67a 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.cc
+++ b/source/blender/blenkernel/intern/tracking_stabilize.cc
@@ -23,7 +23,7 @@
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc
index 88eb387df74..fb0dd443673 100644
--- a/source/blender/blenloader/intern/versioning_280.cc
+++ b/source/blender/blenloader/intern/versioning_280.cc
@@ -68,7 +68,7 @@
 #include "BKE_constraint.h"
 #include "BKE_curveprofile.h"
 #include "BKE_customdata.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_freestyle.h"
 #include "BKE_gpencil_geom_legacy.h"
diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc
index b64df04255b..f4d67c5afef 100644
--- a/source/blender/blenloader/intern/versioning_290.cc
+++ b/source/blender/blenloader/intern/versioning_290.cc
@@ -53,7 +53,7 @@
 #include "BKE_cryptomatte.h"
 #include "BKE_curve.hh"
 #include "BKE_customdata.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 01653bb2f92..633e0100ffd 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -67,7 +67,7 @@
 #include "BKE_customdata.hh"
 #include "BKE_data_transfer.h"
 #include "BKE_deform.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
diff --git a/source/blender/blenloader/intern/versioning_legacy.cc b/source/blender/blenloader/intern/versioning_legacy.cc
index 61f4cb0a04b..4effb383608 100644
--- a/source/blender/blenloader/intern/versioning_legacy.cc
+++ b/source/blender/blenloader/intern/versioning_legacy.cc
@@ -57,7 +57,7 @@
 #include "BKE_constraint.h"
 #include "BKE_customdata.hh"
 #include "BKE_deform.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_lattice.hh"
 #include "BKE_main.hh" /* for Main */
 #include "BKE_mesh.hh" /* for ME_ defines (patching) */
diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc
index a43ee2d10bc..21891828c80 100644
--- a/source/blender/editors/animation/anim_channels_edit.cc
+++ b/source/blender/editors/animation/anim_channels_edit.cc
@@ -31,7 +31,7 @@
 #include "BKE_action.h"
 #include "BKE_anim_data.hh"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.hh"
diff --git a/source/blender/editors/animation/anim_deps.cc b/source/blender/editors/animation/anim_deps.cc
index 287e5cc5e82..23a6fea7970 100644
--- a/source/blender/editors/animation/anim_deps.cc
+++ b/source/blender/editors/animation/anim_deps.cc
@@ -24,7 +24,7 @@
 
 #include "BKE_action.h"
 #include "BKE_anim_data.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.hh"
 
diff --git a/source/blender/editors/animation/anim_draw.cc b/source/blender/editors/animation/anim_draw.cc
index 9d6481768b1..9fa958bfb76 100644
--- a/source/blender/editors/animation/anim_draw.cc
+++ b/source/blender/editors/animation/anim_draw.cc
@@ -21,7 +21,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_mask.h"
 #include "BKE_nla.h"
diff --git a/source/blender/editors/animation/anim_filter.cc b/source/blender/editors/animation/anim_filter.cc
index feabf080429..9c8d4699c7d 100644
--- a/source/blender/editors/animation/anim_filter.cc
+++ b/source/blender/editors/animation/anim_filter.cc
@@ -70,7 +70,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_collection.hh"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.hh"
 #include "BKE_grease_pencil.hh"
diff --git a/source/blender/editors/animation/drivers.cc b/source/blender/editors/animation/drivers.cc
index 4b4d4dd7d58..c64713fb6e1 100644
--- a/source/blender/editors/animation/drivers.cc
+++ b/source/blender/editors/animation/drivers.cc
@@ -20,7 +20,7 @@
 
 #include "BKE_anim_data.hh"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_report.hh"
 
diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc
index b592250b8d9..e0b212d081f 100644
--- a/source/blender/editors/animation/fmodifier_ui.cc
+++ b/source/blender/editors/animation/fmodifier_ui.cc
@@ -27,7 +27,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_screen.hh"
 
 #include "WM_api.hh"
diff --git a/source/blender/editors/animation/keyframes_edit.cc b/source/blender/editors/animation/keyframes_edit.cc
index 8c45d16811c..8a48afb4b6b 100644
--- a/source/blender/editors/animation/keyframes_edit.cc
+++ b/source/blender/editors/animation/keyframes_edit.cc
@@ -23,7 +23,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 
 #include "ED_anim_api.hh"
diff --git a/source/blender/editors/animation/keyframes_general.cc b/source/blender/editors/animation/keyframes_general.cc
index 5abeefe4ffe..279a1ef8292 100644
--- a/source/blender/editors/animation/keyframes_general.cc
+++ b/source/blender/editors/animation/keyframes_general.cc
@@ -26,7 +26,7 @@
 
 #include "BKE_action.h"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_main.hh"
 #include "BKE_scene.hh"
 
diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc
index 4864cf76b4b..7ba26939ef3 100644
--- a/source/blender/editors/animation/keyframes_keylist.cc
+++ b/source/blender/editors/animation/keyframes_keylist.cc
@@ -30,7 +30,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_grease_pencil.hh"
 
 #include "ED_anim_api.hh"
diff --git a/source/blender/editors/animation/keyframes_keylist_test.cc b/source/blender/editors/animation/keyframes_keylist_test.cc
index 12225529856..dfdd5812c79 100644
--- a/source/blender/editors/animation/keyframes_keylist_test.cc
+++ b/source/blender/editors/animation/keyframes_keylist_test.cc
@@ -13,7 +13,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 #include <functional>
 #include <optional>
diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc
index 6f4c9624cb8..b45973a3c5c 100644
--- a/source/blender/editors/animation/keyframing.cc
+++ b/source/blender/editors/animation/keyframing.cc
@@ -27,7 +27,7 @@
 #include "BKE_animsys.h"
 #include "BKE_armature.hh"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/editors/armature/armature_add.cc b/source/blender/editors/armature/armature_add.cc
index 8d309177621..1da2697e246 100644
--- a/source/blender/editors/armature/armature_add.cc
+++ b/source/blender/editors/armature/armature_add.cc
@@ -28,7 +28,7 @@
 #include "BKE_armature.hh"
 #include "BKE_constraint.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idprop.h"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc
index 556b49122bc..d356918a00a 100644
--- a/source/blender/editors/armature/pose_slide.cc
+++ b/source/blender/editors/armature/pose_slide.cc
@@ -42,7 +42,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_vec_types.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 
 #include "BKE_context.hh"
diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc
index 6f6e85956ba..c179a4a38a2 100644
--- a/source/blender/editors/curve/editcurve.cc
+++ b/source/blender/editors/curve/editcurve.cc
@@ -28,7 +28,7 @@
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
 #include "BKE_displist.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_key.hh"
 #include "BKE_layer.hh"
diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc
index a44314f33cf..deedeaeb1a6 100644
--- a/source/blender/editors/curve/editcurve_paint.cc
+++ b/source/blender/editors/curve/editcurve_paint.cc
@@ -17,7 +17,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_object_types.hh"
 #include "BKE_report.hh"
 
diff --git a/source/blender/editors/curve/editcurve_query.cc b/source/blender/editors/curve/editcurve_query.cc
index 4619c974354..0897999823d 100644
--- a/source/blender/editors/curve/editcurve_query.cc
+++ b/source/blender/editors/curve/editcurve_query.cc
@@ -15,7 +15,7 @@
 #include "BLI_math_vector.h"
 
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_layer.hh"
 
 #include "ED_curve.hh"
diff --git a/source/blender/editors/curve/editcurve_select.cc b/source/blender/editors/curve/editcurve_select.cc
index 88a8da53cd1..ddc2f4b3a36 100644
--- a/source/blender/editors/curve/editcurve_select.cc
+++ b/source/blender/editors/curve/editcurve_select.cc
@@ -21,7 +21,7 @@
 
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_layer.hh"
 #include "BKE_report.hh"
 
diff --git a/source/blender/editors/curve/editcurve_undo.cc b/source/blender/editors/curve/editcurve_undo.cc
index 7f3aa055482..46fde85b448 100644
--- a/source/blender/editors/curve/editcurve_undo.cc
+++ b/source/blender/editors/curve/editcurve_undo.cc
@@ -21,7 +21,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_layer.hh"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_convert.cc b/source/blender/editors/gpencil_legacy/gpencil_convert.cc
index fa9315ba36c..8617ac13bdf 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_convert.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_convert.cc
@@ -36,7 +36,7 @@
 #include "BKE_collection.hh"
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_gpencil_geom_legacy.h"
 #include "BKE_gpencil_legacy.h"
diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc
index a5f12094772..c3de1bf8456 100644
--- a/source/blender/editors/interface/interface_anim.cc
+++ b/source/blender/editors/interface/interface_anim.cc
@@ -22,7 +22,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.hh"
 #include "BKE_nla.h"
diff --git a/source/blender/editors/object/object_constraint.cc b/source/blender/editors/object/object_constraint.cc
index f6aa61011e5..8d70d30bca4 100644
--- a/source/blender/editors/object/object_constraint.cc
+++ b/source/blender/editors/object/object_constraint.cc
@@ -32,7 +32,7 @@
 #include "BKE_armature.hh"
 #include "BKE_constraint.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_layer.hh"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc
index 2855ac0739c..a15c49603b5 100644
--- a/source/blender/editors/object/object_relations.cc
+++ b/source/blender/editors/object/object_relations.cc
@@ -47,7 +47,7 @@
 #include "BKE_curve.hh"
 #include "BKE_displist.h"
 #include "BKE_editmesh.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idtype.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index ee2660dffb9..daab25dfeae 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -31,7 +31,7 @@
 #include "BKE_camera.h"
 #include "BKE_context.hh"
 #include "BKE_customdata.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_image.h"
 #include "BKE_image_format.h"
diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc
index d7c22d1a64a..96bd0d7a9c4 100644
--- a/source/blender/editors/screen/screen_ops.cc
+++ b/source/blender/editors/screen/screen_ops.cc
@@ -31,7 +31,7 @@
 #include "BKE_callbacks.hh"
 #include "BKE_context.hh"
 #include "BKE_editmesh.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_icons.h"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc
index b8a63271db9..d67bf355bb0 100644
--- a/source/blender/editors/sound/sound_ops.cc
+++ b/source/blender/editors/sound/sound_ops.cc
@@ -23,7 +23,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc
index 7d459cae107..24e0dd76bd3 100644
--- a/source/blender/editors/space_action/action_edit.cc
+++ b/source/blender/editors/space_action/action_edit.cc
@@ -30,7 +30,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.hh"
diff --git a/source/blender/editors/space_action/action_select.cc b/source/blender/editors/space_action/action_select.cc
index cc55c0f1b50..0624da7b9a5 100644
--- a/source/blender/editors/space_action/action_select.cc
+++ b/source/blender/editors/space_action/action_select.cc
@@ -28,7 +28,7 @@
 #include "RNA_define.hh"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.hh"
 #include "BKE_nla.h"
diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc
index 896744c3017..0dea3e22e74 100644
--- a/source/blender/editors/space_graph/graph_buttons.cc
+++ b/source/blender/editors/space_graph/graph_buttons.cc
@@ -28,7 +28,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_fcurve_driver.h"
 #include "BKE_global.hh"
 #include "BKE_screen.hh"
diff --git a/source/blender/editors/space_graph/graph_draw.cc b/source/blender/editors/space_graph/graph_draw.cc
index 5534d0bde3e..af480138b9f 100644
--- a/source/blender/editors/space_graph/graph_draw.cc
+++ b/source/blender/editors/space_graph/graph_draw.cc
@@ -22,7 +22,7 @@
 
 #include "BKE_anim_data.hh"
 #include "BKE_curve.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 
 #include "GPU_immediate.h"
diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc
index f92c9948931..8a7e8a06276 100644
--- a/source/blender/editors/space_graph/graph_edit.cc
+++ b/source/blender/editors/space_graph/graph_edit.cc
@@ -35,7 +35,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_nla.h"
 #include "BKE_report.hh"
diff --git a/source/blender/editors/space_graph/graph_select.cc b/source/blender/editors/space_graph/graph_select.cc
index 8f1b1953cd3..61261ea4674 100644
--- a/source/blender/editors/space_graph/graph_select.cc
+++ b/source/blender/editors/space_graph/graph_select.cc
@@ -25,7 +25,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 
 #include "UI_interface_c.hh"
diff --git a/source/blender/editors/space_graph/graph_utils.cc b/source/blender/editors/space_graph/graph_utils.cc
index 04a8d7bada1..ed91f986c10 100644
--- a/source/blender/editors/space_graph/graph_utils.cc
+++ b/source/blender/editors/space_graph/graph_utils.cc
@@ -18,7 +18,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_screen.hh"
 
 #include "ED_anim_api.hh"
diff --git a/source/blender/editors/space_graph/graph_view.cc b/source/blender/editors/space_graph/graph_view.cc
index 7c7bc10dd5b..eadc00c1876 100644
--- a/source/blender/editors/space_graph/graph_view.cc
+++ b/source/blender/editors/space_graph/graph_view.cc
@@ -21,7 +21,7 @@
 #include "RNA_define.hh"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 
 #include "UI_view2d.hh"
diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc
index 32459d86db0..2e000ea7859 100644
--- a/source/blender/editors/space_graph/space_graph.cc
+++ b/source/blender/editors/space_graph/space_graph.cc
@@ -20,7 +20,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_lib_remap.hh"
 #include "BKE_screen.hh"
diff --git a/source/blender/editors/space_nla/nla_buttons.cc b/source/blender/editors/space_nla/nla_buttons.cc
index b1c92cace38..e41999c37f1 100644
--- a/source/blender/editors/space_nla/nla_buttons.cc
+++ b/source/blender/editors/space_nla/nla_buttons.cc
@@ -22,7 +22,7 @@
 #include "BLT_translation.hh"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 #include "BKE_screen.hh"
 
diff --git a/source/blender/editors/space_nla/nla_draw.cc b/source/blender/editors/space_nla/nla_draw.cc
index 2e78fe4a2de..476b0412fb3 100644
--- a/source/blender/editors/space_nla/nla_draw.cc
+++ b/source/blender/editors/space_nla/nla_draw.cc
@@ -22,7 +22,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_action.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_nla.h"
 
 #include "ED_anim_api.hh"
diff --git a/source/blender/editors/space_nla/nla_edit.cc b/source/blender/editors/space_nla/nla_edit.cc
index 4f1b613c4fa..41fa288cfec 100644
--- a/source/blender/editors/space_nla/nla_edit.cc
+++ b/source/blender/editors/space_nla/nla_edit.cc
@@ -21,7 +21,7 @@
 #include "BLT_translation.hh"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
 #include "BKE_nla.h"
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index edaef705ea8..d1cc65d222e 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -43,7 +43,7 @@
 #include "BKE_collection.hh"
 #include "BKE_constraint.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_grease_pencil.hh"
 #include "BKE_idtype.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_clipboard.cc b/source/blender/editors/space_sequencer/sequencer_clipboard.cc
index 99822581086..c22d9653676 100644
--- a/source/blender/editors/space_sequencer/sequencer_clipboard.cc
+++ b/source/blender/editors/space_sequencer/sequencer_clipboard.cc
@@ -30,7 +30,7 @@
 #include "BKE_blender_copybuffer.hh"
 #include "BKE_blendfile.hh"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
 #include "BKE_lib_remap.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
index 1900dc751b2..9069bb64583 100644
--- a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
@@ -14,7 +14,7 @@
 #include "DNA_sequence_types.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 #include "BLF_api.hh"
 
diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
index 3233002187e..01a7bb69d52 100644
--- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
@@ -21,7 +21,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_sound.h"
 
diff --git a/source/blender/editors/transform/transform_convert_action.cc b/source/blender/editors/transform/transform_convert_action.cc
index c06f71a1bb1..d5b76f2f5ac 100644
--- a/source/blender/editors/transform/transform_convert_action.cc
+++ b/source/blender/editors/transform/transform_convert_action.cc
@@ -17,7 +17,7 @@
 #include "BLI_rect.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_grease_pencil.hh"
 #include "BKE_key.hh"
diff --git a/source/blender/editors/transform/transform_convert_graph.cc b/source/blender/editors/transform/transform_convert_graph.cc
index d40c6a9b787..632003ea15e 100644
--- a/source/blender/editors/transform/transform_convert_graph.cc
+++ b/source/blender/editors/transform/transform_convert_graph.cc
@@ -15,7 +15,7 @@
 #include "BLI_math_vector.h"
 
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_layer.hh"
 #include "BKE_nla.h"
 #include "BKE_report.hh"
diff --git a/source/blender/io/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h
index e56791ea9a4..0913a96e858 100644
--- a/source/blender/io/collada/AnimationExporter.h
+++ b/source/blender/io/collada/AnimationExporter.h
@@ -29,7 +29,7 @@
 #include "BKE_action.h" /* pose functions */
 #include "BKE_armature.hh"
 #include "BKE_constraint.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_object.hh"
 #include "BKE_scene.hh"
 #include "ED_object.hh"
diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp
index 2ecae8b85b7..bef2e62ce5e 100644
--- a/source/blender/io/collada/AnimationImporter.cpp
+++ b/source/blender/io/collada/AnimationImporter.cpp
@@ -27,7 +27,7 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_object.hh"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/io/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h
index 3300b0c0359..5dd008ec7af 100644
--- a/source/blender/io/collada/BCAnimationCurve.h
+++ b/source/blender/io/collada/BCAnimationCurve.h
@@ -10,7 +10,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_armature.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_material.h"
 
 #include "ED_anim_api.hh"
diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp
index db8875f252c..23110d0dbde 100644
--- a/source/blender/io/collada/DocumentExporter.cpp
+++ b/source/blender/io/collada/DocumentExporter.cpp
@@ -72,7 +72,7 @@
 #include "BKE_armature.hh"
 #include "BKE_blender_version.h"
 #include "BKE_customdata.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_image.h"
 #include "BKE_main.hh"
diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp
index 036131afa5f..a3fd127ed78 100644
--- a/source/blender/io/collada/DocumentImporter.cpp
+++ b/source/blender/io/collada/DocumentImporter.cpp
@@ -41,7 +41,7 @@
 
 #include "BKE_camera.h"
 #include "BKE_collection.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_image.h"
 #include "BKE_layer.hh"
diff --git a/source/blender/io/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h
index 74ebdc48c90..b194ebf6fb8 100644
--- a/source/blender/io/collada/SceneExporter.h
+++ b/source/blender/io/collada/SceneExporter.h
@@ -28,7 +28,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BKE_constraint.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "ED_keyframing.hh"
diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc
index a269ae67be5..dafc1c2b8bb 100644
--- a/source/blender/io/usd/intern/usd_skel_convert.cc
+++ b/source/blender/io/usd/intern/usd_skel_convert.cc
@@ -24,7 +24,7 @@
 #include "BKE_action.h"
 #include "BKE_armature.hh"
 #include "BKE_deform.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_key.hh"
 #include "BKE_mesh.hh"
 #include "BKE_modifier.hh"
diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc
index 42023256d57..d2559db4a55 100644
--- a/source/blender/makesrna/intern/rna_access.cc
+++ b/source/blender/makesrna/intern/rna_access.cc
@@ -37,7 +37,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_collection.hh"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_idprop.h"
 #include "BKE_idtype.hh"
diff --git a/source/blender/makesrna/intern/rna_action.cc b/source/blender/makesrna/intern/rna_action.cc
index 0359f4d8bce..aa824e38a83 100644
--- a/source/blender/makesrna/intern/rna_action.cc
+++ b/source/blender/makesrna/intern/rna_action.cc
@@ -34,7 +34,7 @@
 
 #  include "BLI_math_base.h"
 
-#  include "BKE_fcurve.h"
+#  include "BKE_fcurve.hh"
 
 #  include "DEG_depsgraph.hh"
 
diff --git a/source/blender/makesrna/intern/rna_animation.cc b/source/blender/makesrna/intern/rna_animation.cc
index 462c0b729a8..77f4eb1d03c 100644
--- a/source/blender/makesrna/intern/rna_animation.cc
+++ b/source/blender/makesrna/intern/rna_animation.cc
@@ -93,7 +93,7 @@ const EnumPropertyItem rna_enum_keying_flag_api_items[] = {
 
 #  include "BKE_anim_data.hh"
 #  include "BKE_animsys.h"
-#  include "BKE_fcurve.h"
+#  include "BKE_fcurve.hh"
 #  include "BKE_nla.h"
 
 #  include "DEG_depsgraph.hh"
diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc
index 8a2dccc9a57..e23a673bf2c 100644
--- a/source/blender/makesrna/intern/rna_fcurve.cc
+++ b/source/blender/makesrna/intern/rna_fcurve.cc
@@ -220,7 +220,7 @@ static StructRNA *rna_FModifierType_refine(PointerRNA *ptr)
 /* ****************************** */
 
 #  include "BKE_anim_data.hh"
-#  include "BKE_fcurve.h"
+#  include "BKE_fcurve.hh"
 #  include "BKE_fcurve_driver.h"
 
 #  include "DEG_depsgraph.hh"
diff --git a/source/blender/makesrna/intern/rna_fcurve_api.cc b/source/blender/makesrna/intern/rna_fcurve_api.cc
index 7bfaec26eeb..37b722b75cb 100644
--- a/source/blender/makesrna/intern/rna_fcurve_api.cc
+++ b/source/blender/makesrna/intern/rna_fcurve_api.cc
@@ -24,7 +24,7 @@
 
 #  include <stddef.h>
 
-#  include "BKE_fcurve.h"
+#  include "BKE_fcurve.hh"
 
 static void rna_FCurve_convert_to_samples(FCurve *fcu, ReportList *reports, int start, int end)
 {
diff --git a/source/blender/makesrna/intern/rna_nla.cc b/source/blender/makesrna/intern/rna_nla.cc
index 8574e5fb2bd..fd69e48df44 100644
--- a/source/blender/makesrna/intern/rna_nla.cc
+++ b/source/blender/makesrna/intern/rna_nla.cc
@@ -77,7 +77,7 @@ const EnumPropertyItem rna_enum_nla_mode_extend_items[] = {
 
 /* needed for some of the validation stuff... */
 #  include "BKE_anim_data.hh"
-#  include "BKE_fcurve.h"
+#  include "BKE_fcurve.hh"
 #  include "BKE_nla.h"
 
 #  include "DNA_object_types.h"
diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc
index d6ded7162db..f9f101b019f 100644
--- a/source/blender/python/intern/bpy_rna_anim.cc
+++ b/source/blender/python/intern/bpy_rna_anim.cc
@@ -27,7 +27,7 @@
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
 #include "BKE_context.hh"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
diff --git a/source/blender/sequencer/intern/animation.cc b/source/blender/sequencer/intern/animation.cc
index 985535b7fcf..9fa4d4baae8 100644
--- a/source/blender/sequencer/intern/animation.cc
+++ b/source/blender/sequencer/intern/animation.cc
@@ -12,7 +12,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc
index a9bbd8289be..2c6757ac2e9 100644
--- a/source/blender/sequencer/intern/effects.cc
+++ b/source/blender/sequencer/intern/effects.cc
@@ -31,7 +31,7 @@
 #include "DNA_space_types.h"
 #include "DNA_vfont_types.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
 
diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc
index 649bdc0c37f..6a32b00d56d 100644
--- a/source/blender/sequencer/intern/render.cc
+++ b/source/blender/sequencer/intern/render.cc
@@ -28,7 +28,7 @@
 
 #include "BKE_anim_data.hh"
 #include "BKE_animsys.h"
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_global.hh"
 #include "BKE_image.h"
 #include "BKE_layer.hh"
diff --git a/source/blender/sequencer/intern/sequencer.cc b/source/blender/sequencer/intern/sequencer.cc
index 320da06bbd1..3ec7df27de7 100644
--- a/source/blender/sequencer/intern/sequencer.cc
+++ b/source/blender/sequencer/intern/sequencer.cc
@@ -20,7 +20,7 @@
 #include "BLI_listbase.h"
 #include "BLI_path_util.h"
 
-#include "BKE_fcurve.h"
+#include "BKE_fcurve.hh"
 #include "BKE_idprop.h"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"