diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 68486c7f..dac218ba 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -25,7 +25,7 @@
 #include <tqtextstream.h>
 #include <tqtooltip.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index 850412e6..dd62a770 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 43d6672e..1913153c 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -27,7 +27,7 @@
 #include <tqregexp.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <krfcdate.h>
 
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 0389c8af..a2571197 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -36,7 +36,7 @@
 #include <kfinddialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/cervisia/loglist.h b/cervisia/loglist.h
index 38b527ec..795f4bec 100644
--- a/cervisia/loglist.h
+++ b/cervisia/loglist.h
@@ -22,7 +22,7 @@
 #define LOGLIST_H
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 class TDEConfig;
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index 302eacd0..a20e829b 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -23,7 +23,7 @@
 using Cervisia::LogMessageEdit;
 
 #include <tqtextstream.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 
 
 LogMessageEdit::LogMessageEdit(TQWidget* parent)
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 4b73e4b8..24fcf608 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -25,7 +25,7 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index e645d553..dd11da4f 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -33,7 +33,7 @@
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index 257d8c96..dda93fa5 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -22,7 +22,7 @@
 #define UPDATEVIEW_H
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqptrlist.h>
 
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index 62f1a261..5785102e 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -19,7 +19,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include <kiconloader.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -29,8 +29,8 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 ${APP_NAME}::${APP_NAME}()
diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h
index bc96132f..40b3241a 100644
--- a/kapptemplate/kapp/app.h
+++ b/kapptemplate/kapp/app.h
@@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "${APP_NAME_LC}view.h"
 
diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp
index be995d83..e2610d96 100644
--- a/kapptemplate/kpartapp/app.cpp
+++ b/kapptemplate/kpartapp/app.cpp
@@ -14,7 +14,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 
 #include <kedittoolbar.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <klibloader.h>
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index c87f6be5..ee1a90e5 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -5,7 +5,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
 #include "${APP_NAME_LC}_part.moc"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp
index 74de46f5..ccc7fecc 100644
--- a/kapptemplate/kpartplugin/plugin_app.cpp
+++ b/kapptemplate/kpartplugin/plugin_app.cpp
@@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp
 #include "plugin_${APP_NAME_LC}.h"
 
 #include <tdehtml_part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index d18f59d2..b63fdca3 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -50,7 +50,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmenumngr.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
@@ -63,13 +63,13 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <twin.h>
 
 #include <tqfileinfo.h>
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index 8a0fe6fd..971b86e8 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -42,7 +42,7 @@
 #include <tqmap.h>
 
 #include <tdeversion.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdirwatch.h>
 #include <kprocess.h>
 #include <tqptrlist.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 5543c0f6..da21075b 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -65,7 +65,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <kprogress.h>
