Rename additional header files to avoid conflicts with KDE4

127 files changed, 214 insertions, 214 deletions

diff --git a/apps/ktcachecheck/cachechecker.cpp b/apps/ktcachecheck/cachechecker.cpp
index c8371a7..3c3b35e 100644
--- a/apps/ktcachecheck/cachechecker.cpp
+++ b/apps/ktcachecheck/cachechecker.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/file.h>
 #include <util/error.h>
diff --git a/apps/ktorrent/addpeerwidget.cpp b/apps/ktorrent/addpeerwidget.cpp
index f93be34..063a6a9 100644
--- a/apps/ktorrent/addpeerwidget.cpp
+++ b/apps/ktorrent/addpeerwidget.cpp
@@ -22,11 +22,11 @@
 #include <util/constants.h>
 #include <interfaces/torrentinterface.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index c483f94..1dc1f1f 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index 78dde74..1c05b51 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdetoolbarbutton.h>
 #include <klineedit.h>
diff --git a/apps/ktorrent/groups/activedownloadsgroup.cpp b/apps/ktorrent/groups/activedownloadsgroup.cpp
index e4dd02f..ec3730e 100644
--- a/apps/ktorrent/groups/activedownloadsgroup.cpp
+++ b/apps/ktorrent/groups/activedownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "activedownloadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/activegroup.cpp b/apps/ktorrent/groups/activegroup.cpp
index 48a60ae..7a5e640 100644
--- a/apps/ktorrent/groups/activegroup.cpp
+++ b/apps/ktorrent/groups/activegroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "activegroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/activeuploadsgroup.cpp b/apps/ktorrent/groups/activeuploadsgroup.cpp
index aa50e97..80413b8 100644
--- a/apps/ktorrent/groups/activeuploadsgroup.cpp
+++ b/apps/ktorrent/groups/activeuploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "activeuploadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/allgroup.cpp b/apps/ktorrent/groups/allgroup.cpp
index eba5391..6b8ffb5 100644
--- a/apps/ktorrent/groups/allgroup.cpp
+++ b/apps/ktorrent/groups/allgroup.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include "allgroup.h"
 
 namespace kt
diff --git a/apps/ktorrent/groups/downloadgroup.cpp b/apps/ktorrent/groups/downloadgroup.cpp
index 085eb77..adf4f02 100644
--- a/apps/ktorrent/groups/downloadgroup.cpp
+++ b/apps/ktorrent/groups/downloadgroup.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 #include "downloadgroup.h"
 
diff --git a/apps/ktorrent/groups/group.cpp b/apps/ktorrent/groups/group.cpp
index 31142df..7a3cbf2 100644
--- a/apps/ktorrent/groups/group.cpp
+++ b/apps/ktorrent/groups/group.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "group.h"
 
 namespace kt
diff --git a/apps/ktorrent/groups/groupmanager.h b/apps/ktorrent/groups/groupmanager.h
index 135698c..5c5491e 100644
--- a/apps/ktorrent/groups/groupmanager.h
+++ b/apps/ktorrent/groups/groupmanager.h
@@ -21,7 +21,7 @@
 #define KTGROUPMANAGER_H
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/ptrmap.h>
 
 
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index dd4204b..2ed8682 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
diff --git a/apps/ktorrent/groups/inactivedownloadsgroup.cpp b/apps/ktorrent/groups/inactivedownloadsgroup.cpp
index b383160..548ba17 100644
--- a/apps/ktorrent/groups/inactivedownloadsgroup.cpp
+++ b/apps/ktorrent/groups/inactivedownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "inactivedownloadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/inactivegroup.cpp b/apps/ktorrent/groups/inactivegroup.cpp
index 3270697..326436f 100644
--- a/apps/ktorrent/groups/inactivegroup.cpp
+++ b/apps/ktorrent/groups/inactivegroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "inactivegroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/inactiveuploadsgroup.cpp b/apps/ktorrent/groups/inactiveuploadsgroup.cpp
index 8110a1a..2de8732 100644
--- a/apps/ktorrent/groups/inactiveuploadsgroup.cpp
+++ b/apps/ktorrent/groups/inactiveuploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "inactiveuploadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/queueddownloadsgroup.cpp b/apps/ktorrent/groups/queueddownloadsgroup.cpp
index c182472..36fab9f 100644
--- a/apps/ktorrent/groups/queueddownloadsgroup.cpp
+++ b/apps/ktorrent/groups/queueddownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "queueddownloadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/queueduploadsgroup.cpp b/apps/ktorrent/groups/queueduploadsgroup.cpp
index 8c346a4..c51ab42 100644
--- a/apps/ktorrent/groups/queueduploadsgroup.cpp
+++ b/apps/ktorrent/groups/queueduploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "queueduploadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/apps/ktorrent/groups/torrentdrag.cpp
index 0860ab6..c7296fe 100644
--- a/apps/ktorrent/groups/torrentdrag.cpp
+++ b/apps/ktorrent/groups/torrentdrag.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "torrentdrag.h"
 
 namespace kt
