diff --git a/tdehtml/htmlpageinfo.ui b/tdehtml/htmlpageinfo.ui
index 2315771ae..7f3816b8f 100644
--- a/tdehtml/htmlpageinfo.ui
+++ b/tdehtml/htmlpageinfo.ui
@@ -286,16 +286,12 @@
     <tabstop>_headers</tabstop>
 </tabstops>
 <includes>
+    <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
     <include location="global" impldecl="in declaration">tqlabel.h</include>
-    <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="global" impldecl="in declaration">tqlistview.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tdehtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui
index da653c016..1c105d937 100644
--- a/tdehtml/kjserrordlg.ui
+++ b/tdehtml/kjserrordlg.ui
@@ -118,6 +118,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
 <Q_SLOTS>
     <slot>init()</slot>
@@ -127,7 +128,4 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..ae52f96e0 100644
--- a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
+++ b/tdeio/misc/tdewalletd/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>
diff --git a/tdespell2/ui/configui.ui b/tdespell2/ui/configui.ui
index 94b0061cd..6fe99759a 100644
--- a/tdespell2/ui/configui.ui
+++ b/tdespell2/ui/configui.ui
@@ -102,13 +102,9 @@
 <customwidgets>
 </customwidgets>
 <includes>
-    <include location="global" impldecl="in implementation">keditlistbox.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">keditlistbox.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/tdeui/tdeshortcutdialog_advanced.ui b/tdeui/tdeshortcutdialog_advanced.ui
index b1cc70460..26c255595 100644
--- a/tdeui/tdeshortcutdialog_advanced.ui
+++ b/tdeui/tdeshortcutdialog_advanced.ui
@@ -238,8 +238,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
@@ -247,8 +247,4 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tdeui/tdeshortcutdialog_simple.ui b/tdeui/tdeshortcutdialog_simple.ui
index c21b6f940..30faf94a0 100644
--- a/tdeui/tdeshortcutdialog_simple.ui
+++ b/tdeui/tdeshortcutdialog_simple.ui
@@ -105,8 +105,8 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
@@ -114,7 +114,4 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>