diff --git a/configdialog/kbfxconfigdlgabout.ui b/configdialog/kbfxconfigdlgabout.ui
index 1a2fca9..7e52608 100644
--- a/configdialog/kbfxconfigdlgabout.ui
+++ b/configdialog/kbfxconfigdlgabout.ui
@@ -718,10 +718,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!!</string>
     <function specifier="non virtual" returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</function>
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui
index 366d414..5335eb3 100644
--- a/configdialog/kbfxconfigdlgbutton.ui
+++ b/configdialog/kbfxconfigdlgbutton.ui
@@ -1255,21 +1255,10 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="4" margin="0"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kbfxpixmaplabel.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kbfxpixmaplabel.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kbfxpixmaplabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kbfxpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kbfxpixmaplabel.h</include>
+    <include location="global" impldecl="in implementation">kbfxpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui
index b870cf1..ca4e492 100644
--- a/configdialog/kbfxconfigdlgfonts-old.ui
+++ b/configdialog/kbfxconfigdlgfonts-old.ui
@@ -1162,32 +1162,9 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kbfxfontchooser.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kbfxfontchooser.h</include>
+    <include location="global" impldecl="in implementation">kcolorcombo.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui
index 5f04159..65f720b 100644
--- a/configdialog/kbfxconfigdlglayout.ui
+++ b/configdialog/kbfxconfigdlglayout.ui
@@ -1075,10 +1075,8 @@
     <function access="private" returnType="bool">KbfxMessage()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui
index e865258..25b622e 100644
--- a/configdialog/kbfxconfigdlgmain.ui
+++ b/configdialog/kbfxconfigdlgmain.ui
@@ -664,7 +664,7 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="10" margin="10"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui
index 1bd2038..9efc98d 100644
--- a/configdialog/kbfxconfigdlgplugins.ui
+++ b/configdialog/kbfxconfigdlgplugins.ui
@@ -382,9 +382,9 @@
     <function access="private">KbfxSaveSelectedPlugins()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>tdeactionselector.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">tdeactionselector.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgstyle.ui b/configdialog/kbfxconfigdlgstyle.ui
index 044812e..7b908ed 100644
--- a/configdialog/kbfxconfigdlgstyle.ui
+++ b/configdialog/kbfxconfigdlgstyle.ui
@@ -499,7 +499,7 @@
     <slot>ChangeForm()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui
index 660c80b..e53ce5f 100644
--- a/configdialog/kbfxconfigdlgthemes.ui
+++ b/configdialog/kbfxconfigdlgthemes.ui
@@ -1022,11 +1022,8 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui
index 3b0b6e4..eccab75 100644
--- a/configdialog/kbfxconfigdlgtooltip.ui
+++ b/configdialog/kbfxconfigdlgtooltip.ui
@@ -707,13 +707,8 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/configdialog/kbfxthemeinfo.ui b/configdialog/kbfxthemeinfo.ui
index 190a4d4..9687b51 100644
--- a/configdialog/kbfxthemeinfo.ui
+++ b/configdialog/kbfxthemeinfo.ui
@@ -588,16 +588,7 @@
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>