diff --git a/source/blender/blenkernel/BKE_blender_copybuffer.h b/source/blender/blenkernel/BKE_blender_copybuffer.hh
similarity index 72%
rename from source/blender/blenkernel/BKE_blender_copybuffer.h
rename to source/blender/blenkernel/BKE_blender_copybuffer.hh
index 4779ed2b9b9..698dbc2a6df 100644
--- a/source/blender/blenkernel/BKE_blender_copybuffer.h
+++ b/source/blender/blenkernel/BKE_blender_copybuffer.hh
@@ -9,10 +9,6 @@
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ID;
 struct Main;
 struct ReportList;
@@ -23,11 +19,11 @@ struct bContext;
 /**
  * Initialize a copy operation.
  */
-void BKE_copybuffer_copy_begin(struct Main *bmain_src);
+void BKE_copybuffer_copy_begin(Main *bmain_src);
 /**
  * Mark an ID to be copied. Should only be called after a call to #BKE_copybuffer_copy_begin.
  */
-void BKE_copybuffer_copy_tag_ID(struct ID *id);
+void BKE_copybuffer_copy_tag_ID(ID *id);
 /**
  * Finalize a copy operation into given .blend file 'buffer'.
  *
@@ -35,9 +31,7 @@ void BKE_copybuffer_copy_tag_ID(struct ID *id);
  *
  * \return true on success, false otherwise.
  */
-bool BKE_copybuffer_copy_end(struct Main *bmain_src,
-                             const char *filename,
-                             struct ReportList *reports);
+bool BKE_copybuffer_copy_end(Main *bmain_src, const char *filename, ReportList *reports);
 /**
  * Paste data-blocks from the given .blend file 'buffer' (i.e. append them).
  *
@@ -48,9 +42,9 @@ bool BKE_copybuffer_copy_end(struct Main *bmain_src,
  *
  * \return true on success, false otherwise.
  */
-bool BKE_copybuffer_read(struct Main *bmain_dst,
+bool BKE_copybuffer_read(Main *bmain_dst,
                          const char *libname,
-                         struct ReportList *reports,
+                         ReportList *reports,
                          uint64_t id_types_mask);
 /**
  * Paste data-blocks from the given .blend file 'buffer'  (i.e. append them).
@@ -66,12 +60,5 @@ bool BKE_copybuffer_read(struct Main *bmain_dst,
  * \return Number of IDs directly pasted from the buffer
  * (does not includes indirectly linked ones).
  */
-int BKE_copybuffer_paste(struct bContext *C,
-                         const char *libname,
-                         int flag,
-                         struct ReportList *reports,
-                         uint64_t id_types_mask);
-
-#ifdef __cplusplus
-}
-#endif
+int BKE_copybuffer_paste(
+    bContext *C, const char *libname, int flag, ReportList *reports, uint64_t id_types_mask);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index e128c5743be..6e590e1ce4a 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -339,7 +339,7 @@ set(SRC
   BKE_bake_items_serialize.hh
   BKE_bake_items_socket.hh
   BKE_blender.h
-  BKE_blender_copybuffer.h
+  BKE_blender_copybuffer.hh
   BKE_blender_undo.h
   BKE_blender_user_menu.hh
   BKE_blender_version.h
diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index 8de8319bb49..8f22125cc0b 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -22,9 +22,9 @@
 #include "IMB_moviecache.hh"
 
 #include "BKE_addon.h"
-#include "BKE_blender.h" /* own include */
-#include "BKE_blender_user_menu.hh"
-#include "BKE_blender_version.h" /* own include */
+#include "BKE_blender.h"            /* own include */
+#include "BKE_blender_user_menu.hh" /* own include */
+#include "BKE_blender_version.h"    /* own include */
 #include "BKE_blendfile.hh"
 #include "BKE_brush.hh"
 #include "BKE_cachefile.h"
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.cc b/source/blender/blenkernel/intern/blender_copybuffer.cc
index 1343dd739bd..40627bbb32b 100644
--- a/source/blender/blenkernel/intern/blender_copybuffer.cc
+++ b/source/blender/blenkernel/intern/blender_copybuffer.cc
@@ -24,7 +24,7 @@
 #include "IMB_imbuf.hh"
 #include "IMB_moviecache.hh"
 
-#include "BKE_blender_copybuffer.h" /* own include */
+#include "BKE_blender_copybuffer.hh" /* own include */
 #include "BKE_blendfile.hh"
 #include "BKE_blendfile_link_append.hh"
 #include "BKE_context.hh"
diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc
index 895f1da1b2f..e8eff3a195f 100644
--- a/source/blender/editors/armature/pose_transform.cc
+++ b/source/blender/editors/armature/pose_transform.cc
@@ -24,7 +24,7 @@
 #include "BKE_animsys.h"
 #include "BKE_appdir.h"
 #include "BKE_armature.hh"
-#include "BKE_blender_copybuffer.h"
+#include "BKE_blender_copybuffer.hh"
 #include "BKE_context.hh"
 #include "BKE_deform.h"
 #include "BKE_idprop.h"
diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc
index 69dc409554c..c54f308416c 100644
--- a/source/blender/editors/render/render_shading.cc
+++ b/source/blender/editors/render/render_shading.cc
@@ -35,7 +35,7 @@
 #include "BKE_anim_data.h"
 #include "BKE_animsys.h"
 #include "BKE_appdir.h"
-#include "BKE_blender_copybuffer.h"
+#include "BKE_blender_copybuffer.hh"
 #include "BKE_brush.hh"
 #include "BKE_context.hh"
 #include "BKE_curve.hh"
diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc
index 6eee9e449ae..0ac351eac1a 100644
--- a/source/blender/editors/space_outliner/outliner_edit.cc
+++ b/source/blender/editors/space_outliner/outliner_edit.cc
@@ -27,7 +27,7 @@
 #include "BKE_animsys.h"
 #include "BKE_appdir.h"
 #include "BKE_armature.hh"
-#include "BKE_blender_copybuffer.h"
+#include "BKE_blender_copybuffer.hh"
 #include "BKE_context.hh"
 #include "BKE_idtype.hh"
 #include "BKE_layer.h"
diff --git a/source/blender/editors/space_sequencer/sequencer_clipboard.cc b/source/blender/editors/space_sequencer/sequencer_clipboard.cc
index 3ea648015bd..e2ea3ea6bce 100644
--- a/source/blender/editors/space_sequencer/sequencer_clipboard.cc
+++ b/source/blender/editors/space_sequencer/sequencer_clipboard.cc
@@ -28,7 +28,7 @@
 #include "BLI_path_util.h"
 
 #include "BKE_appdir.h"
-#include "BKE_blender_copybuffer.h"
+#include "BKE_blender_copybuffer.hh"
 #include "BKE_blendfile.hh"
 #include "BKE_context.hh"
 #include "BKE_fcurve.h"
diff --git a/source/blender/editors/space_view3d/view3d_ops.cc b/source/blender/editors/space_view3d/view3d_ops.cc
index 9fa0b235610..a0004b7c422 100644
--- a/source/blender/editors/space_view3d/view3d_ops.cc
+++ b/source/blender/editors/space_view3d/view3d_ops.cc
@@ -18,7 +18,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_appdir.h"
-#include "BKE_blender_copybuffer.h"
+#include "BKE_blender_copybuffer.hh"
 #include "BKE_context.hh"
 #include "BKE_main.hh"
 #include "BKE_report.h"