diff --git a/conf/distro/include/mortsgna-core-tweaks.inc b/conf/distro/include/mortsgna-core-tweaks.inc
index 52eab7c..cc356d9 100644
--- a/conf/distro/include/mortsgna-core-tweaks.inc
+++ b/conf/distro/include/mortsgna-core-tweaks.inc
@@ -13,13 +13,6 @@ LICENSE_DIRECTORY = "${DEPLOY_DIR}/licenses/${MACHINE_ARCH}"
 # Shared state fixups
 MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
 
-# Prefer libjpeg-turbo
-PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
-PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
-
-# libtool REVISIT
-PREFERRED_PROVIDER_libltdl-dev = "libtool"
-
 #
 # udev, devfsd, busybox-mdev (from busybox) or none
 #
diff --git a/conf/distro/include/mortsgna-preferred-providers.inc b/conf/distro/include/mortsgna-preferred-providers.inc
new file mode 100644
index 0000000..897b59d
--- /dev/null
+++ b/conf/distro/include/mortsgna-preferred-providers.inc
@@ -0,0 +1,24 @@
+# common
+PREFERRED_PROVIDER_hotplug                       = "systemd"
+PREFERRED_PROVIDER_virtual/gettext               ??= "gettext"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk  = "linux-libc-headers-nativesdk"
+
+# Prefer libjpeg-turbo
+PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
+PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
+
+# Prefer gummiboot over grub
+EFI_PROVIDER                                     = "gummiboot"
+
+# X11
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# Select xserver-xorg and common drivers as default
+XSERVER ?= " \
+    xserver-xorg \
+    xf86-input-libinput \
+    xf86-video-modesetting \
+"
+
diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf
index f0f09c2..72c4030 100644
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -17,14 +17,8 @@ DISTRO_VERSION = "v0.1"
 TOOLCHAIN_TYPE ?= "internal"
 TOOLCHAIN_BRAND ?= ""
 
-PREFERRED_PROVIDER_dbus-glib                     = "dbus-glib"
-PREFERRED_PROVIDER-gconf-dbus                    = "gconf"
-PREFERRED_PROVIDER_hotplug                       = "systemd"
-PREFERRED_PROVIDER_opkg                          ?= "opkg"
-PREFERRED_PROVIDER_opkg-native                   ?= "opkg-native"
-
-# Prefer gummiboot over grub
-EFI_PROVIDER                                     = "gummiboot"
+# Preferred providers
+include conf/distro/include/mortsgna-preferred-providers.inc
 
 # blacklist policy
 PNBLACKLIST[pn-fso-apm]       = "regular apmd is good enough"
@@ -57,8 +51,6 @@ ONLINE_PACKAGE_MANAGEMENT = "full"
 # Can be "glibc" or "musl"
 TCLIBC ?= "glibc"
 
-PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
-PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk"
 
 require conf/distro/include/mortsgna-${TCLIBC}.inc
 
@@ -72,7 +64,6 @@ ARM_INSTRUCTION_SET_armv6 ?= "arm"
 require conf/distro/include/mortsgna-armv7-tune.inc
 DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
 
-
 require conf/distro/include/mortsgna-inherits.inc
 
 # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
@@ -125,16 +116,6 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 # Processor specific tunes like hard float ABI
 include conf/distro/include/${TARGET_ARCH}-defaults.inc
 
-# Select xserver-xorg and common drivers as default
-XSERVER ?= " \
-    xserver-xorg \
-    xf86-input-libinput \
-    xf86-video-modesetting \
-"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
 # For X11/Wayland images we install an unpriviledged user by default. If this
 # is not desired override DISTRO_GUI_USER
 DISTRO_GUI_USER ?= "unpriv-user"