diff --git a/kdevplatform/shell/launchconfigurationdialog.ui b/kdevplatform/shell/launchconfigurationdialog.ui
index b24ee02e68..5bfd115b55 100644
--- a/kdevplatform/shell/launchconfigurationdialog.ui
+++ b/kdevplatform/shell/launchconfigurationdialog.ui
@@ -1,154 +1,154 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>LaunchConfigurationDialog</class>
  <widget class="QWidget" name="LaunchConfigurationDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>643</width>
     <height>530</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout">
        <item>
         <layout class="QHBoxLayout">
          <item>
           <widget class="QPushButton" name="addConfig">
            <property name="text">
             <string>Add</string>
            </property>
            <property name="icon">
             <iconset theme="list-add">
              <normaloff/>
             </iconset>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="deleteConfig">
            <property name="text">
             <string>Remove</string>
            </property>
            <property name="icon">
             <iconset theme="edit-delete">
              <normaloff/>
             </iconset>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </spacer>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QTreeView" name="tree">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>1</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <attribute name="headerVisible">
           <bool>false</bool>
          </attribute>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="layoutWidget_2">
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="1">
         <widget class="QLabel" name="debugLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="text">
           <string>Debugger:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="2">
         <widget class="QComboBox" name="debugger">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="configName">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="lineWidth">
           <number>1</number>
          </property>
          <property name="text">
           <string>Name</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0" colspan="3">
         <widget class="QStackedWidget" name="stack">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>2</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="KMessageWidget" name="messageWidget"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
    <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kdevplatform/shell/projectsourcepage.ui b/kdevplatform/shell/projectsourcepage.ui
index 819cd6116e..5eb242b6e9 100644
--- a/kdevplatform/shell/projectsourcepage.ui
+++ b/kdevplatform/shell/projectsourcepage.ui
@@ -1,133 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectSourcePage</class>
  <widget class="QWidget" name="ProjectSourcePage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>420</width>
     <height>353</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Source:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="sources"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Destination</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Directory:</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KUrlRequester" name="workingDir">
         <property name="placeholderText" stdset="0">
          <string>Select the directory to use...</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="sourceBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Source</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QWidget" name="remoteWidget" native="true"/>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QPushButton" name="get">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>Get</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QProgressBar" name="creationProgress">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="value">
            <number>0</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <widget class="KMessageWidget" name="status"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kdevplatform/shell/settings/environmentwidget.ui b/kdevplatform/shell/settings/environmentwidget.ui
index 7d0d29d681..22e6b2bf43 100644
--- a/kdevplatform/shell/settings/environmentwidget.ui
+++ b/kdevplatform/shell/settings/environmentwidget.ui
@@ -1,163 +1,163 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>EnvironmentWidget</class>
  <widget class="QWidget" name="EnvironmentWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>704</width>
     <height>480</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Environment profile:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KComboBox" name="profileSelect">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="addProfileButton">
        <property name="toolTip">
         <string>Add profile...</string>
        </property>
        <property name="icon">
         <iconset theme="list-add"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cloneProfileButton">
        <property name="toolTip">
         <string>Clone profile...</string>
        </property>
        <property name="icon">
         <iconset theme="edit-clone"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeProfileButton">
        <property name="toolTip">
         <string>Remove profile</string>
        </property>
        <property name="icon">
         <iconset theme="edit-delete"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="setAsDefaultProfileButton">
        <property name="toolTip">
         <string>Set as default</string>
        </property>
        <property name="icon">
         <iconset theme="starred-symbolic"/>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="1" column="0">
     <widget class="QTableView" name="variableTable">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>2</verstretch>
       </sizepolicy>
      </property>
      <property name="selectionMode">
       <enum>QAbstractItemView::ExtendedSelection</enum>
      </property>
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
      <property name="sortingEnabled">
       <bool>true</bool>
      </property>
      <property name="cornerButtonEnabled">
       <bool>false</bool>
      </property>
      <attribute name="verticalHeaderVisible">
       <bool>false</bool>
      </attribute>
     </widget>
    </item>
    <item row="1" column="1">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QPushButton" name="removeVariableButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="toolTip">
         <string>Remove variable</string>
        </property>
        <property name="icon">
         <iconset theme="edit-delete"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="batchModeEditButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="toolTip">
         <string>Batch Edit Mode</string>
        </property>
        <property name="icon">
         <iconset theme="format-list-unordered"/>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>40</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kdevplatform/shell/settings/projectpreferences.ui b/kdevplatform/shell/settings/projectpreferences.ui
index 126d8fb8b7..cd436c6d69 100644
--- a/kdevplatform/shell/settings/projectpreferences.ui
+++ b/kdevplatform/shell/settings/projectpreferences.ui
@@ -1,88 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectPreferences</class>
  <widget class="QWidget" name="ProjectSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>597</width>
     <height>247</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_3">
        <property name="toolTip">
         <string>Select the base directory where new projects are to be created.</string>
        </property>
        <property name="text">
         <string>Projects base directory:</string>
        </property>
        <property name="buddy">
         <cstring>kcfg_projectsBaseDirectory</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KUrlRequester" name="kcfg_projectsBaseDirectory">
        <property name="toolTip">
         <string>Select the base directory where new projects are to be created.</string>
        </property>
        <property name="mode">
         <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="kcfg_parseAllProjectSources">
      <property name="toolTip">
       <string>Parse all files in a project after the project has been opened.</string>
      </property>
      <property name="text">
       <string>Schedule all project files for parsing</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="kcfg_saveDocuments">
      <property name="toolTip">
       <string>Save all modified documents when the &quot;build&quot; action is triggered.</string>
      </property>
      <property name="text">
       <string>Save all documents before building</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>403</width>
        <height>147</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kdevplatform/shell/sourceformatterselectionedit.ui b/kdevplatform/shell/sourceformatterselectionedit.ui
index dca552dfa5..a106cee5d4 100644
--- a/kdevplatform/shell/sourceformatterselectionedit.ui
+++ b/kdevplatform/shell/sourceformatterselectionedit.ui
@@ -1,181 +1,181 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KDevelop::SourceFormatterSelectionEdit</class>
  <widget class="QWidget" name="KDevelop::SourceFormatterSelectionEdit">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>509</width>
     <height>344</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Language:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
      </property>
      <property name="margin">
       <number>4</number>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="KComboBox" name="cbLanguages"/>
      </item>
     </layout>
    </item>
    <item row="0" column="2" rowspan="3">
     <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,3">
      <item>
       <widget class="QLabel" name="descriptionLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>10</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QLabel" name="previewLabel">
        <property name="text">
         <string>Preview:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QWidget" name="textEditor" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Formatter:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
      </property>
      <property name="margin">
       <number>4</number>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="KComboBox" name="cbFormatters"/>
      </item>
     </layout>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Style:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
      </property>
      <property name="margin">
       <number>4</number>
      </property>
      <property name="indent">
       <number>-1</number>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QPushButton" name="btnNewStyle">
        <property name="text">
         <string>New</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QPushButton" name="btnEditStyle">
        <property name="text">
         <string>Edit...</string>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="QPushButton" name="btnDelStyle">
        <property name="text">
         <string>Delete</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0" colspan="3">
       <widget class="QListWidget" name="styleList">
        <property name="selectionBehavior">
         <enum>QAbstractItemView::SelectRows</enum>
        </property>
        <property name="sortingEnabled">
         <bool>false</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kdevplatform/vcs/dvcs/ui/dvcsimportmetadatawidget.ui b/kdevplatform/vcs/dvcs/ui/dvcsimportmetadatawidget.ui
index b5eb03fbdf..ee29ddc559 100644
--- a/kdevplatform/vcs/dvcs/ui/dvcsimportmetadatawidget.ui
+++ b/kdevplatform/vcs/dvcs/ui/dvcsimportmetadatawidget.ui
@@ -1,60 +1,60 @@
 <ui version="4.0" >
  <class>DvcsImportMetadataWidget</class>
  <widget class="QWidget" name="DvcsImportMetadataWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>581</width>
     <height>37</height>
    </rect>
   </property>
   <layout class="QFormLayout" >
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0" >
     <widget class="QLabel" name="labelUrl" >
      <property name="text" >
       <string>Source directory:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1" >
     <widget class="KUrlRequester" name="sourceLoc" />
    </item>
    <item row="1" column="0">
     <widget class="QLabel">
      <property name="text">
       <string>Commit message:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KTextEdit" name="message">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
-   <header>ktextedit.h</header>
+   <header>KTextEdit</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kdevplatform/vcs/widgets/vcsdiffwidget.ui b/kdevplatform/vcs/widgets/vcsdiffwidget.ui
index 496d96268e..4cf5b21925 100644
--- a/kdevplatform/vcs/widgets/vcsdiffwidget.ui
+++ b/kdevplatform/vcs/widgets/vcsdiffwidget.ui
@@ -1,46 +1,46 @@
 <ui version="4.0" >
  <class>VcsDiffWidget</class>
  <widget class="QWidget" name="VcsDiffWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>625</width>
     <height>376</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QLabel" name="revLabel" >
      <property name="text" >
       <string>Difference between revisions</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KTextEdit" name="diffDisplay" />
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
-   <header>ktextedit.h</header>
+   <header>KTextEdit</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/android/androidpreferences.ui b/plugins/android/androidpreferences.ui
index ba23274168..a1719da608 100644
--- a/plugins/android/androidpreferences.ui
+++ b/plugins/android/androidpreferences.ui
@@ -1,88 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AndroidPreferences</class>
  <widget class="QWidget" name="AndroidPreferences">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="whatsThis">
       <string>Android KDE extra-cmake-modules toolchain file</string>
      </property>
      <property name="text">
       <string>Android toolchain:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KUrlRequester" name="kcfg_cmakeToolchain"/>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Android NDK:</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="KUrlRequester" name="kcfg_ndk"/>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Android SDK:</string>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="KUrlRequester" name="kcfg_sdk"/>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Architecture:</string>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="QLineEdit" name="kcfg_arch"/>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Toolchain:</string>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="QLineEdit" name="kcfg_toolchain"/>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>ABI:</string>
      </property>
     </widget>
    </item>
    <item row="7" column="1">
     <widget class="QLineEdit" name="kcfg_abi"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/appwizard/projectselectionpage.ui b/plugins/appwizard/projectselectionpage.ui
index 6382052b20..790212db03 100644
--- a/plugins/appwizard/projectselectionpage.ui
+++ b/plugins/appwizard/projectselectionpage.ui
@@ -1,177 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectSelectionPage</class>
  <widget class="QWidget" name="ProjectSelectionPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>807</width>
     <height>598</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="propertiesBox">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Properties</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="projectNameLabel">
         <property name="text">
          <string>Project name:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="projectNameEdit"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="locationLabel">
         <property name="text">
          <string>Location:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="locationUrl"/>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="KMessageWidget" name="locationValidWidget"/>
       </item>
      </layout>
     </widget>
    </item>
    <item row="0" column="0">
     <widget class="KDevelop::MultiLevelListView" name="listView"/>
    </item>
    <item row="0" column="1">
     <widget class="QFrame" name="descriptionFrame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>300</width>
        <height>400</height>
       </size>
      </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="spacing">
        <number>0</number>
       </property>
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QWidget" name="descriptionContent" native="true">
         <property name="autoFillBackground">
          <bool>true</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
           <widget class="QLabel" name="header">
            <property name="text">
             <string notr="true"/>
            </property>
            <property name="alignment">
             <set>Qt::AlignHCenter|Qt::AlignTop</set>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QComboBox" name="templateType"/>
          </item>
          <item>
           <widget class="QLabel" name="icon">
            <property name="text">
             <string/>
            </property>
            <property name="alignment">
             <set>Qt::AlignHCenter|Qt::AlignTop</set>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="description">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::MultiLevelListView</class>
    <extends>QWidget</extends>
    <header>util/multilevellistview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>projectNameEdit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/appwizard/projectvcspage.ui b/plugins/appwizard/projectvcspage.ui
index a4c5d2e759..945a2b8ea9 100644
--- a/plugins/appwizard/projectvcspage.ui
+++ b/plugins/appwizard/projectvcspage.ui
@@ -1,48 +1,48 @@
 <ui version="4.0" >
  <class>ProjectVcsPage</class>
  <widget class="QWidget" name="ProjectVcsPage" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>559</width>
     <height>325</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" >
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout" >
      <item>
       <widget class="QLabel" name="label" >
        <property name="text" >
         <string>Version control system:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KComboBox" name="vcsTypes" >
        <property name="sizePolicy" >
         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QStackedWidget" name="vcsImportOptions"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/astyle/astyle_preferences.ui b/plugins/astyle/astyle_preferences.ui