diff --git a/apps/ktorrent/groups/uploadgroup.cpp b/apps/ktorrent/groups/uploadgroup.cpp
index 9baca6d..ee65293 100644
--- a/apps/ktorrent/groups/uploadgroup.cpp
+++ b/apps/ktorrent/groups/uploadgroup.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 #include "uploadgroup.h"
 
diff --git a/apps/ktorrent/groups/userdownloadsgroup.cpp b/apps/ktorrent/groups/userdownloadsgroup.cpp
index 6a4960b..ff1b13b 100644
--- a/apps/ktorrent/groups/userdownloadsgroup.cpp
+++ b/apps/ktorrent/groups/userdownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "userdownloadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/useruploadsgroup.cpp b/apps/ktorrent/groups/useruploadsgroup.cpp
index d0e78bd..f8c9d96 100644
--- a/apps/ktorrent/groups/useruploadsgroup.cpp
+++ b/apps/ktorrent/groups/useruploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "useruploadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
index 5ddf3bc..22c77f7 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/apps/ktorrent/ipfilterwidget.cpp
@@ -33,8 +33,8 @@
 #include <klineedit.h>
 #include <tdesocketaddress.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #define MAX_RANGES 500
 
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 738ec2c..02df83a 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -28,12 +28,12 @@
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <tdeaccel.h>
diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp
index bc4a4b6..38204fe 100644
--- a/apps/ktorrent/ktorrentapp.cpp
+++ b/apps/ktorrent/ktorrentapp.cpp
@@ -20,8 +20,8 @@
 
 #include "ktorrentapp.h"
 
-#include <kglobal.h>
-#include <kstartupinfo.h>
+#include <tdeglobal.h>
+#include <tdestartupinfo.h>
 #include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index d194919..c520d60 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -20,11 +20,11 @@
  ***************************************************************************/
 #include <unistd.h>
 #include <tqdir.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeio/job.h>
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index d55db7d..a22afcb 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -18,14 +18,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdefiledialog.h>
 
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
index 81ccc99..4a60329 100644
--- a/apps/ktorrent/ktorrentviewitem.cpp
+++ b/apps/ktorrent/ktorrentviewitem.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <interfaces/torrentinterface.h>
 #include <tqdatetime.h>
 #include <tqpainter.h>
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp
index b31c310..2f2d42f 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/apps/ktorrent/ktorrentviewmenu.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <interfaces/torrentinterface.h>
 #include <groups/group.h>
diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp
index 96018b5..f658d77 100644
--- a/apps/ktorrent/main.cpp
+++ b/apps/ktorrent/main.cpp
@@ -22,7 +22,7 @@
 #endif
 
 #include <signal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index f550018..4754cd0 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -31,7 +31,7 @@
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp
index 5bf3be2..640fb3e 100644
--- a/apps/ktorrent/newui/buttonbar.cpp
+++ b/apps/ktorrent/newui/buttonbar.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "button.h"
 
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index 4c87ed0..7234038 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -28,10 +28,10 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/apps/ktorrent/pastedialog.cpp b/apps/ktorrent/pastedialog.cpp
index f96381b..82cf6df 100644
--- a/apps/ktorrent/pastedialog.cpp
+++ b/apps/ktorrent/pastedialog.cpp
@@ -26,8 +26,8 @@
 #include <tqapplication.h>
 #include <kurl.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name)
 		:PasteDlgBase(parent, name)
diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
index 12b8e31..73f6a4f 100644
--- a/apps/ktorrent/pref.cpp
+++ b/apps/ktorrent/pref.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kactivelabel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcombobox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -29,12 +29,12 @@
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <tqlistview.h>
 #include <torrent/globals.h>
 #include <util/functions.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqdir.h>
 #include <tqslider.h>
diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
index 212c920..e70c5d3 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/apps/ktorrent/queuedialog.cpp
@@ -32,8 +32,8 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kiconloader.h>
 #include <ksqueezedtextlabel.h>
diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp
index 80fd681..5c9ef8a 100644
--- a/apps/ktorrent/scandialog.cpp
+++ b/apps/ktorrent/scandialog.cpp
@@ -18,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <util/error.h>
 #include <torrent/queuemanager.h>
 #include <torrent/torrentcontrol.h>
diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/apps/ktorrent/speedlimitsdlg.cpp
index 69c6a48..70e2f1c 100644
--- a/apps/ktorrent/speedlimitsdlg.cpp
+++ b/apps/ktorrent/speedlimitsdlg.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
index 491acda..fb3af47 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/apps/ktorrent/torrentcreatordlg.cpp
@@ -12,8 +12,8 @@
 #include <tqcheckbox.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index 3ab560d..ab4f2b2 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include "ktorrent.h"
 #include "trayicon.h"
diff --git a/apps/ktorrent/viewmanager.cpp b/apps/ktorrent/viewmanager.cpp
index ea767f4..eef9d06 100644
--- a/apps/ktorrent/viewmanager.cpp
+++ b/apps/ktorrent/viewmanager.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 #include <interfaces/torrentinterface.h>
 #include <groups/group.h>
diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp
index 40bd783..ff1792b 100644
--- a/apps/ktupnptest/main.cpp
+++ b/apps/ktupnptest/main.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp
index 5725e8a..f38c419 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/apps/ktupnptest/upnptestapp.cpp
@@ -18,9 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtextbrowser.h>
 #include <util/error.h>
 #include "upnptestapp.h"
diff --git a/libktorrent/datachecker/multidatachecker.cpp b/libktorrent/datachecker/multidatachecker.cpp
index dcbac73..f63e05c 100644
--- a/libktorrent/datachecker/multidatachecker.cpp
+++ b/libktorrent/datachecker/multidatachecker.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <util/log.h>
 #include <util/file.h>
diff --git a/libktorrent/datachecker/singledatachecker.cpp b/libktorrent/datachecker/singledatachecker.cpp
index 21341bb..4ecc268 100644
--- a/libktorrent/datachecker/singledatachecker.cpp
+++ b/libktorrent/datachecker/singledatachecker.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <util/log.h>
 #include <util/file.h>
diff --git a/libktorrent/functions.cpp b/libktorrent/functions.cpp
index f57837d..45ef9a2 100644
--- a/libktorrent/functions.cpp
+++ b/libktorrent/functions.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <util/functions.h>
 #include "functions.h"
diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp
index 0b37646..167ff2d 100644
--- a/libktorrent/interfaces/filetreediritem.cpp
+++ b/libktorrent/interfaces/filetreediritem.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <util/functions.h>
diff --git a/libktorrent/interfaces/filetreeitem.cpp b/libktorrent/interfaces/filetreeitem.cpp
index b864b72..ca431b5 100644
--- a/libktorrent/interfaces/filetreeitem.cpp
+++ b/libktorrent/interfaces/filetreeitem.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <interfaces/functions.h>
diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp
index 709b647..096a48c 100644
--- a/libktorrent/interfaces/functions.cpp
+++ b/libktorrent/interfaces/functions.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include "functions.h"
 
 using namespace bt;
diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
index ca44f5d..7fe1424 100644
--- a/libktorrent/labelview.cpp
+++ b/libktorrent/labelview.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <util/log.h>
 #include "labelview.h"
 
diff --git a/libktorrent/migrate/ccmigrate.cpp b/libktorrent/migrate/ccmigrate.cpp
index e824830..631ac6f 100644
--- a/libktorrent/migrate/ccmigrate.cpp
+++ b/libktorrent/migrate/ccmigrate.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/file.h>
 #include <util/error.h>
diff --git a/libktorrent/migrate/migrate.cpp b/libktorrent/migrate/migrate.cpp
index ef6ddf1..4de80cc 100644
--- a/libktorrent/migrate/migrate.cpp
+++ b/libktorrent/migrate/migrate.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/fileops.h>
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
index 497ea2e..872c8c1 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/libktorrent/pluginmanagerprefpage.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tqheader.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <util/constants.h>
 #include "pluginmanager.h"
diff --git a/libktorrent/torrent/announcelist.cpp b/libktorrent/torrent/announcelist.cpp
index 4d3d4fa..65424d0 100644
--- a/libktorrent/torrent/announcelist.cpp
+++ b/libktorrent/torrent/announcelist.cpp
@@ -24,7 +24,7 @@
 #include "globals.h"
 #include <util/log.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstringlist.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/libktorrent/torrent/bdecoder.cpp b/libktorrent/torrent/bdecoder.cpp
