diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index 2dc8119eb6e..e9e00490d21 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -83,7 +83,6 @@ dri_create_context(gl_api api, const struct gl_config * visual,
    cPriv->driverPrivate = ctx;
    ctx->cPriv = cPriv;
    ctx->sPriv = sPriv;
-   ctx->lock = screen->drmLock;
 
    driParseConfigFiles(&ctx->optionCache,
 		       &screen->optionCache, sPriv->myNum, "dri");
diff --git a/src/gallium/state_trackers/dri/common/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h
index cfc8e3345e5..58bc6139691 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.h
+++ b/src/gallium/state_trackers/dri/common/dri_context.h
@@ -52,11 +52,6 @@ struct dri_context
 
    driOptionCache optionCache;
 
-   drmLock *lock;
-   boolean isLocked;
-   boolean stLostLock;
-   boolean wsLostLock;
-
    unsigned int bind_count;
 
    /* gallium */
diff --git a/src/gallium/state_trackers/dri/common/dri_screen.h b/src/gallium/state_trackers/dri/common/dri_screen.h
index 4e865b9c551..66f7400a30a 100644
--- a/src/gallium/state_trackers/dri/common/dri_screen.h
+++ b/src/gallium/state_trackers/dri/common/dri_screen.h
@@ -63,7 +63,6 @@ struct dri_screen
 
    /* drm */
    int fd;
-   drmLock *drmLock;
 
    /* gallium */
    boolean d_depth_bits_last;
diff --git a/src/mesa/drivers/dri/common/drisw_util.h b/src/mesa/drivers/dri/common/drisw_util.h
index d43f5235aa6..deb27093627 100644
--- a/src/mesa/drivers/dri/common/drisw_util.h
+++ b/src/mesa/drivers/dri/common/drisw_util.h
@@ -36,11 +36,9 @@
 #ifndef _DRISW_UTIL_H
 #define _DRISW_UTIL_H
 
-#include "main/mtypes.h"
-
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
-typedef struct _drmLock drmLock;
+#include "main/mtypes.h"
 
 
 /**