index f5abb22230..02ec00360c 100644
--- a/plugins/astyle/astyle_preferences.ui
+++ b/plugins/astyle/astyle_preferences.ui
@@ -1,607 +1,607 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AStylePreferences</class>
  <widget class="QWidget" name="AStylePreferences">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>332</width>
     <height>600</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tabIndentqtion">
       <attribute name="title">
        <string>Indentation</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="KComboBox" name="cbIndentType">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string comment="Indentation type">Tabs</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="Indentation type">Force tabs</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string comment="Indentation type">Spaces</string>
             </property>
            </item>
           </widget>
          </item>
          <item>
           <spacer name="spacer13_3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Minimum</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>18</width>
              <height>21</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QSpinBox" name="inpNuberSpaces">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="toolTip">
             <string>Number of spaces that will be converted to a tab.
 The number of spaces per tab is controlled by the editor.</string>
            </property>
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="value">
             <number>4</number>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QCheckBox" name="chkConvertTabs">
          <property name="enabled">
           <bool>true</bool>
          </property>
          <property name="toolTip">
           <string>Convert tabs to spaces.</string>
          </property>
          <property name="text">
           <string>Con&amp;vert tabs into spaces</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="chkFillEmptyLines">
          <property name="toolTip">
           <string>Fill empty lines with the white space of their previous lines.</string>
          </property>
          <property name="text">
           <string>Fill empt&amp;y lines</string>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QGridLayout" name="gridLayout_3">
          <item row="1" column="0">
           <spacer name="verticalSpacer">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>10</height>
             </size>
            </property>
           </spacer>
          </item>
          <item row="0" column="0">
           <widget class="QLabel" name="lblIndentObjects">
            <property name="text">
             <string>Indent:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1" rowspan="2">
           <widget class="QListWidget" name="listIdentObjects">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <item>
             <property name="text">
              <string>Blocks</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Brackets</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Cases</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Class</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Labels</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Namespaces</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Preprocessor directives</string>
             </property>
            </item>
            <item>
             <property name="text">
              <string>Switches</string>
             </property>
            </item>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QGridLayout" name="gridLayout_4">
          <item row="0" column="1">
           <widget class="QSpinBox" name="inpMaxStatement">
            <property name="toolTip">
             <string>Indent a maximal # spaces in a continuous statement,
 relative to the previous line.</string>
            </property>
            <property name="value">
             <number>40</number>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="TextLabel3_2">
            <property name="toolTip">
             <string>Indent a minimal # spaces in a continuous conditional
 belonging to a conditional header.</string>
            </property>
            <property name="text">
             <string>Minimum in conditional:</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QSpinBox" name="inpMinConditional">
            <property name="toolTip">
             <string>Indent a minimal # spaces in a continuous conditional
 belonging to a conditional header.</string>
            </property>
            <property name="specialValueText">
             <string>Twice current</string>
            </property>
            <property name="minimum">
             <number>-1</number>
            </property>
            <property name="value">
             <number>-1</number>
            </property>
           </widget>
          </item>
          <item row="0" column="0">
           <widget class="QLabel" name="TextLabel2_2">
            <property name="toolTip">
             <string>Indent a maximal # spaces in a continuous statement,
 relative to the previous line.</string>
            </property>
            <property name="text">
             <string>Maximum in statement:</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QSpinBox" name="inpContinuation">
            <property name="toolTip">
             <string>Number of indents</string>
            </property>
            <property name="maximum">
             <number>4</number>
            </property>
            <property name="value">
             <number>1</number>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QCheckBox" name="chkAfterParens">
            <property name="toolTip">
             <string>Indent, instead of align, continuation lines following lines that contain an opening paren '(' or an assignment '='.</string>
            </property>
            <property name="text">
             <string>Continuation lines:</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>144</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabOther">
       <attribute name="title">
        <string>Other</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <item>
         <widget class="QGroupBox" name="gpBrackets">
          <property name="title">
           <string>Brackets</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <layout class="QGridLayout" name="gridLayout_5">
             <item row="0" column="0">
              <widget class="QLabel" name="lblBrackets">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Type:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="0" colspan="2">
              <widget class="QCheckBox" name="chkBracketsCloseHeaders">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="toolTip">
                <string>Break brackets before closing headers (e.g. 'else', 'catch', ...)
 from their immediately preceding closing brackets.</string>
               </property>
               <property name="text">
                <string>Brea&amp;k closing headers</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="KComboBox" name="cbBrackets">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <item>
                <property name="text">
                 <string>No change</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Attach</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Break</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Linux</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Run-In</string>
                </property>
               </item>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gpBlocks">
          <property name="title">
           <string>Blocks</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
            <widget class="QCheckBox" name="chkBlockBreak">
             <property name="toolTip">
              <string>Insert empty lines around unrelated blocks, labels, classes,...
 Known problems:
 
 1. If a statement is NOT part of a block, 
 the following statements are all double spaced. 
 Statements enclosed in a block are formatted 
 correctly.
 
 2. Comments are broken from the block.
 </string>
             </property>
             <property name="text">
              <string comment="Means break unrelated blocks by a newline">&amp;Break blocks</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="chkBlockBreakAll">
             <property name="toolTip">
              <string>Like --break-blocks, except also insert empty lines 
 around closing headers (e.g. 'else', 'catch', ...).
 
 Known problems:
 
 1. If a statement is NOT part of a block, 
 the following statements are all double spaced. 
 Statements enclosed in a block are formatted 
 correctly.
 
 2. Comments are broken from the block.
 </string>
             </property>
             <property name="text">
              <string comment="Means break all blocks with a newline">Break all bl&amp;ocks</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="chkBlockIfElse">
             <property name="toolTip">
              <string>Break 'else if()' statements into two different lines.</string>
             </property>
             <property name="text">
              <string comment="Means break else if() into separate lines">Break i&amp;f-else</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gpPadding">
          <property name="title">
           <string>Padding</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
            <layout class="QGridLayout" name="gridLayout_6">
             <item row="0" column="1">
              <widget class="KComboBox" name="cbParenthesisPadding">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <item>
                <property name="text">
                 <string>No change</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Unpad</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Inside only</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Outside only</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Inside and outside</string>
                </property>
               </item>
              </widget>
             </item>
             <item row="2" column="0" colspan="2">
              <widget class="QCheckBox" name="chkPadOperators">
               <property name="toolTip">
                <string>Insert space padding around operators.
 Once padded, operators stay padded.
 There is no unpad operator option.</string>
               </property>
               <property name="text">
                <string>&amp;Add spaces around operators</string>
               </property>
              </widget>
             </item>
             <item row="0" column="0">
              <widget class="QLabel" name="lblParenthesis">
               <property name="text">
                <string>Pad parenthesis:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="0" colspan="2">
              <widget class="QCheckBox" name="chkPadParenthesisHeader">
               <property name="toolTip">
                <string>Insert space padding after parenthesis headers (e.g. 'if', 'for', 'while', ...)</string>
               </property>
               <property name="text">
                <string>Add spaces after parenthesis &amp;headers</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gpOneLiners">
          <property name="title">
           <string>One liners</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
            <widget class="QCheckBox" name="chkKeepStatements">
             <property name="toolTip">
              <string>Do not break lines containing multiple statements into
 multiple single-statement lines.</string>
             </property>
             <property name="text">
              <string>&amp;Keep one-line statements</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="chkKeepBlocks">
             <property name="toolTip">
              <string>Do not break blocks residing completely on one line.</string>
             </property>
             <property name="text">
              <string>Keep o&amp;ne-line blocks</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gpOther">
          <property name="title">
           <string>Other</string>
          </property>
          <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
           <item row="0" column="0">
            <widget class="QLabel" name="lblPointerAlign">
             <property name="text">
              <string>Pointer Alignment:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QComboBox" name="cbPointerAlign">
             <item>
              <property name="text">
               <string>No change</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Name</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Middle</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Type</string>
              </property>
             </item>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>70</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/clangtidy/config/clangtidypreferences.ui b/plugins/clangtidy/config/clangtidypreferences.ui
index 602f101645..ca45fa20a5 100644
--- a/plugins/clangtidy/config/clangtidypreferences.ui
+++ b/plugins/clangtidy/config/clangtidypreferences.ui
@@ -1,142 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ClangTidyPreferences</class>
  <widget class="QWidget" name="ClangTidyPreferences">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="settingsLayout" stretch="0,0">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="pathsGroupBox">
      <property name="title">
       <string>Paths</string>
      </property>
      <layout class="QHBoxLayout" name="pathsGroupBoxLayout">
       <item>
        <layout class="QVBoxLayout" name="pathsLabelsLayout">
         <item>
          <widget class="QLabel" name="clangtidyLabel">
           <property name="text">
            <string>Clang-&amp;tidy executable:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
            <cstring>kcfg_clangtidyPath</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <layout class="QVBoxLayout" name="pathsUrlsLayout">
         <item>
          <widget class="KUrlRequester" name="kcfg_clangtidyPath">
           <property name="toolTip">
            <string>The full path to the clang-tidy executable</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="jobsBox">
      <property name="title">
       <string/>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QCheckBox" name="kcfg_parallelJobsEnabled">
         <property name="text">
          <string>Run analysis jobs in parallel</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QCheckBox" name="kcfg_parallelJobsAutoCount">
           <property name="text">
            <string>Use all CPU cores</string>
           </property>
          </widget>
         </item>
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QLabel" name="parallelJobsFixedCountLabel">
           <property name="text">
            <string>Maximum number of threads:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QSpinBox" name="kcfg_parallelJobsFixedCount">
           <property name="minimum">
            <number>1</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="settingsSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>186</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/clazy/config/checkswidget.ui b/plugins/clazy/config/checkswidget.ui
index 1601a5940f..185ecb1c60 100644
--- a/plugins/clazy/config/checkswidget.ui
+++ b/plugins/clazy/config/checkswidget.ui
@@ -1,97 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Clazy::ChecksWidget</class>
  <widget class="QWidget" name="Clazy::ChecksWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>606</width>
     <height>284</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="topLayout">
      <item>
       <widget class="QPushButton" name="resetButton">
        <property name="text">
         <string>Reset checks</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KTreeWidgetSearchLine" name="filterEdit"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QSplitter" name="splitter">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="childrenCollapsible">
       <bool>false</bool>
      </property>
      <widget class="QTreeWidget" name="checksTree">
       <attribute name="headerVisible">
        <bool>false</bool>
       </attribute>
       <column>
        <property name="text">
         <string notr="true">1</string>
        </property>
       </column>
      </widget>
      <widget class="QTextEdit" name="descriptionView">
       <property name="readOnly">
        <bool>true</bool>
       </property>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="KMessageWidget" name="messageLabel">
      <property name="text">
       <string>Since nothing is selected Clazy will use all checks from levels 0 and 1.</string>
      </property>
      <property name="closeButtonVisible">
       <bool>false</bool>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>KMessageWidget</header>
   </customwidget>
   <customwidget>
    <class>KTreeWidgetSearchLine</class>
    <extends>QLineEdit</extends>
-   <header>ktreewidgetsearchline.h</header>
+   <header>KTreeWidgetSearchLine</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/clazy/config/globalconfigpage.ui b/plugins/clazy/config/globalconfigpage.ui
index df52e8b301..5b63f72a07 100644
--- a/plugins/clazy/config/globalconfigpage.ui
+++ b/plugins/clazy/config/globalconfigpage.ui
@@ -1,198 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Clazy::GlobalConfigPage</class>
  <widget class="QWidget" name="Clazy::GlobalConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>568</width>
     <height>670</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="pathBox">
      <property name="title">
       <string>Paths</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="executableLabel">
         <property name="text">
          <string>clazy-standalone:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="kcfg_executablePath">
         <property name="toolTip">
          <string>Path to clazy-standalone executable.</string>
         </property>
         <property name="mode">
          <set>KFile::ExistingOnly|KFile::File|KFile::LocalOnly</set>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="docsLabel">
         <property name="text">
          <string>Documentation:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="kcfg_docsPath">
         <property name="toolTip">
          <string>Path to clazy documentation directory.</string>
         </property>
         <property name="mode">
          <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="checksInfoLabel">
         <property name="text">
          <string notr="true">checksInfoLabel</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="jobsBox">
      <property name="title">
       <string/>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QCheckBox" name="kcfg_parallelJobsEnabled">
         <property name="text">
          <string>Run analysis jobs in parallel</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QCheckBox" name="kcfg_parallelJobsAutoCount">
           <property name="text">
            <string>Use all CPU cores</string>
           </property>
          </widget>
         </item>
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QLabel" name="parallelJobsFixedCountLabel">
           <property name="text">
            <string>Maximum number of threads:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QSpinBox" name="kcfg_parallelJobsFixedCount">
           <property name="minimum">
            <number>1</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Output</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QCheckBox" name="kcfg_hideOutputView">
         <property name="text">
          <string>Hide output view during check</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="kcfg_verboseOutput">
         <property name="text">
          <string>Verbose output</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="KMessageWidget" name="errorWidget">
      <property name="text">
       <string notr="true">errorWidget</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
      <property name="closeButtonVisible">
       <bool>false</bool>
      </property>
      <property name="messageType">
       <enum>KMessageWidget::Error</enum>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>264</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>KMessageWidget</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/clazy/config/projectconfigpage.ui b/plugins/clazy/config/projectconfigpage.ui
index 40ac59b8fa..2a99ea4cfd 100644
--- a/plugins/clazy/config/projectconfigpage.ui
+++ b/plugins/clazy/config/projectconfigpage.ui
@@ -1,281 +1,281 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Clazy::ProjectConfigPage</class>
  <widget class="QWidget" name="Clazy::ProjectConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>723</width>
     <height>396</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="checksTab">
       <attribute name="title">
        <string>Checks</string>
       </attribute>
      </widget>
      <widget class="QWidget" name="optionsTab">
       <attribute name="title">
        <string>Options</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QGroupBox" name="commonBox">
          <property name="title">
           <string/>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <widget class="QCheckBox" name="kcfg_onlyQt">
             <property name="toolTip">
              <string>Do not emit warnings for non-Qt files, or in other words, if -DQT_CORE_LIB is missing.</string>
             </property>
             <property name="text">
              <string>Only Qt</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QCheckBox" name="kcfg_qt4Compat">
             <property name="toolTip">
              <string>Disable checks not compatible with Qt 4.</string>
             </property>
             <property name="text">
              <string>Qt4 compatible</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QCheckBox" name="kcfg_qtDeveloper">
             <property name="toolTip">
              <string>For running clazy on Qt itself, optional, but honours specific guidelines.</string>
             </property>
             <property name="text">
              <string>Qt developer</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QCheckBox" name="kcfg_visitImplicitCode">
             <property name="toolTip">
              <string>For visiting implicit code like compiler generated constructors.
 None of the built-in checks benefit from this, but can be useful for custom checks.</string>
             </property>
             <property name="text">
              <string>Visit implicit code</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="headersBox">
          <property name="title">
           <string/>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="QCheckBox" name="kcfg_ignoreIncludedFiles">
             <property name="toolTip">
              <string>Only emit warnings for the current file being compiled and ignore any includes.
 Useful for performance reasons.</string>
             </property>
             <property name="text">
              <string>Ignore included files</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout">
             <item>
              <widget class="QLabel" name="headerFilterLabel">
               <property name="text">
                <string>Header filter:</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLineEdit" name="kcfg_headerFilter">
               <property name="toolTip">
                <string>Regular expression matching the names of the headers to output diagnostics from.
 Diagnostics from the main file of each translation unit are always displayed.</string>
               </property>
               <property name="clearButtonEnabled">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="fixitsBox">
          <property name="title">
           <string/>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <layout class="QHBoxLayout" name="fixitsHLayout">
             <item>
              <widget class="QCheckBox" name="kcfg_enableAllFixits">
               <property name="text">
                <string>Enable all fixits</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QCheckBox" name="kcfg_noInplaceFixits">
               <property name="toolTip">
                <string>Fixits will be applied to a separate file (for unit-test use only).</string>
               </property>
               <property name="text">
                <string>No-inplace fixits</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="KMessageWidget" name="kmessagewidget">
             <property name="text">
              <string>Please backup your code before fixits applying. For better results also disable 
 parallel checking, which can lead to multiple fixit applying for header files.</string>
             </property>
             <property name="closeButtonVisible">
              <bool>false</bool>
             </property>
             <property name="messageType">
              <enum>KMessageWidget::Warning</enum>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="extraTab">
       <attribute name="title">
        <string>Extra Parameters</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="extraAppendLabel">
          <property name="text">
           <string>Compiler append:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QLineEdit" name="kcfg_extraAppend">
          <property name="toolTip">
           <string>Additional parameters to append to the compiler command line.</string>
          </property>
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="extraPrependLabel">
          <property name="text">
           <string>Compiler prepend:</string>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="QLineEdit" name="kcfg_extraPrepend">
          <property name="toolTip">
           <string>Additional parameters to prepend to the compiler command line.</string>
          </property>
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="QLineEdit" name="kcfg_extraClazy">
          <property name="toolTip">
           <string>Additional parameters to clazy-standalone.</string>
          </property>
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="extraClazyLabel">
          <property name="text">
           <string>Extra parameters:</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="CommandLineWidget" name="commandLineWidget" native="true"/>
    </item>
    <item>
     <widget class="KMessageWidget" name="dbError">
      <property name="text">
       <string notr="true">dbError</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
      <property name="closeButtonVisible">
       <bool>false</bool>
      </property>
      <property name="messageType">
       <enum>KMessageWidget::Error</enum>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>KMessageWidget</header>
   </customwidget>
   <customwidget>
    <class>CommandLineWidget</class>
    <extends>QWidget</extends>
    <header>config/commandlinewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/cmake/cmakebuilddirchooser.ui b/plugins/cmake/cmakebuilddirchooser.ui
