diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui
index 59bad45..743eeea 100644
--- a/ksquirrel/imageedit/sq_imagebcg.ui
+++ b/ksquirrel/imageedit/sq_imagebcg.ui
@@ -937,16 +937,19 @@
     <tabstop>spinG</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in declaration">sq_imageedit.h</include>
+    <include location="local"  impldecl="in declaration">sq_imageedit.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
-    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">fmt_filters.h</include>
-    <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_types.h</include>
+    <include location="local"  impldecl="in implementation">fmt_filters.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_defs.h</include>
-    <include location="local" impldecl="in implementation">sq_imagebcg.ui.h</include>
+    <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_types.h</include>
+    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
+    <include location="global" impldecl="in implementation">sq_bcglabel.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_imagebcg.ui.h</include>
+    <include location="global" impldecl="in implementation">sq_label.h</include>
 </includes>
 <variables>
     <variable access="private">int id;</variable>
@@ -983,15 +986,4 @@
     <function specifier="static" returnType="SQ_ImageBCG *">instance()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/imageedit/sq_imageconvert.ui b/ksquirrel/imageedit/sq_imageconvert.ui
index d1ae474..e4a2550 100644
--- a/ksquirrel/imageedit/sq_imageconvert.ui
+++ b/ksquirrel/imageedit/sq_imageconvert.ui
@@ -291,22 +291,23 @@
     <tabstop>textResult</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_types.h</include>
+    <include location="local"  impldecl="in declaration">sq_imageedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
     <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_defs.h</include>
-    <include location="local" impldecl="in declaration">sq_imageedit.h</include>
-    <include location="local" impldecl="in implementation">sq_libraryhandler.h</include>
-    <include location="global" impldecl="in implementation">tqfileinfo.h</include>
-    <include location="global" impldecl="in implementation">tqheader.h</include>
-    <include location="local" impldecl="in implementation">sq_writeoption.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
+    <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_types.h</include>
+    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_errorstring.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_imageconvert.ui.h</include>
+    <include location="local"  impldecl="in implementation">sq_imageeditoptions.h</include>
+    <include location="local"  impldecl="in implementation">sq_libraryhandler.h</include>
+    <include location="local"  impldecl="in implementation">sq_writeoption.h</include>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
     <include location="global" impldecl="in implementation">tqcheckbox.h</include>
-    <include location="local" impldecl="in implementation">sq_imageeditoptions.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
-    <include location="local" impldecl="in implementation">sq_errorstring.h</include>
-    <include location="global" impldecl="in implementation">knuminput.h</include>
-    <include location="local" impldecl="in implementation">sq_imageconvert.ui.h</include>
+    <include location="global" impldecl="in implementation">tqfileinfo.h</include>
+    <include location="global" impldecl="in implementation">tqheader.h</include>
 </includes>
 <forwards>
     <forward>struct fmt_writeoptions;</forward>
@@ -339,7 +340,4 @@
     <function access="protected">closeEvent( TQCloseEvent * e )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui b/ksquirrel/imageedit/sq_imageeditoptions.ui
index 6992481..1435010 100644
--- a/ksquirrel/imageedit/sq_imageeditoptions.ui
+++ b/ksquirrel/imageedit/sq_imageeditoptions.ui
@@ -203,9 +203,12 @@
     <tabstop>pushCancel</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">sq_imageedit.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">sq_imageeditoptions.ui.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">kurlrequester.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_imageedit.h</include>
+    <include location="local"  impldecl="in implementation">sq_imageeditoptions.ui.h</include>
 </includes>
 <forwards>
     <forward>class SQ_ImageOptions;</forward>
@@ -220,9 +223,4 @@
     <function>setConfigPrefix( const TQString &amp; pr )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/ksquirrel/imageedit/sq_imagefilter.ui
