diff --git a/DVD5-i586.group b/DVD5-i586.group
index 0117d485..23667bbf 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -442,8 +442,6 @@
     <package name="dracut"/>
     <package name="dragonplayer"/>
     <package name="dragonplayer-lang"/>
-    <package name="dri2proto-devel"/>
-    <package name="dri3proto-devel"/>
     <package name="drkonqi5"/>
     <package name="drkonqi5-lang"/>
     <package name="dump-rmt"/>
@@ -468,9 +466,11 @@
     <package name="elilo"/>
     <package name="emacs"/>
     <package name="emacs-apel"/>
+    <package name="emacs-flim"/>
     <package name="emacs-info"/>
     <package name="emacs-nox"/>
     <package name="emacs-plugin-devhelp"/>
+    <package name="emacs-w3m"/>
     <package name="emacs-x11"/>
     <package name="enblend-enfuse"/>
     <package name="enchant-1-backend-voikko"/>
@@ -566,7 +566,6 @@
     <package name="firewall-macros"/>
     <package name="firewalld"/>
     <package name="firewalld-lang"/>
-    <package name="fixesproto-devel"/>
     <package name="flac"/>
     <package name="flatpak"/>
     <package name="flatpak-builder"/>
@@ -576,7 +575,6 @@
     <package name="fontconfig-devel"/>
     <package name="fonts-KanjiStrokeOrders"/>
     <package name="fonts-config"/>
-    <package name="fontsproto-devel"/>
     <package name="fortune"/>
     <package name="fossil"/>
     <package name="fprintd"/>
@@ -731,7 +729,6 @@
     <package name="glibc-extra"/>
     <package name="glibc-info"/>
     <package name="glibc-locale"/>
-    <package name="glproto-devel"/>
     <package name="gmp-devel"/>
     <package name="gnome-backgrounds"/>
     <package name="gnome-backgrounds-lang"/>
@@ -1074,7 +1071,6 @@
     <package name="info"/>
     <package name="initviocons"/>
     <package name="inn"/>
-    <package name="inputproto-devel"/>
     <package name="insserv-compat"/>
     <package name="inst-source-utils"/>
     <package name="install-initrd-openSUSE"/>
@@ -1173,7 +1169,6 @@
     <package name="kblocks-lang"/>
     <package name="kbounce"/>
     <package name="kbounce-lang"/>
-    <package name="kbproto-devel"/>
     <package name="kbreakout"/>
     <package name="kbreakout-lang"/>
     <package name="kbruch"/>
@@ -3989,7 +3984,6 @@
     <package name="pragha-plugins"/>
     <package name="prctl"/>
     <package name="presage-data"/>
-    <package name="presentproto-devel"/>
     <package name="printproto-devel"/>
     <package name="prison-qt5-imports"/>
     <package name="privoxy"/>
@@ -4193,7 +4187,6 @@
     <package name="quota"/>
     <package name="quota-nfs"/>
     <package name="radvd"/>
-    <package name="randrproto-devel"/>
     <package name="rarpd"/>
     <package name="rcc-runtime"/>
     <package name="rdesktop"/>
@@ -4212,8 +4205,6 @@
     <package name="remmina-plugin-secret"/>
     <package name="remmina-plugin-vnc"/>
     <package name="remmina-plugin-xdmcp"/>
-    <package name="renderproto-devel"/>
-    <package name="resourceproto-devel"/>
     <package name="rgb"/>
     <package name="rhino"/>
     <package name="ripit"/>
@@ -4460,7 +4451,6 @@
     <package name="scim-qt4"/>
     <package name="scout"/>
     <package name="screen"/>
-    <package name="scrnsaverproto-devel"/>
     <package name="sddm"/>
     <package name="sddm-branding-openSUSE"/>
     <package name="sddm-theme-openSUSE"/>
