From bd0bc855c467695d5cb236d60832d681255b0ad7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:43:54 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 amarok/src/Options2.ui.h                                  | 2 +-
 amarok/src/Options5.ui.h                                  | 2 +-
 amarok/src/actionclasses.cpp                              | 2 +-
 amarok/src/amarokcore/amarokdcophandler.cpp               | 2 +-
 amarok/src/amarokcore/crashhandler.cpp                    | 4 ++--
 amarok/src/analyzers/analyzerfactory.cpp                  | 2 +-
 amarok/src/analyzers/blockanalyzer.cpp                    | 4 ++--
 amarok/src/app.cpp                                        | 6 +++---
 amarok/src/browserbar.cpp                                 | 2 +-
 amarok/src/collectionbrowser.cpp                          | 6 +++---
 amarok/src/collectiondb.cpp                               | 6 +++---
 amarok/src/collectionscanner/collectionscanner.cpp        | 4 ++--
 amarok/src/collectionscanner/main.cpp                     | 2 +-
 amarok/src/configdialog.cpp                               | 2 +-
 amarok/src/contextbrowser.cpp                             | 4 ++--
 amarok/src/coverfetcher.cpp                               | 4 ++--
 amarok/src/covermanager.cpp                               | 4 ++--
 amarok/src/cuefile.cpp                                    | 2 +-
 amarok/src/database_refactor/collectiondb.cpp             | 4 ++--
 amarok/src/database_refactor/dbenginebase.cpp             | 2 +-
 amarok/src/deletedialog.cpp                               | 4 ++--
 amarok/src/deviceconfiguredialog.cpp                      | 2 +-
 amarok/src/directorylist.cpp                              | 2 +-
 amarok/src/editfilterdialog.cpp                           | 6 +++---
 amarok/src/engine/akode/akode-engine.cpp                  | 2 +-
 amarok/src/engine/helix/helix-configdialog.cpp            | 2 +-
 amarok/src/engine/helix/helix-engine.cpp                  | 4 ++--
 amarok/src/engine/helix/helix-errors.cpp                  | 2 +-
 amarok/src/engine/kdemm/kdemmengine.cpp                   | 4 ++--
 amarok/src/engine/mas/masengine.cpp                       | 4 ++--
 amarok/src/engine/nmm/HostList.cpp                        | 2 +-
 amarok/src/engine/nmm/HostListItem.cpp                    | 4 ++--
 amarok/src/engine/nmm/nmm_engine.cpp                      | 4 ++--
 amarok/src/engine/void/void-engine.cpp                    | 2 +-
 amarok/src/engine/xine/xine-config.cpp                    | 2 +-
 amarok/src/engine/xine/xine-engine.cpp                    | 4 ++--
 amarok/src/engine/yauap/yauap-engine.cpp                  | 2 +-
 amarok/src/enginecontroller.cpp                           | 2 +-
 amarok/src/equalizerpresetmanager.cpp                     | 4 ++--
 amarok/src/equalizersetup.cpp                             | 4 ++--
 amarok/src/filebrowser.cpp                                | 4 ++--
 amarok/src/filebrowser.h                                  | 2 +-
 amarok/src/firstrunwizard.ui.h                            | 2 +-
 amarok/src/htmlview.cpp                                   | 4 ++--
 amarok/src/k3bexporter.cpp                                | 4 ++--
 amarok/src/kbookmarkhandler.cpp                           | 2 +-
 amarok/src/konquisidebar/universalamarok.cpp              | 6 +++---
 amarok/src/ktrm.cpp                                       | 2 +-
 amarok/src/lastfm.cpp                                     | 4 ++--
 amarok/src/loader/loader.cpp                              | 2 +-
 amarok/src/magnatunebrowser/magnatunebrowser.cpp          | 2 +-
 amarok/src/magnatunebrowser/magnatunelistview.cpp         | 2 +-
 amarok/src/magnatunebrowser/magnatunelistviewitems.cpp    | 4 ++--
 .../src/magnatunebrowser/magnatuneredownloadhandler.cpp   | 2 +-
 amarok/src/mediabrowser.cpp                               | 8 ++++----
 amarok/src/mediadevice/daap/daapclient.cpp                | 2 +-
 amarok/src/mediadevice/daap/daapclient.h                  | 2 +-
 amarok/src/mediadevice/generic/genericmediadevice.cpp     | 2 +-
 amarok/src/mediadevice/ifp/ifpmediadevice.cpp             | 2 +-
 amarok/src/mediadevice/ipod/ipodmediadevice.cpp           | 2 +-
 amarok/src/mediadevice/mtp/mtpmediadevice.cpp             | 2 +-
 amarok/src/mediadevice/njb/njbmediadevice.cpp             | 4 ++--
 amarok/src/mediadevice/njb/track.cpp                      | 2 +-
 amarok/src/medium.cpp                                     | 2 +-
 amarok/src/mediumpluginmanager.cpp                        | 2 +-
 amarok/src/mediumpluginmanager.h                          | 2 +-
 amarok/src/metabundle.h                                   | 2 +-
 amarok/src/metabundlesaver.h                              | 2 +-
 amarok/src/mountpointmanager.cpp                          | 2 +-
 amarok/src/multitabbar.cpp                                | 2 +-
 amarok/src/mydiroperator.h                                | 2 +-
 amarok/src/osd.cpp                                        | 2 +-
 amarok/src/playerwindow.cpp                               | 4 ++--
 amarok/src/playlist.cpp                                   | 6 +++---
 amarok/src/playlistbrowser.cpp                            | 4 ++--
 amarok/src/playlistbrowseritem.cpp                        | 4 ++--
 amarok/src/playlistitem.cpp                               | 2 +-
 amarok/src/playlistloader.cpp                             | 4 ++--
 amarok/src/playlistselection.cpp                          | 2 +-
 amarok/src/playlistwindow.cpp                             | 8 ++++----
 amarok/src/pluginmanager.cpp                              | 4 ++--
 amarok/src/podcastsettings.cpp                            | 4 ++--
 amarok/src/queuemanager.cpp                               | 2 +-
 amarok/src/refreshimages.cpp                              | 2 +-
 amarok/src/scancontroller.cpp                             | 4 ++--
 amarok/src/scriptmanager.cpp                              | 6 +++---
 amarok/src/scripts/graphequalizer/equalizercanvasview.cpp | 4 ++--
 amarok/src/scripts/graphequalizer/main.cpp                | 2 +-
 amarok/src/scrobbler.cpp                                  | 2 +-
 amarok/src/sliderwidget.cpp                               | 2 +-
 amarok/src/smartplaylisteditor.cpp                        | 2 +-
 amarok/src/socketserver.cpp                               | 2 +-
 amarok/src/statistics.cpp                                 | 2 +-
 amarok/src/statusbar/progressBar.cpp                      | 2 +-
 amarok/src/statusbar/queueLabel.cpp                       | 2 +-
 amarok/src/statusbar/selectLabel.h                        | 2 +-
 amarok/src/statusbar/statusBarBase.cpp                    | 2 +-
 amarok/src/statusbar/statusbar.cpp                        | 2 +-
 amarok/src/statusbar/toggleLabel.h                        | 2 +-
 amarok/src/tagdialog.cpp                                  | 4 ++--
 amarok/src/tagguesser.cpp                                 | 2 +-
 amarok/src/tooltip.cpp                                    | 2 +-
 amarok/src/trackpickerdialog.cpp                          | 2 +-
 amarok/src/transferdialog.cpp                             | 2 +-
 104 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h