index a416e2a4dd..7b121b6826 100644
--- a/plugins/cmake/cmakebuilddirchooser.ui
+++ b/plugins/cmake/cmakebuilddirchooser.ui
@@ -1,215 +1,215 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CMakeBuildDirChooser</class>
  <widget class="QWidget" name="CMakeBuildDirChooser">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>611</width>
     <height>280</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::ExpandingFieldsGrow</enum>
    </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="availableLabel">
      <property name="text">
       <string>Available build directories:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="availableBuildDirs">
      <item>
       <property name="text">
        <string>New build directory</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Build &amp;directory:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>buildFolder</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KUrlRequester" name="buildFolder">
      <property name="minimumSize">
       <size>
        <width>500</width>
        <height>0</height>
       </size>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>&amp;Installation prefix:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>installPrefix</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="KUrlRequester" name="installPrefix">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>500</width>
        <height>0</height>
       </size>
      </property>
      <property name="toolTip">
       <string>The prefix under which the project will be installed. Leaving this empty will let CMake use its default install prefix.</string>
      </property>
      <property name="placeholderText">
       <string>CMake's default install prefix</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Build &amp;type:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>buildType</cstring>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QComboBox" name="buildType">
      <property name="editable">
       <bool>true</bool>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <item>
       <property name="text">
        <string notr="true">Debug</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">Release</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">RelWithDebInfo</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">MinSizeRel</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Extra arguments:</string>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="KComboBox" name="extraArguments">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="editable">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>CMake &amp;executable:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>cmakeExecutable</cstring>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="KUrlRequester" name="cmakeExecutable">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="7" column="0" colspan="2">
     <widget class="QLabel" name="status">
      <property name="text">
       <string notr="true">Status Message...</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/cmake/settings/cmakebuildsettings.ui b/plugins/cmake/settings/cmakebuildsettings.ui
index 5431d30076..1c2622bfe4 100644
--- a/plugins/cmake/settings/cmakebuildsettings.ui
+++ b/plugins/cmake/settings/cmakebuildsettings.ui
@@ -1,268 +1,268 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CMakeBuildSettings</class>
  <widget class="QWidget" name="CMakeBuildSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>605</width>
     <height>607</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QVBoxLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="KComboBox" name="buildDirs"/>
      </item>
      <item>
       <widget class="QPushButton" name="addBuildDir">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="list-add"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeBuildDir">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="edit-delete"/>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Cache Values</string>
      </property>
      <layout class="QVBoxLayout">
       <item>
        <widget class="QTableView" name="cacheList"/>
       </item>
       <item>
        <widget class="QLabel" name="label_6">
         <property name="font">
          <font>
           <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
         <property name="text">
          <string>Comment:</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="commentText">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="showAdvanced">
      <property name="text">
       <string>Show Advanced</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
      <property name="flat">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="advancedBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Advanced</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="installationPrefixLabel">
         <property name="text">
          <string>Installation prefix:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="installationPrefix"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="buildTypeLabel">
         <property name="text">
          <string>Build type:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QComboBox" name="buildType">
         <property name="editable">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string notr="true">Debug</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">Release</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">RelWithDebInfo</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">MinSizeRel</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="extraArgumentsLabel">
         <property name="text">
          <string>Extra arguments:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="KComboBox" name="extraArguments">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="editable">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Configure environment:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KDevelop::EnvironmentSelectionWidget" name="environment">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Select an environment to be used</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KDevelop::EnvironmentConfigureButton" name="configureEnvironment"/>
         </item>
        </layout>
       </item>
       <item row="5" column="1">
        <widget class="QCheckBox" name="showInternal">
         <property name="text">
          <string>Show advanced values</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
        <widget class="KUrlRequester" name="cMakeExecutable"/>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>CMake executable:</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/cmakebuilder/cmakebuilderpreferences.ui b/plugins/cmakebuilder/cmakebuilderpreferences.ui
index 5a1a115fce..4a4f929a98 100644
--- a/plugins/cmakebuilder/cmakebuilderpreferences.ui
+++ b/plugins/cmakebuilder/cmakebuilderpreferences.ui
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CMakeBuilderPreferences</class>
  <widget class="QWidget" name="CMakeBuilderPreferences">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>549</width>
     <height>363</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label1">
      <property name="text">
       <string>Default CMake executable:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KUrlRequester" name="kcfg_cmakeExecutable">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label2">
      <property name="text">
       <string>Default generator:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QComboBox" name="kcfg_generator"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/cppcheck/config/globalconfigpage.ui b/plugins/cppcheck/config/globalconfigpage.ui
index 809de723c0..d26bdde239 100644
--- a/plugins/cppcheck/config/globalconfigpage.ui
+++ b/plugins/cppcheck/config/globalconfigpage.ui
@@ -1,90 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>cppcheck::GlobalConfigPage</class>
  <widget class="QWidget" name="cppcheck::GlobalConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>757</width>
     <height>397</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="pathsGroupBox">
      <property name="title">
       <string>Paths</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLabel" name="cppcheckLabel">
         <property name="text">
          <string>Cppchec&amp;k executable:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>kcfg_executablePath</cstring>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KUrlRequester" name="kcfg_executablePath"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="outputGroupBox">
      <property name="title">
       <string>Output</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QCheckBox" name="kcfg_hideOutputView">
         <property name="text">
          <string>Hide output view during check</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="kcfg_showXmlOutput">
         <property name="text">
          <string>Show cppcheck XML output in the output view</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>149</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/cppcheck/config/projectconfigpage.ui b/plugins/cppcheck/config/projectconfigpage.ui
index 5b6eebcf69..497fb4e2f0 100644
--- a/plugins/cppcheck/config/projectconfigpage.ui
+++ b/plugins/cppcheck/config/projectconfigpage.ui
@@ -1,398 +1,398 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>cppcheck::ProjectConfigPage</class>
  <widget class="QWidget" name="cppcheck::ProjectConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>443</width>
     <height>502</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tabChecks">
       <attribute name="title">
        <string>Checks</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <item>
         <layout class="QGridLayout" name="gridLayout">
          <item row="2" column="0">
           <widget class="QCheckBox" name="kcfg_checkUnusedFunction">
            <property name="toolTip">
             <string>Check for unused functions. It is recommend to only enable this when the whole program is scanned</string>
            </property>
            <property name="text">
             <string>Unused function</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
           <widget class="QCheckBox" name="kcfg_inconclusiveAnalysis">
            <property name="toolTip">
             <string>Allow that Cppcheck reports even though the analysis is inconclusive. There are false positives with this option. Each result must be carefully investigated before you know if it is good or bad.</string>
            </property>
            <property name="text">
             <string>Inconclusive analysis</string>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QCheckBox" name="kcfg_checkInformation">
            <property name="toolTip">
             <string>Enable information messages</string>
            </property>
            <property name="text">
             <string>Information</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="2" column="1">
           <widget class="QCheckBox" name="kcfg_checkMissingInclude">
            <property name="toolTip">
             <string>Warn if there are missing includes. For detailed information use 'check-config'</string>
            </property>
            <property name="text">
             <string>Missing include</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QCheckBox" name="kcfg_checkPerformance">
            <property name="toolTip">
             <string>Enable performance messages</string>
            </property>
            <property name="text">
             <string>Performance</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="3" column="1">
           <widget class="QCheckBox" name="kcfg_forceCheck">
            <property name="toolTip">
             <string>&lt;p&gt;Force checking of files that have a lot of configurations. Error is printed if such a file is found so there is no reason to use this by default. If used together with '--max-configs=', the last option is the one that is effective.&lt;br/&gt;&lt;br/&gt;Be careful with using this option - it can dramatically slow checking.&lt;/p&gt;</string>
            </property>
            <property name="text">
             <string>Force checking</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QCheckBox" name="kcfg_checkPortability">
            <property name="toolTip">
             <string>Enable portability messages</string>
            </property>
            <property name="text">
             <string>Portability</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="0" column="0">
           <widget class="QCheckBox" name="kcfg_checkStyle">
            <property name="toolTip">
             <string>Enable all coding style checks. All messages with the severities 'style', 'performance' and 'portability' are enabled.</string>
            </property>
            <property name="text">
             <string>Style</string>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item row="4" column="0">
           <widget class="QCheckBox" name="kcfg_checkConfig">
            <property name="toolTip">
             <string>Check Cppcheck configuration. The normal code analysis is disabled by this flag.</string>
            </property>
            <property name="text">
             <string>Check config</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabIncludes">
       <attribute name="title">
        <string>Include Directories</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QCheckBox" name="kcfg_useProjectIncludes">
          <property name="toolTip">
           <string>Add 'project' include directories to cppcheck arguments. This option adds only paths related with project's root and build directories.</string>
          </property>
          <property name="text">
           <string>Use 'project' include dirs</string>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="kcfg_useSystemIncludes">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="toolTip">
           <string>&lt;p&gt;Add other, 'system' include directories to cppcheck arguments.&lt;br/&gt;&lt;br/&gt;Be careful with using this option - it can dramatically slow checking.&lt;/p&gt;</string>
          </property>
          <property name="text">
           <string>Use 'system' include dirs</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
          <property name="checked">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QLabel" name="label">
            <property name="text">
             <string>&amp;Ignored includes:</string>
            </property>
            <property name="buddy">
             <cstring>kcfg_ignoredIncludes</cstring>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="kcfg_ignoredIncludes">
            <property name="toolTip">
             <string>&lt;html&gt;
 
 &lt;p&gt;Defines semicolon-separated list of ignored include directories.&lt;/p&gt;
 
 &lt;p&gt;You can use the following placeholders:&lt;/p&gt;
 
 &lt;p&gt;&lt;b&gt;&lt;tt&gt;%p&lt;/tt&gt;&lt;/b&gt; - Gets replaced by the URL of the project's root directory.&lt;/p&gt;
 
 &lt;p&gt;&lt;b&gt;&lt;tt&gt;%b&lt;/tt&gt;&lt;/b&gt; - Gets replaced by the URL of the project's build directory.&lt;/p&gt;
 
 &lt;/html&gt;</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabExtra">
       <attribute name="title">
        <string>Extra Parameters</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
           <layout class="QHBoxLayout" name="extraParametersLayout">
            <property name="sizeConstraint">
             <enum>QLayout::SetDefaultConstraint</enum>
            </property>
            <item>
             <widget class="QLabel" name="extraLabel">
              <property name="text">
               <string>Ex&amp;tra parameters:</string>
              </property>
              <property name="buddy">
               <cstring>kcfg_extraParameters</cstring>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLineEdit" name="kcfg_extraParameters">
              <property name="toolTip">
               <string>&lt;html&gt;
 
 &lt;p&gt;Defines additional parameters for cppcheck (see documentation).&lt;/p&gt;
 
 &lt;p&gt;You can use the following placeholders:&lt;/p&gt;
 
 &lt;p&gt;&lt;b&gt;&lt;tt&gt;%p&lt;/tt&gt;&lt;/b&gt; - Gets replaced by the URL of the project's root directory.&lt;/p&gt;
 
 &lt;p&gt;&lt;b&gt;&lt;tt&gt;%b&lt;/tt&gt;&lt;/b&gt; - Gets replaced by the URL of the project's build directory.&lt;/p&gt;
 
 &lt;/html&gt;</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Command Line</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLineEdit" name="commandLineFilter">
           <property name="placeholderText">
            <string>Search</string>
           </property>
           <property name="clearButtonEnabled">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QCheckBox" name="commandLineBreaks">
           <property name="text">
            <string>Break lines</string>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <widget class="QPlainTextEdit" name="commandLine">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="KMessageWidget" name="messageWidget">
      <property name="text">
       <string/>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
      <property name="closeButtonVisible">
       <bool>false</bool>
      </property>
      <property name="messageType">
       <enum>KMessageWidget::Error</enum>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>KMessageWidget</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>kcfg_checkStyle</tabstop>
   <tabstop>kcfg_checkPerformance</tabstop>
   <tabstop>kcfg_checkPortability</tabstop>
   <tabstop>kcfg_checkInformation</tabstop>
   <tabstop>kcfg_checkUnusedFunction</tabstop>
   <tabstop>kcfg_checkMissingInclude</tabstop>
   <tabstop>kcfg_inconclusiveAnalysis</tabstop>
   <tabstop>kcfg_forceCheck</tabstop>
   <tabstop>kcfg_checkConfig</tabstop>
   <tabstop>kcfg_useProjectIncludes</tabstop>
   <tabstop>kcfg_useSystemIncludes</tabstop>
   <tabstop>kcfg_ignoredIncludes</tabstop>
   <tabstop>kcfg_extraParameters</tabstop>
   <tabstop>commandLineBreaks</tabstop>
   <tabstop>commandLine</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_useProjectIncludes</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_useSystemIncludes</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>226</x>
      <y>58</y>
     </hint>
     <hint type="destinationlabel">
      <x>665</x>
      <y>58</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/custom-buildsystem/configwidget.ui b/plugins/custom-buildsystem/configwidget.ui