@@ -4831,7 +4821,6 @@
     <package name="vdr"/>
     <package name="vdr-lang"/>
     <package name="vhba-kmp-default"/>
-    <package name="videoproto-devel"/>
     <package name="viewnior"/>
     <package name="viewnior-lang"/>
     <package name="viewvc"/>
@@ -4919,7 +4908,6 @@
     <package name="xerces-j2"/>
     <package name="xerces-j2-xml-apis"/>
     <package name="xerces-j2-xml-resolver"/>
-    <package name="xextproto-devel"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
     <package name="xf86-input-keyboard"/>
@@ -4955,7 +4943,6 @@
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-vmware"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xf86driproto-devel"/>
     <package name="xfce4-appfinder"/>
     <package name="xfce4-appfinder-lang"/>
     <package name="xfce4-dev-tools"/>
@@ -5052,7 +5039,6 @@
     <package name="xfwm4-themes"/>
     <package name="xhost"/>
     <package name="xhtml-dtd"/>
-    <package name="xineramaproto-devel"/>
     <package name="xinetd"/>
     <package name="xinit"/>
     <package name="xkbcomp"/>
@@ -5087,10 +5073,10 @@
     <package name="xorg-x11-server"/>
     <package name="xorg-x11-server-sdk"/>
     <package name="xorg-x11-server-wayland"/>
+    <package name="xorgproto-devel"/>
     <package name="xorriso"/>
     <package name="xournal"/>
     <package name="xprop"/>
-    <package name="xproto-devel"/>
     <package name="xrandr"/>
     <package name="xrdb"/>
     <package name="xsane"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index cca80668..be3bf7f5 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -451,8 +451,6 @@
     <package name="drbd"/>
     <package name="drbd-kmp-default"/>
     <package name="drbd-utils"/>
-    <package name="dri2proto-devel"/>
-    <package name="dri3proto-devel"/>
     <package name="drkonqi5"/>
     <package name="drkonqi5-lang"/>
     <package name="dump-rmt"/>
@@ -477,9 +475,11 @@
     <package name="elilo"/>
     <package name="emacs"/>
     <package name="emacs-apel"/>
+    <package name="emacs-flim"/>
     <package name="emacs-info"/>
     <package name="emacs-nox"/>
     <package name="emacs-plugin-devhelp"/>
+    <package name="emacs-w3m"/>
     <package name="emacs-x11"/>
     <package name="enblend-enfuse"/>
     <package name="enchant-1-backend-voikko"/>
@@ -573,7 +573,6 @@
     <package name="firewall-macros"/>
     <package name="firewalld"/>
     <package name="firewalld-lang"/>
-    <package name="fixesproto-devel"/>
     <package name="flac"/>
     <package name="flatpak"/>
     <package name="flatpak-builder"/>
@@ -584,7 +583,6 @@
     <package name="fontconfig-devel"/>
     <package name="fonts-KanjiStrokeOrders"/>
     <package name="fonts-config"/>
-    <package name="fontsproto-devel"/>
     <package name="fprintd"/>
     <package name="fprintd-lang"/>
     <package name="fprintd-pam"/>
@@ -723,7 +721,6 @@
     <package name="glibc-info"/>
     <package name="glibc-locale"/>
     <package name="glibc-locale-32bit"/>
-    <package name="glproto-devel"/>
     <package name="gmp-devel"/>
     <package name="gnome-backgrounds"/>
     <package name="gnome-backgrounds-lang"/>
@@ -1075,7 +1072,6 @@
     <package name="info"/>
     <package name="initviocons"/>
     <package name="inn"/>
-    <package name="inputproto-devel"/>
     <package name="insserv-compat"/>
     <package name="inst-source-utils"/>
     <package name="install-initrd-Kubic"/>
@@ -1174,7 +1170,6 @@
     <package name="kblocks-lang"/>
     <package name="kbounce"/>
     <package name="kbounce-lang"/>
