Rename many classes and header files to avoid conflicts with KDE4

151 files changed, 233 insertions, 233 deletions

diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp
index 5e00cd64..9b2291a2 100644
--- a/blinken/src/blinken.cpp
+++ b/blinken/src/blinken.cpp
@@ -12,14 +12,14 @@
 #include <tqpixmap.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include "blinken.h"
diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index 0bcc845a..50d49bbe 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/doc/kvoctrain/index.docbook b/doc/kvoctrain/index.docbook
index 41f79fb6..ce20e5b8 100644
--- a/doc/kvoctrain/index.docbook
+++ b/doc/kvoctrain/index.docbook
@@ -1153,7 +1153,7 @@ You may download a free font from
 <ulink url="http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html">http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html
 </ulink> or
 <ulink url="http://www.hclrss.demon.co.uk/unicode/fonts.html">http://www.hclrss.demon.co.uk/unicode/fonts.html
-</ulink>. Install these fonts for example with kfontinst.</para>
+</ulink>. Install these fonts for example with tdefontinst.</para>
 
 <para>If you have <application>StarOffice</application> installed you probably
 have the font <quote>Lucida Sans Unicode</quote> which also contains most of the
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 2d15a89d..32f3caa6 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -24,7 +24,7 @@
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kcombobox.h>
 #include <kapplication.h>
 
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index 5f3dba55..2efda7a4 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -22,7 +22,7 @@
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 
 //QT-Includes
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index bc266e5e..cb5cae59 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -43,7 +43,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h
index 41faf36a..3184b555 100644
--- a/kalzium/src/kalzium.h
+++ b/kalzium/src/kalzium.h
@@ -17,7 +17,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDESelectAction;
 class TDEToggleAction;
diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp
index 60eb5108..435f6d7a 100644
--- a/kalzium/src/molcalcwidget.cpp
+++ b/kalzium/src/molcalcwidget.cpp
@@ -29,12 +29,12 @@
 #include "parser.h"
 #include "moleculeparser.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 4d9dca18..850af0b9 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -32,14 +32,14 @@ using namespace std;
 #include <tqfontmetrics.h>
 #include <tqdir.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
 #include <tdeconfigskeleton.h>
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index 096bc467..b0b8ee98 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -18,9 +18,9 @@
 
 #include <config.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h
index 1868d9c6..4b58000c 100644
--- a/kbruch/src/mainqtwidget.h
+++ b/kbruch/src/mainqtwidget.h
@@ -17,7 +17,7 @@
 #ifndef MAINTQTWIDGET_H
 #define MAINTQTWIDGET_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class KJanusWidget;
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index 72f2077a..a35ec107 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -216,7 +216,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontdialog.h</includehint>
+    <includehint>tdefontdialog.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am
index ce6f1e89..c116f6fc 100644
--- a/keduca/keduca/Makefile.am
+++ b/keduca/keduca/Makefile.am
@@ -10,7 +10,7 @@ keduca_SOURCES = main.cpp keduca.cpp
 # Convenience library
 #noinst_LTLIBRARIES = libkeduca_common.la
 
-#libkeduca_common_la_SOURCES = kradioeduca.cpp kquestion.cpp kgroupeduca.cpp keducaview.cpp \
+#libkeduca_common_la_SOURCES = tderadioeduca.cpp kquestion.cpp kgroupeduca.cpp keducaview.cpp \
 #                              keducaprefs.cpp kcheckeduca.cpp
 #libkeduca_common_la_LDFLAGS = $(all_libraries) -no-undefined
 #libkeduca_common_la_LIBADD  = ../libkeduca/libkeduca.la
@@ -19,13 +19,13 @@ keduca_SOURCES = main.cpp keduca.cpp
 kde_module_LTLIBRARIES = libkeducapart.la
 libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 libkeducapart_la_LIBADD  = ../libkeduca/libkeduca.la $(LIB_KPARTS)
-libkeducapart_la_SOURCES = keduca_part.cpp kradioeduca.cpp kquestion.cpp \
+libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \
                            kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
                            kcheckeduca.cpp settings.kcfgc configdialogbase.ui
 
 EXTRA_DIST = main.cpp keduca.cpp keduca.h kcheckeduca.cpp kcheckeduca.h keducaprefs.cpp \
 keducaprefs.h keducaui.rc keducaview.cpp keducaview.h kgroupeduca.cpp kgroupeduca.h kquestion.cpp \