@@ -434,7 +434,7 @@ void CatalogManagerView::markModifiedFiles()
 
 void CatalogManagerView::loadMarks()
 {
-    const KURL url = KFileDialog::getOpenURL( TQString(),"*.marklist", this );
+    const KURL url = KFileDialog::getOpenURL( TQString(),"*.martdelist", this );
     if( url.isEmpty() ) return;
 
     TQString filename;
@@ -510,7 +510,7 @@ void CatalogManagerView::loadMarks()
 
 void CatalogManagerView::saveMarks()
 {
-    const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.marklist", this );
+    const KURL url2 = KFileDialog::getSaveURL( TQString(), "*.martdelist", this );
     if( url2.isEmpty() ) return;
 
     // ### FIXME: why is the file dialog not doing this?
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index 9c321b71..f02b9302 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -51,7 +51,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <twin.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index e01585f3..76728e04 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -39,7 +39,7 @@
 #include <kdatatool.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
 
diff --git a/kbabel/commonui/CMakeLists.txt b/kbabel/commonui/CMakeLists.txt
index a53ee5f7..4738a909 100644
--- a/kbabel/commonui/CMakeLists.txt
+++ b/kbabel/commonui/CMakeLists.txt
@@ -32,7 +32,7 @@ install( FILES
 
 tde_add_library( kbabelcommonui STATIC_PIC AUTOMOC
   SOURCES
-    klisteditor.ui context.cpp kactionselector.cpp
+    tdelisteditor.ui context.cpp tdeactionselector.cpp
     toolselectionwidget.cpp toolaction.cpp finddialog.cpp
     roughtransdlg.cpp projectprefwidgets.cpp projectpref.cpp
     projectwizard.cpp projectwizardwidget.ui projectwizardwidget2.ui
diff --git a/kbabel/commonui/Makefile.am b/kbabel/commonui/Makefile.am
index 65fd166b..94c5a18d 100644
--- a/kbabel/commonui/Makefile.am
+++ b/kbabel/commonui/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libkbabelcommonui.la
 INCLUDES         = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes)
 
 # which sources should be compiled 
-libkbabelcommonui_la_SOURCES = klisteditor.ui context.cpp kactionselector.cpp \
+libkbabelcommonui_la_SOURCES = tdelisteditor.ui context.cpp tdeactionselector.cpp \
 			       toolselectionwidget.cpp toolaction.cpp \
 			       finddialog.cpp roughtransdlg.cpp \
 			       projectprefwidgets.cpp		\
@@ -24,7 +24,7 @@ libkbabelcommonui_la_LIBADD =  $(LIB_KIO) -ltdetexteditor ../common/libkbabelcom
 libkbabelcommonui_la_LDFLAGS = $(all_libraries)
 
 # these are the headers for your project
-noinst_HEADERS   =  context.h kactionselector.h finddialog.h \
+noinst_HEADERS   =  context.h tdeactionselector.h finddialog.h \
 		    roughtransdlg.h projectprefwidgets.h projectpref.h	\
 		    cmdedit.h projectwizard.h
 
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 1c6ded1e..0ae00003 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -31,7 +31,7 @@
       
 **************************************************************************** */
 #include "context.h"
-#include "klisteditor.h"
+#include "tdelisteditor.h"
 #include "kbprojectsettings.h"
 
 #include <tqcombobox.h>
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 04c845c9..f07ba99f 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -32,7 +32,7 @@
   your version.
 
 **************************************************************************** */
-#include "klisteditor.h"
+#include "tdelisteditor.h"
 #include "toolselectionwidget.h"
 #include "projectprefwidgets.h"
 #include "resources.h"
@@ -50,7 +50,7 @@
 #include <kmessagebox.h>
 #include <klineedit.h> 
 #include <kurlcompletion.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolorbutton.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp
index c2638ff5..3758b2be 100644
--- a/kbabel/commonui/tdeactionselector.cpp
+++ b/kbabel/commonui/tdeactionselector.cpp
@@ -27,7 +27,7 @@
  *   your version.                                                         *
  ***************************************************************************/
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 #include <resources.h>
 
 #include <klocale.h>
@@ -559,4 +559,4 @@ int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "tdeactionselector.moc"
diff --git a/kbabel/commonui/tdelisteditor.ui b/kbabel/commonui/tdelisteditor.ui
index 5f0f8ce1..a3130a1f 100644
--- a/kbabel/commonui/tdelisteditor.ui
+++ b/kbabel/commonui/tdelisteditor.ui
@@ -240,7 +240,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">klisteditor.ui.h</include>
+    <include location="local" impldecl="in implementation">tdelisteditor.ui.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>itemsChanged()</signal>
diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h
index 1d785309..c7135a17 100644
--- a/kbabel/commonui/toolaction.h
+++ b/kbabel/commonui/toolaction.h
@@ -33,7 +33,7 @@
 #define TOOLACTION_H
 
 #include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdatatool.h>
 
 class TDEShortcut;
diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h
index d0c8ee3a..e718dce2 100644
--- a/kbabel/commonui/toolselectionwidget.h
+++ b/kbabel/commonui/toolselectionwidget.h
@@ -32,7 +32,7 @@
 #ifndef TOOLSELECTIONWIDGET_H
 #define TOOLSELECTIONWIDGET_H
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 #include <kdemacros.h>
 
 class KDataToolInfo;
diff --git a/kbabel/datatools/Makefile.am b/kbabel/datatools/Makefile.am
index d0460d4c..45bd88b2 100644
--- a/kbabel/datatools/Makefile.am
+++ b/kbabel/datatools/Makefile.am
@@ -16,12 +16,12 @@ INCLUDES         = $(all_includes)
 
 
 # which sources should be compiled for kbabeldict
-#libkbabeltools_la_SOURCES = toolaction.cpp kactionselector.cpp toolselectionwidget.cpp
+#libkbabeltools_la_SOURCES = toolaction.cpp tdeactionselector.cpp toolselectionwidget.cpp
 #libkbabeltools_la_LIBADD =  $(LIB_TDECORE) $(LIB_KIO)
 #libkbabeltools_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
 
 # these are the headers for your project
-#noinst_HEADERS   =  kactionselector.h toolselectionwidget.h
+#noinst_HEADERS   =  tdeactionselector.h toolselectionwidget.h
 #pkginclude_HEADERS = toolaction.h
 
 # let automoc handle all of the meta source files (moc)
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index eea5f60b..9be4ec13 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -60,15 +60,15 @@
 
 #include <dcopclient.h>
 #include <kdatatool.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>
 #include <kled.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 #include <kurl.h>
@@ -77,7 +77,7 @@
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 #include <twin.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdespelldlg.h>
 #include <ksqueezedtextlabel.h>
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 5755a3e3..49247256 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -69,13 +69,13 @@
 #include <tdeconfig.h>
 #include <kapplication.h>
 #include <kled.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <tdespell.h>
 #include <twin.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 #include <kglobalsettings.h>
 
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index d05f135c..9b7d7538 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -27,7 +27,7 @@
 #include "editcmd.h"
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqcolor.h>
 #include <tqlayout.h>
 #include <kglobalsettings.h>
diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h
index 89c0e859..6384360f 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.h
+++ b/kbabel/kbabel/kbcataloglistviewitem.h
@@ -23,7 +23,7 @@
 #ifndef KBCATALOGLISTVIEWITEM_H
 #define KBCATALOGLISTVIEWITEM_H
 #include <memory>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqsimplerichtext.h>
 #include "mymultilineedit.h"
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 6edcbbc5..1e75f78b 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -56,7 +56,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include "kbhighlighting.h"
 
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 0fdd8183..d1adb648 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -37,7 +37,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 #include "kbcatalog.h"
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index 3ac386e5..796cf51f 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -39,7 +39,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tdeconfig.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdialog.h>
 #include <ktempfile.h>
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index 57b7d9d7..4b4f1002 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -31,10 +31,10 @@
 
 **************************************************************************** */
 #include "dictionarymenu.h"
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <tqsignalmapper.h>
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index d62cb176..9374e9d3 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -49,7 +49,7 @@
 #include <kcmenumngr.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h
index d1bd7558..fbca0586 100644
--- a/kbugbuster/gui/buglvi.h
+++ b/kbugbuster/gui/buglvi.h
@@ -17,7 +17,7 @@
 #ifndef KBBMAINWINDOW_BUGLVI_H
 #define KBBMAINWINDOW_BUGLVI_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "bug.h"
 #include "bugcommand.h"
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index ca5c3b66..a8b87fc4 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -22,7 +22,7 @@
 #include <kdialog.h>
 #include <kdebug.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kinputdialog.h>
 
 #include "kbbprefs.h"
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index d7a39cad..1b3ff878 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -21,11 +21,11 @@
 
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdialog.h>
 #if KDE_IS_VERSION( 3, 2, 90 )
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #endif
 #include <kdebug.h>
 
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index df133bce..cfbde061 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -24,7 +24,7 @@
 #include <tqtextview.h>
 #include <tqwidgetstack.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
@@ -32,7 +32,7 @@
 #include <kdialog.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
@@ -153,7 +153,7 @@ void KBBMainWindow::initActions()
     new TDEAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
                  actionCollection(), "file_submit" );
 
-    reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
+    reloadpactdelist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
                  actionCollection(), "reload_packagelist" );
     reloadpack= new TDEAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ),
                  actionCollection(), "reload_package" );
