diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui
index f35e19f78..4334cbbaf 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -719,15 +719,9 @@
kcolorbutton.h
kcombobox.h
- kurlrequester.h
kdialog.h
+ kurlrequester.h
-
- kcombobox.h
- kcolorbutton.h
- kcolorbutton.h
- kcombobox.h
-
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index c810f1e31..9abdeec12 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -123,11 +123,8 @@
tdelistbox.h
- kdialog.h
+ kdialog.h
-
- tdelistbox.h
-
diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui
index f0baacb79..4566ba5c0 100644
--- a/kcontrol/css/cssconfig.ui
+++ b/kcontrol/css/cssconfig.ui
@@ -229,16 +229,12 @@
setEnabled(bool)
-
- kdialog.h
-
+ kdialog.h
+ klineedit.h
+ kpushbutton.h
kurlrequester.h
-
- klineedit.h
- kpushbutton.h
-
diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui
index 5074b8bab..cc69769b7 100644
--- a/kcontrol/css/csscustom.ui
+++ b/kcontrol/css/csscustom.ui
@@ -547,8 +547,4 @@
-
- kcolorbutton.h
- kcolorbutton.h
-
diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui
index 51bd26ad1..a4557c845 100644
--- a/kcontrol/css/preview.ui
+++ b/kcontrol/css/preview.ui
@@ -89,7 +89,4 @@ people.</p>
-
- kseparator.h
-
diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui
index bcdfef2f8..05549de36 100644
--- a/kcontrol/kicker/applettab.ui
+++ b/kcontrol/kicker/applettab.ui
@@ -217,11 +217,9 @@
- kdialog.h
+ qwidget.h
+ kdialog.h
-
- qwidget.h
-
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index 542d66bd2..fae21c356 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -762,14 +762,11 @@
klineedit.h
knuminput.h
- kdialog.h
+ kdialog.h
switchPanel(int)
-
- knuminput.h
-
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 7938f5f6c..803393e66 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -617,10 +617,12 @@ This option is only active if 'Enable background image' is selected.
advancedOptionsButton
- kcolorbutton.h
kcombobox.h
kurlrequester.h
+ kcolorbutton.h
kdialog.h
+ klineedit.h
+ kpushbutton.h
launchAdvancedDialog()
@@ -629,8 +631,4 @@ This option is only active if 'Enable background image' is selected.
-
- klineedit.h
- kpushbutton.h
-
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index ac367a15f..6729d0cf2 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -1110,7 +1110,7 @@ how it is positioned on the screen and how much of the screen it should use.
klineedit.h
knuminput.h
- kdialog.h
+ kdialog.h
lengthenPanel( int )
@@ -1120,10 +1120,4 @@ how it is positioned on the screen and how much of the screen it should use.
-
- knuminput.h
- knuminput.h
- knuminput.h
- knuminput.h
-
diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui
index def27d1fa..1397e2ebb 100644
--- a/kcontrol/knotify/playersettings.ui
+++ b/kcontrol/knotify/playersettings.ui
@@ -323,10 +323,8 @@
+ klineedit.h
+ kpushbutton.h
kurlrequester.h
-
- klineedit.h
- kpushbutton.h
-
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index f3525430e..e3abdbba9 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -256,18 +256,14 @@
- tdelocale.h
kurlrequester.h
tdelistbox.h
- kdialog.h
+ tdelocale.h
+ klineedit.h
+ kpushbutton.h
+ tqwidget.h
+ kdialog.h
-
- tqwidget.h
- kurlrequester.h
- klineedit.h
- kpushbutton.h
- tdelistbox.h
-
diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui
index 5034b42c4..fea9ad139 100644
--- a/kcontrol/konsole/kcmkonsoledialog.ui
+++ b/kcontrol/konsole/kcmkonsoledialog.ui
@@ -386,16 +386,10 @@
kcolorbutton.h
knuminput.h
- kdialog.h
+ schemaeditor.h
+ sessioneditor.h
+ kdialog.h
-
- knuminput.h
- knuminput.h
- knuminput.h
- knuminput.h
- schemaeditor.h
- sessioneditor.h
-
diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui
index 950ebe1a9..0244ab236 100644
--- a/kcontrol/konsole/sessiondialog.ui
+++ b/kcontrol/konsole/sessiondialog.ui
@@ -435,12 +435,10 @@
kcolorbutton.h
kdialog.h
kicondialog.h
+ klineedit.h
+ kpushbutton.h
kurlrequester.h
-
- klineedit.h
- kpushbutton.h
-
diff --git a/kcontrol/tdeio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui
index baf2141af..aed14c5dd 100644
--- a/kcontrol/tdeio/kproxydlg_ui.ui
+++ b/kcontrol/tdeio/kproxydlg_ui.ui
@@ -433,11 +433,9 @@ Although a persistent proxy connection is faster, note that it only works correc
kdialog.h
klineedit.h
+ kpushbutton.h
kurlrequester.h
-
- kpushbutton.h
-
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index 50a13ec4f..4faf2d876 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -137,13 +137,11 @@
+ kdcoplistview.h
kdialog.h
tdelistbox.h
tdelistviewsearchline.h
-
- kdcoplistview.h
-
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index 13d3b9736..93c95c8f0 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -640,21 +640,14 @@
fixx11h.h
+ kcombobox.h
kdialog.h
kiconloader.h
- kpassdlg.h
- kcombobox.h
klineedit.h
+ kpassdlg.h
kpushbutton.h
BarIcon
-
- kpushbutton.h
- kpushbutton.h
- kpushbutton.h
- kpassdlg.h
- kcombobox.h
-
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index 6d571e699..5a285b32e 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -55,12 +55,10 @@
kdialog.h
+ klineedit.h
+ kpushbutton.h
kurlrequester.h
-
- klineedit.h
- kpushbutton.h
-
diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui
index bd2673efa..13f8aa300 100644
--- a/kicker/applets/swallow/prefwidgetbase.ui
+++ b/kicker/applets/swallow/prefwidgetbase.ui
@@ -119,16 +119,13 @@
-
- kdialog.h
-
-
- keditlistbox.h
- klineedit.h
- kurlrequester.h
- klineedit.h
- kpushbutton.h
-
+
+ keditlistbox.h
+ klineedit.h
+ kpushbutton.h
+ kurlrequester.h
+ kdialog.h
+
diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui
index 5d92dab89..e61575a72 100644
--- a/kicker/kicker/ui/appletview.ui
+++ b/kicker/kicker/ui/appletview.ui
@@ -198,8 +198,6 @@
kpushbutton.h
+ tqscrollview.h
-
- tqscrollview.h
-
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
index 4558e2374..fb265df74 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -440,9 +440,10 @@
+ kcolorbutton.h
kdialog.h
knumvalidator.h
- MultiMeterSettingsWidget.ui.h
+ MultiMeterSettingsWidget.ui.h
setMeterBackgroundColor( const TQColor & c )
@@ -469,7 +470,4 @@
-
- kcolorbutton.h
-
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index 21486c4be..352a26762 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -2546,8 +2546,6 @@
klineedit.h
kpushbutton.h
krestrictedline.h
+ tdelistbox.h
-
- tdelistbox.h
-