diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp
index bb44a97..867ef75 100644
--- a/k3bsetup/k3bsetup2.cpp
+++ b/k3bsetup/k3bsetup2.cpp
@@ -26,12 +26,12 @@
 #include <tqscrollview.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 #include <tdelistview.h>
 #include <keditlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index 9007455..a97b9aa 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -20,7 +20,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index 20d92e5..1808584 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp
index 2f719c7..6f984f4 100644
--- a/libk3b/cddb/k3bcddblocalquery.cpp
+++ b/libk3b/cddb/k3bcddblocalquery.cpp
@@ -21,7 +21,7 @@
 #include <tqtextstream.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp
index e364e3c..bf48018 100644
--- a/libk3b/cddb/k3bcddblocalsubmit.cpp
+++ b/libk3b/cddb/k3bcddblocalsubmit.cpp
@@ -22,7 +22,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* parent, const char* name )
diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
index b49283e..4e8787b 100644
--- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp
+++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp
index 3961109..ed3a8f9 100644
--- a/libk3b/cddb/k3bcddbpquery.cpp
+++ b/libk3b/cddb/k3bcddbpquery.cpp
@@ -19,7 +19,7 @@
 #include <tqsocket.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index e8ace1d..d6d65d1 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #include <tqtextstream.h>
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 40b4cbf..898b526 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -31,7 +31,7 @@
 #include <k3bglobalsettings.h>
 #include <k3bpluginmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <kstandarddirs.h>
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index f1ac8f5..e072571 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -26,8 +26,8 @@
 #include <k3bhalconnection.h>
 
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp
index 02697d6..0e169b1 100644
--- a/libk3b/core/k3bjob.cpp
+++ b/libk3b/core/k3bjob.cpp
@@ -18,7 +18,7 @@
 #include <k3bglobals.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 
 #include <tqstringlist.h>
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
index c0c07d5..62860d8 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
@@ -26,7 +26,7 @@
 #include <k3bthreadjob.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class K3bAudioCueFileWritingJob::AnalyserThread : public K3bThread
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp
index f85e138..1af528b 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.cpp
+++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp
@@ -24,7 +24,7 @@
 #include <k3bcore.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <unistd.h>
 
diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp
index 1ba15ce..4f9f103 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.cpp
+++ b/libk3b/jobs/k3bbinimagewritingjob.cpp
@@ -22,7 +22,7 @@
 #include <k3bglobals.h>
 #include <k3bexternalbinmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp
index d023b58..4d8212e 100644
--- a/libk3b/jobs/k3bblankingjob.cpp
+++ b/libk3b/jobs/k3bblankingjob.cpp
@@ -22,7 +22,7 @@
 #include <k3bdevicehandler.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <kdebug.h>
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 91bcbcc..d60228f 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -35,9 +35,9 @@
 
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <tdeio/global.h>
diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp
index 889993b..393a13c 100644
--- a/libk3b/jobs/k3bcdda2wavreader.cpp
+++ b/libk3b/jobs/k3bcdda2wavreader.cpp
@@ -22,7 +22,7 @@
 #include <k3bprocess.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvaluevector.h>
 #include <tqregexp.h>
diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp
index d11ebaa..aa3230e 100644
--- a/libk3b/jobs/k3bclonejob.cpp
+++ b/libk3b/jobs/k3bclonejob.cpp
@@ -25,7 +25,7 @@
 #include <k3bclonetocreader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 873a1b8..fc74e46 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -22,7 +22,7 @@
 #include <k3bthread.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index 343f413..69eb8d5 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -33,7 +33,7 @@
 #include <k3bverificationjob.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 #include <tqfile.h>
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp
index e0d177f..29a17ee 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -26,7 +26,7 @@
 #include <k3bversion.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqvaluelist.h>
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index 59a07c9..5d3ef9b 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -32,8 +32,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 
 #include <tqstring.h>
diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp
index afb9c9d..8f7ef80 100644
--- a/libk3b/jobs/k3breadcdreader.cpp
+++ b/libk3b/jobs/k3breadcdreader.cpp
@@ -25,7 +25,7 @@
 #include <k3bglobals.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqregexp.h>
diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp
index b66ac89..3555692 100644
--- a/libk3b/jobs/k3bverificationjob.cpp
+++ b/libk3b/jobs/k3bverificationjob.cpp
@@ -24,7 +24,7 @@
 #include <k3biso9660.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
index 67832b9..ddefaca 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index a0a2f05..06f6e30 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp
index 353a3f1..8578551 100644
--- a/libk3b/plugin/k3baudioserver.cpp
+++ b/libk3b/plugin/k3baudioserver.cpp
@@ -23,8 +23,8 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <k3bthread.h>
 
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index ab415fa..dde5e9f 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -19,8 +19,8 @@
 
 #include <klibloader.h>
 #include <kinstance.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 /**
  * Template based on KGenericFactory. This is just here to avoid using the TQStringList args parameter
diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index 2e3724d..a461f51 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -20,11 +20,11 @@
 
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 
 #include <tqptrlist.h>
diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
index 6ca0cd5..e4d2e0a 100644
--- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
@@ -25,7 +25,7 @@
 #include <k3bdeviceselectiondialog.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp
index 56293f1..c639574 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
@@ -44,9 +44,9 @@
 #include <kprocess.h>
 #include <kurl.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp
index 6917fe6..6d2449c 100644
--- a/libk3b/projects/audiocd/k3baudioimager.cpp
+++ b/libk3b/projects/audiocd/k3baudioimager.cpp
@@ -21,7 +21,7 @@
 #include <k3bthread.h>
 #include <k3bwavefilewriter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp
index 2415962..8f59744 100644
--- a/libk3b/projects/audiocd/k3baudiojob.cpp
+++ b/libk3b/projects/audiocd/k3baudiojob.cpp
@@ -42,8 +42,8 @@
 #include <tqvaluevector.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <kstringhandler.h>
 
 
diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
index 2f8713b..3c07347 100644
--- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
+++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
@@ -25,7 +25,7 @@
 #include <k3bthread.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdatetime.h>
 
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index 89fdb99..0416f38 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* parent, const char* name )
diff --git a/libk3b/projects/audiocd/k3baudiozerodata.cpp b/libk3b/projects/audiocd/k3baudiozerodata.cpp
index aff0cf9..5ff4a32 100644
--- a/libk3b/projects/audiocd/k3baudiozerodata.cpp
+++ b/libk3b/projects/audiocd/k3baudiozerodata.cpp
@@ -16,7 +16,7 @@
 #include "k3baudiozerodata.h"
 #include "k3baudiotrack.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <string.h>
 
diff --git a/libk3b/projects/datacd/k3bbootitem.cpp b/libk3b/projects/datacd/k3bbootitem.cpp
index f5a8725..768ca92 100644
--- a/libk3b/projects/datacd/k3bbootitem.cpp
+++ b/libk3b/projects/datacd/k3bbootitem.cpp
@@ -17,7 +17,7 @@
 #include "k3bdatadoc.h"
 #include "k3bdiritem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqptrlist.h>
 
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index c0d1aa6..debc574 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -46,11 +46,11 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprogress.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index d3f6049..356ab17 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -37,9 +37,9 @@
 
 #include <kprocess.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
index 26a2b5b..a6b9e88 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
@@ -23,7 +23,7 @@
 #include <k3bfileitem.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include <tqfile.h>
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index 6420023..2f750c5 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -32,8 +32,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp
index bd5167e..88f7d82 100644
--- a/libk3b/projects/datacd/k3bisooptions.cpp
+++ b/libk3b/projects/datacd/k3bisooptions.cpp
@@ -19,7 +19,7 @@
 #include <k3bglobals.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 
 
diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp
index 7b3270c..d367ccc 100644
--- a/libk3b/projects/datacd/k3bmkisofshandler.cpp
+++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp
@@ -20,7 +20,7 @@
 #include <k3bjob.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index e81c98b..cfbe58b 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -23,7 +23,7 @@
 #include <k3bglobals.h>
 #include <k3biso9660.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kdebug.h>
 
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
index cefafdf..058e195 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
@@ -26,7 +26,7 @@
 #include <k3bversion.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqvaluelist.h>
diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp
index e39cf84..c8cec08 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdjob.cpp
@@ -29,7 +29,7 @@
 #include <k3biso9660.h>
 #include <k3bmsinfofetcher.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 
diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp
index c245e04..7119a0e 100644
--- a/libk3b/projects/datadvd/k3bdvdview.cpp
+++ b/libk3b/projects/datadvd/k3bdvdview.cpp
@@ -19,7 +19,7 @@
 #include <k3bfillstatusdisplay.h>
 #include <k3bdatafileview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name )
diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp
index e911a2f..26bf989 100644
--- a/libk3b/projects/k3babstractwriter.cpp
+++ b/libk3b/projects/k3babstractwriter.cpp
@@ -21,8 +21,8 @@
 #include <k3bdevicehandler.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 
 
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 864fcae..863e2a8 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -38,11 +38,11 @@
 #include <tqsocket.h>
 #include <tqsocketdevice.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp
index 15047a1..ce29051 100644
--- a/libk3b/projects/k3bcdrecordwriter.cpp
+++ b/libk3b/projects/k3bcdrecordwriter.cpp
@@ -36,9 +36,9 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 
diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp
index ee70921..2ae4880 100644
--- a/libk3b/projects/k3bdoc.cpp
+++ b/libk3b/projects/k3bdoc.cpp
@@ -20,7 +20,7 @@
 #include <tqdom.h>
 
 // include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp
index 46dc75a..1079533 100644
--- a/libk3b/projects/k3bdvdrecordwriter.cpp
+++ b/libk3b/projects/k3bdvdrecordwriter.cpp
@@ -23,7 +23,7 @@
 #include <k3bglobals.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* parent, const char* name )
diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp
index edaaa40..e25e758 100644
--- a/libk3b/projects/k3bgrowisofshandler.cpp
+++ b/libk3b/projects/k3bgrowisofshandler.cpp
@@ -21,8 +21,8 @@
 #include <k3bdevice.h>
 #include <k3bdevicehandler.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp
index f8b64a3..ebb26a4 100644
--- a/libk3b/projects/k3bgrowisofswriter.cpp
+++ b/libk3b/projects/k3bgrowisofswriter.cpp
@@ -29,9 +29,9 @@
 #include <k3bglobalsettings.h>
 #include <k3bdeviceglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqvaluelist.h>
 #include <tqfile.h>
diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp
index 8e689c0..696ad4c 100644
--- a/libk3b/projects/k3bpipebuffer.cpp
+++ b/libk3b/projects/k3bpipebuffer.cpp
@@ -17,7 +17,7 @@
 
 #include <k3bthread.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <errno.h>
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
index b5d4451..1c7533e 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
@@ -24,10 +24,10 @@
 #include <tqfileinfo.h>
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index 885aa92..7d5858e 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -48,8 +48,8 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/global.h>
 #include <kstringhandler.h>
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp
index 7914b11..5379ba1 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp
@@ -22,11 +22,11 @@
 #include <k3bfileitem.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
