From 281d226f744d70a826a3bffff1ee964ef5915d4f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:44:58 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 libk3b/cddb/k3bcddb.cpp                           | 2 +-
 libk3b/cddb/k3bcddbhttpquery.cpp                  | 2 +-
 libk3b/cddb/k3bcddblocalquery.cpp                 | 2 +-
 libk3b/cddb/k3bcddblocalsubmit.cpp                | 2 +-
 libk3b/cddb/k3bcddbmultientriesdialog.cpp         | 2 +-
 libk3b/cddb/k3bcddbpquery.cpp                     | 2 +-
 libk3b/cddb/k3bcddbquery.cpp                      | 2 +-
 libk3b/core/k3bcore.cpp                           | 2 +-
 libk3b/core/k3bglobals.cpp                        | 4 ++--
 libk3b/core/k3bjob.cpp                            | 2 +-
 libk3b/jobs/k3baudiocuefilewritingjob.cpp         | 2 +-
 libk3b/jobs/k3baudiosessionreadingjob.cpp         | 2 +-
 libk3b/jobs/k3bbinimagewritingjob.cpp             | 2 +-
 libk3b/jobs/k3bblankingjob.cpp                    | 2 +-
 libk3b/jobs/k3bcdcopyjob.cpp                      | 4 ++--
 libk3b/jobs/k3bcdda2wavreader.cpp                 | 2 +-
 libk3b/jobs/k3bclonejob.cpp                       | 2 +-
 libk3b/jobs/k3bdatatrackreader.cpp                | 2 +-
 libk3b/jobs/k3bdvdcopyjob.cpp                     | 2 +-
 libk3b/jobs/k3bdvdformattingjob.cpp               | 2 +-
 libk3b/jobs/k3biso9660imagewritingjob.cpp         | 4 ++--
 libk3b/jobs/k3breadcdreader.cpp                   | 2 +-
 libk3b/jobs/k3bverificationjob.cpp                | 2 +-
 libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 2 +-
 libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp    | 2 +-
 libk3b/plugin/k3baudioserver.cpp                  | 4 ++--
 libk3b/plugin/k3bpluginfactory.h                  | 4 ++--
 libk3b/plugin/k3bpluginmanager.cpp                | 6 +++---
 libk3b/projects/audiocd/k3baudiocdtracksource.cpp | 2 +-
 libk3b/projects/audiocd/k3baudiodoc.cpp           | 4 ++--
 libk3b/projects/audiocd/k3baudioimager.cpp        | 2 +-
 libk3b/projects/audiocd/k3baudiojob.cpp           | 4 ++--
 libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp   | 2 +-
 libk3b/projects/audiocd/k3baudionormalizejob.cpp  | 2 +-
 libk3b/projects/audiocd/k3baudiozerodata.cpp      | 2 +-
 libk3b/projects/datacd/k3bbootitem.cpp            | 2 +-
 libk3b/projects/datacd/k3bdatadoc.cpp             | 6 +++---
 libk3b/projects/datacd/k3bdatajob.cpp             | 4 ++--
 libk3b/projects/datacd/k3bdatapreparationjob.cpp  | 2 +-
 libk3b/projects/datacd/k3bisoimager.cpp           | 4 ++--
 libk3b/projects/datacd/k3bisooptions.cpp          | 2 +-
 libk3b/projects/datacd/k3bmkisofshandler.cpp      | 2 +-
 libk3b/projects/datacd/k3bmsinfofetcher.cpp       | 2 +-
 libk3b/projects/datadvd/k3bdvdbooktypejob.cpp     | 2 +-
 libk3b/projects/datadvd/k3bdvdjob.cpp             | 2 +-
 libk3b/projects/datadvd/k3bdvdview.cpp            | 2 +-
 libk3b/projects/k3babstractwriter.cpp             | 4 ++--
 libk3b/projects/k3bcdrdaowriter.cpp               | 4 ++--
 libk3b/projects/k3bcdrecordwriter.cpp             | 4 ++--
 libk3b/projects/k3bdoc.cpp                        | 2 +-
 libk3b/projects/k3bdvdrecordwriter.cpp            | 2 +-
 libk3b/projects/k3bgrowisofshandler.cpp           | 4 ++--
 libk3b/projects/k3bgrowisofswriter.cpp            | 4 ++--
 libk3b/projects/k3bpipebuffer.cpp                 | 2 +-
 libk3b/projects/mixedcd/k3bmixeddoc.cpp           | 4 ++--
 libk3b/projects/mixedcd/k3bmixedjob.cpp           | 4 ++--
 libk3b/projects/movixcd/k3bmovixdoc.cpp           | 4 ++--
 libk3b/projects/movixcd/k3bmovixdocpreparer.cpp   | 4 ++--
 libk3b/projects/movixcd/k3bmovixjob.cpp           | 2 +-
 libk3b/projects/movixcd/k3bmovixprogram.cpp       | 2 +-
 libk3b/projects/movixdvd/k3bmovixdvdjob.cpp       | 2 +-
 libk3b/projects/videocd/k3bvcddoc.cpp             | 4 ++--
 libk3b/projects/videocd/k3bvcdjob.cpp             | 4 ++--
 libk3b/projects/videocd/k3bvcdoptions.cpp         | 2 +-
 libk3b/projects/videocd/k3bvcdtrack.cpp           | 2 +-
 libk3b/projects/videocd/k3bvcdxmlview.h           | 2 +-
 libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp  | 2 +-
 libk3b/projects/videodvd/k3bvideodvdimager.cpp    | 6 +++---
 libk3b/projects/videodvd/k3bvideodvdjob.cpp       | 4 ++--
 libk3b/tools/k3bbusywidget.cpp                    | 2 +-
 libk3b/tools/k3bdevicecombobox.cpp                | 2 +-
 libk3b/tools/k3bdeviceselectiondialog.cpp         | 2 +-
 libk3b/tools/k3bdirsizejob.cpp                    | 2 +-
 libk3b/tools/k3bintvalidator.cpp                  | 4 ++--
 libk3b/tools/k3bmd5job.cpp                        | 2 +-
 libk3b/tools/k3bmultichoicedialog.cpp             | 2 +-
 libk3b/tools/k3bprogressdialog.cpp                | 2 +-
 libk3b/tools/k3bpushbutton.cpp                    | 2 +-
 libk3b/tools/k3brichtextlabel.cpp                 | 2 +-
 libk3b/tools/k3bstdguiitems.cpp                   | 2 +-
 libk3b/tools/k3btempfile.cpp                      | 2 +-
 libk3b/tools/k3btempfile.h                        | 2 +-
 libk3b/tools/k3btoolbutton.cpp                    | 2 +-
 libk3b/videodvd/k3bvideodvd.cpp                   | 2 +-
 84 files changed, 112 insertions(+), 112 deletions(-)

(limited to 'libk3b')

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>
-- 
cgit v1.2.3