-    <package name="kbproto-devel"/>
     <package name="kbreakout"/>
     <package name="kbreakout-lang"/>
     <package name="kbruch"/>
@@ -4136,7 +4131,6 @@
     <package name="pragha-plugins"/>
     <package name="prctl"/>
     <package name="presage-data"/>
-    <package name="presentproto-devel"/>
     <package name="printproto-devel"/>
     <package name="prison-qt5-imports"/>
     <package name="privoxy"/>
@@ -4346,7 +4340,6 @@
     <package name="quota"/>
     <package name="quota-nfs"/>
     <package name="radvd"/>
-    <package name="randrproto-devel"/>
     <package name="rarpd"/>
     <package name="rcc-runtime"/>
     <package name="rdesktop"/>
@@ -4365,8 +4358,6 @@
     <package name="remmina-plugin-secret"/>
     <package name="remmina-plugin-vnc"/>
     <package name="remmina-plugin-xdmcp"/>
-    <package name="renderproto-devel"/>
-    <package name="resourceproto-devel"/>
     <package name="rgb"/>
     <package name="rhino"/>
     <package name="ripit"/>
@@ -4616,7 +4607,6 @@
     <package name="scim-qt4"/>
     <package name="scout"/>
     <package name="screen"/>
-    <package name="scrnsaverproto-devel"/>
     <package name="sddm"/>
     <package name="sddm-branding-openSUSE"/>
     <package name="sddm-theme-openSUSE"/>
@@ -4993,7 +4983,6 @@
     <package name="vdr"/>
     <package name="vdr-lang"/>
     <package name="vhba-kmp-default"/>
-    <package name="videoproto-devel"/>
     <package name="viewnior"/>
     <package name="viewnior-lang"/>
     <package name="viewvc"/>
@@ -5085,7 +5074,6 @@
     <package name="xerces-j2"/>
     <package name="xerces-j2-xml-apis"/>
     <package name="xerces-j2-xml-resolver"/>
-    <package name="xextproto-devel"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
     <package name="xf86-input-keyboard"/>
@@ -5121,7 +5109,6 @@
     <package name="xf86-video-vesa"/>
     <package name="xf86-video-vmware"/>
     <package name="xf86-video-voodoo"/>
-    <package name="xf86driproto-devel"/>
     <package name="xfce4-appfinder"/>
     <package name="xfce4-appfinder-lang"/>
     <package name="xfce4-dev-tools"/>
@@ -5218,7 +5205,6 @@
     <package name="xfwm4-themes"/>
     <package name="xhost"/>
     <package name="xhtml-dtd"/>
-    <package name="xineramaproto-devel"/>
     <package name="xinetd"/>
     <package name="xinit"/>
     <package name="xkbcomp"/>
@@ -5253,10 +5239,10 @@
     <package name="xorg-x11-server"/>
     <package name="xorg-x11-server-sdk"/>
     <package name="xorg-x11-server-wayland"/>
+    <package name="xorgproto-devel"/>
     <package name="xorriso"/>
     <package name="xournal"/>
     <package name="xprop"/>
-    <package name="xproto-devel"/>
     <package name="xrandr"/>
     <package name="xrdb"/>
     <package name="xsane"/>
diff --git a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
index dc29edf6..2e214e4a 100644
--- a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
@@ -91,7 +91,6 @@
       <repopackage name="cross-s390x-gcc47-icecream-backend" onlyarch="skipit"/>
       <repopackage name="cross-x86_64-gcc47-icecream-backend" onlyarch="skipit"/>
       <repopackage name="curl-mini" onlyarch="skipit"/>
-      <repopackage name="damageproto-devel"/>
       <repopackage name="dbench-ctcs2-glue" onlyarch="skipit"/>
       <repopackage name="desktop-data-SLED" onlyarch="skipit"/>
       <repopackage name="desktop-data-SLED-extra-gnome" onlyarch="skipit"/>
