diff --git a/kbattleship/kbattleship/dialogs/connectDlg.ui b/kbattleship/kbattleship/dialogs/connectDlg.ui
index 40ec9609..884e5898 100644
--- a/kbattleship/kbattleship/dialogs/connectDlg.ui
+++ b/kbattleship/kbattleship/dialogs/connectDlg.ui
@@ -171,13 +171,8 @@
 </widget>
 <customwidgets>
 </customwidgets>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
-    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kenolaba/EvalDlg.ui b/kenolaba/EvalDlg.ui
index a98354d4..660c99a3 100644
--- a/kenolaba/EvalDlg.ui
+++ b/kenolaba/EvalDlg.ui
@@ -1753,8 +1753,5 @@
     <tabstop>evalDelete</tabstop>
     <tabstop>evalSaveAs</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in declaration">kseparator.h</include>
-</includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kjumpingcube/settings.ui b/kjumpingcube/settings.ui
index b0d16132..f3d75ca9 100644
--- a/kjumpingcube/settings.ui
+++ b/kjumpingcube/settings.ui
@@ -262,7 +262,7 @@
     </vbox>
 </widget>
 <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/konquest/newGameDlg_ui.ui b/konquest/newGameDlg_ui.ui
index 55a8a2b9..fded57c7 100644
--- a/konquest/newGameDlg_ui.ui
+++ b/konquest/newGameDlg_ui.ui
@@ -434,7 +434,7 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>minimap.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">minimap.h</include>
+</includes>
 </UI>
diff --git a/kreversi/settings.ui b/kreversi/settings.ui
index ead4757a..0be0825f 100644
--- a/kreversi/settings.ui
+++ b/kreversi/settings.ui
@@ -320,10 +320,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcolorbutton.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/ksnake/appearance.ui b/ksnake/appearance.ui
index d5f49530..f3ed2ae9 100644
--- a/ksnake/appearance.ui
+++ b/ksnake/appearance.ui
@@ -81,7 +81,7 @@
     </vbox>
 </widget>
 <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/ktron/appearance.ui b/ktron/appearance.ui
index 0c817317..9b9f7588 100644
--- a/ktron/appearance.ui
+++ b/ktron/appearance.ui
@@ -293,10 +293,8 @@
     <tabstop>kcfg_Color_Player2</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcolorbutton.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>