From df8e6eeb0f670414b4eb395ca95cdc935a1e9989 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 24 Sep 2002 03:17:31 +0000
Subject: [PATCH] Removed a bunch of no longer used TSX wrappers.

---
 dlls/x11drv/event.c       |   1 -
 dlls/x11drv/keyboard.c    |   1 -
 dlls/x11drv/winpos.c      |  19 +-
 dlls/x11drv/x11drv_main.c |   1 -
 graphics/x11drv/dib.c     |  13 +-
 include/ts_shape.h        |  28 ---
 include/ts_xf86dga.h      |  35 ----
 include/ts_xf86dga2.h     |   8 -
 include/ts_xf86vmode.h    |   7 -
 include/ts_xlib.h         |  48 -----
 include/ts_xresource.h    |  32 ---
 include/ts_xshm.h         |  35 ----
 include/ts_xutil.h        |  29 ---
 include/ts_xvideo.h       |  51 -----
 tools/make_X11wrappers    | 203 +-----------------
 tsx11/Makefile.in         |   7 +-
 tsx11/X11_calls           | 175 ++--------------
 tsx11/ts_shape.c          |  32 ---
 tsx11/ts_xf86dga.c        |  99 ---------
 tsx11/ts_xf86dga2.c       |  60 ------
 tsx11/ts_xf86vmode.c      |  63 ------
 tsx11/ts_xlib.c           | 430 --------------------------------------
 tsx11/ts_xresource.c      |  68 ------
 tsx11/ts_xshm.c           |  99 ---------
 tsx11/ts_xutil.c          | 257 -----------------------
 tsx11/ts_xvideo.c         | 223 --------------------
 26 files changed, 43 insertions(+), 1981 deletions(-)
 delete mode 100644 include/ts_shape.h
 delete mode 100644 include/ts_xf86dga.h
 delete mode 100644 include/ts_xresource.h
 delete mode 100644 include/ts_xshm.h
 delete mode 100644 include/ts_xvideo.h
 delete mode 100644 tsx11/ts_shape.c
 delete mode 100644 tsx11/ts_xf86dga.c
 delete mode 100644 tsx11/ts_xresource.c
 delete mode 100644 tsx11/ts_xshm.c
 delete mode 100644 tsx11/ts_xvideo.c

diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c
index 6c158c4bdda..dc6e9c374dc 100644
--- a/dlls/x11drv/event.c
+++ b/dlls/x11drv/event.c
@@ -25,7 +25,6 @@
 #include <X11/keysym.h>
 
 #include "ts_xlib.h"
-#include "ts_xresource.h"
 #include "ts_xutil.h"
 #ifdef HAVE_LIBXXF86DGA2
 #include "ts_xf86dga2.h"
diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c
index 71b16cf8c46..8b708959f71 100644
--- a/dlls/x11drv/keyboard.c
+++ b/dlls/x11drv/keyboard.c
@@ -29,7 +29,6 @@
 #include <X11/keysym.h>
 
 #include "ts_xlib.h"
-#include "ts_xresource.h"
 #include "ts_xutil.h"
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index 9f2a8516adb..3f7e22e3ceb 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -23,7 +23,10 @@
 
 #include "ts_xlib.h"
 #include "ts_xutil.h"
-#include "ts_shape.h"
+#ifdef HAVE_LIBXSHAPE
+#include <X11/IntrinsicP.h>
+#include <X11/extensions/shape.h>
+#endif HAVE_LIBXSHAPE
 
 #include "winbase.h"
 #include "wingdi.h"
@@ -1649,8 +1652,10 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
         {
             if (!hrgn)
             {
-                TSXShapeCombineMask( display, data->whole_window,
-                                     ShapeBounding, 0, 0, None, ShapeSet );
+                wine_tsx11_lock();
+                XShapeCombineMask( display, data->whole_window,
+                                   ShapeBounding, 0, 0, None, ShapeSet );
+                wine_tsx11_unlock();
             }
             else
             {
@@ -1691,9 +1696,11 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
                     }
 
                     /* shape = non-rectangular windows (X11/extensions) */
-                    TSXShapeCombineRectangles( display, data->whole_window, ShapeBounding,
-                                               0, 0, aXRect,
-                                               pCurrRect - aXRect, ShapeSet, YXBanded );
+                    wine_tsx11_lock();
+                    XShapeCombineRectangles( display, data->whole_window, ShapeBounding,
+                                             0, 0, aXRect,
+                                             pCurrRect - aXRect, ShapeSet, YXBanded );
+                    wine_tsx11_unlock();
                     HeapFree(GetProcessHeap(), 0, aXRect );
                 }
                 HeapFree(GetProcessHeap(), 0, pRegionData);
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 35ee5bfe768..5285b15ddfc 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -34,7 +34,6 @@
 #include <X11/cursorfont.h>
 #include "ts_xlib.h"
 #include "ts_xutil.h"
-#include "ts_shape.h"
 
 #include "winbase.h"
 #include "wine/winbase16.h"
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index 9e4524f0059..5d13fa1ac83 100644
--- a/graphics/x11drv/dib.c
+++ b/graphics/x11drv/dib.c
@@ -23,7 +23,7 @@
 #include "ts_xlib.h"
 #include "ts_xutil.h"
 #ifdef HAVE_LIBXXSHM
-# include "ts_xshm.h"
+#include <X11/extensions/XShm.h>
 # ifdef HAVE_SYS_SHM_H
 #  include <sys/shm.h>
 # endif
@@ -5654,7 +5654,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
 {
     XImage *image;
 
-    wine_tsx11_lock();
     image = XShmCreateImage(gdi_display, visual, bpp, ZPixmap, NULL, shminfo, width, height);
     if (image)
     {
@@ -5674,7 +5673,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
                 if (ok)
                 {
                     shmctl(shminfo->shmid, IPC_RMID, 0);
-                    wine_tsx11_unlock();
                     return image; /* Success! */
                 }
                 /* An error occured */
@@ -5686,7 +5684,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
         XDestroyImage(image);
         image = NULL;
     }
-    wine_tsx11_unlock();
     return image;
 }
 #endif /* HAVE_LIBXXSHM */
