diff --git a/ThunkLibs/libXext/libXext_Guest.cpp b/ThunkLibs/libXext/libXext_Guest.cpp
deleted file mode 100644
index 32734f091..000000000
--- a/ThunkLibs/libXext/libXext_Guest.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-$info$
-tags: thunklibs|X11
-$end_info$
-*/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/Xext.h>
-extern "C" {
-#include <X11/extensions/extutil.h>
-}
-#include <X11/extensions/dpms.h>
-#include <X11/extensions/agproto.h>
-#include <X11/extensions/ag.h>
-#include <X11/extensions/cup.h>
-#include <X11/extensions/dbe.h>
-#include <X11/extensions/dbeproto.h>
-#include <X11/extensions/XEVI.h>
-#include <X11/extensions/Xge.h>
-#include <X11/extensions/XLbx.h>
-#include <X11/extensions/multibuf.h>
-#include <X11/extensions/MITMisc.h>
-#include <X11/extensions/mitmiscconst.h>
-#include <X11/extensions/mitmiscproto.h>
-#include <X11/extensions/security.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/shapeconst.h>
-#include <X11/extensions/shapeproto.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncconst.h>
-#include <X11/extensions/syncproto.h>
-// #include <X11/extensions/XTest.h>
-#undef min
-#undef max
-
-
-#include "common/Guest.h"
-
-#include "thunkgen_guest_libXext.inl"
-
-LOAD_LIB(libXext)
diff --git a/ThunkLibs/libXext/libXext_Host.cpp b/ThunkLibs/libXext/libXext_Host.cpp
deleted file mode 100644
index 7274d0545..000000000
--- a/ThunkLibs/libXext/libXext_Host.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-$info$
-tags: thunklibs|X11
-$end_info$
-*/
-
-#include <stdio.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xregion.h>
-#include <X11/Xutil.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/Xext.h>
-
-extern "C" {
-#include <X11/extensions/extutil.h>
-}
-#include <X11/extensions/dpms.h>
-#include <X11/extensions/agproto.h>
-#include <X11/extensions/ag.h>
-#include <X11/extensions/cup.h>
-#include <X11/extensions/dbe.h>
-#include <X11/extensions/dbeproto.h>
-#include <X11/extensions/XEVI.h>
-#include <X11/extensions/Xge.h>
-#include <X11/extensions/XLbx.h>
-#include <X11/extensions/multibuf.h>
-#include <X11/extensions/MITMisc.h>
-#include <X11/extensions/mitmiscconst.h>
-#include <X11/extensions/mitmiscproto.h>
-#include <X11/extensions/security.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/shapeconst.h>
-#include <X11/extensions/shapeproto.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncconst.h>
-#include <X11/extensions/syncproto.h>
-// #include <X11/extensions/XTest.h>
-
-#define XTRANS_SEND_FDS 1
-#include <X11/Xtrans/Xtransint.h>
-
-#undef min
-#undef max
-
-#include "common/Host.h"
-#include <dlfcn.h>
-
-#include "thunkgen_host_libXext.inl"
-
-EXPORTS(libXext)
diff --git a/ThunkLibs/libXext/libXext_interface.cpp b/ThunkLibs/libXext/libXext_interface.cpp
deleted file mode 100644
index 802e71d2d..000000000
--- a/ThunkLibs/libXext/libXext_interface.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-#include <common/GeneratorInterface.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xregion.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/dpms.h>
-#include <X11/extensions/XEVI.h>
-#include <X11/extensions/Xge.h>
-#include <X11/extensions/XLbx.h>
-#include <X11/extensions/multibuf.h>
-#include <X11/extensions/MITMisc.h>
-#include <X11/extensions/security.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/sync.h>
-extern "C" {
-#include <X11/extensions/extutil.h>
-}
-#include <X11/Xtrans/Xtransint.h>
-
-template<auto>
-struct fex_gen_config {
-  unsigned version = 6;
-};
-
-template<typename>
-struct fex_gen_type {};
-
-template<>
-struct fex_gen_type<_X11XCBPrivate> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XContextDB> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XDisplayAtoms> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XIMFilter> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XkbInfoRec> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XKeytrans> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XLockInfo> : fexgen::opaque_type {};
-template<>
-struct fex_gen_type<_XrmHashBucketRec> : fexgen::opaque_type {};
-
-#ifndef IS_32BIT_THUNK
-// Union types
-template<>
-struct fex_gen_type<XEvent> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<xEvent> : fexgen::assume_compatible_data_layout {};
-
-// Linked-list types
-template<>
-struct fex_gen_type<_XtransConnFd> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<_XQEvent> : fexgen::assume_compatible_data_layout {};
-
-// TODO: These are largely compatible, *but* contain function pointer members that need adjustment!
-template<>
-struct fex_gen_type<_XConnectionInfo> : fexgen::assume_compatible_data_layout {}; // Also contains linked-list pointers
-template<>
-struct fex_gen_type<_XConnWatchInfo> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<_XDisplay> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<XExtData> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<XExtDisplayInfo> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<_XExtension> : fexgen::assume_compatible_data_layout {}; // Also contains linked-list pointers
-template<>
-struct fex_gen_type<_XInternalAsync> : fexgen::assume_compatible_data_layout {}; // Also contains linked-list pointers
-
-// Contains nontrivial circular pointer relationships
-template<>
-struct fex_gen_type<Screen> : fexgen::assume_compatible_data_layout {};
-
-// TODO: This contains a nested struct type of function pointer members
-template<>
-struct fex_gen_type<XImage> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<XExtensionHooks> : fexgen::assume_compatible_data_layout {};
-#endif
-
-template<>
-struct fex_gen_config<DPMSCapable> {};
-template<>
-struct fex_gen_config<DPMSDisable> {};
-template<>
-struct fex_gen_config<DPMSEnable> {};
-template<>
-struct fex_gen_config<DPMSForceLevel> {};
-template<>
-struct fex_gen_config<DPMSGetTimeouts> {};
-template<>
-struct fex_gen_config<DPMSGetVersion> {};
-template<>
-struct fex_gen_config<DPMSInfo> {};
-template<>
-struct fex_gen_config<DPMSQueryExtension> {};
-template<>
-struct fex_gen_config<DPMSSetTimeouts> {};
-template<>
-struct fex_gen_config<XeviGetVisualInfo> {};
-template<>
-struct fex_gen_config<XeviQueryExtension> {};
-template<>
-struct fex_gen_config<XeviQueryVersion> {};
-template<>
-struct fex_gen_config<XGEQueryExtension> {};
-template<>
-struct fex_gen_config<XGEQueryVersion> {};
-template<>
-struct fex_gen_config<XLbxGetEventBase> {};
-template<>
-struct fex_gen_config<XLbxQueryExtension> {};
-template<>
-struct fex_gen_config<XLbxQueryVersion> {};
-template<>
-struct fex_gen_config<XmbufCreateBuffers> {};
-template<>
-struct fex_gen_config<XmbufGetBufferAttributes> {};
-template<>
-struct fex_gen_config<XmbufGetScreenInfo> {};
-template<>
-struct fex_gen_config<XmbufGetVersion> {};
-template<>
-struct fex_gen_config<XmbufGetWindowAttributes> {};
-template<>
-struct fex_gen_config<XmbufQueryExtension> {};
-template<>
-struct fex_gen_config<XMissingExtension> {};
-template<>
-struct fex_gen_config<XMITMiscGetBugMode> {};
-template<>
-struct fex_gen_config<XMITMiscQueryExtension> {};
-template<>
-struct fex_gen_config<XMITMiscSetBugMode> {};
-template<>
-struct fex_gen_config<XSecurityQueryExtension> {};
-template<>
-struct fex_gen_config<XSecurityRevokeAuthorization> {};
-template<>
-struct fex_gen_config<XShapeQueryExtension> {};
-template<>
-struct fex_gen_config<XShapeQueryExtents> {};
-template<>
-struct fex_gen_config<XShapeQueryVersion> {};
-template<>
-struct fex_gen_config<XShmAttach> {};
-template<>
-struct fex_gen_config<XShmDetach> {};
-template<>
-struct fex_gen_config<XShmGetEventBase> {};
-template<>
-struct fex_gen_config<XShmGetImage> {};
-template<>
-struct fex_gen_config<XShmPixmapFormat> {};
-template<>
-struct fex_gen_config<XShmPutImage> {};
-template<>
-struct fex_gen_config<XShmQueryExtension> {};
-template<>
-struct fex_gen_config<XShmQueryVersion> {};
-template<>
-struct fex_gen_config<XSyncAwait> {};
-template<>
-struct fex_gen_config<XSyncAwaitFence> {};
-template<>
-struct fex_gen_config<XSyncChangeAlarm> {};
-template<>
-struct fex_gen_config<XSyncChangeCounter> {};
-template<>
-struct fex_gen_config<XSyncDestroyAlarm> {};
-template<>
-struct fex_gen_config<XSyncDestroyCounter> {};
-template<>
-struct fex_gen_config<XSyncDestroyFence> {};
-template<>
-struct fex_gen_config<XSyncGetPriority> {};
-template<>
-struct fex_gen_config<XSyncInitialize> {};
-template<>
-struct fex_gen_config<XSyncQueryAlarm> {};
-template<>
-struct fex_gen_config<XSyncQueryCounter> {};
-template<>
-struct fex_gen_config<XSyncQueryExtension> {};
-template<>
-struct fex_gen_config<XSyncQueryFence> {};
-template<>
-struct fex_gen_config<XSyncResetFence> {};
-template<>
-struct fex_gen_config<XSyncSetCounter> {};
-template<>
-struct fex_gen_config<XSyncSetPriority> {};
-template<>
-struct fex_gen_config<XSyncTriggerFence> {};
-template<>
-struct fex_gen_config<XSyncValueEqual> {};
-template<>
-struct fex_gen_config<XSyncValueGreaterOrEqual> {};
-template<>
-struct fex_gen_config<XSyncValueGreaterThan> {};
-template<>
-struct fex_gen_config<XSyncValueHigh32> {};
-template<>
-struct fex_gen_config<XSyncValueIsNegative> {};
-template<>
-struct fex_gen_config<XSyncValueIsPositive> {};
-template<>
-struct fex_gen_config<XSyncValueIsZero> {};
-template<>
-struct fex_gen_config<XSyncValueLessOrEqual> {};
-template<>
-struct fex_gen_config<XSyncValueLessThan> {};
-template<>
-struct fex_gen_config<XShapeInputSelected> {};
-template<>
-struct fex_gen_config<XShmCreatePixmap> {};
-template<>
-struct fex_gen_config<XSyncValueLow32> {};
-template<>
-struct fex_gen_config<XmbufChangeBufferAttributes> {};
-template<>
-struct fex_gen_config<XmbufChangeWindowAttributes> {};
-template<>
-struct fex_gen_config<XmbufClearBufferArea> {};
-template<>
-struct fex_gen_config<XmbufDestroyBuffers> {};
-template<>
-struct fex_gen_config<XmbufDisplayBuffers> {};
-template<>
-struct fex_gen_config<XSecurityFreeXauth> {};
-template<>
-struct fex_gen_config<XShapeCombineMask> {};
-template<>
-struct fex_gen_config<XShapeCombineRectangles> {};
-template<>
-struct fex_gen_config<XShapeCombineRegion> {};
-template<>
-struct fex_gen_config<XShapeCombineShape> {};
-template<>
-struct fex_gen_config<XShapeOffsetShape> {};
-template<>
-struct fex_gen_config<XShapeSelectInput> {};
-template<>
-struct fex_gen_config<XSyncFreeSystemCounterList> {};
-template<>
-struct fex_gen_config<XSyncIntsToValue> {};
-template<>
-struct fex_gen_config<XSyncIntToValue> {};
-template<>
-struct fex_gen_config<XSyncMaxValue> {};
-template<>
-struct fex_gen_config<XSyncMinValue> {};
-template<>
-struct fex_gen_config<XSyncValueAdd> {};
-template<>
-struct fex_gen_config<XSyncValueSubtract> {};
-template<>
-struct fex_gen_config<XmbufCreateStereoWindow> {};
-template<>
-struct fex_gen_config<XSecurityAllocXauth> {};
-template<>
-struct fex_gen_config<XSecurityGenerateAuthorization> {};
-template<>
-struct fex_gen_config<XShmCreateImage> {};
-template<>
-struct fex_gen_config<XShapeGetRectangles> {};
-template<>
-struct fex_gen_config<XSyncCreateAlarm> {};
-template<>
-struct fex_gen_config<XSyncCreateCounter> {};
-template<>
-struct fex_gen_config<XSyncCreateFence> {};
-template<>
-struct fex_gen_config<XSyncListSystemCounters> {};
-template<>
-struct fex_gen_config<XextCreateExtension> {};
-template<>
-struct fex_gen_config<XextDestroyExtension> {};
-template<>
-struct fex_gen_config<XextAddDisplay> {};
-template<>
-struct fex_gen_config<XextRemoveDisplay> {};
-template<>
-struct fex_gen_config<XextFindDisplay> {};
-template<>
-struct fex_gen_config<_XGetRequest> {};
-template<>
-struct fex_gen_config<_XFlushGCCache> {};
-#if __SIZEOF_POINTER__ == 8
-template<>
-struct fex_gen_config<_XData32> {};
-template<>
-struct fex_gen_config<_XRead32> {};
-#endif
-template<>
-struct fex_gen_config<_XDeqAsyncHandler> {};
-template<>
-struct fex_gen_config<_XError> {};
-template<>
-struct fex_gen_config<_XIOError> {};
-template<>
-struct fex_gen_config<_XAllocScratch> {};
-template<>
-struct fex_gen_config<_XAllocTemp> {};
-template<>
-struct fex_gen_config<_XFreeTemp> {};
-template<>
-struct fex_gen_config<_XVIDtoVisual> {};
-template<>
-struct fex_gen_config<_XSetLastRequestRead> {};
-template<>
-struct fex_gen_config<_XGetHostname> {};
-template<>
-struct fex_gen_config<_XScreenOfWindow> {};
-template<>
-struct fex_gen_config<_XAsyncErrorHandler> {};
-template<>
-struct fex_gen_config<_XGetAsyncReply> {};
-template<>
-struct fex_gen_config<_XGetAsyncData> {};
-template<>
-struct fex_gen_config<_XFlush> {};
-template<>
-struct fex_gen_config<_XEventsQueued> {};
-template<>
-struct fex_gen_config<_XReadEvents> {};
-template<>
-struct fex_gen_config<_XRead> {};
-template<>
-struct fex_gen_config<_XReadPad> {};
-template<>
-struct fex_gen_config<_XSend> {};
-template<>
-struct fex_gen_config<_XReply> {};
-template<>
-struct fex_gen_config<_XEnq> {};
-template<>
-struct fex_gen_config<_XDeq> {};
-template<>
-struct fex_gen_config<_XUnknownWireEvent> {};
-template<>
-struct fex_gen_config<_XUnknownWireEventCookie> {};
-template<>
-struct fex_gen_config<_XUnknownCopyEventCookie> {};
-template<>
-struct fex_gen_config<_XUnknownNativeEvent> {};
-template<>
-struct fex_gen_config<_XWireToEvent> {};
-template<>
-struct fex_gen_config<_XDefaultWireError> {};
-template<>
-struct fex_gen_config<_XPollfdCacheInit> {};
-template<>
-struct fex_gen_config<_XPollfdCacheAdd> {};
-template<>
-struct fex_gen_config<_XPollfdCacheDel> {};
-template<>
-struct fex_gen_config<_XAllocID> {};
-template<>
-struct fex_gen_config<_XAllocIDs> {};
-template<>
-struct fex_gen_config<_XFreeExtData> {};
-template<>
-struct fex_gen_config<_XRegisterInternalConnection> {};
-template<>
-struct fex_gen_config<_XUnregisterInternalConnection> {};
-template<>
-struct fex_gen_config<_XProcessInternalConnection> {};
-template<>
-struct fex_gen_config<_XTextHeight> {};
-template<>
-struct fex_gen_config<_XTextHeight16> {};
-template<>
-struct fex_gen_config<_XEventToWire> {};
-template<>
-struct fex_gen_config<_XF86LoadQueryLocaleFont> {};
-template<>
-struct fex_gen_config<_XProcessWindowAttributes> {};
-template<>
-struct fex_gen_config<_XDefaultError> {};
-template<>
-struct fex_gen_config<_XDefaultIOError> {};
-
-#if !(X11_VERSION_MAJOR >= 1 && X11_VERSION_MINOR >= 7 && X11_VERSION_PATCH >= 0)
-// Doesn't exist on older X11
-extern void _XDefaultIOErrorExit(Display* dpy, void* user_data);
-#endif
-
-template<>
-struct fex_gen_config<_XDefaultIOErrorExit> {};
-
-template<>
-struct fex_gen_config<_XSetClipRectangles> {};
-template<>
-struct fex_gen_config<_XGetWindowAttributes> {};
-template<>
-struct fex_gen_config<_XPutBackEvent> {};
-template<>
-struct fex_gen_config<_XIsEventCookie> {};
-template<>
-struct fex_gen_config<_XFreeEventCookies> {};
-template<>
-struct fex_gen_config<_XStoreEventCookie> {};
-template<>
-struct fex_gen_config<_XFetchEventCookie> {};
-template<>
-struct fex_gen_config<_XCopyEventCookie> {};
-template<>
-struct fex_gen_config<xlocaledir> {};
diff --git a/ThunkLibs/libXfixes/libXfixes_Guest.cpp b/ThunkLibs/libXfixes/libXfixes_Guest.cpp
deleted file mode 100644
index 7d282e1d4..000000000
--- a/ThunkLibs/libXfixes/libXfixes_Guest.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-$info$
-tags: thunklibs|X11
-$end_info$
-*/
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xfixes.h>
-
-#include "common/Guest.h"
-
-#include "thunkgen_guest_libXfixes.inl"
-
-LOAD_LIB(libXfixes)
diff --git a/ThunkLibs/libXfixes/libXfixes_Host.cpp b/ThunkLibs/libXfixes/libXfixes_Host.cpp
deleted file mode 100644
index 0712fb90a..000000000
--- a/ThunkLibs/libXfixes/libXfixes_Host.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-$info$
-tags: thunklibs|X11
-$end_info$
-*/
-
-#include <stdio.h>
-
-extern "C" {
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xfixes.h>
-}
-#undef min
-#undef max
-
-#include "common/Host.h"
-#include <dlfcn.h>
-
-#include "thunkgen_host_libXfixes.inl"
-
-EXPORTS(libXfixes)
diff --git a/ThunkLibs/libXfixes/libXfixes_interface.cpp b/ThunkLibs/libXfixes/libXfixes_interface.cpp
deleted file mode 100644
index 346addf8a..000000000
--- a/ThunkLibs/libXfixes/libXfixes_interface.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <common/GeneratorInterface.h>
-
-extern "C" {
-#include <X11/extensions/Xfixes.h>
-#include <X11/Xlibint.h>
-}
-
-template<auto>
-struct fex_gen_config {
-  unsigned version = 3;
-};
-
-template<typename>
-struct fex_gen_type {};
-
-#ifndef IS_32BIT_THUNK
-// TODO: These are largely compatible, *but* contain function pointer members that need adjustment!
-template<>
-struct fex_gen_type<XExtData> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<_XDisplay> : fexgen::assume_compatible_data_layout {};
-#endif
-
-template<>
-struct fex_gen_config<XFixesGetCursorName> {};
-template<>
-struct fex_gen_config<XFixesQueryExtension> {};
-template<>
-struct fex_gen_config<XFixesQueryVersion> {};
-template<>
-struct fex_gen_config<XFixesVersion> {};
-template<>
-struct fex_gen_config<XFixesCreatePointerBarrier> {};
-template<>
-struct fex_gen_config<XFixesChangeCursorByName> {};
-template<>
-struct fex_gen_config<XFixesChangeCursor> {};
-template<>
-struct fex_gen_config<XFixesChangeSaveSet> {};
-template<>
-struct fex_gen_config<XFixesCopyRegion> {};
-template<>
-struct fex_gen_config<XFixesDestroyPointerBarrier> {};
-template<>
-struct fex_gen_config<XFixesDestroyRegion> {};
-template<>
-struct fex_gen_config<XFixesExpandRegion> {};
-template<>
-struct fex_gen_config<XFixesHideCursor> {};
-template<>
-struct fex_gen_config<XFixesIntersectRegion> {};
-template<>
-struct fex_gen_config<XFixesInvertRegion> {};
-template<>
-struct fex_gen_config<XFixesRegionExtents> {};
-template<>
-struct fex_gen_config<XFixesSelectCursorInput> {};
-template<>
-struct fex_gen_config<XFixesSelectSelectionInput> {};
-template<>
-struct fex_gen_config<XFixesSetCursorName> {};
-template<>
-struct fex_gen_config<XFixesSetGCClipRegion> {};
-template<>
-struct fex_gen_config<XFixesSetPictureClipRegion> {};
-template<>
-struct fex_gen_config<XFixesSetRegion> {};
-template<>
-struct fex_gen_config<XFixesSetWindowShapeRegion> {};
-template<>
-struct fex_gen_config<XFixesShowCursor> {};
-template<>
-struct fex_gen_config<XFixesSubtractRegion> {};
-template<>
-struct fex_gen_config<XFixesTranslateRegion> {};
-template<>
-struct fex_gen_config<XFixesUnionRegion> {};
-template<>
-struct fex_gen_config<XFixesGetCursorImage> {};
-template<>
-struct fex_gen_config<XFixesFetchRegionAndBounds> {};
-template<>
-struct fex_gen_config<XFixesFetchRegion> {};
-template<>
-struct fex_gen_config<XFixesCreateRegion> {};
-template<>
-struct fex_gen_config<XFixesCreateRegionFromBitmap> {};
-template<>
-struct fex_gen_config<XFixesCreateRegionFromGC> {};
-template<>
-struct fex_gen_config<XFixesCreateRegionFromPicture> {};
-template<>
-struct fex_gen_config<XFixesCreateRegionFromWindow> {};
diff --git a/ThunkLibs/libXrender/libXrender_Guest.cpp b/ThunkLibs/libXrender/libXrender_Guest.cpp
deleted file mode 100644
index 581912248..000000000
--- a/ThunkLibs/libXrender/libXrender_Guest.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-$info$
-tags: thunklibs|X11
-$end_info$
-*/
-
-#include <stdio.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrender.h>
-
-#include "common/Guest.h"
-
-#include "thunkgen_guest_libXrender.inl"
-
-LOAD_LIB(libXrender)
diff --git a/ThunkLibs/libXrender/libXrender_Host.cpp b/ThunkLibs/libXrender/libXrender_Host.cpp
deleted file mode 100644
index 04dbb4a77..000000000
--- a/ThunkLibs/libXrender/libXrender_Host.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-$info$
-tags: thunklibs|X11
-$end_info$
-*/
-
-#include <stdio.h>
-
-extern "C" {
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xregion.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrender.h>
-}
-#undef min
-#undef max
-
-#include "common/Host.h"
-#include <dlfcn.h>
-
-#include "thunkgen_host_libXrender.inl"
-
-EXPORTS(libXrender)
diff --git a/ThunkLibs/libXrender/libXrender_interface.cpp b/ThunkLibs/libXrender/libXrender_interface.cpp
deleted file mode 100644
index 7d6ca2dba..000000000
--- a/ThunkLibs/libXrender/libXrender_interface.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <common/GeneratorInterface.h>
-
-#include <X11/extensions/Xrender.h>
-
-#include <type_traits>
-
-template<auto>
-struct fex_gen_config {
-  unsigned version = 1;
-};
-
-template<typename>
-struct fex_gen_type {};
-
-// Struct with multi-dimensional array member. Compatible data layout across all architectures
-template<>
-struct fex_gen_type<_XTransform> : fexgen::assume_compatible_data_layout {};
-
-#ifndef IS_32BIT_THUNK
-// This has a public definition but is used as an opaque type in most APIs
-template<>
-struct fex_gen_type<std::remove_pointer_t<Region>> : fexgen::assume_compatible_data_layout {};
-
-// TODO: These are largely compatible, *but* contain function pointer members that need adjustment!
-template<>
-struct fex_gen_type<XExtData> : fexgen::assume_compatible_data_layout {};
-template<>
-struct fex_gen_type<_XDisplay> : fexgen::assume_compatible_data_layout {};
-#endif
-
-template<>
-struct fex_gen_config<XRenderCreateAnimCursor> {};
-template<>
-struct fex_gen_config<XRenderCreateCursor> {};
-template<>
-struct fex_gen_config<XRenderCreateGlyphSet> {};
-template<>
-struct fex_gen_config<XRenderReferenceGlyphSet> {};
-template<>
-struct fex_gen_config<XRenderParseColor> {};
-template<>
-struct fex_gen_config<XRenderQueryExtension> {};
-template<>
-struct fex_gen_config<XRenderQueryFormats> {};
-template<>
-struct fex_gen_config<XRenderQuerySubpixelOrder> {};
-template<>
-struct fex_gen_config<XRenderQueryVersion> {};
-template<>
-struct fex_gen_config<XRenderSetSubpixelOrder> {};
-template<>
-struct fex_gen_config<XRenderCreateConicalGradient> {};
-template<>
-struct fex_gen_config<XRenderCreateLinearGradient> {};
-template<>
-struct fex_gen_config<XRenderCreatePicture> {};
-template<>
-struct fex_gen_config<XRenderCreateRadialGradient> {};
-template<>
-struct fex_gen_config<XRenderCreateSolidFill> {};
-template<>
-struct fex_gen_config<XRenderAddGlyphs> {};
-template<>
-struct fex_gen_config<XRenderAddTraps> {};
-template<>
-struct fex_gen_config<XRenderChangePicture> {};
-template<>
-struct fex_gen_config<XRenderComposite> {};
-template<>
-struct fex_gen_config<XRenderCompositeDoublePoly> {};
-template<>
-struct fex_gen_config<XRenderCompositeString16> {};
-template<>
-struct fex_gen_config<XRenderCompositeString32> {};
-template<>
-struct fex_gen_config<XRenderCompositeString8> {};
-template<>
-struct fex_gen_config<XRenderCompositeText16> {};
-template<>
-struct fex_gen_config<XRenderCompositeText32> {};
-template<>
-struct fex_gen_config<XRenderCompositeText8> {};
-template<>
-struct fex_gen_config<XRenderCompositeTrapezoids> {};
-template<>
-struct fex_gen_config<XRenderCompositeTriangles> {};
-template<>
-struct fex_gen_config<XRenderCompositeTriFan> {};
-template<>
-struct fex_gen_config<XRenderCompositeTriStrip> {};
-template<>
-struct fex_gen_config<XRenderFillRectangle> {};
-template<>
-struct fex_gen_config<XRenderFillRectangles> {};
-template<>
-struct fex_gen_config<XRenderFreeGlyphs> {};
-template<>
-struct fex_gen_config<XRenderFreeGlyphSet> {};
-template<>
-struct fex_gen_config<XRenderFreePicture> {};
-template<>
-struct fex_gen_config<XRenderSetPictureClipRectangles> {};
-template<>
-struct fex_gen_config<XRenderSetPictureClipRegion> {};
-template<>
-struct fex_gen_config<XRenderSetPictureFilter> {};
-template<>
-struct fex_gen_config<XRenderSetPictureTransform> {};
-template<>
-struct fex_gen_config<XRenderQueryFilters> {};
-template<>
-struct fex_gen_config<XRenderQueryPictIndexValues> {};
-template<>
-struct fex_gen_config<XRenderFindFormat> {};
-template<>
-struct fex_gen_config<XRenderFindStandardFormat> {};
-template<>
-struct fex_gen_config<XRenderFindVisualFormat> {};
diff --git a/docs/SourceOutline.md b/docs/SourceOutline.md
index 9fe91b5bc..1b2d15ef7 100644
--- a/docs/SourceOutline.md
+++ b/docs/SourceOutline.md
@@ -144,14 +144,6 @@ These are generated + glue logic 1:1 thunks unless noted otherwise
 - [Guest.cpp](../ThunkLibs/libvulkan/Guest.cpp)
 - [Host.cpp](../ThunkLibs/libvulkan/Host.cpp)
 
-#### X11
-- [libXext_Guest.cpp](../ThunkLibs/libXext/libXext_Guest.cpp)
-- [libXext_Host.cpp](../ThunkLibs/libXext/libXext_Host.cpp)
-- [libXfixes_Guest.cpp](../ThunkLibs/libXfixes/libXfixes_Guest.cpp)
-- [libXfixes_Host.cpp](../ThunkLibs/libXfixes/libXfixes_Host.cpp)
-- [libXrender_Guest.cpp](../ThunkLibs/libXrender/libXrender_Guest.cpp)
-- [libXrender_Host.cpp](../ThunkLibs/libXrender/libXrender_Host.cpp)
-
 #### asound
 - [libasound_Guest.cpp](../ThunkLibs/libasound/libasound_Guest.cpp)
 - [libasound_Host.cpp](../ThunkLibs/libasound/libasound_Host.cpp)