diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc
index 9296fb2..2f8c568 100644
--- a/recipes-games/freeciv/freeciv.inc
+++ b/recipes-games/freeciv/freeciv.inc
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SECTION = "games"
 
-DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native"
+FREECIV_GUI = "gtk3.22,qt,sdl2"
+
+DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
 
 SRC_URI = "\
 file://allow-root.patch \
@@ -35,7 +37,8 @@ SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 
 acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"
 
-PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-qt"
+PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common \
+${PN}-gtk3.22 ${PN}-qt ${PN}-sdl2"
 
 do_install_append() {
         rm -Rf ${D}/${datadir}/appdata
@@ -70,9 +73,24 @@ ${datadir}/freeciv/stdsounds \
 ${datadir}/icons/hicolor/*/*/freeciv-modpack.png \
 "
 
+RDEPENDS_${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
+RPROVIDES_${PN}-gtk3.22 = "freeciv-client"
+FILES_${PN}-gtk3.22 = "\
+${bindir}/freeciv-gtk3.22 \
+${datadir}/freeciv/themes/gui-gtk-3.22 \
+${datadir}/freeciv/gtk3.22_menus.xml \
+"
+
 RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
 RPROVIDES_${PN}-qt = "freeciv-client"
 FILES_${PN}-qt = "\
 ${bindir}/freeciv-qt \
 ${datadir}/freeciv/themes/gui-qt \
 "
+
+RDEPENDS_${PN}-sdl2 = "freeciv-common freeciv-client-common"
+RPROVIDES_${PN}-sdl2 = "freeciv-client"
+FILES_${PN}-sdl2 = "\
+${bindir}/freeciv-sdl2 \
+${datadir}/freeciv/themes/gui-sdl2 \
+"
diff --git a/recipes-games/freeciv/freeciv_2.6.2.bb b/recipes-games/freeciv/freeciv_2.6.2.bb
index 6a0271f..c6b86d8 100644
--- a/recipes-games/freeciv/freeciv_2.6.2.bb
+++ b/recipes-games/freeciv/freeciv_2.6.2.bb
@@ -1,9 +1,6 @@
-FREECIV_GUI = "gtk3.22,qt,sdl2"
 
 require freeciv.inc
 
-DEPENDS += "libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
-
 SRC_URI += "\
 ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
 file://QPainterPathInc.patch \
@@ -14,20 +11,3 @@ SRC_URI[sha256sum] = "6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e
 SRC_URI[sha1sum] = "d459c711a164fbaf215e0083aaf5784253a1492f"
 SRC_URI[sha384sum] = "723cb04256875f9d1e40b34c674529ee00128f7192ddab1a569e6344138c080375b99f9a959fe9ebae890ef210fc1b96"
 SRC_URI[sha512sum] = "b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3"
-
-PACKAGES =+ "${PN}-sdl2 ${PN}-gtk3.22"
-
-RDEPENDS_${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3.22 = "freeciv-client"
-FILES_${PN}-gtk3.22 = "\
-${bindir}/freeciv-gtk3.22 \
-${datadir}/freeciv/themes/gui-gtk-3.22 \
-${datadir}/freeciv/gtk3.22_menus.xml \
-"
-
-RDEPENDS_${PN}-sdl2 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-sdl2 = "freeciv-client"
-FILES_${PN}-sdl2 = "\
-${bindir}/freeciv-sdl2 \
-${datadir}/freeciv/themes/gui-sdl2 \
-"
diff --git a/recipes-games/freeciv/freeciv_S3-0-git.bb b/recipes-games/freeciv/freeciv_S3-0-git.bb
index a4e7669..d608297 100644
--- a/recipes-games/freeciv/freeciv_S3-0-git.bb
+++ b/recipes-games/freeciv/freeciv_S3-0-git.bb
@@ -1,11 +1,9 @@
 
-FREECIV_GUI = "gtk3.22,qt,sdl2"
-
 require freeciv.inc
 
 DEFAULT_PREFERENCE = "-2"
 
-DEPENDS += "libsdl2-image libsdl2-ttf libsdl2-gfx freetype tolua-native"
+DEPENDS += "tolua-native"
 
 SRC_URI += "\
 git://github.com/freeciv/freeciv.git;branch=S3_0\
@@ -14,20 +12,3 @@ SRCREV="c319fab994f98076d502da78724c129830e5bd13"
 PN = "freeciv"
 PV = "3.0.0-alpha4"
 S = "${WORKDIR}/git"
-
-PACKAGES =+ "${PN}-sdl2 ${PN}-gtk3.22"
-
-RDEPENDS_${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3.22 = "freeciv-client"
-FILES_${PN}-gtk3.22 = "\
-${bindir}/freeciv-gtk3.22 \
-${datadir}/freeciv/themes/gui-gtk-3.22 \
-${datadir}/freeciv/gtk3.22_menus.xml \
-"
-
-RDEPENDS_${PN}-sdl2 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-sdl2 = "freeciv-client"
-FILES_${PN}-sdl2 = "\
-${bindir}/freeciv-sdl2 \
-${datadir}/freeciv/themes/gui-sdl2 \
-"