index f4c9f2d..55d8be5 100644
--- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
@@ -26,9 +26,9 @@
 #include <k3bexternalbinmanager.h>
 #include <k3bisoimager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 
 #include <tqtextstream.h>
diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp
index 70a639d..837fe0c 100644
--- a/libk3b/projects/movixcd/k3bmovixjob.cpp
+++ b/libk3b/projects/movixcd/k3bmovixjob.cpp
@@ -23,7 +23,7 @@
 #include <k3bdatajob.h>
 #include <k3bdevice.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp
index 24f7a98..aa5b8a5 100644
--- a/libk3b/projects/movixcd/k3bmovixprogram.cpp
+++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp
@@ -19,7 +19,7 @@
 #include <k3bprocess.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
index 9c12741..dfe8061 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
+++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
@@ -23,7 +23,7 @@
 #include <k3bdvdjob.h>
 #include <k3bdevice.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index e052a6c..eb40f16 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -27,9 +27,9 @@
 #include <kprocess.h>
 #include <kurl.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index e4ea8ee..d16e7e0 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -13,11 +13,11 @@
 * See the file "COPYING" for the exact licensing terms.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 
 #include <tqstring.h>
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 0beaaa7..b0d60cf 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -17,7 +17,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <k3bcore.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // TQt Includes
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index b736af1..2e92c4f 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // K3b Includes
 #include "k3bvcdtrack.h"
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h
index 6368dec..aa1a189 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.h
+++ b/libk3b/projects/videocd/k3bvcdxmlview.h
@@ -19,7 +19,7 @@
 
 #include <tqstring.h>
 #include <tqdom.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <k3bvcddoc.h>
 
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
index 6192024..a4550f2 100644
--- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
+++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
@@ -14,7 +14,7 @@
 */
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // k3b includes
 #include "k3bmpeginfo.h"
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
index 9d72448..2cf4965 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
@@ -20,11 +20,11 @@
 #include <k3bprocess.h>
 #include <k3bglobals.h>
 
-#include <ktempfile.h>
-#include <kglobal.h>
+#include <tdetempfile.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtextstream.h>
 #include <tqdir.h>
diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
index 42082d1..04728b5 100644
--- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
@@ -23,8 +23,8 @@
 #include <k3bgrowisofswriter.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index 929e1f1..f9e7bc3 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -18,7 +18,7 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 K3bBusyWidget::K3bBusyWidget( TQWidget* parent, const char* name )
diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp
index 8d2870c..0ca6075 100644
--- a/libk3b/tools/k3bdevicecombobox.cpp
+++ b/libk3b/tools/k3bdevicecombobox.cpp
@@ -18,7 +18,7 @@
 #include <k3bdevicemanager.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmap.h>
 #include <tqptrvector.h>
diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp
index 0c6c3f4..f457adb 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.cpp
+++ b/libk3b/tools/k3bdeviceselectiondialog.cpp
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqframe.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class K3bDeviceSelectionDialog::Private
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index 131e0ff..646e38a 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -21,7 +21,7 @@
 #include <k3bglobals.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqfileinfo.h>
 #include <tqdir.h>
diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp
index 725de5a..a4d20d4 100644
--- a/libk3b/tools/k3bintvalidator.cpp
+++ b/libk3b/tools/k3bintvalidator.cpp
@@ -19,8 +19,8 @@
 
 #include "k3bintvalidator.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index 394f94d..39eff96 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -21,7 +21,7 @@
 #include <k3bfilesplitter.h>
 
 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 9c7dcc5..c502d95 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -45,7 +45,7 @@ public:
 };
 
 
