diff --git a/source/blender/draw/engines/select/select_instance.hh b/source/blender/draw/engines/select/select_instance.hh
index 238b3da53e6..c309b5fb021 100644
--- a/source/blender/draw/engines/select/select_instance.hh
+++ b/source/blender/draw/engines/select/select_instance.hh
@@ -12,7 +12,7 @@
 
 #include "DRW_gpu_wrapper.hh"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "../intern/gpu_select_private.h"
 
diff --git a/source/blender/draw/intern/draw_manager_exec.cc b/source/blender/draw/intern/draw_manager_exec.cc
index b64095f774a..ed28d4b08e2 100644
--- a/source/blender/draw/intern/draw_manager_exec.cc
+++ b/source/blender/draw/intern/draw_manager_exec.cc
@@ -20,7 +20,7 @@
 #include "GPU_state.h"
 
 #ifdef USE_GPU_SELECT
-#  include "GPU_select.h"
+#  include "GPU_select.hh"
 #endif
 
 void DRW_select_load_id(uint id)
diff --git a/source/blender/draw/intern/draw_select_buffer.cc b/source/blender/draw/intern/draw_select_buffer.cc
index 518313fc470..dbe28d68388 100644
--- a/source/blender/draw/intern/draw_select_buffer.cc
+++ b/source/blender/draw/intern/draw_select_buffer.cc
@@ -17,7 +17,7 @@
 
 #include "DNA_screen_types.h"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/editors/armature/armature_select.cc b/source/blender/editors/armature/armature_select.cc
index 79d7332079a..d44c016e600 100644
--- a/source/blender/editors/armature/armature_select.cc
+++ b/source/blender/editors/armature/armature_select.cc
@@ -42,7 +42,7 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "ANIM_bone_collections.h"
 #include "ANIM_bonecolor.hh"
diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.cc b/source/blender/editors/gizmo_library/gizmo_library_presets.cc
index eb2602154b9..0ab4879537e 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_presets.cc
+++ b/source/blender/editors/gizmo_library/gizmo_library_presets.cc
@@ -19,7 +19,7 @@
 #include "BKE_context.hh"
 
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "DEG_depsgraph.hh"
 
diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc
index 08b54817876..1d50c236838 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc
@@ -29,7 +29,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc
index bcda4f529e9..1f46fc38ee7 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc
@@ -27,7 +27,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc
index 5ea1d26ce5b..d6a68547db8 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc
@@ -26,7 +26,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_shader.h"
 #include "GPU_state.h"
 
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc
index 2aa9d804a33..76e7af5ff88 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc
@@ -23,7 +23,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_shader.h"
 #include "GPU_state.h"
 
diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc
index 42f5a11e898..818c6b62f54 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc
@@ -27,7 +27,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc
index 7d5b6ef8e05..fb1c25bdeb2 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc
@@ -26,7 +26,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc
index 5cd201cafa0..d352b851caf 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc
+++ b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc
@@ -23,7 +23,7 @@
 
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/metaball/mball_edit.cc b/source/blender/editors/metaball/mball_edit.cc
index df20871502d..cb201b01c90 100644
--- a/source/blender/editors/metaball/mball_edit.cc
+++ b/source/blender/editors/metaball/mball_edit.cc
@@ -35,7 +35,7 @@
 
 #include "DEG_depsgraph.hh"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "ED_mball.hh"
 #include "ED_object.hh"