index 6bf86c86ec..9deb8706f5 100644
--- a/plugins/custom-buildsystem/configwidget.ui
+++ b/plugins/custom-buildsystem/configwidget.ui
@@ -1,263 +1,263 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfigWidget</class>
  <widget class="QWidget" name="ConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>363</width>
     <height>244</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Build Directory:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KUrlRequester" name="buildDir" native="true">
        <property name="toolTip">
         <string>Select the directory where the tools are being executed in.
 If this is the same as the source directory you can leave it empty.</string>
        </property>
        <property name="placeholderText" stdset="0">
         <string>The directory where the tools are executed</string>
        </property>
        <property name="text" stdset="0">
         <string/>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Build Tools</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Action:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KComboBox" name="buildAction"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_10">
         <property name="text">
          <string>Enable:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCheckBox" name="enableAction">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="execLabel">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Executable:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="KUrlRequester" name="actionExecutable" native="true">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>This is the executable that should be executed when selecting the action from the Project menu</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="argLabel">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Arguments:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLineEdit" name="actionArguments">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>The arguments that the tool needs to execute properly.</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="envLabel">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Environment:</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
        <widget class="KDevelop::EnvironmentSelectionWidget" name="actionEnvironment">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>Choose a pre-configured environment for your tool</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>76</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>QComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>enableAction</sender>
    <signal>toggled(bool)</signal>
    <receiver>actionExecutable</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>169</x>
      <y>100</y>
     </hint>
     <hint type="destinationlabel">
      <x>168</x>
      <y>117</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>enableAction</sender>
    <signal>toggled(bool)</signal>
    <receiver>actionArguments</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>100</x>
      <y>94</y>
     </hint>
     <hint type="destinationlabel">
      <x>109</x>
      <y>142</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>enableAction</sender>
    <signal>toggled(bool)</signal>
    <receiver>actionEnvironment</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>99</x>
      <y>96</y>
     </hint>
     <hint type="destinationlabel">
      <x>103</x>
      <y>169</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>enableAction</sender>
    <signal>toggled(bool)</signal>
    <receiver>execLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>128</x>
      <y>92</y>
     </hint>
     <hint type="destinationlabel">
      <x>51</x>
      <y>113</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>enableAction</sender>
    <signal>toggled(bool)</signal>
    <receiver>argLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>115</x>
      <y>86</y>
     </hint>
     <hint type="destinationlabel">
      <x>35</x>
      <y>138</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>enableAction</sender>
    <signal>toggled(bool)</signal>
    <receiver>envLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>121</x>
      <y>100</y>
     </hint>
     <hint type="destinationlabel">
      <x>34</x>
      <y>176</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui b/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
index 59b648f817..4d4169b1fa 100644
--- a/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
+++ b/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
@@ -1,97 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CompilersWidget</class>
  <widget class="QWidget" name="CompilersWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>547</width>
     <height>410</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QTreeView" name="compilers"/>
    </item>
    <item row="0" column="1">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QPushButton" name="addButton">
        <property name="text">
         <string>&amp;Add</string>
        </property>
        <property name="icon">
         <iconset theme="list-add"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeButton">
        <property name="text">
         <string>&amp;Remove</string>
        </property>
        <property name="icon">
         <iconset theme="edit-delete"/>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>40</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string/>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Name:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="compilerName"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Compiler executable:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="compilerPath"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui b/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui
index 23b38c24c6..dcc80b99fb 100644
--- a/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui
+++ b/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui
@@ -1,110 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>IncludesWidget</class>
  <widget class="QWidget" name="IncludesWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>545</width>
     <height>298</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="KUrlRequester" name="includePathRequester">
        <property name="toolTip">
         <string>Add the currently displayed URL to the list of includes if it is not in the list yet.</string>
        </property>
        <property name="clickMessage" stdset="0">
         <string>A new include path/file to use for parsing files under given directory</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="addIncludePath">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="toolTip">
         <string>Create a new include path entry from this URL.</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="list-add">
          <normaloff/>
         </iconset>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeIncludePath">
        <property name="enabled">
         <bool>false</bool>
        </property>
        <property name="toolTip">
         <string>Delete current include path entry.</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="list-remove">
          <normaloff/>
         </iconset>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QListView" name="includePaths">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>8</verstretch>
       </sizepolicy>
      </property>
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KMessageWidget" name="errorWidget" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header location="global">kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.ui b/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.ui
index cf0cf6ad37..63770d1c24 100644
--- a/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.ui
+++ b/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.ui
@@ -1,236 +1,236 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectPathsWidget</class>
  <widget class="QWidget" name="ProjectPathsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>667</width>
     <height>621</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item row="1" column="0">
     <widget class="QLabel" name="configureLabel">
      <property name="text">
       <string>Configure which macros and include directories/files will be added to the parser during project parsing:</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QCheckBox" name="kcfg_reparse">
        <property name="toolTip">
         <string>Check this if you want the project to be reparsed to apply the changes.</string>
        </property>
        <property name="text">
         <string>Reparse the project</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QWidget" name="compilerBox">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
          <number>0</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <widget class="QLabel" name="label">
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select compiler that will be used to retrieve standard include directories and defined macros.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>Compiler for path:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QComboBox" name="compiler">
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select compiler that will be used to retrieve standard include directories and defined macros.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="batchEdit">
        <property name="toolTip">
         <string>Edit multiply includes/defines at the same time.</string>
        </property>
        <property name="text">
         <string>&amp;Batch Edit...</string>
        </property>
        <property name="icon">
         <iconset theme="format-list-unordered"/>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_4">
        <item>
         <widget class="KComboBox" name="projectPaths">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="addPath">
          <property name="toolTip">
           <string>Add a new sub-project path entry.</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="icon">
           <iconset theme="list-add"/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="removePath">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="toolTip">
           <string>Delete current sub-project path entry.</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="icon">
           <iconset theme="edit-delete"/>
          </property>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item row="2" column="0">
     <widget class="QTabWidget" name="languageParameters">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>8</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="includePathsPage">
       <attribute name="title">
        <string>Includes/Imports</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="0" column="0">
         <widget class="IncludesWidget" name="includesWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>8</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="definesPage">
       <attribute name="title">
        <string>Defines</string>
       </attribute>
       <layout class="QVBoxLayout" name="gridLayout_2">
        <item>
         <widget class="DefinesWidget" name="definesWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>8</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="parserPage">
       <attribute name="title">
        <string>C/C++ Parser</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="0" column="0">
         <widget class="ParserWidget" name="parserWidget" native="true"/>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>DefinesWidget</class>
    <extends>QWidget</extends>
    <header>kcm_widget/defineswidget.h</header>
   </customwidget>
   <customwidget>
    <class>IncludesWidget</class>
    <extends>QWidget</extends>
    <header>kcm_widget/includeswidget.h</header>
   </customwidget>
   <customwidget>
    <class>ParserWidget</class>
    <extends>QWidget</extends>
    <header>kcm_widget/parserwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/custom-definesandincludes/noprojectincludesanddefines/noprojectcustomincludepaths.ui b/plugins/custom-definesandincludes/noprojectincludesanddefines/noprojectcustomincludepaths.ui
index f9f37e33c5..52fe76d181 100644
--- a/plugins/custom-definesandincludes/noprojectincludesanddefines/noprojectcustomincludepaths.ui
+++ b/plugins/custom-definesandincludes/noprojectincludesanddefines/noprojectcustomincludepaths.ui
@@ -1,144 +1,144 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CustomIncludePaths</class>
  <widget class="QDialog" name="CustomIncludePaths">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>526</width>
     <height>536</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Storage Directory:</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KUrlRequester" name="storageDirectory">
           <property name="toolTip">
            <string>The custom include-path will be stored in a special file called &quot;.kdev_include_paths&quot; stored within a source directory.</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Custom include paths or #define's</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QPlainTextEdit" name="customIncludePaths">
          <property name="toolTip">
          <string>The plain list of include paths. You may also define custom macros here by adding "#define NAME VALUE" lines.</string>
          </property>
          </widget>
         </item>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
            <widget class="QPushButton" name="directorySelector">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="maximumSize">
              <size>
               <width>30</width>
               <height>30</height>
              </size>
             </property>
             <property name="toolTip">
              <string>Select a directory to include.</string>
             </property>
             <property name="text">
              <string>...</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>CustomIncludePaths</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>262</x>
      <y>513</y>
     </hint>
     <hint type="destinationlabel">
      <x>262</x>
      <y>267</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>CustomIncludePaths</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>262</x>
      <y>513</y>
     </hint>
     <hint type="destinationlabel">
      <x>262</x>
      <y>267</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/debuggercommon/dialogs/selectcoredialog.ui b/plugins/debuggercommon/dialogs/selectcoredialog.ui
index 9349cda37a..f619a02b65 100644
--- a/plugins/debuggercommon/dialogs/selectcoredialog.ui
+++ b/plugins/debuggercommon/dialogs/selectcoredialog.ui
@@ -1,96 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SelectCoreDialog</class>
  <widget class="QDialog" name="SelectCoreDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>442</width>
     <height>83</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Executable:</string>
        </property>
        <property name="buddy">
         <cstring>executableFile</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="KUrlRequester" name="executableFile"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Core file:</string>
        </property>
        <property name="buddy">
         <cstring>coreFile</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="KUrlRequester" name="coreFile"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>SelectCoreDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>316</x>
      <y>65</y>
     </hint>
     <hint type="destinationlabel">
      <x>316</x>
      <y>89</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>SelectCoreDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>396</x>
      <y>63</y>
     </hint>
     <hint type="destinationlabel">
      <x>396</x>
      <y>88</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/debuggercommon/widgets/selectaddressdialog.ui b/plugins/debuggercommon/widgets/selectaddressdialog.ui
index a9626862c9..55e291b6aa 100644
--- a/plugins/debuggercommon/widgets/selectaddressdialog.ui
+++ b/plugins/debuggercommon/widgets/selectaddressdialog.ui
@@ -1,106 +1,106 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SelectAddressDialog</class>
  <widget class="QDialog" name="SelectAddressDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>291</width>
     <height>94</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Address Selector</string>
   </property>
   <property name="toolTip">
    <string>Select the address to disassemble around</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Select address to disassemble around</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KHistoryComboBox" name="comboBox">
      <property name="insertPolicy">
       <enum>QComboBox::InsertAtTop</enum>
      </property>
      <property name="urlDropsEnabled" stdset="0">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KHistoryComboBox</class>
    <extends>KComboBox</extends>
-   <header>khistorycombobox.h</header>
+   <header>KHistoryComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>SelectAddressDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>140</x>
      <y>72</y>
     </hint>
     <hint type="destinationlabel">
      <x>146</x>
      <y>88</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>SelectAddressDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>245</x>
      <y>71</y>
     </hint>
     <hint type="destinationlabel">
      <x>241</x>
      <y>88</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/execute/nativeappconfig.ui b/plugins/execute/nativeappconfig.ui
index 9a41073bb5..adae26d757 100644
--- a/plugins/execute/nativeappconfig.ui
+++ b/plugins/execute/nativeappconfig.ui
@@ -1,429 +1,429 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NativeAppPage</class>
  <widget class="QWidget" name="NativeAppPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>511</width>
     <height>580</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Executable</string>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Project &amp;target:</string>
         </property>
         <property name="buddy">
          <cstring>projectTargetRadio</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QRadioButton" name="projectTargetRadio">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="ProjectTargetsComboBox" name="projectTarget">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>E&amp;xecutable:</string>
         </property>
         <property name="buddy">
          <cstring>executableRadio</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QRadioButton" name="executableRadio">
           <property name="enabled">
            <bool>true</bool>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KUrlRequester" name="executablePath">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="placeholderText">
            <string>Enter the executable name or absolute path to an executable file</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Behavior</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Ar&amp;guments:</string>
         </property>
         <property name="buddy">
          <cstring>arguments</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="arguments">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter arguments to give to the executable.&lt;br/&gt;You can pass arguments containing space characters by putting them in double-quotes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="placeholderText">
          <string>Enter arguments to give to the executable</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Working &amp;directory:</string>
         </property>
         <property name="buddy">
          <cstring>workingDirectory</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="workingDirectory">
         <property name="toolTip">
          <string>Select a working directory for the executable</string>
         </property>
         <property name="placeholderText">
          <string>Select a working directory for the executable</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>E&amp;nvironment:</string>
         </property>
         <property name="buddy">
          <cstring>environment</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KDevelop::EnvironmentSelectionWidget" name="environment">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Select an environment to be used</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KDevelop::EnvironmentConfigureButton" name="configureEnvironment"/>
         </item>
        </layout>
       </item>
       <item row="3" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>12</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QCheckBox" name="runInTerminal">
           <property name="toolTip">
            <string>&lt;p&gt;By default applications will be run in the background and only their output will be displayed in a tool view. This makes it impossible to interact with applications requiring user input from a terminal emulator. To run such applications, you should use an external terminal.&lt;/p&gt;</string>
           </property>
           <property name="text">
            <string>Use external terminal:</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="3" column="1">
        <widget class="KComboBox" name="terminal">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="toolTip">
          <string>&lt;p&gt;Defines the command to execute the external terminal emulator. Use the following placeholders:&lt;/p&gt;
 &lt;dl&gt;
 &lt;dt&gt;&lt;code&gt;%exe&lt;/code&gt;&lt;/dt&gt;
 &lt;dd&gt;The path to the executable selected above.&lt;/dd&gt;
 &lt;dt&gt;&lt;code&gt;%workdir&lt;/code&gt;&lt;/dt&gt;
 &lt;dd&gt;The path to the working directory selected above.&lt;/dd&gt;
 &lt;/dl&gt;
 &lt;p&gt;The arguments defined above will get appended to this command.&lt;/p&gt;</string>
         </property>
         <property name="editable">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string notr="true">konsole --noclose --workdir %workdir -e %exe</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">xterm -hold -e %exe</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">gnome-terminal -e %exe</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Dependencies</string>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <item row="0" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
          <string>Act&amp;ion:</string>
         </property>
         <property name="buddy">
          <cstring>dependencyAction</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KComboBox" name="dependencyAction">
         <property name="toolTip">
          <string>Specifies the action to take for the dependencies before starting the executable.</string>
         </property>
         <property name="whatsThis">
          <string>The selected action will be run before the executable is started.  This allows there to be parts of a project, upon which the executable does not directly depend, to be built and/or installed before running the application.</string>
         </property>
         <property name="frame">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string>Do Nothing</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string comment="@action">Build</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string comment="@action">Build and Install</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Targets:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KDevelop::DependenciesWidget" name="dependencies" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>ProjectTargetsComboBox</class>
    <extends>QComboBox</extends>
    <header>projecttargetscombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::DependenciesWidget</class>
    <extends>QWidget</extends>
    <header>project/widgets/dependencieswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>executablePath</tabstop>
   <tabstop>arguments</tabstop>
   <tabstop>workingDirectory</tabstop>
   <tabstop>environment</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>projectTargetRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>executablePath</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>124</x>
      <y>55</y>
     </hint>
     <hint type="destinationlabel">
      <x>497</x>
      <y>85</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>executableRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>executablePath</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>124</x>
      <y>83</y>
     </hint>
     <hint type="destinationlabel">
      <x>497</x>
      <y>85</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>runInTerminal</sender>
    <signal>toggled(bool)</signal>
    <receiver>terminal</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>136</x>
      <y>227</y>
     </hint>
     <hint type="destinationlabel">
      <x>206</x>
      <y>226</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>projectTargetRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>projectTarget</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>108</x>
      <y>34</y>
     </hint>
     <hint type="destinationlabel">
      <x>152</x>
      <y>38</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>executableRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>projectTarget</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>106</x>
      <y>73</y>
     </hint>
     <hint type="destinationlabel">
      <x>310</x>
      <y>45</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/executescript/scriptappconfig.ui b/plugins/executescript/scriptappconfig.ui