index e965eb5..38bc67b 100644
--- a/libktorrent/torrent/bdecoder.cpp
+++ b/libktorrent/torrent/bdecoder.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <util/log.h>
 #include <util/error.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "bdecoder.h"
 #include "bnode.h"
 #include "globals.h"
diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
index cb6f902..fc7cd33 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/libktorrent/torrent/cachefile.cpp
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <tqfile.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <util/array.h>
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp
index 38e4fec..76638ce 100644
--- a/libktorrent/torrent/chunkdownload.cpp
+++ b/libktorrent/torrent/chunkdownload.cpp
@@ -30,7 +30,7 @@
 #include "piece.h"
 #include "peerdownloader.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace bt
 {	
diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp
index aa50ad8..1fa4607 100644
--- a/libktorrent/torrent/chunkmanager.cpp
+++ b/libktorrent/torrent/chunkmanager.cpp
@@ -33,7 +33,7 @@
 #include <util/functions.h>
 #include "globals.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/dndfile.cpp b/libktorrent/torrent/dndfile.cpp
index dffb763..23f0f1c 100644
--- a/libktorrent/torrent/dndfile.cpp
+++ b/libktorrent/torrent/dndfile.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/file.h>
 #include <util/error.h>
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/httptracker.cpp b/libktorrent/torrent/httptracker.cpp
index 249a60e..2367ca0 100644
--- a/libktorrent/torrent/httptracker.cpp
+++ b/libktorrent/torrent/httptracker.cpp
@@ -20,7 +20,7 @@
 #include <config.h>
  
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqhostaddress.h>
 #include <util/log.h>
 #include <util/functions.h>
diff --git a/libktorrent/torrent/multifilecache.cpp b/libktorrent/torrent/multifilecache.cpp
index ff5c8a9..aaa2797 100644
--- a/libktorrent/torrent/multifilecache.cpp
+++ b/libktorrent/torrent/multifilecache.cpp
@@ -21,7 +21,7 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <util/file.h>
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/peerid.cpp b/libktorrent/torrent/peerid.cpp
index e6a3387..f15d5f2 100644
--- a/libktorrent/torrent/peerid.cpp
+++ b/libktorrent/torrent/peerid.cpp
@@ -20,7 +20,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "peerid.h"
 #include "ktversion.h"
 
diff --git a/libktorrent/torrent/peermanager.cpp b/libktorrent/torrent/peermanager.cpp
index eefd246..3f542c8 100644
--- a/libktorrent/torrent/peermanager.cpp
+++ b/libktorrent/torrent/peermanager.cpp
@@ -34,7 +34,7 @@
 #include <tqhostaddress.h>
 #include <mse/streamsocket.h> 
 #include <mse/encryptedauthenticate.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ipblocklist.h"
 #include "chunkcounter.h"
 #include "authenticationmonitor.h"
diff --git a/libktorrent/torrent/peersourcemanager.cpp b/libktorrent/torrent/peersourcemanager.cpp
index 136d9e5..a48ccb0 100644
--- a/libktorrent/torrent/peersourcemanager.cpp
+++ b/libktorrent/torrent/peersourcemanager.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <functions.h>
 #include <util/log.h>
 #include <torrent/globals.h>
diff --git a/libktorrent/torrent/preallocationthread.cpp b/libktorrent/torrent/preallocationthread.cpp
index 4b2e40d..dfa8c56 100644
--- a/libktorrent/torrent/preallocationthread.cpp
+++ b/libktorrent/torrent/preallocationthread.cpp
@@ -26,7 +26,7 @@
 #include <util/log.h>
 #include <util/error.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "preallocationthread.h"
 #include "chunkmanager.h"
 #include "globals.h"
diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp
index bf64a2e..bc04f9f 100644
--- a/libktorrent/torrent/queuemanager.cpp
+++ b/libktorrent/torrent/queuemanager.cpp
@@ -21,8 +21,8 @@
 #include "queuemanager.h"
 
 #include <tqstring.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/sha1hash.h>
diff --git a/libktorrent/torrent/singlefilecache.cpp b/libktorrent/torrent/singlefilecache.cpp
index 9df0719..c89c0be 100644
--- a/libktorrent/torrent/singlefilecache.cpp
+++ b/libktorrent/torrent/singlefilecache.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfileinfo.h>
 #include <tqstringlist.h> 
 #include <util/fileops.h>
diff --git a/libktorrent/torrent/torrent.cpp b/libktorrent/torrent/torrent.cpp
index c175be9..a829230 100644
--- a/libktorrent/torrent/torrent.cpp
+++ b/libktorrent/torrent/torrent.cpp
@@ -32,7 +32,7 @@
 #include "bnode.h"
 #include "announcelist.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
index 207b709..14ff2c6 100644
--- a/libktorrent/torrent/torrentcontrol.cpp
+++ b/libktorrent/torrent/torrentcontrol.cpp
@@ -20,8 +20,8 @@
  ***************************************************************************/
 #include <tqdir.h>
 #include <tqfile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tqtextstream.h>
 #include <util/log.h>
diff --git a/libktorrent/torrent/torrentcreator.cpp b/libktorrent/torrent/torrentcreator.cpp
index fae7d75..35c8c3e 100644
--- a/libktorrent/torrent/torrentcreator.cpp
+++ b/libktorrent/torrent/torrentcreator.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <time.h>
 #include <util/error.h>
 #include <ktversion.h>
diff --git a/libktorrent/torrent/udptrackersocket.cpp b/libktorrent/torrent/udptrackersocket.cpp
index bab6f02..6df3cdf 100644
--- a/libktorrent/torrent/udptrackersocket.cpp
+++ b/libktorrent/torrent/udptrackersocket.cpp
@@ -27,8 +27,8 @@
 #include <net/portlist.h>
 #include <util/log.h>
 #include <util/functions.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "globals.h"
 #include "udptrackersocket.h"
 		
diff --git a/libktorrent/util/file.cpp b/libktorrent/util/file.cpp
index d27ccba..95af348 100644
--- a/libktorrent/util/file.cpp
+++ b/libktorrent/util/file.cpp
@@ -24,7 +24,7 @@
 
 #include <tqfile.h>
 #include "config.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libktorrent/util/fileops.cpp b/libktorrent/util/fileops.cpp
index a3e2bf1..29e7549 100644
--- a/libktorrent/util/fileops.cpp
+++ b/libktorrent/util/fileops.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/libktorrent/util/functions.cpp b/libktorrent/util/functions.cpp
index b53a88e..2480a24 100644
--- a/libktorrent/util/functions.cpp
+++ b/libktorrent/util/functions.cpp
@@ -29,9 +29,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "functions.h"
 #include "error.h"
 #include "log.h"
diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp
index 258506a..42e2716 100644
--- a/libktorrent/util/log.cpp
+++ b/libktorrent/util/log.cpp
@@ -20,7 +20,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 #include <tqtextstream.h>
 #include <tqfile.h>
diff --git a/libktorrent/util/mmapfile.cpp b/libktorrent/util/mmapfile.cpp
index 398ce34..b60bef9 100644
--- a/libktorrent/util/mmapfile.cpp
+++ b/libktorrent/util/mmapfile.cpp
@@ -32,7 +32,7 @@
 #include <tqfile.h>
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/error.h>
 #include <util/log.h>
 #include <torrent/globals.h>
diff --git a/plugins/infowidget/availabilitychunkbar.cpp b/plugins/infowidget/availabilitychunkbar.cpp
index 7f26efa..4b50f27 100644
--- a/plugins/infowidget/availabilitychunkbar.cpp
+++ b/plugins/infowidget/availabilitychunkbar.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <util/bitset.h>
 #include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/chunkbar.cpp b/plugins/infowidget/chunkbar.cpp
index 06fed4a..1cd45eb 100644
--- a/plugins/infowidget/chunkbar.cpp
+++ b/plugins/infowidget/chunkbar.cpp
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <math.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmime.h>
 #include <tqimage.h>
 #include <util/log.h>
diff --git a/plugins/infowidget/chunkdownloadview.cpp b/plugins/infowidget/chunkdownloadview.cpp
index 0a93f14..e67da32 100644
--- a/plugins/infowidget/chunkdownloadview.cpp
+++ b/plugins/infowidget/chunkdownloadview.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <interfaces/chunkdownloadinterface.h>
 #include <interfaces/functions.h>
diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
index 1e4b87b..c0e9d72 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/plugins/infowidget/fileview.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <util/bitset.h>
 #include <util/functions.h>
diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp
index 641be87..111070b 100644
--- a/plugins/infowidget/floatspinbox.cpp
+++ b/plugins/infowidget/floatspinbox.cpp
@@ -20,8 +20,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include "floatspinbox.h"
 #include "localefloatvalidator.h"
diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp
index 2a1ddff..c872b58 100644
--- a/plugins/infowidget/infowidgetplugin.cpp
+++ b/plugins/infowidget/infowidgetplugin.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include <tqscrollview.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <interfaces/coreinterface.h>
 #include <interfaces/guiinterface.h>
 #include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/plugins/infowidget/infowidgetprefpage.cpp
index 4ddd0dd..63e2987 100644
--- a/plugins/infowidget/infowidgetprefpage.cpp
+++ b/plugins/infowidget/infowidgetprefpage.cpp
@@ -17,9 +17,9 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include "infowidgetplugin.h"
 #include "infowidgetprefpage.h"
diff --git a/plugins/infowidget/iwfiletreediritem.cpp b/plugins/infowidget/iwfiletreediritem.cpp
index bb6b821..7bfe462 100644
--- a/plugins/infowidget/iwfiletreediritem.cpp
+++ b/plugins/infowidget/iwfiletreediritem.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <util/functions.h>
 #include <interfaces/torrentfileinterface.h>
 #include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp
index d4837dd..effe20a 100644
--- a/plugins/infowidget/iwfiletreeitem.cpp
+++ b/plugins/infowidget/iwfiletreeitem.cpp
@@ -17,9 +17,9 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <interfaces/functions.h>
 #include <interfaces/torrentinterface.h>
 #include <interfaces/torrentfileinterface.h>
diff --git a/plugins/infowidget/localefloatvalidator.cpp b/plugins/infowidget/localefloatvalidator.cpp
index 5990ebf..48aa75c 100644
--- a/plugins/infowidget/localefloatvalidator.cpp
+++ b/plugins/infowidget/localefloatvalidator.cpp
@@ -19,8 +19,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include "localefloatvalidator.h"
 
 kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * parent, const char * name )
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index 4fccbc4..f3b346f 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -21,11 +21,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesocketaddress.h>
 #include <tqpoint.h>
 #include <tqlistview.h>
diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp
index 5c851b9..a4eab2c 100644
--- a/plugins/infowidget/statustab.cpp
+++ b/plugins/infowidget/statustab.cpp
@@ -21,8 +21,8 @@
 #include <float.h>
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <interfaces/functions.h>
 #include <interfaces/torrentinterface.h>
 
diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp
index c689f26..d3f01ba 100644
--- a/plugins/infowidget/trackerview.cpp
+++ b/plugins/infowidget/trackerview.cpp
@@ -29,12 +29,12 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <ksqueezedtextlabel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 
diff --git a/plugins/ipfilter/antip2p.cpp b/plugins/ipfilter/antip2p.cpp
index d448bd5..802c37c 100644
--- a/plugins/ipfilter/antip2p.cpp
+++ b/plugins/ipfilter/antip2p.cpp
@@ -25,7 +25,7 @@
 #include <util/constants.h>
 #include <util/mmapfile.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <tqstring.h>
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index 1ee2604..2334297 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -20,11 +20,11 @@
 #include "convertdialog.h"
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <kmimetype.h>
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index d68651a..ae44ab2 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -25,13 +25,13 @@
 #include "convertdialog.h"
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <kmimetype.h>
diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp
index 4a2ca9b..34a2c3f 100644
--- a/plugins/logviewer/logprefpage.cpp
+++ b/plugins/logviewer/logprefpage.cpp
@@ -20,8 +20,8 @@
 #include "logprefpage.h"
 #include "logprefwidget.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 namespace kt
