diff --git a/modules/libx11/1.8.12.bcr.3/MODULE.bazel b/modules/libx11/1.8.12.bcr.3/MODULE.bazel
new file mode 100644
index 00000000000..a52c2aee6e7
--- /dev/null
+++ b/modules/libx11/1.8.12.bcr.3/MODULE.bazel
@@ -0,0 +1,14 @@
+module(
+    name = "libx11",
+    version = "1.8.12.bcr.3",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libxau", version = "1.0.12.bcr.2")
+bazel_dep(name = "libxcb", version = "1.17.0.bcr.2")
+bazel_dep(name = "libxtrans", version = "1.5.2.bcr.2")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.1.4")
+bazel_dep(name = "xorgproto", version = "2024.1.bcr.1")
diff --git a/modules/libx11/1.8.12.bcr.3/overlay/BUILD.bazel b/modules/libx11/1.8.12.bcr.3/overlay/BUILD.bazel
new file mode 100644
index 00000000000..f95d5ef133d
--- /dev/null
+++ b/modules/libx11/1.8.12.bcr.3/overlay/BUILD.bazel
@@ -0,0 +1,157 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
+MODULES_LC = glob(["modules/lc/**/*.c"])
+
+MODULES_OM = glob(["modules/om/**/*.c"])
+
+MODULES_IM = [
+    "modules/im/ximcp/imCallbk.c",
+    "modules/im/ximcp/imDefFlt.c",
+    "modules/im/ximcp/imDefIc.c",
+    "modules/im/ximcp/imDefIm.c",
+    "modules/im/ximcp/imDefLkup.c",
+    "modules/im/ximcp/imDispch.c",
+    "modules/im/ximcp/imEvToWire.c",
+    "modules/im/ximcp/imExten.c",
+    "modules/im/ximcp/imImSw.c",
+    "modules/im/ximcp/imInt.c",
+    "modules/im/ximcp/imInsClbk.c",
+    "modules/im/ximcp/imLcFlt.c",
+    "modules/im/ximcp/imLcGIc.c",
+    "modules/im/ximcp/imLcIc.c",
+    "modules/im/ximcp/imLcIm.c",
+    "modules/im/ximcp/imLcLkup.c",
+    "modules/im/ximcp/imLcPrs.c",
+    "modules/im/ximcp/imLcSIc.c",
+    "modules/im/ximcp/imRm.c",
+    "modules/im/ximcp/imRmAttr.c",
+    "modules/im/ximcp/imThaiFlt.c",
+    "modules/im/ximcp/imThaiIc.c",
+    "modules/im/ximcp/imThaiIm.c",
+    "modules/im/ximcp/imTrans.c",
+    "modules/im/ximcp/imTransR.c",
+    "modules/im/ximcp/imTrX.c",
+]
+
+LIBI18N_SRCS = glob(
+    [
+        "src/xlibi18n/**/*.c",
+        "src/xlibi18n/**/*.h",
+    ],
+    exclude = [
+        "src/xlibi18n/lcUniConv/8bit_tab_to_h.c",
+        "src/xlibi18n/lcUniConv/cjk_tab_to_h.c",
+    ],
+)
+
+XCMS_SRCS = glob([
+    "src/xcms/**/*.c",
+    "src/xcms/**/*.h",
+])
+
+XKB_SRCS = glob([
+    "src/xkb/**/*.c",
+    "src/xkb/**/*.h",
+])
+
+expand_template(
+    name = "xlibconf_h",
+    out = "include/X11/XlibConf.h",
+    substitutions = {
+        "#undef XTHREADS": "#define XTHREADS 1",
+        "#undef XUSE_MTSAFE_API": "#define XUSE_MTSAFE_API 1",
+    },
+    template = "include/X11/XlibConf.h.in",
+)
+
+cc_binary(
+    name = "makekeys",
+    srcs = ["src/util/makekeys.c"],
+)
+
+genrule(
+    name = "ks_tables",
+    srcs = ["@xorgproto//:include/X11/" + x for x in [
+        "keysymdef.h",
+        "XF86keysym.h",
+        "Sunkeysym.h",
+        "DECkeysym.h",
+        "HPkeysym.h",
+    ]],
+    outs = ["ks_tables.h"],
+    cmd = "$(location :makekeys) $(SRCS) > $@",
+    tools = [":makekeys"],
+)
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBX11_VERSION}": UPSTREAM_VERSION,
+        "{LIBX11_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBX11_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBX11_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    } | select({
+        "@platforms//os:macos": {},
+        "//conditions:default": {
+            "#define BSD44SOCKETS 1": "/* #undef BSD44SOCKETS */",
+            "#define HAVE_SYS_FILIO_H 1": "/* #undef HAVE_SYS_FILIO_H */",
+        },
+    }),
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "x11",
+    srcs = glob(
+        [
+            "src/*.c",
+            "src/*.h",
+        ],
+        exclude = ["src/os2Stubs.c"],
+    ) + XCMS_SRCS + XKB_SRCS + LIBI18N_SRCS + MODULES_LC + MODULES_OM + MODULES_IM,
+    hdrs = glob(["include/X11/**/*.h"]) + [
+        "//:config_h",
+        "//:ks_tables",
+        "//:xlibconf_h",
+    ],
+    copts = [
+        "-Wno-implicit-function-declaration",
+        "-Wno-int-conversion",
+        "-DHAVE_CONFIG_H",
+    ],
+    defines = [
+        "XCMSDIR=\\\"src/xcms\\\"",
+        "XLOCALELIBDIR=\\\"/tmp\\\"",
+    ],
+    includes = [
+        "include",
+        "include/X11",
+        "src",
+        "src/xcms",
+        "src/xkb",
+        "src/xlibi18n",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@libxau",
+        "@libxcb",
+        "@libxtrans",
+        "@xorgproto",
+    ],
+)
+
+alias(
+    name = "libx11",
+    actual = ":x11",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libx11/1.8.12.bcr.3/overlay/MODULE.bazel b/modules/libx11/1.8.12.bcr.3/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libx11/1.8.12.bcr.3/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libx11/1.8.12.bcr.3/overlay/src/config.h.in b/modules/libx11/1.8.12.bcr.3/overlay/src/config.h.in
new file mode 100644
index 00000000000..e9c795c49e0
--- /dev/null
+++ b/modules/libx11/1.8.12.bcr.3/overlay/src/config.h.in
@@ -0,0 +1,331 @@
+/* src/config.h.  Generated from config.h.in by configure.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
+#define BSD44SOCKETS 1
+
+/* Include compose table cache support */
+#define COMPOSECACHE 1
+
+/* Has getresuid() & getresgid() functions */
+/* #undef HASGETRESUID */
+
+/* Has issetugid() function */
+/* #undef HASSETUGID */
+
+/* Has shm*() functions */
+#define HAS_SHM 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Use dlopen to load shared libraries */
+#define HAVE_DLOPEN 1
+
+/* Define to 1 if you have the 'getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the 'getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define to 1 if you have the 'inet_ntop' function. */
+#define HAVE_INET_NTOP 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* launchd support available */
+#define HAVE_LAUNCHD 1
+
+/* Define to 1 if you have the 'ws2_32' library (-lws2_32). */
+/* #undef HAVE_LIBWS2_32 */
+
+/* Define to 1 if you have the <minix/config.h> header file. */
+/* #undef HAVE_MINIX_CONFIG_H */
+
+/* Define to 1 if you have a working 'mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the 'reallocarray' function. */
+/* #undef HAVE_REALLOCARRAY */
+
+/* Define to 1 if you have the 'seteuid' function. */
+#define HAVE_SETEUID 1
+
+/* Define to 1 if the system has the type 'socklen_t'. */
+#define HAVE_SOCKLEN_T 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the 'strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the 'strlcpy' function. */
+#define HAVE_STRLCPY 1
+
+/* Define to 1 if you have the 'strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if the system has the type 'struct sockaddr_storage'. */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#define HAVE_SYS_FILIO_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if the system has the `__builtin_popcountl' built-in function
+   */
+#define HAVE___BUILTIN_POPCOUNTL 1
+
+/* Support IPv6 for TCP connections */
+#define IPv6 1
+
+/* Support os-specific local connections */
+/* #undef LOCALCONN */
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Disable XLOCALEDIR environment variable */
+/* #undef NO_XLOCALEDIR */
+
+/* Name of package */
+#define PACKAGE "libX11"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libX11"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libX11 {LIBX11_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libX11"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBX11_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBX11_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBX11_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBX11_VERSION_PATCH}
+
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Support TCP socket connections */
+#define TCPCONN 1
+
+/* launchd support available */
+#define TRANS_REOPEN 1
+
+/* Support UNIX socket connections */
+#define UNIXCONN 1
+
+/* Split some i18n functions into loadable modules */
+/* #undef USE_DYNAMIC_LC */
+
+/* Use the X cursor library to load cursors */
+#define USE_DYNAMIC_XCURSOR 1
+
+/* poll() function is available */
+#define USE_POLL 1
+
+/* Enable extensions on AIX, Interix, z/OS.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# define _NETBSD_SOURCE 1
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# define _OPENBSD_SOURCE 1
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+/* # undef _POSIX_SOURCE */
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+/* # undef _POSIX_1_SOURCE */
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
+#endif
+/* Enable extensions specified by C23 Annex F.  */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# define __STDC_WANT_IEC_60559_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# define __STDC_WANT_LIB_EXT2__ 1
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+/* # undef _XOPEN_SOURCE */
+#endif
+
+
+/* Call XInitThreads() from the library constructor */
+#define USE_THREAD_SAFETY_CONSTRUCTOR 1
+
+/* Version number of package */
+#define VERSION "{LIBX11_VERSION}"
+
+/* Location of libX11 data */
+#define X11_DATADIR "/usr/local/share/X11"
+
+/* Location of libX11 library data */
+#define X11_LIBDIR "/usr/local/lib/X11"
+
+/* Include support for XCMS */
+#define XCMS 1
+
+/* Location of error message database */
+#define XERRORDB "/usr/local/share/X11/XErrorDB"
+
+/* Enable XF86BIGFONT extension */
+#define XF86BIGFONT 1
+
+/* Use XKB */
+#define XKB 1
+
+/* Location of keysym database */
+#define XKEYSYMDB "/usr/local/share/X11/XKeysymDB"
+
+/* support for X Locales */
+#define XLOCALE 1
+
+/* Location of libX11 locale data */
+#define XLOCALEDATADIR "/usr/local/share/X11/locale"
+
+/* Location of libX11 locale data */
+#define XLOCALEDIR "/usr/local/share/X11/locale"
+
+/* Location of libX11 locale libraries */
+#define XLOCALELIBDIR "/usr/local/lib/X11/locale"
+
+/* Whether libX11 is compiled with thread support */
+#define XTHREADS 1
+
+/* Whether libX11 needs to use MT safe API's */
+#define XUSE_MTSAFE_API 1
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define to 1 on platforms where this makes off_t a 64-bit type. */
+/* #undef _LARGE_FILES */
+
+/* Number of bits in time_t, on hosts where this is settable. */
+/* #undef _TIME_BITS */
+
+/* Defined if needed to expose struct msghdr.msg_control */
+/* #undef _XOPEN_SOURCE */
+
+/* Define to 1 on platforms where this makes time_t a 64-bit type. */
+/* #undef __MINGW_USE_VC2005_COMPAT */
diff --git a/modules/libx11/1.8.12.bcr.3/presubmit.yml b/modules/libx11/1.8.12.bcr.3/presubmit.yml
new file mode 100644
index 00000000000..287d509bbb6
--- /dev/null
+++ b/modules/libx11/1.8.12.bcr.3/presubmit.yml
@@ -0,0 +1,17 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # TODO: Support pthread on windows
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libx11'
diff --git a/modules/libx11/1.8.12.bcr.3/source.json b/modules/libx11/1.8.12.bcr.3/source.json
new file mode 100644
index 00000000000..51ebe71ca50
--- /dev/null
+++ b/modules/libx11/1.8.12.bcr.3/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-6pe+rR6HIdkAIFWXDorWTvee6dzuhZWj2uLPXCGSpH8=",
+    "strip_prefix": "libx11-libX11-1.8.12",
+    "url": "https://github.com/wep21/libx11/archive/refs/tags/libX11-1.8.12.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-Z+9eeNom9R9ZLvw5lYqxsP/G6cha3HDcUGEMzfbd728=",
+        "MODULE.bazel": "sha256-Zxeprrlf/gaIQrq9gJ8H3O0AsWHO2iMDMdi6ZiFEkIw=",
+        "src/config.h.in": "sha256-P0kPXA0EDAdj+AcfYWsI9LPKPz11ie7b4WfXawJMJtw="
+    }
+}
diff --git a/modules/libx11/README.md b/modules/libx11/README.md
new file mode 100644
index 00000000000..87e83360e95
--- /dev/null
+++ b/modules/libx11/README.md
@@ -0,0 +1,4 @@
+# libx11
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libx11/metadata.json b/modules/libx11/metadata.json
index 09aca61cf9d..670e143eb71 100644
--- a/modules/libx11/metadata.json
+++ b/modules/libx11/metadata.json
@@ -4,8 +4,8 @@
         {
             "email": "daisuke.nishimatsu1021@gmail.com",
             "github": "wep21",
-            "name": "Daisuke Nishimatsu",
-            "github_user_id": 42202095
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
         }
     ],
     "repository": [
@@ -14,7 +14,8 @@
     "versions": [
         "1.8.12",
         "1.8.12.bcr.1",
-        "1.8.12.bcr.2"
+        "1.8.12.bcr.2",
+        "1.8.12.bcr.3"
     ],
     "yanked_versions": {}
-}
\ No newline at end of file
+}
diff --git a/modules/libxcursor/1.2.3/MODULE.bazel b/modules/libxcursor/1.2.3/MODULE.bazel
new file mode 100644
index 00000000000..3163631e13f
--- /dev/null
+++ b/modules/libxcursor/1.2.3/MODULE.bazel
@@ -0,0 +1,12 @@
+module(
+    name = "libxcursor",
+    version = "1.2.3",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "libxfixes", version = "6.0.2")
+bazel_dep(name = "libxrender", version = "0.9.12")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxcursor/1.2.3/overlay/BUILD.bazel b/modules/libxcursor/1.2.3/overlay/BUILD.bazel
new file mode 100644
index 00000000000..cec91b9ccd9
--- /dev/null
+++ b/modules/libxcursor/1.2.3/overlay/BUILD.bazel
@@ -0,0 +1,62 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXCURSOR_VERSION}": UPSTREAM_VERSION,
+        "{LIBXCURSOR_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXCURSOR_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXCURSOR_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+expand_template(
+    name = "xcursor_h",
+    out = "include/X11/Xcursor/Xcursor.h",
+    substitutions = {
+        "#undef XCURSOR_LIB_MAJOR": "#define XCURSOR_LIB_MAJOR {}".format(UPSTREAM_VERSION_MAJOR),
+        "#undef XCURSOR_LIB_MINOR": "#define XCURSOR_LIB_MINOR {}".format(UPSTREAM_VERSION_MINOR),
+        "#undef XCURSOR_LIB_REVISION": "#define XCURSOR_LIB_REVISION {}".format(UPSTREAM_VERSION_PATCH),
+    },
+    template = "include/X11/Xcursor/Xcursor.h.in",
+)
+
+cc_library(
+    name = "xcursor",
+    srcs = glob([
+        "src/*.c",
+        "src/*.h",
+    ]) + [
+        "src/config.h",
+    ],
+    hdrs = [":xcursor_h"],
+    copts = [
+        "-DHAVE_CONFIG_H",
+    ],
+    includes = [
+        "include",
+        "include/X11/Xcursor",
+    ],
+    deps = [
+        "@libx11",
+        "@libxfixes",
+        "@libxrender",
+    ],
+)
+
+alias(
+    name = "libxcursor",
+    actual = ":xcursor",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxcursor/1.2.3/overlay/MODULE.bazel b/modules/libxcursor/1.2.3/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxcursor/1.2.3/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxcursor/1.2.3/overlay/src/config.h.in b/modules/libxcursor/1.2.3/overlay/src/config.h.in
new file mode 100644
index 00000000000..98a1fe28c4d
--- /dev/null
+++ b/modules/libxcursor/1.2.3/overlay/src/config.h.in
@@ -0,0 +1,179 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <minix/config.h> header file. */
+/* #undef HAVE_MINIX_CONFIG_H */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if you have Xfixes */
+#define HAVE_XFIXES 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXcursor"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libxcursor/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXcursor"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXcursor {LIBXCURSOR_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXcursor"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXCURSOR_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXCURSOR_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXCURSOR_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXCURSOR_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# define _NETBSD_SOURCE 1
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# define _OPENBSD_SOURCE 1
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+/* # undef _POSIX_SOURCE */
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+/* # undef _POSIX_1_SOURCE */
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# define __STDC_WANT_LIB_EXT2__ 1
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+/* # undef _XOPEN_SOURCE */
+#endif
+
+
+/* Version number of package */
+#define VERSION "{LIBXCURSOR_VERSION}"
+
+/* Major version of libXcursor */
+#define XCURSOR_LIB_MAJOR {LIBXCURSOR_VERSION_MAJOR}
+
+/* Minor version of libXcursor */
+#define XCURSOR_LIB_MINOR {LIBXCURSOR_VERSION_MINOR}
+
+/* Micro revision of libXcursor */
+#define XCURSOR_LIB_REVISION {LIBXCURSOR_VERSION_PATCH}
diff --git a/modules/libxcursor/1.2.3/presubmit.yml b/modules/libxcursor/1.2.3/presubmit.yml
new file mode 100644
index 00000000000..f9e60cc501a
--- /dev/null
+++ b/modules/libxcursor/1.2.3/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxcursor'
diff --git a/modules/libxcursor/1.2.3/source.json b/modules/libxcursor/1.2.3/source.json
new file mode 100644
index 00000000000..9e75324883e
--- /dev/null
+++ b/modules/libxcursor/1.2.3/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-hAKS5c366Ni3lboAvL5iCg3gr2rhhH4ULfCd7IanDtw=",
+    "strip_prefix": "libxcursor-libXcursor-1.2.3",
+    "url": "https://github.com/wep21/libxcursor/archive/refs/tags/libXcursor-1.2.3.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-t8lyBwiI8Qr3Vs8bCNu2aMLRrpFjQKRVkJ16bQh7ZH8=",
+        "MODULE.bazel": "sha256-CHPrnooxD5kZsSMcpClgmO3j66y8hDOgG+es0f4m9L0=",
+        "src/config.h.in": "sha256-RNcIiaF0dGBhSJQjRvPh2fH2ft62yRWp+vQRlRQPndI="
+    }
+}
diff --git a/modules/libxcursor/README.md b/modules/libxcursor/README.md
new file mode 100644
index 00000000000..4bb414d48a8
--- /dev/null
+++ b/modules/libxcursor/README.md
@@ -0,0 +1,4 @@
+# libxcursor
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxcursor/metadata.json b/modules/libxcursor/metadata.json
new file mode 100644
index 00000000000..3539816e37d
--- /dev/null
+++ b/modules/libxcursor/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxcursor",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxcursor"
+    ],
+    "versions": [
+        "1.2.3"
+    ],
+    "yanked_versions": {}
+}
diff --git a/modules/libxext/1.3.6/MODULE.bazel b/modules/libxext/1.3.6/MODULE.bazel
new file mode 100644
index 00000000000..bfad2212779
--- /dev/null
+++ b/modules/libxext/1.3.6/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "libxext",
+    version = "1.3.6",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxext/1.3.6/overlay/BUILD.bazel b/modules/libxext/1.3.6/overlay/BUILD.bazel
new file mode 100644
index 00000000000..6c491e61138
--- /dev/null
+++ b/modules/libxext/1.3.6/overlay/BUILD.bazel
@@ -0,0 +1,52 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXEXT_VERSION}": UPSTREAM_VERSION,
+        "{LIBXEXT_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXEXT_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXEXT_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "xext",
+    srcs = glob([
+        "src/*.c",
+        "src/*.h",
+    ]) + [
+        "src/config.h",
+    ],
+    hdrs = glob(["include/X11/extensions/*.h"]),
+    copts = [
+        "-DHAVE_CONFIG_H",
+        "-Wno-implicit-function-declaration",
+        "-Wno-int-conversion",
+    ],
+    includes = [
+        "include",
+        "include/X11/extensions",
+        "src",
+    ],
+    deps = [
+        "@libx11",
+    ],
+)
+
+alias(
+    name = "libxext",
+    actual = ":xext",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxext/1.3.6/overlay/MODULE.bazel b/modules/libxext/1.3.6/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxext/1.3.6/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxext/1.3.6/overlay/src/config.h.in b/modules/libxext/1.3.6/overlay/src/config.h.in
new file mode 100644
index 00000000000..fdb78aa0544
--- /dev/null
+++ b/modules/libxext/1.3.6/overlay/src/config.h.in
@@ -0,0 +1,174 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <minix/config.h> header file. */
+/* #undef HAVE_MINIX_CONFIG_H */
+
+/* Define to 1 if you have the `reallocarray' function. */
+#define HAVE_REALLOCARRAY 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if the system has the `__builtin_popcountl' built-in function
+   */
+#define HAVE___BUILTIN_POPCOUNTL 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXext"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libxext/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXext"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXext {LIBXEXT_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXext"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXEXT_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXEXT_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXEXT_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXEXT_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# define _NETBSD_SOURCE 1
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# define _OPENBSD_SOURCE 1
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+/* # undef _POSIX_SOURCE */
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+/* # undef _POSIX_1_SOURCE */
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# define __STDC_WANT_LIB_EXT2__ 1
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+/* # undef _XOPEN_SOURCE */
+#endif
+
+
+/* Version number of package */
+#define VERSION "{LIBXEXT_VERSION}"
diff --git a/modules/libxext/1.3.6/presubmit.yml b/modules/libxext/1.3.6/presubmit.yml
new file mode 100644
index 00000000000..db2f359b123
--- /dev/null
+++ b/modules/libxext/1.3.6/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxext'
diff --git a/modules/libxext/1.3.6/source.json b/modules/libxext/1.3.6/source.json
new file mode 100644
index 00000000000..d60765a00dd
--- /dev/null
+++ b/modules/libxext/1.3.6/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-TkjqJxtfU8M4YBim4CY0VP5YKkE/zgJzreYB+/6eDHI=",
+    "strip_prefix": "libxext-libXext-1.3.6",
+    "url": "https://github.com/wep21/libxext/archive/refs/tags/libXext-1.3.6.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-CzlspnJVTlV0OC05HiwwZ0QWxVnyGb2Tbr0XdtPv2nI=",
+        "MODULE.bazel": "sha256-ERykXF4P4VUw9IbOGT2MYTdCqdnbYTPQFVEf/RJj5sQ=",
+        "src/config.h.in": "sha256-m/l7RrmnFCSTEO+IIOmY8Bd5Fs5EECaVFdz4gFIpG+U="
+    }
+}
diff --git a/modules/libxext/README.md b/modules/libxext/README.md
new file mode 100644
index 00000000000..abbe073d671
--- /dev/null
+++ b/modules/libxext/README.md
@@ -0,0 +1,4 @@
+# libxext
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxext/metadata.json b/modules/libxext/metadata.json
new file mode 100644
index 00000000000..18c0e0a35aa
--- /dev/null
+++ b/modules/libxext/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxext",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxext"
+    ],
+    "versions": [
+        "1.3.6"
+    ],
+    "yanked_versions": {}
+}
diff --git a/modules/libxfixes/6.0.2/MODULE.bazel b/modules/libxfixes/6.0.2/MODULE.bazel
new file mode 100644
index 00000000000..a5ffc7fb13a
--- /dev/null
+++ b/modules/libxfixes/6.0.2/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "libxfixes",
+    version = "6.0.2",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxfixes/6.0.2/overlay/BUILD.bazel b/modules/libxfixes/6.0.2/overlay/BUILD.bazel
new file mode 100644
index 00000000000..47ced03317a
--- /dev/null
+++ b/modules/libxfixes/6.0.2/overlay/BUILD.bazel
@@ -0,0 +1,50 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXFIXES_VERSION}": UPSTREAM_VERSION,
+        "{LIBXFIXES_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXFIXES_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXFIXES_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "xfixes",
+    srcs = glob([
+        "src/*.c",
+        "src/*.h",
+    ]) + [
+        "src/config.h",
+    ],
+    hdrs = glob(["include/X11/extensions/*.h"]),
+    copts = [
+        "-DHAVE_CONFIG_H",
+    ],
+    includes = [
+        "include",
+        "include/X11/extensions",
+        "src",
+    ],
+    deps = [
+        "@libx11",
+    ],
+)
+
+alias(
+    name = "libxfixes",
+    actual = ":xfixes",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxfixes/6.0.2/overlay/MODULE.bazel b/modules/libxfixes/6.0.2/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxfixes/6.0.2/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxfixes/6.0.2/overlay/src/config.h.in b/modules/libxfixes/6.0.2/overlay/src/config.h.in
new file mode 100644
index 00000000000..9d4b40f885b
--- /dev/null
+++ b/modules/libxfixes/6.0.2/overlay/src/config.h.in
@@ -0,0 +1,73 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXfixes"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libxfixes/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXfixes"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXfixes {LIBXFIXES_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXfixes"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXFIXES_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXFIXES_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXFIXES_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXFIXES_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "{LIBXFIXES_VERSION}"
diff --git a/modules/libxfixes/6.0.2/patches/fix_include.patch b/modules/libxfixes/6.0.2/patches/fix_include.patch
new file mode 100644
index 00000000000..4e5f658bb03
--- /dev/null
+++ b/modules/libxfixes/6.0.2/patches/fix_include.patch
@@ -0,0 +1,13 @@
+diff --git src/Xfixesint.h src/Xfixesint.h
+index a058f12..eb2f878 100644
+--- src/Xfixesint.h
++++ src/Xfixesint.h
+@@ -28,7 +28,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xlibint.h>
+ #include <X11/Xutil.h>
+-#include "Xfixes.h"
++#include <Xfixes.h>
+ #include <X11/extensions/xfixesproto.h>
+ 
+ typedef struct _XFixesExtDisplayInfo {
diff --git a/modules/libxfixes/6.0.2/presubmit.yml b/modules/libxfixes/6.0.2/presubmit.yml
new file mode 100644
index 00000000000..40319681313
--- /dev/null
+++ b/modules/libxfixes/6.0.2/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxfixes'
diff --git a/modules/libxfixes/6.0.2/source.json b/modules/libxfixes/6.0.2/source.json
new file mode 100644
index 00000000000..83b4b8f9d3b
--- /dev/null
+++ b/modules/libxfixes/6.0.2/source.json
@@ -0,0 +1,14 @@
+{
+    "integrity": "sha256-Hn3+LdDrJSj8IcKx22REOw9B4qxiOAmTm+a0AIxC71o=",
+    "strip_prefix": "libxfixes-libXfixes-6.0.2",
+    "url": "https://github.com/wep21/libxfixes/archive/refs/tags/libXfixes-6.0.2.tar.gz",
+    "patch_strip": 0,
+    "overlay": {
+        "BUILD.bazel": "sha256-JdgwOb+dvWavKQ1gWRTYIGc0ZGMTtOVX+yxcwIrsib4=",
+        "MODULE.bazel": "sha256-VWQcjCRHyb7ru1HI81MRf8KLbZP/XAOY7Gh7fFxSYM0=",
+        "src/config.h.in": "sha256-9lAXyMQO50smCm9ZIl8Fh18vIqcMBtBo5KW1aRCdTbw="
+    },
+    "patches": {
+        "fix_include.patch": "sha256-EMFhBXK6efAt3vC5RfIQoJW/F+qgh8B36qZk90ntTyc="
+    }
+}
diff --git a/modules/libxfixes/README.md b/modules/libxfixes/README.md
new file mode 100644
index 00000000000..7780acc62ee
--- /dev/null
+++ b/modules/libxfixes/README.md
@@ -0,0 +1,4 @@
+# libxfixes
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxfixes/metadata.json b/modules/libxfixes/metadata.json
new file mode 100644
index 00000000000..b503ebd05c7
--- /dev/null
+++ b/modules/libxfixes/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfixes",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxfixes"
+    ],
+    "versions": [
+        "6.0.2"
+    ],
+    "yanked_versions": {}
+}
diff --git a/modules/libxi/1.8.2/MODULE.bazel b/modules/libxi/1.8.2/MODULE.bazel
new file mode 100644
index 00000000000..e4ecb9dc337
--- /dev/null
+++ b/modules/libxi/1.8.2/MODULE.bazel
@@ -0,0 +1,12 @@
+module(
+    name = "libxi",
+    version = "1.8.2",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "libxext", version = "1.3.6")
+bazel_dep(name = "libxfixes", version = "6.0.2")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxi/1.8.2/overlay/BUILD.bazel b/modules/libxi/1.8.2/overlay/BUILD.bazel
new file mode 100644
index 00000000000..cf613f0de97
--- /dev/null
+++ b/modules/libxi/1.8.2/overlay/BUILD.bazel
@@ -0,0 +1,57 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXI_VERSION}": UPSTREAM_VERSION,
+        "{LIBXI_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXI_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXI_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "xi",
+    srcs = glob(
+        [
+            "src/*.c",
+            "src/*.h",
+        ],
+        # This doesn't seem to even compile, and isn't necessary.
+        exclude = ["src/XFreeLst.c"],
+    ) + [
+        "src/config.h",
+    ],
+    hdrs = glob(["include/X11/extensions/*.h"]),
+    copts = [
+        "-DHAVE_CONFIG_H",
+        "-Wno-implicit-int",
+    ],
+    includes = [
+        "include",
+        "include/X11/extensions",
+        "src",
+    ],
+    deps = [
+        "@libx11",
+        "@libxext",
+        "@libxfixes",
+    ],
+)
+
+alias(
+    name = "libxi",
+    actual = ":xi",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxi/1.8.2/overlay/MODULE.bazel b/modules/libxi/1.8.2/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxi/1.8.2/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxi/1.8.2/overlay/src/config.h.in b/modules/libxi/1.8.2/overlay/src/config.h.in
new file mode 100644
index 00000000000..437d52ecbc9
--- /dev/null
+++ b/modules/libxi/1.8.2/overlay/src/config.h.in
@@ -0,0 +1,73 @@
+/* src/config.h.  Generated from config.h.in by configure.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXi"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libXi/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXi"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXi {LIBXI_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXi"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXI_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXI_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXI_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXI_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "{LIBXI_VERSION}"
diff --git a/modules/libxi/1.8.2/presubmit.yml b/modules/libxi/1.8.2/presubmit.yml
new file mode 100644
index 00000000000..be3f63ea062
--- /dev/null
+++ b/modules/libxi/1.8.2/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxi'
diff --git a/modules/libxi/1.8.2/source.json b/modules/libxi/1.8.2/source.json
new file mode 100644
index 00000000000..cbb8f1849ea
--- /dev/null
+++ b/modules/libxi/1.8.2/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-rkViBxOW1Bo5W4AYGScP/IOtt764CTbpujVA07jqtGk=",
+    "strip_prefix": "libxi-libXi-1.8.2",
+    "url": "https://github.com/wep21/libxi/archive/refs/tags/libXi-1.8.2.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-h4V3qAo4w2aHZAp5eCPxwA9YG07Q0qB3li78cuEMLqg=",
+        "MODULE.bazel": "sha256-JOltUF16GF2bqJ4DRSN7SuB9o7wznRLWJyqUhV3KvLU=",
+        "src/config.h.in": "sha256-9RklZxfQfBw8QMT/O8yXRwx/X/yZr6jwR3NWzXsGdOA="
+    }
+}
diff --git a/modules/libxi/README.md b/modules/libxi/README.md
new file mode 100644
index 00000000000..e8888942e0e
--- /dev/null
+++ b/modules/libxi/README.md
@@ -0,0 +1,4 @@
+# libxi
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxi/metadata.json b/modules/libxi/metadata.json
new file mode 100644
index 00000000000..b1c3c48733a
--- /dev/null
+++ b/modules/libxi/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxi",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxi"
+    ],
+    "versions": [
+        "1.8.2"
+    ],
+    "yanked_versions": {}
+}
diff --git a/modules/libxinerama/1.1.5/MODULE.bazel b/modules/libxinerama/1.1.5/MODULE.bazel
new file mode 100644
index 00000000000..11c4e4a00e6
--- /dev/null
+++ b/modules/libxinerama/1.1.5/MODULE.bazel
@@ -0,0 +1,11 @@
+module(
+    name = "libxinerama",
+    version = "1.1.5",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "libxext", version = "1.3.6")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxinerama/1.1.5/overlay/BUILD.bazel b/modules/libxinerama/1.1.5/overlay/BUILD.bazel
new file mode 100644
index 00000000000..443d77e5658
--- /dev/null
+++ b/modules/libxinerama/1.1.5/overlay/BUILD.bazel
@@ -0,0 +1,49 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXINERAMA_VERSION}": UPSTREAM_VERSION,
+        "{LIBXINERAMA_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXINERAMA_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXINERAMA_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "xinerama",
+    srcs = glob([
+        "src/*.c",
+    ]) + [
+        "src/config.h",
+    ],
+    hdrs = glob(["include/X11/extensions/*.h"]),
+    copts = [
+        "-DHAVE_CONFIG_H",
+    ],
+    includes = [
+        "include",
+        "include/X11/extensions",
+    ],
+    deps = [
+        "@libx11",
+        "@libxext",
+    ],
+)
+
+alias(
+    name = "libxinerama",
+    actual = ":xinerama",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxinerama/1.1.5/overlay/MODULE.bazel b/modules/libxinerama/1.1.5/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxinerama/1.1.5/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxinerama/1.1.5/overlay/src/config.h.in b/modules/libxinerama/1.1.5/overlay/src/config.h.in
new file mode 100644
index 00000000000..91ab8637c2c
--- /dev/null
+++ b/modules/libxinerama/1.1.5/overlay/src/config.h.in
@@ -0,0 +1,73 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXinerama"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libxinerama/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXinerama"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXinerama {LIBXINERAMA_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXinerama"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXINERAMA_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXINERAMA_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXINERAMA_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXINERAMA_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "{LIBXINERAMA_VERSION}"
diff --git a/modules/libxinerama/1.1.5/presubmit.yml b/modules/libxinerama/1.1.5/presubmit.yml
new file mode 100644
index 00000000000..8374061de17
--- /dev/null
+++ b/modules/libxinerama/1.1.5/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxinerama'
diff --git a/modules/libxinerama/1.1.5/source.json b/modules/libxinerama/1.1.5/source.json
new file mode 100644
index 00000000000..3b562d475e1
--- /dev/null
+++ b/modules/libxinerama/1.1.5/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-cczgHKPEtcEocPOa4uT6Y6m8MDgH+bHE517X0SKlYPk=",
+    "strip_prefix": "libxinerama-libXinerama-1.1.5",
+    "url": "https://github.com/wep21/libxinerama/archive/refs/tags/libXinerama-1.1.5.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-X6qamrRGLLLWG/3tsUZMhtDIoew4oGidaBCjG/P4z7k=",
+        "MODULE.bazel": "sha256-rTQLmqzZzK92reLBPSPErUFVQ1uYAkHqWgx5oKVmqlg=",
+        "src/config.h.in": "sha256-Cc9ETINAa3IJug9LF8TLqNxB27VFrJjzu6WpmPDfKfs="
+    }
+}
diff --git a/modules/libxinerama/README.md b/modules/libxinerama/README.md
new file mode 100644
index 00000000000..dd1ee659d67
--- /dev/null
+++ b/modules/libxinerama/README.md
@@ -0,0 +1,4 @@
+# libxinerame
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxinerama/metadata.json b/modules/libxinerama/metadata.json
new file mode 100644
index 00000000000..a6b69251f90
--- /dev/null
+++ b/modules/libxinerama/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxinerama",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxinerama"
+    ],
+    "versions": [
+        "1.1.5"
+    ],
+    "yanked_versions": {}
+}
diff --git a/modules/libxrandr/1.5.4/MODULE.bazel b/modules/libxrandr/1.5.4/MODULE.bazel
new file mode 100644
index 00000000000..76a393c3d66
--- /dev/null
+++ b/modules/libxrandr/1.5.4/MODULE.bazel
@@ -0,0 +1,12 @@
+module(
+    name = "libxrandr",
+    version = "1.5.4",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "libxrender", version = "0.9.12")
+bazel_dep(name = "libxext", version = "1.3.6")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxrandr/1.5.4/overlay/BUILD.bazel b/modules/libxrandr/1.5.4/overlay/BUILD.bazel
new file mode 100644
index 00000000000..c508edb72d5
--- /dev/null
+++ b/modules/libxrandr/1.5.4/overlay/BUILD.bazel
@@ -0,0 +1,52 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXRANDR_VERSION}": UPSTREAM_VERSION,
+        "{LIBXRANDR_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXRANDR_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXRANDR_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "xrandr",
+    srcs = glob([
+        "src/*.c",
+        "src/*.h",
+    ]) + [
+        "src/config.h",
+    ],
+    hdrs = glob(["include/X11/extensions/*.h"]),
+    copts = [
+        "-DHAVE_CONFIG_H",
+    ],
+    includes = [
+        "include",
+        "include/X11/extensions",
+        "src",
+    ],
+    deps = [
+        "@libx11",
+        "@libxext",
+        "@libxrender",
+    ],
+)
+
+alias(
+    name = "libxrandr",
+    actual = ":xrandr",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxrandr/1.5.4/overlay/MODULE.bazel b/modules/libxrandr/1.5.4/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxrandr/1.5.4/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxrandr/1.5.4/overlay/src/config.h.in b/modules/libxrandr/1.5.4/overlay/src/config.h.in
new file mode 100644
index 00000000000..ae12b155e71
--- /dev/null
+++ b/modules/libxrandr/1.5.4/overlay/src/config.h.in
@@ -0,0 +1,73 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXrandr"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libxrandr/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXrandr"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXrandr {LIBXRANDR_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXrandr"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXRANDR_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXRANDR_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXRANDR_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXRANDR_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "{LIBXRANDR_VERSION}"
diff --git a/modules/libxrandr/1.5.4/presubmit.yml b/modules/libxrandr/1.5.4/presubmit.yml
new file mode 100644
index 00000000000..0e0453039ea
--- /dev/null
+++ b/modules/libxrandr/1.5.4/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxrandr'
diff --git a/modules/libxrandr/1.5.4/source.json b/modules/libxrandr/1.5.4/source.json
new file mode 100644
index 00000000000..b2eae1a0926
--- /dev/null
+++ b/modules/libxrandr/1.5.4/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-oZCcvp3tlBh7ZCCujDRxU/gniVUmXLgKZM2uVQFDM5Y=",
+    "strip_prefix": "libxrandr-libXrandr-1.5.4",
+    "url": "https://github.com/wep21/libxrandr/archive/refs/tags/libXrandr-1.5.4.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-mxlM58kiKIqmBzDJSZeoMgAQAyaLAFHz4dP6M+/gQoA=",
+        "MODULE.bazel": "sha256-zFXruO8xaZBOXAHRJSTmVjq+JOxhZnFRFaeT7vuvRRU=",
+        "src/config.h.in": "sha256-cKf7TNdUqWLM0bHG64R6jNcl2GuiYgBmFfBrLS3leRg="
+    }
+}
diff --git a/modules/libxrandr/README.md b/modules/libxrandr/README.md
new file mode 100644
index 00000000000..6fb765b5d55
--- /dev/null
+++ b/modules/libxrandr/README.md
@@ -0,0 +1,4 @@
+# libxrandr
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxrandr/metadata.json b/modules/libxrandr/metadata.json
new file mode 100644
index 00000000000..973e654902c
--- /dev/null
+++ b/modules/libxrandr/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrandr",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxrandr"
+    ],
+    "versions": [
+        "1.5.4"
+    ],
+    "yanked_versions": {}
+}
diff --git a/modules/libxrender/0.9.12/MODULE.bazel b/modules/libxrender/0.9.12/MODULE.bazel
new file mode 100644
index 00000000000..2659964da2f
--- /dev/null
+++ b/modules/libxrender/0.9.12/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "libxrender",
+    version = "0.9.12",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "libx11", version = "1.8.12.bcr.3")
+bazel_dep(name = "rules_cc", version = "0.1.4")
diff --git a/modules/libxrender/0.9.12/overlay/BUILD.bazel b/modules/libxrender/0.9.12/overlay/BUILD.bazel
new file mode 100644
index 00000000000..fbc3175a960
--- /dev/null
+++ b/modules/libxrender/0.9.12/overlay/BUILD.bazel
@@ -0,0 +1,50 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
+UPSTREAM_VERSION = module_version().split(".bcr.", 1)[0]
+
+UPSTREAM_VERSION_MAJOR = UPSTREAM_VERSION.split(".")[0]
+
+UPSTREAM_VERSION_MINOR = UPSTREAM_VERSION.split(".")[1]
+
+UPSTREAM_VERSION_PATCH = UPSTREAM_VERSION.split(".")[2]
+
+expand_template(
+    name = "config_h",
+    out = "src/config.h",
+    substitutions = {
+        "{LIBXRENDER_VERSION}": UPSTREAM_VERSION,
+        "{LIBXRENDER_VERSION_MAJOR}": UPSTREAM_VERSION_MAJOR,
+        "{LIBXRENDER_VERSION_MINOR}": UPSTREAM_VERSION_MINOR,
+        "{LIBXRENDER_VERSION_PATCH}": UPSTREAM_VERSION_PATCH,
+    },
+    template = "src/config.h.in",
+)
+
+cc_library(
+    name = "xrender",
+    srcs = glob([
+        "src/*.c",
+        "src/*.h",
+    ]) + [
+        "src/config.h",
+    ],
+    hdrs = glob(["include/X11/extensions/*.h"]),
+    copts = [
+        "-DHAVE_CONFIG_H",
+    ],
+    includes = [
+        "include",
+        "include/X11/extensions",
+        "src",
+    ],
+    deps = [
+        "@libx11",
+    ],
+)
+
+alias(
+    name = "libxrender",
+    actual = ":xrender",
+    visibility = ["//visibility:public"],
+)
diff --git a/modules/libxrender/0.9.12/overlay/MODULE.bazel b/modules/libxrender/0.9.12/overlay/MODULE.bazel
new file mode 120000
index 00000000000..9b599e3ad9c
--- /dev/null
+++ b/modules/libxrender/0.9.12/overlay/MODULE.bazel
@@ -0,0 +1 @@
+../MODULE.bazel
\ No newline at end of file
diff --git a/modules/libxrender/0.9.12/overlay/src/config.h.in b/modules/libxrender/0.9.12/overlay/src/config.h.in
new file mode 100644
index 00000000000..d02821f643e
--- /dev/null
+++ b/modules/libxrender/0.9.12/overlay/src/config.h.in
@@ -0,0 +1,73 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libXrender"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libXrender"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libXrender {LIBXRENDER_VERSION}"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libXrender"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "{LIBXRENDER_VERSION}"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR {LIBXRENDER_VERSION_MAJOR}
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR {LIBXRENDER_VERSION_MINOR}
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL {LIBXRENDER_VERSION_PATCH}
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "{LIBXRENDER_VERSION}"
diff --git a/modules/libxrender/0.9.12/presubmit.yml b/modules/libxrender/0.9.12/presubmit.yml
new file mode 100644
index 00000000000..56672fff8d6
--- /dev/null
+++ b/modules/libxrender/0.9.12/presubmit.yml
@@ -0,0 +1,16 @@
+matrix:
+  platform:
+  - debian11
+  - ubuntu2204
+  - ubuntu2404
+  - macos
+  - macos_arm64
+  # - windows
+  bazel: [7.x, 8.x, rolling]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@libxrender'
diff --git a/modules/libxrender/0.9.12/source.json b/modules/libxrender/0.9.12/source.json
new file mode 100644
index 00000000000..4f5ea986c71
--- /dev/null
+++ b/modules/libxrender/0.9.12/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-RwVZ354OTbyB1YVdPTZKF+EiY2AKCCFyMvix9u883b8=",
+    "strip_prefix": "libxrender-libXrender-0.9.12",
+    "url": "https://github.com/wep21/libxrender/archive/refs/tags/libXrender-0.9.12.tar.gz",
+    "overlay": {
+        "BUILD.bazel": "sha256-hfpy7lbHxfXNC26OiRPwvTO/imroVbIrojI66BmbL7E=",
+        "MODULE.bazel": "sha256-itNHG2PZUDalOB3VYCohhM0Rvf/EMD0rxwdfpeQE1Rs=",
+        "src/config.h.in": "sha256-rUZQTO/L9Hqddkmlg6iLzoAQQabdzveGs3lgxmNz6xc="
+    }
+}
diff --git a/modules/libxrender/README.md b/modules/libxrender/README.md
new file mode 100644
index 00000000000..91f5933d712
--- /dev/null
+++ b/modules/libxrender/README.md
@@ -0,0 +1,4 @@
+# libxrender
+
+- `overlay/src/config.h.in` is copied from the upstream Autoconf `configure` output. Our Bazel setup only substitutes the version placeholders via `expand_template`; all other contents should stay identical to upstream.
+
diff --git a/modules/libxrender/metadata.json b/modules/libxrender/metadata.json
new file mode 100644
index 00000000000..fb064a727e6
--- /dev/null
+++ b/modules/libxrender/metadata.json
@@ -0,0 +1,18 @@
+{
+    "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrender",
+    "maintainers": [
+        {
+            "email": "daisuke.nishimatsu1021@gmail.com",
+            "github": "wep21",
+            "github_user_id": 42202095,
+            "name": "Daisuke Nishimatsu"
+        }
+    ],
+    "repository": [
+        "https://github.com/wep21/libxrender"
+    ],
+    "versions": [
+        "0.9.12"
+    ],
+    "yanked_versions": {}
+}