Rename additional header files to avoid conflicts with KDE4

91 files changed, 143 insertions, 143 deletions

diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp
index 3130013..e715a07 100644
--- a/konversation/src/alias_preferences.cpp
+++ b/konversation/src/alias_preferences.cpp
@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index 4c4dfde..02fbda3 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <tdeparts/componentfactory.h>
diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp
index 3f91de6..7ecb53c 100644
--- a/konversation/src/awaymanager.cpp
+++ b/konversation/src/awaymanager.cpp
@@ -21,7 +21,7 @@
 
 #include <dcopref.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
index 58eb89a..80130dc 100644
--- a/konversation/src/channel.cpp
+++ b/konversation/src/channel.cpp
@@ -22,8 +22,8 @@
 #include "ircinput.h"
 #include "ircviewbox.h"
 #include "ircview.h"
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include "common.h"
 #include "topiclabel.h"
 #include "channeloptionsdialog.h"
@@ -56,11 +56,11 @@
 #include <klineedit.h>
 #include <kinputdialog.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <twin.h>
 
diff --git a/konversation/src/channeldialog.cpp b/konversation/src/channeldialog.cpp
index f6cc746..d50a694 100644
--- a/konversation/src/channeldialog.cpp
+++ b/konversation/src/channeldialog.cpp
@@ -16,8 +16,8 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation
diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
index 7bbf891..db6d2f5 100644
--- a/konversation/src/channellistpanel.cpp
+++ b/konversation/src/channellistpanel.cpp
@@ -33,10 +33,10 @@
 #include <krun.h>
 #include <tdelistview.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 
diff --git a/konversation/src/channelnick.cpp b/konversation/src/channelnick.cpp
index 540dd5a..736bef5 100644
--- a/konversation/src/channelnick.cpp
+++ b/konversation/src/channelnick.cpp
@@ -20,7 +20,7 @@
 #include "channel.h"
 #include "server.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 ChannelNick::ChannelNick(const NickInfoPtr& nickInfo, const bool& isop, const bool& isadmin,
diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
index fd5007c..e9e9dbf 100644
--- a/konversation/src/channeloptionsdialog.cpp
+++ b/konversation/src/channeloptionsdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqtoolbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <ktextedit.h>
 #include <klineedit.h>
diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
index 68740a4..4e9c884 100644
--- a/konversation/src/chatwindow.cpp
+++ b/konversation/src/chatwindow.cpp
@@ -24,7 +24,7 @@
 #include <tqtooltip.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
 #include <tdeactioncollection.h>
diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp
index d3449fc..1916ed3 100644
--- a/konversation/src/common.cpp
+++ b/konversation/src/common.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqbitmap.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Konversation
diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg
index 03ce962..878423c 100644
--- a/konversation/src/config/konversation.kcfg
+++ b/konversation/src/config/konversation.kcfg
@@ -7,7 +7,7 @@
   <include>tqsize.h</include>
   <include>kdialog.h</include>
   <include>kuser.h</include>
-  <include>kglobalsettings.h</include>
+  <include>tdeglobalsettings.h</include>
   <kcfgfile name="konversationrc" />
 
   <group name="Appearance">
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
index d9a5393..03dedcd 100644
--- a/konversation/src/config/preferences.cpp
+++ b/konversation/src/config/preferences.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kuser.h>
 
diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp
index 294adec..52f3336 100644
--- a/konversation/src/connectionmanager.cpp
+++ b/konversation/src/connectionmanager.cpp
@@ -20,8 +20,8 @@
 
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 ConnectionManager::ConnectionManager(TQObject* parent) : TQObject(parent)
diff --git a/konversation/src/dcc_preferences.cpp b/konversation/src/dcc_preferences.cpp
index 8dd652a..880bd4c 100644
--- a/konversation/src/dcc_preferences.cpp
+++ b/konversation/src/dcc_preferences.cpp
@@ -14,7 +14,7 @@
 
 #include <tqcombobox.h>
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 DCC_Config::DCC_Config(TQWidget *parent, const char* name) :
diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
index 99e37d8..7855029 100644
--- a/konversation/src/dccchat.cpp
+++ b/konversation/src/dccchat.cpp
@@ -34,8 +34,8 @@
 #include <tqpopupmenu.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kserversocket.h>
 #include <tdesocketaddress.h>