index 096ac593..a6793b68 100644
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@@ -17,7 +17,7 @@
 
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knewstuff/downloaddialog.h> // knewstuff theme fetching
 #include <knewstuff/engine.h>         // "
 #include <knewstuff/knewstuff.h>      // "
diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h
index 63f37884..f28ea00e 100644
--- a/amarok/src/Options5.ui.h
+++ b/amarok/src/Options5.ui.h
@@ -24,7 +24,7 @@ email                : fh@ez.no
 *****************************************************************************/
 
 #include "amarokconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include "qstringx.h"
 #include <tqtooltip.h>
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index 3223ae56..d00d6928 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -24,7 +24,7 @@
 #include <tdeaction.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp
index c73261d7..7cb55e34 100644
--- a/amarok/src/amarokcore/amarokdcophandler.cpp
+++ b/amarok/src/amarokcore/amarokdcophandler.cpp
@@ -47,7 +47,7 @@
 
 #include <dcopclient.h>
 #include <tdeactioncollection.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 
 namespace Amarok
diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp
index 930ccef5..5fc0f27f 100644
--- a/amarok/src/amarokcore/crashhandler.cpp
+++ b/amarok/src/amarokcore/crashhandler.cpp
@@ -15,8 +15,8 @@
 #include <tdeapplication.h> //invokeMailer()
 #include <kdebug.h>       //kdBacktrace()
 #include <tdeversion.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/amarok/src/analyzers/analyzerfactory.cpp b/amarok/src/analyzers/analyzerfactory.cpp