index 7171921575..1ae2143b2b 100644
--- a/plugins/executescript/scriptappconfig.ui
+++ b/plugins/executescript/scriptappconfig.ui
@@ -1,413 +1,413 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ScriptAppPage</class>
  <widget class="QWidget" name="ScriptAppPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>675</width>
     <height>510</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Interpreter</string>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
       </property>
       <property name="labelAlignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="formAlignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Script interpreter:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="interpreter">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="editable">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string/>
          </property>
         </item>
         <item>
          <property name="text">
           <string>python</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>ruby</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>bash</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>php</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_4">
      <property name="title">
       <string>Script file</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QRadioButton" name="runCurrentFile">
         <property name="text">
          <string>Run the file currently open in the editor</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="runFixedFile">
         <property name="text">
          <string>Always run the same file</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLabel" name="scriptLabel">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>Script file:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KUrlRequester" name="executablePath">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="placeholderText" stdset="0">
            <string>Enter the absolute path to the script to run</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Behavior</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <property name="labelAlignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Arguments:</string>
         </property>
         <property name="buddy">
          <cstring>arguments</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="arguments">
         <property name="toolTip">
          <string>Enter arguments to give to the executable</string>
         </property>
         <property name="placeholderText">
          <string/>
         </property>
         <property name="placeholderText" stdset="0">
          <string>Enter arguments to give to the executable</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Working directory:</string>
         </property>
         <property name="buddy">
          <cstring>workingDirectory</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="workingDirectory">
         <property name="toolTip">
          <string>Select a working directory for the executable</string>
         </property>
         <property name="placeholderText" stdset="0">
          <string>Select a working directory for the executable</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Environment:</string>
         </property>
         <property name="buddy">
          <cstring>environment</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KDevelop::EnvironmentSelectionWidget" name="environment">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Select an environment to be used</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KDevelop::EnvironmentConfigureButton" name="configureEnvironment"/>
         </item>
        </layout>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Output filter:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QComboBox" name="outputFilteringMode">
         <property name="toolTip">
          <string>Select the filter to applied to the output. E.g. to mark errors with red text</string>
         </property>
         <item>
          <property name="text">
           <string>No Filter</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Compiler Filter</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Script Error Filter</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Static Analysis Filter</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Execute on Host</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QCheckBox" name="remoteHostCheckbox">
         <property name="text">
          <string>Execute on remote host</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QLabel" name="remoteHostLabel">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>Remote host (ssh):</string>
           </property>
           <property name="buddy">
            <cstring>remoteHost</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLineEdit" name="remoteHost">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="placeholderText" stdset="0">
            <string>Enter a remote host (user@example.com)</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>arguments</tabstop>
   <tabstop>workingDirectory</tabstop>
   <tabstop>environment</tabstop>
   <tabstop>outputFilteringMode</tabstop>
   <tabstop>remoteHost</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>runFixedFile</sender>
    <signal>toggled(bool)</signal>
    <receiver>executablePath</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>157</y>
     </hint>
     <hint type="destinationlabel">
      <x>337</x>
      <y>179</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>remoteHostCheckbox</sender>
    <signal>toggled(bool)</signal>
    <receiver>remoteHostLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>413</y>
     </hint>
     <hint type="destinationlabel">
      <x>86</x>
      <y>443</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>remoteHostCheckbox</sender>
    <signal>toggled(bool)</signal>
    <receiver>remoteHost</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>413</y>
     </hint>
     <hint type="destinationlabel">
      <x>401</x>
      <y>443</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>runFixedFile</sender>
    <signal>toggled(bool)</signal>
    <receiver>scriptLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>157</y>
     </hint>
     <hint type="destinationlabel">
      <x>179</x>
      <y>183</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/externalscript/editexternalscript.ui b/plugins/externalscript/editexternalscript.ui
index 125882a98f..45dded449e 100644
--- a/plugins/externalscript/editexternalscript.ui
+++ b/plugins/externalscript/editexternalscript.ui
@@ -1,303 +1,303 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>EditExternalScriptBase</class>
  <widget class="QWidget" name="EditExternalScriptBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>521</width>
     <height>400</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="nameLabel">
        <property name="text">
         <string>&amp;Name:</string>
        </property>
        <property name="buddy">
         <cstring>nameEdit</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLineEdit" name="nameEdit">
        <property name="toolTip">
         <string>&lt;p&gt;The name will also be used as the identifier during code completion.&lt;/p&gt;
   &lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; No spaces allowed.&lt;/p&gt;</string>
        </property>
        <property name="placeholderText">
         <string>please insert a name</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="commandLabel">
        <property name="toolTip">
         <string/>
        </property>
        <property name="text">
         <string>&amp;Command:</string>
        </property>
        <property name="buddy">
         <cstring>commandEdit</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QLineEdit" name="commandEdit">
        <property name="placeholderText">
         <string>please insert a command to execute</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="stdinLabel">
        <property name="toolTip">
         <string/>
        </property>
        <property name="text">
         <string>&amp;Input:</string>
        </property>
        <property name="buddy">
         <cstring>stdinCombo</cstring>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QComboBox" name="stdinCombo">
        <item>
         <property name="text">
          <string>nothing</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>selection in current file or nothing</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>selection in current file or whole file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>contents of current file</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="stdoutLabel">
        <property name="toolTip">
         <string/>
        </property>
        <property name="text">
         <string>&amp;Output:</string>
        </property>
        <property name="buddy">
         <cstring>stdoutCombo</cstring>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="QComboBox" name="stdoutCombo">
        <item>
         <property name="text">
          <string>ignore</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>insert at cursor position of current file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>replace selection of current file or insert at cursor position</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>replace selection of current file or whole file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>replace contents of current file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>create new file</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="stderrLabel">
        <property name="text">
         <string>Errors:</string>
        </property>
        <property name="buddy">
         <cstring>stderrCombo</cstring>
        </property>
       </widget>
      </item>
      <item row="4" column="1">
       <widget class="QComboBox" name="stderrCombo">
        <item>
         <property name="text">
          <string>ignore</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>merge with normal output</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>insert at cursor position of current file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>replace selection of current file or insert at cursor position</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>replace selection of current file or whole file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>replace contents of current file</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>create new file</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="5" column="0">
       <widget class="QLabel" name="saveLabel">
        <property name="text">
         <string>Save &amp;mode:</string>
        </property>
        <property name="buddy">
         <cstring>saveCombo</cstring>
        </property>
       </widget>
      </item>
      <item row="5" column="1">
       <widget class="QComboBox" name="saveCombo">
        <item>
         <property name="text">
          <string>save nothing</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>save active document</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>save all open documents</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="6" column="0">
       <widget class="QLabel">
        <property name="text">
         <string>Show out&amp;put:</string>
        </property>
        <property name="buddy">
         <cstring>showOutputBox</cstring>
        </property>
       </widget>
      </item>
      <item row="6" column="1">
       <widget class="QCheckBox" name="showOutputBox">
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="7" column="0">
       <widget class="QLabel" name="outputFilterLabel">
        <property name="text">
         <string>Output filter:</string>
        </property>
        <property name="buddy">
         <cstring>outputFilterCombo</cstring>
        </property>
       </widget>
      </item>
      <item row="7" column="1">
       <widget class="QComboBox" name="outputFilterCombo">
        <item>
         <property name="text">
          <string>no filter</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>compiler filter</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>script error filter</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>static analysis error filter</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="8" column="0">
       <widget class="QLabel" name="shortcutLabel">
        <property name="toolTip">
         <string>&lt;p&gt;Defines shortcuts you can use to execute this script.&lt;/p&gt;</string>
        </property>
        <property name="text">
         <string>Shortcut:</string>
        </property>
       </widget>
      </item>
      <item row="8" column="1">
       <widget class="KShortcutWidget" name="shortcutWidget"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KShortcutWidget</class>
    <extends>QWidget</extends>
-   <header>kshortcutwidget.h</header>
+   <header>KShortcutWidget</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/templatepreviewtoolview.ui b/plugins/filetemplates/templatepreviewtoolview.ui
index 56fbdd9119..298c4f1a1c 100644
--- a/plugins/filetemplates/templatepreviewtoolview.ui
+++ b/plugins/filetemplates/templatepreviewtoolview.ui
@@ -1,171 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>TemplatePreviewToolView</class>
  <widget class="QWidget" name="TemplatePreviewToolView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>686</width>
     <height>571</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="KMessageWidget" name="messageWidget" native="true"/>
    </item>
    <item>
     <widget class="TemplatePreview" name="preview" native="true"/>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Template type</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QRadioButton" name="projectRadioButton">
         <property name="text">
          <string>Project template</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="classRadioButton">
         <property name="text">
          <string>Class template</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Maximum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QLabel" name="emptyLinesPolicyLabel">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>&amp;Empty lines policy</string>
           </property>
           <property name="buddy">
            <cstring>emptyLinesPolicyComboBox</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QComboBox" name="emptyLinesPolicyComboBox">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <item>
            <property name="text">
             <string>Keep empty lines</string>
            </property>
           </item>
           <item>
            <property name="text">
             <string>Remove repeated empty lines</string>
            </property>
           </item>
           <item>
            <property name="text">
             <string>Remove all empty lines</string>
            </property>
           </item>
          </widget>
         </item>
         <item>
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header>kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>TemplatePreview</class>
    <extends>QWidget</extends>
    <header>templatepreview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>classRadioButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>emptyLinesPolicyComboBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>76</x>
      <y>69</y>
     </hint>
     <hint type="destinationlabel">
      <x>171</x>
      <y>100</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>classRadioButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>emptyLinesPolicyLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>55</x>
      <y>70</y>
     </hint>
     <hint type="destinationlabel">
      <x>55</x>
      <y>101</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/filetemplates/ui/licensechooser.ui b/plugins/filetemplates/ui/licensechooser.ui
index 37f05ae049..be52e513e0 100644
--- a/plugins/filetemplates/ui/licensechooser.ui
+++ b/plugins/filetemplates/ui/licensechooser.ui
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>LicenseChooserDialog</class>
  <widget class="QWidget" name="LicenseChooserDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>419</width>
     <height>284</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Choose the license under which to place the generated content.</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QWidget" name="widget" native="true">
         <layout class="QFormLayout" name="formLayout">
          <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>License type:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KComboBox" name="licenseComboBox">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QCheckBox" name="saveLicense">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="toolTip">
             <string>Click here if you want to save this license for future use</string>
            </property>
            <property name="text">
             <string>Save license</string>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QLineEdit" name="licenseName">
            <property name="enabled">
             <bool>false</bool>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="KTextEdit" name="licenseTextEdit">
         <property name="acceptRichText">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>&lt;p&gt;You can use &lt;code&gt;&amp;lt;year&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;month&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;day&amp;gt;&lt;/code&gt; and &lt;code&gt;&amp;lt;copyright holder&amp;gt;&lt;/code&gt; as placeholders.&lt;/p&gt;</string>
         </property>
         <property name="textFormat">
          <enum>Qt::RichText</enum>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
-   <header>ktextedit.h</header>
+   <header>KTextEdit</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/ui/newclass.ui b/plugins/filetemplates/ui/newclass.ui
index db6caed134..b71613a816 100644
--- a/plugins/filetemplates/ui/newclass.ui
+++ b/plugins/filetemplates/ui/newclass.ui
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NewClassDialog</class>
  <widget class="QWidget" name="NewClassDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>555</width>
     <height>488</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Identify the class and any classes from which it is to inherit.</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="identifierLabel">
         <property name="text">
          <string>&amp;Identifier:</string>
         </property>
         <property name="buddy">
          <cstring>identifierLineEdit</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="identifierLineEdit"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="inheritanceLabel">
         <property name="text">
          <string>In&amp;heritance:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KEditListWidget" name="keditlistwidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>1</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KEditListWidget</class>
    <extends>QWidget</extends>
-   <header>keditlistwidget.h</header>
+   <header>KEditListWidget</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/ui/outputlocation.ui b/plugins/filetemplates/ui/outputlocation.ui
index 2970d02d37..49f3bfe1e5 100644
--- a/plugins/filetemplates/ui/outputlocation.ui
+++ b/plugins/filetemplates/ui/outputlocation.ui
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>OutputLocationDialog</class>
  <widget class="QWidget" name="OutputLocationDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>448</width>
     <height>250</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Choose where to save the generated content.</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="1" column="0">
        <widget class="QGroupBox" name="positionGroupBox">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="flat">
          <bool>true</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <layout class="QFormLayout" name="positionFormLayout"/>
          </item>
         </layout>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QGroupBox" name="urlGroupBox">
         <property name="flat">
          <bool>true</bool>
         </property>
         <property name="checkable">
          <bool>false</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
           <widget class="QCheckBox" name="lowerFilenameCheckBox">
            <property name="text">
             <string>Lower case file names</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KMessageWidget" name="messageWidget" native="true"/>
          </item>
          <item>
           <layout class="QFormLayout" name="urlFormLayout">
            <property name="fieldGrowthPolicy">
             <enum>QFormLayout::ExpandingFieldsGrow</enum>
            </property>
           </layout>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>5</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/ui/testcases.ui b/plugins/filetemplates/ui/testcases.ui
index 3b6e3989a2..24c9b5ce92 100644
--- a/plugins/filetemplates/ui/testcases.ui
+++ b/plugins/filetemplates/ui/testcases.ui
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>TestCasesPage</class>
  <widget class="QWidget" name="TestCasesPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>555</width>
     <height>488</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Set the test name and its test cases.</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="identifierLabel">
         <property name="text">
          <string>&amp;Identifier:</string>
         </property>
         <property name="buddy">
          <cstring>identifierLineEdit</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="identifierLineEdit"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="testCasesLabel">
         <property name="text">
          <string>&amp;Test cases:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KEditListWidget" name="keditlistwidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>1</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KEditListWidget</class>
    <extends>QWidget</extends>
-   <header>keditlistwidget.h</header>
+   <header>KEditListWidget</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/gdb/debuggertracingdialog.ui b/plugins/gdb/debuggertracingdialog.ui
index 39583ab52a..e5275396fa 100644
--- a/plugins/gdb/debuggertracingdialog.ui
+++ b/plugins/gdb/debuggertracingdialog.ui
@@ -1,128 +1,125 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DebuggerTracingDialog</class>
  <widget class="QDialog" name="DebuggerTracingDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>438</width>
     <height>409</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Tracing Configuration</string>
   </property>
   <layout class="QGridLayout">
    <item row="4" column="0" colspan="2">
     <widget class="QLineEdit" name="customFormat">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="whatsThis">
       <string>&lt;b&gt;Custom format string&lt;/b&gt;
 &lt;p&gt;Specify a C-style format string that will be used when printing the chosen expression. For example:
 &lt;p align=&quot;center&quot;&gt; &lt;tt&gt;Tracepoint 1: g = %d&lt;/tt&gt;&lt;/p&gt;
 If custom format string is not enabled, names and values of all expressions will be printed, using &quot;%d&quot; as format specifier for all expressions.</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="expressionsLabel">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Expressions to print:</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="0" colspan="2">
     <widget class="QCheckBox" name="enable">
      <property name="whatsThis">
       <string>&lt;b&gt;Enable tracing&lt;/b&gt;
 &lt;p&gt;Tracing is a mechanism to automatically print values of the chosen expressions and continue execution when breakpoint is hit. You can think of it as printf debugging that does not require modifying the source.&lt;/p&gt;</string>
      </property>
      <property name="text">
       <string>Enable tracing</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QCheckBox" name="enableCustomFormat">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Custom format string</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="KEditListBox" name="expressions">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="title">
       <string/>
      </property>
     </widget>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KEditListBox</class>
    <extends>QGroupBox</extends>
