diff --git a/src/kile/configcheckerwidget.ui b/src/kile/configcheckerwidget.ui
index a57c284..0e50bce 100644
--- a/src/kile/configcheckerwidget.ui
+++ b/src/kile/configcheckerwidget.ui
@@ -96,17 +96,15 @@
         </widget>
     </vbox>
 </widget>
-<includes>
-    <include location="local" impldecl="in implementation">configcheckerwidget.ui.h</include>
-</includes>
 <functions>
     <function specifier="non virtual" returnType="KProgress *">progressBar()</function>
     <function specifier="non virtual" returnType="TQLabel *">label()</function>
     <function specifier="non virtual" returnType="TDEListBox *">listBox()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="local"  impldecl="in implementation">configcheckerwidget.ui.h</include>
+</includes>
 </UI>
diff --git a/src/kile/generalconfigwidget.ui b/src/kile/generalconfigwidget.ui
index 9ffb0ea..6ca52a4 100644
--- a/src/kile/generalconfigwidget.ui
+++ b/src/kile/generalconfigwidget.ui
@@ -240,12 +240,8 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/kile/graphicsconfigwidget.ui b/src/kile/graphicsconfigwidget.ui
index 63259b9..15d5701 100644
--- a/src/kile/graphicsconfigwidget.ui
+++ b/src/kile/graphicsconfigwidget.ui
@@ -113,8 +113,9 @@
 </customwidgets>
 <includes>
     <include location="global" impldecl="in declaration">tdeconfig.h</include>
-    <include location="local" impldecl="in declaration">latexcmd.h</include>
-    <include location="local" impldecl="in declaration">latexcmddialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="local"  impldecl="in declaration">latexcmd.h</include>
+    <include location="local"  impldecl="in declaration">latexcmddialog.h</include>
 </includes>
 <variables>
     <variable access="private">TDEConfig *m_config;</variable>
@@ -128,7 +129,4 @@
     <function specifier="non virtual">setLatexCommands( TDEConfig * config, KileDocument::LatexCommands * commands )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/src/kile/helpconfigwidget.ui b/src/kile/helpconfigwidget.ui
index 340378b..7bfabf7 100644
--- a/src/kile/helpconfigwidget.ui
+++ b/src/kile/helpconfigwidget.ui
@@ -156,8 +156,9 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">kilehelp.h</include>
-    <include location="local" impldecl="in implementation">helpconfigwidget.ui.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="local"  impldecl="in implementation">helpconfigwidget.ui.h</include>
+    <include location="local"  impldecl="in implementation">kilehelp.h</include>
 </includes>
 <forwards>
     <forward>namespace KileHelp { class Help; } class avoid_compile_error</forward>
@@ -172,7 +173,4 @@
     <function specifier="non virtual">setHelp( KileHelp::Help * help )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/src/kile/latexconfigwidget.ui b/src/kile/latexconfigwidget.ui
index ef6d51d..a0dcef2 100644
--- a/src/kile/latexconfigwidget.ui
+++ b/src/kile/latexconfigwidget.ui
@@ -234,9 +234,10 @@
 </connections>
 <includes>
     <include location="global" impldecl="in declaration">tdeconfig.h</include>
-    <include location="local" impldecl="in declaration">latexcmd.h</include>
-    <include location="local" impldecl="in declaration">latexcmddialog.h</include>
-    <include location="local" impldecl="in implementation">latexconfigwidget.ui.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="local"  impldecl="in declaration">latexcmd.h</include>
+    <include location="local"  impldecl="in declaration">latexcmddialog.h</include>
+    <include location="local"  impldecl="in implementation">latexconfigwidget.ui.h</include>
 </includes>
 <variables>
     <variable access="private">TDEConfig *m_config;</variable>
@@ -250,9 +251,4 @@
     <function specifier="non virtual">setLatexCommands( TDEConfig * config, KileDocument::LatexCommands * commands )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/src/kile/newtoolwizard.ui b/src/kile/newtoolwizard.ui
index e902e00..9b605be 100644
--- a/src/kile/newtoolwizard.ui
+++ b/src/kile/newtoolwizard.ui
@@ -161,12 +161,14 @@ the standard "LaTeX" tool.</string>
     <tabstop>m_cbTools</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">tqstringlist.h</include>
-    <include location="global" impldecl="in implementation">tqregexp.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">tdeglobal.h</include>
-    <include location="local" impldecl="in implementation">kiletoolmanager.h</include>
     <include location="global" impldecl="in implementation">tdelocale.h</include>
-    <include location="local" impldecl="in implementation">newtoolwizard.ui.h</include>
+    <include location="global" impldecl="in implementation">tqregexp.h</include>
+    <include location="global" impldecl="in implementation">tqstringlist.h</include>
+    <include location="local"  impldecl="in implementation">kiletoolmanager.h</include>
+    <include location="local"  impldecl="in implementation">newtoolwizard.ui.h</include>
 </includes>
 <variables>
     <variable access="private">TQStringList m_toolList;</variable>
@@ -182,8 +184,4 @@ the standard "LaTeX" tool.</string>
     <function returnType="TQString">parentTool()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/src/kile/scriptingconfigwidget.ui b/src/kile/scriptingconfigwidget.ui
index 5a1ea43..f46fafc 100644
--- a/src/kile/scriptingconfigwidget.ui
+++ b/src/kile/scriptingconfigwidget.ui
@@ -208,12 +208,9 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
-    <include location="local" impldecl="in implementation">scriptingconfigwidget.ui.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="local"  impldecl="in implementation">scriptingconfigwidget.ui.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
 </UI>
diff --git a/src/kile/structureconfigwidget.ui b/src/kile/structureconfigwidget.ui
index d0fd69b..17e6d87 100644
--- a/src/kile/structureconfigwidget.ui
+++ b/src/kile/structureconfigwidget.ui
@@ -338,8 +338,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/kile/symbolviewconfig.ui b/src/kile/symbolviewconfig.ui
index afb1df7..72ff253 100644
--- a/src/kile/symbolviewconfig.ui
+++ b/src/kile/symbolviewconfig.ui
@@ -135,8 +135,7 @@
     <tabstop>kcfg_clearMFUS</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>