diff --git a/plugins/logviewer/logprefwidget.cpp b/plugins/logviewer/logprefwidget.cpp
index 46ea88d..66a6cdb 100644
--- a/plugins/logviewer/logprefwidget.cpp
+++ b/plugins/logviewer/logprefwidget.cpp
@@ -21,8 +21,8 @@
 #include "logviewerpluginsettings.h"
 #include "logflags.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqwidget.h>
 #include <tqstring.h>
diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp
index 343080f..8b1be8a 100644
--- a/plugins/logviewer/logviewer.cpp
+++ b/plugins/logviewer/logviewer.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tqapplication.h>
 #include "logviewer.h"
diff --git a/plugins/logviewer/logviewerplugin.cpp b/plugins/logviewer/logviewerplugin.cpp
index 4c11680..b586aad 100644
--- a/plugins/logviewer/logviewerplugin.cpp
+++ b/plugins/logviewer/logviewerplugin.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <util/log.h>
 #include <torrent/globals.h>
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index 6c227f7..6f517be 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -18,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kurlrequester.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <util/log.h>
diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/plugins/partfileimport/partfileimportplugin.cpp
index e74ae13..148cf4f 100644
--- a/plugins/partfileimport/partfileimportplugin.cpp
+++ b/plugins/partfileimport/partfileimportplugin.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
 #include <tdepopupmenu.h>
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index 22289f1..5b45a4c 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "rssfeed.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <krfcdate.h>
 #include <tdeio/netaccess.h>
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 97c5b9c..8addd09 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -21,12 +21,12 @@
 
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <keditlistbox.h>
 // #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <tqobject.h>
diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp
index 051c8e2..4a60921 100644
--- a/plugins/rssfeed/rssfeedplugin.cpp
+++ b/plugins/rssfeed/rssfeedplugin.cpp
@@ -29,9 +29,9 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "rssfeedmanager.h"
 #include "rssfeedplugin.h"
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index b17bec8..561ca27 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "rsslinkdownloader.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqfile.h>
 
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index 6badd61..a496af7 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -21,7 +21,7 @@
 #define RSSLINKDOWNLOADER_H
 
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <interfaces/coreinterface.h>
 #include <torrent/globals.h>
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index 1180f4b..dfceba0 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -21,7 +21,7 @@
 
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 #include <tqstring.h>
diff --git a/plugins/scanfolder/scanfolderplugin.cpp b/plugins/scanfolder/scanfolderplugin.cpp
index 2d9c069..710d1d0 100644
--- a/plugins/scanfolder/scanfolderplugin.cpp
+++ b/plugins/scanfolder/scanfolderplugin.cpp
@@ -28,9 +28,9 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "scanfolder.h"
 #include "scanfolderplugin.h"
diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/plugins/scanfolder/scanfolderprefpage.cpp
index b8dd406..9fc466e 100644
--- a/plugins/scanfolder/scanfolderprefpage.cpp
+++ b/plugins/scanfolder/scanfolderprefpage.cpp
@@ -20,8 +20,8 @@
 #include "scanfolderplugin.h"
 #include "scanfolderprefpage.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/plugins/scanfolder/scanfolderprefpagewidget.cpp b/plugins/scanfolder/scanfolderprefpagewidget.cpp
index 5a96afd..14b89ff 100644
--- a/plugins/scanfolder/scanfolderprefpagewidget.cpp
+++ b/plugins/scanfolder/scanfolderprefpagewidget.cpp
@@ -25,9 +25,9 @@
 #include <tqcheckbox.h>
 #include <tqfile.h>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 namespace kt
diff --git a/plugins/scheduler/bwscheduler.cpp b/plugins/scheduler/bwscheduler.cpp
index 5f2502a..77d6b1c 100644
--- a/plugins/scheduler/bwscheduler.cpp
+++ b/plugins/scheduler/bwscheduler.cpp
@@ -35,7 +35,7 @@
 #include <tqfile.h>
 #include <tqptrlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 using namespace bt;
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
index 48d00e9..38ab296 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/plugins/scheduler/bwsprefpagewidget.cpp
@@ -24,11 +24,11 @@
 #include "schedulerpluginsettings.h"
 
 #include <knuminput.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
diff --git a/plugins/scheduler/bwswidget.cpp b/plugins/scheduler/bwswidget.cpp
index dd9728f..b3358a7 100644
--- a/plugins/scheduler/bwswidget.cpp
+++ b/plugins/scheduler/bwswidget.cpp
@@ -20,7 +20,7 @@
 #include "bwswidget.h"
 #include "schedulerpluginsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstringlist.h>
 #include <tqpixmap.h>
 #include <tqtable.h>
@@ -29,7 +29,7 @@
 #include <tqfont.h>
 #include <tqcolor.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 namespace kt
diff --git a/plugins/scheduler/schedulerplugin.cpp b/plugins/scheduler/schedulerplugin.cpp
index 0f1c6fa..d0b8f68 100644
--- a/plugins/scheduler/schedulerplugin.cpp
+++ b/plugins/scheduler/schedulerplugin.cpp
@@ -28,11 +28,11 @@
 #include <tqtimer.h>
 #include <tqdatetime.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "schedulerplugin.h"
 #include "schedulerpluginsettings.h"
