diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index b157424..d5e7767 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -363,12 +363,16 @@ You must still specify the block size.</string>
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in implementation">tdeapplication.h</include>
-    <include location="global" impldecl="in implementation">tdefiledialog.h</include>
-    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
-    <include location="global" impldecl="in implementation">tdeglobal.h</include>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">OptionsDlgWidget.ui.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">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">tdeapplication.h</include>
+	<include location="global" impldecl="in implementation">tdefiledialog.h</include>
+	<include location="global" impldecl="in implementation">tdemessagebox.h</include>
+	<include location="global" impldecl="in implementation">tdeglobal.h</include>
+	<include location="global" impldecl="in implementation">kdialog.h</include>
+	<include location="local"  impldecl="in implementation">OptionsDlgWidget.ui.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>doBrowseTapeDevice()</signal>
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
index 60a720f..2780fae 100644
--- a/knetworkconf/knetworkconf/kadddevicedlg.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlg.ui
@@ -403,9 +403,8 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
index ebbca21..cbb59f0 100644
--- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui
+++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
@@ -148,9 +148,7 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/kadddevicewifiext.ui b/knetworkconf/knetworkconf/kadddevicewifiext.ui
index 6b60cf2..2fe74c1 100644
--- a/knetworkconf/knetworkconf/kadddevicewifiext.ui
+++ b/knetworkconf/knetworkconf/kadddevicewifiext.ui
@@ -89,8 +89,8 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpassdlg.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index f79401d..a05a9e7 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -157,10 +157,9 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kdialog.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index c14f352..35586fb 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -290,14 +290,10 @@
     <function specifier="non virtual" returnType="bool">modified()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kdialog.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
index 37098be..c392aaf 100644
--- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
+++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
@@ -98,7 +98,7 @@
     <slot>close()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kdialog.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index 576aeb3..dc77b40 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -1074,29 +1074,11 @@
     <slot access="private">updateProfileSlot()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.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">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index 705396e..acef30e 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -130,8 +130,8 @@ the changes can take effect.</string>
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in declaration">kdialog.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
index ab822a2..daa59b3 100644
--- a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
@@ -133,10 +133,9 @@
     <slot>exitSlot()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>kpushbutton.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>
+	<include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/ksysv/configwizard.ui b/ksysv/configwizard.ui
index ce58190..cf489b6 100644
--- a/ksysv/configwizard.ui
+++ b/ksysv/configwizard.ui
@@ -623,4 +623,7 @@ You have finished the initial configuration of SysV-Init Editor. &lt;b&gt;Press&
     <slot access="protected">chooseDistribution(int)</slot>
     <slot access="protected">browseServices()</slot>
 </connections>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui
index 8e7fe99..5046fc7 100644
--- a/ksysv/lookandfeelconfig.ui
+++ b/ksysv/lookandfeelconfig.ui
@@ -497,4 +497,7 @@
 </Q_SLOTS>
 <pixmapfunction>DesktopIcon</pixmapfunction>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui
index 6f2a263..0273f2b 100644
--- a/ksysv/pathconfig.ui
+++ b/ksysv/pathconfig.ui
@@ -291,4 +291,7 @@
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kuser/filessettings.ui b/kuser/filessettings.ui
index 83a8827..272d776 100644
--- a/kuser/filessettings.ui
+++ b/kuser/filessettings.ui
@@ -222,4 +222,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index 2efcab5..f6e4be4 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -237,4 +237,8 @@
     <slot>kcfg_createHomeDir_toggled( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 7dff3a1..ed4e248 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -359,8 +359,9 @@
     <slot>kcfg_ldapsam_toggled( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.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">knuminput.h</include>
+</includes>
 </UI>
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index 6466874..3edfbb6 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -275,4 +275,8 @@
     <tabstop>kcfg_ldapcnfullname</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index e14a809..fb4b246 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -236,9 +236,7 @@
     <slot>kcfg_sneverexpire_toggled( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kdatetimewidget.h</includehint>
-    <includehint>kdatewidget.h</includehint>
-    <includehint>ktimewidget.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kdatetimewidget.h</include>
+</includes>
 </UI>