10 files changed, 40 insertions, 63 deletions
diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui
index 2653a625..672b13c4 100644
--- a/chalk/ui/kis_previewwidgetbase.ui
+++ b/chalk/ui/kis_previewwidgetbase.ui
@@ -261,11 +261,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>imageviewer.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">imageviewer.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui
index aec6907d..2db08d5b 100644
--- a/chalk/ui/wdgautogradient.ui
+++ b/chalk/ui/wdgautogradient.ui
@@ -393,7 +393,7 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index fcc464a9..ff8bcfbf 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -287,9 +287,6 @@
         <data format="PNG" length="730">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002a149444154388db595df4b536118c73f3bdbecf8036c4e41f2c6695022045e486e90b721e4ba126f1a0966627f4108512004a197fd0586588220980a9a068be63abaa884cc1f6d30a7e29cfb216dceb39d9d2e2cf3c74997e417de97972fbc9fe77d1e789e57e772b9384d369b4d3deab95c2edd497784b3404ff20f460650fff732fc0ee0f5bc241298252dc710f4174e4be4908cb9661439cefa7c0fb71eee79fbe0486096b5af3d644e4e50537a3de880b4f2c7db07a7e51819156e77fe3b1860b4bb1095d871f0c1f4239108068381f84e9cc58545c6c7c78946a3d45dafa3b4b414511411f34456d756e9eded65706090924a076bdf9e1f071fd4c0c000c15010f7b49bc93793b4de6ba5abab0bd3451300bbbbbb783e7a08ac04d858dfd0cc4013dcdedebe7f368a462449a2ff553fcd4dcdf87c3eba7bba71bbdcf8fd7e8a8a8ab20703d4d6d6d2f1a00383d180b9c84c85a58282fc027c3e1ff537ea71dc71303a36caf6f6367d2ffab203773eeaa4e1660336ab8db49226c798839c9211f402b22c53535383cd6ac35261c1eff76b82353b4fafd7a3a80a899d048220904aa588842324779278bd5e9cef9cc41371ca2e9511de0a675f8ae1a161cc2633e5e5e5980a4d0882c06678133157243f2f9f85a50526a62698fb32c78c674613acf962dfb28fd05688443c41329944de95997e3fcdc8e8088b4b8bb85d6e42c110f6463b5557aab207c77ec458febe8c3fe067657585542a85d566c5bbecc5fdc18de5b285603088925168b9db927d294451c4e9745275b50a7ba39dc44e8292e212daeeb7517dad9aa9b7534833129224d1d4d4a409de9f6e9fc61eabaf9f9d7d9a7d1e7ba20e3dd5986e8a1c47c75ecf97543ab45ff117e5e416138f7af790474bb13edf435a0195d8a19ecf46eaaf2d9339609ed7a03ff56b3aabce0dfc13238259bff00a6d890000000049454e44ae426082</data>
     </image>
 </images>
-<includes>
-    <include location="local" impldecl="in declaration">kiconloader.h</include>
-</includes>
 <Q_SLOTS>
     <slot>zoomChanged(int)</slot>
     <slot>zoomMinus()</slot>
@@ -297,8 +294,9 @@
 </Q_SLOTS>
 <pixmapfunction>BarIcon</pixmapfunction>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdetoolbar.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">tdetoolbar.h</include>
+    <include location="local"  impldecl="in declaration">kiconloader.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui
index f4a0f695..1029c28a 100644
--- a/chalk/ui/wdgcolorsettings.ui
+++ b/chalk/ui/wdgcolorsettings.ui
@@ -347,11 +347,9 @@ The different rendering intent methods will affect only what is shown on screen,
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kis_cmb_idlist.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>squeezedcombobox.h</includehint>
-    <includehint>kis_cmb_idlist.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kis_cmb_idlist.h</include>
+    <include location="global" impldecl="in implementation">squeezedcombobox.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgcustompalette.ui b/chalk/ui/wdgcustompalette.ui
index ec0881bc..d496ac7a 100644
--- a/chalk/ui/wdgcustompalette.ui
+++ b/chalk/ui/wdgcustompalette.ui
@@ -82,7 +82,7 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kis_palette_view.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kis_palette_view.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui
index 9383fbfd..953b5a96 100644
--- a/chalk/ui/wdggeneralsettings.ui
+++ b/chalk/ui/wdggeneralsettings.ui
@@ -177,7 +177,7 @@
 <customwidgets>
 </customwidgets>
 <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/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui
index dbb90e0a..9103460a 100644
--- a/chalk/ui/wdggridsettings.ui
+++ b/chalk/ui/wdggridsettings.ui
@@ -449,20 +449,9 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui
index 82548e11..07ce9d63 100644
--- a/chalk/ui/wdgnewimage.ui
+++ b/chalk/ui/wdgnewimage.ui
@@ -422,14 +422,10 @@
     <tabstop>txtDescription</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kis_cmb_idlist.h</includehint>
-    <includehint>squeezedcombobox.h</includehint>
-    <includehint>kcolorcombo.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorcombo.h</include>
+    <include location="global" impldecl="in implementation">kis_cmb_idlist.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">squeezedcombobox.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui
index 82deb5b9..b3976f30 100644
--- a/chalk/ui/wdgperformancesettings.ui
+++ b/chalk/ui/wdgperformancesettings.ui
@@ -139,8 +139,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui
index e51a4d6c..dfb5b2c6 100644
--- a/chalk/ui/wdgtextbrush.ui
+++ b/chalk/ui/wdgtextbrush.ui
@@ -152,7 +152,7 @@
     <slot access="private">boldButtonClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>