diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
index 110187f4..aebfb6ad 100644
--- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
+++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
@@ -224,16 +224,12 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kpassdlg.h</include>
-    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="global" impldecl="in implementation">tdelocale.h</include>
-    <include location="local" impldecl="in implementation">joindomaindlg.ui.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="local"  impldecl="in implementation">joindomaindlg.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot>accept()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpassdlg.h</includehint>
-    <includehint>kpassdlg.h</includehint>
-</includehints>
 </UI>
diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui
index dd1f162d..55c8773d 100644
--- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui
+++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui
@@ -8389,13 +8389,17 @@ This is only available if the SSL libraries have been compiled on your system an
     <tabstop>oplockBreakWaitTimeSpin</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">tqptrlist.h</include>
     <include location="global" impldecl="in declaration">share.h</include>
+    <include location="global" impldecl="in declaration">tqptrlist.h</include>
+    <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="global" impldecl="in implementation">kprocess.h</include>
-    <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurllabel.h</include>
-    <include location="local" impldecl="in implementation">kcminterface.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <include location="local"  impldecl="in implementation">kcminterface.ui.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>changed()</signal>
@@ -8411,10 +8415,4 @@ This is only available if the SSL libraries have been compiled on your system an
     <slot>updateSecurityLevelHelpLbl()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui
index 870654c6..e6e47938 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui
+++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui
@@ -1187,12 +1187,13 @@
     <tabstop>_tabs</tabstop>
   </tabstops>
   <includes>
-    <include location='local' impldecl='in implementation'>kcmprinterdlg.ui.h</include>
     <include location='global' impldecl='in implementation'>kcombobox.h</include>
     <include location='global' impldecl='in implementation'>kiconloader.h</include>
     <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>
+    <include location='local'  impldecl='in implementation'>kcmprinterdlg.ui.h</include>
   </includes>
   <Q_SLOTS>
     <slot>init()</slot>
@@ -1201,7 +1202,4 @@
     <slot>printersChkToggled( bool )</slot>
   </Q_SLOTS>
   <layoutdefaults margin='11' spacing='6'/>
-  <includehints>
-    <includehint>kpushbutton.h</includehint>
-  </includehints>
 </UI>
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui
index 075878cb..25f3e5a9 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui
+++ b/filesharing/advanced/kcm_sambaconf/share.ui
@@ -3248,13 +3248,6 @@ Only change something if you know what you are doing.</string>
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<includes>
-    <include location="local" impldecl="in implementation">kiconloader.h</include>
-    <include location="global" impldecl="in implementation">tqptrlist.h</include>
-    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
-    <include location="global" impldecl="in implementation">kprocess.h</include>
-    <include location="local" impldecl="in implementation">share.ui.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="private">checkValues()</slot>
     <slot access="private" specifier="non virtual">init()</slot>
@@ -3282,8 +3275,11 @@ Only change something if you know what you are doing.</string>
     <include location="global" impldecl="in declaration">krestrictedline.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
     <include location="global" impldecl="in declaration">tdelistview.h</include>
+    <include location="global" impldecl="in implementation">kprocess.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">tqptrlist.h</include>
+    <include location="local"  impldecl="in implementation">kiconloader.h</include>
+    <include location="local"  impldecl="in implementation">share.ui.h</include>
 </includes>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui
index 3853a8c0..6552d3bf 100644
--- a/kget/dlgautomationbase.ui
+++ b/kget/dlgautomationbase.ui
@@ -241,9 +241,11 @@
 </connections>
 <includes>
     <include location="global" impldecl="in implementation">kdatetimewidget.h</include>
+    <include location="global" impldecl="in implementation">kdatewidget.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">ktimewidget.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected" specifier="pure virtual">slotChanged()</slot>
@@ -251,8 +253,4 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kdatewidget.h</includehint>
-    <includehint>ktimewidget.h</includehint>
-</includehints>
 </UI>
diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui
index 92f1da17..4dfcdf68 100644
--- a/knewsticker/knewstickerconfigwidget.ui
+++ b/knewsticker/knewstickerconfigwidget.ui
@@ -1157,22 +1157,8 @@ Note that the filters are processed from the top to the bottom so that of two fi
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="global" impldecl="in declaration">kcombobox.h</include>
     <include location="global" impldecl="in declaration">klineedit.h</include>
-    <include location="global" impldecl="in declaration">tdelistview.h</include>
     <include location="global" impldecl="in declaration">knuminput.h</include>
+    <include location="global" impldecl="in declaration">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
index 9af2b331..9e5cde20 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
@@ -202,14 +202,9 @@
     </image>
 </images>
 <includes>
-    <include location="global" impldecl="in declaration">tdelistbox.h</include>
-    <include location="global" impldecl="in declaration">kurllabel.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
+    <include location="global" impldecl="in declaration">kurllabel.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurllabel.h</includehint>
-    <includehint>kseparator.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
index 88e7ecba..a96bbcd8 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
@@ -213,7 +213,7 @@
     </image>
 </images>
 <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/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
