diff --git a/src/otrprefs.ui b/src/otrprefs.ui
index cb93975..2bcf214 100644
--- a/src/otrprefs.ui
+++ b/src/otrprefs.ui
@@ -289,7 +289,7 @@
     <slot access="private">generateFingerprint()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>
diff --git a/src/smppopupui.ui b/src/smppopupui.ui
index b2dc7f8..8319ed2 100644
--- a/src/smppopupui.ui
+++ b/src/smppopupui.ui
@@ -181,11 +181,8 @@
     <slot>cancelSMP()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/verifypopupui.ui b/src/verifypopupui.ui
index b1e066c..2749db7 100644
--- a/src/verifypopupui.ui
+++ b/src/verifypopupui.ui
@@ -104,10 +104,9 @@
     <slot>cbChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kactivelabel.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">kpushbutton.h</include>
+</includes>
 </UI>