index 28d5f7b3..9aa9b08a 100644
--- a/amarok/src/analyzers/analyzerfactory.cpp
+++ b/amarok/src/analyzers/analyzerfactory.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //separate from analyzerbase.cpp to save compile time
 
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 28252448..666340af 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -14,9 +14,9 @@
 #include <cmath>
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h> //paletteChange()
+#include <tdeglobalsettings.h> //paletteChange()
 #include <kiconloader.h>     //mousePressEvent
-#include <klocale.h>         //mousePressEvent
+#include <tdelocale.h>         //mousePressEvent
 #include <tdepopupmenu.h>      //mousePressEvent
 
 #include <tqevent.h>          //mousePressEvent
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index 43d3e761..c20fe55c 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -57,11 +57,11 @@ email                : markey@web.de
 #include <kcursor.h>             //Amarok::OverrideCursor
 #include <kedittoolbar.h>        //slotConfigToolbars()
 #include <kglobalaccel.h>        //initGlobalShortcuts()
-#include <kglobalsettings.h>     //applyColorScheme()
+#include <tdeglobalsettings.h>     //applyColorScheme()
 #include <kiconloader.h>         //amarok Icon
 #include <kkeydialog.h>          //slotConfigShortcuts()
-#include <klocale.h>
-#include <kmessagebox.h>         //applySettings(), genericEventHandler()
+#include <tdelocale.h>
+#include <tdemessagebox.h>         //applySettings(), genericEventHandler()
 #include <krun.h>                //Amarok::invokeBrowser()
 #include <kstandarddirs.h>
 #include <kurldrag.h>            //genericEventHandler()
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index 62891c85..1d3e8625 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>  //kapp
 #include <tdeconfig.h>
 #include <kiconloader.h>   //multiTabBar icons
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>       //for resize cursor
 #include <tqpainter.h>
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 1106b12a..54370202 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -58,10 +58,10 @@
 #include <kcombobox.h>
 #include <kcursor.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>    //renderView()
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index 2f11f4d3..24a79f9e 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -54,12 +54,12 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>          //checkDatabase()
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
 #include <klineedit.h>            //setupCoverFetcher()
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
diff --git a/amarok/src/collectionscanner/collectionscanner.cpp b/amarok/src/collectionscanner/collectionscanner.cpp
index 5e3d4d5c..8636410d 100644
--- a/amarok/src/collectionscanner/collectionscanner.cpp
+++ b/amarok/src/collectionscanner/collectionscanner.cpp
@@ -41,8 +41,8 @@
 #include <tqtimer.h>
 
 #include <dcopref.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 
 CollectionScanner::CollectionScanner( const TQStringList& folders,
diff --git a/amarok/src/collectionscanner/main.cpp b/amarok/src/collectionscanner/main.cpp
index 48c68928..a78f1a68 100644
--- a/amarok/src/collectionscanner/main.cpp
+++ b/amarok/src/collectionscanner/main.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 int main( int argc, char *argv[] )
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 41c8477c..8b71aa7a 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -55,7 +55,7 @@ email                : markey@web.de
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 8b3dd7fc..1d3ff5b5 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -58,12 +58,12 @@
 #include <tdeconfig.h> // suggested/related/favorite box visibility
 #include <kdialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kmdcodec.h> // for data: URLs
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 753b8b51..1bdaed54 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -27,8 +27,8 @@
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <twin.h>
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index d67dea10..851f4084 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -40,8 +40,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>    //showCoverMenu()
+#include <tdelocale.h>
+#include <tdemessagebox.h>    //showCoverMenu()
 #include <tdemultipledrag.h>
 #include <tdeio/netaccess.h>
 #include <tdepopupmenu.h>    //showCoverMenu()
diff --git a/amarok/src/cuefile.cpp b/amarok/src/cuefile.cpp
index cf109848..4882e264 100644
--- a/amarok/src/cuefile.cpp
+++ b/amarok/src/cuefile.cpp
@@ -7,7 +7,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "cuefile.h"
 #include "metabundle.h"
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index f02d19d8..64a299e5 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -30,11 +30,11 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
 #include <tdeio/job.h>
 #include <klineedit.h>            //setupCoverFetcher()
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/amarok/src/database_refactor/dbenginebase.cpp b/amarok/src/database_refactor/dbenginebase.cpp
index ec3a34b5..b2d438e5 100644
--- a/amarok/src/database_refactor/dbenginebase.cpp
+++ b/amarok/src/database_refactor/dbenginebase.cpp
@@ -23,7 +23,7 @@
 #include <dbenginebase.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index cd8d38d6..837b011b 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -16,10 +16,10 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
 
diff --git a/amarok/src/deviceconfiguredialog.cpp b/amarok/src/deviceconfiguredialog.cpp
index 27f36a53..fc8276a0 100644
--- a/amarok/src/deviceconfiguredialog.cpp
+++ b/amarok/src/deviceconfiguredialog.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <twin.h>
 
diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp
index 4aa30b49..9b8c4660 100644
--- a/amarok/src/directorylist.cpp
+++ b/amarok/src/directorylist.cpp
@@ -21,7 +21,7 @@
 #include "mountpointmanager.h"
 
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqlabel.h>
diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp
index e1d7ed4d..6e79a53d 100644
--- a/amarok/src/editfilterdialog.cpp
+++ b/amarok/src/editfilterdialog.cpp
@@ -13,11 +13,11 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 
 #include "amarokcore/amarokconfig.h"
diff --git a/amarok/src/engine/akode/akode-engine.cpp b/amarok/src/engine/akode/akode-engine.cpp
index 26840589..191a3d89 100644
--- a/amarok/src/engine/akode/akode-engine.cpp
+++ b/amarok/src/engine/akode/akode-engine.cpp
@@ -11,7 +11,7 @@
 #include <akode-engine.h>
 #include <akode/decoder.h>
 #include <akode/player.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 
 AMAROK_EXPORT_PLUGIN( AkodeEngine )
diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp
index f8c1df7a..3fcaf997 100644
--- a/amarok/src/engine/helix/helix-configdialog.cpp
+++ b/amarok/src/engine/helix/helix-configdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <klineedit.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include "helix-configdialog.h"
diff --git a/amarok/src/engine/helix/helix-engine.cpp b/amarok/src/engine/helix/helix-engine.cpp
index 02b187b6..8d508209 100644
--- a/amarok/src/engine/helix/helix-engine.cpp
+++ b/amarok/src/engine/helix/helix-engine.cpp
@@ -23,8 +23,8 @@
 
 #include "debug.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 #include <tqdir.h>
diff --git a/amarok/src/engine/helix/helix-errors.cpp b/amarok/src/engine/helix/helix-errors.cpp
index bad40dfc..800cd9bb 100644
--- a/amarok/src/engine/helix/helix-errors.cpp
+++ b/amarok/src/engine/helix/helix-errors.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 #include <iostream>
 #include "debug.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <map>
 
 using namespace std;
diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp
index 185e2e0b..67b7e9e1 100644
--- a/amarok/src/engine/kdemm/kdemmengine.cpp
+++ b/amarok/src/engine/kdemm/kdemmengine.cpp
@@ -37,8 +37,8 @@ what                 : interface to the KDE Multimedia interface (KDEMM)
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index ba31a5fa..ac9edc57 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/amarok/src/engine/mas/masengine.cpp
@@ -34,8 +34,8 @@ what                 : interface to the Media Application Server (MAS)
 #include <tdeconfig.h>
 #include <tdefileitem.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp
index e31ef80c..93d14507 100644
--- a/amarok/src/engine/nmm/HostList.cpp
+++ b/amarok/src/engine/nmm/HostList.cpp
@@ -26,7 +26,7 @@
 
 #include <tqcursor.h>
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "debug.h"
 #include "HostListItem.h"
diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp
index 9ac9a7b7..d73b94ef 100644
--- a/amarok/src/engine/nmm/HostListItem.cpp
+++ b/amarok/src/engine/nmm/HostListItem.cpp
@@ -30,9 +30,9 @@
 #include <tqpainter.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp
index 9ec4b560..1edeae23 100644
--- a/amarok/src/engine/nmm/nmm_engine.cpp
+++ b/amarok/src/engine/nmm/nmm_engine.cpp
@@ -50,8 +50,8 @@
 #include <tqtimer.h>
 
 #include <tdefileitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <iostream>
 #include <kurl.h>
diff --git a/amarok/src/engine/void/void-engine.cpp b/amarok/src/engine/void/void-engine.cpp
index 394c8310..8f958ad4 100644
--- a/amarok/src/engine/void/void-engine.cpp
+++ b/amarok/src/engine/void/void-engine.cpp
@@ -16,7 +16,7 @@ copyright            : (C) 2004 by Mark Kretschmann <markey@web.de>
 
 #include "void-engine.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 AMAROK_EXPORT_PLUGIN( VoidEngine )
diff --git a/amarok/src/engine/xine/xine-config.cpp b/amarok/src/engine/xine/xine-config.cpp
index cef57168..1972fb09 100644
--- a/amarok/src/engine/xine/xine-config.cpp
+++ b/amarok/src/engine/xine/xine-config.cpp
@@ -13,7 +13,7 @@
 #include "xinecfg.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp
index 62be1efb..b2a6c5ab 100644
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/amarok/src/engine/xine/xine-engine.cpp
@@ -30,8 +30,8 @@ AMAROK_EXPORT_PLUGIN( XineEngine )
 #include <cmath>
 #include "debug.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqapplication.h>
diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp
index 04c3b6fa..46c671b0 100644
--- a/amarok/src/engine/yauap/yauap-engine.cpp
+++ b/amarok/src/engine/yauap/yauap-engine.cpp
@@ -15,7 +15,7 @@ copyright            : (C) 2006 by Sascha Sommer <saschasommer@freenet.de>
 
 #include <tqapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp
index da966360..f0312807 100644
--- a/amarok/src/enginecontroller.cpp
+++ b/amarok/src/enginecontroller.cpp
@@ -33,7 +33,7 @@
 #include <tdefileitem.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 
 #include <cstdlib>
diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp
index c33848ee..b72a819f 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -28,8 +28,8 @@
 #include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h> //locate()
 
 EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *name )
diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp
index f58c6af1..a5455ec2 100644
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@@ -40,8 +40,8 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>  //presets
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h> //locate()
 #include <twin.h>
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index b8619e48..d33bddc9 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -31,11 +31,11 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include "kbookmarkhandler.h"
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>     ///@see SearchPane
 #include <tdetoolbarbutton.h>  ///@see ctor
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index 61ac95c3..3e3b1a6a 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -25,7 +25,7 @@
 #define FILESELECTOR_WIDGET_H
 
 #include <tqvbox.h>        //baseclass
-#include <kdiroperator.h> //some inline functions
+#include <tdediroperator.h> //some inline functions
 #include <tdetoolbar.h>     //baseclass
 #include <kurl.h>         //stack allocated
 
diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h
index 4b450726..cc5480e7 100644
--- a/amarok/src/firstrunwizard.ui.h
+++ b/amarok/src/firstrunwizard.ui.h
@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 
 namespace Amarok
diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp
index f5520703..c7c4c97e 100644
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@@ -16,11 +16,11 @@
 
 #include <tdeapplication.h> //kapp
 #include <tdeactioncollection.h>
-#include <kglobal.h> //kapp
+#include <tdeglobal.h> //kapp
 #include <kimageeffect.h> // gradient background image
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h> //locate file
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 KTempFile *HTMLView::m_bgGradientImage = 0;
 KTempFile *HTMLView::m_headerGradientImage = 0;