index f84bbcfc..725c64c8 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
+++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
@@ -265,7 +265,4 @@ The priority is used to determine which contact to use when you click on a metac
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
index ff41c06e..dfc1d19a 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
@@ -390,10 +390,8 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui
index c5949844..ed48c00a 100644
--- a/kopete/kopete/contactlist/customnotifications.ui
+++ b/kopete/kopete/contactlist/customnotifications.ui
@@ -231,10 +231,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
index 646e58ff..64201f76 100644
--- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
@@ -572,13 +572,11 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <include location="global" impldecl="in implementation">addressbooklinkwidget.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">kicondialog.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>
-<includehints>
-    <includehint>addressbooklinkwidget.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/kopete/grouptdeabcselectorwidget.ui b/kopete/kopete/grouptdeabcselectorwidget.ui
index bdcf1045..5a0ecfb9 100644
--- a/kopete/kopete/grouptdeabcselectorwidget.ui
+++ b/kopete/kopete/grouptdeabcselectorwidget.ui
@@ -84,8 +84,8 @@
       <header>addressbooklinkwidget.h</header>
     </customwidget>
 </customwidgets>				     
-<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/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index 45653bd4..0c3c1c87 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -457,10 +457,8 @@
     <include location="global" impldecl="in implementation">kcolorbutton.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">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index c0445894..b75b8d9c 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -278,9 +278,7 @@
 <layoutdefaults spacing="0" margin="0"/>
 <includes>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">smpppdlocationwidget.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<includehints>
-    <includehint>smpppdlocationwidget.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui
index fca8f50e..f996f8b7 100644
--- a/kopete/plugins/statistics/statisticswidget.ui
+++ b/kopete/plugins/statistics/statisticswidget.ui
@@ -239,10 +239,8 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kdatepicker.h</include>
+    <include location="global" impldecl="in implementation">kdatetbl.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">ktimewidget.h</include>
 </includes>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kdatetbl.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui
index dfe781f1..9ede265d 100644
--- a/kopete/plugins/webpresence/webpresenceprefs.ui
+++ b/kopete/plugins/webpresence/webpresenceprefs.ui
@@ -361,9 +361,7 @@ images/winpopup_protocol.png</string>
 <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>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
index 551d9322..5a13dbd9 100644
--- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
+++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
@@ -1043,7 +1043,7 @@ If two resources have the same priority, the messages will be sent to the one co
     <tabstop>cbSendComposingEvent</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kopetepasswordwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include>
+</includes>
 </UI>
diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
index 914d1533..024b4657 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
@@ -431,7 +431,7 @@
     <tabstop>mScreenName</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kopetepasswordwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include>
+</includes>
 </UI>
diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index 13817584..96821c2f 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -210,8 +210,4 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
index 98932d9b..18386cc2 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
@@ -534,7 +534,7 @@
     <tabstop>rbBlockDenyList</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kopetepasswordwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include>
+</includes>
 </UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
index bd9f2f8e..fd0ac697 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
@@ -480,7 +480,7 @@ If you do not currently have an ICQ account, please click the button to create o
     <tabstop>chkWebAware</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kopetepasswordwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include>
+</includes>
 </UI>
diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui
index 31e71c76..e37dcee1 100644
--- a/kopete/protocols/sms/services/gsmlibprefs.ui
+++ b/kopete/protocols/sms/services/gsmlibprefs.ui
@@ -93,10 +93,8 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui
index 43cb42e1..0e35f7f5 100644
--- a/kopete/protocols/sms/services/smsclientprefs.ui
+++ b/kopete/protocols/sms/services/smsclientprefs.ui
@@ -125,10 +125,8 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui
index 04cc3406..98ac7c31 100644
--- a/kopete/protocols/sms/services/smssendprefs.ui
+++ b/kopete/protocols/sms/services/smssendprefs.ui
@@ -181,10 +181,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index fde15b0b..fa427760 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -183,9 +183,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <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>
 </includes>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index ed10dfb2..df48d194 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -349,11 +349,9 @@ However, the recommended way is to ask your administrator to create this directo
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui
index 34f6590c..06d4f891 100644
--- a/krfb/krfb/manageinvitations.ui
+++ b/krfb/krfb/manageinvitations.ui
@@ -210,7 +210,4 @@
     <slot>listSelectionChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui
index 576707cc..a0e89bb4 100644
--- a/ksirc/KSPrefs/page_looknfeelbase.ui
+++ b/ksirc/KSPrefs/page_looknfeelbase.ui
@@ -316,10 +316,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <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>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui
index 07cd7ff4..b69a5998 100644
--- a/ksirc/KSPrefs/page_startupbase.ui
+++ b/ksirc/KSPrefs/page_startupbase.ui
@@ -190,8 +190,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui
index c98e60e6..46c4ce0a 100644
--- a/ksirc/dccNewbase.ui
+++ b/ksirc/dccNewbase.ui
@@ -229,10 +229,8 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <include location="global" impldecl="in implementation">alistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<includehints>
-    <includehint>alistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui
index b58a3503..73f37cd8 100644
--- a/wifi/kcmwifi/ifconfigpagebase.ui
+++ b/wifi/kcmwifi/ifconfigpagebase.ui
@@ -489,11 +489,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.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>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>