diff --git a/src/gallium/frontends/wgl/stw_device.c b/src/gallium/frontends/wgl/stw_device.c
index 557eca8a068..5e3b6e1b6f2 100644
--- a/src/gallium/frontends/wgl/stw_device.c
+++ b/src/gallium/frontends/wgl/stw_device.c
@@ -260,11 +260,6 @@ stw_cleanup(void)
 
    stw_dev->screen->destroy(stw_dev->screen);
 
-   /* glapi is statically linked: we can call the local destroy function. */
-#ifdef _GLAPI_NO_EXPORTS
-   _glapi_destroy_multithread();
-#endif
-
    stw_tls_cleanup();
 
    util_dynarray_fini(&stw_dev->pixelformats);
diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index b59de799467..e14434f79e6 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -133,8 +133,6 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
       return GL_FALSE;
    }
 
-   _glapi_check_multithread();
-
    __glXLock();
    if (oldGC == gc &&
        gc->currentDrawable == draw && gc->currentReadable == read) {
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 21f53d489ed..5b5850bc49b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1493,11 +1493,6 @@ _mesa_make_current( struct gl_context *newCtx,
       st_glFlush(curCtx, 0);
    }
 
-   /* Call this periodically to detect when the user has begun using
-    * GL rendering from multiple threads.
-    */
-   _glapi_check_multithread();
-
    if (!newCtx) {
       _glapi_set_dispatch(NULL);  /* none current */
       /* We need old ctx to correctly release Draw/ReadBuffer