@@ -553,7 +552,6 @@
       <repopackage name="udev-mini" onlyarch="skipit"/>
       <repopackage name="unrar"/>
       <repopackage name="wayland-devel"/>
-      <repopackage name="xf86vidmodeproto-devel"/>
       <repopackage name="xv"/>
       <repopackage name="yast2-all-packages" onlyarch="skipit"/>
       <repopackage name="yast2-branding-SLED" onlyarch="skipit"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 0f83e237..220867c7 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -441,8 +441,6 @@
       <repopackage name="dracut" arch="i586,i686"/>
       <repopackage name="dragonplayer" arch="i586,i686"/>
       <repopackage name="dragonplayer-lang" arch="i586,i686"/>
-      <repopackage name="dri2proto-devel" arch="i586,i686"/>
-      <repopackage name="dri3proto-devel" arch="i586,i686"/>
       <repopackage name="drkonqi5" arch="i586,i686"/>
       <repopackage name="drkonqi5-lang" arch="i586,i686"/>
       <repopackage name="dump-rmt" arch="i586,i686"/>
@@ -467,9 +465,11 @@
       <repopackage name="elilo" arch="i586,i686"/>
       <repopackage name="emacs" arch="i586,i686"/>
       <repopackage name="emacs-apel" arch="i586,i686"/>
+      <repopackage name="emacs-flim" arch="i586,i686"/>
       <repopackage name="emacs-info" arch="i586,i686"/>
       <repopackage name="emacs-nox" arch="i586,i686"/>
       <repopackage name="emacs-plugin-devhelp" arch="i586,i686"/>
+      <repopackage name="emacs-w3m" arch="i586,i686"/>
       <repopackage name="emacs-x11" arch="i586,i686"/>
       <repopackage name="enblend-enfuse" arch="i586,i686"/>
       <repopackage name="enchant-1-backend-voikko" arch="i586,i686"/>
@@ -566,7 +566,6 @@
       <repopackage name="firewall-macros" arch="i586,i686"/>
       <repopackage name="firewalld" arch="i586,i686"/>
       <repopackage name="firewalld-lang" arch="i586,i686"/>
-      <repopackage name="fixesproto-devel" arch="i586,i686"/>
       <repopackage name="flac" arch="i586,i686"/>
       <repopackage name="flatpak" arch="i586,i686"/>
       <repopackage name="flatpak-builder" arch="i586,i686"/>
@@ -576,7 +575,6 @@
       <repopackage name="fontconfig-devel" arch="i586,i686"/>
       <repopackage name="fonts-config" arch="i586,i686"/>
       <repopackage name="fonts-KanjiStrokeOrders" arch="i586,i686"/>
-      <repopackage name="fontsproto-devel" arch="i586,i686"/>
       <repopackage name="fortune" arch="i586,i686"/>
       <repopackage name="fossil" arch="i586,i686"/>
       <repopackage name="fprintd" arch="i586,i686"/>
@@ -735,7 +733,6 @@
       <repopackage name="glibc-extra" arch="i586,i686"/>
       <repopackage name="glibc-info" arch="i586,i686"/>
       <repopackage name="glibc-locale" arch="i586,i686"/>
-      <repopackage name="glproto-devel" arch="i586,i686"/>
       <repopackage name="gmp-devel" arch="i586,i686"/>
       <repopackage name="gnome-backgrounds" arch="i586,i686"/>
       <repopackage name="gnome-backgrounds-lang" arch="i586,i686"/>
@@ -1080,7 +1077,6 @@
       <repopackage name="info" arch="i586,i686"/>
       <repopackage name="initviocons" arch="i586,i686"/>
       <repopackage name="inn" arch="i586,i686"/>
-      <repopackage name="inputproto-devel" arch="i586,i686"/>
       <repopackage name="insserv-compat" arch="i586,i686"/>
       <repopackage name="inst-source-utils" arch="i586,i686"/>
       <repopackage name="install-initrd-openSUSE" arch="i586,i686"/>