index d3e4783..42f3022 100644
--- a/ksquirrel/imageedit/sq_imagefilter.ui
+++ b/ksquirrel/imageedit/sq_imagefilter.ui
@@ -1505,12 +1505,15 @@
     <tabstop>pushCancel</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in declaration">sq_imageedit.h</include>
+    <include location="local"  impldecl="in declaration">sq_imageedit.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">fmt_filters.h</include>
-    <include location="local" impldecl="in implementation">sq_imagefilter.ui.h</include>
+    <include location="local"  impldecl="in implementation">fmt_filters.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">sq_bcglabel.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_imagefilter.ui.h</include>
 </includes>
 <variables>
     <variable access="private">TQImage sample, sample_saved;</variable>
@@ -1553,50 +1556,4 @@
     <function specifier="static" returnType="SQ_ImageFilter *">instance()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/imageedit/sq_writeoption.ui b/ksquirrel/imageedit/sq_writeoption.ui
index aa11a78..43cf07e 100644
--- a/ksquirrel/imageedit/sq_writeoption.ui
+++ b/ksquirrel/imageedit/sq_writeoption.ui
@@ -162,8 +162,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/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui
index 59bad45..743eeea 100644
--- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui
+++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui
@@ -937,16 +937,19 @@
     <tabstop>spinG</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in declaration">sq_imageedit.h</include>
+    <include location="local"  impldecl="in declaration">sq_imageedit.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
-    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">fmt_filters.h</include>
-    <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_types.h</include>
+    <include location="local"  impldecl="in implementation">fmt_filters.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_defs.h</include>
-    <include location="local" impldecl="in implementation">sq_imagebcg.ui.h</include>
+    <include location="global" impldecl="in implementation">ksquirrel-libs/fmt_types.h</include>
+    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
+    <include location="global" impldecl="in implementation">sq_bcglabel.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_imagebcg.ui.h</include>
+    <include location="global" impldecl="in implementation">sq_label.h</include>
 </includes>
 <variables>
     <variable access="private">int id;</variable>
@@ -983,15 +986,4 @@
     <function specifier="static" returnType="SQ_ImageBCG *">instance()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_label.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/ksquirrel/ksquirrelpart/sq_imagefilter.ui
index d3e4783..42f3022 100644
--- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui
+++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui
@@ -1505,12 +1505,15 @@
     <tabstop>pushCancel</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in declaration">sq_imageedit.h</include>
+    <include location="local"  impldecl="in declaration">sq_imageedit.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">fmt_filters.h</include>
-    <include location="local" impldecl="in implementation">sq_imagefilter.ui.h</include>
+    <include location="local"  impldecl="in implementation">fmt_filters.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">sq_bcglabel.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_imagefilter.ui.h</include>
 </includes>
 <variables>
     <variable access="private">TQImage sample, sample_saved;</variable>
@@ -1553,50 +1556,4 @@
     <function specifier="static" returnType="SQ_ImageFilter *">instance()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-    <includehint>sq_bcglabel.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/sq_options.ui b/ksquirrel/sq_options.ui
index 91c17da..916ac5e 100644
--- a/ksquirrel/sq_options.ui
+++ b/ksquirrel/sq_options.ui
@@ -2066,20 +2066,26 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kstandarddirs.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local"  impldecl="in implementation">sq_codecsettings.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_hloptions.h</include>
+    <include location="global" impldecl="in implementation">sq_iconlistbox.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconlistitem.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_libraryhandler.h</include>
+    <include location="local"  impldecl="in implementation">sq_options.ui.h</include>
+    <include location="local"  impldecl="in implementation">sq_pixmapcache.h</include>
+    <include location="local"  impldecl="in implementation">sq_viewcache.h</include>
+    <include location="global" impldecl="in implementation">tqdir.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">sq_libraryhandler.h</include>
     <include location="global" impldecl="in implementation">tqimage.h</include>
     <include location="global" impldecl="in implementation">tqmessagebox.h</include>
