diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui
index ca3f8597..0608eaf4 100644
--- a/amarok/src/Options1.ui
+++ b/amarok/src/Options1.ui
@@ -684,6 +684,9 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options1.ui.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
 <Q_SLOTS>
     <slot>slotUpdateMoodFrame()</slot>
@@ -692,9 +695,4 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index 94d80460..281e82f3 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -744,6 +744,9 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options2.ui.h</include>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
 <Q_SLOTS>
     <slot>installPushButton_clicked()</slot>
@@ -756,13 +759,4 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-    <includehint>tdefontrequester.h</includehint>
-    <includehint>tdefontrequester.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui
index 0f068752..077b8d43 100644
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@@ -506,6 +506,11 @@
 <includes>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
     <include location="global" impldecl="in implementation">tqdesktopwidget.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="local" impldecl="in declaration">osd.h</include>
 </includes>
 <variables>
@@ -525,7 +530,4 @@
     <function access="protected">showEvent( TQShowEvent * )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextedit.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/Options7.ui b/amarok/src/Options7.ui
index 8b6fffe0..2bc18c49 100644
--- a/amarok/src/Options7.ui
+++ b/amarok/src/Options7.ui
@@ -74,8 +74,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 7ae99160..124f7f36 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -290,16 +290,11 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">Options8.ui.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">updateServices( const TQString &amp; s )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui
index f8186c08..2339a086 100644
--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@@ -448,6 +448,9 @@
     <include location="local" impldecl="in implementation">config.h</include>
     <include location="local" impldecl="in implementation">debug.h</include>
     <include location="local" impldecl="in implementation">dbsetup.ui.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
 <Q_SLOTS>
     <slot>databaseEngine_activated( int )</slot>
@@ -456,13 +459,4 @@
     <function access="private">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui
index 5a21c0b5..f3706f97 100644
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@@ -129,7 +129,7 @@
     <slot access="protected">slotShouldDelete(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui
index 50e87bbf..a62fb86b 100644
--- a/amarok/src/engine/xine/xineconfigbase.ui
+++ b/amarok/src/engine/xine/xineconfigbase.ui
@@ -501,6 +501,8 @@
 </widget>
 <includes>
     <include location="local" impldecl="in declaration">plugin/pluginconfig.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui
index b112c078..c6613fa6 100644
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@@ -291,12 +291,8 @@
     <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>dbsetup.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">dbsetup.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
index 4e1b02c2..6d7499f8 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
@@ -112,9 +112,9 @@
     <slot access="protected">downloadButtonClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
index a58a0dda..26a2062d 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@@ -103,7 +103,7 @@
     <slot access="protected">selectionChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui
index 3df6bb40..ac17a494 100644
--- a/amarok/src/mediadevice/daap/addhostbase.ui
+++ b/amarok/src/mediadevice/daap/addhostbase.ui
@@ -171,10 +171,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
index e3468e17..f0bddeac 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -434,6 +434,7 @@
     <include location="global" impldecl="in implementation">collectionbrowser.h</include>
     <include location="local" impldecl="in declaration">genericmediadevice.h</include>
     <include location="global" impldecl="in declaration">tqpopupmenu.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
 <variables>
     <variable access="private">TQPopupMenu *m_unsupportedMenu;</variable>
@@ -457,7 +458,4 @@
     <function access="private" specifier="non virtual">destroy()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui
index af4ea8b1..47e02f57 100644
--- a/amarok/src/newdynamic.ui
+++ b/amarok/src/newdynamic.ui
@@ -352,9 +352,8 @@
     <tabstop>m_upcomingIntSpinBox</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>playlistselection.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">playlistselection.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui
index 1f9548ef..2f5740a6 100644
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@@ -563,6 +563,9 @@
     <include location="global" impldecl="in declaration">metabundle.h</include>
     <include location="global" impldecl="in implementation">tqdialog.h</include>
     <include location="global" impldecl="in implementation">tqstring.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
 <variables>
     <variable>MetaBundle previewBundle;</variable>
@@ -586,11 +589,4 @@
     <function>init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/podcastsettingsbase.ui b/amarok/src/podcastsettingsbase.ui
index c503b4e7..124bbf72 100644
--- a/amarok/src/podcastsettingsbase.ui
+++ b/amarok/src/podcastsettingsbase.ui
@@ -211,9 +211,9 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui
index c3ca95aa..b5809495 100644
--- a/amarok/src/scriptmanagerbase.ui
+++ b/amarok/src/scriptmanagerbase.ui
@@ -129,6 +129,7 @@
 </widget>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="0"/>
 <layoutfunctions spacing="KDialog::spacingHint"/>
diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui
index ef2e1b16..96e869bf 100644
--- a/amarok/src/scripts/graphequalizer/eqdialog.ui
+++ b/amarok/src/scripts/graphequalizer/eqdialog.ui
@@ -198,6 +198,7 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">eqdialog.ui.h</include>
+    <include location="global" impldecl="in implementation">equalizercanvasview.h</include>
 </includes>
 <Q_SLOTS>
     <slot>eqGroupBox_toggled( bool eqEnabled )</slot>
@@ -206,7 +207,4 @@
     <function specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>equalizercanvasview.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui
index 589f6fb1..ab8aa969 100644
--- a/amarok/src/tagdialogbase.ui
+++ b/amarok/src/tagdialogbase.ui
@@ -821,26 +821,12 @@
 </tabstops>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktabwidget.h</includehint>
-    <includehint>coverfetcher.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">ktabwidget.h</include>
+    <include location="global" impldecl="in implementation">coverfetcher.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index 49fb9219..6556725d 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -190,6 +190,8 @@ Note that the order in which the schemes appear in the list is relevant, since t
 </customwidgets>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <Q_SLOTS>
     <slot specifier="non virtual">slotCurrentChanged( TQListViewItem * item )</slot>
@@ -210,13 +212,4 @@ Note that the order in which the schemes appear in the list is relevant, since t
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
 <layoutfunctions spacing="KDialog::spacingHint"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui
index b997554d..e01a2c50 100644
--- a/amarok/src/trackpickerdialogbase.ui
+++ b/amarok/src/trackpickerdialogbase.ui
@@ -176,7 +176,7 @@
     <tabstop>trackList</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>