diff --git a/kcalc/colors.ui b/kcalc/colors.ui
index af64057..6661521 100644
--- a/kcalc/colors.ui
+++ b/kcalc/colors.ui
@@ -275,4 +275,7 @@
     <tabstop>kcfg_OperationButtonsColor</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kcalc/constants.ui b/kcalc/constants.ui
index 8bebd01..7cad5ff 100644
--- a/kcalc/constants.ui
+++ b/kcalc/constants.ui
@@ -480,12 +480,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.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>
+</includes>
 </UI>
diff --git a/kedit/color.ui b/kedit/color.ui
index bec67d9..70400fe 100644
--- a/kedit/color.ui
+++ b/kedit/color.ui
@@ -123,7 +123,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kgpg/adduid.ui b/kgpg/adduid.ui
index 0bf4537..3454ade 100644
--- a/kgpg/adduid.ui
+++ b/kgpg/adduid.ui
@@ -61,4 +61,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui
index b604046..9cdee30 100644
--- a/kgpg/conf_decryption.ui
+++ b/kgpg/conf_decryption.ui
@@ -66,4 +66,7 @@
     <slot>use_agent_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index ff807aa..f64556a 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -309,13 +309,11 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">conf_encryption.ui.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <Q_SLOTS>
     <slot>allow_custom_option_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 8a7f14a..ed91a8a 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -206,14 +206,11 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 <includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.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>
 </includehints>
 </UI>
diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui
index f0f1e14..e551d85 100644
--- a/kgpg/conf_misc.ui
+++ b/kgpg/conf_misc.ui
@@ -410,4 +410,7 @@ the original file.</string>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index 677f561..a8594e3 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -111,8 +111,8 @@ all others will be stored for use by KGpg only.</string>
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui
index 1344d26..467c001 100644
--- a/kgpg/conf_ui2.ui
+++ b/kgpg/conf_ui2.ui
@@ -169,10 +169,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <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/kgpg/groupedit.ui b/kgpg/groupedit.ui
index 794a310..0f5be01 100644
--- a/kgpg/groupedit.ui
+++ b/kgpg/groupedit.ui
@@ -206,7 +206,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 4daae5b..94f4573 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -131,6 +131,7 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">keyexport.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>checkFile_toggled( bool isOn )</slot>
diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui
index 7dce70b..2d845f2 100644
--- a/kgpg/keyproperties.ui
+++ b/kgpg/keyproperties.ui
@@ -496,12 +496,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui
index 4087bde..036d75f 100644
--- a/kgpg/keyserver.ui
+++ b/kgpg/keyserver.ui
@@ -333,4 +333,8 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui
index e4f30ff..c5cd4af 100644
--- a/kgpg/kgpgrevokewidget.ui
+++ b/kgpg/kgpgrevokewidget.ui
@@ -141,6 +141,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>cbSave_toggled( bool isOn )</slot>
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index 75a6ef5..fe4167c 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -398,8 +398,12 @@ Remember that if you download a file or open one in an editor, parts of the file
     <slot>finishButton_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 <includehints>
-    <includehint>kactivelabel.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kgpg/newkey.ui b/kgpg/newkey.ui
index fe978df..7793d74 100644
--- a/kgpg/newkey.ui
+++ b/kgpg/newkey.ui
@@ -188,6 +188,8 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">newkey.ui.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>CBsave_toggled( bool isOn )</slot>
diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui
index 3a9a325..d704647 100644
--- a/kgpg/searchres.ui
+++ b/kgpg/searchres.ui
@@ -117,8 +117,8 @@
     <tabstop>kLEID</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui
index b974eb7..2dc9c38 100644
--- a/kgpg/sourceselect.ui
+++ b/kgpg/sourceselect.ui
@@ -104,8 +104,10 @@
     <slot>checkFile_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 <includehints>
-    <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kjots/confpagefont.ui b/kjots/confpagefont.ui
index 75bfcb8..ddd971a 100644
--- a/kjots/confpagefont.ui
+++ b/kjots/confpagefont.ui
@@ -32,7 +32,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontdialog.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontdialog.h</include>
+</includes>
 </UI>
diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui
index f717a48..4b554f7 100644
--- a/kjots/confpagemisc.ui
+++ b/kjots/confpagemisc.ui
@@ -146,7 +146,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
index 27778ef..6cff8c9 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
@@ -255,6 +255,8 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">kcmkvaio_general.ui.h</include>
+    <include location="global" impldecl="in implementation">kled.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>changed();</signal>
@@ -264,10 +266,4 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-    <includehint>kled.h</includehint>
-    <includehint>kled.h</includehint>
-    <includehint>kled.h</includehint>
-</includehints>
 </UI>
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
index 9fd6c7e..0951321 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
@@ -283,6 +283,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>changed();</signal>
@@ -293,15 +294,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index 3f5057b..103537a 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -257,9 +257,9 @@
     <slot access="protected">objectSelected(TQListViewItem *)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui
index 0ae6457..946d108 100644
--- a/ksim/monitors/snmp/configwidget.ui
+++ b/ksim/monitors/snmp/configwidget.ui
@@ -208,8 +208,7 @@
     <tabstop>removeMonitor</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index 64c617f..d02104d 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -515,12 +515,8 @@
     <slot access="protected">testHost()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index 0b57cb7..a6d2e2d 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -433,8 +433,8 @@
     <slot access="protected">browse()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui
index e81a9f3..5e4fac6 100644
--- a/ksim/monitors/snmp/proberesultdialogbase.ui
+++ b/ksim/monitors/snmp/proberesultdialogbase.ui
@@ -118,7 +118,7 @@
     </connection>
 </connections>
 <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/ktimer/prefwidget.ui b/ktimer/prefwidget.ui
index dd04060..cd5715e 100644
--- a/ktimer/prefwidget.ui
+++ b/ktimer/prefwidget.ui
@@ -276,10 +276,10 @@
 </widget>
 <includes>
     <include location="global" impldecl="in declaration">kseparator.h</include>
+    <include location="global" impldecl="in declaration">kurlrequester.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui
index 24f068e..d264187 100644
--- a/superkaramba/src/themes_layout.ui
+++ b/superkaramba/src/themes_layout.ui
@@ -233,9 +233,10 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 <includehints>
     <includehint>kwidgetlistbox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui
index 6e07e26..8a55785 100644
--- a/superkaramba/src/themewidget_layout.ui
+++ b/superkaramba/src/themewidget_layout.ui
@@ -176,7 +176,7 @@
 </images>
 <layoutdefaults spacing="6" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/tdelirc/kcmlirc/addactionbase.ui b/tdelirc/kcmlirc/addactionbase.ui
index dfb6f12..9887a97 100644
--- a/tdelirc/kcmlirc/addactionbase.ui
+++ b/tdelirc/kcmlirc/addactionbase.ui
@@ -1589,20 +1589,10 @@
     <slot>updateOptions()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">keditlistbox.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">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/tdelirc/kcmlirc/editactionbase.ui b/tdelirc/kcmlirc/editactionbase.ui
index 7e1a006..e7dd0f7 100644
--- a/tdelirc/kcmlirc/editactionbase.ui
+++ b/tdelirc/kcmlirc/editactionbase.ui
@@ -1275,13 +1275,9 @@
     <slot>updateOptions()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">keditlistbox.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/tdelirc/kcmlirc/editmodebase.ui b/tdelirc/kcmlirc/editmodebase.ui
index b59533b..e6c36f3 100644
--- a/tdelirc/kcmlirc/editmodebase.ui
+++ b/tdelirc/kcmlirc/editmodebase.ui
@@ -294,10 +294,8 @@
     <slot>slotClearIcon()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kicondialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kicondialog.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/tdelirc/kcmlirc/kcmlircbase.ui b/tdelirc/kcmlirc/kcmlircbase.ui
index b5b21bf..3bf02c8 100644
--- a/tdelirc/kcmlirc/kcmlircbase.ui
+++ b/tdelirc/kcmlirc/kcmlircbase.ui
@@ -486,6 +486,7 @@
 </widget>
 <includes>
     <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
@@ -493,14 +494,5 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/tdelirc/kcmlirc/newmode.ui b/tdelirc/kcmlirc/newmode.ui
index 811b493..2365dce 100644
--- a/tdelirc/kcmlirc/newmode.ui
+++ b/tdelirc/kcmlirc/newmode.ui
@@ -145,14 +145,11 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">newmode.ui.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <Q_SLOTS>
     <slot>slotTextChanged( const TQString &amp; newText )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tdelirc/kcmlirc/selectprofile.ui b/tdelirc/kcmlirc/selectprofile.ui
index 911deb4..1a2c3eb 100644
--- a/tdelirc/kcmlirc/selectprofile.ui
+++ b/tdelirc/kcmlirc/selectprofile.ui
@@ -120,9 +120,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.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">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/tdewallet/walletwidget.ui b/tdewallet/walletwidget.ui
index 3161d0c..7078a0d 100644
--- a/tdewallet/walletwidget.ui
+++ b/tdewallet/walletwidget.ui
@@ -409,6 +409,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
 <layoutdefaults spacing="6" margin="11"/>