diff --git a/konversation/src/dcccommon.cpp b/konversation/src/dcccommon.cpp
index 4bf2ef0..0c6d071 100644
--- a/konversation/src/dcccommon.cpp
+++ b/konversation/src/dcccommon.cpp
@@ -18,7 +18,7 @@
 
 #include <tqhostaddress.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kresolver.h>
 #include <kserversocket.h>
 
diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp
index 3489c84..c1eb985 100644
--- a/konversation/src/dccrecipientdialog.cpp
+++ b/konversation/src/dccrecipientdialog.cpp
@@ -17,7 +17,7 @@
 #include <tqlayout.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/konversation/src/dccresumedialog.cpp b/konversation/src/dccresumedialog.cpp
index 30b687b..97d14a7 100644
--- a/konversation/src/dccresumedialog.cpp
+++ b/konversation/src/dccresumedialog.cpp
@@ -19,7 +19,7 @@
 #include <tqvbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp
index 4bdbcb0..f8d5558 100644
--- a/konversation/src/dcctransferdetailedinfopanel.cpp
+++ b/konversation/src/dcctransferdetailedinfopanel.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <krun.h>
 #include <kurlrequester.h>
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 1028200..09ae0f3 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -29,12 +29,12 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <tdeapplication.h>
diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
index a0a54ac..85b532c 100644
--- a/konversation/src/dcctransferpanelitem.cpp
+++ b/konversation/src/dcctransferpanelitem.cpp
@@ -25,11 +25,11 @@
 
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <krun.h>
 
diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp
index 72b77dd..536eab0 100644
--- a/konversation/src/dcctransferrecv.cpp
+++ b/konversation/src/dcctransferrecv.cpp
@@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kserversocket.h>
 #include <kstandarddirs.h>
 #include <kstreamsocket.h>
diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp
index 15b45fd..69c09fc 100644
--- a/konversation/src/dcctransfersend.cpp
+++ b/konversation/src/dcctransfersend.cpp
@@ -34,7 +34,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kserversocket.h>
 #include <tdesocketaddress.h>
 #include <kstreamsocket.h>