-   <header>keditlistbox.h</header>
+   <header>KEditListBox</header>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="local">keditlistbox.h</include>
- </includes>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>DebuggerTracingDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>307</x>
      <y>384</y>
     </hint>
     <hint type="destinationlabel">
      <x>63</x>
      <y>8</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>DebuggerTracingDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>400</x>
      <y>385</y>
     </hint>
     <hint type="destinationlabel">
      <x>342</x>
      <y>8</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/gdb/gdbconfigpage.ui b/plugins/gdb/gdbconfigpage.ui
index 6bf9160fcf..4d0445cc81 100644
--- a/plugins/gdb/gdbconfigpage.ui
+++ b/plugins/gdb/gdbconfigpage.ui
@@ -1,297 +1,294 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>GdbConfigPage</class>
  <widget class="QWidget" name="GdbConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>698</width>
     <height>483</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Debugger</string>
      </property>
      <layout class="QFormLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="gdbPath_label">
         <property name="text">
          <string>Debugger e&amp;xecutable:</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
          <cstring>kcfg_gdbPath</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="kcfg_gdbPath" native="true">
         <property name="toolTip">
          <string>Gdb executable</string>
         </property>
         <property name="whatsThis">
          <string>To run &quot;gdb&quot; executable from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, &quot;arm-gdb&quot;), by typing the name here, or specify full path to the gdb executable.</string>
         </property>
         <property name="placeholderText" stdset="0">
          <string>Override path to gdb executable</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="debuggingShell_label">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you want gdb to be executed by a special shell script, which for example properly sets the library path, insert it here e.g.: /path/to/script.sh --scriptArguments&lt;/p&gt;&lt;p&gt;Note: your script'll be invoked like this: /path/to/script.sh --scriptArguments debugger --debuggerArguments. So script.sh &lt;span style=&quot; font-weight:600;&quot;&gt;must&lt;/span&gt; invoke &amp;quot;debugger&amp;quot; executable manually.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
         <property name="text">
          <string>She&amp;ll script:</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
          <cstring>kcfg_debuggingShell</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="kcfg_debuggingShell" native="true">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you want gdb to be executed by a special shell script, which for example properly sets the library path, insert it here e.g.: /path/to/script.sh --scriptArguments&lt;/p&gt;&lt;p&gt;Note: your script'll be invoked like this: /path/to/script.sh --scriptArguments debugger --debuggerArguments. So script.sh &lt;span style=&quot; font-weight:600;&quot;&gt;must&lt;/span&gt; invoke &amp;quot;debugger&amp;quot; executable manually.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="whatsThis">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Options</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Display static &amp;members:</string>
         </property>
         <property name="buddy">
          <cstring>kcfg_displayStaticMembers</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QCheckBox" name="kcfg_displayStaticMembers">
         <property name="whatsThis">
          <string>Displaying static members makes GDB slower in
 producing data within KDE and Qt.
 It may change the &quot;signature&quot; of the data
 which QString and friends rely on,
 but if you need to debug into these values then
 check this option.</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Display &amp;demangled names:</string>
         </property>
         <property name="buddy">
          <cstring>kcfg_asmDemangle</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCheckBox" name="kcfg_asmDemangle">
         <property name="whatsThis">
          <string>When displaying the disassembled code you
 can select to see the methods' mangled names.
 However, non-mangled names are easier to read.</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>S&amp;tart debugger with:</string>
         </property>
         <property name="buddy">
          <cstring>kcfg_startWith</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QComboBox" name="kcfg_startWith">
         <item>
          <property name="text">
           <string>Application Output</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>GDB Console</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Frame Stack</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="whatsThis">
       <string>This script is intended for the actual commands needed to connect to a remotely running executable.
 	shell sleep 5	wait for remote program to start
 	target remote ...	connect to the remote debugger
 	continue	[optional] run debugging to the first breakpoint</string>
      </property>
      <property name="title">
       <string>Remote Debugging</string>
      </property>
      <layout class="QFormLayout">
       <item row="1" column="0">
        <widget class="QLabel" name="runShellScript_label">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Script to start remote application&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;This shell script is run after the Gdb Config script has been sourced by gdb.&lt;/p&gt;&lt;p&gt;It's purpose is to actually start the remote process.&lt;/p&gt;&lt;p&gt;1) Find a way to execute a command remotely - rsh, ssh, telnet, ...&lt;/p&gt;&lt;p&gt;2a) Execute &amp;quot;gdbserver ... application&amp;quot; on target.&lt;/p&gt;&lt;p&gt;or if your executable contains the gdb stub:&lt;/p&gt;&lt;p&gt;2b) Execute &amp;quot;application&amp;quot; on target.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string comment="Shell script to be executed at run time">R&amp;un shell script:</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
          <cstring>kcfg_runShellScript</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="kcfg_runShellScript" native="true">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Script to start remote application&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;This shell script is run after the Gdb Config script has been sourced by gdb.&lt;/p&gt;&lt;p&gt;It's purpose is to actually start the remote process.&lt;/p&gt;&lt;p&gt;1) Find a way to execute a command remotely - rsh, ssh, telnet, ...&lt;/p&gt;&lt;p&gt;2a) Execute &amp;quot;gdbserver ... application&amp;quot; on target.&lt;/p&gt;&lt;p&gt;or if your executable contains the gdb stub:&lt;/p&gt;&lt;p&gt;2b) Execute &amp;quot;application&amp;quot; on target.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="configGdbScript_label">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This script is sourced by gdb when the debugging starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Gdb &amp;config script:</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
          <cstring>kcfg_configGdbScript</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="KUrlRequester" name="kcfg_runGdbScript" native="true">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Script to connect with remote application&lt;/p&gt;&lt;p&gt;For example:&lt;/p&gt;&lt;p&gt;	shell sleep 5	 #wait for remote program to start&lt;/p&gt;&lt;p&gt;	target remote ...	#connect to the remote debugger&lt;/p&gt;&lt;p&gt;	continue	#[optional] run debugging to the first breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="runGdbScript_label">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Script to connect with remote application&lt;/p&gt;&lt;p&gt;For example:&lt;/p&gt;&lt;p&gt;	shell sleep 5	 #wait for remote program to start&lt;/p&gt;&lt;p&gt;	target remote ...	#connect to the remote debugger&lt;/p&gt;&lt;p&gt;	continue	#[optional] run debugging to the first breakpoint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string comment="Gdb script to be executed at run time.">Run &amp;gdb script:</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
          <cstring>kcfg_runGdbScript</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="kcfg_configGdbScript" native="true">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This script is sourced by gdb when the debugging starts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="whatsThis">
          <string/>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>kcfg_gdbPath</tabstop>
   <tabstop>kcfg_debuggingShell</tabstop>
   <tabstop>kcfg_displayStaticMembers</tabstop>
   <tabstop>kcfg_asmDemangle</tabstop>
   <tabstop>kcfg_startWith</tabstop>
   <tabstop>kcfg_configGdbScript</tabstop>
   <tabstop>kcfg_runShellScript</tabstop>
   <tabstop>kcfg_runGdbScript</tabstop>
  </tabstops>
- <includes>
-  <include location="local">kurlrequester.h</include>
- </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/grepview/grepoutputview.ui b/plugins/grepview/grepoutputview.ui
index 77617c1c5c..3d21385625 100644
--- a/plugins/grepview/grepoutputview.ui
+++ b/plugins/grepview/grepoutputview.ui
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>GrepOutputView</class>
  <widget class="QWidget" name="GrepOutputView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>746</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QWidget" name="statusbar" native="true">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="margin">
          <number>0</number>
         </property>
         <item>
          <widget class="KComboBox" name="modelSelector">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>5</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="replacementLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string>Replacement &amp;text:</string>
           </property>
           <property name="buddy">
            <cstring>replacementCombo</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KComboBox" name="replacementCombo">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>2</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Enter the replacement pattern.</string>
           </property>
           <property name="editable">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="applyButton">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>1</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Apply replacement on selected items.</string>
           </property>
           <property name="text">
            <string>&amp;Replace</string>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
      <item>
       <widget class="QTreeView" name="resultsTreeView"/>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/grepview/grepwidget.ui b/plugins/grepview/grepwidget.ui
index b4ca5cf342..fd58fb8340 100644
--- a/plugins/grepview/grepwidget.ui
+++ b/plugins/grepview/grepwidget.ui
@@ -1,454 +1,454 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>GrepWidget</class>
  <widget class="QWidget" name="GrepWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>730</width>
     <height>330</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
     <height>16777215</height>
    </size>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="1" colspan="5">
     <widget class="QComboBox" name="patternCombo">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="toolTip">
       <string>Enter the regular expression you want to search for here.</string>
      </property>
      <property name="whatsThis">
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Enter the regular expression you want to search for here.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If you do not check &quot;Regular Expression&quot; below, this is considered a raw string. That means, all meta characters are escaped.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Possible meta characters are:&lt;/p&gt;
 &lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;.&lt;/span&gt; - Matches any character&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;^&lt;/span&gt; - Matches the beginning of a line&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;$&lt;/span&gt; - Matches the end of a line&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;\b&lt;/span&gt; - Matches a word boundary&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;\s&lt;/span&gt; - Matches any whitespace character&lt;/li&gt;&lt;/ul&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The following repetition operators exist:&lt;/p&gt;
 &lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;?&lt;/span&gt; - The preceding item is matched at most once&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;*&lt;/span&gt; - The preceding item is matched zero or more times&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;+&lt;/span&gt; - The preceding item is matched one or more times&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;{&lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;n&lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;}&lt;/span&gt; - The preceding item is matched exactly &lt;span style=&quot; font-style:italic;&quot;&gt;n&lt;/span&gt; times&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;{&lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;n&lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;,}&lt;/span&gt; - The preceding item is matched &lt;span style=&quot; font-style:italic;&quot;&gt;n&lt;/span&gt; or more times&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;{,&lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;n&lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;}&lt;/span&gt; - The preceding item is matched at most &lt;span style=&quot; font-style:italic;&quot;&gt;n&lt;/span&gt; times&lt;/li&gt;
 &lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;{&lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;n&lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;,&lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;m&lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;}&lt;/span&gt; - The preceding item is matched at least &lt;span style=&quot; font-style:italic;&quot;&gt;n&lt;/span&gt;, but at most &lt;span style=&quot; font-style:italic;&quot;&gt;m&lt;/span&gt; times.&lt;/li&gt;&lt;/ul&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Furthermore, backreferences to bracketed subexpressions are available via the notation \&lt;span style=&quot; font-style:italic;&quot;&gt;n&lt;/span&gt;.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;For further reference, look at &lt;a href=&quot;https://www.pcre.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;www.pcre.org&lt;/span&gt;&lt;/a&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;man pcresyntax.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="editable">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_9">
      <property name="text">
       <string>Template:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>templateEdit</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1" colspan="3">
     <widget class="KComboBox" name="templateEdit">
      <property name="toolTip">
       <string>This is the regular expression template.</string>
      </property>
      <property name="whatsThis">
       <string>This is the regular expression template. &lt;i&gt;%s&lt;/i&gt; will be replaced by the pattern, while &lt;i&gt;%%&lt;/i&gt; will be replaced by &lt;i&gt;%&lt;/i&gt;.</string>
      </property>
     </widget>
    </item>
    <item row="5" column="5">
     <widget class="QPushButton" name="syncButton">
      <property name="toolTip">
       <string>Quickly select location from a set of directories</string>
      </property>
      <property name="text">
       <string>Quick Select</string>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="depthLabel">
      <property name="text">
       <string>Depth:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>depthSpin</cstring>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="QSpinBox" name="depthSpin">
      <property name="toolTip">
       <string extracomment="Maximum level of recursion. For folder-based searches, that means the level of subfolders. Choose 0 to look only in files inside the current folder, or Full to search also on the subfolders’s files, theirs subfolders’ files, and so on."/>
      </property>
      <property name="specialValueText">
       <string extracomment="Full recursion will be used. For folder-based searches, that means searching in the target folder and all the subfolders, their subfolders, and so on.">Full</string>
      </property>
      <property name="minimum">
       <number>-1</number>
      </property>
      <property name="value">
       <number>-1</number>
      </property>
     </widget>
    </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>Pattern:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>patternCombo</cstring>
      </property>
     </widget>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Files:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>filesCombo</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="2">
     <widget class="QLabel" name="label_11">
      <property name="text">
       <string>Case sensitive:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>caseSensitiveCheck</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="3">
     <widget class="QCheckBox" name="caseSensitiveCheck">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="toolTip">
       <string>Case-sensitive searching.</string>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Location(s):</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>searchPaths</cstring>
      </property>
     </widget>
    </item>
    <item row="7" column="1" colspan="5">
     <widget class="KComboBox" name="filesCombo">
      <property name="toolTip">
       <string>Files filter.</string>
      </property>
      <property name="whatsThis">
       <string>Enter the file name pattern of the files to search here. You may give several patterns separated by commas or spaces.</string>
      </property>
      <property name="editable">
       <bool>true</bool>
      </property>
      <property name="autoCompletion">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="8" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Exclude:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>excludeCombo</cstring>
      </property>
     </widget>
    </item>
    <item row="8" column="1" colspan="5">
     <widget class="KComboBox" name="excludeCombo">
      <property name="toolTip">
       <string>Files pattern to exclude</string>
      </property>
      <property name="whatsThis">
       <string>Enter the file name pattern of the files to exclude from the search here. You may give several patterns separated by commas or spaces.&lt;p&gt;Every pattern is internally surrounded by asterisks, so that each pattern can match parts of the file paths.&lt;/p&gt;</string>
      </property>
      <property name="editable">
       <bool>true</bool>
      </property>
      <property name="autoCompletion">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="9" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>141</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="9" column="1">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>41</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="9" column="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>151</width>
        <height>31</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="9" column="3" colspan="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>361</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="4" colspan="2">
     <widget class="KComboBox" name="templateTypeCombo"/>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_10">
      <property name="text">
       <string>Regular expression:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>regexCheck</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QCheckBox" name="regexCheck">
      <property name="toolTip">
       <string>Enable or disable regular expression.</string>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="6" column="2">
     <widget class="QLabel" name="limitToProjectLabel">
      <property name="text">
       <string>Limit to project files:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>limitToProjectCheck</cstring>
      </property>
     </widget>
    </item>
    <item row="6" column="3">
     <widget class="QCheckBox" name="limitToProjectCheck">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="1" colspan="3">
     <widget class="KComboBox" name="replacementTemplateEdit">
      <property name="toolTip">
       <string>Enter the replacement template.</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Replacement template:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>replacementTemplateEdit</cstring>
      </property>
     </widget>
    </item>
    <item row="5" column="1" colspan="3">
     <widget class="KComboBox" name="searchPaths">
      <property name="toolTip">
       <string>Select the location where you want to search. It can be a directory, a file, or a semicolon separated (without spaces) list of directories/files.</string>
      </property>
      <property name="editable">
       <bool>true</bool>
      </property>
      <property name="autoCompletion">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item row="5" column="4">
     <widget class="QPushButton" name="directorySelector">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="maximumSize">
       <size>
        <width>30</width>
        <height>30</height>
       </size>
      </property>
      <property name="toolTip">
       <string>Select a directory to search in.</string>
      </property>
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="10" column="3" colspan="3">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>patternCombo</tabstop>
   <tabstop>templateEdit</tabstop>
   <tabstop>templateTypeCombo</tabstop>
   <tabstop>replacementTemplateEdit</tabstop>
   <tabstop>regexCheck</tabstop>
   <tabstop>caseSensitiveCheck</tabstop>
   <tabstop>searchPaths</tabstop>
   <tabstop>directorySelector</tabstop>
   <tabstop>syncButton</tabstop>
   <tabstop>depthSpin</tabstop>
   <tabstop>limitToProjectCheck</tabstop>
   <tabstop>filesCombo</tabstop>
   <tabstop>excludeCombo</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/heaptrack/config/globalconfigpage.ui b/plugins/heaptrack/config/globalconfigpage.ui