diff --git a/plugins/scheduler/schedulerprefpage.cpp b/plugins/scheduler/schedulerprefpage.cpp
index f6219a8..3977a14 100644
--- a/plugins/scheduler/schedulerprefpage.cpp
+++ b/plugins/scheduler/schedulerprefpage.cpp
@@ -23,8 +23,8 @@
 #include "schedulerplugin.h"
 #include "schedulerpluginsettings.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
index 3179650..a0c02fe 100644
--- a/plugins/search/htmlpart.cpp
+++ b/plugins/search/htmlpart.cpp
@@ -17,14 +17,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 //#include <tqfile.h>
 #include <tqclipboard.h>
 #include <tqapplication.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdeparts/browserextension.h>
 #include <util/constants.h>
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index 94f77da..e1126f5 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
 #include <tdepopupmenu.h>
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index ba79b00..fdfb941 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -21,15 +21,15 @@
 #include <kurl.h>
 #include <tqtooltip.h>
 #include <tqfile.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <klineedit.h>
 
diff --git a/plugins/search/searchtab.cpp b/plugins/search/searchtab.cpp
index 1d64eb0..c752bc5 100644
--- a/plugins/search/searchtab.cpp
+++ b/plugins/search/searchtab.cpp
@@ -22,13 +22,13 @@
 #include <tqapplication.h>
 #include <tqlistbox.h>
 #include <tqcheckbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 #include <kcompletion.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "searchtab.h"
 #include "searchenginelist.h"
 #include "searchpluginsettings.h"
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index d6b4154..128ceeb 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -28,15 +28,15 @@
 #include <tqstringlist.h> 
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h> 
 #include <kiconloader.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
 #include <tdeparts/partmanager.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
 #include <util/log.h>
diff --git a/plugins/stats/ChartDrawer.h b/plugins/stats/ChartDrawer.h
index 3dc2f48..d7211b0 100644
--- a/plugins/stats/ChartDrawer.h
+++ b/plugins/stats/ChartDrawer.h
@@ -32,7 +32,7 @@
 #include <tqmime.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <vector>
 #include <cmath>
diff --git a/plugins/stats/StatsPluginPrefs.h b/plugins/stats/StatsPluginPrefs.h
index 271caf2..43c524d 100644
--- a/plugins/stats/StatsPluginPrefs.h
+++ b/plugins/stats/StatsPluginPrefs.h
@@ -25,8 +25,8 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <interfaces/prefpageinterface.h>
diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp
index aa5773a..a370966 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/plugins/upnp/upnpplugin.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp
index e360b3c..1d3a6da 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/plugins/upnp/upnpprefpage.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include "upnpprefpage.h"
 #include "upnpprefwidget.h"
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index b44c43d..7d0bbb5 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <torrent/udptrackersocket.h>
 #include <torrent/globals.h>
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index d88995a..0e18e92 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <stdlib.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqstringlist.h>
 #include <tdeio/netaccess.h>
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index 97aafae..24e847f 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -22,10 +22,10 @@
 #include <tqdatetime.h>
 #include <tdeapplication.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfileinfo.h>
 #include <tqsocket.h>
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index a4f5f6a..eb42684 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include <tdeio/global.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <net/socketmonitor.h>
 #include <torrent/choker.h>
diff --git a/plugins/webinterface/webinterfaceplugin.cpp b/plugins/webinterface/webinterfaceplugin.cpp
index 32cc164..fb47d03 100644
--- a/plugins/webinterface/webinterfaceplugin.cpp
+++ b/plugins/webinterface/webinterfaceplugin.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <util/log.h>
 #include <interfaces/coreinterface.h>
diff --git a/plugins/webinterface/webinterfaceprefpage.h b/plugins/webinterface/webinterfaceprefpage.h
index 9bf606e..f05c723 100644
--- a/plugins/webinterface/webinterfaceprefpage.h
+++ b/plugins/webinterface/webinterfaceprefpage.h
@@ -23,8 +23,8 @@
 #include <interfaces/prefpageinterface.h>
 #include "webinterfaceprefwidget.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 namespace kt
 {
diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/plugins/webinterface/webinterfaceprefwidget.cpp
index 1e30a08..c1e19f4 100644
--- a/plugins/webinterface/webinterfaceprefwidget.cpp
+++ b/plugins/webinterface/webinterfaceprefwidget.cpp
@@ -21,8 +21,8 @@
 #include "webinterfaceprefwidget.h"
 #include "webinterfacepluginsettings.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>