-kquestion.h kradioeduca.cpp kradioeduca.h
+kquestion.h tderadioeduca.cpp tderadioeduca.h
 
 METASOURCES = AUTO
 
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index eae53cd5..051a8c3e 100644
--- a/keduca/keduca/kcheckeduca.cpp
+++ b/keduca/keduca/kcheckeduca.cpp
@@ -19,7 +19,7 @@
 #include "kcheckeduca.moc"
 
 #include <tqstyle.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
 {
diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h
index 736dc712..130d15be 100644
--- a/keduca/keduca/keduca.h
+++ b/keduca/keduca/keduca.h
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 /** The KEduca TestMaster.
     This will execute the Test/Examen as defined by the KEduca Document. */
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index ec77868f..3c3482fc 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -18,7 +18,7 @@
 #include "kgroupeduca.h"
 #include "kgroupeduca.moc"
 #include "kcheckeduca.h"
-#include "kradioeduca.h"
+#include "tderadioeduca.h"
 
 #include <klocale.h>
 
@@ -66,7 +66,7 @@ void KGroupEduca::setType(ButtonType type)
     _typeMode = type;
 }
 
-/** Clear all kradio or kcheck answers */
+/** Clear all tderadio or kcheck answers */
 void KGroupEduca::clearAnswers()
 {
     unsigned int maxButton = count();
diff --git a/keduca/keduca/kgroupeduca.h b/keduca/keduca/kgroupeduca.h
index e551806e..05ff761b 100644
--- a/keduca/keduca/kgroupeduca.h
+++ b/keduca/keduca/kgroupeduca.h
@@ -38,7 +38,7 @@ public:
     void insertAnswer( const TQString& text);
     /** Set type */
     void setType(ButtonType Type);
-    /** Clear all kradio or kcheck answers */
+    /** Clear all tderadio or kcheck answers */
     void clearAnswers();
     /** Return if is checked radio or check buttons */
     bool isChecked(int id);
diff --git a/keduca/keduca/tderadioeduca.cpp b/keduca/keduca/tderadioeduca.cpp
index b858cb6d..4dde0d17 100644
--- a/keduca/keduca/tderadioeduca.cpp
+++ b/keduca/keduca/tderadioeduca.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kradioeduca.cpp  -  description
+                          tderadioeduca.cpp  -  description
                              -------------------
     begin                : Wed Sep 6 2000
     copyright            : (C) 2000 by Javier Campos Morales
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kradioeduca.h"
-#include "kradioeduca.moc"
+#include "tderadioeduca.h"
+#include "tderadioeduca.moc"
 #include <tqstyle.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 TDERadioEduca::TDERadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
 {
diff --git a/keduca/keduca/tderadioeduca.h b/keduca/keduca/tderadioeduca.h
index 1056ff53..7ffb503f 100644
--- a/keduca/keduca/tderadioeduca.h
+++ b/keduca/keduca/tderadioeduca.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kradioeduca.h  -  description
+                          tderadioeduca.h  -  description
                              -------------------
     begin                : Wed Sep 6 2000
     copyright            : (C) 2000 by Javier Campos Morales
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index 832c59ac..1646e249 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -24,7 +24,7 @@
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
 //#include <.h>
 
 // TQt includes
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index e0902db1..1eb9e877 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -875,6 +875,6 @@
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index d91efb79..11841ab8 100644
--- a/keduca/keducabuilder/keducabuilder.h
+++ b/keduca/keducabuilder/keducabuilder.h
@@ -20,10 +20,10 @@
 
 #include "../libkeduca/fileread.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-#include <klistbox.h>
-#include <kaction.h>
+#include <tdelistbox.h>
+#include <tdeaction.h>
 
 #include <tqtextview.h>
 #include <tqsplitter.h>
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 2c69c146..34d6a82c 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -46,7 +46,7 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c
              this, TQT_SLOT( slotChoiceChanged(int) ) );
 }
 