@@ -316,8 +316,8 @@ void KBBMainWindow::slotDisconnectedAction()
 
     bool enable = !m_disconnectedAction->isChecked();
 
-    reloadpacklist->setEnabled( enable );
-    reloadpacklist->setEnabled( enable );
+    reloadpactdelist->setEnabled( enable );
+    reloadpactdelist->setEnabled( enable );
     reloadpack->setEnabled( enable );
     reloadbug->setEnabled( enable );
     reloadall->setEnabled( enable );
diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h
index 9ced8512..2c99effe 100644
--- a/kbugbuster/gui/kbbmainwindow.h
+++ b/kbugbuster/gui/kbbmainwindow.h
@@ -18,7 +18,7 @@
 
 #include <kapplication.h>
 #include <kbookmarkmanager.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqmap.h>
 
 #include "package.h"
@@ -112,7 +112,7 @@ class KBBMainWindow : public TDEMainWindow, virtual public KBookmarkOwner
      * Used TDEActions
      */
     TDEAction *fileQuit;
-    TDEAction *reloadpacklist;
+    TDEAction *reloadpactdelist;
     TDEAction *reloadpack;
     TDEAction *reloadbug;
     TDEAction *reloadall;
diff --git a/kbugbuster/tderesources/bugzilla.desktop b/kbugbuster/tderesources/bugzilla.desktop
index 767b06cd..2329eb87 100644
--- a/kbugbuster/tderesources/bugzilla.desktop
+++ b/kbugbuster/tderesources/bugzilla.desktop
@@ -16,7 +16,7 @@ Name[ga]=Tascliosta Bugzilla
 Name[gl]=Lista de itens por facer de Bugzilla
 Name[he]=רשימת מטלות של Bugzilla
 Name[hu]=Bugzilla feladatlista