-    <include location="global" impldecl="in implementation">tqdir.h</include>
-    <include location="local" impldecl="in implementation">sq_iconlistitem.h</include>
-    <include location="local" impldecl="in implementation">sq_viewcache.h</include>
-    <include location="local" impldecl="in implementation">sq_pixmapcache.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
-    <include location="local" impldecl="in implementation">sq_codecsettings.h</include>
-    <include location="local" impldecl="in implementation">sq_hloptions.h</include>
-    <include location="local" impldecl="in implementation">sq_options.ui.h</include>
 </includes>
 <variables>
     <variable>TQString custpixmap;</variable>
@@ -2102,38 +2108,4 @@
     <function access="private" returnType="bool">isPowerOf2( int tested )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>sq_iconlistbox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/sq_slideshow.ui b/ksquirrel/sq_slideshow.ui
index ebaaaa0..0ff4d32 100644
--- a/ksquirrel/sq_slideshow.ui
+++ b/ksquirrel/sq_slideshow.ui
@@ -420,11 +420,16 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
-    <include location="local" impldecl="in implementation">sq_config.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local"  impldecl="in implementation">sq_config.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_slideshow.ui.h</include>
+    <include location="local"  impldecl="in implementation">sq_widgetstack.h</include>
     <include location="global" impldecl="in implementation">tqpopupmenu.h</include>
-    <include location="local" impldecl="in implementation">sq_widgetstack.h</include>
-    <include location="local" impldecl="in implementation">sq_slideshow.ui.h</include>
 </includes>
 <variables>
     <variable access="private">TQStringList items;</variable>
@@ -442,13 +447,4 @@
     <function access="private">appendPath( const TQString &amp; path )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/sq_slideshowlisting.ui b/ksquirrel/sq_slideshowlisting.ui
index 71d6daf..7457b45 100644
--- a/ksquirrel/sq_slideshowlisting.ui
+++ b/ksquirrel/sq_slideshowlisting.ui
@@ -97,7 +97,8 @@
 <customwidgets>
 </customwidgets>
 <includes>
-    <include location="local" impldecl="in implementation">sq_slideshowlisting.ui.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+    <include location="local"  impldecl="in implementation">sq_slideshowlisting.ui.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>kill();</signal>
@@ -107,7 +108,4 @@
     <function specifier="non virtual">setFile( int count, const TQString &amp; f )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ksqueezedtextlabel.h</includehint>
-</includehints>
 </UI>
diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui
index 8de42e2..965ff3a 100644
--- a/ksquirrel/sq_thumbnailcachemaster.ui
+++ b/ksquirrel/sq_thumbnailcachemaster.ui
@@ -230,15 +230,16 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tdeio/job.h</include>
-    <include location="global" impldecl="in implementation">tqapplication.h</include>
     <include location="global" impldecl="in implementation">kdirsize.h</include>
-    <include location="local" impldecl="in implementation">sq_viewcache.h</include>
-    <include location="local" impldecl="in implementation">sq_pixmapcache.h</include>
-    <include location="local" impldecl="in implementation">sq_dirthumbs.h</include>
-    <include location="local" impldecl="in implementation">sq_iconloader.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="local"  impldecl="in implementation">sq_dirthumbs.h</include>
+    <include location="local"  impldecl="in implementation">sq_iconloader.h</include>
+    <include location="local"  impldecl="in implementation">sq_pixmapcache.h</include>
+    <include location="local"  impldecl="in implementation">sq_thumbnailcachemaster.ui.h</include>
+    <include location="local"  impldecl="in implementation">sq_viewcache.h</include>
     <include location="global" impldecl="in implementation">tdeio/global.h</include>
     <include location="global" impldecl="in implementation">tdeio/job.h</include>
-    <include location="local" impldecl="in implementation">sq_thumbnailcachemaster.ui.h</include>
+    <include location="global" impldecl="in implementation">tqapplication.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="private">slotCalcCache()</slot>
@@ -253,12 +254,4 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>