@@ -1179,7 +1175,6 @@
       <repopackage name="kblocks-lang" arch="i586,i686"/>
       <repopackage name="kbounce" arch="i586,i686"/>
       <repopackage name="kbounce-lang" arch="i586,i686"/>
-      <repopackage name="kbproto-devel" arch="i586,i686"/>
       <repopackage name="kbreakout" arch="i586,i686"/>
       <repopackage name="kbreakout-lang" arch="i586,i686"/>
       <repopackage name="kbruch" arch="i586,i686"/>
@@ -4044,7 +4039,6 @@
       <repopackage name="pragha-plugins" arch="i586,i686"/>
       <repopackage name="prctl" arch="i586,i686"/>
       <repopackage name="presage-data" arch="i586,i686"/>
-      <repopackage name="presentproto-devel" arch="i586,i686"/>
       <repopackage name="printproto-devel" arch="i586,i686"/>
       <repopackage name="prison-qt5-imports" arch="i586,i686"/>
       <repopackage name="privoxy" arch="i586,i686"/>
@@ -4248,7 +4242,6 @@
       <repopackage name="quota" arch="i586,i686"/>
       <repopackage name="quota-nfs" arch="i586,i686"/>
       <repopackage name="radvd" arch="i586,i686"/>
-      <repopackage name="randrproto-devel" arch="i586,i686"/>
       <repopackage name="rarpd" arch="i586,i686"/>
       <repopackage name="rcc-runtime" arch="i586,i686"/>
       <repopackage name="rdesktop" arch="i586,i686"/>
@@ -4267,8 +4260,6 @@
       <repopackage name="remmina-plugin-secret" arch="i586,i686"/>
       <repopackage name="remmina-plugin-vnc" arch="i586,i686"/>
       <repopackage name="remmina-plugin-xdmcp" arch="i586,i686"/>
-      <repopackage name="renderproto-devel" arch="i586,i686"/>
-      <repopackage name="resourceproto-devel" arch="i586,i686"/>
       <repopackage name="rgb" arch="i586,i686"/>
       <repopackage name="rhino" arch="i586,i686"/>
       <repopackage name="ripit" arch="i586,i686"/>
@@ -4515,7 +4506,6 @@
       <repopackage name="scim-qt4" arch="i586,i686"/>
       <repopackage name="scout" arch="i586,i686"/>
       <repopackage name="screen" arch="i586,i686"/>
-      <repopackage name="scrnsaverproto-devel" arch="i586,i686"/>
       <repopackage name="sddm" arch="i586,i686"/>
       <repopackage name="sddm-branding-openSUSE" arch="i586,i686"/>
       <repopackage name="sddm-theme-openSUSE" arch="i586,i686"/>
@@ -4887,7 +4877,6 @@
       <repopackage name="vdr" arch="i586,i686"/>
       <repopackage name="vdr-lang" arch="i586,i686"/>
       <repopackage name="vhba-kmp-default" arch="i586,i686"/>
-      <repopackage name="videoproto-devel" arch="i586,i686"/>
       <repopackage name="viewnior" arch="i586,i686"/>
       <repopackage name="viewnior-lang" arch="i586,i686"/>
       <repopackage name="viewvc" arch="i586,i686"/>
@@ -4978,7 +4967,6 @@
       <repopackage name="xerces-j2" arch="i586,i686"/>
       <repopackage name="xerces-j2-xml-apis" arch="i586,i686"/>
       <repopackage name="xerces-j2-xml-resolver" arch="i586,i686"/>
-      <repopackage name="xextproto-devel" arch="i586,i686"/>
       <repopackage name="xf86-input-evdev" arch="i586,i686"/>
       <repopackage name="xf86-input-joystick" arch="i586,i686"/>
       <repopackage name="xf86-input-keyboard" arch="i586,i686"/>