diff --git a/amarok/src/k3bexporter.cpp b/amarok/src/k3bexporter.cpp
index cc5de16c..fa47847d 100644
--- a/amarok/src/k3bexporter.cpp
+++ b/amarok/src/k3bexporter.cpp
@@ -20,8 +20,8 @@
 #include "amarok.h"
 
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqcstring.h>
diff --git a/amarok/src/kbookmarkhandler.cpp b/amarok/src/kbookmarkhandler.cpp
index ff070e22..b57bd829 100644
--- a/amarok/src/kbookmarkhandler.cpp
+++ b/amarok/src/kbookmarkhandler.cpp
@@ -23,7 +23,7 @@
 #include "kbookmarkhandler.h"
 #include <kbookmarkimporter.h>
 #include <kbookmarkmenu.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kstandarddirs.h>
 
 KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, TDEPopupMenu* rootmenu )
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 47dfd466..8feea13a 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -24,15 +24,15 @@
 
 #include <tqlabel.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <tqdatetime.h>
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index fffaab8f..a49c3a6d 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kurl.h>
 #include <kresolver.h>
 
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index aa94755b..d0cfb562 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -33,10 +33,10 @@
 #include <tdeaction.h>
 #include <klineedit.h>
 #include <kmdcodec.h>       //md5sum
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeshortcut.h>
 #include <kurl.h>
 
diff --git a/amarok/src/loader/loader.cpp b/amarok/src/loader/loader.cpp
index 6f98e453..e615ed9d 100644
--- a/amarok/src/loader/loader.cpp
+++ b/amarok/src/loader/loader.cpp
@@ -23,7 +23,7 @@
 #include <tqprocess.h>
 #include <tqstring.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksplashscreen.h>
 
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.cpp b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
index 08644b12..26b04d27 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.cpp
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
@@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA.
 #include <kstandarddirs.h> //locate()
 #include <kurl.h>
 #include <kiconloader.h>   //multiTabBar icons
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqsplitter.h>
 #include <tqdragobject.h>
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp
index 0bcb38bc..26c4a4c2 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp
@@ -22,7 +22,7 @@
 #include "magnatunelistview.h"
 
 #include <tdeversion.h>  
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcolor.h>
 
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
index 59964ad5..01560b76 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@@ -20,9 +20,9 @@
 #include "debug.h"
 #include "magnatunelistviewitems.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdatetime.h>
 
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
index 72e19ed4..47e778f0 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
@@ -26,7 +26,7 @@
 
 #include "tqdir.h"
 #include "tqmessagebox.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index 6ab637a3..3f4b1e2d 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -61,12 +61,12 @@
 #include <kcombobox.h>
 #include <kdirlister.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdemultipledrag.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
