diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui
index 6b18120..ce24474 100644
--- a/src/ksvnwidgets/authdlg.ui
+++ b/src/ksvnwidgets/authdlg.ui
@@ -188,8 +188,7 @@
     <slot access="protected">slotHelp()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui
index c79adbb..6be884e 100644
--- a/src/ksvnwidgets/logmessage.ui
+++ b/src/ksvnwidgets/logmessage.ui
@@ -336,9 +336,8 @@
     <slot access="protected">insertFile()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="2" margin="2"/>
-<includehints>
-    <includehint>ktextedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>depthselector.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/src/ksvnwidgets/ssltrustprompt.ui b/src/ksvnwidgets/ssltrustprompt.ui
index 20add40..7d9e332 100644
--- a/src/ksvnwidgets/ssltrustprompt.ui
+++ b/src/ksvnwidgets/ssltrustprompt.ui
@@ -34,7 +34,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="2" margin="2"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
 </UI>
diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui
index 864edf2..ca9a885 100644
--- a/src/settings/cmdexecsettings.ui
+++ b/src/settings/cmdexecsettings.ui
@@ -147,9 +147,8 @@
     <slot access="protected">showLogToggled(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui
index 86c8e2f..4b2b5dd 100644
--- a/src/settings/diffmergesettings.ui
+++ b/src/settings/diffmergesettings.ui
@@ -243,9 +243,7 @@ When %1 and %2 is given, tdesvn let this display make the diff. For that it it m
     <slot access="protected">diffDispChanged(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui
index d2bc5c7..bc0a5f6 100644
--- a/src/settings/dispcolor_settings.ui
+++ b/src/settings/dispcolor_settings.ui
@@ -245,15 +245,7 @@
     <slot access="protected">coloredStateToggled(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui
index 82d92e4..be6ef19 100644
--- a/src/settings/display_settings.ui
+++ b/src/settings/display_settings.ui
@@ -235,9 +235,8 @@ When kde-default is wanted for opening on double click, enter &amp;quot;default&
     <slot access="protected">dispFileInfotoggled(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>klineedit.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>
+</includes>
 </UI>
diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui
index b8a9ce4..da2d801 100644
--- a/src/settings/revisiontree_settings.ui
+++ b/src/settings/revisiontree_settings.ui
@@ -237,11 +237,7 @@
     <tabstop>m_BottomTop</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui
index 4651078..7157584 100644
--- a/src/settings/subversion_settings.ui
+++ b/src/settings/subversion_settings.ui
@@ -242,8 +242,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui
index 0f3a136..f4ec033 100644
--- a/src/svnfrontend/blamedisplay.ui
+++ b/src/svnfrontend/blamedisplay.ui
@@ -105,7 +105,7 @@
     <slot access="protected">slotItemDoubleClicked(TQListViewItem*)</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/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui
index f16b5b0..c1af479 100644
--- a/src/svnfrontend/copymoveview.ui
+++ b/src/svnfrontend/copymoveview.ui
@@ -94,9 +94,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="2" margin="2"/>
-<includehints>
-    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui
index 0ca5ef5..64d73e4 100644
--- a/src/svnfrontend/createrepo_dlg.ui
+++ b/src/svnfrontend/createrepo_dlg.ui
@@ -198,10 +198,8 @@
     <slot access="protected">compatChanged14(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui
index 5238574..0d15e28 100644
--- a/src/svnfrontend/dumprepo_dlg.ui
+++ b/src/svnfrontend/dumprepo_dlg.ui
@@ -185,16 +185,8 @@
     <slot access="protected">slotDumpRange(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<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>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui
index 237f802..5e06fd9 100644
--- a/src/svnfrontend/editpropsdlg.ui
+++ b/src/svnfrontend/editpropsdlg.ui
@@ -236,9 +236,8 @@
     <slot access="protected">showHelp()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui
index dabaeec..8f3ed80 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -210,14 +210,7 @@
     <slot access="protected">urlChanged(const TQString&amp;)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="2" margin="2"/>
-<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>rangeinput_impl.h</includehint>
-    <includehint>depthselector.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/fronthelpers/rangeinput.ui b/src/svnfrontend/fronthelpers/rangeinput.ui
index 0b5e4bb..16e806f 100644
--- a/src/svnfrontend/fronthelpers/rangeinput.ui
+++ b/src/svnfrontend/fronthelpers/rangeinput.ui
@@ -270,16 +270,8 @@
     <slot access="protected">stopDateToggled(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="2" margin="2"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kdatetimewidget.h</includehint>
-    <includehint>kdatewidget.h</includehint>
-    <includehint>ktimewidget.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kdatetimewidget.h</includehint>
-    <includehint>kdatewidget.h</includehint>
-    <includehint>ktimewidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdatetimewidget.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/fronthelpers/revisionbutton.ui b/src/svnfrontend/fronthelpers/revisionbutton.ui
index 1ac2d25..b517e7e 100644
--- a/src/svnfrontend/fronthelpers/revisionbutton.ui
+++ b/src/svnfrontend/fronthelpers/revisionbutton.ui
@@ -49,7 +49,7 @@
     <slot>askRevision()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui
index 6dd3193..47c7052 100644
--- a/src/svnfrontend/hotcopydlg.ui
+++ b/src/svnfrontend/hotcopydlg.ui
@@ -83,12 +83,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<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>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui
index 470a266..70a947b 100644
--- a/src/svnfrontend/loaddmpdlg.ui
+++ b/src/svnfrontend/loaddmpdlg.ui
@@ -171,13 +171,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <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">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 547b07b..621ecd0 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -198,16 +198,7 @@
     <slot access="protected">externDisplayToggled(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="2" margin="2"/>
-<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>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>rangeinput_impl.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index 9f29038..b55f2ec 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -466,17 +466,9 @@
     <forward>class TQListViewItem;</forward>
 </forwards>
 <layoutdefaults spacing="2" margin="2"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>revisionbuttonimpl.h</includehint>
-    <includehint>revisionbuttonimpl.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>ktextbrowser.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>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>