@@ -5014,7 +5002,6 @@
       <repopackage name="xf86-video-vesa" arch="i586,i686"/>
       <repopackage name="xf86-video-vmware" arch="i586,i686"/>
       <repopackage name="xf86-video-voodoo" arch="i586,i686"/>
-      <repopackage name="xf86driproto-devel" arch="i586,i686"/>
       <repopackage name="xfce4-appfinder" arch="i586,i686"/>
       <repopackage name="xfce4-appfinder-lang" arch="i586,i686"/>
       <repopackage name="xfce4-dev-tools" arch="i586,i686"/>
@@ -5111,7 +5098,6 @@
       <repopackage name="xfwm4-themes" arch="i586,i686"/>
       <repopackage name="xhost" arch="i586,i686"/>
       <repopackage name="xhtml-dtd" arch="i586,i686"/>
-      <repopackage name="xineramaproto-devel" arch="i586,i686"/>
       <repopackage name="xinetd" arch="i586,i686"/>
       <repopackage name="xinit" arch="i586,i686"/>
       <repopackage name="xkbcomp" arch="i586,i686"/>
@@ -5146,10 +5132,10 @@
       <repopackage name="xorg-x11-server" arch="i586,i686"/>
       <repopackage name="xorg-x11-server-sdk" arch="i586,i686"/>
       <repopackage name="xorg-x11-server-wayland" arch="i586,i686"/>
+      <repopackage name="xorgproto-devel" arch="i586,i686"/>
       <repopackage name="xorriso" arch="i586,i686"/>
       <repopackage name="xournal" arch="i586,i686"/>
       <repopackage name="xprop" arch="i586,i686"/>
-      <repopackage name="xproto-devel" arch="i586,i686"/>
       <repopackage name="xrandr" arch="i586,i686"/>
       <repopackage name="xrdb" arch="i586,i686"/>
       <repopackage name="xsane" arch="i586,i686"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index 63089eb9..eb3deb21 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -453,8 +453,6 @@
       <repopackage name="drbd" arch="x86_64"/>
       <repopackage name="drbd-kmp-default" arch="x86_64"/>
       <repopackage name="drbd-utils" arch="x86_64"/>
-      <repopackage name="dri2proto-devel" arch="x86_64"/>
-      <repopackage name="dri3proto-devel" arch="x86_64"/>
       <repopackage name="drkonqi5" arch="x86_64"/>
       <repopackage name="drkonqi5-lang" arch="x86_64"/>
       <repopackage name="dump-rmt" arch="x86_64"/>
@@ -479,9 +477,11 @@
       <repopackage name="elilo" arch="x86_64"/>
       <repopackage name="emacs" arch="x86_64"/>
       <repopackage name="emacs-apel" arch="x86_64"/>
+      <repopackage name="emacs-flim" arch="x86_64"/>
       <repopackage name="emacs-info" arch="x86_64"/>
       <repopackage name="emacs-nox" arch="x86_64"/>
       <repopackage name="emacs-plugin-devhelp" arch="x86_64"/>
+      <repopackage name="emacs-w3m" arch="x86_64"/>
       <repopackage name="emacs-x11" arch="x86_64"/>
       <repopackage name="enblend-enfuse" arch="x86_64"/>
       <repopackage name="enchant-1-backend-voikko" arch="x86_64"/>
@@ -576,7 +576,6 @@
       <repopackage name="firewall-macros" arch="x86_64"/>
       <repopackage name="firewalld" arch="x86_64"/>
       <repopackage name="firewalld-lang" arch="x86_64"/>
-      <repopackage name="fixesproto-devel" arch="x86_64"/>
       <repopackage name="flac" arch="x86_64"/>
       <repopackage name="flatpak" arch="x86_64"/>
       <repopackage name="flatpak-builder" arch="x86_64"/>
