Rename additional header files to avoid conflicts with KDE4

38 files changed, 94 insertions, 94 deletions

diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp
index 4ec11657..48ccd27b 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp
+++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp
@@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kplugininfo.h>
 
 #include "addaccountwizardpage1.h"
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 7f43c5c8..7ec11d52 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -47,7 +47,7 @@
 #include <tqvbox.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tdeversion.h>
@@ -58,9 +58,9 @@
 #include <kdebug.h>
 #include <tdelistview.h>
 // used for its AddresseeItem class
-#include <kabc/addresseedialog.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addresseedialog.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <addcontactpage.h>
 #include "addressbookselectorwidget.h"
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.h b/kopete/kopete/addcontactwizard/addcontactwizard.h
index 8c9fc1bc..18c7e5c2 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.h
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 
 #include <kdebug.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 #include "addcontactwizard_base.h"
 
 class AddContactPage;
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp
index 48e1b159..be2ddda7 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp
@@ -21,7 +21,7 @@
 #include <addcontactpage.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetecontactlist.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
index e0817490..d0594901 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
@@ -25,9 +25,9 @@
 #include "kopeteaccount.h"
 #include "kopetemetacontact.h"
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
 #include <kdebug.h>
 #include <tdemultipledrag.h>
 #include <tdepopupmenu.h>
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index d5215c40..56d015bd 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -52,13 +52,13 @@
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdemultipledrag.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurldrag.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index 3c58cb50..647e6609 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -35,13 +35,13 @@
 #include <tdeconfig.h>
 #include <ktabwidget.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <twin.h>
 #include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kgenericfactory.h>
 #include <tdehtmlview.h>
 #include <ksyntaxhighlighter.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 28a58abf..03fe962a 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -28,14 +28,14 @@
 
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
@@ -46,7 +46,7 @@
 #include <kstringhandler.h>
 #include <ksqueezedtextlabel.h>
 #include <tdestdaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "chatmessagepart.h"
 #include "chattexteditpart.h"
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
index 6a5b4534..2badcaa8 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
@@ -25,7 +25,7 @@
 #include <kdirlister.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <karchive.h>
 #include <kzip.h>
 #include <ktar.h>
@@ -33,7 +33,7 @@
 #include <tdeio/netaccess.h>
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kopetechatwindowstyle.h"
 
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 3981b9bf..89bb2eae 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -40,14 +40,14 @@
 #include <tdeversion.h>
 #include <kedittoolbar.h>
 #include <tdefontdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 6cf32161..29838491 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -26,8 +26,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index df9f2c76..6995f68a 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -1,7 +1,7 @@
 #include <ktextedit.h>
 #include <tdeaction.h>
 #include <kcolordialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefontdialog.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 21cf6988..177de9c6 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -31,8 +31,8 @@
 #include <tdeunittest/module.h>
 #include <kinstance.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <kopetechatwindowstyle.h>
 
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
index 71691706..562d319a 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -29,8 +29,8 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "addaccountwizard.h"
 #include "editaccountwidget.h"
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index d308c57c..206a148f 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -50,8 +50,8 @@
 #include <tdeio/netaccess.h>
 #include <tdehtmlview.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index 11bc5ae4..7bd23273 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -20,7 +20,7 @@
 #include "kopeteprefs.h"
 #include "kopeteemoticons.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp
index c83fd1c8..89ec4e48 100644
--- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp
+++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp
@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TooltipItem : public TDEListViewItem
 {
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
index cf5f98ed..fe9c59aa 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
@@ -28,7 +28,7 @@
 #include <tqslider.h>
 
 #include <kplugininfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp
index f3d61b44..ff2793fd 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.cpp
+++ b/kopete/kopete/config/behavior/behaviorconfig.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <kplugininfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.cpp b/kopete/kopete/config/identity/globalidentitiesmanager.cpp
index 41fbb3b6..e34e783d 100644
--- a/kopete/kopete/config/identity/globalidentitiesmanager.cpp
+++ b/kopete/kopete/config/identity/globalidentitiesmanager.cpp
@@ -24,7 +24,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <ksavefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index 1d513964..48269acf 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -35,10 +35,10 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurlrequester.h>
 #include <kinputdialog.h>
 #include <kpixmapregionselectordialog.h>
@@ -48,9 +48,9 @@
 #include <tdeio/netaccess.h>
 
 // KDE KABC(AddressBook) includes
-#include <kabc/addresseedialog.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
 
 // Kopete include
 #include "kabcpersistence.h"
diff --git a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
index ffa89670..646db5fc 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
+++ b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
@@ -5,4 +5,4 @@ Singleton=true
 Mutators=true
 MemberVariables=private
 GlobalEnums=true
-IncludeFiles=klocale.h
+IncludeFiles=tdelocale.h
diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.cpp b/kopete/kopete/config/plugins/kopetepluginconfig.cpp
index 7f790a0b..68416df5 100644
--- a/kopete/kopete/config/plugins/kopetepluginconfig.cpp
+++ b/kopete/kopete/config/plugins/kopetepluginconfig.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpluginselector.h>
 #include <ksettings/dispatcher.h>
 
diff --git a/kopete/kopete/contactlist/kabcexport.cpp b/kopete/kopete/contactlist/kabcexport.cpp
index 46801d2c..5435fa7d 100644
--- a/kopete/kopete/contactlist/kabcexport.cpp
+++ b/kopete/kopete/contactlist/kabcexport.cpp
@@ -25,14 +25,14 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kabc/addressee.h>
-#include <kabc/addressbook.h>
-#include <kabc/phonenumber.h>
-#include <kabc/picture.h>
-#include <kabc/resource.h>
-#include <kabc/stdaddressbook.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/phonenumber.h>
+#include <tdeabc/picture.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <kabcpersistence.h>
 #include <kopetecontact.h>
diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
index dc283e1b..21bbbcd5 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
+++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
@@ -18,14 +18,14 @@
     *************************************************************************
 */
 
-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopeteaccount.h"
 #include "kopeteglobal.h"
diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h
index 587de5c9..7dd675ed 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexport.h
+++ b/kopete/kopete/contactlist/kopeteaddrbookexport.h
@@ -21,8 +21,8 @@
 #ifndef KOPETEADDRBOOKEXPORT_H
 #define KOPETEADDRBOOKEXPORT_H
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
 
 #include "kopetecontactproperty.h"
 
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index c161eeff..f035bdcb 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -37,14 +37,14 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 #include <tdemultipledrag.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/vcardconverter.h>
 
 #include <tdeversion.h>
 #include <kinputdialog.h>
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
index 212381fc..5936af4f 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <twin.h>
 #include <kcmultidialog.h>
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
index 67fc9b79..b9a75957 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
@@ -18,7 +18,7 @@
 
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index d05bd12f..fe454204 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -36,12 +36,12 @@
 #include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
-#include <kabc/addresseedialog.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
diff --git a/kopete/kopete/contactlist/kopetelviprops.h b/kopete/kopete/contactlist/kopetelviprops.h
index 01e91936..fb85d2bd 100644
--- a/kopete/kopete/contactlist/kopetelviprops.h
+++ b/kopete/kopete/contactlist/kopetelviprops.h
@@ -20,7 +20,7 @@
 #define KOPETELVIPROPS_H
 
 #include <kdialogbase.h>
-#include <kabc/sound.h>
+#include <tdeabc/sound.h>
 
 #include "kopetemetacontact.h"
 
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 8b583856..04bb8c98 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -29,16 +29,16 @@
 #include <kiconeffect.h>
 #include <kimageeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
 
 #include <tdeversion.h>
 #include <kinputdialog.h>
diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp
index fd7bc38d..9c4c4e3b 100644
--- a/kopete/kopete/kimifaceimpl.cpp
+++ b/kopete/kopete/kimifaceimpl.cpp
@@ -20,11 +20,11 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kplugininfo.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include "kopeteaccount.h"
 #include "kopeteaccountmanager.h"
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index c3b94e06..1b72b4b4 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -25,9 +25,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "addaccountwizard.h"
 #include "kabcpersistence.h"
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index 88e68645..645c1a88 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -25,11 +25,11 @@
 #include <tqtimer.h>
 
 #include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
 #include <kurl.h>
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
index 74f740d8..869f8e62 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
@@ -27,12 +27,12 @@
 // KDE include
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <kpixmapregionselectordialog.h>
 
diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp
index 7995c64e..b286dc6e 100644
--- a/kopete/kopete/kopeteiface.cpp
+++ b/kopete/kopete/kopeteiface.cpp
@@ -15,10 +15,10 @@
     *************************************************************************
 */
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kopeteiface.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index ef938d0a..398c4827 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -34,15 +34,15 @@
 #include <tdeactionclasses.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifydialog.h>
 #include <tdepopupmenu.h>
 #include <tdeaccel.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kglobalaccel.h>
 #include <twin.h>