diff --git a/src/Q_bookmarkdialog.ui b/src/Q_bookmarkdialog.ui
index e86dafd..e686609 100644
--- a/src/Q_bookmarkdialog.ui
+++ b/src/Q_bookmarkdialog.ui
@@ -408,13 +408,9 @@
     <tabstop>ModeComboBox</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.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">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/src/Q_colorspreferencesdialog.ui b/src/Q_colorspreferencesdialog.ui
index dd0b7ef..ccafa4b 100644
--- a/src/Q_colorspreferencesdialog.ui
+++ b/src/Q_colorspreferencesdialog.ui
@@ -122,10 +122,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/src/Q_mainwindow.ui b/src/Q_mainwindow.ui
index 43aeb46..3e4c03b 100644
--- a/src/Q_mainwindow.ui
+++ b/src/Q_mainwindow.ui
@@ -370,11 +370,7 @@
     <tabstop>LogWindowA</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kbtaskview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/src/Q_userinterfacepreferencesdialog.ui b/src/Q_userinterfacepreferencesdialog.ui
index 836fea2..2390be0 100644
--- a/src/Q_userinterfacepreferencesdialog.ui
+++ b/src/Q_userinterfacepreferencesdialog.ui
@@ -136,7 +136,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
 </UI>