@@ -587,7 +586,6 @@
       <repopackage name="fontconfig-devel" arch="x86_64"/>
       <repopackage name="fonts-config" arch="x86_64"/>
       <repopackage name="fonts-KanjiStrokeOrders" arch="x86_64"/>
-      <repopackage name="fontsproto-devel" arch="x86_64"/>
       <repopackage name="fprintd" arch="x86_64"/>
       <repopackage name="fprintd-lang" arch="x86_64"/>
       <repopackage name="fprintd-pam" arch="x86_64"/>
@@ -728,7 +726,6 @@
       <repopackage name="glibc-info" arch="x86_64"/>
       <repopackage name="glibc-locale" arch="x86_64"/>
       <repopackage name="glibc-locale-32bit" arch="x86_64"/>
-      <repopackage name="glproto-devel" arch="x86_64"/>
       <repopackage name="gmp-devel" arch="x86_64"/>
       <repopackage name="gnome-backgrounds" arch="x86_64"/>
       <repopackage name="gnome-backgrounds-lang" arch="x86_64"/>
@@ -1082,7 +1079,6 @@
       <repopackage name="info" arch="x86_64"/>
       <repopackage name="initviocons" arch="x86_64"/>
       <repopackage name="inn" arch="x86_64"/>
-      <repopackage name="inputproto-devel" arch="x86_64"/>
       <repopackage name="insserv-compat" arch="x86_64"/>
       <repopackage name="inst-source-utils" arch="x86_64"/>
       <repopackage name="install-initrd-Kubic" arch="x86_64"/>
@@ -1181,7 +1177,6 @@
       <repopackage name="kblocks-lang" arch="x86_64"/>
       <repopackage name="kbounce" arch="x86_64"/>
       <repopackage name="kbounce-lang" arch="x86_64"/>
-      <repopackage name="kbproto-devel" arch="x86_64"/>
       <repopackage name="kbreakout" arch="x86_64"/>
       <repopackage name="kbreakout-lang" arch="x86_64"/>
       <repopackage name="kbruch" arch="x86_64"/>
@@ -4189,7 +4184,6 @@
       <repopackage name="pragha-plugins" arch="x86_64"/>
       <repopackage name="prctl" arch="x86_64"/>
       <repopackage name="presage-data" arch="x86_64"/>
-      <repopackage name="presentproto-devel" arch="x86_64"/>
       <repopackage name="printproto-devel" arch="x86_64"/>
       <repopackage name="prison-qt5-imports" arch="x86_64"/>
       <repopackage name="privoxy" arch="x86_64"/>
@@ -4399,7 +4393,6 @@
       <repopackage name="quota" arch="x86_64"/>
       <repopackage name="quota-nfs" arch="x86_64"/>
       <repopackage name="radvd" arch="x86_64"/>
-      <repopackage name="randrproto-devel" arch="x86_64"/>
       <repopackage name="rarpd" arch="x86_64"/>
       <repopackage name="rcc-runtime" arch="x86_64"/>
       <repopackage name="rdesktop" arch="x86_64"/>
@@ -4418,8 +4411,6 @@
       <repopackage name="remmina-plugin-secret" arch="x86_64"/>
       <repopackage name="remmina-plugin-vnc" arch="x86_64"/>
       <repopackage name="remmina-plugin-xdmcp" arch="x86_64"/>
-      <repopackage name="renderproto-devel" arch="x86_64"/>
-      <repopackage name="resourceproto-devel" arch="x86_64"/>
       <repopackage name="rgb" arch="x86_64"/>
       <repopackage name="rhino" arch="x86_64"/>
       <repopackage name="ripit" arch="x86_64"/>
@@ -4669,7 +4660,6 @@
       <repopackage name="scim-qt4" arch="x86_64"/>
       <repopackage name="scout" arch="x86_64"/>
       <repopackage name="screen" arch="x86_64"/>
