diff --git a/meta/packages/xorg-lib/libx11-diet_git.bb b/meta/packages/xorg-lib/libx11-diet_git.bb
index 220df234d2..d1f0a753fa 100644
--- a/meta/packages/xorg-lib/libx11-diet_git.bb
+++ b/meta/packages/xorg-lib/libx11-diet_git.bb
@@ -1,19 +1,12 @@
 require libx11.inc
-PV = "1.1.99.1+gitr${SRCREV}"
+require libx11_git.inc
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-S = "${WORKDIR}/git"
-
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://include_fix.patch;patch=1 \
-            file://X18NCMSstubs.diff;patch=1 \
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
             file://fix-disable-xlocale.diff;patch=1 \
             file://fix-utf8-wrong-define.patch;patch=1"
 
 DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
-
 EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
 CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/libx11-sdk_git.bb b/meta/packages/xorg-lib/libx11-sdk_git.bb
index 904ca4d636..04558d2ad6 100644
--- a/meta/packages/xorg-lib/libx11-sdk_git.bb
+++ b/meta/packages/xorg-lib/libx11-sdk_git.bb
@@ -1,11 +1,9 @@
-require libx11_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
+require libx11.inc
+require libx11_git.inc
 
 DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native"
 PROVIDES = ""
-PV = "1.1.99.1+gitr${SRCREV}"
+
+EXTRA_OECONF += "--without-xcb"
 
 inherit sdk
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
diff --git a/meta/packages/xorg-lib/libx11-trim_git.bb b/meta/packages/xorg-lib/libx11-trim_git.bb
index be0af38dbd..45ec225b43 100644
--- a/meta/packages/xorg-lib/libx11-trim_git.bb
+++ b/meta/packages/xorg-lib/libx11-trim_git.bb
@@ -1,18 +1,10 @@
 require libx11.inc
-PV = "1.1.99.1+gitr${SRCREV}"
+require libx11_git.inc
+
 PR = "r1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-S = "${WORKDIR}/git"
-
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://include_fix.patch;patch=1"
-
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
-
 EXTRA_OECONF += "--disable-xcms --with-xcb"
 CFLAGS += "-D_GNU_SOURCE"
 
-FILESPATH = "${FILE_DIRNAME}/libx11-git"
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
index f1aeb00ac5..b4278ffc27 100644
--- a/meta/packages/xorg-lib/libx11_git.bb
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -1,11 +1,8 @@
-DEFAULT_PREFERENCE = "-1"
-
 require libx11.inc
+require libx11_git.inc
 
 DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
            bigreqsproto xtrans libxau libxcb libxdmcp util-macros"
-PV = "1.1.99.1+gitr${SRCREV}"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-S = "${WORKDIR}/git"
+DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta/packages/xorg-lib/libx11_git.inc b/meta/packages/xorg-lib/libx11_git.inc
new file mode 100644
index 0000000000..1949544528
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_git.inc
@@ -0,0 +1,10 @@
+PV = "1.1.99.1+gitr${SRCREV}"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+S = "${WORKDIR}/git"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
+FILESPATH = "${FILE_DIRNAME}/libx11-git"