diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.hh
similarity index 62%
rename from source/blender/blenkernel/BKE_library.h
rename to source/blender/blenkernel/BKE_library.hh
index dbe30f95805..edef4d18c77 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.hh
@@ -11,15 +11,7 @@
 
 #include "BLI_compiler_attrs.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Library;
 struct Main;
 
-void BKE_library_filepath_set(struct Main *bmain, struct Library *lib, const char *filepath);
-
-#ifdef __cplusplus
-}
-#endif
+void BKE_library_filepath_set(Main *bmain, Library *lib, const char *filepath);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 666b26ff876..26003e6b1cc 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -416,7 +416,7 @@ set(SRC
   BKE_lib_override.hh
   BKE_lib_query.h
   BKE_lib_remap.hh
-  BKE_library.h
+  BKE_library.hh
   BKE_light.h
   BKE_light_linking.h
   BKE_lightprobe.h
diff --git a/source/blender/blenkernel/intern/bpath.cc b/source/blender/blenkernel/intern/bpath.cc
index 48db749a868..c5e1c69e00d 100644
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@@ -59,7 +59,7 @@
 #include "BKE_idtype.h"
 #include "BKE_image.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 #include "BKE_node.h"
 #include "BKE_report.h"
diff --git a/source/blender/blenkernel/intern/library.cc b/source/blender/blenkernel/intern/library.cc
index 55b9cb3b203..d538ad31dc0 100644
--- a/source/blender/blenkernel/intern/library.cc
+++ b/source/blender/blenkernel/intern/library.cc
@@ -25,7 +25,7 @@
 #include "BKE_idtype.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 #include "BKE_main_namemap.hh"
 #include "BKE_packedFile.h"
diff --git a/source/blender/blenkernel/intern/main_test.cc b/source/blender/blenkernel/intern/main_test.cc
index 9c8e8fc26e4..024b50ba05e 100644
--- a/source/blender/blenkernel/intern/main_test.cc
+++ b/source/blender/blenkernel/intern/main_test.cc
@@ -14,7 +14,7 @@
 #include "BKE_collection.h"
 #include "BKE_idtype.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 
 #include "DNA_ID.h"
diff --git a/source/blender/blenloader/intern/blend_validate.cc b/source/blender/blenloader/intern/blend_validate.cc
index 72f4b477067..40f44c74eb5 100644
--- a/source/blender/blenloader/intern/blend_validate.cc
+++ b/source/blender/blenloader/intern/blend_validate.cc
@@ -27,7 +27,7 @@
 #include "BKE_key.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_remap.hh"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 #include "BKE_report.h"
 
diff --git a/source/blender/editors/armature/armature_add.cc b/source/blender/editors/armature/armature_add.cc
index 58b03589d3c..7f35c4f6cb4 100644
--- a/source/blender/editors/armature/armature_add.cc
+++ b/source/blender/editors/armature/armature_add.cc
@@ -33,7 +33,7 @@
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc
index 7a3da716c01..f7a296e4a03 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc
@@ -44,7 +44,7 @@
 #include "BKE_gpencil_legacy.h"
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 #include "BKE_material.h"
 #include "BKE_object.hh"
diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc
index 51cb7e86e32..b42f806b626 100644
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@ -36,7 +36,7 @@
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_override.hh"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 #include "BKE_main_namemap.hh"
 #include "BKE_modifier.hh"
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index f8150b4f9c8..d9b6865a81e 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -17,7 +17,7 @@
 #include "BKE_global.h"
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 #include "BKE_node.hh"
 #include "BKE_object.hh"
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index d63223a2876..48a3214ad31 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -9,7 +9,7 @@
 
 #include "BKE_constraint.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_modifier.hh"
 #include "BKE_object.hh"
 
diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc
index bac93b594c6..f28c49f2c53 100644
--- a/source/blender/makesrna/intern/rna_ID.cc
+++ b/source/blender/makesrna/intern/rna_ID.cc
@@ -222,7 +222,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = {
 #  include "BKE_lib_override.hh"
 #  include "BKE_lib_query.h"
 #  include "BKE_lib_remap.hh"
-#  include "BKE_library.h"
+#  include "BKE_library.hh"
 #  include "BKE_material.h"
 #  include "BKE_preview_image.hh"
 #  include "BKE_vfont.hh"
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index 89046bb996f..8e6b933b170 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -21,7 +21,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_lib_id.h"
-#include "BKE_library.h"
+#include "BKE_library.hh"
 #include "BKE_main.hh"
 
 #include "MEM_guardedalloc.h"