diff --git a/knetworkmanager-0.8/src/connection_editor.ui b/knetworkmanager-0.8/src/connection_editor.ui
index 291829a..e6e1717 100644
--- a/knetworkmanager-0.8/src/connection_editor.ui
+++ b/knetworkmanager-0.8/src/connection_editor.ui
@@ -112,12 +112,4 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    
-    
-    
-    
-    
-    
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless.ui b/knetworkmanager-0.8/src/connection_setting_wireless.ui
index 3b35de1..3a29035 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless.ui
@@ -132,9 +132,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.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">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui b/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui
index a851a93..9de9a47 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui
@@ -158,6 +158,4 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/src/connection_settings.ui b/knetworkmanager-0.8/src/connection_settings.ui
index c7994de..8225ee7 100644
--- a/knetworkmanager-0.8/src/connection_settings.ui
+++ b/knetworkmanager-0.8/src/connection_settings.ui
@@ -128,10 +128,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/knetworkmanager-0.8/src/vpnauthentication.ui b/knetworkmanager-0.8/src/vpnauthentication.ui
index 124fa55..eb34891 100644
--- a/knetworkmanager-0.8/src/vpnauthentication.ui
+++ b/knetworkmanager-0.8/src/vpnauthentication.ui
@@ -142,8 +142,7 @@
     <slot access="protected">cancel()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui
index 3bea9b4..7943294 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui
@@ -74,7 +74,4 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui
index a1dbd99..521e21f 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui
@@ -614,6 +614,4 @@
     <tabstop>editUsername</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
index 4078684..1f527b4 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
@@ -88,8 +88,4 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    
-    
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
index c966535..b1d5ac1 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
@@ -236,9 +236,4 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    
-    
-    
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui
index a728a1d..4bf361d 100644
--- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui
@@ -229,8 +229,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <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>
+</includes>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui
index 4fdf2f1..8ff418c 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui
@@ -61,8 +61,4 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    
-    
-</includehints>
 </UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui
index c9fbd43..a7fed54 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui
@@ -274,6 +274,4 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-</includehints>
 </UI>