-Name[is]=Bugzilla verklisti
+Name[is]=Bugzilla vertdelisti
 Name[it]=Lista delle cosa da fare di Bugzilla
 Name[ja]=BugzillaToDo リスト
 Name[ka]=Bugzilla-ს დავალებათა სია
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 31146762..6213ee2e 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kaboutdata.h>
 
 #include "difference.h"
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index e2e2956c..1dfac530 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqwidget.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiletreeview.h>
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index 6124d184..79d318cf 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Diff2 {
 class DiffModel;
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 9150b392..942760de 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <klocale.h>
 
 #include "viewpage.h"
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 8e667800..8bb6cf83 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -25,7 +25,7 @@
 #include <tqtextcodec.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
@@ -959,7 +959,7 @@ bool KompareModelList::blendFile( DiffModel* model, const TQString& fileContents
 	TQStringList::ConstIterator lEnd    = lines.end();
 
 	DiffHunkList* hunks = model->hunks();
-	kdDebug(8101) << "Hunks in hunklist: " << hunks->count() << endl;
+	kdDebug(8101) << "Hunks in huntdelist: " << hunks->count() << endl;
 	DiffHunkListIterator hunkIt = hunks->begin();
 
 	DiffHunk*   newHunk = 0;
diff --git a/kspy/classinfoview.h b/kspy/classinfoview.h
index 121a276c..71f4d5ba 100644
--- a/kspy/classinfoview.h
+++ b/kspy/classinfoview.h
@@ -19,7 +19,7 @@
 #define CLASSINFOVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
   *@author Richard Dale
diff --git a/kspy/navview.h b/kspy/navview.h
index f0ab3ee1..ed87da79 100644
--- a/kspy/navview.h
+++ b/kspy/navview.h
@@ -19,7 +19,7 @@
 #define NAVVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class NavViewItem;
 
diff --git a/kspy/propsview.h b/kspy/propsview.h
index f98f068b..7ce538f3 100644
--- a/kspy/propsview.h
+++ b/kspy/propsview.h
@@ -19,7 +19,7 @@
 #define PROPSVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
   *@author Richard Moore
diff --git a/kspy/receiversview.h b/kspy/receiversview.h
index 965ee65a..420e16a4 100644
--- a/kspy/receiversview.h
+++ b/kspy/receiversview.h
@@ -19,7 +19,7 @@
 #define RECEIVERSVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
   *@author Richard Dale
diff --git a/kspy/sigslotview.h b/kspy/sigslotview.h
index 7a478cc5..97615cdc 100644
--- a/kspy/sigslotview.h
+++ b/kspy/sigslotview.h
@@ -19,7 +19,7 @@
 #define SIGSLOTVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
   *@author Richard Moore
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 2067add6..9d61989e 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 
 #include <tqlabel.h>
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index b3bb14af..196293dd 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -32,7 +32,7 @@
 
 #include <kurl.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <kiconloader.h>
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index a79c9816..7a33904c 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -22,7 +22,7 @@
 #include "kuiviewer_part.h"
 #include "kuiviewer_part.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <tdeio/netaccess.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/genericfactory.h>
 #include <kstdaction.h>
 #include <kstyle.h>
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 9ff5abd0..742a674a 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -64,7 +64,7 @@
 #include <tqwidgetlist.h>
 
 #include <kdrawutil.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kpixmapeffect.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
diff --git a/scripts/fixheaders b/scripts/fixheaders
index 2e1dc579..577b6968 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -57,7 +57,7 @@ $lastdir = '.';
  '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject",
  '`kdDebug\' undeclared \(first use this function\)' => "kdebug",
  '`kdWarning\' undeclared \(first use this function\)' => "kdebug",
- 'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "kpopupmenu",
+ 'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "tdepopupmenu",
  'no matching function for call to `KMenuBar::' => "kmenubar",
  'invalid use of undefined type `class QPointArray' => "qpointarray",
  'variable `QPainter \S*\' has initializer but incomplete type' => "qpainter",
@@ -84,9 +84,9 @@ $lastdir = '.';
  'invalid use of undefined type `class QLineEdit\'' => "qlineedit",
  'invalid use of undefined type `class QComboBox\'' => "qcombobox",
  'invalid use of undefined type `class QStyle\'' => "qstyle",
- 'invalid use of undefined type `class TDEPopupMenu\'' => "kpopupmenu",
+ 'invalid use of undefined type `class TDEPopupMenu\'' => "tdepopupmenu",
  'invalid use of undefined type `class QPopupMenu\'' => "qpopupmenu",
- 'cannot convert `TDEPopupMenu \*\' to `QPopupMenu \*' => "kpopupmenu",
+ 'cannot convert `TDEPopupMenu \*\' to `QPopupMenu \*' => "tdepopupmenu",
  'aggregate `QPopupMenu \S*\' has incomplete type' => "qpopupmenu",
  'invalid use of undefined type `class KURL' => "kurl",
  'no method `QApplication::' => "qapplication",
diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes
index 67e11156..0585b735 100644
--- a/scripts/fixkdeincludes
+++ b/scripts/fixkdeincludes
@@ -118,7 +118,7 @@ $hExt       = "(h|H|hh|hxx|hpp|h\\+\\+)";
  'kapp.h'        =>  "kapplication.h",
  'kstddirs.h'    =>  "kstandarddirs.h",
  'kuniqueapp.h'  =>  "kuniqueapplication.h",
- 'ktmainwindow.h'=>  "kmainwindow.h",
+ 'ktmainwindow.h'=>  "tdemainwindow.h",
  'kcolorbtn.h'   =>  "kcolorbutton.h",
  'kcolordlg.h'   =>  "kcolordialog.h",
  'kxmlgui.h'     =>  "kxmlguifactory.h",
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index 8e64e399..62b84378 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -237,7 +237,7 @@ function! MapIdentHeader( ident )
     elseif a:ident == 'TDEConfigGroup'
         return '<tdeconfigbase.h>'
     elseif a:ident == 'TDEListViewItem'
-        return '<klistview.h>'
+        return '<tdelistview.h>'
     elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)'
         return '<kdebug.h>'
     elseif a:ident == 'kapp'
diff --git a/tdecachegrind/tdecachegrind/CMakeLists.txt b/tdecachegrind/tdecachegrind/CMakeLists.txt
index 3906452e..10d9b1ae 100644
--- a/tdecachegrind/tdecachegrind/CMakeLists.txt
+++ b/tdecachegrind/tdecachegrind/CMakeLists.txt
@@ -34,10 +34,10 @@ install( FILES x-tdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/applicati
 
 tde_add_executable( tdecachegrind AUTOMOC
   SOURCES
-    functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
+    functionselectionbase.ui stactdeselectionbase.ui partselectionbase.ui
     configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
     main.cpp configuration.cpp functionselection.cpp coverage.cpp
-    partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
+    partgraph.cpp toplevel.cpp stactdeselection.cpp stackbrowser.cpp
     subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
     utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
     sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
diff --git a/tdecachegrind/tdecachegrind/Makefile.am b/tdecachegrind/tdecachegrind/Makefile.am
index f7c1bf8c..a09f8ce9 100644
--- a/tdecachegrind/tdecachegrind/Makefile.am
+++ b/tdecachegrind/tdecachegrind/Makefile.am
@@ -2,13 +2,13 @@ bin_PROGRAMS = tdecachegrind
 
 tdecachegrind_SOURCES = \
  functionselectionbase.ui \
- stackselectionbase.ui \
+ stactdeselectionbase.ui \
  partselectionbase.ui \
  configdlgbase.ui \
  loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp \
  main.cpp configuration.cpp \
  functionselection.cpp coverage.cpp partgraph.cpp \
- toplevel.cpp stackselection.cpp stackbrowser.cpp \
+ toplevel.cpp stactdeselection.cpp stackbrowser.cpp \
  subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp \
  utils.cpp fixcost.cpp \
  traceitemview.cpp instrview.cpp tabview.cpp \
diff --git a/tdecachegrind/tdecachegrind/stackitem.cpp b/tdecachegrind/tdecachegrind/stackitem.cpp
index e3763ab4..412781de 100644
--- a/tdecachegrind/tdecachegrind/stackitem.cpp
+++ b/tdecachegrind/tdecachegrind/stackitem.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "listutils.h"
 #include "stackitem.h"
-#include "stackselection.h"
+#include "stactdeselection.h"
 
 // StackItem
 
diff --git a/tdecachegrind/tdecachegrind/stactdeselection.cpp b/tdecachegrind/tdecachegrind/stactdeselection.cpp
index 59094754..29c45d2b 100644
--- a/tdecachegrind/tdecachegrind/stactdeselection.cpp
+++ b/tdecachegrind/tdecachegrind/stactdeselection.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 
 #include "stackbrowser.h"
-#include "stackselection.h"
+#include "stactdeselection.h"
 #include "stackitem.h"
 
 StackSelection::StackSelection( TQWidget* parent, const char* name)
@@ -227,4 +227,4 @@ void StackSelection::setGroupType(TraceItem::CostType gt)
     ((StackItem*)item)->updateGroup();
 }
 
-#include "stackselection.moc"
+#include "stactdeselection.moc"
diff --git a/tdecachegrind/tdecachegrind/stactdeselection.h b/tdecachegrind/tdecachegrind/stactdeselection.h
index 8a826495..5e25a5d8 100644
--- a/tdecachegrind/tdecachegrind/stactdeselection.h
+++ b/tdecachegrind/tdecachegrind/stactdeselection.h
@@ -25,7 +25,7 @@
 #ifndef STACKSELECTION_H
 #define STACKSELECTION_H
 
-#include "stackselectionbase.h"
+#include "stactdeselectionbase.h"
 #include "tracedata.h"
 
 class TraceFunction;
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index c8ac689b..5c1bd609 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -38,16 +38,16 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <ktip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #if ENABLE_DUMPDOCK
@@ -57,7 +57,7 @@
 #include "toplevel.h"
 #include "partselection.h"
 #include "functionselection.h"
-#include "stackselection.h"
+#include "stactdeselection.h"
 #include "stackbrowser.h"
 #include "tracedata.h"
 #include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/toplevel.h b/tdecachegrind/tdecachegrind/toplevel.h
index 69b3079b..0880fd47 100644
--- a/tdecachegrind/tdecachegrind/toplevel.h
+++ b/tdecachegrind/tdecachegrind/toplevel.h
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 
 #include <dcopobject.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "traceitemview.h"
 #include "tracedata.h"
diff --git a/umbrello/umbrello/CMakeLists.txt b/umbrello/umbrello/CMakeLists.txt
index 7329dec6..5080dcc2 100644
--- a/umbrello/umbrello/CMakeLists.txt
+++ b/umbrello/umbrello/CMakeLists.txt
@@ -77,7 +77,7 @@ tde_add_executable( umbrello AUTOMOC
     umlviewimageexporter.cpp umlviewimageexporterall.cpp
     umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp
     uniqueid.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp
-    widget_factory.cpp widget_utils.cpp worktoolbar.cpp
+    widget_factory.cpp widget_utils.cpp wortdetoolbar.cpp
   LINK
     refactoring-static codeimport-static kdevcppparser-static clipboard-static
     codegenerator-static docgenerators-static dialogs-static
diff --git a/umbrello/umbrello/Makefile.am b/umbrello/umbrello/Makefile.am
index b19ecb18..25d90fe9 100644
--- a/umbrello/umbrello/Makefile.am
+++ b/umbrello/umbrello/Makefile.am
@@ -111,7 +111,7 @@ usecasewidget.cpp \
 widgetbase.cpp \
 widget_factory.cpp \
 widget_utils.cpp \
-worktoolbar.cpp
+wortdetoolbar.cpp
 
 #umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_KIO)
 umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_KIO)
diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h
index f34b7df9..68b1384e 100644
--- a/umbrello/umbrello/activitywidget.h
+++ b/umbrello/umbrello/activitywidget.h
@@ -13,7 +13,7 @@
 #define ACTIVITYWIDGET_H
 
 #include "umlwidget.h"
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 #define ACTIVITY_MARGIN 5
 #define ACTIVITY_WIDTH 30
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 581a023c..a68cf60b 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -13,7 +13,7 @@
 #define ALIGNTOOLBAR_H
 
 #include <tqpixmap.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include "umlnamespace.h"
 #include "umlwidgetlist.h"
 
diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h
index 27b49b40..26b42039 100644
--- a/umbrello/umbrello/dialogs/activitydialog.h
+++ b/umbrello/umbrello/dialogs/activitydialog.h
@@ -20,7 +20,7 @@
 
 //kde class includes
 #include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 //local class includes
 #include "umlwidgetcolorpage.h"
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 7f20c427..4bd892f4 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -14,7 +14,7 @@
 
 //kde class includes
 #include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include "../associationwidget.h"
 
 class AssocRolePage;
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index d11e0d25..3eeafe2b 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -14,7 +14,7 @@
 
 //kde class includes
 #include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include "../umlnamespace.h"
 
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 4de2f313..f4e107f3 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -342,7 +342,7 @@
 <customwidgets>
     <customwidget>
         <class>TDEFontChooser</class>
-        <header location="global">kfontdialog.h</header>
+        <header location="global">tdefontdialog.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
index f4715b0d..f0657e96 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
@@ -22,7 +22,7 @@
 
 // qt/kde includes
 #include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolorbutton.h>
 
 
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index 98fb4549..5b47bd9b 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -22,7 +22,7 @@
 #include <tqdict.h>
 //kde includes
 #include <kcombobox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdialogbase.h>
 #include <kcolorbutton.h>
 #include <knuminput.h>
diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp
index e49d1633..da3c28d1 100644
--- a/umbrello/umbrello/dialogs/statedialog.cpp
+++ b/umbrello/umbrello/dialogs/statedialog.cpp
@@ -22,7 +22,7 @@
 //kde includes
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 //local includes
 #include "../umlview.h"
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 804100c4..91586098 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index 791c8ad8..1f87e732 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -18,8 +18,8 @@
  */
 
 #include <kapplication.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 665cc621..08c5a3ed 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -16,7 +16,7 @@
 #ifndef KPLAYERSLIDERACTION_H
 #define KPLAYERSLIDERACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqslider.h>
 
 /**KPlayer's slider widget. Works around the TQt upside-down slider bug.
diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h
index 1b61ab08..0ceddb50 100644
--- a/umbrello/umbrello/listpopupmenu.h
+++ b/umbrello/umbrello/listpopupmenu.h
@@ -12,7 +12,7 @@
 #ifndef LISTPOPUPMENU_H
 #define LISTPOPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "umlnamespace.h"
 
 class UMLView;
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h
index f14f7571..ab68b140 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.h
+++ b/umbrello/umbrello/refactoring/refactoringassistant.h
@@ -15,7 +15,7 @@
 #define REFACTORING_ASSISTANT
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <map>
 
diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h
index f4a8008a..5aec4396 100644
--- a/umbrello/umbrello/statewidget.h
+++ b/umbrello/umbrello/statewidget.h
@@ -14,7 +14,7 @@
 #include <tqpainter.h>
 #include <tqstringlist.h>
 #include "umlwidget.h"
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 #define STATE_MARGIN 5
 #define STATE_WIDTH 30
diff --git a/umbrello/umbrello/textbloctdelist.h b/umbrello/umbrello/textblocklist.h
similarity index 100%
rename from umbrello/umbrello/textbloctdelist.h
rename to umbrello/umbrello/textblocklist.h
diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h
index 89597211..43938573 100644
--- a/umbrello/umbrello/toolbarstatearrow.h
+++ b/umbrello/umbrello/toolbarstatearrow.h
@@ -15,7 +15,7 @@
 
 #include "toolbarstate.h"
 
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 class TQMouseEvent;
 class UMLView;
diff --git a/umbrello/umbrello/toolbarstatefactory.h b/umbrello/umbrello/toolbarstatefactory.h
index b5c1ee4c..2f7eb058 100644
--- a/umbrello/umbrello/toolbarstatefactory.h
+++ b/umbrello/umbrello/toolbarstatefactory.h
@@ -14,7 +14,7 @@
 
 #include "toolbarstate.h"
 
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 #define NR_OF_TOOLBAR_STATES 4
 
diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h
index 9989d98e..d7629a49 100644
--- a/umbrello/umbrello/toolbarstatepool.h
+++ b/umbrello/umbrello/toolbarstatepool.h
@@ -14,7 +14,7 @@
 
 #include "toolbarstate.h"
 
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 /**
  * Base class for tools that can use the same state but with different button.
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 23b87597..1cc01c01 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 
 // kde includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
@@ -37,8 +37,8 @@
 #include <kstatusbar.h>
 #include <ktip.h>
 #include <ktabwidget.h>
-#include <ktoolbarbutton.h>
-#include <kpopupmenu.h>
+#include <tdetoolbarbutton.h>
+#include <tdepopupmenu.h>
 
 // app includes
 #include "aligntoolbar.h"
@@ -53,7 +53,7 @@
 #include "umldoc.h"
 #include "umllistview.h"
 #include "umlviewlist.h"
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 #ifdef HAVE_DOT
 # include "autotqlayout/autolayoutdlg.h" //dimitri
 #endif
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index c9463a53..f3cbb2e8 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -28,7 +28,7 @@
 // kde includes
 #include <kurl.h>
 #include <kdockwidget.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // app includes
 #include "umlnamespace.h"
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index 9b64ae3d..2bbc7ffc 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -14,7 +14,7 @@
 
 #include <tqdom.h>
 #include <tqpixmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include "umlnamespace.h"
 #include "umllistviewitemlist.h"
 
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 805c28af..856f4e49 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -27,7 +27,7 @@
 #include "associationwidgetlist.h"
 #include "messagewidgetlist.h"
 #include "optionstate.h"
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 // forward declarations
 class ClassOptionsPage;
diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp
index e5a2519d..a51a5ae1 100644
--- a/umbrello/umbrello/umlwidget.cpp
+++ b/umbrello/umbrello/umlwidget.cpp
@@ -16,7 +16,7 @@
 #include <tqcolor.h>
 #include <kdebug.h>
 #include <kcolordialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kmessagebox.h>
 // local includes
 #include "umlwidgetcontroller.h"
diff --git a/umbrello/umbrello/wortdetoolbar.cpp b/umbrello/umbrello/wortdetoolbar.cpp
index 80d9c810..03fe2b18 100644
--- a/umbrello/umbrello/wortdetoolbar.cpp
+++ b/umbrello/umbrello/wortdetoolbar.cpp
@@ -10,20 +10,20 @@
  ***************************************************************************/
 
 // own header
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 // qt/kde include files
 #include <tqmainwindow.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 // application specific includes
 #include "uml.h"
 #include "umldoc.h"
 #include "umlview.h"
-#include "worktoolbar.h"
+#include "wortdetoolbar.h"
 
 
 WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name)
@@ -312,4 +312,4 @@ void WorkToolBar::loadPixmaps() {
     }
 }
 