index c628974b56..649c3acf4e 100644
--- a/plugins/heaptrack/config/globalconfigpage.ui
+++ b/plugins/heaptrack/config/globalconfigpage.ui
@@ -1,86 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Heaptrack::GlobalConfigPage</class>
  <widget class="QWidget" name="Heaptrack::GlobalConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>450</width>
     <height>213</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="pathsGroupBox">
      <property name="title">
       <string>Executables</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="heaptrackExecutableLabel">
         <property name="text">
          <string>Heaptrack:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>kcfg_heaptrackExecutable</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="kcfg_heaptrackExecutable"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="heaptrackGuiExecutableLabel">
         <property name="text">
          <string>Visualizer:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="kcfg_heaptrackGuiExecutable"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>68</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/lldb/widgets/lldbconfigpage.ui b/plugins/lldb/widgets/lldbconfigpage.ui
index 6a12cfe4e4..239f2bf7ea 100644
--- a/plugins/lldb/widgets/lldbconfigpage.ui
+++ b/plugins/lldb/widgets/lldbconfigpage.ui
@@ -1,223 +1,223 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>LldbConfigPage</class>
  <widget class="QWidget" name="LldbConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>530</width>
     <height>535</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupDebugger">
      <property name="title">
       <string>Debugger</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Debugger executable:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="lineDebuggerExec" native="true">
         <property name="placeholderText" stdset="0">
          <string>Override path to lldb-mi executable</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Additional arguments:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="lineDebuggerArgs">
         <property name="placeholderText">
          <string/>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Environment:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KDevelop::EnvironmentSelectionWidget" name="comboEnv">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KDevelop::EnvironmentConfigureButton" name="btnEditEnv">
           <property name="text">
            <string/>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="4" column="1">
        <widget class="QCheckBox" name="checkInheritSystem">
         <property name="text">
          <string>Inherit system environment</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupOptions">
      <property name="title">
       <string>Options</string>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Config script:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="lineConfigScript" native="true">
         <property name="placeholderText" stdset="0">
          <string>/path/to/lldb/config/script</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Start debugger with:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QComboBox" name="comboStartWith">
         <item>
          <property name="text">
           <string>Application Output</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>LLDB Console</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Frame Stack</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Break on start:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCheckBox" name="checkBreakOnStart">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupRemote">
      <property name="title">
       <string>Remo&amp;te Debugging</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <item row="0" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Remote server:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="lineRemoteServer">
         <property name="placeholderText">
          <string>host:port</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
          <string>Remote work path:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="lineOnDevPath">
         <property name="placeholderText">
          <string>/path/to/a/on-device/writable/directory</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>149</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>QComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/makebuilder/makeconfig.ui b/plugins/makebuilder/makeconfig.ui
index 4a4b848391..3467e0aec0 100644
--- a/plugins/makebuilder/makeconfig.ui
+++ b/plugins/makebuilder/makeconfig.ui
@@ -1,385 +1,385 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MakeConfig</class>
  <widget class="QWidget" name="MakeConfig">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>521</width>
     <height>362</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
    </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>&amp;Abort on first error:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_abortOnFirstError</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QCheckBox" name="kcfg_abortOnFirstError">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>&amp;Display commands but do not execute them:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_displayOnly</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QCheckBox" name="kcfg_displayOnly">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_31">
      <property name="text">
       <string>Insta&amp;ll as root:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_installAsRoot</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="QCheckBox" name="kcfg_installAsRoot">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="rootinstallationcommandLabel">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Root installation &amp;command:</string>
      </property>
      <property name="buddy">
       <cstring>kcfg_suCommand</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="KComboBox" name="kcfg_suCommand">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="editable">
       <bool>true</bool>
      </property>
      <item>
       <property name="text">
        <string>kdesu</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>kdesudo</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>gksu</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>&amp;Number of simultaneous jobs:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_numberOfJobs</cstring>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="QSpinBox" name="kcfg_numberOfJobs">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="minimum">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>&amp;Make executable:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>makeExecutable</cstring>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="KUrlRequester" name="makeExecutable" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>Default make &amp;target:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_defaultTarget</cstring>
      </property>
     </widget>
    </item>
    <item row="7" column="1">
     <widget class="QLineEdit" name="kcfg_defaultTarget">
      <property name="clearButtonEnabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="8" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Additional ma&amp;ke options:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_additionalOptions</cstring>
      </property>
     </widget>
    </item>
    <item row="8" column="1">
     <widget class="QLineEdit" name="kcfg_additionalOptions">
      <property name="clearButtonEnabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="10" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Active environment &amp;profile:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_environmentProfile</cstring>
      </property>
     </widget>
    </item>
    <item row="10" column="1">
     <widget class="QWidget" name="widget" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="KDevelop::EnvironmentSelectionWidget" name="kcfg_environmentProfile">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KDevelop::EnvironmentConfigureButton" name="configureEnvironment"/>
       </item>
      </layout>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Override number of &amp;jobs:</string>
      </property>
      <property name="buddy">
       <cstring>kcfg_overrideNumberOfJobs</cstring>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QCheckBox" name="kcfg_overrideNumberOfJobs">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header location="global">util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_installAsRoot</sender>
    <signal>clicked(bool)</signal>
    <receiver>kcfg_suCommand</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>516</x>
      <y>74</y>
     </hint>
     <hint type="destinationlabel">
      <x>516</x>
      <y>102</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_installAsRoot</sender>
    <signal>toggled(bool)</signal>
    <receiver>rootinstallationcommandLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>516</x>
      <y>74</y>
     </hint>
     <hint type="destinationlabel">
      <x>195</x>
      <y>97</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_installAsRoot</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_suCommand</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>516</x>
      <y>74</y>
     </hint>
     <hint type="destinationlabel">
      <x>195</x>
      <y>97</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_overrideNumberOfJobs</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_numberOfJobs</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>411</x>
      <y>128</y>
     </hint>
     <hint type="destinationlabel">
      <x>411</x>
      <y>159</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_overrideNumberOfJobs</sender>
    <signal>toggled(bool)</signal>
    <receiver>label</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>411</x>
      <y>128</y>
     </hint>
     <hint type="destinationlabel">
      <x>204</x>
      <y>157</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/meson/settings/mesonadvancedsettings.ui b/plugins/meson/settings/mesonadvancedsettings.ui
index 62686cede6..8f436590e9 100644
--- a/plugins/meson/settings/mesonadvancedsettings.ui
+++ b/plugins/meson/settings/mesonadvancedsettings.ui
@@ -1,250 +1,250 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MesonAdvancedSettings</class>
  <widget class="QWidget" name="MesonAdvancedSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>500</width>
     <height>250</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QPushButton" name="b_showAdvanced">
      <property name="text">
       <string>Show advanced configuration</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="container">
      <property name="title">
       <string>Advanced configuration</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="l_mesonArgs">
           <property name="text">
            <string>Extra Meson arguments:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QLabel" name="l_backend">
           <property name="layoutDirection">
            <enum>Qt::LeftToRight</enum>
           </property>
           <property name="text">
            <string>Meson backend:</string>
           </property>
           <property name="scaledContents">
            <bool>false</bool>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item row="2" column="0">
          <widget class="QLabel" name="l_mesonExe">
           <property name="text">
            <string>Meson executable:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="KLineEdit" name="i_mesonArgs">
           <property name="toolTip">
            <string>Changing this will reset the build options</string>
           </property>
           <property name="placeholderText">
            <string>Extra meson configuration arguments</string>
           </property>
           <property name="showClearButton" stdset="0">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item row="1" column="1">
          <widget class="KComboBox" name="i_backend"/>
         </item>
         <item row="2" column="1">
          <widget class="KUrlRequester" name="i_mesonExe">
           <property name="placeholderText">
            <string>Path to the meson executable</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <widget class="QPushButton" name="b_hideAdvanced">
         <property name="text">
          <string>Hide advanced configuration</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
+   <header>KLineEdit</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>b_showAdvanced</sender>
    <signal>clicked()</signal>
    <receiver>container</receiver>
    <slot>show()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>249</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>144</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>b_showAdvanced</sender>
    <signal>clicked()</signal>
    <receiver>b_showAdvanced</receiver>
    <slot>hide()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>249</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>16</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>b_hideAdvanced</sender>
    <signal>clicked()</signal>
    <receiver>container</receiver>
    <slot>hide()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>249</x>
      <y>224</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>144</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>b_hideAdvanced</sender>
    <signal>clicked()</signal>
    <receiver>b_showAdvanced</receiver>
    <slot>show()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>249</x>
      <y>224</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>16</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>i_mesonArgs</sender>
    <signal>textChanged(QString)</signal>
    <receiver>MesonAdvancedSettings</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>327</x>
      <y>90</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>124</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>i_backend</sender>
    <signal>currentIndexChanged(int)</signal>
    <receiver>MesonAdvancedSettings</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>327</x>
      <y>128</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>124</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>i_mesonExe</sender>
    <signal>textChanged(QString)</signal>
    <receiver>MesonAdvancedSettings</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>327</x>
      <y>175</y>
     </hint>
     <hint type="destinationlabel">
      <x>249</x>
      <y>124</y>
     </hint>
    </hints>
   </connection>
  </connections>
  <slots>
   <signal>configChanged()</signal>
   <slot>updated()</slot>
  </slots>
 </ui>
diff --git a/plugins/meson/settings/mesonnewbuilddir.ui b/plugins/meson/settings/mesonnewbuilddir.ui
index 16f757b82c..159fc37b8b 100644
--- a/plugins/meson/settings/mesonnewbuilddir.ui
+++ b/plugins/meson/settings/mesonnewbuilddir.ui
@@ -1,182 +1,182 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MesonNewBuildDir</class>
  <widget class="QDialog" name="MesonNewBuildDir">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>670</width>
     <height>700</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="hl_buildDir">
      <item>
       <widget class="QLabel" name="l_buildDir">
        <property name="text">
         <string>Build directory:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KUrlRequester" name="i_buildDir">
        <property name="mode">
         <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
        </property>
        <property name="placeholderText">
         <string>Full Path to the new build directory</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="MesonOptionsView" name="options" native="true"/>
    </item>
    <item>
     <widget class="MesonAdvancedSettings" name="advanced" native="true"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="hl_bottomBar">
      <item>
       <widget class="QLabel" name="l_statusMessage">
        <property name="text">
         <string>Status message...</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="b_buttonBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="standardButtons">
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
   <customwidget>
    <class>MesonAdvancedSettings</class>
    <extends>QWidget</extends>
    <header>settings/mesonadvancedsettings.h</header>
    <container>1</container>
    <slots>
     <signal>configChanged()</signal>
    </slots>
   </customwidget>
   <customwidget>
    <class>MesonOptionsView</class>
    <extends>QWidget</extends>
    <header>settings/mesonoptionsview.h</header>
    <container>1</container>
    <slots>
     <signal>configChanged()</signal>
    </slots>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>b_buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>564</x>
      <y>643</y>
     </hint>
     <hint type="destinationlabel">
      <x>329</x>
      <y>333</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>b_buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>564</x>
      <y>643</y>
     </hint>
     <hint type="destinationlabel">
      <x>329</x>
      <y>333</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>advanced</sender>
    <signal>configChanged()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>324</x>
      <y>571</y>
     </hint>
     <hint type="destinationlabel">
      <x>324</x>
      <y>312</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>options</sender>
    <signal>configChanged()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>334</x>
      <y>263</y>
     </hint>
     <hint type="destinationlabel">
      <x>334</x>
      <y>349</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>i_buildDir</sender>
    <signal>textChanged(QString)</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>399</x>
      <y>89</y>
     </hint>
     <hint type="destinationlabel">
      <x>334</x>
      <y>349</y>
     </hint>
    </hints>
   </connection>
  </connections>
  <slots>
   <slot>resetFields()</slot>
   <slot>updated()</slot>
  </slots>
 </ui>
