diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index ed91a8a..dea46e2 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -208,9 +208,7 @@
 <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>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 94f4573..2dffb81 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -130,14 +130,12 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">keyexport.ui.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">keyexport.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot>checkFile_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui
index c5cd4af..325c1cf 100644
--- a/kgpg/kgpgrevokewidget.ui
+++ b/kgpg/kgpgrevokewidget.ui
@@ -140,14 +140,12 @@
     <tabstop>kURLRequester1</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.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">kgpgrevokewidget.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot>cbSave_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index fe4167c..d0fa62d 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -401,9 +401,7 @@ Remember that if you download a file or open one in an editor, parts of the file
 <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">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui
index 2dc9c38..65a821b 100644
--- a/kgpg/sourceselect.ui
+++ b/kgpg/sourceselect.ui
@@ -105,10 +105,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/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
index 0951321..40554fa 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
@@ -282,8 +282,9 @@
     <tabstop>commandExecMail</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.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">kcmthinkpad_general.ui.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>changed();</signal>
@@ -293,7 +294,4 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui
index cd5715e..eefc336 100644
--- a/ktimer/prefwidget.ui
+++ b/ktimer/prefwidget.ui
@@ -277,10 +277,8 @@
 <includes>
     <include location="global" impldecl="in declaration">kseparator.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui
index d264187..0530e52 100644
--- a/superkaramba/src/themes_layout.ui
+++ b/superkaramba/src/themes_layout.ui
@@ -235,8 +235,6 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kwidgetlistbox.h</include>
 </includes>
-<includehints>
-    <includehint>kwidgetlistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/tdelirc/kcmlirc/kcmlircbase.ui b/tdelirc/kcmlirc/kcmlircbase.ui
index 3bf02c8..ba32690 100644
--- a/tdelirc/kcmlirc/kcmlircbase.ui
+++ b/tdelirc/kcmlirc/kcmlircbase.ui
@@ -485,14 +485,12 @@
     </grid>
 </widget>
 <includes>
-    <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <include location="local"  impldecl="in implementation">kcmlircbase.ui.h</include>
 </includes>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/tdewallet/kbetterthankdialogbase.ui b/tdewallet/kbetterthankdialogbase.ui
index 65d8b5a..bf8a29d 100644
--- a/tdewallet/kbetterthankdialogbase.ui
+++ b/tdewallet/kbetterthankdialogbase.ui
@@ -148,7 +148,4 @@
     <slot access="protected">reject()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>