@@ -75,7 +75,7 @@
 #include <krun.h>
 #include <kstandarddirs.h> //locate file
 #include <ktabbar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
 #include <tdeactioncollection.h>
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index 0b2fd4b1..0df0820f 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -45,7 +45,7 @@
 #include <tdepopupmenu.h>
 #include <kresolver.h>
 #include <kstandarddirs.h>     //loading icons
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 
diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h
index 3d85c5d9..e6128edb 100644
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@@ -20,7 +20,7 @@
 
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #define DNSSD_SUPPORT KDE_IS_VERSION(3,4,0)
 
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 858227f8..ddd8adb1 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -43,7 +43,7 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmountpoint.h>
 #include <tdepopupmenu.h>
 #include <kurlrequester.h>     //downloadSelectedItems()
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index a21b2f2c..25586595 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -36,7 +36,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
 #include <tdeapplication.h>
 #include <tdeconfig.h>           //download saveLocation
 #include <kiconloader.h>       //smallIcon
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kurlrequester.h>     //downloadSelectedItems()
 #include <kurlrequesterdlg.h>  //downloadSelectedItems()
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index 340000ce..e07cd23c 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -47,7 +47,7 @@ AMAROK_EXPORT_PLUGIN( IpodMediaDevice )
 #include <kmountpoint.h>
 #include <kpushbutton.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index 5d99df71..7231749b 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -42,7 +42,7 @@ AMAROK_EXPORT_PLUGIN( MtpMediaDevice )
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 #include <ktempdir.h>
 
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index c313dffb..2d30b2fa 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -42,8 +42,8 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
 #include <tdefiledialog.h>
 #include <kiconloader.h>       //smallIcon
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <ktempdir.h>
 #include <tdetoolbarbutton.h>
diff --git a/amarok/src/mediadevice/njb/track.cpp b/amarok/src/mediadevice/njb/track.cpp
index 24a24534..d795d259 100644
--- a/amarok/src/mediadevice/njb/track.cpp
+++ b/amarok/src/mediadevice/njb/track.cpp
@@ -26,7 +26,7 @@ static const char* rcsid __attribute__((unused)) =
 #include <tqregexp.h>
 #include <tqptrlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 /* ------------------------------------------------------------------------ */
diff --git a/amarok/src/medium.cpp b/amarok/src/medium.cpp
index b05de959..b32c347b 100644
--- a/amarok/src/medium.cpp
+++ b/amarok/src/medium.cpp
@@ -20,7 +20,7 @@
 #include "medium.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 const TQString Medium::SEPARATOR = "---";
 
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index 73675b38..f9130258 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 using Amarok::escapeHTML;
diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h
index 735e4ea9..a367596f 100644
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@@ -22,7 +22,7 @@
 
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQButton;
 class TQGroupBox;
diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h
index a6a217ce..d3c5436b 100644
--- a/amarok/src/metabundle.h
+++ b/amarok/src/metabundle.h
@@ -13,7 +13,7 @@
 
 #include <tqstringlist.h>
 #include <kurl.h>    //inline functions
-#include <klocale.h> //inline functions
+#include <tdelocale.h> //inline functions
 #include <taglib/audioproperties.h>
 #include "expression.h"
 #include "atomicstring.h"
diff --git a/amarok/src/metabundlesaver.h b/amarok/src/metabundlesaver.h
index 58cd6eea..5ef3d320 100644
--- a/amarok/src/metabundlesaver.h
+++ b/amarok/src/metabundlesaver.h
@@ -7,7 +7,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 #include <kurl.h>    //inline functions
-#include <klocale.h> //inline functions
+#include <tdelocale.h> //inline functions
 #include <taglib/audioproperties.h>
 #include "expression.h"
 #include "atomicstring.h"
diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp
index bfec2aba..bba625c9 100644
--- a/amarok/src/mountpointmanager.cpp
+++ b/amarok/src/mountpointmanager.cpp
@@ -28,7 +28,7 @@
 #include "pluginmanager.h"
 #include "statusbar.h"
 
-#include <kglobal.h>        //used in init()
+#include <tdeglobal.h>        //used in init()
 #include <ktrader.h>
 
 #include <tqfile.h>
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 1a1dca18..a121fe34 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -44,7 +44,7 @@
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
 
diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h
index abfda61b..691b8d03 100644
--- a/amarok/src/mydiroperator.h
+++ b/amarok/src/mydiroperator.h
@@ -4,7 +4,7 @@
 #include "mydirlister.h"
 
 #include <tdeaction.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdepopupmenu.h>
 
 class Medium;
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index 8f8b7ff7..02a6aa58 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -604,7 +604,7 @@ OSDWidget::useMoodbar( void )
 
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Amarok
 {
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 6f737865..37d917ae 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -38,8 +38,8 @@ email                : markey@web.de
 #include <tqtooltip.h>        //analyzer tooltip
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 7a318cc0..fdd8b03b 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -68,13 +68,13 @@
 #include <tdeapplication.h>
 #include <kcursor.h>         //setOverrideCursor()
 #include <kdialogbase.h>
-#include <kglobalsettings.h> //rename()
+#include <tdeglobalsettings.h> //rename()
 #include <kiconeffect.h>
 #include <kiconloader.h>     //slotShowContextMenu()
 #include <tdeio/job.h>         //deleteSelectedFiles()
 #include <klineedit.h>       //setCurrentTrack()
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krandomsequence.h> //random Mode
 #include <kstandarddirs.h>   //TDEGlobal::dirs()
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 69368ef6..3a2da836 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -50,8 +50,8 @@
 #include <kiconloader.h>       //smallIcon
 #include <kinputdialog.h>
 #include <klineedit.h>         //rename()
-#include <klocale.h>
-#include <kmessagebox.h>       //renamePlaylist(), deleteSelectedPlaylist()
+#include <tdelocale.h>
+#include <tdemessagebox.h>       //renamePlaylist(), deleteSelectedPlaylist()
 #include <kmimetype.h>
 #include <tdemultipledrag.h>     //dragObject()
 #include <tdepopupmenu.h>
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index 0b649337..c9186ade 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -42,8 +42,8 @@
 #include <kiconloader.h>       //smallIcon
 #include <tdeio/jobclasses.h>    //podcast retrieval
 #include <tdeio/job.h>           //podcast retrieval
-#include <klocale.h>
-#include <kmessagebox.h>       //podcast info box
+#include <tdelocale.h>
+#include <tdemessagebox.h>       //podcast info box
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index adddb261..bfacc9ee 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -40,7 +40,7 @@
 
 #include <tdeversion.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index 8eb748ec..aca4a223 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -969,9 +969,9 @@ PlaylistFile::loadSMIL( TQTextStream &stream )
 
 /// @class RemotePlaylistFetcher
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem *after, int options )
         : TQObject( Playlist::instance()->qscrollview() )
diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp
index 98a1a617..977189d4 100644
--- a/amarok/src/playlistselection.cpp
+++ b/amarok/src/playlistselection.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name )
     : TDEListView( parent, name )
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index e8f860e3..a9feed10 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -58,13 +58,13 @@
 #include <tdeaction.h>          //m_actionCollection
 #include <tdeapplication.h>     //kapp
 #include <tdefiledialog.h>      //savePlaylist(), openPlaylist()
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtml_part.h>       //Welcome Tab
 #include <kiconloader.h>      //ClearFilter button
 #include <kinputdialog.h>     //slotAddStream()
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>      //savePlaylist()
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>      //savePlaylist()
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>    //Welcome Tab, locate welcome.html
diff --git a/amarok/src/pluginmanager.cpp b/amarok/src/pluginmanager.cpp
index 4259c00a..8ecfb358 100644
--- a/amarok/src/pluginmanager.cpp
+++ b/amarok/src/pluginmanager.cpp
@@ -25,8 +25,8 @@ email                : markey@web.de
 #include <tqstring.h>
 
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 using std::vector;
 using Amarok::Plugin;
diff --git a/amarok/src/podcastsettings.cpp b/amarok/src/podcastsettings.cpp
index 700ce186..61fff37c 100644
--- a/amarok/src/podcastsettings.cpp
+++ b/amarok/src/podcastsettings.cpp
@@ -8,9 +8,9 @@
 
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kmessagebox.h>    //global changes confirmation
+#include <tdemessagebox.h>    //global changes confirmation
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <twin.h>
 
diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp
index 1734d7c2..ee3c3a9c 100644
--- a/amarok/src/queuemanager.cpp
+++ b/amarok/src/queuemanager.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kurldrag.h>
 #include <twin.h>
diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp
index 4098b83d..afb1b397 100644
--- a/amarok/src/refreshimages.cpp
+++ b/amarok/src/refreshimages.cpp
@@ -21,7 +21,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/scheduler.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 RefreshImages::RefreshImages()
diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp
index 16b71141..57fd7c9a 100644
--- a/amarok/src/scancontroller.cpp
+++ b/amarok/src/scancontroller.cpp
@@ -36,8 +36,8 @@
 
 #include <dcopref.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // class ScanController
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index bbd04881..c9abc2fd 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -49,11 +49,11 @@
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocio.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kpushbutton.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
index 9f02ef7f..b69d457e 100644
--- a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
+++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
@@ -13,8 +13,8 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 EqualizerCanvasView::EqualizerCanvasView(TQWidget *parent = 0, const char *name = 0)
     : TQCanvasView(parent, name)
diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp
index 0f1ff103..eeea187f 100644
--- a/amarok/src/scripts/graphequalizer/main.cpp
+++ b/amarok/src/scripts/graphequalizer/main.cpp
@@ -9,7 +9,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 
diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp
index 8bdd32bc..e93c67c4 100644
--- a/amarok/src/scrobbler.cpp
+++ b/amarok/src/scrobbler.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp
index c885cd35..8f1379db 100644
--- a/amarok/src/sliderwidget.cpp
+++ b/amarok/src/sliderwidget.cpp
@@ -36,7 +36,7 @@
 
 #include <kiconloader.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmapeffect.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp
index bd94b520..5d478357 100644
--- a/amarok/src/smartplaylisteditor.cpp
+++ b/amarok/src/smartplaylisteditor.cpp
@@ -15,7 +15,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmountpoint.h>
 #include <knuminput.h>
 
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index 596ee632..673733e1 100644
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
@@ -16,7 +16,7 @@
 #include "enginebase.h"       //to get the scope
 #include "enginecontroller.h" //to get the engine
 #include "statusbar.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>       //Vis::Selector
 #include <kprocess.h>         //Vis::Selector
 #include <twin.h>             //Vis::Selector
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index 62b13cf4..906b481d 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <tdeversion.h>        //TDE_VERSION ifndefs.  Remove this once we reach a kde 4 dep
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemultipledrag.h>     //startDrag()
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>    //paintCell
diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp
index 9b6d1415..65d7c5eb 100644
--- a/amarok/src/statusbar/progressBar.cpp
+++ b/amarok/src/statusbar/progressBar.cpp
@@ -21,7 +21,7 @@
 #include "progressBar.h"
 #include "statusbar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp
index 448ba654..80e17450 100644
--- a/amarok/src/statusbar/queueLabel.cpp
+++ b/amarok/src/statusbar/queueLabel.cpp
@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 
 #include <tdeactioncollection.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h
index a1aa338a..235c2779 100644
--- a/amarok/src/statusbar/selectLabel.h
+++ b/amarok/src/statusbar/selectLabel.h
@@ -28,7 +28,7 @@
 #include "overlayWidget.h"
 #include "popupMessage.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqlabel.h>
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index ebd0503d..56e5c421 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeio/job.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqapplication.h>
diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp
index 0b4a666c..363ba6b0 100644
--- a/amarok/src/statusbar/statusbar.cpp
+++ b/amarok/src/statusbar/statusbar.cpp
@@ -29,7 +29,7 @@
 #include "statusbar.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqhbox.h>
 #include <tqlayout.h>
diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h
index 3730a1aa..61339cd7 100644
--- a/amarok/src/statusbar/toggleLabel.h
+++ b/amarok/src/statusbar/toggleLabel.h
@@ -28,7 +28,7 @@
 #include "popupMessage.h"
 
 #include <tdeactionclasses.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqlabel.h>
diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp
index 7f6a15c6..6b8886e5 100644
--- a/amarok/src/tagdialog.cpp
+++ b/amarok/src/tagdialog.cpp
@@ -34,13 +34,13 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <ktabwidget.h>
 #include <ktextedit.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/tagguesser.cpp b/amarok/src/tagguesser.cpp
index 59442dbe..21a79c7c 100644
--- a/amarok/src/tagguesser.cpp
+++ b/amarok/src/tagguesser.cpp
@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmacroexpander.h>
 
 FileNameScheme::FileNameScheme( const TQString &s )
diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp
index 5feb6136..572fdc66 100644
--- a/amarok/src/tooltip.cpp
+++ b/amarok/src/tooltip.cpp
@@ -22,7 +22,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqsimplerichtext.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "debug.h"
 #include "tooltip.h"
diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp
index 88a0077d..7b3bf4b9 100644
--- a/amarok/src/trackpickerdialog.cpp
+++ b/amarok/src/trackpickerdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "trackpickerdialog.h"
 #include "trackpickerdialogbase.h"
diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp
index ce7bf02f..499fa0a2 100644
--- a/amarok/src/transferdialog.cpp
+++ b/amarok/src/transferdialog.cpp
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 TransferDialog::TransferDialog( MediaDevice *mdev )