-      <repopackage name="scrnsaverproto-devel" arch="x86_64"/>
       <repopackage name="sddm" arch="x86_64"/>
       <repopackage name="sddm-branding-openSUSE" arch="x86_64"/>
       <repopackage name="sddm-theme-openSUSE" arch="x86_64"/>
@@ -5047,7 +5037,6 @@
       <repopackage name="vdr" arch="x86_64"/>
       <repopackage name="vdr-lang" arch="x86_64"/>
       <repopackage name="vhba-kmp-default" arch="x86_64"/>
-      <repopackage name="videoproto-devel" arch="x86_64"/>
       <repopackage name="viewnior" arch="x86_64"/>
       <repopackage name="viewnior-lang" arch="x86_64"/>
       <repopackage name="viewvc" arch="x86_64"/>
@@ -5142,7 +5131,6 @@
       <repopackage name="xerces-j2" arch="x86_64"/>
       <repopackage name="xerces-j2-xml-apis" arch="x86_64"/>
       <repopackage name="xerces-j2-xml-resolver" arch="x86_64"/>
-      <repopackage name="xextproto-devel" arch="x86_64"/>
       <repopackage name="xf86-input-evdev" arch="x86_64"/>
       <repopackage name="xf86-input-joystick" arch="x86_64"/>
       <repopackage name="xf86-input-keyboard" arch="x86_64"/>
@@ -5178,7 +5166,6 @@
       <repopackage name="xf86-video-vesa" arch="x86_64"/>
       <repopackage name="xf86-video-vmware" arch="x86_64"/>
       <repopackage name="xf86-video-voodoo" arch="x86_64"/>
-      <repopackage name="xf86driproto-devel" arch="x86_64"/>
       <repopackage name="xfce4-appfinder" arch="x86_64"/>
       <repopackage name="xfce4-appfinder-lang" arch="x86_64"/>
       <repopackage name="xfce4-dev-tools" arch="x86_64"/>
@@ -5275,7 +5262,6 @@
       <repopackage name="xfwm4-themes" arch="x86_64"/>
       <repopackage name="xhost" arch="x86_64"/>
       <repopackage name="xhtml-dtd" arch="x86_64"/>
-      <repopackage name="xineramaproto-devel" arch="x86_64"/>
       <repopackage name="xinetd" arch="x86_64"/>
       <repopackage name="xinit" arch="x86_64"/>
       <repopackage name="xkbcomp" arch="x86_64"/>
@@ -5310,10 +5296,10 @@
       <repopackage name="xorg-x11-server" arch="x86_64"/>
       <repopackage name="xorg-x11-server-sdk" arch="x86_64"/>
       <repopackage name="xorg-x11-server-wayland" arch="x86_64"/>
+      <repopackage name="xorgproto-devel" arch="x86_64"/>
       <repopackage name="xorriso" arch="x86_64"/>
       <repopackage name="xournal" arch="x86_64"/>
       <repopackage name="xprop" arch="x86_64"/>
-      <repopackage name="xproto-devel" arch="x86_64"/>
       <repopackage name="xrandr" arch="x86_64"/>
       <repopackage name="xrdb" arch="x86_64"/>
       <repopackage name="xsane" arch="x86_64"/>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
index be906467..4874b727 100644
--- a/openSUSE-Addon-NonOss-Deps.group
+++ b/openSUSE-Addon-NonOss-Deps.group
@@ -13,7 +13,6 @@
     <package name="Mesa-libglapi-devel"/>
     <package name="alsa-devel"/>
     <package name="bsdiff"/>
-    <package name="damageproto-devel"/>
     <package name="freeglut-devel"/>
     <package name="glu-devel"/>
     <package name="libOSMesa-devel"/>
@@ -34,6 +33,5 @@
     <package name="steamtricks-data"/>
     <package name="ubuntu-fonts"/>
     <package name="wayland-devel"/>
-    <package name="xf86vidmodeproto-devel"/>
   </packagelist>
 </group>