diff --git a/k9Mplayer/mplayer.ui b/k9Mplayer/mplayer.ui
index 87f779c..7ef3501 100644
--- a/k9Mplayer/mplayer.ui
+++ b/k9Mplayer/mplayer.ui
@@ -429,11 +429,7 @@
     <slot>bSwitchAudioClick()</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>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/k9author/chapterEdit.ui b/k9author/chapterEdit.ui
index 2d7e337..68192c4 100644
--- a/k9author/chapterEdit.ui
+++ b/k9author/chapterEdit.ui
@@ -347,13 +347,9 @@
     <slot>bTitleButtonClick()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktimewidget.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>ktimewidget.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">ktimewidget.h</include>
+</includes>
 </UI>
diff --git a/k9author/import.ui b/k9author/import.ui
index af49e39..df2e28a 100644
--- a/k9author/import.ui
+++ b/k9author/import.ui
@@ -200,8 +200,8 @@
     <slot>cbFormatActivated(const TQString &amp;)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>tdeselect.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">tdeselect.h</include>
+</includes>
 </UI>
diff --git a/k9author/menuEdit.ui b/k9author/menuEdit.ui
index 7f34593..6dce647 100644
--- a/k9author/menuEdit.ui
+++ b/k9author/menuEdit.ui
@@ -331,12 +331,9 @@
     <slot>cbEndActivated(int)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/k9author/newTitle.ui b/k9author/newTitle.ui
index 78b1250..40b7028 100644
--- a/k9author/newTitle.ui
+++ b/k9author/newTitle.ui
@@ -272,13 +272,10 @@
     <slot>bAddClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>ktimewidget.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">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ktimewidget.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui
index 65eed10..a136dec 100644
--- a/libk9copy/backupdlg.ui
+++ b/libk9copy/backupdlg.ui
@@ -376,8 +376,7 @@
     <slot>bPlayToggled(bool state)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/libk9copy/mp4dlg.ui b/libk9copy/mp4dlg.ui
index f46c4e9..a1deb49 100644
--- a/libk9copy/mp4dlg.ui
+++ b/libk9copy/mp4dlg.ui
@@ -274,8 +274,8 @@
     <slot>Cancel()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/libk9copy/processList.ui b/libk9copy/processList.ui
index 0eaa9c0..dcd59e6 100644
--- a/libk9copy/processList.ui
+++ b/libk9copy/processList.ui
@@ -110,7 +110,7 @@
     <slot>bCancelClick()</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/libk9copy/progress.ui b/libk9copy/progress.ui
index 789860c..934bf56 100644
--- a/libk9copy/progress.ui
+++ b/libk9copy/progress.ui
@@ -238,8 +238,8 @@
     <slot>bCancelClick()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/configDlg.ui b/src/configDlg.ui
index c02dfe1..ac0a203 100644
--- a/src/configDlg.ui
+++ b/src/configDlg.ui
@@ -189,8 +189,7 @@
     <slot>bOkClick()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/k9mainw.ui b/src/k9mainw.ui
index 582604e..6c9ff45 100644
--- a/src/k9mainw.ui
+++ b/src/k9mainw.ui
@@ -417,11 +417,9 @@
     <slot>itemRenamed(TQListViewItem*,int)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdeselect.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdeselect.h</include>
+</includes>
 </UI>
diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui
index 5c906ec..1934e39 100644
--- a/src/k9mainwsov.ui
+++ b/src/k9mainwsov.ui
@@ -414,11 +414,9 @@
     <slot>itemRenamed(TQListViewItem*,int)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdeselect.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdeselect.h</include>
+</includes>
 </UI>
diff --git a/src/mencoderCmdGen.ui b/src/mencoderCmdGen.ui
index 3cc749b..3e2344c 100644
--- a/src/mencoderCmdGen.ui
+++ b/src/mencoderCmdGen.ui
@@ -208,8 +208,7 @@
     <slot>listViewCurrentChanged(TQListViewItem*)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/playbackoptionsw.ui b/src/playbackoptionsw.ui
index d30fb3e..ee0aa1f 100644
--- a/src/playbackoptionsw.ui
+++ b/src/playbackoptionsw.ui
@@ -398,8 +398,7 @@
     <slot>cbDefSubActivated(int)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/prefAuthor.ui b/src/prefAuthor.ui
index 0633a84..27745bd 100644
--- a/src/prefAuthor.ui
+++ b/src/prefAuthor.ui
@@ -239,13 +239,9 @@
     <slot>bButtonFontClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/prefDVD.ui b/src/prefDVD.ui
index 07e904f..673c99b 100644
--- a/src/prefDVD.ui
+++ b/src/prefDVD.ui
@@ -167,9 +167,7 @@
     </grid>
 </widget>
 <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>
+</includes>
 </UI>
diff --git a/src/prefMencoder.ui b/src/prefMencoder.ui
index 1d4bbf9..9534376 100644
--- a/src/prefMencoder.ui
+++ b/src/prefMencoder.ui
@@ -811,15 +811,7 @@ audio bitrate</string>
     <slot>bResetClicked()</slot>
 </Q_SLOTS>
 <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>
-    <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>