diff --git a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
index e4768f4a3a8..b02baf29bc1 100644
--- a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
+++ b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc
@@ -25,7 +25,7 @@
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "RNA_access.hh"
diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc
index 6da7374b729..12935a2ec89 100644
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@@ -92,7 +92,7 @@
 #include "UI_resources.hh"
 
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc
index af9fbb59d23..fae63d3bc35 100644
--- a/source/blender/editors/space_view3d/view3d_view.cc
+++ b/source/blender/editors/space_view3d/view3d_view.cc
@@ -33,7 +33,7 @@
 #include "UI_resources.hh"
 
 #include "GPU_matrix.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "WM_api.hh"
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index d5e30d174e0..27e1f511e5e 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -100,7 +100,7 @@ set(SRC
   GPU_matrix.h
   GPU_platform.h
   GPU_primitive.h
-  GPU_select.h
+  GPU_select.hh
   GPU_shader.h
   GPU_shader_builtin.h
   GPU_shader_shared.h
diff --git a/source/blender/gpu/GPU_select.h b/source/blender/gpu/GPU_select.hh
similarity index 100%
rename from source/blender/gpu/GPU_select.h
rename to source/blender/gpu/GPU_select.hh
diff --git a/source/blender/gpu/intern/gpu_select.cc b/source/blender/gpu/intern/gpu_select.cc
index cfc05c1cbd1..a048f9ece39 100644
--- a/source/blender/gpu/intern/gpu_select.cc
+++ b/source/blender/gpu/intern/gpu_select.cc
@@ -13,7 +13,7 @@
 
 #include "DNA_userdef_types.h"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "BLI_rect.h"
 
diff --git a/source/blender/gpu/intern/gpu_select_next.cc b/source/blender/gpu/intern/gpu_select_next.cc
index 5197c4849de..0a4e60c86bf 100644
--- a/source/blender/gpu/intern/gpu_select_next.cc
+++ b/source/blender/gpu/intern/gpu_select_next.cc
@@ -12,7 +12,7 @@
 #include "BLI_rect.h"
 #include "BLI_span.hh"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "gpu_select_private.h"
 
diff --git a/source/blender/gpu/intern/gpu_select_pick.cc b/source/blender/gpu/intern/gpu_select_pick.cc
index da2bf7d68c2..5d7ef4e9509 100644
--- a/source/blender/gpu/intern/gpu_select_pick.cc
+++ b/source/blender/gpu/intern/gpu_select_pick.cc
@@ -14,7 +14,7 @@
 
 #include "GPU_debug.h"
 #include "GPU_framebuffer.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.cc b/source/blender/gpu/intern/gpu_select_sample_query.cc
index ce1951207fe..46e5651f881 100644
--- a/source/blender/gpu/intern/gpu_select_sample_query.cc
+++ b/source/blender/gpu/intern/gpu_select_sample_query.cc
@@ -13,7 +13,7 @@
 
 #include "GPU_debug.h"
 #include "GPU_framebuffer.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc
index 5200b227dfe..e748c1e1c07 100644
--- a/source/blender/makesrna/intern/rna_userdef.cc
+++ b/source/blender/makesrna/intern/rna_userdef.cc
@@ -187,7 +187,7 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = {
 #  include "DEG_depsgraph.hh"
 
 #  include "GPU_capabilities.h"
-#  include "GPU_select.h"
+#  include "GPU_select.hh"
 #  include "GPU_texture.h"
 
 #  include "BLF_api.h"
diff --git a/source/blender/python/gpu/gpu_py_select.cc b/source/blender/python/gpu/gpu_py_select.cc
index 4eb6ebb07a2..a1977434e5a 100644
--- a/source/blender/python/gpu/gpu_py_select.cc
+++ b/source/blender/python/gpu/gpu_py_select.cc
@@ -20,7 +20,7 @@
 
 #include "../generic/py_capi_utils.h"
 
-#include "GPU_select.h"
+#include "GPU_select.hh"
 
 #include "gpu_py.h"
 #include "gpu_py_select.h" /* Own include. */
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
index 4bef15dce5b..7245a1056ba 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
@@ -27,7 +27,7 @@
 #include "GPU_framebuffer.h"
 #include "GPU_matrix.h"
 #include "GPU_platform.h"
-#include "GPU_select.h"
+#include "GPU_select.hh"
 #include "GPU_state.h"
 #include "GPU_viewport.h"