diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui
index db4ee05..98e50d9 100644
--- a/src/gui/asmformattingwidget.ui
+++ b/src/gui/asmformattingwidget.ui
@@ -203,11 +203,7 @@
     <tabstop>kcfg_AutoFormatMBOutput</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>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/gui/createsubprojectwidget.ui b/src/gui/createsubprojectwidget.ui
index 5354bcd..1519421 100644
--- a/src/gui/createsubprojectwidget.ui
+++ b/src/gui/createsubprojectwidget.ui
@@ -91,9 +91,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.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>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui
index 729861b..1835a3a 100644
--- a/src/gui/generaloptionswidget.ui
+++ b/src/gui/generaloptionswidget.ui
@@ -262,8 +262,8 @@
     <tabstop>refreshRateSlider</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui
index e8d5c32..4beab8c 100644
--- a/src/gui/gpasmsettingswidget.ui
+++ b/src/gui/gpasmsettingswidget.ui
@@ -279,10 +279,8 @@
     <tabstop>kcfg_DosFormat</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui
index c97dbbc..18e0559 100644
--- a/src/gui/linkeroptionswidget.ui
+++ b/src/gui/linkeroptionswidget.ui
@@ -168,12 +168,10 @@
     <tabstop>m_pInternalLibraries</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">keditlistbox.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/gui/logicwidget.ui b/src/gui/logicwidget.ui
index e57feab..676a441 100644
--- a/src/gui/logicwidget.ui
+++ b/src/gui/logicwidget.ui
@@ -263,14 +263,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped
     </vbox>
 </widget>
 <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>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/src/gui/microsettingswidget.ui b/src/gui/microsettingswidget.ui
index 9030238..1d43ea5 100644
--- a/src/gui/microsettingswidget.ui
+++ b/src/gui/microsettingswidget.ui
@@ -187,11 +187,8 @@ Drag it to set the type (input/output).</string>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.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">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui
index 5d94858..21d7afd 100644
--- a/src/gui/newfilewidget.ui
+++ b/src/gui/newfilewidget.ui
@@ -188,8 +188,8 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
     <tabstop>addToProjectCheck</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kiconview.h</includehint>
-    <includehint>microselectwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kiconview.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>
diff --git a/src/gui/newpinmappingwidget.ui b/src/gui/newpinmappingwidget.ui
index 36a7117..9fd4274 100644
--- a/src/gui/newpinmappingwidget.ui
+++ b/src/gui/newpinmappingwidget.ui
@@ -124,7 +124,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/src/gui/newprojectwidget.ui b/src/gui/newprojectwidget.ui
index b7c73b8..5c8a14f 100644
--- a/src/gui/newprojectwidget.ui
+++ b/src/gui/newprojectwidget.ui
@@ -101,10 +101,9 @@
     <tabstop>projectLocationURL</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.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>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui
index 79a98d0..45f54da 100644
--- a/src/gui/oscilloscopewidget.ui
+++ b/src/gui/oscilloscopewidget.ui
@@ -282,8 +282,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>oscilloscopeview.h</includehint>
-    <includehint>probepositioner.h</includehint>
-</includehints>
+<includes>
+    <include location="local" impldecl="in implementation">oscilloscopeview.h</include>
+    <include location="local" impldecl="in implementation">probepositioner.h</include>
+</includes>
 </UI>
diff --git a/src/gui/outputmethodwidget.ui b/src/gui/outputmethodwidget.ui
index 3eee06d..9d42484 100644
--- a/src/gui/outputmethodwidget.ui
+++ b/src/gui/outputmethodwidget.ui
@@ -173,10 +173,10 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>microselectwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>
diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui
index 60654f9..0b2b381 100644
--- a/src/gui/picprogrammerconfigwidget.ui
+++ b/src/gui/picprogrammerconfigwidget.ui
@@ -271,15 +271,9 @@
     <tabstop>kcfg_PicProgrammerPort</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.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">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/src/gui/processingoptionswidget.ui b/src/gui/processingoptionswidget.ui
index 658e394..4a9eaef 100644
--- a/src/gui/processingoptionswidget.ui
+++ b/src/gui/processingoptionswidget.ui
@@ -89,10 +89,10 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>microselectwidget.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.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>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>
diff --git a/src/gui/programmerwidget.ui b/src/gui/programmerwidget.ui
index e9e603e..0a44e48 100644
--- a/src/gui/programmerwidget.ui
+++ b/src/gui/programmerwidget.ui
@@ -116,8 +116,8 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>microselectwidget.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="local" impldecl="in implementation">microselectwidget.h</include>
+</includes>
 </UI>
diff --git a/src/gui/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui
index 475a53b..99505d3 100644
--- a/src/gui/sdccoptionswidget.ui
+++ b/src/gui/sdccoptionswidget.ui
@@ -580,7 +580,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>