@@ -5812,8 +5809,9 @@ HBITMAP X11DRV_DIB_CreateDIBSection(
   /* Create XImage */
   if (dib && bmp)
   {
+      wine_tsx11_lock();
 #ifdef HAVE_LIBXXSHM
-      if (TSXShmQueryExtension(gdi_display) &&
+      if (XShmQueryExtension(gdi_display) &&
           (dib->image = X11DRV_XShmCreateImage( bm.bmWidth, effHeight,
                                                 bmp->bitmap.bmBitsPixel, &dib->shminfo )) )
       {
@@ -5825,6 +5823,7 @@ HBITMAP X11DRV_DIB_CreateDIBSection(
 #else
       dib->image = X11DRV_DIB_CreateXImage( bm.bmWidth, effHeight, bmp->bitmap.bmBitsPixel );
 #endif
+      wine_tsx11_unlock();
   }
 
   /* Clean up in case of errors */
@@ -5872,10 +5871,11 @@ void X11DRV_DIB_DeleteDIBSection(BITMAPOBJ *bmp)
 
   if (dib->image)
   {
+      wine_tsx11_lock();
 #ifdef HAVE_LIBXXSHM
       if (dib->shminfo.shmid != -1)
       {
-          TSXShmDetach (gdi_display, &(dib->shminfo));
+          XShmDetach (gdi_display, &(dib->shminfo));
           XDestroyImage (dib->image);
           shmdt (dib->shminfo.shmaddr);
           dib->shminfo.shmid = -1;
@@ -5883,6 +5883,7 @@ void X11DRV_DIB_DeleteDIBSection(BITMAPOBJ *bmp)
       else
 #endif
           XDestroyImage( dib->image );
+      wine_tsx11_unlock();
   }
 
   if (dib->colorMap)
diff --git a/include/ts_shape.h b/include/ts_shape.h
deleted file mode 100644
index cff6c450f58..00000000000
--- a/include/ts_shape.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Thread safe wrappers around shape calls.
- * Always include this file instead of <X11/shape.h>.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#ifndef __WINE_TS_SHAPE_H
-#define __WINE_TS_SHAPE_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef HAVE_LIBXSHAPE
-#include <X11/IntrinsicP.h>
-
-#include <X11/extensions/shape.h>
-
-extern void (*wine_tsx11_lock)(void);
-extern void (*wine_tsx11_unlock)(void);
-
-extern void  TSXShapeCombineRectangles(Display*, Window, int, int, int, XRectangle*, int, int, int);
-extern void  TSXShapeCombineMask(Display*, Window, int, int, int, Pixmap, int);
-
-#endif /* defined(HAVE_LIBXSHAPE) */
-
-#endif /* __WINE_TS_SHAPE_H */
diff --git a/include/ts_xf86dga.h b/include/ts_xf86dga.h
deleted file mode 100644
index 2b7f9f1947c..00000000000
--- a/include/ts_xf86dga.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Thread safe wrappers around xf86dga calls.
- * Always include this file instead of <X11/xf86dga.h>.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#ifndef __WINE_TS_XF86DGA_H
-#define __WINE_TS_XF86DGA_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef HAVE_LIBXXF86DGA
-
-#include <X11/Xlib.h>
-#include <X11/extensions/xf86dga.h>
-
-extern void (*wine_tsx11_lock)(void);
-extern void (*wine_tsx11_unlock)(void);
-
-extern Bool TSXF86DGAQueryVersion(Display*,int*,int*);
-extern Bool TSXF86DGAQueryExtension(Display*,int*,int*);
-extern Status TSXF86DGAGetVideo(Display*,int,char**,int*,int*,int*);
-extern Status TSXF86DGADirectVideo(Display*,int,int);
-extern Status TSXF86DGAGetViewPortSize(Display*,int,int*,int*);
-extern Status TSXF86DGASetViewPort(Display*,int,int,int);
-extern Status TSXF86DGAInstallColormap(Display*,int,Colormap);
-extern Status TSXF86DGAQueryDirectVideo(Display*,int,int*);
-extern Status TSXF86DGAViewPortChanged(Display*,int,int);
-
-#endif /* defined(HAVE_LIBXXF86DGA) */
-
-#endif /* __WINE_TS_XF86DGA_H */
diff --git a/include/ts_xf86dga2.h b/include/ts_xf86dga2.h
index 950f75993ce..8f7758cdcfc 100644
--- a/include/ts_xf86dga2.h
+++ b/include/ts_xf86dga2.h
@@ -30,14 +30,6 @@ extern void TSXDGASetViewport(Display*, int, int, int, int);
 extern void TSXDGAInstallColormap(Display*, int, Colormap);
 extern Colormap TSXDGACreateColormap(Display*, int, XDGADevice*, int);
 extern void TSXDGASelectInput(Display*, int, long);
-extern void TSXDGAFillRectangle(Display*, int, int, int, unsigned int, unsigned int, unsigned long);
-extern void TSXDGACopyArea(Display*, int, int, int, unsigned int, unsigned int, int, int);
-extern void TSXDGACopyTransparentArea(Display*, int, int, int, unsigned int, unsigned int, int, int, unsigned long);
-extern int TSXDGAGetViewportStatus(Display*, int);
-extern void TSXDGASync(Display*, int);
-extern Bool TSXDGASetClientVersion(Display*);
-extern void TSXDGAChangePixmapMode(Display*, int, int*, int*, int);
-extern void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent*, XKeyEvent*);
 
 #endif /* defined(HAVE_LIBXXF86DGA2) */
 
diff --git a/include/ts_xf86vmode.h b/include/ts_xf86vmode.h
index 3ac833b3665..041473c1868 100644
--- a/include/ts_xf86vmode.h
+++ b/include/ts_xf86vmode.h
@@ -27,15 +27,8 @@ extern Bool TSXF86VidModeQueryVersion(Display*,int*,int*);
 extern Bool TSXF86VidModeQueryExtension(Display*,int*,int*);
 extern Bool TSXF86VidModeGetModeLine(Display*,int,int*,XF86VidModeModeLine*);
 extern Bool TSXF86VidModeGetAllModeLines(Display*,int,int*,XF86VidModeModeInfo***);
-extern Bool TSXF86VidModeAddModeLine(Display*,int,XF86VidModeModeInfo*,XF86VidModeModeInfo*);
-extern Bool TSXF86VidModeDeleteModeLine(Display*,int,XF86VidModeModeInfo*);
-extern Bool TSXF86VidModeModModeLine(Display*,int,XF86VidModeModeLine*);
-extern Status TSXF86VidModeValidateModeLine(Display*,int,XF86VidModeModeInfo*);
-extern Bool TSXF86VidModeSwitchMode(Display*,int,int);
 extern Bool TSXF86VidModeSwitchToMode(Display*,int,XF86VidModeModeInfo*);
 extern Bool TSXF86VidModeLockModeSwitch(Display*,int,int);
-extern Bool TSXF86VidModeGetMonitor(Display*,int,XF86VidModeMonitor*);
-extern Bool TSXF86VidModeGetViewPort(Display*,int,int*,int*);
 extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int);
 
 #endif /* defined(HAVE_LIBXXF86VM) */
diff --git a/include/ts_xlib.h b/include/ts_xlib.h
index 6b2ee99c040..c4ebbe068d2 100644
--- a/include/ts_xlib.h
+++ b/include/ts_xlib.h
@@ -21,60 +21,36 @@ extern void (*wine_tsx11_unlock)(void);
 
 extern XFontStruct * TSXLoadQueryFont(Display*, const  char*);
 extern XModifierKeymap	* TSXGetModifierMapping(Display*);
-extern XImage * TSXCreateImage(Display*, Visual*, unsigned int, int, int, char*, unsigned int, unsigned int, int, int);
 extern XImage * TSXGetImage(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int);
-extern XImage * TSXGetSubImage(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int, XImage*, int, int);
 extern Display * TSXOpenDisplay(const  char*);
-extern void  TSXrmInitialize(void);
 extern char * TSXGetAtomName(Display*, Atom);
 extern char * TSXKeysymToString(KeySym);
 extern Atom  TSXInternAtom(Display*, const  char*, int);
-extern Colormap  TSXCopyColormapAndFree(Display*, Colormap);
 extern Colormap  TSXCreateColormap(Display*, Window, Visual*, int);
-extern Cursor  TSXCreatePixmapCursor(Display*, Pixmap, Pixmap, XColor*, XColor*, unsigned int, unsigned int);
-extern Cursor  TSXCreateFontCursor(Display*, unsigned int);
-extern GC  TSXCreateGC(Display*, Drawable, unsigned long, XGCValues*);
 extern Pixmap  TSXCreatePixmap(Display*, Drawable, unsigned int, unsigned int, unsigned int);
 extern Pixmap  TSXCreateBitmapFromData(Display*, Drawable, const  char*, unsigned int, unsigned int);
 extern Window  TSXGetSelectionOwner(Display*, Atom);
-extern Window  TSXCreateWindow(Display*, Window, int, int, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual*, unsigned long, XSetWindowAttributes*);
 extern char ** TSXListFonts(Display*, const  char*, int, int*);
 extern KeySym  TSXKeycodeToKeysym(Display*, unsigned int, int);
 extern KeySym  TSXLookupKeysym(XKeyEvent*, int);
 extern KeySym * TSXGetKeyboardMapping(Display*, unsigned int, int, int*);
-extern char * TSXResourceManagerString(Display*);
-extern VisualID  TSXVisualIDFromVisual(Visual*);
-extern int   TSXInitThreads(void);
-extern XPixmapFormatValues * TSXListPixmapFormats(Display*, int*);
 extern int * TSXListDepths(Display*, int, int*);
 extern int   TSXReconfigureWMWindow(Display*, Window, int, unsigned int, XWindowChanges*);
-extern int   TSXSetWMProtocols(Display*, Window, Atom*, int);
-extern int   TSXIconifyWindow(Display*, Window, int);
-extern int  TSXSetTransientForHint(Display*, Window, Window);
-extern int  TSXActivateScreenSaver(Display*);
 extern int   TSXAllocColor(Display*, Colormap, XColor*);
 extern int   TSXAllocColorCells(Display*, Colormap, int, unsigned long*, unsigned int, unsigned long*, unsigned int);
 extern int  TSXBell(Display*, int);
 extern int  TSXChangeGC(Display*, GC, unsigned long, XGCValues*);
-extern int  TSXChangeKeyboardControl(Display*, unsigned long, XKeyboardControl*);
 extern int  TSXChangeProperty(Display*, Window, Atom, Atom, int, int, const  unsigned char*, int);
 extern int  TSXChangeWindowAttributes(Display*, Window, unsigned long, XSetWindowAttributes*);
-extern int   TSXCheckTypedEvent(Display*, int, XEvent*);
-extern int   TSXCheckTypedWindowEvent(Display*, Window, int, XEvent*);
-extern int   TSXCheckWindowEvent(Display*, Window, long, XEvent*);
-extern int  TSXConvertSelection(Display*, Atom, Atom, Atom, Window, Time);
 extern int  TSXCopyArea(Display*, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int);
 extern int  TSXCopyPlane(Display*, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned long);
 extern int  TSXDefineCursor(Display*, Window, Cursor);
 extern int  TSXDeleteProperty(Display*, Window, Atom);
-extern int  TSXDestroyWindow(Display*, Window);
 extern int  TSXDisplayKeycodes(Display*, int*, int*);
 extern int  TSXDrawArc(Display*, Drawable, GC, int, int, unsigned int, unsigned int, int, int);
 extern int  TSXDrawLine(Display*, Drawable, GC, int, int, int, int);
 extern int  TSXDrawLines(Display*, Drawable, GC, XPoint*, int, int);
-extern int  TSXDrawPoint(Display*, Drawable, GC, int, int);
 extern int  TSXDrawRectangle(Display*, Drawable, GC, int, int, unsigned int, unsigned int);
-extern int  TSXDrawSegments(Display*, Drawable, GC, XSegment*, int);
 extern int  TSXDrawString16(Display*, Drawable, GC, int, int, const  XChar2b*, int);
 extern int  TSXDrawText16(Display*, Drawable, GC, int, int, XTextItem16*, int);
 extern int  TSXFillArc(Display*, Drawable, GC, int, int, unsigned int, unsigned int, int, int);
@@ -84,70 +60,46 @@ extern int  TSXFlush(Display*);
 extern int  TSXFree(void*);
 extern int  TSXFreeColormap(Display*, Colormap);
 extern int  TSXFreeColors(Display*, Colormap, unsigned long*, int, unsigned long);
-extern int  TSXFreeCursor(Display*, Cursor);
 extern int  TSXFreeFont(Display*, XFontStruct*);
 extern int  TSXFreeFontNames(char**);
-extern int  TSXFreeGC(Display*, GC);
 extern int  TSXFreeModifiermap(XModifierKeymap*);
 extern int  TSXFreePixmap(Display*, Pixmap);
 extern int   TSXGetFontProperty(XFontStruct*, Atom, unsigned long*);
 extern int   TSXGetGeometry(Display*, Drawable, Window*, int*, int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*);
 extern int  TSXGetInputFocus(Display*, Window*, int*);
-extern int  TSXGetKeyboardControl(Display*, XKeyboardState*);
 extern int  TSXGetScreenSaver(Display*, int*, int*, int*, int*);
 extern int  TSXGetWindowProperty(Display*, Window, Atom, long, long, int, Atom, Atom*, int*, unsigned long*, unsigned long*, unsigned char**);
 extern int   TSXGetWindowAttributes(Display*, Window, XWindowAttributes*);
-extern int  TSXGrabKeyboard(Display*, Window, int, int, int, Time);
 extern int  TSXGrabPointer(Display*, Window, int, unsigned int, int, int, Window, Cursor, Time);
 extern int  TSXGrabServer(Display*);
-extern int  TSXInstallColormap(Display*, Colormap);
 extern KeyCode  TSXKeysymToKeycode(Display*, KeySym);
 extern int  TSXMapWindow(Display*, Window);
-extern int  TSXNextEvent(Display*, XEvent*);
-extern int  TSXParseGeometry(const  char*, int*, int*, unsigned int*, unsigned int*);
-extern int  TSXPending(Display*);
-extern int  TSXPutBackEvent(Display*, XEvent*);
-extern int  TSXPutImage(Display*, Drawable, GC, XImage*, int, int, int, int, unsigned int, unsigned int);
 extern int  TSXQueryColor(Display*, Colormap, XColor*);
 extern int  TSXQueryColors(Display*, Colormap, XColor*, int);
-extern int  TSXQueryKeymap(Display*, char*);
 extern int   TSXQueryPointer(Display*, Window, Window*, Window*, int*, int*, int*, int*, unsigned int*);
 extern int   TSXQueryTree(Display*, Window, Window*, Window*, Window**, unsigned int*);
 extern int  TSXRefreshKeyboardMapping(XMappingEvent*);
-extern int  TSXResetScreenSaver(Display*);
-extern int  TSXRestackWindows(Display*, Window*, int);
 extern int   TSXSendEvent(Display*, Window, int, long, XEvent*);
 extern int  TSXSetArcMode(Display*, GC, int);
-extern int  TSXSetBackground(Display*, GC, unsigned long);
-extern int  TSXSetClipMask(Display*, GC, Pixmap);
-extern int  TSXSetClipOrigin(Display*, GC, int, int);
 extern int  TSXSetClipRectangles(Display*, GC, int, int, XRectangle*, int, int);
 extern int  TSXSetDashes(Display*, GC, int, const  char*, int);
-extern int  TSXSetFillStyle(Display*, GC, int);
-extern int  TSXSetFont(Display*, GC, Font);
 extern int  TSXSetForeground(Display*, GC, unsigned long);
 extern int  TSXSetFunction(Display*, GC, int);
 extern int  TSXSetGraphicsExposures(Display*, GC, int);
-extern int  TSXSetIconName(Display*, Window, const  char*);
-extern int  TSXSetInputFocus(Display*, Window, int, Time);
 extern int  TSXSetLineAttributes(Display*, GC, unsigned int, int, int, int);
 extern int  TSXSetScreenSaver(Display*, int, int, int, int);
 extern int  TSXSetSelectionOwner(Display*, Atom, Window, Time);
 extern int  TSXSetSubwindowMode(Display*, GC, int);
-extern int  TSXSetWindowColormap(Display*, Window, Colormap);
 extern int  TSXStoreColor(Display*, Colormap, XColor*);
-extern int  TSXStoreName(Display*, Window, const  char*);
 extern int  TSXSync(Display*, int);
 extern int  TSXTextExtents16(XFontStruct*, const  XChar2b*, int, int*, int*, int*, XCharStruct*);
 extern int  TSXTextWidth16(XFontStruct*, const  XChar2b*, int);
-extern int  TSXUngrabKeyboard(Display*, Time);
 extern int  TSXUngrabPointer(Display*, Time);
 extern int  TSXUngrabServer(Display*);
 extern int  TSXUninstallColormap(Display*, Colormap);
 extern int  TSXUnmapWindow(Display*, Window);
 extern int  TSXWarpPointer(Display*, Window, Window, int, int, unsigned int, unsigned int, int, int);
 extern XIM  TSXOpenIM(Display*, struct _XrmHashBucketRec*, char*, char*);
-extern int (*TSXSynchronize(Display *, Bool))(Display *);
 
 #endif /* defined(HAVE_X11_XLIB_H) */
 
diff --git a/include/ts_xresource.h b/include/ts_xresource.h
deleted file mode 100644
index 2c82c052e16..00000000000
--- a/include/ts_xresource.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Thread safe wrappers around Xresource calls.
- * Always include this file instead of <X11/Xresource.h>.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#ifndef __WINE_TS_XRESOURCE_H
-#define __WINE_TS_XRESOURCE_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef HAVE_X11_XLIB_H
-
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-
-extern void (*wine_tsx11_lock)(void);
-extern void (*wine_tsx11_unlock)(void);
-
-extern XrmQuark  TSXrmUniqueQuark(void);
-extern int   TSXrmGetResource(XrmDatabase, const  char*, const  char*, char**, XrmValue*);
-extern XrmDatabase  TSXrmGetFileDatabase(const  char*);
-extern XrmDatabase  TSXrmGetStringDatabase(const  char*);
-extern void  TSXrmMergeDatabases(XrmDatabase, XrmDatabase*);
-extern void  TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const  char*, int*, char**);
-
-#endif /* defined(HAVE_X11_XLIB_H) */
-
-#endif /* __WINE_TS_XRESOURCE_H */
diff --git a/include/ts_xshm.h b/include/ts_xshm.h
deleted file mode 100644
index db4459c3a07..00000000000
--- a/include/ts_xshm.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Thread safe wrappers around XShm calls.
- * Always include this file instead of <X11/XShm.h>.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#ifndef __WINE_TS_XSHM_H
-#define __WINE_TS_XSHM_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef HAVE_LIBXXSHM
-
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
-
-extern void (*wine_tsx11_lock)(void);
-extern void (*wine_tsx11_unlock)(void);
-
-extern Bool TSXShmQueryExtension(Display *);
-extern Bool TSXShmQueryVersion(Display *, int *, int *, Bool *);
-extern int TSXShmPixmapFormat(Display *);
-extern Status TSXShmAttach(Display *, XShmSegmentInfo *);
-extern Status TSXShmDetach(Display *, XShmSegmentInfo *);
-extern Status TSXShmPutImage(Display *, Drawable, GC, XImage *, int, int, int, int, unsigned int, unsigned int, Bool);
-extern Status TSXShmGetImage(Display *, Drawable, XImage *, int, int, unsigned long);
-extern XImage * TSXShmCreateImage(Display *, Visual *, unsigned int, int, char *, XShmSegmentInfo *, unsigned int, unsigned int);
-extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *, unsigned int, unsigned int, unsigned int);
-
-#endif /* defined(HAVE_LIBXXSHM) */
-
-#endif /* __WINE_TS_XSHM_H */
diff --git a/include/ts_xutil.h b/include/ts_xutil.h
index 3286ecefd68..edb9417a149 100644
--- a/include/ts_xutil.h
+++ b/include/ts_xutil.h
@@ -21,41 +21,12 @@
 extern void (*wine_tsx11_lock)(void);
 extern void (*wine_tsx11_unlock)(void);
 
-extern XClassHint * TSXAllocClassHint(void);
-extern XSizeHints * TSXAllocSizeHints(void);
 extern XWMHints * TSXAllocWMHints(void);
-extern int  TSXClipBox(Region, XRectangle*);
-extern Region  TSXCreateRegion(void);
-extern int  TSXDestroyRegion(Region);
-extern int  TSXEmptyRegion(Region);
-extern int  TSXEqualRegion(Region, Region);
 extern int  TSXFindContext(Display*, XID, XContext, XPointer*);
-extern XVisualInfo * TSXGetVisualInfo(Display*, long, XVisualInfo*, int*);
 extern XWMHints * TSXGetWMHints(Display*, Window);
-extern int   TSXGetWMSizeHints(Display*, Window, XSizeHints*, long*, Atom);
-extern int  TSXIntersectRegion(Region, Region, Region);
 extern int  TSXLookupString(XKeyEvent*, char*, int, KeySym*, XComposeStatus*);
-extern int  TSXOffsetRegion(Region, int, int);
-extern int   TSXPointInRegion(Region, int, int);
-extern Region  TSXPolygonRegion(XPoint*, int, int);
-extern int  TSXRectInRegion(Region, int, int, unsigned int, unsigned int);
-extern int  TSXSaveContext(Display*, XID, XContext, const  char*);
-extern int  TSXSetClassHint(Display*, Window, XClassHint*);
 extern int  TSXSetWMHints(Display*, Window, XWMHints*);
-extern void  TSXSetWMProperties(Display*, Window, XTextProperty*, XTextProperty*, char**, int, XSizeHints*, XWMHints*, XClassHint*);
-extern void  TSXSetWMSizeHints(Display*, Window, XSizeHints*, Atom);
-extern int  TSXSetRegion(Display*, GC, Region);
-extern int  TSXShrinkRegion(Region, int, int);
-extern int   TSXStringListToTextProperty(char**, int, XTextProperty*);
-extern int  TSXSubtractRegion(Region, Region, Region);
-extern int  TSXUnionRectWithRegion(XRectangle*, Region, Region);
-extern int  TSXUnionRegion(Region, Region, Region);
-extern int  TSXXorRegion(Region, Region, Region);
 extern int TSXDestroyImage(struct _XImage *);
-extern struct _XImage * TSXSubImage(struct _XImage *, int, int, unsigned int, unsigned int);
-extern int TSXAddPixel(struct _XImage *, long);
-extern XContext TSXUniqueContext(void);
-extern int TSXDeleteContext(Display*,XID,XContext);
 
 #endif /* defined(HAVE_X11_XLIB_H) */
 
diff --git a/include/ts_xvideo.h b/include/ts_xvideo.h
deleted file mode 100644
index e8b5968dcf2..00000000000
--- a/include/ts_xvideo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Thread safe wrappers around xvideo calls.
- * Always include this file instead of <X11/xvideo.h>.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#ifndef __WINE_TS_XVIDEO_H
-#define __WINE_TS_XVIDEO_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef HAVE_XVIDEO
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/Xvlib.h>
-
-extern void (*wine_tsx11_lock)(void);
-extern void (*wine_tsx11_unlock)(void);
-
-extern int TSXvQueryExtension(Display*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*);
-extern int TSXvQueryAdaptors(Display*, Window, unsigned int*, XvAdaptorInfo**);
-extern int TSXvQueryEncodings(Display*, XvPortID, unsigned int*, XvEncodingInfo**);
-extern int TSXvPutVideo(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
-extern int TSXvPutStill(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
-extern int TSXvGetVideo(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
-extern int TSXvGetStill(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
-extern int TSXvStopVideo(Display*, XvPortID, Drawable);
-extern int TSXvGrabPort(Display*, XvPortID, Time);
-extern int TSXvUngrabPort(Display*, XvPortID, Time);
-extern int TSXvSelectVideoNotify(Display*, Drawable, Bool);
-extern int TSXvSelectPortNotify(Display*, XvPortID, Bool);
-extern int TSXvSetPortAttribute(Display*, XvPortID, Atom, int);
-extern int TSXvGetPortAttribute(Display*, XvPortID, Atom, int*);
-extern int TSXvQueryBestSize(Display*, XvPortID, Bool, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int*, unsigned int*);
-extern XvAttribute* TSXvQueryPortAttributes(Display*, XvPortID, int*);
-extern void TSXvFreeAdaptorInfo(XvAdaptorInfo*);
-extern void TSXvFreeEncodingInfo(XvEncodingInfo*);
-extern XvImageFormatValues * TSXvListImageFormats(Display*, XvPortID, int*);
-extern XvImage * TSXvCreateImage(Display*, XvPortID, int, char*, int, int);
-extern int TSXvPutImage(Display*, XvPortID, Drawable, GC, XvImage*, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
-extern int TSXvShmPutImage(Display*, XvPortID, Drawable, GC, XvImage*, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int, Bool);
-extern XvImage * TSXvShmCreateImage(Display*, XvPortID, int, char*, int, int, XShmSegmentInfo*);
-
-#endif /* defined(HAVE_XVIDEO) */
-
-#endif /* __WINE_TS_XVIDEO_H */
diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers
index 7937bfa1e11..c163c127c6d 100755
--- a/tools/make_X11wrappers
+++ b/tools/make_X11wrappers
@@ -30,7 +30,7 @@
 $X11_include_dir = "/usr/X11/include";
 $outdir = "tsx11";
 $wantfile = "$outdir/X11_calls";
-@dolist = ("Xlib", "Xresource", "Xutil", "XShm", "xf86dga", "xf86dga2", "xf86vmode", "shape", "xvideo");
+@dolist = ("Xlib", "Xutil", "xf86dga2", "xf86vmode");
 
 # First read list of wanted function names.
 
@@ -60,16 +60,9 @@ foreach $name (@dolist) {
     $pre_file = "#ifdef HAVE_X11_XLIB_H\n";
     $post_file = "#endif /* defined(HAVE_X11_XLIB_H) */\n";
     $inc_name = $name;
-    if($name eq "Xutil" || $name eq "Xresource" || $name eq "XShm") {
-	$x11_incl = "#include <X11/Xlib.h>\n";
+    if($name eq "Xutil") {
 	# For Xutil, we need X11/Xresource.h for XUniqueContext().
-	$x11_incl .= "#include <X11/Xresource.h>\n" if $name eq "Xutil";
-    }
-    if($name eq "xf86dga")  {
-    	$x11_incl = "#include <X11/Xlib.h>\n";
-	$extensions_dir = "extensions/";
-	$pre_file = "#ifdef HAVE_LIBXXF86DGA\n";
-	$post_file = "#endif /* defined(HAVE_LIBXXF86DGA) */\n";
+	$x11_incl = "#include <X11/Xlib.h>\n#include <X11/Xresource.h>\n";
     }
     if($name eq "xf86dga2")  {
     	$x11_incl = "#include <X11/Xlib.h>\n";
@@ -78,31 +71,12 @@ foreach $name (@dolist) {
 	$post_file = "#endif /* defined(HAVE_LIBXXF86DGA2) */\n";
 	$inc_name = "xf86dga";
     }
-    if($name eq "XShm") {
-	$extensions_dir = "extensions/";
-	$pre_file = "#ifdef HAVE_LIBXXSHM\n";
-	$post_file = "#endif /* defined(HAVE_LIBXXSHM) */\n";
-    }
     if($name eq "xf86vmode") {
      	$x11_incl = "#include <X11/Xlib.h>\n";
 	$extensions_dir = "extensions/";
 	$pre_file = "#include \"windef.h\"\n#ifdef HAVE_LIBXXF86VM\n#define XMD_H\n#include \"basetsd.h\"\n";
 	$post_file = "#endif /* defined(HAVE_LIBXXF86VM) */\n";
     }
-    if($name eq "shape") {
-        $extensions_dir = "extensions/";
-        $pre_file = "#ifdef HAVE_LIBXSHAPE\n#include <X11/IntrinsicP.h>\n";
-        $post_file = "#endif /* defined(HAVE_LIBXSHAPE) */\n";
-        $inc_name = "shape";
-    }
-    if($name eq "xvideo")  {
-    	$x11_incl = "#include <X11/Xlib.h>\n#include <X11/extensions/Xv.h>\n#include <X11/extensions/XShm.h>\n";
-	$extensions_dir = "extensions/";
-	$pre_file = "#ifdef HAVE_XVIDEO\n";
-	$post_file = "#endif /* defined(HAVE_XVIDEO) */\n";
-	$inc_name = "Xvlib";
-    }
-
 
     print OUTH <<END;
 /*
@@ -143,82 +117,7 @@ $x11_incl#include <X11/$extensions_dir$inc_name.h>
 
 END
 
-    if ($name eq "XShm") {
-	output_fn("XShmQueryExtension", "Bool",
-		  "Display *", "Display *a0", "a0");
-	output_fn("XShmQueryVersion", "Bool",
-		  "Display *, int *, int *, Bool *",
-		  "Display *a0, int *a1, int *a2, Bool *a3", "a0, a1, a2, a3");
-	output_fn("XShmPixmapFormat", "int",
-		  "Display *", "Display *a0", "a0");
-	output_fn("XShmAttach", Status,
-		  "Display *, XShmSegmentInfo *",
-		  "Display *a0, XShmSegmentInfo *a1", "a0, a1");
-	output_fn("XShmDetach", Status,
-		  "Display *, XShmSegmentInfo *",
-		  "Display *a0, XShmSegmentInfo *a1", "a0, a1");
-	output_fn("XShmPutImage", Status,
-		  "Display *, Drawable, GC, XImage *, int, int, int, int, unsigned int, unsigned int, Bool",
-		  "Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10", "a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10");
-	output_fn("XShmGetImage", Status,
-		  "Display *, Drawable, XImage *, int, int, unsigned long",
-		  "Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5",
-		  "a0, a1, a2, a3, a4, a5");
-	output_fn("XShmCreateImage", "XImage *",
-		  "Display *, Visual *, unsigned int, int, char *, XShmSegmentInfo *, unsigned int, unsigned int",
-		  "Display *a0, Visual *a1, unsigned int a2, int a3, char *a4, XShmSegmentInfo *a5, unsigned int a6, unsigned int a7",
-		  "a0, a1, a2, a3, a4, a5, a6, a7");
-	output_fn("XShmCreatePixmap", "Pixmap",
-		  "Display *, Drawable, char *, XShmSegmentInfo *, unsigned int, unsigned int, unsigned int",
-		  "Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a3, unsigned int a4, unsigned int a5, unsigned int a6",
-		  "a0, a1, a2, a3, a4, a5, a6");
-    } elsif($name eq "xf86dga") {
-    	output_fn("XF86DGAQueryVersion",Bool,
-		"Display*,int*,int*",
-		"Display*a0,int*a1,int*a2",
-		"a0,a1,a2"
-	);
-    	output_fn("XF86DGAQueryExtension",Bool,
-		"Display*,int*,int*",
-		"Display*a0,int*a1,int*a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86DGAGetVideo",Status,
-		"Display*,int,char**,int*,int*,int*",
-		"Display*a0,int a1,char**a2,int*a3,int*a4,int*a5",
-		"a0,a1,a2,a3,a4,a5"
-	);
-	output_fn("XF86DGADirectVideo",Status,
-		"Display*,int,int",
-		"Display*a0,int a1,int a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86DGAGetViewPortSize",Status,
-		"Display*,int,int*,int*",
-		"Display*a0,int a1,int *a2,int *a3",
-		"a0,a1,a2,a3"
-	);
-	output_fn("XF86DGASetViewPort",Status,
-		"Display*,int,int,int",
-		"Display*a0,int a1,int a2,int a3",
-		"a0,a1,a2,a3"
-	);
-	output_fn("XF86DGAInstallColormap",Status,
-		"Display*,int,Colormap",
-		"Display*a0,int a1,Colormap a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86DGAQueryDirectVideo",Status,
-		"Display*,int,int*",
-		"Display*a0,int a1,int *a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86DGAViewPortChanged",Status,
-		"Display*,int,int",
-		"Display*a0,int a1,int a2",
-		"a0,a1,a2"
-	);
-    } elsif($name eq "xf86dga2") {
+    if($name eq "xf86dga2") {
     	output_fn_short("Bool", "XDGAQueryVersion", "Display*" ,"int*","int*");
     	output_fn_short("Bool", "XDGAQueryExtension", "Display*" ,"int*","int*");
     	output_fn_short("XDGAMode*", "XDGAQueryModes", "Display*" ,"int", "int*");
@@ -229,38 +128,6 @@ END
     	output_fn_short("void", "XDGAInstallColormap", "Display*" , "int", "Colormap");
 	output_fn_short("Colormap", "XDGACreateColormap", "Display*" ,"int", "XDGADevice*", "int");
     	output_fn_short("void", "XDGASelectInput", "Display*" ,"int", "long");
-    	output_fn_short("void", "XDGAFillRectangle", "Display*" ,"int", "int", "int", "unsigned int", "unsigned int", "unsigned long");
-   	output_fn_short("void", "XDGACopyArea", "Display*" ,"int", "int", "int", "unsigned int", "unsigned int", "int", "int");
-   	output_fn_short("void", "XDGACopyTransparentArea", "Display*" ,"int", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned long");
-    	output_fn_short("int", "XDGAGetViewportStatus", "Display*" ,"int");
-    	output_fn_short("void", "XDGASync", "Display*" ,"int");
-    	output_fn_short("Bool", "XDGASetClientVersion", "Display*");
-    	output_fn_short("void", "XDGAChangePixmapMode", "Display*" ,"int", "int*", "int*", "int");
-	output_fn_short("void", "XDGAKeyEventToXKeyEvent", "XDGAKeyEvent*" ,"XKeyEvent*");
-    } elsif ($name eq "xvideo") {
-	output_fn_short("int", "XvQueryExtension", "Display*", "unsigned int*", "unsigned int*", "unsigned int*", "unsigned int*", "unsigned int*");
-	output_fn_short("int", "XvQueryAdaptors", "Display*", "Window", "unsigned int*", "XvAdaptorInfo**");
-	output_fn_short("int", "XvQueryEncodings", "Display*", "XvPortID", "unsigned int*", "XvEncodingInfo**");
-	output_fn_short("int", "XvPutVideo", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
-	output_fn_short("int", "XvPutStill", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
-	output_fn_short("int", "XvGetVideo", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
-	output_fn_short("int", "XvGetStill", "Display*", "XvPortID", "Drawable", "GC", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
-	output_fn_short("int", "XvStopVideo", "Display*", "XvPortID", "Drawable");
-	output_fn_short("int", "XvGrabPort", "Display*", "XvPortID", "Time");
-	output_fn_short("int", "XvUngrabPort", "Display*", "XvPortID", "Time");
-	output_fn_short("int", "XvSelectVideoNotify", "Display*", "Drawable", "Bool");
-	output_fn_short("int", "XvSelectPortNotify", "Display*", "XvPortID", "Bool");
-	output_fn_short("int", "XvSetPortAttribute", "Display*", "XvPortID", "Atom", "int");
-	output_fn_short("int", "XvGetPortAttribute", "Display*", "XvPortID", "Atom", "int*");
-	output_fn_short("int", "XvQueryBestSize", "Display*", "XvPortID", "Bool", "unsigned int", "unsigned int", "unsigned int", "unsigned int", "unsigned int*", "unsigned int*");
-	output_fn_short("XvAttribute*", "XvQueryPortAttributes", "Display*", "XvPortID", "int*");
-	output_fn_short("void", "XvFreeAdaptorInfo", "XvAdaptorInfo*");
-	output_fn_short("void", "XvFreeEncodingInfo", "XvEncodingInfo*");
-	output_fn_short("XvImageFormatValues *", "XvListImageFormats", "Display*", "XvPortID", "int*");
-	output_fn_short("XvImage *", "XvCreateImage", "Display*", "XvPortID", "int", "char*", "int", "int");
-	output_fn_short("int", "XvPutImage", "Display*", "XvPortID", "Drawable", "GC", "XvImage*", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int");
-	output_fn_short("int", "XvShmPutImage", "Display*", "XvPortID", "Drawable", "GC", "XvImage*", "int", "int", "unsigned int", "unsigned int", "int", "int", "unsigned int", "unsigned int", "Bool");
-output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int", "char*", "int", "int", "XShmSegmentInfo*");
     } elsif($name eq "xf86vmode") {
     	output_fn("XF86VidModeQueryVersion",Bool,
 		"Display*,int*,int*",
@@ -282,31 +149,6 @@ output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int",
 		"Display*a0,int a1,int*a2,XF86VidModeModeInfo***a3",
 		"a0,a1,a2,a3"
 	);
-	output_fn("XF86VidModeAddModeLine",Bool,
-		"Display*,int,XF86VidModeModeInfo*,XF86VidModeModeInfo*",
-		"Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3",
-		"a0,a1,a2,a3"
-	);
-	output_fn("XF86VidModeDeleteModeLine",Bool,
-		"Display*,int,XF86VidModeModeInfo*",
-		"Display*a0,int a1,XF86VidModeModeInfo*a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86VidModeModModeLine",Bool,
-		"Display*,int,XF86VidModeModeLine*",
-		"Display*a0,int a1,XF86VidModeModeLine*a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86VidModeValidateModeLine",Status,
-		"Display*,int,XF86VidModeModeInfo*",
-		"Display*a0,int a1,XF86VidModeModeInfo*a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86VidModeSwitchMode",Bool,
-		"Display*,int,int",
-		"Display*a0,int a1,int a2",
-		"a0,a1,a2"
-	);
 	output_fn("XF86VidModeSwitchToMode",Bool,
 		"Display*,int,XF86VidModeModeInfo*",
 		"Display*a0,int a1,XF86VidModeModeInfo*a2",
@@ -317,16 +159,6 @@ output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int",
 		"Display*a0,int a1,int a2",
 		"a0,a1,a2"
 	);
-	output_fn("XF86VidModeGetMonitor",Bool,
-		"Display*,int,XF86VidModeMonitor*",
-		"Display*a0,int a1,XF86VidModeMonitor*a2",
-		"a0,a1,a2"
-	);
-	output_fn("XF86VidModeGetViewPort",Bool,
-		"Display*,int,int*,int*",
-		"Display*a0,int a1,int*a2,int*a3",
-		"a0,a1,a2,a3"
-	);
 	output_fn("XF86VidModeSetViewPort",Bool,
 		"Display*,int,int,int",
 		"Display*a0,int a1,int a2,int a3",
@@ -383,34 +215,9 @@ output_fn_short("XvImage *", "XvShmCreateImage", "Display*", "XvPortID", "int",
       }
     }
 
-    if($name eq "Xlib") {
-	raw_output_fn("XSynchronize", "int (*r)(Display *)",
-		  "int (*TSXSynchronize(Display *, Bool))(Display *)",
-		  "int (*TSXSynchronize(Display *a0, Bool a1))(Display *)",
-		  "a0, a1");
-    } elsif($name eq "Xutil") {
+    if ($name eq "Xutil") {
 	output_fn("XDestroyImage", "int",
 		  "struct _XImage *", "struct _XImage *a0", "a0");
-	output_fn("XGetPixel", "unsigned long",
-		  "struct _XImage *, int, int",
-		  "struct _XImage *a0, int a1, int a2",
-		  "a0, a1, a2");
-	output_fn("XPutPixel", "int",
-		  "struct _XImage *, int, int, unsigned long",
-		  "struct _XImage *a0, int a1, int a2, unsigned long a3",
-		  "a0, a1, a2, a3");
-	output_fn("XSubImage", "struct _XImage *",
-		  "struct _XImage *, int, int, unsigned int, unsigned int",
-		  "struct _XImage *a0, int a1, int a2, unsigned int a3, unsigned int a4",
-		  "a0, a1, a2, a3, a4");
-	output_fn("XAddPixel", "int",
-		  "struct _XImage *, long",
-		  "struct _XImage *a0, long a1", "a0, a1");
-	output_fn("XUniqueContext", "XContext", "void", "void", "");
-	output_fn("XDeleteContext", "int",
-		  "Display*,XID,XContext",
-		  "Display*a0,XID a1,XContext a2",
-		  "a0,a1,a2");
     }
 
     print OUTH <<END;
diff --git a/tsx11/Makefile.in b/tsx11/Makefile.in
index 511b37ee4b0..c4fa115fbfb 100644
--- a/tsx11/Makefile.in
+++ b/tsx11/Makefile.in
@@ -11,15 +11,10 @@ EXTRALIBS = $(X_LIBS) $(XLIB)
 
 C_SRCS = \
 	locking.c \
-	ts_xf86dga.c \
 	ts_xf86dga2.c \
 	ts_xf86vmode.c \
-	ts_xshm.c \
 	ts_xlib.c \
-	ts_xresource.c \
-	ts_xvideo.c \
-	ts_xutil.c \
-	ts_shape.c
+	ts_xutil.c
 
 all: libwine_tsx11.$(LIBEXT)
 
diff --git a/tsx11/X11_calls b/tsx11/X11_calls
index cf57942c443..debfb0b4302 100644
--- a/tsx11/X11_calls
+++ b/tsx11/X11_calls
@@ -4,52 +4,45 @@
 # To add a new call, put it on this list and run tools/make_X11wrappers.
 # Also read the comments at the top of tools/make_X11wrappers.
 #
-XActivateScreenSaver
-XAddPixel
-XAllocClassHint
 XAllocColor
 XAllocColorCells
-XAllocSizeHints
 XAllocWMHints
 XBell
 XChangeGC
-XChangeKeyboardControl
 XChangeProperty
 XChangeWindowAttributes
-XCheckTypedEvent
-XCheckTypedWindowEvent
-XCheckWindowEvent
-XClipBox
-XConvertSelection
 XCopyArea
-XCopyColormapAndFree
 XCopyPlane
 XCreateBitmapFromData
 XCreateColormap
-XCreateFontCursor
-XCreateGC
-XCreateImage
 XCreatePixmap
-XCreatePixmapCursor
-XCreateRegion
-XCreateWindow
+XDGACloseFramebuffer
+XDGACreateColormap
+XDGAInstallColormap
+XDGAOpenFramebuffer
+XDGAQueryExtension
+XDGAQueryModes
+XDGAQueryVersion
+XDGASelectInput
+XDGASetMode
+XDGASetViewport
 XDefineCursor
-XDeleteContext
 XDeleteProperty
 XDestroyImage
-XDestroyRegion
-XDestroyWindow
 XDisplayKeycodes
 XDrawArc
 XDrawLine
 XDrawLines
-XDrawPoint
 XDrawRectangle
-XDrawSegments
 XDrawString16
 XDrawText16
-XEmptyRegion
-XEqualRegion
+XF86VidModeGetAllModeLines
+XF86VidModeGetModeLine
+XF86VidModeLockModeSwitch
+XF86VidModeQueryExtension
+XF86VidModeQueryVersion
+XF86VidModeSetViewPort
+XF86VidModeSwitchToMode
 XFillArc
 XFillPolygon
 XFillRectangle
@@ -58,10 +51,8 @@ XFlush
 XFree
 XFreeColormap
 XFreeColors
-XFreeCursor
 XFreeFont
 XFreeFontNames
-XFreeGC
 XFreeModifiermap
 XFreePixmap
 XGetAtomName
@@ -69,183 +60,51 @@ XGetFontProperty
 XGetGeometry
 XGetImage
 XGetInputFocus
-XGetKeyboardControl
 XGetKeyboardMapping
 XGetModifierMapping
 XGetScreenSaver
 XGetSelectionOwner
-XGetSubImage
-XGetVisualInfo
 XGetWMHints
-XGetWMSizeHints
 XGetWindowAttributes
 XGetWindowProperty
-XGrabKeyboard
 XGrabPointer
 XGrabServer
-XIconifyWindow
-XInitThreads
-XInstallColormap
 XInternAtom
-XIntersectRegion
 XKeycodeToKeysym
 XKeysymToKeycode
 XKeysymToString
 XListDepths
 XListFonts
-XListPixmapFormats
 XLoadQueryFont
 XLookupKeysym
 XLookupString
 XMapWindow
-XNextEvent
-XOffsetRegion
 XOpenDisplay
 XOpenIM
-XParseGeometry
-XPending
-XPointInRegion
-XPolygonRegion
-XPutBackEvent
-XPutImage
 XQueryColor
 XQueryColors
-XQueryKeymap
 XQueryPointer
 XQueryTree
 XReconfigureWMWindow
-XRectInRegion
 XRefreshKeyboardMapping
-XResetScreenSaver
-XResourceManagerString
-XRestackWindows
-XSaveContext
 XSendEvent
 XSetArcMode
-XSetBackground
-XSetClassHint
-XSetClipMask
-XSetClipOrigin
 XSetClipRectangles
 XSetDashes
-XSetFillStyle
-XSetFont
 XSetForeground
 XSetFunction
 XSetGraphicsExposures
-XSetIconName
-XSetInputFocus
 XSetLineAttributes
-XSetRegion
 XSetScreenSaver
 XSetSelectionOwner
 XSetSubwindowMode
-XSetTransientForHint
-XSetWindowColormap
 XSetWMHints
-XSetWMProperties
-XSetWMProtocols
-XSetWMSizeHints
-XShapeCombineMask
-XShapeCombineRectangles
-XShmAttach
-XShmCreateImage
-XShmCreatePixmap
-XShmDetach
-XShmGetImage
-XShmPixmapFormat
-XShmPutImage
-XShmQueryExtension
-XShmQueryVersion
-XShrinkRegion
 XStoreColor
-XStoreName
-XStringListToTextProperty
-XSubImage
-XSubtractRegion
 XSync
-XSynchronize
 XTextExtents16
 XTextWidth16
-XUngrabKeyboard
 XUngrabPointer
 XUngrabServer
 XUninstallColormap
-XUnionRectWithRegion
-XUnionRegion
-XUniqueContext
 XUnmapWindow
-XVisualIDFromVisual
 XWarpPointer
-XXorRegion
-XrmGetFileDatabase
-XrmGetResource
-XrmGetStringDatabase
-XrmInitialize
-XrmMergeDatabases
-XrmParseCommand
-XrmUniqueQuark
-XF86DGAQueryExtension
-XF86DGASetViewPort
-XF86DGAInstallColormap
-XF86DGAViewPortChanged
-XF86DGADirectVideo
-XF86DGAQueryVersion
-XF86DGAQueryDirectVideo
-XF86DGAGetVideo
-XF86DGAGetViewPortSize
-XF86VidModeQueryVersion
-XF86VidModeQueryExtension
-XF86VidModeGetModeLine
-XF86VidModeGetAllModeLines
-XF86VidModeAddModeLine
-XF86VidModeDeleteModeLine
-XF86VidModeModModeLine
-XF86VidModeValidateModeLine
-XF86VidModeSwitchMode
-XF86VidModeSwitchToMode
-XF86VidModeLockModeSwitch
-XF86VidModeGetMonitor
-XF86VidModeGetViewPort
-XF86VidModeSetViewPort
-XDGAQueryExtension
-XDGAQueryVersion
-XDGAQueryModes
-XDGASetMode
-XDGAOpenFramebuffer
-XDGACloseFramebuffer
-XDGASetViewport
-XDGAInstallColormap
-XDGACreateColormap
-XDGASelectInput
-XDGAFillRectangle
-XDGACopyArea
-XDGACopyTransparentArea
-XDGAGetViewportStatus
-XDGASync
-XDGASetClientVersion
-XDGAChangePixmapMode
-XDGAKeyEventToXKeyEvent
-XvQueryExtension
-XvQueryAdaptors
-XvQueryEncodings
-XvPutVideo
-XvPutStill
-XvGetVideo
-XvGetStill
-XvStopVideo
-XvGrabPort
-XvUngrabPort
-XvSelectVideoNotify
-XvSelectPortNotify
-XvSetPortAttribute
-XvGetPortAttribute
-XvQueryBestSize
-XvQueryPortAttributes
-XvFreeAdaptorInfo
-XvFreeEncodingInfo
-XvListImageFormats
-XvCreateImage
-XvPutImage
-XvShmPutImage
-XvShmCreateImage
diff --git a/tsx11/ts_shape.c b/tsx11/ts_shape.c
deleted file mode 100644
index f64f5306df0..00000000000
--- a/tsx11/ts_shape.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Thread safe wrappers around shape calls.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#include "config.h"
-
-#ifdef HAVE_LIBXSHAPE
-#include <X11/IntrinsicP.h>
-
-#include <X11/extensions/shape.h>
-
-#include "ts_shape.h"
-
-
-void  TSXShapeCombineRectangles(Display* a0, Window a1, int a2, int a3, int a4, XRectangle* a5, int a6, int a7, int a8)
-{
-  wine_tsx11_lock();
-  XShapeCombineRectangles(a0, a1, a2, a3, a4, a5, a6, a7, a8);
-  wine_tsx11_unlock();
-}
-
-void  TSXShapeCombineMask(Display* a0, Window a1, int a2, int a3, int a4, Pixmap a5, int a6)
-{
-  wine_tsx11_lock();
-  XShapeCombineMask(a0, a1, a2, a3, a4, a5, a6);
-  wine_tsx11_unlock();
-}
-
-#endif /* defined(HAVE_LIBXSHAPE) */
-
diff --git a/tsx11/ts_xf86dga.c b/tsx11/ts_xf86dga.c
deleted file mode 100644
index dfe46d84c74..00000000000
--- a/tsx11/ts_xf86dga.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Thread safe wrappers around xf86dga calls.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#include "config.h"
-
-#ifdef HAVE_LIBXXF86DGA
-
-#include <X11/Xlib.h>
-#include <X11/extensions/xf86dga.h>
-
-#include "ts_xf86dga.h"
-
-
-Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86DGAQueryVersion(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Bool TSXF86DGAQueryExtension(Display*a0,int*a1,int*a2)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86DGAQueryExtension(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGAGetVideo(Display*a0,int a1,char**a2,int*a3,int*a4,int*a5)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGAGetVideo(a0,a1,a2,a3,a4,a5);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGADirectVideo(Display*a0,int a1,int a2)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGADirectVideo(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGAGetViewPortSize(Display*a0,int a1,int *a2,int *a3)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGAGetViewPortSize(a0,a1,a2,a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGASetViewPort(Display*a0,int a1,int a2,int a3)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGASetViewPort(a0,a1,a2,a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGAInstallColormap(Display*a0,int a1,Colormap a2)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGAInstallColormap(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGAQueryDirectVideo(Display*a0,int a1,int *a2)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGAQueryDirectVideo(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86DGAViewPortChanged(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-#endif /* defined(HAVE_LIBXXF86DGA) */
-
diff --git a/tsx11/ts_xf86dga2.c b/tsx11/ts_xf86dga2.c
index 6ad371436d7..47b628ba7f3 100644
--- a/tsx11/ts_xf86dga2.c
+++ b/tsx11/ts_xf86dga2.c
@@ -96,65 +96,5 @@ void TSXDGASelectInput(Display* a0, int a1, long a2)
   wine_tsx11_unlock();
 }
 
-void TSXDGAFillRectangle(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6)
-{
-  wine_tsx11_lock();
-  XDGAFillRectangle( a0,  a1,  a2,  a3,  a4,  a5,  a6);
-  wine_tsx11_unlock();
-}
-
-void TSXDGACopyArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7)
-{
-  wine_tsx11_lock();
-  XDGACopyArea( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7);
-  wine_tsx11_unlock();
-}
-
-void TSXDGACopyTransparentArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7, unsigned long a8)
-{
-  wine_tsx11_lock();
-  XDGACopyTransparentArea( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8);
-  wine_tsx11_unlock();
-}
-
-int TSXDGAGetViewportStatus(Display* a0, int a1)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XDGAGetViewportStatus( a0,  a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-void TSXDGASync(Display* a0, int a1)
-{
-  wine_tsx11_lock();
-  XDGASync( a0,  a1);
-  wine_tsx11_unlock();
-}
-
-Bool TSXDGASetClientVersion(Display* a0)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XDGASetClientVersion( a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-void TSXDGAChangePixmapMode(Display* a0, int a1, int* a2, int* a3, int a4)
-{
-  wine_tsx11_lock();
-  XDGAChangePixmapMode( a0,  a1,  a2,  a3,  a4);
-  wine_tsx11_unlock();
-}
-
-void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1)
-{
-  wine_tsx11_lock();
-  XDGAKeyEventToXKeyEvent( a0,  a1);
-  wine_tsx11_unlock();
-}
-
 #endif /* defined(HAVE_LIBXXF86DGA2) */
 
diff --git a/tsx11/ts_xf86vmode.c b/tsx11/ts_xf86vmode.c
index 7a3aa895044..aa8b7235817 100644
--- a/tsx11/ts_xf86vmode.c
+++ b/tsx11/ts_xf86vmode.c
@@ -53,51 +53,6 @@ Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo**
   return r;
 }
 
-Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86VidModeAddModeLine(a0,a1,a2,a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86VidModeDeleteModeLine(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86VidModeModModeLine(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XF86VidModeValidateModeLine(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86VidModeSwitchMode(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2)
 {
   Bool r;
@@ -116,24 +71,6 @@ Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2)
   return r;
 }
 
-Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86VidModeGetMonitor(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XF86VidModeGetViewPort(a0,a1,a2,a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
 Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
 {
   Bool r;
diff --git a/tsx11/ts_xlib.c b/tsx11/ts_xlib.c
index aca35c9b191..27a05750012 100644
--- a/tsx11/ts_xlib.c
+++ b/tsx11/ts_xlib.c
@@ -31,15 +31,6 @@ XModifierKeymap	* TSXGetModifierMapping(Display* a0)
   return r;
 }
 
-XImage * TSXCreateImage(Display* a0, Visual* a1, unsigned int a2, int a3, int a4, char* a5, unsigned int a6, unsigned int a7, int a8, int a9)
-{
-  XImage * r;
-  wine_tsx11_lock();
-  r = XCreateImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9);
-  wine_tsx11_unlock();
-  return r;
-}
-
 XImage * TSXGetImage(Display* a0, Drawable a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6, int a7)
 {
   XImage * r;
@@ -49,15 +40,6 @@ XImage * TSXGetImage(Display* a0, Drawable a1, int a2, int a3, unsigned int a4,
   return r;
 }
 
-XImage * TSXGetSubImage(Display* a0, Drawable a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6, int a7, XImage* a8, int a9, int a10)
-{
-  XImage * r;
-  wine_tsx11_lock();
-  r = XGetSubImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
-  wine_tsx11_unlock();
-  return r;
-}
-
 Display * TSXOpenDisplay(const  char* a0)
 {
   Display * r;
@@ -67,13 +49,6 @@ Display * TSXOpenDisplay(const  char* a0)
   return r;
 }
 
-void  TSXrmInitialize(void)
-{
-  wine_tsx11_lock();
-  XrmInitialize();
-  wine_tsx11_unlock();
-}
-
 char * TSXGetAtomName(Display* a0, Atom a1)
 {
   char * r;
@@ -101,15 +76,6 @@ Atom  TSXInternAtom(Display* a0, const  char* a1, int a2)
   return r;
 }
 
-Colormap  TSXCopyColormapAndFree(Display* a0, Colormap a1)
-{
-  Colormap  r;
-  wine_tsx11_lock();
-  r = XCopyColormapAndFree(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 Colormap  TSXCreateColormap(Display* a0, Window a1, Visual* a2, int a3)
 {
   Colormap  r;
@@ -119,33 +85,6 @@ Colormap  TSXCreateColormap(Display* a0, Window a1, Visual* a2, int a3)
   return r;
 }
 
-Cursor  TSXCreatePixmapCursor(Display* a0, Pixmap a1, Pixmap a2, XColor* a3, XColor* a4, unsigned int a5, unsigned int a6)
-{
-  Cursor  r;
-  wine_tsx11_lock();
-  r = XCreatePixmapCursor(a0, a1, a2, a3, a4, a5, a6);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Cursor  TSXCreateFontCursor(Display* a0, unsigned int a1)
-{
-  Cursor  r;
-  wine_tsx11_lock();
-  r = XCreateFontCursor(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-GC  TSXCreateGC(Display* a0, Drawable a1, unsigned long a2, XGCValues* a3)
-{
-  GC  r;
-  wine_tsx11_lock();
-  r = XCreateGC(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
 Pixmap  TSXCreatePixmap(Display* a0, Drawable a1, unsigned int a2, unsigned int a3, unsigned int a4)
 {
   Pixmap  r;
@@ -173,15 +112,6 @@ Window  TSXGetSelectionOwner(Display* a0, Atom a1)
   return r;
 }
 
-Window  TSXCreateWindow(Display* a0, Window a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned int a6, int a7, unsigned int a8, Visual* a9, unsigned long a10, XSetWindowAttributes* a11)
-{
-  Window  r;
-  wine_tsx11_lock();
-  r = XCreateWindow(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
-  wine_tsx11_unlock();
-  return r;
-}
-
 char ** TSXListFonts(Display* a0, const  char* a1, int a2, int* a3)
 {
   char ** r;
@@ -218,42 +148,6 @@ KeySym * TSXGetKeyboardMapping(Display* a0, unsigned int a1, int a2, int* a3)
   return r;
 }
 
-char * TSXResourceManagerString(Display* a0)
-{
-  char * r;
-  wine_tsx11_lock();
-  r = XResourceManagerString(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-VisualID  TSXVisualIDFromVisual(Visual* a0)
-{
-  VisualID  r;
-  wine_tsx11_lock();
-  r = XVisualIDFromVisual(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXInitThreads(void)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XInitThreads();
-  wine_tsx11_unlock();
-  return r;
-}
-
-XPixmapFormatValues * TSXListPixmapFormats(Display* a0, int* a1)
-{
-  XPixmapFormatValues * r;
-  wine_tsx11_lock();
-  r = XListPixmapFormats(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int * TSXListDepths(Display* a0, int a1, int* a2)
 {
   int * r;
@@ -272,42 +166,6 @@ int   TSXReconfigureWMWindow(Display* a0, Window a1, int a2, unsigned int a3, XW
   return r;
 }
 
-int   TSXSetWMProtocols(Display* a0, Window a1, Atom* a2, int a3)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XSetWMProtocols(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXIconifyWindow(Display* a0, Window a1, int a2)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XIconifyWindow(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSetTransientForHint(Display* a0, Window a1, Window a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetTransientForHint(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXActivateScreenSaver(Display* a0)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XActivateScreenSaver(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int   TSXAllocColor(Display* a0, Colormap a1, XColor* a2)
 {
   int   r;
@@ -344,15 +202,6 @@ int  TSXChangeGC(Display* a0, GC a1, unsigned long a2, XGCValues* a3)
   return r;
 }
 
-int  TSXChangeKeyboardControl(Display* a0, unsigned long a1, XKeyboardControl* a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XChangeKeyboardControl(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXChangeProperty(Display* a0, Window a1, Atom a2, Atom a3, int a4, int a5, const  unsigned char* a6, int a7)
 {
   int  r;
@@ -371,42 +220,6 @@ int  TSXChangeWindowAttributes(Display* a0, Window a1, unsigned long a2, XSetWin
   return r;
 }
 
-int   TSXCheckTypedEvent(Display* a0, int a1, XEvent* a2)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XCheckTypedEvent(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXCheckTypedWindowEvent(Display* a0, Window a1, int a2, XEvent* a3)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XCheckTypedWindowEvent(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXCheckWindowEvent(Display* a0, Window a1, long a2, XEvent* a3)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XCheckWindowEvent(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXConvertSelection(Display* a0, Atom a1, Atom a2, Atom a3, Window a4, Time a5)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XConvertSelection(a0, a1, a2, a3, a4, a5);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXCopyArea(Display* a0, Drawable a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9)
 {
   int  r;
@@ -443,15 +256,6 @@ int  TSXDeleteProperty(Display* a0, Window a1, Atom a2)
   return r;
 }
 
-int  TSXDestroyWindow(Display* a0, Window a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XDestroyWindow(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXDisplayKeycodes(Display* a0, int* a1, int* a2)
 {
   int  r;
@@ -488,15 +292,6 @@ int  TSXDrawLines(Display* a0, Drawable a1, GC a2, XPoint* a3, int a4, int a5)
   return r;
 }
 
-int  TSXDrawPoint(Display* a0, Drawable a1, GC a2, int a3, int a4)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XDrawPoint(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXDrawRectangle(Display* a0, Drawable a1, GC a2, int a3, int a4, unsigned int a5, unsigned int a6)
 {
   int  r;
@@ -506,15 +301,6 @@ int  TSXDrawRectangle(Display* a0, Drawable a1, GC a2, int a3, int a4, unsigned
   return r;
 }
 
-int  TSXDrawSegments(Display* a0, Drawable a1, GC a2, XSegment* a3, int a4)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XDrawSegments(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXDrawString16(Display* a0, Drawable a1, GC a2, int a3, int a4, const  XChar2b* a5, int a6)
 {
   int  r;
@@ -596,15 +382,6 @@ int  TSXFreeColors(Display* a0, Colormap a1, unsigned long* a2, int a3, unsigned
   return r;
 }
 
-int  TSXFreeCursor(Display* a0, Cursor a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XFreeCursor(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXFreeFont(Display* a0, XFontStruct* a1)
 {
   int  r;
@@ -623,15 +400,6 @@ int  TSXFreeFontNames(char** a0)
   return r;
 }
 
-int  TSXFreeGC(Display* a0, GC a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XFreeGC(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXFreeModifiermap(XModifierKeymap* a0)
 {
   int  r;
@@ -677,15 +445,6 @@ int  TSXGetInputFocus(Display* a0, Window* a1, int* a2)
   return r;
 }
 
-int  TSXGetKeyboardControl(Display* a0, XKeyboardState* a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XGetKeyboardControl(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXGetScreenSaver(Display* a0, int* a1, int* a2, int* a3, int* a4)
 {
   int  r;
@@ -713,15 +472,6 @@ int   TSXGetWindowAttributes(Display* a0, Window a1, XWindowAttributes* a2)
   return r;
 }
 
-int  TSXGrabKeyboard(Display* a0, Window a1, int a2, int a3, int a4, Time a5)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XGrabKeyboard(a0, a1, a2, a3, a4, a5);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXGrabPointer(Display* a0, Window a1, int a2, unsigned int a3, int a4, int a5, Window a6, Cursor a7, Time a8)
 {
   int  r;
@@ -740,15 +490,6 @@ int  TSXGrabServer(Display* a0)
   return r;
 }
 
-int  TSXInstallColormap(Display* a0, Colormap a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XInstallColormap(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 KeyCode  TSXKeysymToKeycode(Display* a0, KeySym a1)
 {
   KeyCode  r;
@@ -767,51 +508,6 @@ int  TSXMapWindow(Display* a0, Window a1)
   return r;
 }
 
-int  TSXNextEvent(Display* a0, XEvent* a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XNextEvent(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXParseGeometry(const  char* a0, int* a1, int* a2, unsigned int* a3, unsigned int* a4)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XParseGeometry(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXPending(Display* a0)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XPending(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXPutBackEvent(Display* a0, XEvent* a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XPutBackEvent(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXPutImage(Display* a0, Drawable a1, GC a2, XImage* a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXQueryColor(Display* a0, Colormap a1, XColor* a2)
 {
   int  r;
@@ -830,15 +526,6 @@ int  TSXQueryColors(Display* a0, Colormap a1, XColor* a2, int a3)
   return r;
 }
 
-int  TSXQueryKeymap(Display* a0, char* a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XQueryKeymap(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int   TSXQueryPointer(Display* a0, Window a1, Window* a2, Window* a3, int* a4, int* a5, int* a6, int* a7, unsigned int* a8)
 {
   int   r;
@@ -866,24 +553,6 @@ int  TSXRefreshKeyboardMapping(XMappingEvent* a0)
   return r;
 }
 
-int  TSXResetScreenSaver(Display* a0)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XResetScreenSaver(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXRestackWindows(Display* a0, Window* a1, int a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XRestackWindows(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int   TSXSendEvent(Display* a0, Window a1, int a2, long a3, XEvent* a4)
 {
   int   r;
@@ -902,33 +571,6 @@ int  TSXSetArcMode(Display* a0, GC a1, int a2)
   return r;
 }
 
-int  TSXSetBackground(Display* a0, GC a1, unsigned long a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetBackground(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSetClipMask(Display* a0, GC a1, Pixmap a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetClipMask(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSetClipOrigin(Display* a0, GC a1, int a2, int a3)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetClipOrigin(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXSetClipRectangles(Display* a0, GC a1, int a2, int a3, XRectangle* a4, int a5, int a6)
 {
   int  r;
@@ -947,24 +589,6 @@ int  TSXSetDashes(Display* a0, GC a1, int a2, const  char* a3, int a4)
   return r;
 }
 
-int  TSXSetFillStyle(Display* a0, GC a1, int a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetFillStyle(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSetFont(Display* a0, GC a1, Font a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetFont(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXSetForeground(Display* a0, GC a1, unsigned long a2)
 {
   int  r;
@@ -992,24 +616,6 @@ int  TSXSetGraphicsExposures(Display* a0, GC a1, int a2)
   return r;
 }
 
-int  TSXSetIconName(Display* a0, Window a1, const  char* a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetIconName(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSetInputFocus(Display* a0, Window a1, int a2, Time a3)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetInputFocus(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXSetLineAttributes(Display* a0, GC a1, unsigned int a2, int a3, int a4, int a5)
 {
   int  r;
@@ -1046,15 +652,6 @@ int  TSXSetSubwindowMode(Display* a0, GC a1, int a2)
   return r;
 }
 
-int  TSXSetWindowColormap(Display* a0, Window a1, Colormap a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetWindowColormap(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXStoreColor(Display* a0, Colormap a1, XColor* a2)
 {
   int  r;
@@ -1064,15 +661,6 @@ int  TSXStoreColor(Display* a0, Colormap a1, XColor* a2)
   return r;
 }
 
-int  TSXStoreName(Display* a0, Window a1, const  char* a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XStoreName(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXSync(Display* a0, int a1)
 {
   int  r;
@@ -1100,15 +688,6 @@ int  TSXTextWidth16(XFontStruct* a0, const  XChar2b* a1, int a2)
   return r;
 }
 
-int  TSXUngrabKeyboard(Display* a0, Time a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XUngrabKeyboard(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXUngrabPointer(Display* a0, Time a1)
 {
   int  r;
@@ -1163,14 +742,5 @@ XIM  TSXOpenIM(Display* a0, struct _XrmHashBucketRec* a1, char* a2, char* a3)
   return r;
 }
 
-int (*TSXSynchronize(Display *a0, Bool a1))(Display *)
-{
-  int (*r)(Display *);
-  wine_tsx11_lock();
-  r = XSynchronize(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 #endif /* defined(HAVE_X11_XLIB_H) */
 
diff --git a/tsx11/ts_xresource.c b/tsx11/ts_xresource.c
deleted file mode 100644
index 8848ffad551..00000000000
--- a/tsx11/ts_xresource.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Thread safe wrappers around Xresource calls.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#include "config.h"
-
-#ifdef HAVE_X11_XLIB_H
-
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-
-#include "ts_xresource.h"
-
-
-XrmQuark  TSXrmUniqueQuark(void)
-{
-  XrmQuark  r;
-  wine_tsx11_lock();
-  r = XrmUniqueQuark();
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXrmGetResource(XrmDatabase a0, const  char* a1, const  char* a2, char** a3, XrmValue* a4)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XrmGetResource(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XrmDatabase  TSXrmGetFileDatabase(const  char* a0)
-{
-  XrmDatabase  r;
-  wine_tsx11_lock();
-  r = XrmGetFileDatabase(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XrmDatabase  TSXrmGetStringDatabase(const  char* a0)
-{
-  XrmDatabase  r;
-  wine_tsx11_lock();
-  r = XrmGetStringDatabase(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-void  TSXrmMergeDatabases(XrmDatabase a0, XrmDatabase* a1)
-{
-  wine_tsx11_lock();
-  XrmMergeDatabases(a0, a1);
-  wine_tsx11_unlock();
-}
-
-void  TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const  char* a3, int* a4, char** a5)
-{
-  wine_tsx11_lock();
-  XrmParseCommand(a0, a1, a2, a3, a4, a5);
-  wine_tsx11_unlock();
-}
-
-#endif /* defined(HAVE_X11_XLIB_H) */
-
diff --git a/tsx11/ts_xshm.c b/tsx11/ts_xshm.c
deleted file mode 100644
index 4baeed6c55e..00000000000
--- a/tsx11/ts_xshm.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Thread safe wrappers around XShm calls.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#include "config.h"
-
-#ifdef HAVE_LIBXXSHM
-
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
-
-#include "ts_xshm.h"
-
-
-Bool TSXShmQueryExtension(Display *a0)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XShmQueryExtension(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Bool TSXShmQueryVersion(Display *a0, int *a1, int *a2, Bool *a3)
-{
-  Bool r;
-  wine_tsx11_lock();
-  r = XShmQueryVersion(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXShmPixmapFormat(Display *a0)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XShmPixmapFormat(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXShmAttach(Display *a0, XShmSegmentInfo *a1)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XShmAttach(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXShmDetach(Display *a0, XShmSegmentInfo *a1)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XShmDetach(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXShmPutImage(Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XShmPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Status TSXShmGetImage(Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5)
-{
-  Status r;
-  wine_tsx11_lock();
-  r = XShmGetImage(a0, a1, a2, a3, a4, a5);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XImage * TSXShmCreateImage(Display *a0, Visual *a1, unsigned int a2, int a3, char *a4, XShmSegmentInfo *a5, unsigned int a6, unsigned int a7)
-{
-  XImage * r;
-  wine_tsx11_lock();
-  r = XShmCreateImage(a0, a1, a2, a3, a4, a5, a6, a7);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a3, unsigned int a4, unsigned int a5, unsigned int a6)
-{
-  Pixmap r;
-  wine_tsx11_lock();
-  r = XShmCreatePixmap(a0, a1, a2, a3, a4, a5, a6);
-  wine_tsx11_unlock();
-  return r;
-}
-
-#endif /* defined(HAVE_LIBXXSHM) */
-
diff --git a/tsx11/ts_xutil.c b/tsx11/ts_xutil.c
index cf663d4208f..b8b00cf1e48 100644
--- a/tsx11/ts_xutil.c
+++ b/tsx11/ts_xutil.c
@@ -15,24 +15,6 @@
 #include "ts_xutil.h"
 
 
-XClassHint * TSXAllocClassHint(void)
-{
-  XClassHint * r;
-  wine_tsx11_lock();
-  r = XAllocClassHint();
-  wine_tsx11_unlock();
-  return r;
-}
-
-XSizeHints * TSXAllocSizeHints(void)
-{
-  XSizeHints * r;
-  wine_tsx11_lock();
-  r = XAllocSizeHints();
-  wine_tsx11_unlock();
-  return r;
-}
-
 XWMHints * TSXAllocWMHints(void)
 {
   XWMHints * r;
@@ -42,51 +24,6 @@ XWMHints * TSXAllocWMHints(void)
   return r;
 }
 
-int  TSXClipBox(Region a0, XRectangle* a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XClipBox(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Region  TSXCreateRegion(void)
-{
-  Region  r;
-  wine_tsx11_lock();
-  r = XCreateRegion();
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXDestroyRegion(Region a0)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XDestroyRegion(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXEmptyRegion(Region a0)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XEmptyRegion(a0);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXEqualRegion(Region a0, Region a1)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XEqualRegion(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXFindContext(Display* a0, XID a1, XContext a2, XPointer* a3)
 {
   int  r;
@@ -96,15 +33,6 @@ int  TSXFindContext(Display* a0, XID a1, XContext a2, XPointer* a3)
   return r;
 }
 
-XVisualInfo * TSXGetVisualInfo(Display* a0, long a1, XVisualInfo* a2, int* a3)
-{
-  XVisualInfo * r;
-  wine_tsx11_lock();
-  r = XGetVisualInfo(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
 XWMHints * TSXGetWMHints(Display* a0, Window a1)
 {
   XWMHints * r;
@@ -114,24 +42,6 @@ XWMHints * TSXGetWMHints(Display* a0, Window a1)
   return r;
 }
 
-int   TSXGetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, long* a3, Atom a4)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XGetWMSizeHints(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXIntersectRegion(Region a0, Region a1, Region a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XIntersectRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXLookupString(XKeyEvent* a0, char* a1, int a2, KeySym* a3, XComposeStatus* a4)
 {
   int  r;
@@ -141,60 +51,6 @@ int  TSXLookupString(XKeyEvent* a0, char* a1, int a2, KeySym* a3, XComposeStatus
   return r;
 }
 
-int  TSXOffsetRegion(Region a0, int a1, int a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XOffsetRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXPointInRegion(Region a0, int a1, int a2)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XPointInRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-Region  TSXPolygonRegion(XPoint* a0, int a1, int a2)
-{
-  Region  r;
-  wine_tsx11_lock();
-  r = XPolygonRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXRectInRegion(Region a0, int a1, int a2, unsigned int a3, unsigned int a4)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XRectInRegion(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSaveContext(Display* a0, XID a1, XContext a2, const  char* a3)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSaveContext(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSetClassHint(Display* a0, Window a1, XClassHint* a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetClassHint(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int  TSXSetWMHints(Display* a0, Window a1, XWMHints* a2)
 {
   int  r;
@@ -204,83 +60,6 @@ int  TSXSetWMHints(Display* a0, Window a1, XWMHints* a2)
   return r;
 }
 
-void  TSXSetWMProperties(Display* a0, Window a1, XTextProperty* a2, XTextProperty* a3, char** a4, int a5, XSizeHints* a6, XWMHints* a7, XClassHint* a8)
-{
-  wine_tsx11_lock();
-  XSetWMProperties(a0, a1, a2, a3, a4, a5, a6, a7, a8);
-  wine_tsx11_unlock();
-}
-
-void  TSXSetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, Atom a3)
-{
-  wine_tsx11_lock();
-  XSetWMSizeHints(a0, a1, a2, a3);
-  wine_tsx11_unlock();
-}
-
-int  TSXSetRegion(Display* a0, GC a1, Region a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSetRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXShrinkRegion(Region a0, int a1, int a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XShrinkRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int   TSXStringListToTextProperty(char** a0, int a1, XTextProperty* a2)
-{
-  int   r;
-  wine_tsx11_lock();
-  r = XStringListToTextProperty(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXSubtractRegion(Region a0, Region a1, Region a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XSubtractRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXUnionRectWithRegion(XRectangle* a0, Region a1, Region a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XUnionRectWithRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXUnionRegion(Region a0, Region a1, Region a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XUnionRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int  TSXXorRegion(Region a0, Region a1, Region a2)
-{
-  int  r;
-  wine_tsx11_lock();
-  r = XXorRegion(a0, a1, a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 int TSXDestroyImage(struct _XImage *a0)
 {
   int r;
@@ -290,41 +69,5 @@ int TSXDestroyImage(struct _XImage *a0)
   return r;
 }
 
-struct _XImage * TSXSubImage(struct _XImage *a0, int a1, int a2, unsigned int a3, unsigned int a4)
-{
-  struct _XImage * r;
-  wine_tsx11_lock();
-  r = XSubImage(a0, a1, a2, a3, a4);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXAddPixel(struct _XImage *a0, long a1)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XAddPixel(a0, a1);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XContext TSXUniqueContext(void)
-{
-  XContext r;
-  wine_tsx11_lock();
-  r = XUniqueContext();
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXDeleteContext(Display*a0,XID a1,XContext a2)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XDeleteContext(a0,a1,a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
 #endif /* defined(HAVE_X11_XLIB_H) */
 
diff --git a/tsx11/ts_xvideo.c b/tsx11/ts_xvideo.c
deleted file mode 100644
index cfa88d45096..00000000000
--- a/tsx11/ts_xvideo.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Thread safe wrappers around xvideo calls.
- * This file was generated automatically by tools/make_X11wrappers
- * DO NOT EDIT!
- */
-
-#include "config.h"
-
-#ifdef HAVE_XVIDEO
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/Xvlib.h>
-
-#include "ts_xvideo.h"
-
-
-int TSXvQueryExtension(Display* a0, unsigned int* a1, unsigned int* a2, unsigned int* a3, unsigned int* a4, unsigned int* a5)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvQueryExtension( a0,  a1,  a2,  a3,  a4,  a5);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvQueryAdaptors(Display* a0, Window a1, unsigned int* a2, XvAdaptorInfo** a3)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvQueryAdaptors( a0,  a1,  a2,  a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvQueryEncodings(Display* a0, XvPortID a1, unsigned int* a2, XvEncodingInfo** a3)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvQueryEncodings( a0,  a1,  a2,  a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvPutVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvPutVideo( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10,  a11);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvPutStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvPutStill( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10,  a11);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvGetVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvGetVideo( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10,  a11);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvGetStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvGetStill( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10,  a11);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvStopVideo(Display* a0, XvPortID a1, Drawable a2)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvStopVideo( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvGrabPort(Display* a0, XvPortID a1, Time a2)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvGrabPort( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvUngrabPort(Display* a0, XvPortID a1, Time a2)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvUngrabPort( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvSelectVideoNotify(Display* a0, Drawable a1, Bool a2)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvSelectVideoNotify( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvSelectPortNotify(Display* a0, XvPortID a1, Bool a2)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvSelectPortNotify( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvSetPortAttribute(Display* a0, XvPortID a1, Atom a2, int a3)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvSetPortAttribute( a0,  a1,  a2,  a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvGetPortAttribute(Display* a0, XvPortID a1, Atom a2, int* a3)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvGetPortAttribute( a0,  a1,  a2,  a3);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvQueryBestSize(Display* a0, XvPortID a1, Bool a2, unsigned int a3, unsigned int a4, unsigned int a5, unsigned int a6, unsigned int* a7, unsigned int* a8)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvQueryBestSize( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XvAttribute* TSXvQueryPortAttributes(Display* a0, XvPortID a1, int* a2)
-{
-  XvAttribute* r;
-  wine_tsx11_lock();
-  r = XvQueryPortAttributes( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-void TSXvFreeAdaptorInfo(XvAdaptorInfo* a0)
-{
-  wine_tsx11_lock();
-  XvFreeAdaptorInfo( a0);
-  wine_tsx11_unlock();
-}
-
-void TSXvFreeEncodingInfo(XvEncodingInfo* a0)
-{
-  wine_tsx11_lock();
-  XvFreeEncodingInfo( a0);
-  wine_tsx11_unlock();
-}
-
-XvImageFormatValues * TSXvListImageFormats(Display* a0, XvPortID a1, int* a2)
-{
-  XvImageFormatValues * r;
-  wine_tsx11_lock();
-  r = XvListImageFormats( a0,  a1,  a2);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XvImage * TSXvCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5)
-{
-  XvImage * r;
-  wine_tsx11_lock();
-  r = XvCreateImage( a0,  a1,  a2,  a3,  a4,  a5);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvPutImage( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10,  a11,  a12);
-  wine_tsx11_unlock();
-  return r;
-}
-
-int TSXvShmPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12, Bool a13)
-{
-  int r;
-  wine_tsx11_lock();
-  r = XvShmPutImage( a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10,  a11,  a12,  a13);
-  wine_tsx11_unlock();
-  return r;
-}
-
-XvImage * TSXvShmCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5, XShmSegmentInfo* a6)
-{
-  XvImage * r;
-  wine_tsx11_lock();
-  r = XvShmCreateImage( a0,  a1,  a2,  a3,  a4,  a5,  a6);
-  wine_tsx11_unlock();
-  return r;
-}
-
-#endif /* defined(HAVE_XVIDEO) */
-
-- 
GitLab