diff --git a/tderadio3/plugins/alsa-sound/alsa-mixer-element-ui.ui b/tderadio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
index 54467cc..87cdfa5 100644
--- a/tderadio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
+++ b/tderadio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
@@ -264,7 +264,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="2"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/tderadio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui b/tderadio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
index df64968..9484f18 100644
--- a/tderadio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
+++ b/tderadio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
@@ -312,12 +312,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/tderadio3/plugins/lirc/lirc-configuration-ui.ui b/tderadio3/plugins/lirc/lirc-configuration-ui.ui
index a0beb27..ca0ce59 100644
--- a/tderadio3/plugins/lirc/lirc-configuration-ui.ui
+++ b/tderadio3/plugins/lirc/lirc-configuration-ui.ui
@@ -104,7 +104,7 @@
 </customwidgets>
 <pixmapfunction>SmallIconSet</pixmapfunction>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/tderadio3/plugins/oss-sound/oss-sound-configuration-ui.ui b/tderadio3/plugins/oss-sound/oss-sound-configuration-ui.ui
index 422924f..eca5c58 100644
--- a/tderadio3/plugins/oss-sound/oss-sound-configuration-ui.ui
+++ b/tderadio3/plugins/oss-sound/oss-sound-configuration-ui.ui
@@ -120,13 +120,10 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/tderadio3/plugins/radio/radio-configuration-ui.ui b/tderadio3/plugins/radio/radio-configuration-ui.ui
index 8acc582..63ea82f 100644
--- a/tderadio3/plugins/radio/radio-configuration-ui.ui
+++ b/tderadio3/plugins/radio/radio-configuration-ui.ui
@@ -758,17 +758,14 @@
     <tabstop>editMedia</tabstop>
     <tabstop>editComment</tabstop>
 </tabstops>
+<pixmapfunction>SmallIconSet</pixmapfunction>
+<layoutdefaults spacing="6" margin="0"/>
 <includes>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
-    <include location="global" impldecl="in implementation">tqwidgetstack.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">src/include/radiostation-listview.h</include>
+    <include location="global" impldecl="in implementation">tqwidgetstack.h</include>
 </includes>
-<pixmapfunction>SmallIconSet</pixmapfunction>
-<layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>src/include/radiostation-listview.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tderadio3/plugins/recording/recording-configuration-ui.ui b/tderadio3/plugins/recording/recording-configuration-ui.ui
index 2a90973..99d7e0a 100644
--- a/tderadio3/plugins/recording/recording-configuration-ui.ui
+++ b/tderadio3/plugins/recording/recording-configuration-ui.ui
@@ -717,15 +717,10 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/tderadio3/plugins/streaming/streaming-configuration-ui.ui b/tderadio3/plugins/streaming/streaming-configuration-ui.ui
index 42636ec..2d4cf7f 100644
--- a/tderadio3/plugins/streaming/streaming-configuration-ui.ui
+++ b/tderadio3/plugins/streaming/streaming-configuration-ui.ui
@@ -758,20 +758,12 @@
     <tabstop>m_cbEndianess</tabstop>
     <tabstop>m_cbChannels</tabstop>
 </tabstops>
+<pixmapfunction>SmallIconSet</pixmapfunction>
+<layoutdefaults spacing="6" margin="0"/>
 <includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<pixmapfunction>SmallIconSet</pixmapfunction>
-<layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
index a85f11b..f528418 100644
--- a/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
+++ b/tderadio3/plugins/timecontrol/timecontrol-configuration-ui.ui
@@ -441,12 +441,10 @@
     <tabstop>checkboxAlarmEnable</tabstop>
     <tabstop>comboStationSelection</tabstop>
 </tabstops>
+<pixmapfunction>SmallIcon</pixmapfunction>
+<layoutdefaults spacing="6" margin="0"/>
 <includes>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
 </includes>
-<pixmapfunction>SmallIcon</pixmapfunction>
-<layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/tderadio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/tderadio3/plugins/v4lradio/v4lradio-configuration-ui.ui
index 4462938..63cdc59 100644
--- a/tderadio3/plugins/v4lradio/v4lradio-configuration-ui.ui
+++ b/tderadio3/plugins/v4lradio/v4lradio-configuration-ui.ui
@@ -946,21 +946,11 @@
     <tabstop>editMaxFrequency</tabstop>
     <tabstop>editSignalMinQuality</tabstop>
 </tabstops>
+<pixmapfunction>SmallIconSet</pixmapfunction>
+<layoutdefaults spacing="6" margin="0"/>
 <includes>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">ktabwidget.h</include>
 </includes>
-<pixmapfunction>SmallIconSet</pixmapfunction>
-<layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>ktabwidget.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
 </UI>
diff --git a/tderadio3/src/pluginmanager-configuration-ui.ui b/tderadio3/src/pluginmanager-configuration-ui.ui
index ed3e75e..921da5c 100644
--- a/tderadio3/src/pluginmanager-configuration-ui.ui
+++ b/tderadio3/src/pluginmanager-configuration-ui.ui
@@ -376,21 +376,14 @@
 </widget>
 <customwidgets>
 </customwidgets>
+<pixmapfunction>SmallIconSet</pixmapfunction>
+<layoutdefaults spacing="6" margin="0"/>
 <includes>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<pixmapfunction>SmallIconSet</pixmapfunction>
-<layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/tderadio3/src/stationselector-ui.ui b/tderadio3/src/stationselector-ui.ui
index 2844baf..3020fe5 100644
--- a/tderadio3/src/stationselector-ui.ui
+++ b/tderadio3/src/stationselector-ui.ui
@@ -161,13 +161,11 @@
         <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
     </image>
 </images>
+<pixmapfunction>SmallIconSet</pixmapfunction>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">radiostation-listview.h</include>
 </includes>
-<pixmapfunction>SmallIconSet</pixmapfunction>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>radiostation-listview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>