diff --git a/konversation/src/editnotifydialog.cpp b/konversation/src/editnotifydialog.cpp
index 8874463..4971c9a 100644
--- a/konversation/src/editnotifydialog.cpp
+++ b/konversation/src/editnotifydialog.cpp
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 EditNotifyDialog::EditNotifyDialog(TQWidget* parent,
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index c810be7..d9cb9c1 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -22,14 +22,14 @@
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 #include <kiconloader.h>
diff --git a/konversation/src/identity.cpp b/konversation/src/identity.cpp
index bcb39db..ace74df 100644
--- a/konversation/src/identity.cpp
+++ b/konversation/src/identity.cpp
@@ -18,7 +18,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 int Identity::s_availableId = 0;
diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp
index cfa592a..4e61c19 100644
--- a/konversation/src/identitydialog.cpp
+++ b/konversation/src/identitydialog.cpp
@@ -28,11 +28,11 @@
 #include <tqwhatsthis.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuser.h>
 
 
diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp
index 227701e..4a2c4e5 100644
--- a/konversation/src/ignore_preferences.cpp
+++ b/konversation/src/ignore_preferences.cpp
@@ -15,7 +15,7 @@
 #include "ignore.h"
 #include "preferences.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqlistview.h>
 #include <tqlineedit.h>
diff --git a/konversation/src/ignorelistviewitem.cpp b/konversation/src/ignorelistviewitem.cpp
index 1e40457..b1a4a7f 100644
--- a/konversation/src/ignorelistviewitem.cpp
+++ b/konversation/src/ignorelistviewitem.cpp
@@ -14,7 +14,7 @@
 #include "ignorelistviewitem.h"
 #include "ignore.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp
index 2bb52f4..91cff9e 100644
--- a/konversation/src/inputfilter.cpp
+++ b/konversation/src/inputfilter.cpp
@@ -28,7 +28,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <kstringhandler.h>
 #include <config.h>
diff --git a/konversation/src/insertchardialog.cpp b/konversation/src/insertchardialog.cpp
index 4c6c80c..dfd1463 100644
--- a/konversation/src/insertchardialog.cpp
+++ b/konversation/src/insertchardialog.cpp
@@ -12,7 +12,7 @@
 #include "insertchardialog.h"
 
 #include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kguiitem.h>
 
 
diff --git a/konversation/src/irccharsets.cpp b/konversation/src/irccharsets.cpp
index 5daf06d..5b3dd7a 100644
--- a/konversation/src/irccharsets.cpp
+++ b/konversation/src/irccharsets.cpp
@@ -15,7 +15,7 @@
 #include <tqtextcodec.h>
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 
 #include <tqlocale.h>
diff --git a/konversation/src/irccolorchooser.cpp b/konversation/src/irccolorchooser.cpp
index 00fcdb0..7a07263 100644
--- a/konversation/src/irccolorchooser.cpp
+++ b/konversation/src/irccolorchooser.cpp
@@ -19,7 +19,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 
diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
index 476a32d..2fcc05a 100644
--- a/konversation/src/ircinput.cpp
+++ b/konversation/src/ircinput.cpp
@@ -28,8 +28,8 @@
 #include <tqpopupmenu.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdecompletionbox.h>
 
 #define MAXHISTORY 100
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index 7f5f2af..c7c6aad 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -45,8 +45,8 @@
 
 #include <dcopref.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kbookmark.h>
@@ -59,13 +59,13 @@
 #include <kshell.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tdestdaccel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp
index 0cb3218..6fe74c5 100644
--- a/konversation/src/ircviewbox.cpp
+++ b/konversation/src/ircviewbox.cpp
@@ -13,7 +13,7 @@
 #include "ircview.h"
 #include "searchbar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
diff --git a/konversation/src/joinchanneldialog.cpp b/konversation/src/joinchanneldialog.cpp
index d50eb8c..819ab95 100644
--- a/konversation/src/joinchanneldialog.cpp
+++ b/konversation/src/joinchanneldialog.cpp
@@ -17,7 +17,7 @@
 
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 
diff --git a/konversation/src/konsolepanel.cpp b/konversation/src/konsolepanel.cpp
index 80270b6..e604d37 100644
--- a/konversation/src/konsolepanel.cpp
+++ b/konversation/src/konsolepanel.cpp
@@ -15,7 +15,7 @@
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KonsolePanel::KonsolePanel(TQWidget *p) : ChatWindow( p ), k_part (0)
diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp
index bed1288..b31344a 100644
--- a/konversation/src/konvdcop.cpp
+++ b/konversation/src/konvdcop.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KonvDCOP::KonvDCOP() : DCOPObject("irc"), TQObject(0, "irc")
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index c5dcd20..a3e78bb 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -41,8 +41,8 @@
 #include <dcopclient.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 
diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp
index 87ca976..813ff80 100644
--- a/konversation/src/konversationmainwindow.cpp
+++ b/konversation/src/konversationmainwindow.cpp
@@ -39,20 +39,20 @@
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
 #include <kkeydialog.h>
 #include <tdeversion.h>
 #include <kedittoolbar.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <scriptmanager.h>
-#include <kabc/addressbook.h>
-#include <kabc/errorhandler.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/errorhandler.h>
 
 #include <config.h>
 #ifdef  USE_KNOTIFY
diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp
index bdfc9ca..c2223d3 100644
--- a/konversation/src/konversationstatusbar.cpp
+++ b/konversation/src/konversationstatusbar.cpp
@@ -19,7 +19,7 @@
 #include <tqtooltip.h>
 
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <ksqueezedtextlabel.h>
 
diff --git a/konversation/src/konviconfigdialog.cpp b/konversation/src/konviconfigdialog.cpp
index 5fee076..f966096 100644
--- a/konversation/src/konviconfigdialog.cpp
+++ b/konversation/src/konviconfigdialog.cpp
@@ -40,7 +40,7 @@
 
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp
index c726aff..99e69d1 100644
--- a/konversation/src/konvisettingsdialog.cpp
+++ b/konversation/src/konvisettingsdialog.cpp
@@ -37,7 +37,7 @@
 #include <tqsplitter.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp
index 9948687..06fe441 100644
--- a/konversation/src/linkaddressbook/addressbook.cpp
+++ b/konversation/src/linkaddressbook/addressbook.cpp
@@ -22,8 +22,8 @@
 #include <tqstringlist.h>
 #include "tqwidget.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <twin.h>
diff --git a/konversation/src/linkaddressbook/addressbook.h b/konversation/src/linkaddressbook/addressbook.h
index 69dea7f..362d836 100644
--- a/konversation/src/linkaddressbook/addressbook.h
+++ b/konversation/src/linkaddressbook/addressbook.h
@@ -15,8 +15,8 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <kstaticdeleter.h>
 #include <tqobject.h>
diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
index e572dfa..1aea454 100644
--- a/konversation/src/linkaddressbook/addressbook_base.cpp
+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
@@ -20,12 +20,12 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 #include <krun.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Konversation
 {
diff --git a/konversation/src/linkaddressbook/addressbook_base.h b/konversation/src/linkaddressbook/addressbook_base.h
index 8fd9aac..6278a2e 100644
--- a/konversation/src/linkaddressbook/addressbook_base.h
+++ b/konversation/src/linkaddressbook/addressbook_base.h
@@ -25,8 +25,8 @@
 #include <config.h>
 
 
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 
 namespace Konversation
diff --git a/konversation/src/linkaddressbook/addresseeitem.cpp b/konversation/src/linkaddressbook/addresseeitem.cpp
index 0628a21..b8fea55 100644
--- a/konversation/src/linkaddressbook/addresseeitem.cpp
+++ b/konversation/src/linkaddressbook/addresseeitem.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/konversation/src/linkaddressbook/addresseeitem.h b/konversation/src/linkaddressbook/addresseeitem.h
index e7518b1..1a4088a 100644
--- a/konversation/src/linkaddressbook/addresseeitem.h
+++ b/konversation/src/linkaddressbook/addresseeitem.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <klineedit.h>
 #include <tdelistview.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 /**
   @short Special ListViewItem
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
index f4b5638..864dcfd 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
@@ -34,7 +34,7 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kinputdialog.h>
@@ -43,8 +43,8 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 
 LinkAddressbookUI::LinkAddressbookUI( TQWidget *parent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname )
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.h b/konversation/src/linkaddressbook/linkaddressbookui.h
index dd3cfba..acd1830 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.h
+++ b/konversation/src/linkaddressbook/linkaddressbookui.h
@@ -30,7 +30,7 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 class TQCheckListItem;
 class LinkAddressbookUI_Base;
diff --git a/konversation/src/linkaddressbook/nicklisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp
index 732b32e..af4757f 100644
--- a/konversation/src/linkaddressbook/nicklisttooltip.cpp
+++ b/konversation/src/linkaddressbook/nicklisttooltip.cpp
@@ -18,7 +18,7 @@
 #include "../nickinfo.h"
 #include "../common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
 
diff --git a/konversation/src/linkaddressbook/nicklisttooltip.h b/konversation/src/linkaddressbook/nicklisttooltip.h
index 728f9c6..e810fec 100644
--- a/konversation/src/linkaddressbook/nicklisttooltip.h
+++ b/konversation/src/linkaddressbook/nicklisttooltip.h
@@ -22,7 +22,7 @@
 #include <tqpoint.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class NickListView;
diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
index 30cc808..697fd22 100644
--- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
@@ -19,7 +19,7 @@
 #include "../nickinfo.h"
 #include "../nicksonline.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
 #include <tdelistview.h>
diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.h b/konversation/src/linkaddressbook/nicksonlinetooltip.h
index 5fd2896..d6f1451 100644
--- a/konversation/src/linkaddressbook/nicksonlinetooltip.h
+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.h
@@ -22,7 +22,7 @@
 #include <tqpoint.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class NicksOnline;
diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp
index f3f03e6..43c7ee8 100644
--- a/konversation/src/logfilereader.cpp
+++ b/konversation/src/logfilereader.cpp
@@ -30,9 +30,9 @@
 
 #include <kdialog.h>
 #include <tdetoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/jobclasses.h>
 
diff --git a/konversation/src/main.cpp b/konversation/src/main.cpp
index d3db469..899a4ce 100644
--- a/konversation/src/main.cpp
+++ b/konversation/src/main.cpp
@@ -15,7 +15,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
diff --git a/konversation/src/multilineedit.cpp b/konversation/src/multilineedit.cpp
index b4af548..63148bb 100644
--- a/konversation/src/multilineedit.cpp
+++ b/konversation/src/multilineedit.cpp
@@ -15,7 +15,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 TQString MultilineEdit::returnText;                // static
diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
index dddb473..a3f8d03 100644
--- a/konversation/src/nick.cpp
+++ b/konversation/src/nick.cpp
@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kabc/phonenumber.h>
+#include <tdelocale.h>
+#include <tdeabc/phonenumber.h>
 
 #include "konversationapplication.h"
 #include "preferences.h"
diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp
index 50e6409..b23b0b3 100644
--- a/konversation/src/nickinfo.cpp
+++ b/konversation/src/nickinfo.cpp
@@ -28,7 +28,7 @@
 
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 NickInfo::NickInfo(const TQString& nick, Server* server): TDEShared()
diff --git a/konversation/src/nickinfo.h b/konversation/src/nickinfo.h
index 9167b6f..c0c4300 100644
--- a/konversation/src/nickinfo.h
+++ b/konversation/src/nickinfo.h
@@ -19,7 +19,7 @@
 #include <tqdatetime.h>
 #include <ksharedptr.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 
 class Server;
diff --git a/konversation/src/nicklistbehavior_preferences.cpp b/konversation/src/nicklistbehavior_preferences.cpp
index 90aaaea..f64a4f3 100644
--- a/konversation/src/nicklistbehavior_preferences.cpp
+++ b/konversation/src/nicklistbehavior_preferences.cpp
@@ -18,7 +18,7 @@
 #include <tqheader.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 NictdelistBehavior_Config::NictdelistBehavior_Config(TQWidget *parent, const char *name)
diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp
index d135d63..39db932 100644
--- a/konversation/src/nicklistview.cpp
+++ b/konversation/src/nicklistview.cpp
@@ -18,7 +18,7 @@
 #include "linkaddressbook/addressbook.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
index 5bced05..37d6ad9 100644
--- a/konversation/src/nicksonline.cpp
+++ b/konversation/src/nicksonline.cpp
@@ -39,12 +39,12 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
diff --git a/konversation/src/notificationhandler.cpp b/konversation/src/notificationhandler.cpp
index 7b615e0..da10278 100644
--- a/konversation/src/notificationhandler.cpp
+++ b/konversation/src/notificationhandler.cpp
@@ -23,7 +23,7 @@
 
 #include <knotifyclient.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Konversation
diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
index 6443864..3836e20 100644
--- a/konversation/src/osd.cpp
+++ b/konversation/src/osd.cpp
@@ -24,7 +24,7 @@ the Free Software Foundation; either version 2 of the License, or
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>                      //unsetColors()
+#include <tdeglobalsettings.h>                      //unsetColors()
 
 #include <X11/Xlib.h>                             //reposition()
 
@@ -312,7 +312,7 @@ void OSDWidget::reposition( TQSize newSize )
 //////  OSDPreviewWidget below /////////////////////
 
 #include <kcursor.h>                              //previewWidget
-#include <klocale.h>
+#include <tdelocale.h>
 
 OSDPreviewWidget::OSDPreviewWidget( const TQString &appName, TQWidget *parent, const char *name )
 : OSDWidget( appName, parent, name )
diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
index 3d0a864..080e0d2 100644
--- a/konversation/src/outputfilter.cpp
+++ b/konversation/src/outputfilter.cpp
@@ -31,7 +31,7 @@
 #include <tqvaluelist.h>
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/passdlg.h>
 #include <tdeconfig.h>
@@ -40,7 +40,7 @@
 #include <tdesocketaddress.h>
 #include <kresolver.h>
 #include <kreverseresolver.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation
diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
index 1945952..bc69645 100644
--- a/konversation/src/query.cpp
+++ b/konversation/src/query.cpp
@@ -32,10 +32,10 @@
 #include <tqwhatsthis.h>
 #include <tqsplitter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <tdepopupmenu.h>
diff --git a/konversation/src/queuetuner.cpp b/konversation/src/queuetuner.cpp
index 10c64ec..15467e9 100644
--- a/konversation/src/queuetuner.cpp
+++ b/konversation/src/queuetuner.cpp
@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container)
diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
index 371a939..75d5ec5 100644
--- a/konversation/src/quickbuttons_preferences.cpp
+++ b/konversation/src/quickbuttons_preferences.cpp
@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 
diff --git a/konversation/src/quickconnectdialog.cpp b/konversation/src/quickconnectdialog.cpp
index 0d86fcc..ba8d36f 100644
--- a/konversation/src/quickconnectdialog.cpp
+++ b/konversation/src/quickconnectdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqcheckbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 QuickConnectDialog::QuickConnectDialog(TQWidget *parent)
diff --git a/konversation/src/rawlog.cpp b/konversation/src/rawlog.cpp
index 79150b9..6f8405f 100644
--- a/konversation/src/rawlog.cpp
+++ b/konversation/src/rawlog.cpp
@@ -19,7 +19,7 @@
 #include "server.h"
 #include "konversationapplication.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp
index 54c25af..934704f 100644
--- a/konversation/src/searchbar.cpp
+++ b/konversation/src/searchbar.cpp
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define SEARCH_FORWARD_MENU 1
 #define MATCH_CASE_MENU 2
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index 0a5029d..b9150e3 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -48,11 +48,11 @@
 #include <tqdatetime.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kresolver.h>
 #include <tdesocketdevice.h>
 #include <tdeaction.h>
diff --git a/konversation/src/serverdialog.cpp b/konversation/src/serverdialog.cpp
index 060cf6d..51f3d56 100644
--- a/konversation/src/serverdialog.cpp
+++ b/konversation/src/serverdialog.cpp
@@ -20,8 +20,8 @@
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation
diff --git a/konversation/src/servergroupdialog.cpp b/konversation/src/servergroupdialog.cpp
index a4e6786..ac7d6ea 100644
--- a/konversation/src/servergroupdialog.cpp
+++ b/konversation/src/servergroupdialog.cpp
@@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>
diff --git a/konversation/src/serverison.cpp b/konversation/src/serverison.cpp
index ac54843..69fddd3 100644
--- a/konversation/src/serverison.cpp
+++ b/konversation/src/serverison.cpp
@@ -25,8 +25,8 @@
 #include <tqmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 
 ServerISON::ServerISON(Server* server) : m_server(server)
diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp
index b4de8d8..f722899 100644
--- a/konversation/src/serverlistdialog.cpp
+++ b/konversation/src/serverlistdialog.cpp
@@ -24,10 +24,10 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation
diff --git a/konversation/src/sslsocket.cpp b/konversation/src/sslsocket.cpp
index 3659d00..e22fe7b 100644
--- a/konversation/src/sslsocket.cpp
+++ b/konversation/src/sslsocket.cpp
@@ -17,14 +17,14 @@
 
 #include "sslsocket.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kssl.h>
 #include <ksslinfodlg.h>
 #include <ksslpeerinfo.h>
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesocketdevice.h>
 
 
diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp
index 031a845..c1b1fd9 100644
--- a/konversation/src/statuspanel.cpp
+++ b/konversation/src/statuspanel.cpp
@@ -26,8 +26,8 @@
 #include <tqlineedit.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent)
diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
index 75fd513..b033155 100644
--- a/konversation/src/theme_preferences.cpp
+++ b/konversation/src/theme_preferences.cpp
@@ -32,9 +32,9 @@
 #include <tdelistbox.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
index 91f0408..67b3b92 100644
--- a/konversation/src/topiclabel.cpp
+++ b/konversation/src/topiclabel.cpp
@@ -26,7 +26,7 @@
 #include <kshell.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
diff --git a/konversation/src/topiclabel.h b/konversation/src/topiclabel.h
index e8d6653..2b58ce0 100644
--- a/konversation/src/topiclabel.h
+++ b/konversation/src/topiclabel.h
@@ -14,7 +14,7 @@
 #define KONVERSATIONTOPICLABEL_H
 
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class TQFontMetrics;
diff --git a/konversation/src/trayicon.cpp b/konversation/src/trayicon.cpp
index b64bcf6..d444d3f 100644
--- a/konversation/src/trayicon.cpp
+++ b/konversation/src/trayicon.cpp
@@ -22,9 +22,9 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Konversation
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index 3a531d5..0c90533 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <krun.h>
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index c4781ea..894effa 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -38,12 +38,12 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 
 ViewContainer::ViewContainer(KonversationMainWindow* window):
diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
index 45635e8..a1a30c1 100644
--- a/konversation/src/viewtree.cpp
+++ b/konversation/src/viewtree.cpp
@@ -27,8 +27,8 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 
diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp
index 4822ce5..bec9205 100644
--- a/konversation/src/viewtreeitem.cpp
+++ b/konversation/src/viewtreeitem.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 
 
diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp
index f5518ab..e475842 100644
--- a/konversation/src/warnings_preferences.cpp
+++ b/konversation/src/warnings_preferences.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 
diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp
index 9a7db30..3b30cfb 100644
--- a/konversation/src/watchednicknames_preferences.cpp
+++ b/konversation/src/watchednicknames_preferences.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>