-// from kmessagebox.cpp
+// from tdemessagebox.cpp
 static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
 {
   TQString icon_name;
diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp
index fe7b2af..f510622 100644
--- a/libk3b/tools/k3bprogressdialog.cpp
+++ b/libk3b/tools/k3bprogressdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqframe.h>
 #include <tqwidgetstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index a80374d..780a338 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -19,7 +19,7 @@
 #include <tqpopupmenu.h>
 #include <tqevent.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 36c0a63..70edeae 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -19,7 +19,7 @@
 #include <tqstylesheet.h>
 #include <tqsimplerichtext.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 static TQString qrichtextify( const TQString& text )
 {
diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp
index c8fee1b..87f3542 100644
--- a/libk3b/tools/k3bstdguiitems.cpp
+++ b/libk3b/tools/k3bstdguiitems.cpp
@@ -22,7 +22,7 @@
 #include <tqframe.h>
 #include <tqpalette.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* parent, const char* name )
diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp
index 0136f91..55d8491 100644
--- a/libk3b/tools/k3btempfile.cpp
+++ b/libk3b/tools/k3btempfile.cpp
@@ -15,7 +15,7 @@
 
 #include "k3btempfile.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 
diff --git a/libk3b/tools/k3btempfile.h b/libk3b/tools/k3btempfile.h
index 4b18164..03dc75f 100644
--- a/libk3b/tools/k3btempfile.h
+++ b/libk3b/tools/k3btempfile.h
@@ -16,7 +16,7 @@
 #ifndef _K3B_TEMP_FILE_H_
 #define _K3B_TEMP_FILE_H_
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <k3b_export.h>
 
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index f9b72ff..cdc26b9 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -19,7 +19,7 @@
 #include <tqpainter.h>
 #include <tqevent.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 
diff --git a/libk3b/videodvd/k3bvideodvd.cpp b/libk3b/videodvd/k3bvideodvd.cpp
index f435393..e0b763e 100644
--- a/libk3b/videodvd/k3bvideodvd.cpp
+++ b/libk3b/videodvd/k3bvideodvd.cpp
@@ -24,7 +24,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <inttypes.h> // needed by dvdreads headers
 #include <dvdread/dvd_reader.h>
diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp
index 4d36916..f334724 100644
--- a/libk3bdevice/k3bdeviceglobals.cpp
+++ b/libk3bdevice/k3bdeviceglobals.cpp
@@ -17,7 +17,7 @@
 #include "k3bdiskinfo.h"
 #include "k3bdevice.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <k3bdebug.h>
 
 #include <tqstringlist.h>
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index ab31a89..3677f67 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -32,7 +32,7 @@
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <iostream>
 #include <limits.h>
diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp
index 0709d28..0a67c6e 100644
--- a/libk3bdevice/k3bdiskinfo.cpp
+++ b/libk3bdevice/k3bdiskinfo.cpp
@@ -18,7 +18,7 @@
 
 #include <k3bmsf.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <k3bdebug.h>
 #include <tdeio/global.h>
 
diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp
index dbb19a3..ca12457 100644
--- a/libk3bdevice/k3bhalconnection.cpp
+++ b/libk3bdevice/k3bhalconnection.cpp
@@ -17,7 +17,7 @@
 #include "k3bdevice.h"
 
 #include <k3bdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
index afacdf6..8b923f5 100644
--- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
+++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index d4b7778..bb2253a 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -24,7 +24,7 @@ extern "C" {
 
 #include <string.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #if LIBAVFORMAT_BUILD < 4629
diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp
index 7177071..671bf4c 100644
--- a/plugins/decoder/flac/k3bflacdecoder.cpp
+++ b/plugins/decoder/flac/k3bflacdecoder.cpp
@@ -23,7 +23,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <string.h>
 #include <math.h>
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
index 8103b44..ad094a6 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 
diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp
index 951caa2..a28e24b 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.cpp
+++ b/plugins/decoder/mp3/k3bmaddecoder.cpp
@@ -33,7 +33,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 #include <tqfile.h>
diff --git a/plugins/decoder/musepack/k3bmpcdecoder.cpp b/plugins/decoder/musepack/k3bmpcdecoder.cpp
index 84dd9d7..3dcbaf3 100644
--- a/plugins/decoder/musepack/k3bmpcdecoder.cpp
+++ b/plugins/decoder/musepack/k3bmpcdecoder.cpp
@@ -20,7 +20,7 @@
 
 #include <k3bpluginfactory.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K_EXPORT_COMPONENT_FACTORY( libk3bmpcdecoder, K3bPluginFactory<K3bMpcDecoderFactory>( "libk3bmpcdecoder" ) )
diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp
index 717c1a2..67d7ce9 100644
--- a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp
+++ b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp
@@ -24,7 +24,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/plugins/decoder/wave/k3bwavedecoder.cpp b/plugins/decoder/wave/k3bwavedecoder.cpp
index 28f873a..cf27610 100644
--- a/plugins/decoder/wave/k3bwavedecoder.cpp
+++ b/plugins/decoder/wave/k3bwavedecoder.cpp
@@ -23,7 +23,7 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index a21b7e2..10fb35b 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqregexp.h>
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index 7384ba6..0f89798 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -23,9 +23,9 @@
 #include <tqpushbutton.h>
 
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp
index c201465..127422b 100644
--- a/plugins/encoder/lame/k3blameencoder.cpp
+++ b/plugins/encoder/lame/k3blameencoder.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 #include <k3bpluginfactory.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
index bcf3903..c2ce5b3 100644
--- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp
+++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
@@ -21,7 +21,7 @@
 #include <k3bcore.h>
 #include <k3bpluginfactory.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <knuminput.h>
diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp
index 9321501..38f147d 100644
--- a/plugins/encoder/skeleton.cpp
+++ b/plugins/encoder/skeleton.cpp
@@ -17,7 +17,7 @@
 
 #include "k3b<name>encoder.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index b0f734d..d91502f 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfileinfo.h>
 #include <tqfile.h>
diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
index 47dfa44..aa708d2 100644
--- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
+++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
@@ -27,8 +27,8 @@
 
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefilemetainfo.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
index 9eff938..21b620a 100644
--- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
+++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqstring.h>
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 15c0a78..56159c1 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -37,10 +37,10 @@
 #include <kkeydialog.h>
 // include files for KDE
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <klineeditdlg.h>
@@ -50,7 +50,7 @@
 #include <kurllabel.h>
 #include <tdetoolbar.h>
 #include <kstatusbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdialog.h>
 #include <kedittoolbar.h>
 #include <ksystemtray.h>
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index f9c5e33..2079ee0 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -23,10 +23,10 @@
 
 #include <tdeaction.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdepopupmenu.h>
 
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index 57749e5..db82043 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -45,14 +45,14 @@
 #include <k3bjob.h>
 
 #include <ktip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <kstandarddirs.h>
-#include <kstartupinfo.h>
-#include <kmessagebox.h>
+#include <tdestartupinfo.h>
+#include <tdemessagebox.h>
 
 #include <tqguardedptr.h>
 #include <tqtimer.h>
diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp
index b49626e..414bf01 100644
--- a/src/k3baudioplayer.cpp
+++ b/src/k3baudioplayer.cpp
@@ -35,7 +35,7 @@
 #include <kurldrag.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeaction.h>
 
diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp
index a143610..9ce456d 100644
--- a/src/k3bburnprogressdialog.cpp
+++ b/src/k3bburnprogressdialog.cpp
@@ -23,9 +23,9 @@
 #include "k3bthemedlabel.h"
 #include <k3bthememanager.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp
index 1cb4ab3..7450d07 100644
--- a/src/k3bdatamodewidget.cpp
+++ b/src/k3bdatamodewidget.cpp
@@ -17,7 +17,7 @@
 #include "k3bdatamodewidget.h"
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqwhatsthis.h>
diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp
index 6b34e3b..e0a5e66 100644
--- a/src/k3bdebuggingoutputdialog.cpp
+++ b/src/k3bdebuggingoutputdialog.cpp
@@ -27,12 +27,12 @@
 #include <tqfile.h>
 #include <tqclipboard.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* parent )
diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp
index 1af8b41..614c512 100644
--- a/src/k3bdebuggingoutputfile.cpp
+++ b/src/k3bdebuggingoutputfile.cpp
@@ -23,7 +23,7 @@
 #include <k3bglobals.h>
 
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 #include <tqtextstream.h>
diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h
index db6254b..b7cc5df 100644
--- a/src/k3bdiroperator.h
+++ b/src/k3bdiroperator.h
@@ -17,7 +17,7 @@
 #ifndef K3BDIROPERATOR_H
 #define K3BDIROPERATOR_H
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kbookmarkmanager.h>
 
 class TQIconViewItem;
diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index 22ef018..35cbe1d 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -64,7 +64,7 @@
 #include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/file.h>
 #include <tdeio/global.h>
@@ -74,7 +74,7 @@
 #include <kcombobox.h>
 #include <tdefiletreeview.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 7de833b..8801c39 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index b8f6d38..f763f72 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -37,10 +37,10 @@
 #include <tqeventloop.h>
 #include <tqfont.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 #include <knotifyclient.h>
 
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index 7e523da..b6f9718 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -26,14 +26,14 @@
 #include <k3bglobals.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
 #include <tdeio/global.h>
 #include <tdefileitem.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqdir.h>
 #include <tqevent.h>
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index b4add44..d82e611 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -36,9 +36,9 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <tdefilefiltercombo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdirlister.h>
 #include <kprogress.h>
 
diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp
index 818eb82..4234f4b 100644
--- a/src/k3bfirstrun.cpp
+++ b/src/k3bfirstrun.cpp
@@ -18,7 +18,7 @@
 #include "k3bservicemenuinstaller.h"
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index c3276b4..eafc637 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpainter.h>
 #include <tqtooltip.h>
diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index be88cef..6b1f09c 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -38,14 +38,14 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
 
 
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index 84770bd..77e0b76 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -53,13 +53,13 @@
 #include <tqapplication.h>
 
 #include <kprogress.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <knotifyclient.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp
index 6b61023..ee035e0 100644
--- a/src/k3bjobprogressosd.cpp
+++ b/src/k3bjobprogressosd.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kcursor.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqpixmap.h>
diff --git a/src/k3blsofwrapperdialog.cpp b/src/k3blsofwrapperdialog.cpp
index 6ffc6f5..ab18849 100644
--- a/src/k3blsofwrapperdialog.cpp
+++ b/src/k3blsofwrapperdialog.cpp
@@ -20,8 +20,8 @@
 #include <k3bdevice.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 
diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp
index ae9d06c..c28008d 100644
--- a/src/k3bmediacache.cpp
+++ b/src/k3bmediacache.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqthread.h>
 #include <tqmutex.h>
diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp
index 738e44f..8412b59 100644
--- a/src/k3bmediaselectioncombobox.cpp
+++ b/src/k3bmediaselectioncombobox.cpp
@@ -25,7 +25,7 @@
 #include <k3bcdtext.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfont.h>
 #include <tqmap.h>
diff --git a/src/k3bmediaselectiondialog.cpp b/src/k3bmediaselectiondialog.cpp
index 7e1bf63..5b3e39a 100644
--- a/src/k3bmediaselectiondialog.cpp
+++ b/src/k3bmediaselectiondialog.cpp
@@ -18,7 +18,7 @@
 #include "k3bmediacache.h"
 #include "k3bapplication.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp
index 8755185..47d3655 100644
--- a/src/k3bmedium.cpp
+++ b/src/k3bmedium.cpp
@@ -23,7 +23,7 @@
 #include <k3biso9660.h>
 #include <k3biso9660backend.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 /**
diff --git a/src/k3bmusicbrainz.cpp b/src/k3bmusicbrainz.cpp
index a2b0f54..428d03e 100644
--- a/src/k3bmusicbrainz.cpp
+++ b/src/k3bmusicbrainz.cpp
@@ -21,7 +21,7 @@
 
 #include <musicbrainz/mb_c.h>
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp
index 8e669c0..6270ae1 100644
--- a/src/k3bpassivepopup.cpp
+++ b/src/k3bpassivepopup.cpp
@@ -22,7 +22,7 @@
 #include <k3bapplication.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kpushbutton.h>
diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp
index b41820b..5822ed8 100644
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
@@ -50,8 +50,8 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 class K3bProjectManager::Private
diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp
index 2507feb..b97d442 100644
--- a/src/k3bprojecttabwidget.cpp
+++ b/src/k3bprojecttabwidget.cpp
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqevent.h>
 #include <tqtabbar.h>
diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp
index c2938bf..79eb250 100644
--- a/src/k3bservicemenuinstaller.cpp
+++ b/src/k3bservicemenuinstaller.cpp
@@ -15,10 +15,10 @@
 
 #include "k3bservicemenuinstaller.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
 
diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp
index eeef7a3..c785410 100644
--- a/src/k3bsidepanel.cpp
+++ b/src/k3bsidepanel.cpp
@@ -17,7 +17,7 @@
 #include "k3b.h"
 #include "k3bfiletreeview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index c84ab73..d23e75a 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -29,7 +29,7 @@
 #include <k3bview.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 9375190..598dbe2 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -40,14 +40,14 @@
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #ifdef HAVE_ICONV_H
 #include <langinfo.h>
diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
index 22b2750..53b322b 100644
--- a/src/k3btempdirselectionwidget.cpp
+++ b/src/k3btempdirselectionwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqfileinfo.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp
index 82e33ce..f0001d0 100644
--- a/src/k3bthememanager.cpp
+++ b/src/k3bthememanager.cpp
@@ -18,10 +18,10 @@
 #include <k3bversion.h>
 
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpixmap.h>
 #include <tqfile.h>
diff --git a/src/k3btrm.cpp b/src/k3btrm.cpp
index 1843471..2f4aa27 100644
--- a/src/k3btrm.cpp
+++ b/src/k3btrm.cpp
@@ -21,7 +21,7 @@
 #include "musicbrainz/mb_c.h"
 
 #include <kdebug.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kurl.h>
 
 
diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp
index 4f72e63..99011d2 100644
--- a/src/k3bwelcomewidget.cpp
+++ b/src/k3bwelcomewidget.cpp
@@ -34,11 +34,11 @@
 
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp
index 6095ee3..981d1fd 100644
--- a/src/k3bwriterselectionwidget.cpp
+++ b/src/k3bwriterselectionwidget.cpp
@@ -24,11 +24,11 @@
 #include <k3bglobals.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 
diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp
index 3097e92..887741f 100644
--- a/src/k3bwritingmodewidget.cpp
+++ b/src/k3bwritingmodewidget.cpp
@@ -19,7 +19,7 @@
 
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqtooltip.h>
diff --git a/src/main.cpp b/src/main.cpp
index dfb9037..83ff784 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,9 +16,9 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kstdguiitem.h>
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index 49534f1..0594f1c 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -26,8 +26,8 @@
 #include <k3bcore.h>
 #include <k3bemptydiscwaiter.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index dd8bec2..ae35f47 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -36,10 +36,10 @@
 #include <k3bmediacache.h>
 
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 60e55c0..6ea61c2 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -42,8 +42,8 @@
 #include <k3bcdtext.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <kstdguiitem.h>
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index a7de882..b9a1459 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -45,13 +45,13 @@
 #include <tqhbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 
 
 
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index 329e6bb..d6fc2af 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -24,8 +24,8 @@
 #include <k3bwritingmodewidget.h>
 #include <k3bjobprogressdialog.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index d4481d9..915e300 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -33,8 +33,8 @@
 #include <k3bmediacache.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <kstdguiitem.h>
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 02d680c..6c4079e 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -35,7 +35,7 @@
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index fa8f73d..e527481 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -34,7 +34,7 @@
 #include <krun.h>
 #include <tdelistview.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp
index 6bbb4b0..6fe722b 100644
--- a/src/option/k3bdeviceoptiontab.cpp
+++ b/src/option/k3bdeviceoptiontab.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index acaf3f2..d4d3cd7 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -21,10 +21,10 @@
 #include <k3blistview.h>
 
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp
index d34b3a0..3cf5607 100644
--- a/src/option/k3bexternalbinoptiontab.cpp
+++ b/src/option/k3bexternalbinoptiontab.cpp
@@ -18,9 +18,9 @@
 #include <k3bexternalbinmanager.h>
 #include "k3bexternalbinwidget.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 200de08..e79ac32 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -35,10 +35,10 @@
 
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditlistbox.h>
 #include <tdelistview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
 
 
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 49c1f6c..7176364 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -29,11 +29,11 @@
 #include <tqradiobutton.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
 
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 54e3f45..de0f57b 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp
index d367584..8f214ee 100644
--- a/src/option/k3bpluginoptiontab.cpp
+++ b/src/option/k3bpluginoptiontab.cpp
@@ -22,12 +22,12 @@
 #include <k3blistview.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
 
 #include <tqstringlist.h>
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index 515c4f0..adb27f4 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -19,9 +19,9 @@
 #include "k3bthememanager.h"
 
 #include <k3bapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tdelistview.h>
 #include <tdeio/global.h>
diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp
index 8274f3b..8e4fff8 100644
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
@@ -49,10 +49,10 @@
 #include <tqhbox.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, const char *name, bool modal )
diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp
index a1dff26..6b8dda6 100644
--- a/src/projects/k3baudiocdtextwidget.cpp
+++ b/src/projects/k3baudiocdtextwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqgroupbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 
diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp
index 438cd83..84b943b 100644
--- a/src/projects/k3baudiodatasourceeditwidget.cpp
+++ b/src/projects/k3baudiodatasourceeditwidget.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 
diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp
index 42fe2ce..30ff9df 100644
--- a/src/projects/k3baudiotrackaddingdialog.cpp
+++ b/src/projects/k3baudiotrackaddingdialog.cpp
@@ -25,9 +25,9 @@
 #include <k3bthreadjob.h>
 #include <k3bcuefileparser.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp
index 8e20636..7871b1e 100644
--- a/src/projects/k3baudiotrackdialog.cpp
+++ b/src/projects/k3baudiotrackdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index 57e7ebb..8cb7633 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -19,7 +19,7 @@
 #include <k3baudioserver.h>
 
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqslider.h>
 #include <tqtimer.h>
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index f0c7fcb..3ba799b 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -20,7 +20,7 @@
 #include <k3bmsf.h>
 #include <k3bmsfedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index 3e21a54..07c6027 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -25,11 +25,11 @@
 #include <k3baudiofile.h>
 #include <k3bpassivepopup.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index b24c5f3..0786f70 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -52,12 +52,12 @@
 
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 
 
diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp
index 76f0c97..9c9860e 100644
--- a/src/projects/k3baudiotrackwidget.cpp
+++ b/src/projects/k3baudiotrackwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqtabwidget.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index de903e3..1c226a3 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -42,10 +42,10 @@
 #include <tqstring.h>
 
 // KDE-includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 
diff --git a/src/projects/k3bbootimagedialog.cpp b/src/projects/k3bbootimagedialog.cpp
index a722736..88c40af 100644
--- a/src/projects/k3bbootimagedialog.cpp
+++ b/src/projects/k3bbootimagedialog.cpp
@@ -17,7 +17,7 @@
 #include "k3bbootimagedialog.h"
 #include "k3bbootimageview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bBootImageDialog::K3bBootImageDialog( K3bDataDoc* doc, 
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index 7b3e2f4..85c00bd 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -19,11 +19,11 @@
 #include "k3bbootitem.h"
 #include <k3bintvalidator.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 #include <tqstring.h>
diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp
index be1cb17..cd8af5e 100644
--- a/src/projects/k3bdataadvancedimagesettingswidget.cpp
+++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelistview.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp
index 3df6c2a..6b0abdd 100644
--- a/src/projects/k3bdataburndialog.cpp
+++ b/src/projects/k3bdataburndialog.cpp
@@ -51,9 +51,9 @@
 #include <tqspinbox.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index cb35a18..1aa154c 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -30,7 +30,7 @@
 #include <tqheader.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index d703d2f..b928256 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -37,7 +37,7 @@
 #include <tqheader.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp
index ced699c..08cda53 100644
--- a/src/projects/k3bdataimagesettingswidget.cpp
+++ b/src/projects/k3bdataimagesettingswidget.cpp
@@ -28,8 +28,8 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 
diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp
index aa038eb..1c5f3d7 100644
--- a/src/projects/k3bdatamultisessioncombobox.cpp
+++ b/src/projects/k3bdatamultisessioncombobox.cpp
@@ -15,7 +15,7 @@
 
 #include "k3bdatamultisessioncombobox.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqwhatsthis.h>
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index 183f47c..970d607 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -33,7 +33,7 @@
 
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <tdeio/global.h>
diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp
index bf5d263..6ccaec2 100644
--- a/src/projects/k3bdatasessionimportdialog.cpp
+++ b/src/projects/k3bdatasessionimportdialog.cpp
@@ -26,8 +26,8 @@
 #include <tqcursor.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* parent )
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 9bf28db..b110a6d 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -41,12 +41,12 @@
 #include <k3bsignalwaiter.h>
 #include <k3bexternalbinmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstdguiitem.h>
 #include <tdeconfig.h>
 #include <ksqueezedtextlabel.h>
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index 63584f2..89653be 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -31,12 +31,12 @@
 #include <k3btoolbox.h>
 #include <k3bvalidators.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <kdialogbase.h>
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index 1534363..fb42b67 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeio/global.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <kpixmapeffect.h>
diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp
index decfca8..3fccbed 100644
--- a/src/projects/k3bdvdburndialog.cpp
+++ b/src/projects/k3bdvdburndialog.cpp
@@ -29,9 +29,9 @@
 #include <k3bglobalsettings.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bdvdview.cpp b/src/projects/k3bdvdview.cpp
index c245e04..7119a0e 100644
--- a/src/projects/k3bdvdview.cpp
+++ b/src/projects/k3bdvdview.cpp
@@ -19,7 +19,7 @@
 #include <k3bfillstatusdisplay.h>
 #include <k3bdatafileview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name )
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index b2d2e2a..fca7f89 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -41,14 +41,14 @@
 
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kpixmapeffect.h>
 
 
diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp
index b956e67..43b798d 100644
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
@@ -52,11 +52,11 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, const char *name, bool modal )
diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp
index dd644b5..f279054 100644
--- a/src/projects/k3bmixeddirtreeview.cpp
+++ b/src/projects/k3bmixeddirtreeview.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class K3bMixedDirTreeView::PrivateAudioRootViewItem : public K3bListViewItem
diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp
index 1647ef6..ee1b4f4 100644
--- a/src/projects/k3bmixedview.cpp
+++ b/src/projects/k3bmixedview.cpp
@@ -37,10 +37,10 @@
 #include <tqvaluelist.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeactionclasses.h>
 
 
diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp
index 189ee4f..a5ae170 100644
--- a/src/projects/k3bmovixburndialog.cpp
+++ b/src/projects/k3bmovixburndialog.cpp
@@ -30,9 +30,9 @@
 #include <k3bwritingmodewidget.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp
index 0dddd81..c17bc7d 100644
--- a/src/projects/k3bmovixdvdburndialog.cpp
+++ b/src/projects/k3bmovixdvdburndialog.cpp
@@ -32,8 +32,8 @@
 #include <k3bcore.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/projects/k3bmovixdvdview.cpp b/src/projects/k3bmovixdvdview.cpp
index ae1e5a7..7c8d7d3 100644
--- a/src/projects/k3bmovixdvdview.cpp
+++ b/src/projects/k3bmovixdvdview.cpp
@@ -19,7 +19,7 @@
 #include <k3bmovixlistview.h>
 #include <k3bfillstatusdisplay.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *parent, const char *name )
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index 299b415..2c9deda 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -19,7 +19,7 @@
 #include "k3bmovixfileitem.h"
 #include <k3bdiritem.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/global.h>
 #include <kurldrag.h>
diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp
index 9ede404..dfa7882 100644
--- a/src/projects/k3bmovixoptionswidget.cpp
+++ b/src/projects/k3bmovixoptionswidget.cpp
@@ -19,9 +19,9 @@
 #include "k3bmovixprogram.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 85d8312..0780c08 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -25,12 +25,12 @@
 #include <k3bprojectplugin.h>
 #include <k3btoolbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include <tqlayout.h>
diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp
index d39b88c..0a6ca8d 100644
--- a/src/projects/k3bmusicbrainzjob.cpp
+++ b/src/projects/k3bmusicbrainzjob.cpp
@@ -27,9 +27,9 @@
 #include <k3baudiodatasource.h>
 #include <k3bsimplejobhandler.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 // determine one trm
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index 52a9707..e03b175 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -39,13 +39,13 @@
 #include <tqspinbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index fa5a262..4290f4f 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -27,9 +27,9 @@
 #include <tqtoolbutton.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
 #include <tdeapplication.h>
diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp
index 8035cd7..dd06d68 100644
--- a/src/projects/k3bvcdlistview.cpp
+++ b/src/projects/k3bvcdlistview.cpp
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kdialog.h>
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 58c7d5e..4b4c72a 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -33,7 +33,7 @@
 // Kde Includes
 #include <kiconloader.h>
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <knuminput.h>
 #include <kurl.h>
diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp
index 5c8a2ed..2df5c70 100644
--- a/src/projects/k3bvcdview.cpp
+++ b/src/projects/k3bvcdview.cpp
@@ -19,10 +19,10 @@
 
 
 // KDE-includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // K3b Includes
 #include "k3bvcdview.h"
diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp
index 1479ffc..15ffcc3 100644
--- a/src/projects/k3bvideodvdburndialog.cpp
+++ b/src/projects/k3bvideodvdburndialog.cpp
@@ -28,9 +28,9 @@
 #include <k3bglobalsettings.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp
index 3bcc328..ae70fa0 100644
--- a/src/projects/k3bvideodvdview.cpp
+++ b/src/projects/k3bvideodvdview.cpp
@@ -24,8 +24,8 @@
 #include <k3btoolbox.h>
 #include <k3bprojectplugin.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeactioncollection.h>
 
 #include <tqsplitter.h>
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index 66b05a4..df3384d 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -24,8 +24,8 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc
index dcaf5d0..655263f 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cc
@@ -35,8 +35,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 //#define DefaultFormat KoStore::Tar
diff --git a/src/rip/k3baudiocdlistview.cpp b/src/rip/k3baudiocdlistview.cpp
index 8e0a31a..cf8c33b 100644
--- a/src/rip/k3baudiocdlistview.cpp
+++ b/src/rip/k3baudiocdlistview.cpp
@@ -16,7 +16,7 @@
 #include "k3baudiocdlistview.h"
 #include "k3baudiocdview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqheader.h>
 #include <tqtooltip.h>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 91e5a51..219a345 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -34,12 +34,12 @@
 #include <k3baudiocdtrackdrag.h>
 #include <k3bthemedlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp
index 34d1de7..11f5146 100644
--- a/src/rip/k3baudioconvertingoptionwidget.cpp
+++ b/src/rip/k3baudioconvertingoptionwidget.cpp
@@ -24,7 +24,7 @@
 #include <kurlrequester.h>
 #include <tdeio/global.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqintdict.h>
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 425d64b..748f6fc 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -32,14 +32,14 @@
 #include <k3bthreadjob.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqheader.h>
diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp
index 7e9a4ea..a94ced4 100644
--- a/src/rip/k3baudioprojectconvertingthread.cpp
+++ b/src/rip/k3baudioprojectconvertingthread.cpp
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 
diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp
index 3aed35c..eded9aa 100644
--- a/src/rip/k3baudioripjob.cpp
+++ b/src/rip/k3baudioripjob.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, TQObject* parent )
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index bdac4f6..e3116ab 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -30,7 +30,7 @@
 #include <k3baudioencoder.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
@@ -40,7 +40,7 @@
 #include <kiconloader.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 
 #include <tqgroupbox.h>
diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp
index faf8fcc..cd04976 100644
--- a/src/rip/k3baudioripthread.cpp
+++ b/src/rip/k3baudioripthread.cpp
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index e8b533a..2c8e533 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -16,7 +16,7 @@
 #include "k3bcddbpatternwidget.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kurllabel.h>
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 382c00d..fd256a4 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -21,8 +21,8 @@
 #include <tqdatetime.h>
 #include <tqvaluestack.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 
 TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index 2dea3f7..b996d1b 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index b6c033d..8a09301 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -16,9 +16,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <tqdatetime.h>
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 8c6aac4..9eafedb 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -15,12 +15,12 @@
 
 
 // kde include
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 // qt includes
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 1dd9753..523b91f 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -19,8 +19,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index f964a67..1025f30 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -23,16 +23,16 @@
 #include <k3bglobals.h>
 #include <k3bfilesysteminfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tdeio/global.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
index f17b6ff..b448fa0 100644
--- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
@@ -19,7 +19,7 @@
 #include <k3bvideodvdtitledetectclippingjob.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bVideoDVDRippingJob::TitleRipInfo::TitleRipInfo()
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 8caa60a..b0106a3 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -31,8 +31,8 @@
 #include <tqheader.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 873fd9f..c524fa6 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 742a7f7..649ac7b 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -21,7 +21,7 @@
 #include <k3bintmapcombobox.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdeio/global.h>
 #include <kurllabel.h>
diff --git a/tdeioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp
index 8a9a4ea..7ddaa28 100644
--- a/tdeioslaves/videodvd/videodvd.cpp
+++ b/tdeioslaves/videodvd/videodvd.cpp
@@ -22,8 +22,8 @@
 
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <stdlib.h>