diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index cadcb3f5..ceabd80d 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -510,9 +510,8 @@
     <slot access="protected">paletteSelected(int)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>styledbutton.h</includehint>
-    <includehint>styledbutton.h</includehint>
-    <includehint>previewframe.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">previewframe.h</include>
+    <include location="global" impldecl="in implementation">styledbutton.h</include>
+</includes>
 </UI>
diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui
index 78fcb222..3e0cab3b 100644
--- a/kommander/editor/paletteeditoradvanced.ui
+++ b/kommander/editor/paletteeditoradvanced.ui
@@ -758,9 +758,7 @@
     <slot>showHelp()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>styledbutton.h</includehint>
-    <includehint>styledbutton.h</includehint>
-    <includehint>styledbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">styledbutton.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index 3a3a1efd..22a702c0 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -363,7 +363,7 @@
 </connections>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>visualframeeditor.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">visualframeeditor.h</include>
+</includes>
 </UI>
diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui
index 05766e6b..8f3798f4 100644
--- a/quanta/plugins/pluginconfig.ui
+++ b/quanta/plugins/pluginconfig.ui
@@ -264,7 +264,4 @@
     <slot>slotPluginTypeHighlighted(const TQString&amp;)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kicondialog.h</includehint>
-</includehints>
 </UI>
diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui
index a23e8de7..4da60b9d 100644
--- a/quanta/project/projectnewlocals.ui
+++ b/quanta/project/projectnewlocals.ui
@@ -338,7 +338,7 @@
     <tabstop>clearList</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>uploadtreeview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">uploadtreeview.h</include>
+</includes>
 </UI>