diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 6e7fc792a20..6315c85f29b 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -31,7 +31,7 @@ set(SRC
   image_undo.cc
   space_image.cc
 
-  image_intern.h
+  image_intern.hh
 )
 
 set(LIB
diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc
index 708a735150f..8cf4e4fa740 100644
--- a/source/blender/editors/space_image/image_buttons.cc
+++ b/source/blender/editors/space_image/image_buttons.cc
@@ -44,7 +44,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
-#include "image_intern.h"
+#include "image_intern.hh"
 
 #define B_NOP -1
 #define MAX_IMAGE_INFO_LEN 128
diff --git a/source/blender/editors/space_image/image_draw.cc b/source/blender/editors/space_image/image_draw.cc
index 34cfa95ec43..4b849f791db 100644
--- a/source/blender/editors/space_image/image_draw.cc
+++ b/source/blender/editors/space_image/image_draw.cc
@@ -62,7 +62,7 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
-#include "image_intern.h"
+#include "image_intern.hh"
 
 static void draw_render_info(
     const bContext *C, Scene *scene, Image *ima, ARegion *region, float zoomx, float zoomy)
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.hh
similarity index 96%
rename from source/blender/editors/space_image/image_intern.h
rename to source/blender/editors/space_image/image_intern.hh
index 765e00ea4a1..b062aa057a1 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.hh
@@ -16,13 +16,9 @@ struct bContext;
 struct bNodeTree;
 struct wmOperatorType;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* `space_image.cc` */
 
-extern const char *image_context_dir[]; /* doc access */
+extern "C" extern const char *image_context_dir[]; /* doc access */
 
 /* `image_draw.cc` */
 
@@ -100,7 +96,3 @@ void IMAGE_OT_tile_fill(struct wmOperatorType *ot);
  */
 struct ImageUser *ntree_get_active_iuser(struct bNodeTree *ntree);
 void image_buttons_register(struct ARegionType *art);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc
index 68fb8808193..1723af72bfb 100644
--- a/source/blender/editors/space_image/image_ops.cc
+++ b/source/blender/editors/space_image/image_ops.cc
@@ -86,7 +86,7 @@
 
 #include "RE_engine.h"
 
-#include "image_intern.h"
+#include "image_intern.hh"
 
 /* -------------------------------------------------------------------- */
 /** \name View Navigation Utilities
diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc
index ecca3d2dab2..69668e7ab47 100644
--- a/source/blender/editors/space_image/space_image.cc
+++ b/source/blender/editors/space_image/space_image.cc
@@ -56,7 +56,7 @@
 
 #include "DRW_engine.h"
 
-#include "image_intern.h"
+#include "image_intern.hh"
 
 /**************************** common state *****************************/