diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 98cc18d845..73d9f9ac74 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -17,7 +17,7 @@ configure_args="\
 	$(vopt_if python --with-python=/usr/bin/python3)"
 hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
-	$(vopt_if python 'python3-devel')"
+ $(vopt_if python 'python3-devel gettext-devel')"
 depends=gdb
 short_desc="GNU Debugger for AVR"
 maintainer="Artur Sinila <opensource@logarithmus.dev>"
@@ -43,10 +43,6 @@ desc_option_gdbserver="Enable support for building GDB server"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
 
-if [ "$build_option_python" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" gettext-libs"
-fi
-
 post_extract() {
 	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
 	mkdir -p build
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index c6a63ce3dc..ac8e6837d7 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -24,7 +24,9 @@ configure_args="
  $(vopt_with python)
 "
 hostmakedepends="autoconf automake bison flex pkg-config texinfo"
-makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel readline-devel zlib-devel $(vopt_if guile guile-devel) $(vopt_if python 'python3-devel')"
+makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel
+ readline-devel zlib-devel $(vopt_if guile guile-devel)
+ $(vopt_if python 'python3-devel gettext-devel')"
 short_desc="GNU Debugger"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="GPL-3.0-or-later"
@@ -40,10 +42,6 @@ nocross=yes
 
 CFLAGS="-fcommon"
 
-if [ "$build_option_python" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" gettext-libs"
-fi
-
 post_install() {
 	# resolve conflicts with binutils and native gdb
 	rm -fr ${DESTDIR}/usr/{share/{locale,gdb,info},include}
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 02e0e66350..64787a9ade 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -11,7 +11,7 @@ configure_args="--disable-werror --disable-nls --with-system-readline
  $(vopt_with debuginfod)"
 hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python python3-devel)
+ $(vopt_if python 'python3-devel gettext-devel')
  $(vopt_if debuginfod elfutils-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
@@ -22,10 +22,6 @@ checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
 python_version=3
 patch_args="-Np1"
 
-if [ "$build_option_python" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" gettext-libs"
-fi
-
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
 	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index b311b60e20..f54fadf9b7 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -5,11 +5,11 @@ revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
-hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils"
+hostmakedepends="automake libtool gettext-devel-tools intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel
  SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel
- bzip2-devel"
+ bzip2-devel gettext-devel"
 depends="${pkgname}-data"
 short_desc="2D motocross platform game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,10 +18,6 @@ homepage="http://xmoto.tuxfamily.org/"
 distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz"
 checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66
 
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" gettext-libs"
-fi
-
 pre_install() {
 	vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/
 }