-/** based on code in kaction.cpp
+/** based on code in tdeaction.cpp
  */
 void KEducaEditorStartDialog::buildRecentFilesList()
 {
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 6bc0444a..16a5ad60 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -10,7 +10,7 @@
 
 #include <stdlib.h> // for RAND_MAX
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 0355ba96..67762cd9 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kinputdialog.h>
diff --git a/kgeography/src/kgeography.h b/kgeography/src/kgeography.h
index a48c0fb5..a9343079 100644
--- a/kgeography/src/kgeography.h
+++ b/kgeography/src/kgeography.h
@@ -11,7 +11,7 @@
 #ifndef KGEOGRAPHY_H
 #define KGEOGRAPHY_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAction;
 class KPushButton;
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 61b04c85..cda2beee 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -32,16 +32,16 @@
 #include <tqdir.h>
 
 #include <kapplication.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 
 KHangMan::KHangMan()
diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h
index 9fddf835..2ec8dfc0 100644
--- a/khangman/khangman/khangman.h
+++ b/khangman/khangman/khangman.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "khangmanview.h"
 
diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp
index 37874973..d7da3f96 100644
--- a/khangman/khangman/khnewstuff.cpp
+++ b/khangman/khangman/khnewstuff.cpp
@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <tqdir.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "prefs.h"
 #include "khnewstuff.h"
diff --git a/kig/TODO b/kig/TODO
index ec313e58..3a80cba6 100644
--- a/kig/TODO
+++ b/kig/TODO
@@ -7,8 +7,8 @@
    many points as times you pressed escape ( or perhaps the times you
    pressed esc square or sth like that ).  Anyway, this is due to how
    Kig works with some strange Qt event loop stuff to make its modes
-   work, along with a strange way in kaccel of working.  I have a
-   patch against tdecore/kaccel.cpp that should fix it, but the real
+   work, along with a strange way in tdeaccel of working.  I have a
+   patch against tdecore/tdeaccel.cpp that should fix it, but the real
    fix is to get rid of the entire event loop stuff and think of a
    better way to manage all this. pino: seems pressing the stop button
    n times, where n are the times you pressed escape, cancel all the
diff --git a/kig/filters/drgeo-filter-chooser.cc b/kig/filters/drgeo-filter-chooser.cc
index 3369af92..81fab837 100644
--- a/kig/filters/drgeo-filter-chooser.cc
+++ b/kig/filters/drgeo-filter-chooser.cc
@@ -19,7 +19,7 @@
 #include "drgeo-filter-chooser.h"
 #include "drgeo-filter-chooser.moc"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index d173a46e..3cc334eb 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -133,7 +133,7 @@ Please select which to import:</string>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 005342de..06babdfa 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -42,7 +42,7 @@
 #include <tqiconset.h>
 #include <tqtextstream.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klocale.h>
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 79620ebc..5f92aaf7 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -24,7 +24,7 @@
 #include <tqevent.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 3e85d0b4..b62d4685 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -43,7 +43,7 @@
 #include <algorithm>
 #include <functional>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -51,13 +51,13 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeprint/kprintdialogpage.h>
 
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index f9d70f29..02b3869d 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -41,7 +41,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include <cmath>
diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h
index 6187dbe3..56ab6f73 100644
--- a/kig/misc/guiaction.h
+++ b/kig/misc/guiaction.h
@@ -26,7 +26,7 @@
 
 #include <tqstring.h>
 #include <tqcstring.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class GUIAction;
 class KigPart;
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index eddac9e1..e9c13364 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -36,7 +36,7 @@
 #include "popup.h"
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/dragrectmode.cc b/kig/modes/dragrectmode.cc
index 8091f8cb..29b00886 100644
--- a/kig/modes/dragrectmode.cc
+++ b/kig/modes/dragrectmode.cc
@@ -24,7 +24,7 @@
 
 #include <tqevent.h>
 #include <tqglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 DragRectMode::DragRectMode( const TQPoint& start, KigPart& d, KigWidget& w )
   : KigMode( d ), mstart( start ), mnc( true ), mstartselected( true ),
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index c92dccf8..f8c82dfa 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -36,7 +36,7 @@
 
 #include <kcursor.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
diff --git a/kig/modes/mode.cc b/kig/modes/mode.cc
index 76edc4f1..dbc6f7d6 100644
--- a/kig/modes/mode.cc
+++ b/kig/modes/mode.cc
@@ -22,7 +22,7 @@
 
 #include "../kig/kig_part.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 void KigMode::enableActions()
 {
diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc
index c4dd7f4f..70123996 100644
--- a/kig/modes/normal.cc
+++ b/kig/modes/normal.cc
@@ -32,7 +32,7 @@
 #include "typesdialog.h"
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index b55adafb..042e379a 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -52,7 +52,7 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcolordialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kig/modes/popup.h b/kig/modes/popup.h
index d1fb89d5..16078c15 100644
--- a/kig/modes/popup.h
+++ b/kig/modes/popup.h
@@ -21,7 +21,7 @@
 #ifndef KIG_MODES_POPUP_H
 #define KIG_MODES_POPUP_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <vector>
 
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index c0333ecb..6e06bb79 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -27,7 +27,7 @@
 
 #include <tqpopupmenu.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 class KigPart;
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 0a74d56d..cc5cec92 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -328,7 +328,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc
index 08215bfb..5c001df6 100644
--- a/kig/objects/polygon_imp.cc
+++ b/kig/objects/polygon_imp.cc
@@ -498,34 +498,34 @@ std::vector<Coordinate> computeConvexHull( const std::vector<Coordinate>& points
    */
 
   if ( points.size() < 3 ) return points;
-  std::vector<Coordinate> worklist = points;
+  std::vector<Coordinate> wortdelist = points;
   std::vector<Coordinate> result;
 
-  double ymin = worklist[0].y;
+  double ymin = wortdelist[0].y;
   uint imin = 0;
-  for ( uint i = 1; i < worklist.size(); ++i )
+  for ( uint i = 1; i < wortdelist.size(); ++i )
   {
-    if ( worklist[i].y < ymin )
+    if ( wortdelist[i].y < ymin )
     {
-      ymin = worklist[i].y;
+      ymin = wortdelist[i].y;
       imin = i;
     }
   }
 
-  // worklist[imin] is definitely on the convex hull, let's start from there
-  result.push_back( worklist[imin] );
-  Coordinate startpoint = worklist[imin];
-  Coordinate apoint = worklist[imin];
+  // wortdelist[imin] is definitely on the convex hull, let's start from there
+  result.push_back( wortdelist[imin] );
+  Coordinate startpoint = wortdelist[imin];
+  Coordinate apoint = wortdelist[imin];
   double aangle = 0.0;
 
-  while ( ! worklist.empty() )
+  while ( ! wortdelist.empty() )
   {
     int besti = -1;
     double anglemin = 10000.0;
-    for ( uint i = 0; i < worklist.size(); ++i )
+    for ( uint i = 0; i < wortdelist.size(); ++i )
     {
-      if ( worklist[i] == apoint ) continue;
-      Coordinate v = worklist[i] - apoint;
+      if ( wortdelist[i] == apoint ) continue;
+      Coordinate v = wortdelist[i] - apoint;
       double angle = std::atan2( v.y, v.x );
       while ( angle < aangle ) angle += 2*M_PI;
       if ( angle < anglemin )
@@ -536,14 +536,14 @@ std::vector<Coordinate> computeConvexHull( const std::vector<Coordinate>& points
     }
 
     if ( besti < 0 ) return result;   // this happens, e.g. if all points coincide
-    apoint = worklist[besti];
+    apoint = wortdelist[besti];
     aangle = anglemin;
     if ( apoint == startpoint )
     {
       return result;
     }
     result.push_back( apoint );
-    worklist.erase( worklist.begin() + besti, worklist.begin() + besti + 1 );
+    wortdelist.erase( wortdelist.begin() + besti, wortdelist.begin() + besti + 1 );
   }
   assert( false );
   return result;
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index c883a159..a9f83390 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -23,14 +23,14 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-//#include <kactionclasses.h>
-//#include <kactioncollection.h>
+//#include <tdeactionclasses.h>
+//#include <tdeactioncollection.h>
 // make it still work on old kde 3.1...
-#include <kaction.h>
+#include <tdeaction.h>
 //
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktextedit.h>
 #include <tdetexteditor/clipboardinterface.h>
 #include <tdetexteditor/dynwordwrapinterface.h>
diff --git a/kig/scripting/python_scripter.cc b/kig/scripting/python_scripter.cc
index 7e833d5c..81f377ac 100644
--- a/kig/scripting/python_scripter.cc
+++ b/kig/scripting/python_scripter.cc
@@ -539,12 +539,12 @@ void PythonScripter::saveErrors()
 
   object printexcfunc = d->mainnamespace[ "traceback" ].attr( "format_exception" );
 
-  list tracebacklist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
+  list tracebactdelist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
   str tracebackstr( "" );
   while ( true )
   {
     try {
-      str s = extract<str>( tracebacklist.pop() );
+      str s = extract<str>( tracebactdelist.pop() );
       tracebackstr += s;
     }
     catch( ... )
diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp
index e6ec117d..c7edcc80 100644
--- a/kiten/configdictionaries.cpp
+++ b/kiten/configdictionaries.cpp
@@ -19,7 +19,7 @@
 **/
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <tqstringlist.h>
diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui
index 77bb52ad..1df05174 100644
--- a/kiten/configdictionariesbase.ui
+++ b/kiten/configdictionariesbase.ui
@@ -307,7 +307,7 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kiten/configfont.ui b/kiten/configfont.ui
index 90b5ac72..c439108a 100644
--- a/kiten/configfont.ui
+++ b/kiten/configfont.ui
@@ -28,6 +28,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontdialog.h</includehint>
+    <includehint>tdefontdialog.h</includehint>
 </includehints>
 </UI>
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index c5609c21..d952285d 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -19,7 +19,7 @@
  USA
 **/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index cc85487e..0a76d8ec 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -19,11 +19,11 @@
  USA
 **/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kiten/main.cpp b/kiten/main.cpp
index e391ec50..25f8e54c 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -22,7 +22,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqsqlpropertymap.h>
 
 #include "kiten.h"
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index ae97a29c..cba25ffc 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kapplication.h>
 #include <tqvgroupbox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tqtextcodec.h>
 #include <klocale.h>
 #include <tqcombobox.h>
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 602cdf6a..49f300f0 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 9a278ecb..506cde60 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -19,10 +19,10 @@
  USA
 **/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
diff --git a/kiten/widgets.h b/kiten/widgets.h
index 1bf0782a..44ae4447 100644
--- a/kiten/widgets.h
+++ b/kiten/widgets.h
@@ -23,9 +23,9 @@
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klineedit.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <ktextbrowser.h>
 
 class TDEListView;
diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h
index 7cff071a..3568148b 100644
--- a/klatin/klatin/klatin.h
+++ b/klatin/klatin/klatin.h
@@ -21,9 +21,9 @@
 #include <config.h>
 #endif
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klineedit.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "klatinchoose.h"
 #include "klatingrammar.h"
diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui
index 181b9a1b..6bb42517 100644
--- a/klettres/klettres/fontsdlg.ui
+++ b/klettres/klettres/fontsdlg.ui
@@ -33,6 +33,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontdialog.h</includehint>
+    <includehint>tdefontdialog.h</includehint>
 </includehints>
 </UI>
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index eaba8fc2..533a7714 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 
 //KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <tdeconfigdialog.h>
@@ -40,8 +40,8 @@
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 //Project includes
 #include "klnewstuff.h"
 #include "klettres.h"
diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h
index 02ff5197..6814723f 100644
--- a/klettres/klettres/klettres.h
+++ b/klettres/klettres/klettres.h
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "klettresview.h"
 #include "soundfactory.h"
diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp
index 18bca5fd..b2a8a50d 100644
--- a/klettres/klettres/klnewstuff.cpp
+++ b/klettres/klettres/klnewstuff.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <ktar.h>
 #include <tqdir.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include "klnewstuff.h"
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index eae23ab5..3602e325 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -29,7 +29,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui
index 90285af2..0f91d5c7 100644
--- a/kmplot/kmplot/FktDlgData.ui
+++ b/kmplot/kmplot/FktDlgData.ui
@@ -419,6 +419,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 879a4f41..c2172ee8 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 
 // local includes
diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h
index 8a34ef36..f258999c 100644
--- a/kmplot/kmplot/MainDlg.h
+++ b/kmplot/kmplot/MainDlg.h
@@ -32,9 +32,9 @@
 #include <tqpicture.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/part.h>
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index 1778ee9c..be828f76 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -33,13 +33,13 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 
 // local includes
diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h
index 6d960894..c197d237 100644
--- a/kmplot/kmplot/View.h
+++ b/kmplot/kmplot/View.h
@@ -32,9 +32,9 @@
 
 // KDE includes
 #include <dcopclient.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprinter.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index c2017c8a..a91d3ad1 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index 07cd3042..0b13905f 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -25,7 +25,7 @@
 
 #include "kmplot.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index a88fedc4..6b59b08d 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -28,7 +28,7 @@
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 9045c23f..784afe89 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
diff --git a/kmplot/kmplot/ksliderwindow.h b/kmplot/kmplot/ksliderwindow.h
index b221f575..e19b25d2 100644
--- a/kmplot/kmplot/ksliderwindow.h
+++ b/kmplot/kmplot/ksliderwindow.h
@@ -26,7 +26,7 @@
 #ifndef KSLIDERWINDOW_H
 #define KSLIDERWINDOW_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "sliderwindow.h"
 
diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui
index 29b3ecb1..30bc937e 100644
--- a/kmplot/kmplot/qconstanteditor.ui
+++ b/kmplot/kmplot/qconstanteditor.ui
@@ -198,6 +198,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui
index 872a574c..18d6bb1b 100644
--- a/kmplot/kmplot/settingspagefonts.ui
+++ b/kmplot/kmplot/settingspagefonts.ui
@@ -121,8 +121,8 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui
index 6dc67273..8842d6d4 100644
--- a/kstars/kstars/addcatdialogui.ui
+++ b/kstars/kstars/addcatdialogui.ui
@@ -355,7 +355,7 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>draglistbox.h</includehint>
     <includehint>draglistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index e8817ab7..28599439 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 
 #include "detaildialog.h"
diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui
index 04e4c150..4a1353c7 100644
--- a/kstars/kstars/details_database.ui
+++ b/kstars/kstars/details_database.ui
@@ -50,6 +50,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui
index c75c52dc..460f2068 100644
--- a/kstars/kstars/details_links.ui
+++ b/kstars/kstars/details_links.ui
@@ -178,8 +178,8 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui
index 97541c44..6ff0ebb4 100644
--- a/kstars/kstars/devmanager.ui
+++ b/kstars/kstars/devmanager.ui
@@ -428,10 +428,10 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h
index 1786961e..2327c21c 100644
--- a/kstars/kstars/draglistbox.h
+++ b/kstars/kstars/draglistbox.h
@@ -18,7 +18,7 @@
 #ifndef DRAGLISTBOX_H
 #define DRAGLISTBOX_H
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 class TQDragEnterEvent;
 class TQDragDropEvent;
diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp
index 9aa0c372..560cf82f 100644
--- a/kstars/kstars/fitsimage.cpp
+++ b/kstars/kstars/fitsimage.cpp
@@ -21,10 +21,10 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
-#include <ktoolbar.h> 
+#include <tdetoolbar.h> 
 #include <kapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h
index 4ee482b3..514fc5dc 100644
--- a/kstars/kstars/fitsimage.h
+++ b/kstars/kstars/fitsimage.h
@@ -32,7 +32,7 @@
 #include <kpixmapio.h>
 #include <kpixmap.h>
 #include <kdialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include "indi/fitsrw.h"
diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp
index 6a4d7fcd..c68a54aa 100644
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@@ -149,7 +149,7 @@ float * FITSProcess::combine(TQPtrList<float> & frames, int mode)
 }
  
  /*
- *  This Quickselect routine is based on the algorithm described in
+ *  This Quictdeselect routine is based on the algorithm described in
  *  "Numerical recipies in C", Second Edition,
  *  Cambridge University Press, 1992, Section 8.5, ISBN 0-521-43108-5
  */
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index b9c8c03f..19056236 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -21,10 +21,10 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <kcommand.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqfile.h>
 #include <tqvbox.h>
diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h
index ee3c7a7c..a951d01c 100644
--- a/kstars/kstars/fitsviewer.h
+++ b/kstars/kstars/fitsviewer.h
@@ -33,7 +33,7 @@
 #include <kpixmapio.h>
 #include <kpixmap.h>
 #include <kdialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 #include <kcommand.h>
 
diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui
index f114266d..f5f78de2 100644
--- a/kstars/kstars/fovdialogui.ui
+++ b/kstars/kstars/fovdialogui.ui
@@ -184,7 +184,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index 8fdbacbc..b14a00a9 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -22,8 +22,8 @@
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
 #include <tdeio/netaccess.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
 #include "imageviewer.h"
 
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index e0b085e9..6c10b671 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -24,7 +24,7 @@
 #include <kpixmapio.h>
 #include <tdeio/job.h>
 #include <ktempfile.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**@class ImageViewer
 	*@short Image viewer widget for KStars
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index 56e8407f..e3388984 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -69,13 +69,13 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kdialogbase.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #define NINDI_STD	26
 /* INDI standard property used across all clients to enable interoperability. */
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index 1de1b3ea..6210db85 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -32,14 +32,14 @@
 #include <tqtextedit.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kextsock.h>
 #include <unistd.h>
diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp
index 3c63b835..9408f57e 100644
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@@ -41,12 +41,12 @@
 
 #include <kled.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <knuminput.h>
diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp
index 112a69b4..3d3138f2 100644
--- a/kstars/kstars/indiproperty.cpp
+++ b/kstars/kstars/indiproperty.cpp
@@ -24,7 +24,7 @@
  #include "indi/base64.h"
  #include "indi/indicom.h"
  
- #include <kpopupmenu.h>
+ #include <tdepopupmenu.h>
  #include <klineedit.h>
  #include <kled.h>
  #include <klocale.h>
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index debf946c..b5fe7085 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -51,7 +51,7 @@
  #include <kprogress.h>
  #include <kurl.h>
  #include <kdirlister.h>
- #include <kaction.h>
+ #include <tdeaction.h>
  
   
  #define STD_BUFFER_SIZ		1024000
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index 695ce191..22bc486f 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -19,7 +19,7 @@
 #if KDE_IS_VERSION( 3, 2, 90 )
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h
index 6dd9b143..a96b4118 100644
--- a/kstars/kstars/kspopupmenu.h
+++ b/kstars/kstars/kspopupmenu.h
@@ -19,7 +19,7 @@
 #ifndef KSPOPUPMENU_H
 #define KSPOPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 /**@class KSPopupMenu
 	*The KStars Popup Menu.  The menu is sensitive to the 
diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp
index c57eec64..e75199d4 100644
--- a/kstars/kstars/kstars.cpp
+++ b/kstars/kstars/kstars.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 //#include <iostream.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kiconloader.h>
 #include <tqpalette.h>
 #include <kstatusbar.h>
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index 3e719742..fffc4eba 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -23,7 +23,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqwidget.h>
 
 #include "kstarsinterface.h"
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index 133d5fab..7b852ac8 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -19,10 +19,10 @@
 #include <sys/stat.h>
 
 #include <kdebug.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <klineedit.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
@@ -32,7 +32,7 @@
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <kprocess.h>
 #include <tqcheckbox.h>
diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h
index 652113bf..3007ed58 100644
--- a/kstars/kstars/kstarsdata.h
+++ b/kstars/kstars/kstarsdata.h
@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <iostream>
 
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index a4cc5835..1511d920 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -24,10 +24,10 @@
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <ktempfile.h>
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <knuminput.h> 
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index 4db3b995..9b1a4b58 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -19,9 +19,9 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <dcopclient.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <ktip.h>
 #include <kmessagebox.h>
diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp
index 85258362..1c4ed73d 100644
--- a/kstars/kstars/kswizard.cpp
+++ b/kstars/kstars/kswizard.cpp
@@ -19,7 +19,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 
 #include "kstars.h"
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index 10b290db..72af66e6 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 
 #include <tqmemarray.h>
diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp
index 12da4367..d14f97a5 100644
--- a/kstars/kstars/skymapevents.cpp
+++ b/kstars/kstars/skymapevents.cpp
@@ -26,7 +26,7 @@
 
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <kshortcut.h> //KKey class
+#include <tdeshortcut.h> //KKey class
 
 #include "skymap.h"
 #include "Options.h"
diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h
index 15d0bc32..062b9fc3 100644
--- a/kstars/kstars/skyobjectname.h
+++ b/kstars/kstars/skyobjectname.h
@@ -19,7 +19,7 @@
 #define SKYOBJECTNAME_H
 
 #include <tqstring.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 /**@class SkyObjectName
diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp
index b2f17009..12c82a79 100644
--- a/kstars/kstars/telescopeprop.cpp
+++ b/kstars/kstars/telescopeprop.cpp
@@ -17,7 +17,7 @@
 
 
 #include <kpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui
index 53f8c8f2..bf823651 100644
--- a/kstars/kstars/telescopepropui.ui
+++ b/kstars/kstars/telescopepropui.ui
@@ -257,7 +257,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp
index 9afd62e4..388e4bcf 100644
--- a/kstars/kstars/telescopewizardprocess.cpp
+++ b/kstars/kstars/telescopewizardprocess.cpp
@@ -18,7 +18,7 @@
 #include <tqtextedit.h>
 #include <tqradiobutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index f568dbec..6241b3c3 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -28,7 +28,7 @@
 #include <tdeversion.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
 #include <kurl.h>
diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui
index 7bd41bbd..d7a16f57 100644
--- a/kstars/kstars/thumbnailpickerui.ui
+++ b/kstars/kstars/thumbnailpickerui.ui
@@ -305,7 +305,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h
index ca8550dd..5c62909d 100644
--- a/kstars/kstars/toggleaction.h
+++ b/kstars/kstars/toggleaction.h
@@ -27,7 +27,7 @@
 	*/
 
 #include <tqiconset.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class ToggleAction : public TDEAction {
 	Q_OBJECT
diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp
index c1b7b298..74370a74 100644
--- a/kstars/kstars/tools/altvstime.cpp
+++ b/kstars/kstars/tools/altvstime.cpp
@@ -19,7 +19,7 @@
 #include <tqpainter.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
 
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index bcb593d8..ad6942bf 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -17,7 +17,7 @@
 
 #include <tqvariant.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index 963d3cdd..d3184aea 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqwidgetstack.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kstatusbar.h>
 #include <ktextedit.h>
diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui
index 33a2dbbc..c53fe812 100644
--- a/kstars/kstars/tools/observinglistui.ui
+++ b/kstars/kstars/tools/observinglistui.ui
@@ -566,8 +566,8 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp
index 2b63509e..cf6c64d1 100644
--- a/kstars/kstars/tools/obslistwizard.cpp
+++ b/kstars/kstars/tools/obslistwizard.cpp
@@ -19,8 +19,8 @@
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <knuminput.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 #include "dmsbox.h"
diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui
index 5fd3f6d2..1f258a7b 100644
--- a/kstars/kstars/tools/obslistwizardui.ui
+++ b/kstars/kstars/tools/obslistwizardui.ui
@@ -1014,10 +1014,10 @@ select from a region on the sky.</string>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>dmsbox.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>magnitudespinbox.h</includehint>
diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui
index c5adc126..1f9394d4 100644
--- a/kstars/kstars/tools/optionstreeview.ui
+++ b/kstars/kstars/tools/optionstreeview.ui
@@ -132,6 +132,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 3f6afe34..93d95955 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -26,8 +26,8 @@
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kprocess.h>
 #include <ktextedit.h>
 #include <ktempfile.h>
diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui
index bf17b669..0c917ea0 100644
--- a/kstars/kstars/tools/scriptbuilderui.ui
+++ b/kstars/kstars/tools/scriptbuilderui.ui
@@ -634,13 +634,13 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp
index 2aa3590e..74ad75e7 100644
--- a/kstars/kstars/tools/wutdialog.cpp
+++ b/kstars/kstars/tools/wutdialog.cpp
@@ -33,7 +33,7 @@
 
 #include <kcombobox.h>
 #include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 
 #include <tqgroupbox.h>
diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui
index 7117eb8a..b3086f64 100644
--- a/kstars/kstars/tools/wutdialogui.ui
+++ b/kstars/kstars/tools/wutdialogui.ui
@@ -557,9 +557,9 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 39a0b445..c25bd26c 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -28,15 +28,15 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfigdialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <knuminput.h>
 
 // Own header files
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index dd7f859d..e2648969 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -21,7 +21,7 @@
 #include <tqstringlist.h>
 #include <tqvaluevector.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <kurl.h>
 
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index 9d3ce406..c0d71736 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -22,7 +22,7 @@
 #include <ksqueezedtextlabel.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 
 #include <utility>
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index 27c74ec4..c9eff2eb 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <klocale.h>
@@ -24,7 +24,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tdefiledialog.h>
 
 #include <algorithm>  // for std::swap
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 20ecbb94..83105f4c 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -667,7 +667,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index 3a23de1b..96ed2bff 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -336,6 +336,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 36bc7c23..949207cc 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -137,6 +137,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/ktouch/training/polish.ktouch.xml b/ktouch/training/polish.ktouch.xml
index 8495942c..514d8ec3 100644
--- a/ktouch/training/polish.ktouch.xml
+++ b/ktouch/training/polish.ktouch.xml
@@ -1116,7 +1116,7 @@ Mikołaj Machowski</Comment>
 <Line>ksografią osobową &lt;zasmrodzą&gt; satemową on</Line>
 <Line>piątemu kastanietową do kriochirurgią</Line>
 <Line>brzuszyną. Linową homonimią, szokową</Line>
-<Line>wątleniu 'klistronową' stiliagą 8. marca w</Line>
+<Line>wątleniu 'tdelistronową' stiliagą 8. marca w</Line>
 <Line>posapywałyby &lt;43&gt; dąsowi poknocą</Line>
 <Line>intytulacją 108 wybetonują? On na</Line>
 <Line>(bodhisattwą) troiłyby &lt;kozłku&gt;</Line>
diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h
index c125ea0b..fd1a744c 100644
--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@@ -27,8 +27,8 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 
 // include files for the application
 #include "verbspanish.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index e8e25332..6cdcbb54 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
 #include <kcolorbutton.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kcombobox.h>
 
 #include "kvoctrainprefs.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index fb8c4bf9..1891c80d 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -522,8 +522,8 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index e15f8aef..457daa7b 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <twinmodule.h>
 
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index b2e90a86..389ced39 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -33,7 +33,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 9cf65272..b3c2fddf 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -30,7 +30,7 @@
 #include <tdefiledialog.h>
 #include <kcombobox.h>
 #include <kprogress.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index f6296b5e..df9ae70b 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -36,8 +36,8 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <krandomsequence.h>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index ea7e98ff..fa4fc59a 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -25,7 +25,7 @@
 
 #include "StatistikPage.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index a55ea93e..4206a476 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kedittoolbar.h>
 #include <kstandarddirs.h> //locate
-#include <kfontdialog.h>
-#include <kpopupmenu.h>
+#include <tdefontdialog.h>
+#include <tdepopupmenu.h>
 #include <knotifydialog.h>
 #include <kiconloader.h>
 //#include <keduvocdata.h>
diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h
index 86d4772b..56d305ff 100644
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@@ -28,8 +28,8 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kdirwatch.h>
 #include <kurl.h>
 
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index b96c66f6..1047a280 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
 #include <kcolorbutton.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 
 #include "kwordquizprefs.h"
 #include "prefeditor.h"
diff --git a/kwordquiz/src/prefcardappearance.cpp b/kwordquiz/src/prefcardappearance.cpp
index e2e08f2a..ae968059 100644
--- a/kwordquiz/src/prefcardappearance.cpp
+++ b/kwordquiz/src/prefcardappearance.cpp
@@ -12,7 +12,7 @@
 #include <tqwidgetstack.h>
 #include <tqlabel.h>
 
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
 
diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui
index 257c246a..31adb29d 100644
--- a/kwordquiz/src/prefcardappearancebase.ui
+++ b/kwordquiz/src/prefcardappearancebase.ui
@@ -545,7 +545,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h
index 0b293a72..1deb4049 100644
--- a/kwordquiz/src/qaview.h
+++ b/kwordquiz/src/qaview.h
@@ -19,7 +19,7 @@
 #ifndef TQAVIEW_H
 #define TQAVIEW_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "qaviewbase.h"
 
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index e0953ef3..720ab775 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -29,7 +29,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index eb9f9a51..3957b73f 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -46,7 +46,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include <tqpainter.h>
 #include <tqdict.h>
 #include <assert.h>
diff --git a/libtdeedu/extdate/testwidget.h b/libtdeedu/extdate/testwidget.h
index 82118881..cc4bc2db 100644
--- a/libtdeedu/extdate/testwidget.h
+++ b/libtdeedu/extdate/testwidget.h
@@ -18,7 +18,7 @@
 #ifndef TESTWIDGET_H
 #define TESTWIDGET_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KDatePicker;
 class KLineEdit;
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp
index b0caca67..2ea46848 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.cpp
+++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp
@@ -15,10 +15,10 @@
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kglobal.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kstandarddirs.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include <tqfile.h>
 #include <tqlabel.h>