diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui
index 59c8e8e..5a2f42d 100644
--- a/katapult/common/imagedisplaysettings.ui
+++ b/katapult/common/imagedisplaysettings.ui
@@ -206,8 +206,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontcombo.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+</includes>
 </UI>
diff --git a/katapult/katapult/confcatalogs.ui b/katapult/katapult/confcatalogs.ui
index 54c9af5..46322b2 100644
--- a/katapult/katapult/confcatalogs.ui
+++ b/katapult/katapult/confcatalogs.ui
@@ -33,7 +33,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdeactionselector.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdeactionselector.h</include>
+</includes>
 </UI>
diff --git a/katapult/katapult/confdisplay.ui b/katapult/katapult/confdisplay.ui
index 2dc3a1c..cf0d44c 100644
--- a/katapult/katapult/confdisplay.ui
+++ b/katapult/katapult/confdisplay.ui
@@ -58,7 +58,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/katapult/plugins/catalogs/amarokcatalog/settings.ui b/katapult/plugins/catalogs/amarokcatalog/settings.ui
index 350a20e..41ae516 100644
--- a/katapult/plugins/catalogs/amarokcatalog/settings.ui
+++ b/katapult/plugins/catalogs/amarokcatalog/settings.ui
@@ -74,7 +74,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
index 24ae2e2..e6c9942 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
+++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
@@ -108,10 +108,8 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
index ca86824..ff7edd4 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui
+++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
@@ -213,7 +213,7 @@
     <tabstop>fracDigits</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/katapult/plugins/catalogs/documentcatalog/settings.ui b/katapult/plugins/catalogs/documentcatalog/settings.ui
index d688553..d15e811 100644
--- a/katapult/plugins/catalogs/documentcatalog/settings.ui
+++ b/katapult/plugins/catalogs/documentcatalog/settings.ui
@@ -76,7 +76,7 @@
 </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/katapult/plugins/catalogs/programcatalog/settings.ui b/katapult/plugins/catalogs/programcatalog/settings.ui
index 16c5e91..dd13ee2 100644
--- a/katapult/plugins/catalogs/programcatalog/settings.ui
+++ b/katapult/plugins/catalogs/programcatalog/settings.ui
@@ -95,7 +95,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>