Import wine_tsx11_lock/unlock directly from x11drv in opengl32 and
ddraw, so that they don't need to link with libwine_tsx11.
Removed header wine_gl.h.

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 268c587..990e9c0 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -544,7 +544,7 @@
 /* Auto-generated file... Do not edit ! */
 
 #include \"config.h\"
-#include \"wine_gl.h\"
+#include \"opengl_ext.h\"
 #include \"wine/debug.h\"
 
 typedef const GLubyte * GLstring;
@@ -567,13 +567,11 @@
 /* Auto-generated file... Do not edit ! */
 
 #include \"config.h\"
-#include \"wine_gl.h\"
+#include \"opengl_ext.h\"
 #include \"wine/debug.h\"
 
 typedef const GLubyte * GLstring;
 
-#include \"opengl_ext.h\"
-
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 ";