diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index e7546ec1d64..6b3e9d599b5 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1699,7 +1699,7 @@ bind_uniform_buffer(struct gl_context *ctx,
 {
    bind_buffer(ctx, &ctx->UniformBufferBindings[index],
                bufObj, offset, size, autoSize,
-               ctx->DriverFlags.NewUniformBuffer,
+               ST_NEW_UNIFORM_BUFFER,
                USAGE_UNIFORM_BUFFER);
 }
 
@@ -4399,7 +4399,7 @@ bind_uniform_buffers(struct gl_context *ctx, GLuint first, GLsizei count,
 
    /* Assume that at least one binding will be changed */
    FLUSH_VERTICES(ctx, 0, 0);
-   ctx->NewDriverState |= ctx->DriverFlags.NewUniformBuffer;
+   ctx->NewDriverState |= ST_NEW_UNIFORM_BUFFER;
 
    if (!buffers) {
       /* The ARB_multi_bind spec says:
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a64c01852a6..0b5742a827a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4774,12 +4774,6 @@ struct gl_driver_flags
    /** gl_context::TransformFeedback::CurrentObject::shader_program */
    uint64_t NewTransformFeedbackProg;
 
-   /**
-    * gl_context::UniformBufferBindings
-    * gl_shader_program::UniformBlocks
-    */
-   uint64_t NewUniformBuffer;
-
    /**
     * gl_context::ShaderStorageBufferBindings
     * gl_shader_program::ShaderStorageBlocks
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index f628e0658ff..365eaf25d0c 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -48,6 +48,8 @@
 #include "util/bitscan.h"
 #include "api_exec_decl.h"
 
+#include "state_tracker/st_context.h"
+
 /**
  * Update the vertex/fragment program's TexturesUsed array.
  *
@@ -1109,7 +1111,7 @@ uniform_block_binding(struct gl_context *ctx, struct gl_shader_program *shProg,
        uniformBlockBinding) {
 
       FLUSH_VERTICES(ctx, 0, 0);
-      ctx->NewDriverState |= ctx->DriverFlags.NewUniformBuffer;
+      ctx->NewDriverState |= ST_NEW_UNIFORM_BUFFER;
 
       shProg->data->UniformBlocks[uniformBlockIndex].Binding =
          uniformBlockBinding;
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 8dc9f2f9dc3..f9ede366702 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -447,8 +447,6 @@ st_init_driver_flags(struct st_context *st)
 {
    struct gl_driver_flags *f = &st->ctx->DriverFlags;
 
-   f->NewUniformBuffer = ST_NEW_UNIFORM_BUFFER;
-
    /* Shader resources */
    f->NewTextureBuffer = ST_NEW_SAMPLER_VIEWS;
    if (st->has_hw_atomics)