-#include "worktoolbar.moc"
+#include "wortdetoolbar.moc"
diff --git a/umbrello/umbrello/wortdetoolbar.h b/umbrello/umbrello/wortdetoolbar.h
index a7d9339c..f3b2b815 100644
--- a/umbrello/umbrello/wortdetoolbar.h
+++ b/umbrello/umbrello/wortdetoolbar.h
@@ -15,7 +15,7 @@
 #include <tqmap.h>
 #include <tqpixmap.h>
 #include <tqcursor.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include "umlnamespace.h"
 
diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj
index 6f584c8d..aeba8483 100644
--- a/umbrello/uml.kdevprj
+++ b/umbrello/uml.kdevprj
@@ -437,7 +437,7 @@ install_location=
 type=DATA
 
 [uml/Makefile.am]
-files=uml/actor.h,uml/actorwidgetdata.h,uml/actorwidget.h,uml/associationwidgetdata.h,uml/associationwidgetdatalist.h,uml/associationwidget.h,uml/assocrules.h,uml/attribute.h,uml/concept.h,uml/conceptwidgetdata.h,uml/conceptwidget.h,uml/docwindow.h,uml/floatingtextdata.h,uml/floatingtext.h,uml/infowidget.h,uml/kstartuplogo.h,uml/linepath.h,uml/listpopupmenu.h,uml/messagewidgetdata.h,uml/messagewidget.h,uml/actor.cpp,uml/actorwidget.cpp,uml/actorwidgetdata.cpp,uml/associationwidget.cpp,uml/associationwidgetdata.cpp,uml/assocrules.cpp,uml/attribute.cpp,uml/concept.cpp,uml/conceptwidget.cpp,uml/conceptwidgetdata.cpp,uml/docwindow.cpp,uml/floatingtext.cpp,uml/floatingtextdata.cpp,uml/infowidget.cpp,uml/kstartuplogo.cpp,uml/linepath.cpp,uml/listpopupmenu.cpp,uml/main.cpp,uml/messagewidget.cpp,uml/messagewidgetdata.cpp,uml/notewidget.cpp,uml/notewidgetdata.cpp,uml/notewidgetdata.h,uml/notewidget.h,uml/objectwidget.cpp,uml/objectwidgetdata.cpp,uml/objectwidgetdata.h,uml/objectwidget.h,uml/operation.cpp,uml/operation.h,uml/statewidget.cpp,uml/statewidgetdata.cpp,uml/statewidgetdata.h,uml/statewidget.h,uml/uml.cpp,uml/umldoc.cpp,uml/umldoc.h,uml/uml.h,uml/umlnamespace.cpp,uml/umlnamespace.h,uml/umlobject.cpp,uml/umlobject.h,uml/umlobjectlist.h,uml/umlviewcanvas.cpp,uml/umlviewcanvas.h,uml/umlview.cpp,uml/umlviewdata.cpp,uml/umlviewdata.h,uml/umlview.h,uml/umlviewlist.h,uml/umlwidget.cpp,uml/umlwidgetdata.cpp,uml/umlwidgetdata.h,uml/umlwidget.h,uml/umlwidgetlist.h,uml/usecase.cpp,uml/usecase.h,uml/usecasewidget.cpp,uml/usecasewidgetdata.cpp,uml/usecasewidgetdata.h,uml/usecasewidget.h,uml/worktoolbar.cpp,uml/worktoolbar.h,uml/hi16-app-uml.png,uml/hi32-app-uml.png,uml/lo16-app-uml.png,uml/lo32-app-uml.png,uml/tips,uml/uml.desktop,uml/umlui.rc,uml/x-uml.desktop,uml/activitywidgetdata.cpp,uml/activitywidgetdata.h,uml/activitywidget.cpp,uml/activitywidget.h,uml/codegenerator.cpp,uml/codegenerator.h,uml/seqlinewidget.cpp,uml/seqlinewidget.h,uml/umllistview.cpp,uml/umllistview.h,uml/umllistviewitem.cpp,uml/umllistviewitem.h,uml/umllistviewitemdata.cpp,uml/umllistviewitemdata.h,uml/umllistviewitemdatalist.h,uml/classimport.cpp,uml/classimport.h,uml/umllistviewitemlist.h
+files=uml/actor.h,uml/actorwidgetdata.h,uml/actorwidget.h,uml/associationwidgetdata.h,uml/associationwidgetdatalist.h,uml/associationwidget.h,uml/assocrules.h,uml/attribute.h,uml/concept.h,uml/conceptwidgetdata.h,uml/conceptwidget.h,uml/docwindow.h,uml/floatingtextdata.h,uml/floatingtext.h,uml/infowidget.h,uml/kstartuplogo.h,uml/linepath.h,uml/listpopupmenu.h,uml/messagewidgetdata.h,uml/messagewidget.h,uml/actor.cpp,uml/actorwidget.cpp,uml/actorwidgetdata.cpp,uml/associationwidget.cpp,uml/associationwidgetdata.cpp,uml/assocrules.cpp,uml/attribute.cpp,uml/concept.cpp,uml/conceptwidget.cpp,uml/conceptwidgetdata.cpp,uml/docwindow.cpp,uml/floatingtext.cpp,uml/floatingtextdata.cpp,uml/infowidget.cpp,uml/kstartuplogo.cpp,uml/linepath.cpp,uml/listpopupmenu.cpp,uml/main.cpp,uml/messagewidget.cpp,uml/messagewidgetdata.cpp,uml/notewidget.cpp,uml/notewidgetdata.cpp,uml/notewidgetdata.h,uml/notewidget.h,uml/objectwidget.cpp,uml/objectwidgetdata.cpp,uml/objectwidgetdata.h,uml/objectwidget.h,uml/operation.cpp,uml/operation.h,uml/statewidget.cpp,uml/statewidgetdata.cpp,uml/statewidgetdata.h,uml/statewidget.h,uml/uml.cpp,uml/umldoc.cpp,uml/umldoc.h,uml/uml.h,uml/umlnamespace.cpp,uml/umlnamespace.h,uml/umlobject.cpp,uml/umlobject.h,uml/umlobjectlist.h,uml/umlviewcanvas.cpp,uml/umlviewcanvas.h,uml/umlview.cpp,uml/umlviewdata.cpp,uml/umlviewdata.h,uml/umlview.h,uml/umlviewlist.h,uml/umlwidget.cpp,uml/umlwidgetdata.cpp,uml/umlwidgetdata.h,uml/umlwidget.h,uml/umlwidgetlist.h,uml/usecase.cpp,uml/usecase.h,uml/usecasewidget.cpp,uml/usecasewidgetdata.cpp,uml/usecasewidgetdata.h,uml/usecasewidget.h,uml/wortdetoolbar.cpp,uml/wortdetoolbar.h,uml/hi16-app-uml.png,uml/hi32-app-uml.png,uml/lo16-app-uml.png,uml/lo32-app-uml.png,uml/tips,uml/uml.desktop,uml/umlui.rc,uml/x-uml.desktop,uml/activitywidgetdata.cpp,uml/activitywidgetdata.h,uml/activitywidget.cpp,uml/activitywidget.h,uml/codegenerator.cpp,uml/codegenerator.h,uml/seqlinewidget.cpp,uml/seqlinewidget.h,uml/umllistview.cpp,uml/umllistview.h,uml/umllistviewitem.cpp,uml/umllistviewitem.h,uml/umllistviewitemdata.cpp,uml/umllistviewitemdata.h,uml/umllistviewitemdatalist.h,uml/classimport.cpp,uml/classimport.h,uml/umllistviewitemlist.h
 sub_dirs=classparser,clipboard,dialogs,pics,codegenerators,headings
 type=prog_main
 
@@ -2135,13 +2135,13 @@ install=false
 install_location=
 type=HEADER
 
-[uml/worktoolbar.cpp]
+[uml/wortdetoolbar.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[uml/worktoolbar.h]
+[uml/wortdetoolbar.h]
 dist=true
 install=false
 install_location=