diff --git a/plugins/ninjabuilder/ninjaconfig.ui b/plugins/ninjabuilder/ninjaconfig.ui
index e2b65188e9..b0c9a4dcac 100644
--- a/plugins/ninjabuilder/ninjaconfig.ui
+++ b/plugins/ninjabuilder/ninjaconfig.ui
@@ -1,295 +1,295 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NinjaConfig</class>
  <widget class="QWidget" name="NinjaConfig">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>521</width>
     <height>362</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>&amp;Display commands but do not execute them:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_displayOnly</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QCheckBox" name="kcfg_displayOnly">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_31">
      <property name="text">
       <string>Install as &amp;root:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_installAsRoot</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QCheckBox" name="kcfg_installAsRoot">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="rootinstallationcommandLabel">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>Root installation &amp;command:</string>
      </property>
      <property name="buddy">
       <cstring>kcfg_suCommand</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KComboBox" name="kcfg_suCommand">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <item>
       <property name="text">
        <string notr="true">kdesu</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">kdesudo</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">sudo</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="jobOverrideLabel">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
       <string>&amp;Number of simultaneous jobs:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_numberOfJobs</cstring>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QSpinBox" name="kcfg_numberOfJobs">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="minimum">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_1">
      <property name="text">
       <string>Count of &amp;errors to be tolerated:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_numberOfErrors</cstring>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="QSpinBox" name="kcfg_numberOfErrors">
      <property name="minimum">
       <number>1</number>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Additional ninja &amp;options:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_additionalOptions</cstring>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="QLineEdit" name="kcfg_additionalOptions">
      <property name="clearButtonEnabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Active Environment &amp;Profile:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_environmentProfile</cstring>
      </property>
     </widget>
    </item>
    <item row="7" column="1">
     <widget class="QWidget" name="widget" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="KDevelop::EnvironmentSelectionWidget" name="kcfg_environmentProfile">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KDevelop::EnvironmentConfigureButton" name="configureEnvironment"/>
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>O&amp;verride number of jobs:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_overrideNumberOfJobs</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QCheckBox" name="kcfg_overrideNumberOfJobs"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header location="global">util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>kcfg_installAsRoot</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_suCommand</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>516</x>
      <y>74</y>
     </hint>
     <hint type="destinationlabel">
      <x>516</x>
      <y>102</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_installAsRoot</sender>
    <signal>toggled(bool)</signal>
    <receiver>rootinstallationcommandLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>516</x>
      <y>74</y>
     </hint>
     <hint type="destinationlabel">
      <x>195</x>
      <y>97</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_overrideNumberOfJobs</sender>
    <signal>toggled(bool)</signal>
    <receiver>kcfg_numberOfJobs</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>387</x>
      <y>89</y>
     </hint>
     <hint type="destinationlabel">
      <x>387</x>
      <y>114</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>kcfg_overrideNumberOfJobs</sender>
    <signal>toggled(bool)</signal>
    <receiver>jobOverrideLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>387</x>
      <y>89</y>
     </hint>
     <hint type="destinationlabel">
      <x>172</x>
      <y>114</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/patchreview/localpatchwidget.ui b/plugins/patchreview/localpatchwidget.ui
index f94ef69d19..e8921ed1d7 100644
--- a/plugins/patchreview/localpatchwidget.ui
+++ b/plugins/patchreview/localpatchwidget.ui
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>LocalPatchWidget</class>
  <widget class="QWidget" name="LocalPatchWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="localPatchOptions">
      <property name="title">
       <string>Patch</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Base:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="baseDir">
         <property name="placeholderText">
          <string>Patch base...</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2">
        <widget class="QTabWidget" name="tabWidget">
         <property name="currentIndex">
          <number>1</number>
         </property>
         <widget class="QWidget" name="fileTab">
          <attribute name="title">
           <string>From File</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="KUrlRequester" name="filename">
             <property name="placeholderText">
              <string>Patch location...</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
         <widget class="QWidget" name="commandTab">
          <attribute name="title">
           <string>From Command</string>
          </attribute>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLineEdit" name="command">
             <property name="placeholderText">
              <string>Command's output...</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </widget>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="applied">
         <property name="toolTip">
          <string>Patch is already applied on local version</string>
         </property>
         <property name="text">
          <string>Already applied</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/perforce/ui/perforceimportmetadatawidget.ui b/plugins/perforce/ui/perforceimportmetadatawidget.ui
index 9dd8910ccd..daa65e2a5d 100644
--- a/plugins/perforce/ui/perforceimportmetadatawidget.ui
+++ b/plugins/perforce/ui/perforceimportmetadatawidget.ui
@@ -1,235 +1,235 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PerforceImportMetadataWidget</class>
  <widget class="QWidget" name="PerforceImportMetadataWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>581</width>
     <height>339</height>
    </rect>
   </property>
   <layout class="QFormLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="labelUrl">
      <property name="text">
       <string>Source directory:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KUrlRequester" name="sourceLoc" native="true"/>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="labelExec">
      <property name="text">
       <string>P4 executable:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KUrlRequester" name="executableLoc" native="true"/>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="labelP4port">
      <property name="text">
       <string>P4 Port</string>
      </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="QLineEdit" name="p4portEdit">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
      <property name="toolTip">
       <string>The format of P4PORT for Perforce applications is protocol:host:port, or port by itself if both the Perforce application and versioning service are running on the same host. Port numbers must be in the range 1024 through 32767</string>
      </property>
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="labelP4user">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>100</width>
        <height>0</height>
       </size>
      </property>
      <property name="text">
       <string>P4 User</string>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="QLineEdit" name="p4userEdit">
      <property name="toolTip">
       <string>Current Perforce user name. By default, the Perforce username is the same as the OS username</string>
      </property>
     </widget>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="labelP4client">
      <property name="text">
       <string>P4 Client</string>
      </property>
     </widget>
    </item>
    <item row="7" column="1">
     <widget class="KComboBox" name="p4clientEdit">
      <property name="toolTip">
       <string>Name of current client workspace on the Perforce server</string>
      </property>
     </widget>
    </item>
    <item row="8" column="0">
     <widget class="QLabel" name="labelP4config">
      <property name="text">
       <string>P4 Config</string>
      </property>
     </widget>
    </item>
    <item row="8" column="1">
     <widget class="QLineEdit" name="p4configEdit">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Contains a file name without a path. The specified file is used to store other Perforce environment variables </string>
      </property>
     </widget>
    </item>
    <item row="9" column="1">
     <widget class="QPushButton" name="testP4setupButton">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>50</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Test</string>
      </property>
     </widget>
    </item>
    <item row="10" column="1">
     <widget class="QTextBrowser" name="errorMsg">
      <property name="styleSheet">
       <string notr="true">* { background-color: rgba(0, 0, 0, 0); }</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>250</width>
        <height>0</height>
       </size>
      </property>
      <property name="layoutDirection">
       <enum>Qt::LeftToRight</enum>
      </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
      <property name="title">
       <string/>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
      <property name="checked">
       <bool>false</bool>
      </property>
      <widget class="QRadioButton" name="radioButtonConfig">
       <property name="geometry">
        <rect>
         <x>7</x>
         <y>10</y>
         <width>100</width>
         <height>30</height>
        </rect>
       </property>
       <property name="text">
        <string>Config File</string>
       </property>
       <property name="checked">
        <bool>true</bool>
       </property>
      </widget>
      <widget class="QRadioButton" name="radioButtonVariables">
       <property name="geometry">
        <rect>
         <x>115</x>
         <y>10</y>
         <width>140</width>
         <height>31</height>
        </rect>
       </property>
       <property name="text">
        <string>User/Port Config</string>
       </property>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/projectfilter/projectfiltersettings.ui b/plugins/projectfilter/projectfiltersettings.ui
index b797f4f386..9cabc19e8d 100644
--- a/plugins/projectfilter/projectfiltersettings.ui
+++ b/plugins/projectfilter/projectfiltersettings.ui
@@ -1,114 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectFilterSettings</class>
  <widget class="QWidget" name="ProjectFilterSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>696</width>
     <height>400</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Configure which files and folders inside the project folder should be included or excluded:</string>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QTreeView" name="filters"/>
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QPushButton" name="add">
          <property name="text">
           <string>Add</string>
          </property>
          <property name="icon">
           <iconset theme="list-add">
            <normaloff/>
           </iconset>
          </property>
          <property name="default">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="remove">
          <property name="text">
           <string>Remove</string>
          </property>
          <property name="icon">
           <iconset theme="edit-delete">
            <normaloff/>
           </iconset>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="moveUp">
          <property name="text">
           <string>Move Up</string>
          </property>
          <property name="icon">
           <iconset theme="arrow-up">
            <normaloff/>
           </iconset>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="moveDown">
          <property name="text">
           <string>Move Down</string>
          </property>
          <property name="icon">
           <iconset theme="arrow-down">
            <normaloff/>
           </iconset>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <widget class="KMessageWidget" name="messageWidget" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/qmakebuilder/qmakeconfig.ui b/plugins/qmakebuilder/qmakeconfig.ui
index 62cd2616d4..ad83875694 100644
--- a/plugins/qmakebuilder/qmakeconfig.ui
+++ b/plugins/qmakebuilder/qmakeconfig.ui
@@ -1,93 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QMakeConfig</class>
  <widget class="QWidget" name="QMakeConfig">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>520</width>
     <height>552</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="sizeConstraint">
       <enum>QLayout::SetMinimumSize</enum>
      </property>
      <item>
       <widget class="KComboBox" name="buildDirCombo"/>
      </item>
      <item>
       <widget class="QPushButton" name="addButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="list-add"/>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="edit-delete"/>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="maximumSize">
       <size>
        <width>16777215</width>
        <height>273</height>
       </size>
      </property>
      <property name="title">
       <string>Build Settings</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>492</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/qmakemanager/qmakebuilddirchooser.ui b/plugins/qmakemanager/qmakebuilddirchooser.ui
index b3a7175e6d..bf29a8e2e7 100644
--- a/plugins/qmakemanager/qmakebuilddirchooser.ui
+++ b/plugins/qmakemanager/qmakebuilddirchooser.ui
@@ -1,163 +1,163 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QMakeBuildDirChooser</class>
  <widget class="QWidget" name="QMakeBuildDirChooser">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>611</width>
     <height>200</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::ExpandingFieldsGrow</enum>
    </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>QMake &amp;executable:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_qmakeExecutable</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KUrlRequester" name="kcfg_qmakeExecutable">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>&amp;Build directory:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_buildDir</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KUrlRequester" name="kcfg_buildDir"/>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>&amp;Install to (target.path):</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_installPrefix</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KUrlRequester" name="kcfg_installPrefix">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Build &amp;type:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_buildType</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QComboBox" name="kcfg_buildType">
      <property name="editable">
       <bool>false</bool>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <item>
       <property name="text">
        <string notr="true">Debug</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">Release</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>(Use default from .pro file)</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Extra arguments:</string>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="KLineEdit" name="kcfg_extraArgs"/>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="KMessageWidget" name="status" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
+   <header>KLineEdit</header>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>kcfg_qmakeExecutable</tabstop>
   <tabstop>kcfg_buildDir</tabstop>
   <tabstop>kcfg_installPrefix</tabstop>
   <tabstop>kcfg_buildType</tabstop>
   <tabstop>kcfg_extraArgs</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/qthelp/qthelpconfig.ui b/plugins/qthelp/qthelpconfig.ui
index bc04f80754..e0d2ae924b 100644
--- a/plugins/qthelp/qthelpconfig.ui
+++ b/plugins/qthelp/qthelpconfig.ui
@@ -1,197 +1,197 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtHelpConfigUI</class>
  <widget class="QWidget" name="QtHelpConfigUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>560</width>
     <height>443</height>
    </rect>
   </property>
   <property name="locale">
    <locale language="English" country="UnitedStates"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="boxAutoLoad">
      <property name="title">
       <string>Load QtHelp Documentation from System Locations</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="labelLoadQtApiDocs">
         <property name="text">
          <string>&amp;Load Qt API documentation:</string>
         </property>
         <property name="buddy">
          <cstring>loadQtDocsCheckBox</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QCheckBox" name="loadQtDocsCheckBox">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="labelLoadFromDirectory">
         <property name="text">
          <string>Load QtHelp files from directory:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="qchSearchDir" native="true"/>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="KMessageWidget" name="messageAvailabilityQtDocs" native="true">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="text" stdset="0">
          <string/>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="boxQchManage">
      <property name="title">
       <string>Install Additional Documentation Files</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <property name="spacing">
            <number>1</number>
           </property>
           <property name="leftMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QTreeWidget" name="qchTable">
             <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
             <property name="rootIsDecorated">
              <bool>false</bool>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
             </property>
             <property name="columnCount">
              <number>5</number>
             </property>
             <property name="showGrid" stdset="0">
              <bool>false</bool>
             </property>
             <attribute name="headerVisible">
              <bool>true</bool>
             </attribute>
             <column>
              <property name="text">
               <string>Name</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>Path</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true">IconName</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true">Ghns</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true"/>
              </property>
             </column>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="tableCtrlLayout">
             <item>
              <widget class="QPushButton" name="addButton">
               <property name="text">
                <string>Add</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <property name="topMargin">
              <number>0</number>
             </property>
            </layout>
           </item>
          </layout>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
-   <header location="global">kmessagewidget.h</header>
+   <header>KMessageWidget</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header location="global">kurlrequester.h</header>
+   <header>KUrlRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/qthelp/qthelpconfigeditdialog.ui b/plugins/qthelp/qthelpconfigeditdialog.ui
index 1b457b45ac..4a2bc3920f 100644
--- a/plugins/qthelp/qthelpconfigeditdialog.ui
+++ b/plugins/qthelp/qthelpconfigeditdialog.ui
@@ -1,139 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtHelpConfigEditDialog</class>
  <widget class="QDialog" name="QtHelpConfigEditDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>125</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Icon:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KIconButton" name="qchIcon">
      <property name="toolTip">
       <string>Select an icon</string>
      </property>
      <property name="iconSize">
       <number>16</number>
      </property>
      <property name="strictIconSize">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Name:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLineEdit" name="qchName">
      <property name="toolTip">
       <string>Enter a name</string>
      </property>
      <property name="placeholderText">
       <string>Select a name</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Path:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KUrlRequester" name="qchRequester">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="toolTip">
       <string>Select a QtHelp file...</string>
      </property>
      <property name="filter">
       <string notr="true">*.qch|Qt Compressed Help (.qch)</string>
      </property>
      <property name="placeholderText">
       <string>Select a QtHelp file...</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KIconButton</class>
    <extends>QPushButton</extends>
-   <header>kiconbutton.h</header>
+   <header>KIconButton</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>QtHelpConfigEditDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>QtHelpConfigEditDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/subversion/ui/importmetadatawidget.ui b/plugins/subversion/ui/importmetadatawidget.ui
index 045fecf44a..ad7e6f0924 100644
--- a/plugins/subversion/ui/importmetadatawidget.ui
+++ b/plugins/subversion/ui/importmetadatawidget.ui
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SvnImportMetadataWidget</class>
  <widget class="QWidget" name="SvnImportMetadataWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>549</width>
     <height>280</height>
    </rect>
   </property>
   <layout class="QFormLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="labelForSrc">
      <property name="text">
       <string>Source directory:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Repository:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLineEdit" name="dest">
      <property name="toolTip">
       <string>Repository Location</string>
      </property>
      <property name="statusTip">
       <string>Repository Location to import into</string>
      </property>
      <property name="whatsThis">
       <string>Choose the repository into which the source directory is imported</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KUrlRequester" name="srcEdit"/>
    </item>
    <item row="2" column="1">
     <widget class="KTextEdit" name="message">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Commit message:</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
-   <header>kurlrequester.h</header>
+   <header>KUrlRequester</header>
   </customwidget>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
-   <header>ktextedit.h</header>
+   <header>KTextEdit</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>