diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui
index 8d92f782..6e16ffbc 100644
--- a/kipi-plugins/batchprocessimages/renameimagesbase.ui
+++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui
@@ -353,7 +353,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="6"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui
index 0524bc85..9a56491c 100644
--- a/kipi-plugins/calendar/caleventsbase.ui
+++ b/kipi-plugins/calendar/caleventsbase.ui
@@ -203,8 +203,7 @@ This is fully optional. All the events from this calendar will be printed green.
     <slot>ohChooseSlot()</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/kipi-plugins/htmlexport/outputpage.ui b/kipi-plugins/htmlexport/outputpage.ui
index aa7e3f4b..0b3fe9ed 100644
--- a/kipi-plugins/htmlexport/outputpage.ui
+++ b/kipi-plugins/htmlexport/outputpage.ui
@@ -75,9 +75,9 @@
 <customwidgets>
 </customwidgets>
 <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">klineedit.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/kipi-plugins/htmlexport/themepage.ui b/kipi-plugins/htmlexport/themepage.ui
index 382b7f97..2307fbe0 100644
--- a/kipi-plugins/htmlexport/themepage.ui
+++ b/kipi-plugins/htmlexport/themepage.ui
@@ -34,8 +34,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
index f62a1315..1db35a06 100644
--- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui
+++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
@@ -1286,15 +1286,13 @@ The program uses the 'images2mpg' bash script.</string>
 </images>
 <includes>
     <include location="global" impldecl="in declaration">klineedit.h</include>
-    <include location="global" impldecl="in declaration">libkipi/interface.h</include>
     <include location="global" impldecl="in declaration">kprocess.h</include>
+    <include location="global" impldecl="in declaration">libkipi/interface.h</include>
     <include location="global" impldecl="in declaration">tdeio/previewjob.h</include>
     <include location="global" impldecl="in declaration">tdelistbox.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">libkipi/interface.h</include>
-    <include location="global" impldecl="in implementation">kprocess.h</include>
-    <include location="global" impldecl="in implementation">tdeio/previewjob.h</include>
-    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kimg2mpg.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
 </includes>
 <Q_SLOTS>
     <slot specifier="non virtual">reset()</slot>
@@ -1331,11 +1329,4 @@ The program uses the 'images2mpg' bash script.</string>
     <function specifier="non virtual">readSettings()</function>
 </functions>
 <layoutdefaults spacing="6" margin="6"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kimg2mpg.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kprogress.h</includehint>
-</includehints>
 </UI>
diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui
index 939445f8..ae04886a 100644
--- a/kipi-plugins/printwizard/frmprintwizardbase.ui
+++ b/kipi-plugins/printwizard/frmprintwizardbase.ui
@@ -2313,18 +2313,15 @@ Click the 'Next' button to begin.</string>
     <slot>ListPhotoOrder_highlighted( int )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdefontcombo.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kurllabel.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>cropframe.h</includehint>
-    <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">cropframe.h</include>
+    <include location="global" impldecl="in implementation">kcolorcombo.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">kprogress.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurllabel.h</include>
+    <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui
index 0a366058..39689a80 100644
--- a/kipi-plugins/slideshow/slideshowconfigbase.ui
+++ b/kipi-plugins/slideshow/slideshowconfigbase.ui
@@ -1479,15 +1479,14 @@ Ken Burns effect doesn't use this cache mechanism.</string>
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">klineedit.h</include>
-    <include location="global" impldecl="in declaration">libkipi/interface.h</include>
     <include location="global" impldecl="in declaration">kprocess.h</include>
+    <include location="global" impldecl="in declaration">libkipi/interface.h</include>
     <include location="global" impldecl="in declaration">tdeio/previewjob.h</include>
     <include location="global" impldecl="in declaration">tdelistbox.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">libkipi/interface.h</include>
-    <include location="global" impldecl="in implementation">kprocess.h</include>
-    <include location="global" impldecl="in implementation">tdeio/previewjob.h</include>
-    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">listimageitems.h</include>
+    <include location="global" impldecl="in implementation">tdefontdialog.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">slotOpenGLToggled()</slot>
@@ -1512,11 +1511,4 @@ Ken Burns effect doesn't use this cache mechanism.</string>
     <function access="protected">saveSettings()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>listimageitems.h</includehint>
-    <includehint>tdefontdialog.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kipi-plugins/sync/sinklistbase.ui b/kipi-plugins/sync/sinklistbase.ui
index 7cfe2c08..e09be991 100644
--- a/kipi-plugins/sync/sinklistbase.ui
+++ b/kipi-plugins/sync/sinklistbase.ui
@@ -173,8 +173,8 @@
     <slot access="protected">buttonAdd_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>