diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl
index 6a142e00033..006485fd949 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl
@@ -21,23 +21,7 @@
 #define GBUFFER_NORMAL_MAX GBUFFER_LAYER_MAX
 #define GBUFFER_DATA_MAX (GBUFFER_LAYER_MAX * 2)
 
-/* Structure used as input and output of the packing & read functions. */
 struct GBufferData {
-  /* Only valid (or null) if `has_diffuse`, `has_reflection` or `has_refraction` is true. */
-  /* TODO(fclem): This should eventually become ClosureUndetermined. */
-  ClosureDiffuse diffuse;
-  ClosureTranslucent translucent;
-  ClosureReflection reflection;
-  ClosureRefraction refraction;
-  /* Additional object information if any closure needs it. */
-  float thickness;
-  uint object_id;
-  /* First world normal stored in the gbuffer. Only valid if `has_any_surface` is true. */
-  vec3 surface_N;
-};
-
-/* TODO(fclem): This should replace GBufferData. */
-struct GBufferDataUndetermined {
   ClosureUndetermined diffuse;
   ClosureUndetermined translucent;
   ClosureUndetermined reflection;
@@ -648,7 +632,7 @@ void gbuffer_closure_metal_clear_coat_load(inout GBufferReader gbuf,
  *
  * \{ */
 
-GBufferWriter gbuffer_pack(GBufferDataUndetermined data_in)
+GBufferWriter gbuffer_pack(GBufferData data_in)
 {
   GBufferWriter gbuf;
   gbuf.header = 0u;
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_test.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_test.glsl
index 66ab068d497..d6fe01324cf 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_test.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_test.glsl
@@ -12,9 +12,9 @@
 
 #define TEST(a, b) if (true)
 
-GBufferDataUndetermined gbuffer_new()
+GBufferData gbuffer_new()
 {
-  GBufferDataUndetermined data;
+  GBufferData data;
   data.diffuse.weight = 0.0;
   data.translucent.weight = 0.0;
   data.reflection.weight = 0.0;
@@ -27,7 +27,7 @@ GBufferDataUndetermined gbuffer_new()
 
 void main()
 {
-  GBufferDataUndetermined data_in;
+  GBufferData data_in;
   GBufferReader data_out;
   samplerGBufferHeader header_tx = 0;
   samplerGBufferClosure closure_tx = 0;
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_surf_deferred_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_surf_deferred_frag.glsl
index ff62bab48a4..302151a31ce 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_surf_deferred_frag.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_surf_deferred_frag.glsl
@@ -83,7 +83,7 @@ void main()
 
   /* ----- GBuffer output ----- */
 
-  GBufferDataUndetermined gbuf_data;
+  GBufferData gbuf_data;
   gbuf_data.diffuse = g_diffuse_data;
   gbuf_data.translucent = g_translucent_data;
   gbuf_data.reflection = g_reflection_data;
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_surf_hybrid_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_surf_hybrid_frag.glsl
index 4dd2d6e0946..6de219578ee 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_surf_hybrid_frag.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_surf_hybrid_frag.glsl
@@ -85,7 +85,7 @@ void main()
 
   /* ----- GBuffer output ----- */
 
-  GBufferDataUndetermined gbuf_data;
+  GBufferData gbuf_data;
   gbuf_data.diffuse = g_diffuse_data;
   gbuf_data.translucent = g_translucent_data;
   gbuf_data.reflection = g_reflection_data;