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

---
 dcoprss/feedbrowser.cpp                          |  2 +-
 dcoprss/main.cpp                                 |  2 +-
 dcoprss/xmlrpciface.cpp                          |  2 +-
 .../advanced/kcm_sambaconf/dictmanager.cpp       |  2 +-
 .../advanced/kcm_sambaconf/hiddenfileview.cpp    |  4 ++--
 .../advanced/kcm_sambaconf/joindomaindlg.ui      |  4 ++--
 .../advanced/kcm_sambaconf/kcmsambaconf.cpp      |  6 +++---
 .../kcm_sambaconf/linuxpermissionchecker.cpp     |  4 ++--
 .../advanced/kcm_sambaconf/printerdlgimpl.cpp    |  2 +-
 .../kcm_sambaconf/qmultichecklistitem.cpp        |  2 +-
 filesharing/advanced/kcm_sambaconf/sambafile.cpp |  6 +++---
 filesharing/advanced/kcm_sambaconf/share.ui      |  2 +-
 .../advanced/kcm_sambaconf/sharedlgimpl.cpp      |  4 ++--
 .../kcm_sambaconf/smbconfconfigwidget.cpp        |  4 ++--
 .../advanced/kcm_sambaconf/smbpasswdfile.cpp     |  2 +-
 .../advanced/kcm_sambaconf/usertabimpl.cpp       |  2 +-
 filesharing/advanced/nfs/nfsdialog.cpp           |  4 ++--
 filesharing/advanced/nfs/nfsfile.cpp             |  6 +++---
 filesharing/advanced/nfs/nfshostdlg.cpp          |  4 ++--
 .../advanced/propsdlgplugin/propertiespage.cpp   |  6 +++---
 .../propsdlgplugin/propsdlgshareplugin.cpp       |  4 ++--
 filesharing/simple/fileshare.cpp                 |  2 +-
 filesharing/simple/groupconfigdlg.cpp            |  4 ++--
 filesharing/simple/krichtextlabel.cpp            |  2 +-
 kdict/actions.h                                  |  2 +-
 kdict/applet/kdictapplet.cpp                     |  2 +-
 kdict/dict.cpp                                   |  4 ++--
 kdict/main.cpp                                   |  2 +-
 kdict/matchview.cpp                              |  4 ++--
 kdict/options.cpp                                |  2 +-
 kdict/options.h                                  |  2 +-
 kdict/queryview.cpp                              |  6 +++---
 kdict/sets.cpp                                   |  2 +-
 kdict/toplevel.cpp                               |  2 +-
 kget/dlgAdvanced.cpp                             |  4 ++--
 kget/dlgAutomation.cpp                           |  2 +-
 kget/dlgConnection.cpp                           |  4 ++--
 kget/dlgDirectories.cpp                          |  6 +++---
 kget/dlgIndividual.cpp                           |  2 +-
 kget/dlgLimits.cpp                               |  2 +-
 kget/dlgPreferences.cpp                          |  2 +-
 kget/docking.cpp                                 |  2 +-
 kget/droptarget.cpp                              |  4 ++--
 kget/kget_plug_in/kget_linkview.cpp              |  4 ++--
 kget/kget_plug_in/kget_plug_in.cpp               |  6 +++---
 kget/logwindow.cpp                               |  2 +-
 kget/main.cpp                                    |  4 ++--
 kget/safedelete.cpp                              |  4 ++--
 kget/settings.cpp                                |  8 ++++----
 kget/tdefileio.cpp                               |  4 ++--
 kget/tdemainwidget.cpp                           |  8 ++++----
 kget/transfer.cpp                                |  6 +++---
 kget/transferlist.cpp                            |  6 +++---
 knewsticker/common/configaccess.cpp              |  4 ++--
 knewsticker/common/configaccess.h                |  2 +-
 knewsticker/common/newsengine.cpp                |  2 +-
 knewsticker/common/newsengine.h                  |  2 +-
 knewsticker/common/xmlnewsaccess.cpp             |  2 +-
 knewsticker/knewsticker.cpp                      |  4 ++--
 knewsticker/knewstickerconfig.cpp                |  2 +-
 .../kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp    |  4 ++--
 knewsticker/newsscroller.cpp                     |  2 +-
 knewsticker/newssourcedlgimpl.cpp                |  2 +-
 kopete/KABC_INTEG_NOTES                          |  2 +-
 .../kopete/addaccountwizard/addaccountwizard.cpp |  4 ++--
 .../kopete/addcontactwizard/addcontactwizard.cpp |  8 ++++----
 .../kopete/addcontactwizard/addcontactwizard.h   |  2 +-
 .../addcontactwizard/fastaddcontactwizard.cpp    |  2 +-
 .../kopete/chatwindow/chatmemberslistwidget.cpp  |  6 +++---
 kopete/kopete/chatwindow/chatmessagepart.cpp     |  6 +++---
 kopete/kopete/chatwindow/chatview.cpp            |  6 +++---
 kopete/kopete/chatwindow/kopetechatwindow.cpp    |  8 ++++----
 .../chatwindow/kopetechatwindowstylemanager.cpp  |  4 ++--
 kopete/kopete/chatwindow/kopeteemailwindow.cpp   |  8 ++++----
 .../kopete/chatwindow/kopeteemoticonaction.cpp   |  4 ++--
 kopete/kopete/chatwindow/krichtexteditpart.cpp   |  2 +-
 .../tests/chatwindowstylerendering_test.cpp      |  4 ++--
 .../config/accounts/kopeteaccountconfig.cpp      |  4 ++--
 .../config/appearance/appearanceconfig.cpp       |  4 ++--
 .../config/appearance/emoticonseditdialog.cpp    |  2 +-
 .../config/appearance/tooltipeditdialog.cpp      |  2 +-
 kopete/kopete/config/avdevice/avdeviceconfig.cpp |  2 +-
 kopete/kopete/config/behavior/behaviorconfig.cpp |  2 +-
 .../config/identity/globalidentitiesmanager.cpp  |  2 +-
 .../config/identity/kopeteidentityconfig.cpp     | 12 ++++++------
 .../kopeteidentityconfigpreferences.kcfgc        |  2 +-
 .../kopete/config/plugins/kopetepluginconfig.cpp |  2 +-
 kopete/kopete/contactlist/kabcexport.cpp         | 16 ++++++++--------
 .../kopete/contactlist/kopeteaddrbookexport.cpp  |  4 ++--
 kopete/kopete/contactlist/kopeteaddrbookexport.h |  4 ++--
 .../kopete/contactlist/kopetecontactlistview.cpp |  8 ++++----
 .../kopete/contactlist/kopetegrouplistaction.cpp |  2 +-
 .../kopete/contactlist/kopetegroupviewitem.cpp   |  2 +-
 kopete/kopete/contactlist/kopetelviprops.cpp     | 10 +++++-----
 kopete/kopete/contactlist/kopetelviprops.h       |  2 +-
 .../kopete/contactlist/kopetemetacontactlvi.cpp  | 10 +++++-----
 kopete/kopete/kimifaceimpl.cpp                   |  8 ++++----
 kopete/kopete/kopeteapplication.cpp              |  4 ++--
 kopete/kopete/kopeteballoon.cpp                  |  4 ++--
 kopete/kopete/kopeteeditglobalidentitywidget.cpp |  4 ++--
 kopete/kopete/kopeteiface.cpp                    |  6 +++---
 kopete/kopete/kopetewindow.cpp                   |  6 +++---
 kopete/libkopete/CMakeLists.txt                  |  2 +-
 kopete/libkopete/avdevice/videodevicepool.cpp    |  2 +-
 kopete/libkopete/avdevice/videodevicepool.h      |  2 +-
 .../compat/kpixmapregionselectordialog.cpp       |  2 +-
 .../compat/kpixmapregionselectorwidget.cpp       |  2 +-
 kopete/libkopete/connectionmanager.cpp           |  4 ++--
 kopete/libkopete/kabcpersistence.cpp             | 12 ++++++------
 kopete/libkopete/kautoconfig.cpp                 |  2 +-
 kopete/libkopete/knotification.cpp               |  4 ++--
 kopete/libkopete/kopeteaccount.cpp               |  4 ++--
 kopete/libkopete/kopeteaccountmanager.cpp        |  2 +-
 kopete/libkopete/kopeteaway.cpp                  |  4 ++--
 kopete/libkopete/kopeteawayaction.cpp            |  2 +-
 kopete/libkopete/kopeteawaydialog.cpp            |  2 +-
 kopete/libkopete/kopeteblacklister.cpp           |  2 +-
 kopete/libkopete/kopetechatsession.cpp           |  6 +++---
 kopete/libkopete/kopetecommandhandler.cpp        |  2 +-
 kopete/libkopete/kopetecontact.cpp               |  4 ++--
 kopete/libkopete/kopetecontactlist.cpp           |  4 ++--
 kopete/libkopete/kopetecontactlistelement.cpp    |  2 +-
 kopete/libkopete/kopeteglobal.cpp                |  4 ++--
 kopete/libkopete/kopetegroup.cpp                 |  2 +-
 kopete/libkopete/kopetemessage.cpp               |  2 +-
 kopete/libkopete/kopetemetacontact.cpp           |  8 ++++----
 kopete/libkopete/kopetemimetypehandler.cpp       |  4 ++--
 kopete/libkopete/kopeteonlinestatus.cpp          |  2 +-
 kopete/libkopete/kopeteonlinestatusmanager.cpp   |  2 +-
 kopete/libkopete/kopetepassword.cpp              |  4 ++--
 kopete/libkopete/kopetepasswordedaccount.cpp     |  2 +-
 kopete/libkopete/kopetepicture.cpp               |  2 +-
 kopete/libkopete/kopeteprefs.cpp                 |  2 +-
 kopete/libkopete/kopeteprotocol.cpp              |  2 +-
 kopete/libkopete/kopetetask.cpp                  |  2 +-
 kopete/libkopete/kopetetransfermanager.cpp       |  4 ++--
 kopete/libkopete/kopeteutils.cpp                 |  4 ++--
 kopete/libkopete/private/kopetecommand.cpp       |  4 ++--
 kopete/libkopete/private/kopeteutils_private.cpp |  2 +-
 kopete/libkopete/private/kopeteviewmanager.cpp   |  4 ++--
 kopete/libkopete/tests/kopeteemoticontest.cpp    |  2 +-
 .../tests/kopetepasswordtest_program.cpp         |  2 +-
 kopete/libkopete/tests/kopetepropertiestest.cpp  |  2 +-
 .../libkopete/tests/kopetewallettest_program.cpp |  2 +-
 kopete/libkopete/ui/addressbooklinkwidget.cpp    |  2 +-
 kopete/libkopete/ui/addressbooklinkwidget.h      |  2 +-
 .../libkopete/ui/addressbookselectordialog.cpp   |  2 +-
 .../libkopete/ui/addressbookselectorwidget.cpp   |  2 +-
 kopete/libkopete/ui/addressbookselectorwidget.h  |  2 +-
 kopete/libkopete/ui/addresseeitem.cpp            |  2 +-
 kopete/libkopete/ui/addresseeitem.h              |  2 +-
 kopete/libkopete/ui/contactaddednotifydialog.cpp |  4 ++--
 kopete/libkopete/ui/kopetefileconfirmdialog.cpp  |  4 ++--
 kopete/libkopete/ui/kopetelistview.cpp           |  2 +-
 kopete/libkopete/ui/kopetestdaction.cpp          |  2 +-
 .../libkopete/ui/metacontactselectorwidget.cpp   |  2 +-
 kopete/libkopete/ui/userinfodialog.cpp           |  2 +-
 .../addbookmarks/addbookmarksprefssettings.cpp   |  2 +-
 kopete/plugins/alias/aliaspreferences.cpp        |  6 +++---
 kopete/plugins/autoreplace/autoreplaceconfig.cpp |  4 ++--
 .../autoreplace/autoreplacepreferences.cpp       |  4 ++--
 kopete/plugins/contactnotes/contactnotesedit.cpp |  2 +-
 .../cryptography/cryptographyguiclient.cpp       |  2 +-
 .../cryptography/cryptographyselectuserkey.cpp   |  2 +-
 kopete/plugins/cryptography/kgpginterface.cpp    |  2 +-
 kopete/plugins/cryptography/kgpgselkey.cpp       |  2 +-
 kopete/plugins/cryptography/popuppublic.cpp      |  2 +-
 kopete/plugins/highlight/highlightconfig.cpp     |  2 +-
 .../plugins/highlight/highlightpreferences.cpp   |  2 +-
 kopete/plugins/history/converter.cpp             |  4 ++--
 kopete/plugins/history/historydialog.cpp         |  2 +-
 kopete/plugins/history/historyguiclient.cpp      |  2 +-
 kopete/plugins/history/historyplugin.cpp         |  2 +-
 kopete/plugins/latex/latexguiclient.cpp          |  4 ++--
 kopete/plugins/latex/latexplugin.cpp             |  4 ++--
 kopete/plugins/latex/latexplugin.h               |  2 +-
 kopete/plugins/latex/latexpreferences.cpp        |  2 +-
 .../plugins/netmeeting/netmeetingguiclient.cpp   |  2 +-
 .../plugins/netmeeting/netmeetinginvitation.cpp  |  6 +++---
 .../plugins/netmeeting/netmeetingpreferences.cpp |  4 ++--
 .../nowlistening/nowlisteningconfig.kcfgc        |  2 +-
 .../nowlistening/nowlisteningguiclient.cpp       |  4 ++--
 .../nowlistening/nowlisteningpreferences.cpp     |  2 +-
 kopete/plugins/smpppdcs/detectorsmpppd.cpp       |  2 +-
 kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp    |  2 +-
 kopete/plugins/smpppdcs/unittest/main.cpp        |  2 +-
 kopete/plugins/statistics/statisticscontact.cpp  |  2 +-
 kopete/plugins/statistics/statisticsdb.cpp       |  2 +-
 kopete/plugins/statistics/statisticsdialog.cpp   |  2 +-
 kopete/plugins/statistics/statisticsplugin.cpp   |  2 +-
 kopete/plugins/texteffect/texteffectconfig.cpp   |  2 +-
 .../plugins/texteffect/texteffectpreferences.cpp |  2 +-
 kopete/plugins/translator/translatordialog.cpp   |  2 +-
 .../plugins/translator/translatorguiclient.cpp   |  2 +-
 .../plugins/translator/translatorlanguages.cpp   |  2 +-
 kopete/plugins/translator/translatorplugin.cpp   |  2 +-
 kopete/plugins/webpresence/webpresenceplugin.cpp |  4 ++--
 kopete/protocols/gadu/gaduaccount.cpp            |  6 +++---
 kopete/protocols/gadu/gaduaddcontactpage.cpp     |  2 +-
 kopete/protocols/gadu/gaduaway.cpp               |  2 +-
 kopete/protocols/gadu/gaducommands.cpp           |  2 +-
 kopete/protocols/gadu/gaducontact.cpp            |  4 ++--
 kopete/protocols/gadu/gadudcctransaction.cpp     |  4 ++--
 kopete/protocols/gadu/gadueditaccount.cpp        |  4 ++--
 kopete/protocols/gadu/gadueditcontact.cpp        |  2 +-
 kopete/protocols/gadu/gadupubdir.cpp             |  2 +-
 kopete/protocols/gadu/gaduregisteraccount.cpp    |  6 +++---
 kopete/protocols/gadu/gadusession.cpp            |  2 +-
 kopete/protocols/groupwise/gwaccount.cpp         |  4 ++--
 kopete/protocols/groupwise/gwcontact.cpp         |  2 +-
 kopete/protocols/groupwise/gwmessagemanager.cpp  |  4 ++--
 .../protocols/groupwise/libgroupwise/gwerror.cpp |  2 +-
 .../protocols/groupwise/ui/gwaddcontactpage.cpp  |  2 +-
 .../protocols/groupwise/ui/gwchatpropsdialog.cpp |  2 +-
 .../groupwise/ui/gwchatsearchdialog.cpp          |  2 +-
 .../groupwise/ui/gwcontactproperties.cpp         |  2 +-
 .../groupwise/ui/gweditaccountwidget.cpp         |  4 ++--
 .../protocols/groupwise/ui/gwprivacydialog.cpp   |  4 ++--
 .../groupwise/ui/gwreceiveinvitationdialog.cpp   |  2 +-
 kopete/protocols/groupwise/ui/gwsearch.cpp       |  2 +-
 kopete/protocols/irc/ircaccount.cpp              |  4 ++--
 kopete/protocols/irc/ircaddcontactpage.cpp       |  4 ++--
 kopete/protocols/irc/ircchannelcontact.cpp       |  4 ++--
 kopete/protocols/irc/irccontact.cpp              |  2 +-
 kopete/protocols/irc/ircguiclient.cpp            |  2 +-
 kopete/protocols/irc/ircprotocol.cpp             |  4 ++--
 kopete/protocols/irc/ircservercontact.cpp        |  2 +-
 kopete/protocols/irc/ircusercontact.cpp          |  2 +-
 kopete/protocols/irc/libkirc/kircengine.cpp      |  2 +-
 kopete/protocols/irc/libkirc/kircmessage.cpp     |  4 ++--
 kopete/protocols/irc/libkirc/kirctransfer.cpp    |  2 +-
 .../irc/libkirc/kirctransferhandler.cpp          |  4 ++--
 kopete/protocols/irc/libkirc/ksslsocket.cpp      |  4 ++--
 kopete/protocols/irc/ui/channellist.cpp          |  4 ++--
 kopete/protocols/irc/ui/irceditaccountwidget.cpp |  6 +++---
 kopete/protocols/jabber/jabberaccount.cpp        |  4 ++--
 kopete/protocols/jabber/jabberbasecontact.cpp    |  4 ++--
 kopete/protocols/jabber/jabberbookmarks.cpp      |  2 +-
 kopete/protocols/jabber/jabberchatsession.cpp    |  2 +-
 kopete/protocols/jabber/jabbercontact.cpp        |  4 ++--
 kopete/protocols/jabber/jabbercontactpool.cpp    |  2 +-
 kopete/protocols/jabber/jabberfiletransfer.cpp   |  4 ++--
 .../protocols/jabber/jabbergroupchatmanager.cpp  |  2 +-
 kopete/protocols/jabber/jabbergroupcontact.cpp   |  2 +-
 .../jabber/jabbergroupmembercontact.cpp          |  2 +-
 kopete/protocols/jabber/jabberprotocol.cpp       |  2 +-
 kopete/protocols/jabber/jabbertransport.cpp      |  2 +-
 .../jabber/jingle/jinglevoicesessiondialog.cpp   |  2 +-
 .../protocols/jabber/tdeioslave/jabberdisco.cpp  |  4 ++--
 kopete/protocols/jabber/ui/dlgjabberbrowse.cpp   |  4 ++--
 .../jabber/ui/dlgjabberchangepassword.cpp        |  4 ++--
 kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp |  2 +-
 .../jabber/ui/dlgjabberchatroomslist.cpp         |  4 ++--
 kopete/protocols/jabber/ui/dlgjabberregister.cpp |  4 ++--
 kopete/protocols/jabber/ui/dlgjabberservices.cpp |  4 ++--
 kopete/protocols/jabber/ui/dlgjabbervcard.cpp    |  4 ++--
 .../protocols/jabber/ui/jabberaddcontactpage.cpp |  2 +-
 .../protocols/jabber/ui/jabberchooseserver.cpp   |  2 +-
 .../jabber/ui/jabbereditaccountwidget.cpp        |  4 ++--
 .../jabber/ui/jabberregisteraccount.cpp          |  6 +++---
 kopete/protocols/meanwhile/meanwhileaccount.cpp  |  4 ++--
 kopete/protocols/meanwhile/meanwhilecontact.cpp  |  2 +-
 .../meanwhile/meanwhileeditaccountwidget.cpp     |  4 ++--
 kopete/protocols/meanwhile/meanwhilesession.cpp  |  4 ++--
 kopete/protocols/msn/dispatcher.cpp              |  2 +-
 kopete/protocols/msn/incomingtransfer.cpp        |  4 ++--
 kopete/protocols/msn/msnaccount.cpp              |  6 +++---
 kopete/protocols/msn/msnaddcontactpage.cpp       |  4 ++--
 kopete/protocols/msn/msnchatsession.cpp          |  6 +++---
 kopete/protocols/msn/msncontact.cpp              |  8 ++++----
 kopete/protocols/msn/msndebugrawcmddlg.cpp       |  2 +-
 kopete/protocols/msn/msnfiletransfersocket.cpp   |  2 +-
 kopete/protocols/msn/msnnotifysocket.cpp         |  6 +++---
 kopete/protocols/msn/msnsocket.cpp               |  4 ++--
 kopete/protocols/msn/msnswitchboardsocket.cpp    |  6 +++---
 kopete/protocols/msn/outgoingtransfer.cpp        |  2 +-
 kopete/protocols/msn/ui/msneditaccountwidget.cpp |  4 ++--
 kopete/protocols/msn/webcam.cpp                  |  4 ++--
 kopete/protocols/msn/webcam/msnwebcamdialog.cpp  |  2 +-
 kopete/protocols/oscar/aim/aimaccount.cpp        |  4 ++--
 kopete/protocols/oscar/aim/aimcontact.cpp        |  4 ++--
 kopete/protocols/oscar/aim/aimjoinchat.cpp       |  2 +-
 kopete/protocols/oscar/aim/aimprotocol.cpp       |  4 ++--
 kopete/protocols/oscar/aim/aimuserinfo.cpp       |  2 +-
 .../protocols/oscar/aim/ui/aimaddcontactpage.cpp |  4 ++--
 kopete/protocols/oscar/icq/icqaccount.cpp        |  4 ++--
 kopete/protocols/oscar/icq/icqcontact.cpp        |  4 ++--
 kopete/protocols/oscar/icq/icqpresence.cpp       |  2 +-
 kopete/protocols/oscar/icq/icqprotocol.cpp       |  4 ++--
 kopete/protocols/oscar/icq/icqreadaway.cpp       |  2 +-
 .../protocols/oscar/icq/ui/icqaddcontactpage.cpp |  4 ++--
 .../oscar/icq/ui/icqauthreplydialog.cpp          |  2 +-
 .../oscar/icq/ui/icqeditaccountwidget.cpp        |  2 +-
 .../protocols/oscar/icq/ui/icqsearchdialog.cpp   |  4 ++--
 .../protocols/oscar/icq/ui/icquserinfowidget.cpp |  4 ++--
 kopete/protocols/oscar/liboscar/aimlogintask.cpp |  2 +-
 kopete/protocols/oscar/liboscar/client.cpp       |  2 +-
 .../oscar/liboscar/closeconnectiontask.cpp       |  2 +-
 kopete/protocols/oscar/liboscar/logintask.cpp    |  2 +-
 .../protocols/oscar/liboscar/ssimodifytask.cpp   |  2 +-
 kopete/protocols/oscar/liboscar/userdetails.cpp  |  2 +-
 kopete/protocols/oscar/oscaraccount.cpp          |  4 ++--
 kopete/protocols/oscar/oscarcontact.cpp          |  4 ++--
 .../oscar/oscarencodingselectiondialog.cpp       |  2 +-
 .../oscar/oscarlistnonservercontacts.cpp         |  2 +-
 kopete/protocols/oscar/oscarmyselfcontact.cpp    |  2 +-
 kopete/protocols/oscar/oscarversionupdater.cpp   |  2 +-
 kopete/protocols/oscar/oscarvisibilitydialog.cpp |  2 +-
 kopete/protocols/sms/serviceloader.cpp           |  4 ++--
 kopete/protocols/sms/services/gsmlib.cpp         |  4 ++--
 kopete/protocols/sms/services/smsclient.cpp      |  4 ++--
 kopete/protocols/sms/services/smssend.cpp        |  4 ++--
 .../protocols/sms/services/smssendprovider.cpp   |  4 ++--
 kopete/protocols/sms/smsaccount.cpp              |  4 ++--
 kopete/protocols/sms/smscontact.cpp              |  4 ++--
 kopete/protocols/sms/smseditaccountwidget.cpp    |  4 ++--
 kopete/protocols/sms/smsprotocol.cpp             |  2 +-
 kopete/protocols/sms/smsuserpreferences.cpp      |  2 +-
 kopete/protocols/testbed/testbedaccount.cpp      |  2 +-
 kopete/protocols/testbed/testbedcontact.cpp      |  2 +-
 .../protocols/testbed/ui/testbedwebcamdialog.cpp |  2 +-
 .../winpopup/libwinpopup/libwinpopup.cpp         |  4 ++--
 kopete/protocols/winpopup/wpaccount.cpp          |  2 +-
 kopete/protocols/winpopup/wpaddcontact.cpp       |  4 ++--
 kopete/protocols/winpopup/wpeditaccount.cpp      |  4 ++--
 kopete/protocols/winpopup/wpprotocol.cpp         |  2 +-
 kopete/protocols/winpopup/wpuserinfo.cpp         |  2 +-
 .../protocols/yahoo/libkyahoo/modifyyabtask.cpp  |  2 +-
 .../yahoo/libkyahoo/picturenotifiertask.cpp      |  2 +-
 .../yahoo/libkyahoo/receivefiletask.cpp          |  2 +-
 .../protocols/yahoo/libkyahoo/sendfiletask.cpp   |  2 +-
 .../yahoo/libkyahoo/sendmessagetask.cpp          |  2 +-
 .../yahoo/libkyahoo/sendpicturetask.cpp          |  2 +-
 .../yahoo/libkyahoo/statusnotifiertask.cpp       |  2 +-
 kopete/protocols/yahoo/libkyahoo/webcamtask.cpp  |  4 ++--
 kopete/protocols/yahoo/libkyahoo/yabtask.cpp     |  2 +-
 .../yahoo/libkyahoo/yahoobuddyiconloader.cpp     |  4 ++--
 .../protocols/yahoo/libkyahoo/yahoochattask.cpp  |  2 +-
 .../protocols/yahoo/ui/yahoouserinfodialog.cpp   |  4 ++--
 kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp  |  2 +-
 kopete/protocols/yahoo/yahooaccount.cpp          |  4 ++--
 kopete/protocols/yahoo/yahoochatsession.cpp      |  6 +++---
 .../yahoo/yahooconferencemessagemanager.cpp      |  4 ++--
 kopete/protocols/yahoo/yahoocontact.cpp          |  6 +++---
 kopete/protocols/yahoo/yahooeditaccount.cpp      |  4 ++--
 kopete/protocols/yahoo/yahooverifyaccount.cpp    |  4 ++--
 kopete/protocols/yahoo/yahoowebcam.cpp           |  2 +-
 kpf/src/ActiveMonitor.cpp                        |  2 +-
 kpf/src/ActiveMonitorWindow.cpp                  |  2 +-
 kpf/src/Applet.cpp                               |  6 +++---
 kpf/src/AppletItem.cpp                           |  2 +-
 kpf/src/BandwidthGraph.cpp                       |  2 +-
 kpf/src/ConfigDialogPage.cpp                     |  2 +-
 kpf/src/DirectoryLister.cpp                      |  4 ++--
 kpf/src/ErrorMessageConfigDialog.cpp             |  2 +-
 kpf/src/Help.cpp                                 |  2 +-
 kpf/src/PropertiesDialogPlugin.cpp               |  6 +++---
 kpf/src/Resource.cpp                             |  2 +-
 kpf/src/ServerWizard.cpp                         |  2 +-
 kpf/src/SingleServerConfigDialog.cpp             |  2 +-
 kpf/src/StartingKPFDialog.cpp                    |  2 +-
 kpf/src/Utils.cpp                                |  2 +-
 kpf/src/WebServer.cpp                            |  6 +++---
 kpf/src/WebServerManager.cpp                     |  2 +-
 kppp/accounting.cpp                              |  2 +-
 kppp/accounts.cpp                                |  6 +++---
 kppp/acctselect.cpp                              |  2 +-
 kppp/connect.cpp                                 |  4 ++--
 kppp/conwindow.cpp                               |  4 ++--
 kppp/debug.cpp                                   |  2 +-
 kppp/docking.cpp                                 |  2 +-
 kppp/edit.cpp                                    |  4 ++--
 kppp/general.cpp                                 |  2 +-
 kppp/kpppwidget.cpp                              |  6 +++---
 kppp/loginterm.cpp                               |  2 +-
 kppp/logview/export.h                            |  2 +-
 kppp/logview/log.cpp                             |  2 +-
 kppp/logview/main.cpp                            |  2 +-
 kppp/logview/main.h                              |  2 +-
 kppp/logview/monthly.cpp                         |  6 +++---
 kppp/main.cpp                                    |  6 +++---
 kppp/miniterm.cpp                                |  6 +++---
 kppp/modem.cpp                                   |  2 +-
 kppp/modemcmds.cpp                               |  2 +-
 kppp/modemdb.cpp                                 |  2 +-
 kppp/modeminfo.cpp                               |  4 ++--
 kppp/modems.cpp                                  |  6 +++---
 kppp/pppdargs.cpp                                |  2 +-
 kppp/pppdata.cpp                                 |  6 +++---
 kppp/ppplog.cpp                                  |  4 ++--
 kppp/pppstatdlg.cpp                              |  2 +-
 kppp/providerdb.cpp                              |  2 +-
 kppp/pwentry.cpp                                 |  2 +-
 kppp/ruleset.cpp                                 |  4 ++--
 kppp/runtests.cpp                                |  4 ++--
 krdc/keycapturedialog.cpp                        |  2 +-
 krdc/krdc.cpp                                    |  6 +++---
 krdc/main.cpp                                    |  4 ++--
 krdc/maindialog.cpp                              |  2 +-
 krdc/maindialogwidget.cpp                        |  4 ++--
 krdc/preferencesdialog.cpp                       |  2 +-
 krdc/rdp/krdpview.cpp                            |  4 ++--
 krdc/rdp/rdphostpref.cpp                         |  2 +-
 krdc/vnc/kvncview.cpp                            |  4 ++--
 krdc/vnc/vnchostpref.cpp                         |  2 +-
 krfb/kcm_krfb/kcm_krfb.cpp                       |  2 +-
 krfb/kinetd/kinetd.cpp                           |  4 ++--
 krfb/krfb/configuration.cc                       |  6 +++---
 krfb/krfb/connectiondialog.cc                    |  2 +-
 krfb/krfb/invitedialog.cc                        |  2 +-
 krfb/krfb/main.cpp                               |  4 ++--
 krfb/krfb/personalinvitedialog.cc                |  2 +-
 krfb/krfb/rfbcontroller.cc                       |  4 ++--
 krfb/krfb/trayicon.cpp                           |  4 ++--
 ksirc/FilterRuleEditor.cpp                       |  4 ++--
 ksirc/KSOpenkSirc/open_ksirc.cpp                 |  4 ++--
 ksirc/KSPrefs/ksprefs.cpp                        |  2 +-
 ksirc/KSPrefs/page_autoconnect.cpp               |  2 +-
 ksirc/KSPrefs/page_general.cpp                   |  2 +-
 ksirc/KSProgress/ksprogressdata.cpp              |  2 +-
 ksirc/KSTicker/ksticker.cpp                      |  2 +-
 ksirc/KSTicker/ksttest.cpp                       |  2 +-
 ksirc/KSTicker/speeddialog.cpp                   |  2 +-
 ksirc/KSTicker/speeddialogData.cpp               |  2 +-
 ksirc/NewWindowDialog.cpp                        |  2 +-
 ksirc/alistbox.cpp                               |  2 +-
 ksirc/chanButtons.cpp                            |  2 +-
 ksirc/chanparser.cpp                             |  4 ++--
 ksirc/charSelector.cpp                           |  2 +-
 ksirc/colorpicker.cpp                            |  2 +-
 ksirc/dccManager.cpp                             |  2 +-
 ksirc/dccNew.cpp                                 |  4 ++--
 ksirc/dccToplevel.cpp                            |  4 ++--
 ksirc/displayMgrMDI.cpp                          |  4 ++--
 ksirc/dockservercontroller.cpp                   |  4 ++--
 ksirc/ioDCC.cpp                                  |  2 +-
 ksirc/iocontroller.cpp                           |  2 +-
 ksirc/ksirc.cpp                                  |  2 +-
 ksirc/ksircprocess.cpp                           |  4 ++--
 ksirc/ksview.cpp                                 |  2 +-
 ksirc/mditoplevel.cpp                            |  2 +-
 ksirc/messageReceiver.cpp                        |  2 +-
 ksirc/servercontroller.cpp                       |  4 ++--
 ksirc/servercontroller.dlg                       |  2 +-
 ksirc/ssfeprompt.cpp                             |  2 +-
 ksirc/topic.cpp                                  |  2 +-
 ksirc/toplevel.cpp                               | 10 +++++-----
 ksirc/usercontrolmenu.cpp                        |  2 +-
 ktalkd/kcmktalkd/answmachpage.cpp                |  2 +-
 ktalkd/kcmktalkd/forwmachpage.cpp                |  2 +-
 ktalkd/kcmktalkd/main.cpp                        |  4 ++--
 ktalkd/kcmktalkd/soundpage.cpp                   |  4 ++--
 ktalkd/ktalkdlg/ktalkdlg.cpp                     |  2 +-
 lanbrowsing/kcmlisa/findnic.cpp                  |  2 +-
 lanbrowsing/kcmlisa/kcmlisa.cpp                  |  6 +++---
 lanbrowsing/kcmlisa/kcmreslisa.cpp               |  4 ++--
 lanbrowsing/kcmlisa/kcmtdeiolan.cpp              |  2 +-
 lanbrowsing/kcmlisa/main.cpp                     |  2 +-
 lanbrowsing/kcmlisa/portsettingsbar.cpp          |  2 +-
 lanbrowsing/kcmlisa/setupwizard.cpp              |  2 +-
 lanbrowsing/kcmlisa/setupwizard.h                |  2 +-
 lanbrowsing/tdeio_lan/tdeio_lan.cpp              |  4 ++--
 tdednssd/ioslave/dnssd.cpp                       |  6 +++---
 tdednssd/kdedmodule/dnssdwatcher.cpp             |  4 ++--
 tdefile-plugins/torrent/tdefile_torrent.cpp      |  2 +-
 wifi/interface_wireless.cpp                      |  2 +-
 wifi/interface_wireless_wirelessextensions.cpp   |  4 ++--
 wifi/kcmwifi/ifconfigpage.cpp                    |  2 +-
 wifi/kcmwifi/kcmwifi.cpp                         |  4 ++--
 wifi/kcmwifi/mainconfig.cpp                      |  4 ++--
 wifi/kcmwifi/wificonfig.cpp                      |  6 +++---
 wifi/kwifimanager.cpp                            |  6 +++---
 wifi/kwireless/kwireless.cpp                     |  6 +++---
 wifi/kwireless/kwirelesswidget.cpp               |  4 ++--
 wifi/kwireless/linuxwirelesswidget.cpp           |  2 +-
 wifi/kwireless/propertytable.cpp                 |  2 +-
 wifi/locator.h                                   |  2 +-
 wifi/main.cpp                                    |  2 +-
 wifi/networkscanning.cpp                         |  6 +++---
 wifi/speed.cpp                                   |  2 +-
 wifi/statistics.cpp                              |  2 +-
 wifi/status.cpp                                  |  2 +-
 wifi/strength.cpp                                |  2 +-
 483 files changed, 783 insertions(+), 783 deletions(-)

diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp
index 62b670bb..e91cd703 100644
--- a/dcoprss/feedbrowser.cpp
+++ b/dcoprss/feedbrowser.cpp
@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include <tqcstring.h>
diff --git a/dcoprss/main.cpp b/dcoprss/main.cpp
index fb822a22..88807acd 100644
--- a/dcoprss/main.cpp
+++ b/dcoprss/main.cpp
@@ -5,7 +5,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "service.h"
 #include "query.h"
diff --git a/dcoprss/xmlrpciface.cpp b/dcoprss/xmlrpciface.cpp
index a3ba3956..05896d81 100644
--- a/dcoprss/xmlrpciface.cpp
+++ b/dcoprss/xmlrpciface.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 
 #include <tqdom.h>
diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
index 04eb0be7..099e29ea 100644
--- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
+++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 #include <kurlrequester.h> 
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "sambashare.h"
 #include "dictmanager.h" 
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 9c9e8de7..2b629f42 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -39,10 +39,10 @@
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <krestrictedline.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledetailview.h>
 #include <kdirlister.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "hiddenfileview.h"
diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
index 51a0ff36..110187f4 100644
--- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
+++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
@@ -224,8 +224,8 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kpassdlg.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">joindomaindlg.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 879983d9..6af9fb71 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -44,8 +44,8 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
@@ -53,7 +53,7 @@
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <krestrictedline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kjanuswidget.h>
 #include <tdelistview.h>
 #include <ksimpleconfig.h>
diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
index 83ea5180..081def45 100644
--- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
+++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
@@ -26,8 +26,8 @@
 #include <tqregexp.h> 
 #include <tqstringlist.h> 
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "passwd.h"
diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
index fa601072..55baa274 100644
--- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
@@ -50,7 +50,7 @@
 #include <tdeprint/kmprinter.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
index 187289b6..e11a1857 100644
--- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
+++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
@@ -32,7 +32,7 @@
 #include <tqheader.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "qmultichecklistitem.moc"
 #include "qmultichecklistitem.h"
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index 2cb66bec..7929b96d 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -26,9 +26,9 @@
 #include <tqfileinfo.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <ksambashare.h>
 
 #include <pwd.h>
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui
index c89bbe20..a150c097 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui
+++ b/filesharing/advanced/kcm_sambaconf/share.ui
@@ -3251,7 +3251,7 @@ Only change something if you know what you are doing.</string>
 <includes>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">tqptrlist.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="global" impldecl="in implementation">kprocess.h</include>
     <include location="local" impldecl="in implementation">share.ui.h</include>
 </includes>
diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
index b8fa97b4..56536018 100644
--- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
@@ -57,10 +57,10 @@
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledetailview.h>
 #include <kdirlister.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <krestrictedline.h>
diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
index a2a5c03e..5856528b 100644
--- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
@@ -33,8 +33,8 @@
  
 #include <tdeapplication.h> 
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
  
 
 #include "smbconfconfigwidget.h"
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
index 50bf2713..cc6e6a18 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
@@ -34,7 +34,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 
 #include "sambafile.h"
diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
index 9d0eb7ce..1be8f95b 100644
--- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
@@ -38,7 +38,7 @@
 #include <tqlineedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index 245402f0..ed009db1 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -26,9 +26,9 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdeaccel.h>
 
diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp
index 58c62ca8..3397ee9b 100644
--- a/filesharing/advanced/nfs/nfsfile.cpp
+++ b/filesharing/advanced/nfs/nfsfile.cpp
@@ -27,10 +27,10 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <knfsshare.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocio.h>
 
 #include "nfsfile.h"
diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp
index e45f1f87..4b62845e 100644
--- a/filesharing/advanced/nfs/nfshostdlg.cpp
+++ b/filesharing/advanced/nfs/nfshostdlg.cpp
@@ -21,9 +21,9 @@
 #include <tqwhatsthis.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <assert.h>
 
diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
index 0bf740ef..a61a8dd6 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
@@ -28,15 +28,15 @@
 #include <tdefileshare.h>
 #include <knfsshare.h>
 #include <ksambashare.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdefile.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kprocio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // NFS related
 #include "../nfs/nfsfile.h"
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 41c3bd71..2b05706c 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -25,11 +25,11 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tdefileshare.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "propertiespage.h"
 #include "propsdlgshareplugin.h"
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 327e6f6a..2ce40e3a 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -38,7 +38,7 @@
 #include <tdefileshare.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kuser.h>
 #include <kurl.h>
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index f771fa6c..67d66274 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -26,10 +26,10 @@
 #include <tqvbox.h>
 #include <tqhbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuser.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <tdelistbox.h>
 #include <kprocess.h>
diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp
index 0df5a95f..9130c4a2 100644
--- a/filesharing/simple/krichtextlabel.cpp
+++ b/filesharing/simple/krichtextlabel.cpp
@@ -22,7 +22,7 @@
 #include <tqstylesheet.h>
 #include <tqsimplerichtext.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 static TQString qrichtextify( const TQString& text )
 {
diff --git a/kdict/actions.h b/kdict/actions.h
index a5dd9201..5c618827 100644
--- a/kdict/actions.h
+++ b/kdict/actions.h
@@ -21,7 +21,7 @@
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 #include <tdeaction.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 class KComboBox;
 class TQLabel;
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 7ef1f847..e4bb9b14 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
diff --git a/kdict/dict.cpp b/kdict/dict.cpp
index 04c0643c..8094758d 100644
--- a/kdict/dict.cpp
+++ b/kdict/dict.cpp
@@ -25,9 +25,9 @@
 #include <tqregexp.h>
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <kextsock.h>
 #include <ksocks.h>
diff --git a/kdict/main.cpp b/kdict/main.cpp
index 7325e8f8..ce51a24d 100644
--- a/kdict/main.cpp
+++ b/kdict/main.cpp
@@ -14,7 +14,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelibs_export.h>
 
 #include "application.h"
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index ccc9cf1f..be2e018b 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -22,10 +22,10 @@
 #include <tqregexp.h>
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dict.h"
 #include "options.h"
diff --git a/kdict/options.cpp b/kdict/options.cpp
index 6885ae8d..4048badd 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -28,7 +28,7 @@
 
 #include <kcolordialog.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 #include <knuminput.h>
 #include <klineedit.h>
diff --git a/kdict/options.h b/kdict/options.h
index cea767c1..5a3a58c4 100644
--- a/kdict/options.h
+++ b/kdict/options.h
@@ -20,7 +20,7 @@
 
 #include <tqlistbox.h>
 #include <kdialogbase.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 class TQLineEdit;
 class TQCheckBox;
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index 1c71ab05..2f5f4a49 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -19,12 +19,12 @@
 #include <tqtimer.h>
 
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kcursor.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdehtml_events.h>
 #include <tdehtmlview.h>
 
diff --git a/kdict/sets.cpp b/kdict/sets.cpp
index 51dd7eb6..d49828b6 100644
--- a/kdict/sets.cpp
+++ b/kdict/sets.cpp
@@ -20,7 +20,7 @@
 
 #include <kiconloader.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "options.h"
 #include "sets.h"
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index aee8c156..72b22980 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -20,7 +20,7 @@
 #include <kstdaction.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp
index dc479fc2..4695cc5a 100644
--- a/kget/dlgAdvanced.cpp
+++ b/kget/dlgAdvanced.cpp
@@ -27,9 +27,9 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "settings.h"
diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp
index 97a299eb..9e425de9 100644
--- a/kget/dlgAutomation.cpp
+++ b/kget/dlgAutomation.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdatetimewidget.h>
 #include <knuminput.h>
 #include "common.h"
diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp
index 2908eda5..82655422 100644
--- a/kget/dlgConnection.cpp
+++ b/kget/dlgConnection.cpp
@@ -30,8 +30,8 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeprotocolmanager.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <kcombobox.h>
diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp
index bf12aa32..7faec0e5 100644
--- a/kget/dlgDirectories.cpp
+++ b/kget/dlgDirectories.cpp
@@ -33,9 +33,9 @@
 
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "settings.h"
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index 7add48c0..eeaa018d 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -40,7 +40,7 @@
 
 #include <tdeapplication.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <krun.h>
 #include <tdeio/global.h>
diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp
index 6f1f08f0..8ae36b8e 100644
--- a/kget/dlgLimits.cpp
+++ b/kget/dlgLimits.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "settings.h"
diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp
index 736ce7d3..777f5419 100644
--- a/kget/dlgPreferences.cpp
+++ b/kget/dlgPreferences.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
 
diff --git a/kget/docking.cpp b/kget/docking.cpp
index a8a11393..fa1adb97 100644
--- a/kget/docking.cpp
+++ b/kget/docking.cpp
@@ -29,7 +29,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 28f246b2..ed600f88 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -30,10 +30,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdemainwindow.h>
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index d16882dc..0cf512f9 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -7,8 +7,8 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstdaction.h>
 #include <tdetoolbar.h>
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp
index 58a52d81..b7f1ed69 100644
--- a/kget/kget_plug_in/kget_plug_in.cpp
+++ b/kget/kget_plug_in/kget_plug_in.cpp
@@ -25,11 +25,11 @@
 #include <kdebug.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 
diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp
index ecf35986..601beb31 100644
--- a/kget/logwindow.cpp
+++ b/kget/logwindow.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqlistview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeaction.h>
 
diff --git a/kget/main.cpp b/kget/main.cpp
index 48bdf170..1c1b9eb5 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -26,12 +26,12 @@
 
 
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kurl.h>
 #include <kuniqueapplication.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/kget/safedelete.cpp b/kget/safedelete.cpp
index 53fbbbc3..6ee9ec15 100644
--- a/kget/safedelete.cpp
+++ b/kget/safedelete.cpp
@@ -1,5 +1,5 @@
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kget/settings.cpp b/kget/settings.cpp
index c98bbd7e..8c905e18 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -25,12 +25,12 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 #include <netwm_def.h>
 
 #include <tqdir.h>
diff --git a/kget/tdefileio.cpp b/kget/tdefileio.cpp
index ee4b4096..ed9ef955 100644
--- a/kget/tdefileio.cpp
+++ b/kget/tdefileio.cpp
@@ -21,8 +21,8 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "tdefileio.h"
 
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 57171e2f..a7d51617 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -56,10 +56,10 @@
 #include <kiconloader.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <khelpmenu.h>
 #include <kedittoolbar.h>
@@ -68,7 +68,7 @@
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeio/renamedlg.h>
 
 #include "safedelete.h"
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index b1da4d5a..d1ff6f0b 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -26,14 +26,14 @@
 #include <tqheader.h>
 
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <assert.h>
 #include "safedelete.h"
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 12ce3b8e..d6acafc1 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -26,11 +26,11 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdeio/netaccess.h>
 
diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp
index 2de8990a..c8ad18f6 100644
--- a/knewsticker/common/configaccess.cpp
+++ b/knewsticker/common/configaccess.cpp
@@ -14,8 +14,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
 	// Arts ---------------
diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h
index b9be6d49..eab1b6fe 100644
--- a/knewsticker/common/configaccess.h
+++ b/knewsticker/common/configaccess.h
@@ -16,7 +16,7 @@
 
 #include <tdeconfig.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp
index d0c8c214..6f341c46 100644
--- a/knewsticker/common/newsengine.cpp
+++ b/knewsticker/common/newsengine.cpp
@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h
index 8015534b..81d2be81 100644
--- a/knewsticker/common/newsengine.h
+++ b/knewsticker/common/newsengine.h
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksharedptr.h>
 
 class ConfigAccess;
diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp
index 742c1ad1..b9d2ef3a 100644
--- a/knewsticker/common/xmlnewsaccess.cpp
+++ b/knewsticker/common/xmlnewsaccess.cpp
@@ -12,7 +12,7 @@
 
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqbuffer.h>
 #include <tqdom.h>
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 01b5c000..cca820eb 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -23,9 +23,9 @@
 #include <kiconloader.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <tqcursor.h>
 #include <tqlayout.h>
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index 77689310..0e558a1c 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdepopupmenu.h>
 
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 15ebe7f7..8076c304 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -19,11 +19,11 @@
 
 #include <tdeapplication.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurllabel.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqmultilineedit.h>
 #include <tqvbox.h>
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index cd9d9000..4c5f3861 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -18,7 +18,7 @@
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "configaccess.h"
 #include "newsscroller.h"
diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp
index e5c50090..83fd6e04 100644
--- a/knewsticker/newssourcedlgimpl.cpp
+++ b/knewsticker/newssourcedlgimpl.cpp
@@ -15,7 +15,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
 
diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES
index 561b27ec..3b00924d 100644
--- a/kopete/KABC_INTEG_NOTES
+++ b/kopete/KABC_INTEG_NOTES
@@ -195,7 +195,7 @@ Implementation notes
 
 6) Question: how to combine all contacts in an MCs' data before saving this to kabc.
 
-7) First do dupe check or 'im-info-in-kabc-not-in-kopete' check in case this information already exists in KABC.  Once added to a MC, if already associated, we can add the new contact information to kabc immediately, otherwise Deferred association accessed via MC properties dialog.
+7) First do dupe check or 'im-info-in-tdeabc-not-in-kopete' check in case this information already exists in KABC.  Once added to a MC, if already associated, we can add the new contact information to kabc immediately, otherwise Deferred association accessed via MC properties dialog.
 
 8) Don't remove the kabc fields, other IM clients might be using them.  So we just remove them from the Kopete contact list.  Dupe contact on the MC add contact thingy will catch if the contact is added again.  (and the user might still want to have other data like the phone number) * See the kabc section
 
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>
diff --git a/kopete/libkopete/CMakeLists.txt b/kopete/libkopete/CMakeLists.txt
index 1fb766dd..113289cb 100644
--- a/kopete/libkopete/CMakeLists.txt
+++ b/kopete/libkopete/CMakeLists.txt
@@ -86,6 +86,6 @@ tde_add_library( kopete SHARED AUTOMOC
     kopeteprefs.cpp kopetepicture.cpp webcamwidget.cpp
   VERSION 1.0.0
   EMBED kopeteui-static
-  LINK kopeteprivate-static kabc-shared tdeutils-shared tdehtml-shared
+  LINK kopeteprivate-static tdeabc-shared tdeutils-shared tdehtml-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
index 4cc0af42..4c96a452 100644
--- a/kopete/libkopete/avdevice/videodevicepool.cpp
+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
@@ -21,7 +21,7 @@
 #include <cstring>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 
 #include "videodevice.h"
diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h
index b793172d..07db7880 100644
--- a/kopete/libkopete/avdevice/videodevicepool.h
+++ b/kopete/libkopete/avdevice/videodevicepool.h
@@ -33,7 +33,7 @@
 #include "kopete_export.h"
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 namespace Kopete {
 
diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp
index c394af0f..8228cd2f 100644
--- a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp
@@ -21,7 +21,7 @@
 #include <kdialogbase.h>
 #include <tqdialog.h>
 #include <tqdesktopwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent,
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index 8b658e03..7ba93e90 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 #include <kimageeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <stdlib.h>
diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp
index 781ea22f..90519ae7 100644
--- a/kopete/libkopete/connectionmanager.cpp
+++ b/kopete/libkopete/connectionmanager.cpp
@@ -1,7 +1,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 
 #include "clientiface_stub.h"
diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp
index 83caeb29..2e0e5b61 100644
--- a/kopete/libkopete/kabcpersistence.cpp
+++ b/kopete/libkopete/kabcpersistence.cpp
@@ -18,15 +18,15 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/resource.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
 
 // UI related includes used for importing from KABC
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "accountselector.h"
 #include "kopeteuiglobal.h"
 
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 3ac39409..cdb29672 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -20,7 +20,7 @@
 
 #include "kautoconfig.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqsqlpropertymap.h>
 #include <tqobjectlist.h>
 #include <tdeconfig.h>
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index 44529554..9730d100 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <knotifyclient.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kpassivepopup.h>
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index c3af2df8..623fd2fd 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -23,12 +23,12 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 
 #include "kabcpersistence.h"
diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index df844211..bd3ba42d 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kplugininfo.h>
 
 #include "kopeteaccount.h"
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index fe23ee9e..1412634a 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -34,8 +34,8 @@
 #include <tdeapplication.h>
 #include <dcopref.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <ksettings/dispatcher.h>
 
diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp
index 12c133f9..da5b77fb 100644
--- a/kopete/libkopete/kopeteawayaction.cpp
+++ b/kopete/libkopete/kopeteawayaction.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <kinputdialog.h>
 #include <kstringhandler.h>
diff --git a/kopete/libkopete/kopeteawaydialog.cpp b/kopete/libkopete/kopeteawaydialog.cpp
index 19d9fb9c..9515ab3b 100644
--- a/kopete/libkopete/kopeteawaydialog.cpp
+++ b/kopete/libkopete/kopeteawaydialog.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include "kopeteaway.h"
diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp
index e249d736..31b7dd0b 100644
--- a/kopete/libkopete/kopeteblacklister.cpp
+++ b/kopete/libkopete/kopeteblacklister.cpp
@@ -18,7 +18,7 @@
 #include "kopetecontact.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqstringlist.h>
 
diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp
index 41083d5e..e92f591c 100644
--- a/kopete/libkopete/kopetechatsession.cpp
+++ b/kopete/libkopete/kopetechatsession.cpp
@@ -27,9 +27,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotification.h>
 
 #include "kopeteaccount.h"
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index 481f8b88..bbdf6375 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -17,7 +17,7 @@
 #include <tdeapplication.h>
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeversion.h>
 #include <kxmlguiclient.h>
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index 2c9e856c..322a46f3 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -28,9 +28,9 @@
 
 #include <kabcpersistence.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistviewsearchline.h>
 
 #include "kopetecontactlist.h"
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index ca947582..de9e509b 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -25,12 +25,12 @@
 #include <tqtimer.h>
 
 #include <tdeapplication.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kdebug.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kopeteconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "kopetemetacontact.h"
 #include "kopetecontact.h"
 #include "kopetechatsession.h"
diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp
index 86fc19c1..cfce58b6 100644
--- a/kopete/libkopete/kopetecontactlistelement.cpp
+++ b/kopete/libkopete/kopetecontactlistelement.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kopeteplugin.h"
 
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index bf4a89d3..1bebb8d7 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -20,10 +20,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp
index 6206545a..c73194bd 100644
--- a/kopete/libkopete/kopetegroup.cpp
+++ b/kopete/libkopete/kopetegroup.cpp
@@ -23,7 +23,7 @@
 #include "kopetecontact.h"
 #include "kopetechatsession.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Kopete {
 
diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp
index a70b137b..5a55dcbc 100644
--- a/kopete/libkopete/kopetemessage.cpp
+++ b/kopete/libkopete/kopetemessage.cpp
@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 #include <tqtextcodec.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <kmdcodec.h>
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index d71962e4..fb34e892 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -22,12 +22,12 @@
 
 #include <tdeapplication.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeversion.h>
 
 #include "kabcpersistence.h"
diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp
index 8f4741b8..0421ba25 100644
--- a/kopete/libkopete/kopetemimetypehandler.cpp
+++ b/kopete/libkopete/kopetemimetypehandler.cpp
@@ -23,10 +23,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
diff --git a/kopete/libkopete/kopeteonlinestatus.cpp b/kopete/libkopete/kopeteonlinestatus.cpp
index f37c18f8..866f7b50 100644
--- a/kopete/libkopete/kopeteonlinestatus.cpp
+++ b/kopete/libkopete/kopeteonlinestatus.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
 
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index e5c2476f..0809881d 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
 #include <kcpuinfo.h> // for WORDS_BIGENDIAN
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index 62ba7d42..875e2edf 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -31,8 +31,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kpassdlg.h>
 #include <kstringhandler.h>
diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp
index 9c946d21..67a7d1fe 100644
--- a/kopete/libkopete/kopetepasswordedaccount.cpp
+++ b/kopete/libkopete/kopetepasswordedaccount.cpp
@@ -19,7 +19,7 @@
 #include "kopeteprotocol.h"
 #include "kopeteonlinestatus.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpixmap.h>
 
diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp
index 11e067cb..dad810c4 100644
--- a/kopete/libkopete/kopetepicture.cpp
+++ b/kopete/libkopete/kopetepicture.cpp
@@ -18,7 +18,7 @@
 
 #include <tqbuffer.h>
 
-#include <kabc/picture.h>
+#include <tdeabc/picture.h>
 
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 4701edfb..1cab6c07 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -21,7 +21,7 @@
 #include <tqmetaobject.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp
index 52d033bf..b0758128 100644
--- a/kopete/libkopete/kopeteprotocol.cpp
+++ b/kopete/libkopete/kopeteprotocol.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdict.h>
 
diff --git a/kopete/libkopete/kopetetask.cpp b/kopete/libkopete/kopetetask.cpp
index fad469c8..2f308ce7 100644
--- a/kopete/libkopete/kopetetask.cpp
+++ b/kopete/libkopete/kopetetask.cpp
@@ -16,7 +16,7 @@
 
 #include "kopetetask.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqptrlist.h>
 
diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp
index 43e57573..1df5b7c7 100644
--- a/kopete/libkopete/kopetetransfermanager.cpp
+++ b/kopete/libkopete/kopetetransfermanager.cpp
@@ -16,11 +16,11 @@
     *************************************************************************
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <tdefiledialog.h>
 #include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/observer.h>
 
 #include "kopetemetacontact.h"
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index efd632bd..f5cd0b2e 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -19,11 +19,11 @@
 
 #include <tqmap.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
 #include <kdebug.h>
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp
index 1c7ff584..7a21c5ed 100644
--- a/kopete/libkopete/private/kopetecommand.cpp
+++ b/kopete/libkopete/private/kopetecommand.cpp
@@ -17,8 +17,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopeteview.h"
diff --git a/kopete/libkopete/private/kopeteutils_private.cpp b/kopete/libkopete/private/kopeteutils_private.cpp
index 933a5b11..21453baa 100644
--- a/kopete/libkopete/private/kopeteutils_private.cpp
+++ b/kopete/libkopete/private/kopeteutils_private.cpp
@@ -16,7 +16,7 @@
 
 #include <tqmap.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdebug.h>
 
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index a3150403..91305a2b 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -18,12 +18,12 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqptrlist.h>
 #include <tqstylesheet.h>
 #include <kplugininfo.h>
 #include <knotification.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <twin.h>
 
 #include "kopeteprefs.h"
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index b38c3572..f57becaa 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 8239ca86..3a80524c 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 static TQTextStream _out( stdout, IO_WriteOnly );
diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp
index f7ce6e5e..19dcff47 100644
--- a/kopete/libkopete/tests/kopetepropertiestest.cpp
+++ b/kopete/libkopete/tests/kopetepropertiestest.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "kopetepropertiestest.h"
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 85201f40..58f2370e 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 31e04a52..2aa7df67 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqapplication.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <kiconloader.h>
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h
index 09574193..0ff4a651 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.h
+++ b/kopete/libkopete/ui/addressbooklinkwidget.h
@@ -24,7 +24,7 @@
 #ifndef ADDRESSBOOKLINKWIDGET_H
 #define ADDRESSBOOKLINKWIDGET_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "addressbooklinkwidget_base.h"
 
diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp
index 44f42e2a..e75e7bc9 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbookselectordialog.cpp
@@ -22,7 +22,7 @@
 #include <tqdialog.h>
 #include <tqlistview.h>
 #include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 namespace Kopete
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 9e03292b..8a0f08b5 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tdeversion.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index af4b1834..09eb406d 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -28,7 +28,7 @@
 #define AddressBookSelectorWidget_H
 
 #include <kdialogbase.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 #include <kdemacros.h>
 #include "kopete_export.h"
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 724f277c..3065abe8 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "addresseeitem.h"
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index e0d8de53..6962d109 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -27,7 +27,7 @@
 #include <klineedit.h>
 #include <tdelistview.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 /**
   @short Special ListViewItem
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index 5b5e1e55..b0fdd43a 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -23,13 +23,13 @@
 #include <tqstylesheet.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "kopetegroup.h"
 #include "kopeteaccount.h"
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index 524d6bed..25aa6140 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -19,10 +19,10 @@
 
 #include <klineedit.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include "kopetetransfermanager.h"
 #include "fileconfirmbase.h"
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 44b2a8d9..a81714f3 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -23,7 +23,7 @@
 #include "kopeteprefs.h"
 
 #include <tqapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index 5a589293..b10450d4 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksettings/dialog.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 856e421e..cec17bf7 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tdeversion.h>
diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp
index 8c0b2765..909c38c9 100644
--- a/kopete/libkopete/ui/userinfodialog.cpp
+++ b/kopete/libkopete/ui/userinfodialog.cpp
@@ -22,7 +22,7 @@
 #include <ktextbrowser.h>
 #include <tdeapplication.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index 8fe0fed1..b1e1b0c1 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -11,7 +11,7 @@
 //
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "addbookmarksprefssettings.h"
 
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 6b91418d..2c160abd 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -9,11 +9,11 @@
 
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tqregexp.h>
 #include <tqlayout.h>
diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
index ce0ca264..6e8ef3bd 100644
--- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
@@ -19,8 +19,8 @@
 #include "autoreplaceconfig.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 AutoReplaceConfig::AutoReplaceConfig()
 {
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
index 48062fb5..f8bb68c9 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
@@ -22,9 +22,9 @@
 #include <tqheader.h>
 #include <tqlistview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 #include <kautoconfig.h>
 
diff --git a/kopete/plugins/contactnotes/contactnotesedit.cpp b/kopete/plugins/contactnotes/contactnotesedit.cpp
index 782476b9..39802a6a 100644
--- a/kopete/plugins/contactnotes/contactnotesedit.cpp
+++ b/kopete/plugins/contactnotes/contactnotesedit.cpp
@@ -19,7 +19,7 @@
 #include <tqtextedit.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetemetacontact.h"
 
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index d8cafd85..8adf8fab 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeaction.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 class CryptographyPlugin;
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index ae92647b..26551a7e 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp
index 73858012..5763e910 100644
--- a/kopete/plugins/cryptography/kgpginterface.cpp
+++ b/kopete/plugins/cryptography/kgpginterface.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <stdlib.h>
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 8604e97c..403efbb7 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <kprocess.h>
 #include <kiconloader.h>
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 7263e95c..e5aaeebf 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -35,7 +35,7 @@
 #include <tdelistview.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #include <tdelistviewsearchline.h>
 #include <kactivelabel.h>
diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp
index d6e04d7f..02f28f7a 100644
--- a/kopete/plugins/highlight/highlightconfig.cpp
+++ b/kopete/plugins/highlight/highlightconfig.cpp
@@ -24,7 +24,7 @@
 
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "filter.h"
 #include "highlightconfig.h"
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index 34a7a1cc..524a7044 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kgenericfactory.h>
 #include <kcolorbutton.h>
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index f3616ee4..ca3c2e74 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -22,9 +22,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
 #include <ksavefile.h>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 37ddb921..aedd3e8a 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -45,7 +45,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp
index eeda505c..54cc3401 100644
--- a/kopete/plugins/history/historyguiclient.cpp
+++ b/kopete/plugins/history/historyguiclient.cpp
@@ -22,7 +22,7 @@
 #include "kopeteview.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 class HistoryPlugin;
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index bf53fee4..fb48e79f 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -18,7 +18,7 @@
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //#include <tdeconfig.h>
 #include <kplugininfo.h>
 #include <tdeversion.h>
diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp
index d62be944..6e704847 100644
--- a/kopete/plugins/latex/latexguiclient.cpp
+++ b/kopete/plugins/latex/latexguiclient.cpp
@@ -20,8 +20,8 @@
 #include <tqvariant.h>
 
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqimage.h>
 #include <tqregexp.h>
 #include <tqstylesheet.h>
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index 17ef8c15..2773d21f 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -25,9 +25,9 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopeteuiglobal.h"
diff --git a/kopete/plugins/latex/latexplugin.h b/kopete/plugins/latex/latexplugin.h
index 52be1c69..5b88e791 100644
--- a/kopete/plugins/latex/latexplugin.h
+++ b/kopete/plugins/latex/latexplugin.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"
diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp
index 9014fff1..505b81e2 100644
--- a/kopete/plugins/latex/latexpreferences.cpp
+++ b/kopete/plugins/latex/latexpreferences.cpp
@@ -17,7 +17,7 @@
 
 #include <tqlayout.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <knuminput.h>
diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
index e47386a2..bf457b90 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "msnchatsession.h"
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 4373cb05..b42f9e93 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -22,11 +22,11 @@
 #include "msncontact.h"
 #include "kopetemetacontact.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 #include <tqtimer.h>
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 207fd6cd..309d4d15 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -20,9 +20,9 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
index d562e0cb..af76d576 100644
--- a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
+++ b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
@@ -5,4 +5,4 @@ Singleton=true
 Mutators=true
 MemberVariables=private
 GlobalEnums=true
-IncludeFiles=klocale.h
+IncludeFiles=tdelocale.h
diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
index 702bdeca..f9c4d631 100644
--- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
@@ -26,8 +26,8 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowListeningPlugin *plugin )
 		: TQObject(parent) , KXMLGUIClient(parent)
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index 47eb51b4..85cd864b 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -23,7 +23,7 @@
 #include <tqradiobutton.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "config.h" // for HAVE_XMMS
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 57ca728d..009780c8 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 931fbb83..75976df5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <kresolver.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kopetepluginmanager.h"
diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp
index 79b0656c..09779d27 100644
--- a/kopete/plugins/smpppdcs/unittest/main.cpp
+++ b/kopete/plugins/smpppdcs/unittest/main.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeunittest/runnergui.h>
 
 #include "clienttest.h"
diff --git a/kopete/plugins/statistics/statisticscontact.cpp b/kopete/plugins/statistics/statisticscontact.cpp
index badaf147..8ec488ec 100644
--- a/kopete/plugins/statistics/statisticscontact.cpp
+++ b/kopete/plugins/statistics/statisticscontact.cpp
@@ -20,7 +20,7 @@
 #include <tquuid.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetemetacontact.h"
 #include "kopeteonlinestatus.h"
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 0feed26c..48378f3c 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index fb7ac6d8..a696c9df 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 
 #include "kdialogbase.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdelistview.h"
 #include "tdehtml_part.h"
 #include "kstandarddirs.h"
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 49ddfb18..2cfe0290 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -21,7 +21,7 @@
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 
diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp
index a411b363..7f983e0c 100644
--- a/kopete/plugins/texteffect/texteffectconfig.cpp
+++ b/kopete/plugins/texteffect/texteffectconfig.cpp
@@ -18,7 +18,7 @@
 
 #include <tqstring.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include "texteffectconfig.h"
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index e2a05469..b178aaf1 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 #include <kgenericfactory.h>
 #include <kautoconfig.h>
diff --git a/kopete/plugins/translator/translatordialog.cpp b/kopete/plugins/translator/translatordialog.cpp
index 02e405ec..2bbd0114 100644
--- a/kopete/plugins/translator/translatordialog.cpp
+++ b/kopete/plugins/translator/translatordialog.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
  
 #include "translatordialog.h"
diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp
index 0a2e8ed2..5d245c0f 100644
--- a/kopete/plugins/translator/translatorguiclient.cpp
+++ b/kopete/plugins/translator/translatorguiclient.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetechatsession.h"
 #include "kopeteview.h"
diff --git a/kopete/plugins/translator/translatorlanguages.cpp b/kopete/plugins/translator/translatorlanguages.cpp
index 5eecbf22..be532847 100644
--- a/kopete/plugins/translator/translatorlanguages.cpp
+++ b/kopete/plugins/translator/translatorlanguages.cpp
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "translatorlanguages.h"
 
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index f052af16..223d1d70 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeaboutdata.h>
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 48271559..4265c7aa 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 #ifdef HAVE_XSLT
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 5ca54870..f82f20ee 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -39,11 +39,11 @@
 #include <kpassdlg.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #include <tqapplication.h>
diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp
index 99867508..aeed83b3 100644
--- a/kopete/protocols/gadu/gaduaddcontactpage.cpp
+++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp
@@ -29,7 +29,7 @@
 #include "gaducontact.h"
 #include "gaducontactlist.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kopetecontactlist.h>
 #include <kopetegroup.h>
diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp
index 2be2a2aa..2678106c 100644
--- a/kopete/protocols/gadu/gaduaway.cpp
+++ b/kopete/protocols/gadu/gaduaway.cpp
@@ -27,7 +27,7 @@
 #include "kopeteonlinestatus.h"
 
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp
index 104e1b01..e167ffd7 100644
--- a/kopete/protocols/gadu/gaducommands.cpp
+++ b/kopete/protocols/gadu/gaducommands.cpp
@@ -32,7 +32,7 @@
 #include <tqtextcodec.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <errno.h>
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index bedb3f55..40d06c52 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -20,11 +20,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "gaduaccount.h"
 #include "gaduprotocol.h"
diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp
index a6568ff6..34be220a 100644
--- a/kopete/protocols/gadu/gadudcctransaction.cpp
+++ b/kopete/protocols/gadu/gadudcctransaction.cpp
@@ -27,8 +27,8 @@
 #include <netinet/in.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kopetetransfermanager.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp
index 08987c16..75001746 100644
--- a/kopete/protocols/gadu/gadueditaccount.cpp
+++ b/kopete/protocols/gadu/gadueditaccount.cpp
@@ -36,9 +36,9 @@
 #include <tqgroupbox.h>
 
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include "kopetepasswordwidget.h"
diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp
index 985a9874..b3a5ae68 100644
--- a/kopete/protocols/gadu/gadueditcontact.cpp
+++ b/kopete/protocols/gadu/gadueditcontact.cpp
@@ -28,7 +28,7 @@
 #include "gaduadd.h"
 
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kopetegroup.h>
 #include <kopetecontactlist.h>
diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp
index 92f53b48..00ba18ed 100644
--- a/kopete/protocols/gadu/gadupubdir.cpp
+++ b/kopete/protocols/gadu/gadupubdir.cpp
@@ -38,7 +38,7 @@
 #include <krestrictedline.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name )
 : KDialogBase( parent, name, false, TQString(), User1|User2|User3|Cancel, User2 )
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index 6f622b7d..f70feb60 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -25,11 +25,11 @@
 #include <tqlabel.h>
 
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "gaduregisteraccountui.h"
 #include "gaduregisteraccount.h"
diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp
index 7fded85a..6789a6ff 100644
--- a/kopete/protocols/gadu/gadusession.cpp
+++ b/kopete/protocols/gadu/gadusession.cpp
@@ -25,7 +25,7 @@
 
 #include "gadusession.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "kopetemessage.h"
 
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index 622311c3..f102b3f9 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 
 #include <kopeteuiglobal.h>
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index 3bc505d7..c356e14e 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kopetemetacontact.h>
 #include <kopeteuiglobal.h>
diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp
index 583c525f..cf0c3225 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.cpp
+++ b/kopete/protocols/groupwise/gwmessagemanager.cpp
@@ -16,9 +16,9 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeshortcut.h>
 
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
index ba2a2a58..f61161d3 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "gwerror.h"
 
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
index 5ece3882..b0ace3d0 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
@@ -32,7 +32,7 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopeteaccount.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp
index 1cfee7ee..45dd9ec2 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "gwerror.h"
 #include "gwchatpropswidget.h"
 
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
index 8d61cda1..3cf58e7d 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "client.h"
 #include "chatroommanager.h"
 
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index 94be6350..48b69e2d 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kopeteglobal.h>
 #include <kopeteonlinestatus.h>
 #include <kopetemetacontact.h>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 62ff00ae..37a1f26e 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include "kopetepasswordedaccount.h"
 #include "kopetepasswordwidget.h"
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
index 80daff71..208e99fb 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
@@ -24,8 +24,8 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "client.h"
 #include "gwaccount.h"
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
index 4c51487f..4dbbe45b 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kopetecontact.h>
 #include <kopeteglobal.h>
 #include <kopetemetacontact.h>
diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp
index b3f2428e..addb54cd 100644
--- a/kopete/protocols/groupwise/ui/gwsearch.cpp
+++ b/kopete/protocols/groupwise/ui/gwsearch.cpp
@@ -24,7 +24,7 @@
 //#include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kopetemetacontact.h>
 
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 2b8dc549..e586dd6a 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -46,11 +46,11 @@
 #include <tdeconfig.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <tdepopupmenu.h>
 
diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp
index 6b19721c..35bc4fc2 100644
--- a/kopete/protocols/irc/ircaddcontactpage.cpp
+++ b/kopete/protocols/irc/ircaddcontactpage.cpp
@@ -28,8 +28,8 @@
 #include <tqframe.h>
 #include <tqtabwidget.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddContactPage(parent, 0)
 {
diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 91b7459f..c11aec03 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -34,8 +34,8 @@
 #include <kinputdialog.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 
 #include <tqtimer.h>
 
diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp
index c45b5303..1df631f9 100644
--- a/kopete/protocols/irc/irccontact.cpp
+++ b/kopete/protocols/irc/irccontact.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp
index 3724781d..9ce7f73a 100644
--- a/kopete/protocols/irc/ircguiclient.cpp
+++ b/kopete/protocols/irc/ircguiclient.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdeversion.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 8c8e6291..2c35d737 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -45,10 +45,10 @@
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp
index e5018ccd..7c7a9d50 100644
--- a/kopete/protocols/irc/ircservercontact.cpp
+++ b/kopete/protocols/irc/ircservercontact.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index 07515c75..1254b9d9 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -29,7 +29,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 79bc56df..4ca09bfc 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -27,7 +27,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kextsock.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqtextcodec.h>
diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp
index 8a48ce52..7eb7b7b0 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessage.cpp
@@ -24,8 +24,8 @@
 
 #include <kdebug.h>
 #include <kextsock.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 using namespace KIRC;
 
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index 68e28f0c..cbcb6682 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kextsock.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
index 3a5ef27c..c86124cb 100644
--- a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
@@ -15,8 +15,8 @@
     *************************************************************************
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kextsock.h>
 
 #include <tqfile.h>
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 8d248152..23e7a10c 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -19,7 +19,7 @@
 #include <tqsocketnotifier.h>
 
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kssl.h>
 #include <ksslinfodlg.h>
@@ -27,7 +27,7 @@
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksslsocket.h"
 
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 6f26b0e4..9ee7bbcb 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -19,8 +19,8 @@
 
 #include "kircengine.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqvariant.h>
 #include <tqlabel.h>
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 0b357726..854eff97 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -27,13 +27,13 @@
 
 #include "kopetepasswordwidget.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqlabel.h>
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 29e542be..cf4999fc 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -39,8 +39,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdesocketbase.h>
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index ec4b869f..7f2dca11 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -17,13 +17,13 @@
   */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tqtimer.h>
 #include <tqimage.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 
diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp
index 8167a1c7..ba8d1779 100644
--- a/kopete/protocols/jabber/jabberbookmarks.cpp
+++ b/kopete/protocols/jabber/jabberbookmarks.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "xmpp_tasks.h"
 
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 71b2c7d6..1f347412 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kopetechatsessionmanager.h"
 #include "kopetemessage.h"
 #include "kopeteviewplugin.h"
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index d019a734..92bad45f 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -29,8 +29,8 @@
 #include <tqbuffer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp
index 43724d28..5f68b9dc 100644
--- a/kopete/protocols/jabber/jabbercontactpool.cpp
+++ b/kopete/protocols/jabber/jabbercontactpool.cpp
@@ -20,7 +20,7 @@
 
 #include <tqptrlist.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kopeteaccountmanager.h>
 #include <kopetecontactlist.h>
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp
index e60116e5..c172b30f 100644
--- a/kopete/protocols/jabber/jabberfiletransfer.cpp
+++ b/kopete/protocols/jabber/jabberfiletransfer.cpp
@@ -19,8 +19,8 @@
 #include <im.h>
 #include <xmpp.h>
 #include "jabberfiletransfer.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include "kopeteuiglobal.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
index e098fdad..f746c0af 100644
--- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp
+++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
@@ -19,7 +19,7 @@
 
 #include <tqptrlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kopetechatsessionmanager.h"
 #include "kopeteview.h"
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index b110b521..fde5e300 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -19,7 +19,7 @@
 #include "jabbergroupcontact.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
index 3bbc7a94..35b06c09 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
@@ -18,7 +18,7 @@
 #include "jabbergroupmembercontact.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index 4de868a7..7cc3be7a 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 94bbb5b2..e503008e 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "xmpp_tasks.h"
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
index 86fc606f..dc2b2c8d 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
@@ -27,7 +27,7 @@
 #include "voicecaller.h"
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // Kopete includes
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index a075bbde..c3091248 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
@@ -25,9 +25,9 @@
 #include <tqcstring.h>
 #include <tqthread.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <xmpp_tasks.h>
 #include "jabberclient.h"
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
index be558388..10c11b0f 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
@@ -21,8 +21,8 @@
 #include <tqtable.h>
 #include <tqlabel.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "jabberaccount.h"
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
index 948a594e..c665bf94 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
@@ -20,9 +20,9 @@
 #include "dlgjabberchangepassword.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <kopetepassword.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
index 9d69beae..46071122 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
index 1803a013..3afea298 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
@@ -9,8 +9,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtable.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
index ff324085..0f6f55f4 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
@@ -18,8 +18,8 @@
 
 #include <tqpushbutton.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "jabberaccount.h"
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
index 1bd1310c..bf0eaa27 100644
--- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqpushbutton.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 34a2eb35..0092742e 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -32,9 +32,9 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 076b92b8..3542cb0f 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlayout.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kopeteaccount.h>
 #include <tqlabel.h>
 #include <kopetegroup.h>
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index 77356c55..9221b2c4 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -20,7 +20,7 @@
 #include "jabberchooseserver.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index a07c8f1d..4fecd6c4 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 #include <kopetepassword.h>
 #include <kopetepasswordedaccount.h>
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index e18adbf9..febad40c 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -20,10 +20,10 @@
 #include "jabberregisteraccount.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <knuminput.h>
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index 7350b425..d38f0df5 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -27,11 +27,11 @@
 
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfigbase.h>
 #include "kopeteaway.h"
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqdict.h>
 
 MeanwhileAccount::MeanwhileAccount(
diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp
index e594dd57..0c7a2db7 100644
--- a/kopete/protocols/meanwhile/meanwhilecontact.cpp
+++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp
@@ -17,7 +17,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopeteaccount.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
index 8f795724..77955782 100644
--- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
+++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <kopeteaccount.h>
 #include <kopetepasswordwidget.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include "meanwhileprotocol.h"
 #include "meanwhileaccount.h"
 #include "meanwhileeditaccountwidget.h"
diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp
index 3b880932..bacf49c6 100644
--- a/kopete/protocols/meanwhile/meanwhilesession.cpp
+++ b/kopete/protocols/meanwhile/meanwhilesession.cpp
@@ -18,8 +18,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <kopetepassword.h>
 #include <kopetechatsession.h>
diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index f81ef8cc..70d43a14 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -34,7 +34,7 @@ using P2P::OutgoingTransfer;
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // TQt includes
 #include <tqdatastream.h>
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index a4f31216..0da4a04c 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -22,10 +22,10 @@ using P2P::Message;
 // Kde includes
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kserversocket.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 using namespace KNetwork;
 
 // TQt includes
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 6c7dbb41..c987bf1d 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -25,11 +25,11 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>
@@ -54,7 +54,7 @@
 
 #if !defined NDEBUG
 #include "msndebugrawcmddlg.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #endif
 
 #if MSN_WEBCAM
diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp
index 8bdf77a1..74102e1d 100644
--- a/kopete/protocols/msn/msnaddcontactpage.cpp
+++ b/kopete/protocols/msn/msnaddcontactpage.cpp
@@ -16,8 +16,8 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "msnadd.h"
 #include "msnaddcontactpage.h"
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 6137e17b..fabd62ab 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -27,10 +27,10 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdemainwindow.h>
 #include <tdetoolbar.h>
 #include <krun.h>
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 25041d72..40d45b51 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -28,13 +28,13 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqregexp.h>
 #include <tdeio/job.h>
 
diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp
index 48c4050e..b2a4ebbd 100644
--- a/kopete/protocols/msn/msndebugrawcmddlg.cpp
+++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <ktextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent )
 : KDialogBase( parent, 0L, true,
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index 3c480092..b7121c30 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -28,7 +28,7 @@
 #include <kserversocket.h>
 #include <kbufferedsocket.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetetransfermanager.h"
 #include "kopetecontact.h"
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 5f20d9ca..ec9b27c8 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -34,11 +34,11 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <krun.h>
 #include <tdeio/job.h>
 #include <tqfile.h>
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 32b3d17a..2bb33c97 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -31,8 +31,8 @@
 #include <kbufferedsocket.h>
 #include <kserversocket.h>
 #include <kresolver.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 179b45e3..77b7b550 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -35,14 +35,14 @@
 
 // kde
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfig.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // for the display picture
 #include <msncontact.h>
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index ce34f4a9..5d66c495 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -21,7 +21,7 @@
 // Kde includes
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 using namespace KNetwork;
 
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 57022e6d..41a007f9 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -32,8 +32,8 @@
 
 #include <kautoconfig.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index b7f991cd..60046d17 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -20,9 +20,9 @@
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <kbufferedsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kserversocket.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqguardedptr.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index 39b7049b..f10d6abe 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <tqwidget.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 37bfb1dc..f6be26b7 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -19,9 +19,9 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 
 #include "kopeteawayaction.h"
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index fcd51501..2fa79bf1 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopeteaway.h"
 #include "kopetechatsession.h"
diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp
index 2ccec9b2..bc4a3edf 100644
--- a/kopete/protocols/oscar/aim/aimjoinchat.cpp
+++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "aimjoinchatbase.h"
 #include "aimaccount.h"
diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp
index 0b70ac89..f71e1848 100644
--- a/kopete/protocols/oscar/aim/aimprotocol.cpp
+++ b/kopete/protocols/oscar/aim/aimprotocol.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstringlist.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "aimprotocol.h"
@@ -34,7 +34,7 @@
 #include "kopetemetacontact.h"
 
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kimageio.h>
 
 typedef KGenericFactory<AIMProtocol> AIMProtocolFactory;
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index eb013a4a..0cce3a5c 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
index f00741c9..c6612027 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
@@ -22,8 +22,8 @@
 
 #include <tqlayout.h>
 #include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent,
 					 const char *name )
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index 53ca409a..d7a5a529 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -19,10 +19,10 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopeteawayaction.h"
 #include "kopetemessage.h"
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index a6bd9b83..7971bd8f 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -26,8 +26,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kpassivepopup.h>
 #include <kinputdialog.h>
diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp
index b0a051d7..8fca2441 100644
--- a/kopete/protocols/oscar/icq/icqpresence.cpp
+++ b/kopete/protocols/oscar/icq/icqpresence.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include <kopeteonlinestatus.h>
diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp
index 26284a35..a54c82b0 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.cpp
+++ b/kopete/protocols/oscar/icq/icqprotocol.cpp
@@ -39,9 +39,9 @@
 */
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopeteglobal.h"
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp
index 772650fb..962b97e5 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.cpp
+++ b/kopete/protocols/oscar/icq/icqreadaway.cpp
@@ -23,7 +23,7 @@
 #include <tqvbox.h>
 
 #include <ktextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 
 #include <assert.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index a5071753..719b0bd7 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -29,9 +29,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "icqadd.h"
 #include "icqaccount.h"
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
index 9041a131..a6f4b7d4 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
@@ -18,7 +18,7 @@
 #include "icqauthreplydialog.h"
 #include "icqauthreplyui.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqradiobutton.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
index edcf03ce..f441317a 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
@@ -28,7 +28,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
 #include <kurllabel.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
index 59cf7e92..1fa26280 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopeteuiglobal.h"
 
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
index 32eeb9b9..db2761b8 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
@@ -27,10 +27,10 @@
 
 #include <kdatewidget.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "icqgeneralinfo.h"
 #include "icqcontact.h"
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
index 9c669dcd..a371b0df 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "connection.h"
 #include "oscartypes.h"
 #include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index f0073b47..fe24fdb3 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -24,7 +24,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h> //for kdDebug()
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "buddyicontask.h"
 #include "clientreadytask.h"
diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
index 3b062b2a..338d1125 100644
--- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
+++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "connection.h"
 #include "transfer.h"
 #include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp
index f7b55531..73379e40 100644
--- a/kopete/protocols/oscar/liboscar/logintask.cpp
+++ b/kopete/protocols/oscar/liboscar/logintask.cpp
@@ -20,7 +20,7 @@
 
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "aimlogintask.h"
 #include "connection.h"
diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
index 80a9346c..6392bb9c 100644
--- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
@@ -21,7 +21,7 @@
 #include "ssimodifytask.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include "connection.h"
 #include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
index f8737026..c88bc54b 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.cpp
+++ b/kopete/protocols/oscar/liboscar/userdetails.cpp
@@ -22,7 +22,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqptrlist.h>
 #include "oscarutils.h"
 #include "oscardebug.h"
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 76c46be2..af2b8ba5 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -43,8 +43,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index f9bf5fae..f2b27360 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -23,8 +23,8 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tdeversion.h>
 
diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp
index 7a1826cb..d6a8ea2f 100644
--- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp
+++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* parent, int initialEncoding )
     : KDialogBase( parent, 0, false, i18n( "Select Encoding" ), Ok | Cancel )
diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp
index 4529f562..b185770b 100644
--- a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp
+++ b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp
@@ -22,7 +22,7 @@
 #include "oscarlistcontactsbase.h"
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 OscarListNonServerContacts::OscarListNonServerContacts(TQWidget* parent)
     : KDialogBase( parent, 0, false, i18n( "Add Contacts to Server List" ),
diff --git a/kopete/protocols/oscar/oscarmyselfcontact.cpp b/kopete/protocols/oscar/oscarmyselfcontact.cpp
index 28aeb8f2..56612d5b 100644
--- a/kopete/protocols/oscar/oscarmyselfcontact.cpp
+++ b/kopete/protocols/oscar/oscarmyselfcontact.cpp
@@ -14,7 +14,7 @@
   *************************************************************************
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetecontactlist.h"
 
diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp
index e7cb0a7a..ab899883 100644
--- a/kopete/protocols/oscar/oscarversionupdater.cpp
+++ b/kopete/protocols/oscar/oscarversionupdater.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 TQMutex updateMutex;
diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp
index f6d38f6c..235693e1 100644
--- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp
+++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp
@@ -19,7 +19,7 @@
 #include <tqstringlist.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "oscarvisibilitybase.h"
 #include "client.h"
diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp
index 0ebbe7fa..bbd1b396 100644
--- a/kopete/protocols/sms/serviceloader.cpp
+++ b/kopete/protocols/sms/serviceloader.cpp
@@ -16,8 +16,8 @@
 
 #include "config.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "serviceloader.h"
diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index e8a83d69..cdbf44ed 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -23,9 +23,9 @@
 #include <tqthread.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeconfigbase.h>
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index c459bdd0..3391a8d1 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -17,9 +17,9 @@
 #include <tqcombobox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeconfigbase.h>
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 93e7e033..cd2afc52 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -22,9 +22,9 @@
 
 #include <tdeconfigbase.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kopeteaccount.h"
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index 40a60baa..b478d89d 100644
--- a/kopete/protocols/sms/services/smssendprovider.cpp
+++ b/kopete/protocols/sms/services/smssendprovider.cpp
@@ -21,9 +21,9 @@
 #include <tdeconfigbase.h>
 #include <kprocess.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopeteaccount.h"
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index 4cfd4788..2e596025 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -21,8 +21,8 @@
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kopetemetacontact.h>
 #include <kopetecontactlist.h>
 
diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp
index e15861ee..127cc516 100644
--- a/kopete/protocols/sms/smscontact.cpp
+++ b/kopete/protocols/sms/smscontact.cpp
@@ -18,8 +18,8 @@
 #include <tdeconfigbase.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopeteaccount.h"
diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp
index f1872a21..e8a358d1 100644
--- a/kopete/protocols/sms/smseditaccountwidget.cpp
+++ b/kopete/protocols/sms/smseditaccountwidget.cpp
@@ -23,8 +23,8 @@
 #include <tqradiobutton.h>
 
 #include <tdeconfigbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krestrictedline.h>
 
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp
index f232edc3..29170791 100644
--- a/kopete/protocols/sms/smsprotocol.cpp
+++ b/kopete/protocols/sms/smsprotocol.cpp
@@ -17,7 +17,7 @@
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopeteaccountmanager.h"
 #include "kopeteonlinestatusmanager.h"
diff --git a/kopete/protocols/sms/smsuserpreferences.cpp b/kopete/protocols/sms/smsuserpreferences.cpp
index 7c3e799c..f0942eb7 100644
--- a/kopete/protocols/sms/smsuserpreferences.cpp
+++ b/kopete/protocols/sms/smsuserpreferences.cpp
@@ -16,7 +16,7 @@
 
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include "smsuserpreferences.h"
diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index bf33a02f..267f452b 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include "kopetemetacontact.h"
diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp
index 56513f14..00ec27ba 100644
--- a/kopete/protocols/testbed/testbedcontact.cpp
+++ b/kopete/protocols/testbed/testbedcontact.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopeteaccount.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
index 14e45dc3..6022d8cb 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
 : KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ),
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 605315fa..fee40b3f 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -23,8 +23,8 @@
 // KDE Includes
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdirlister.h>
 
 // Kopete Includes
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index 5d212fdd..a1a285c4 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -24,7 +24,7 @@
 // KDE Includes
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 // Kopete Includes
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index e5912c14..10f7df71 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 // Kopete Includes
 #include <addcontactpage.h>
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index c66094fe..bf4e7555 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -27,11 +27,11 @@
 
 // KDE Includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <knuminput.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index c3f3a038..ee639ca7 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index 39651475..4ecc2156 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -23,7 +23,7 @@
 
 // KDE Includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <ksimpleconfig.h>
 
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 668e29c3..b81d5b29 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqdatastream.h>
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
index 07c3d225..c24f8a20 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent)
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index 532e21bf..d56666cd 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 4cb17847..e50f420a 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tdeapplication.h> // for random()
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstreamsocket.h>
 #include <tdeio/global.h>
 
diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
index 828c6832..3f37cac0 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include <tqstring.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SendMessageTask::SendMessageTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index 95193241..2fcc1d7e 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -27,7 +27,7 @@
 #include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KNetwork;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
index ddb249bd..d1c4926e 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 8a14b354..5856fa10 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -25,11 +25,11 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqpixmap.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kstreamsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KNetwork;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 98df4ef0..c48a2549 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -25,7 +25,7 @@
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 YABTask::YABTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index 96f96389..569a4e45 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -20,13 +20,13 @@
 
 // KDE Includes
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "yahootypes.h"
 #include "client.h"
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 96cc20c5..9e5d7cd1 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -21,7 +21,7 @@
 #include "yahootypes.h"
 #include "client.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index 023b50b5..f98b80a4 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -29,10 +29,10 @@
 
 #include <kdatewidget.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "yahooworkinfowidget.h"
 #include "yahoogeneralinfowidget.h"
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
index caa3c75a..a6f8cb1b 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <webcamwidget.h>
 
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 8a1f5a4e..56b71cc9 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -32,12 +32,12 @@
 #include <tqfileinfo.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index e59c5062..38c9c04f 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -24,10 +24,10 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdemainwindow.h>
 #include <tdetoolbar.h>
 #include <krun.h>
diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
index c96d52da..244d2b4c 100644
--- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
+++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <klineeditdlg.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 77e03b27..86f89076 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -47,11 +47,11 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdeshortcut.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <kurl.h>
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index 8913eba3..b5d61768 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -27,9 +27,9 @@
 #include <tqspinbox.h>
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 62dde427..55999195 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -21,8 +21,8 @@
 // KDE Includes
 #include <kdebug.h>
 #include <klineedit.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp
index 0ddf8a45..51d7b1bf 100644
--- a/kopete/protocols/yahoo/yahoowebcam.cpp
+++ b/kopete/protocols/yahoo/yahoowebcam.cpp
@@ -15,7 +15,7 @@
 
 #include <kdebug.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqtimer.h>
 
 #include "client.h"
diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index 5a11848d..22628b17 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "ActiveMonitorItem.h"
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index e2a3e782..7695de80 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ActiveMonitor.h"
 #include "ActiveMonitorWindow.h"
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 9529809d..d6c55f0e 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -32,12 +32,12 @@
 
 #include <dcopclient.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kurldrag.h>
 
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index 3cbd9080..552bfdc8 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -28,7 +28,7 @@
 #include <tqcursor.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 #include <tdeapplication.h>
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index bbc56747..641c53f1 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index c0191441..f834a1d5 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <tdefiledialog.h>
 
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index c0b0a503..cac9781c 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -29,8 +29,8 @@
 #include <tqstylesheet.h>
 #include <tqpalette.h>
 #include <tqtextstream.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 20367f30..d07c660d 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -30,7 +30,7 @@
 
 #include <kurlrequester.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "Defines.h"
diff --git a/kpf/src/Help.cpp b/kpf/src/Help.cpp
index 0973cb6b..9e789751 100644
--- a/kpf/src/Help.cpp
+++ b/kpf/src/Help.cpp
@@ -22,7 +22,7 @@
 */
 
 #include "Help.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <dnssd/servicebrowser.h>
 
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 7c39d541..26bbf429 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -34,13 +34,13 @@
 #include <tqlineedit.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <dcopclient.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kgenericfactory.h>
 
diff --git a/kpf/src/Resource.cpp b/kpf/src/Resource.cpp
index e9f521a5..c6c88b3e 100644
--- a/kpf/src/Resource.cpp
+++ b/kpf/src/Resource.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <kmimetype.h>
 
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 4b200b3f..7c56e323 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <klineedit.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 
diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp
index c39f944b..e280a327 100644
--- a/kpf/src/SingleServerConfigDialog.cpp
+++ b/kpf/src/SingleServerConfigDialog.cpp
@@ -21,7 +21,7 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "WebServer.h"
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 7832ecd9..8fb185bf 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -28,7 +28,7 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "StartingKPFDialog.h"
diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp
index 631059a7..b66ef87b 100644
--- a/kpf/src/Utils.cpp
+++ b/kpf/src/Utils.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "Utils.h"
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index e114dd0e..0c97252a 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -34,9 +34,9 @@
 // KDE includes
 #include "config.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <dnssd/publicservice.h>
 
 // Local includes
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index c70f9111..fd135405 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -23,7 +23,7 @@
 
 // KDE includes
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 // Local includes
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp
index 7f346eef..b92d5e4f 100644
--- a/kppp/accounting.cpp
+++ b/kppp/accounting.cpp
@@ -32,7 +32,7 @@
 #include <tqdir.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <time.h>
 
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 39d41cca..250a83d4 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -33,9 +33,9 @@
 
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <twin.h>
 #include <kdialogbase.h>
 #include <kstdguiitem.h>
diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp
index 55c30e9c..f42b5a66 100644
--- a/kppp/acctselect.cpp
+++ b/kppp/acctselect.cpp
@@ -44,7 +44,7 @@
 #include <tqcheckbox.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <krun.h>
 
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index 3b7eb6fc..879de553 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -31,8 +31,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include <unistd.h>
diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp
index fb0aa27b..4523af90 100644
--- a/kppp/conwindow.cpp
+++ b/kppp/conwindow.cpp
@@ -26,8 +26,8 @@
 #include "docking.h"
 #include "pppdata.h"
 #include "pppstats.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 extern PPPData gpppdata;
 
diff --git a/kppp/debug.cpp b/kppp/debug.cpp
index 8ad64d41..24fd939f 100644
--- a/kppp/debug.cpp
+++ b/kppp/debug.cpp
@@ -23,7 +23,7 @@
 #include "debug.h"
 #include "main.h"
 #include "pppdata.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/kppp/docking.cpp b/kppp/docking.cpp
index b569b3c1..cfb41529 100644
--- a/kppp/docking.cpp
+++ b/kppp/docking.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index 9e24bd99..7d2b6f58 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -26,13 +26,13 @@
 #include <string.h>
 #include <termios.h>
 #include <tqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvgroupbox.h>
 #include <tqhbox.h>
 #include <kdialog.h>
diff --git a/kppp/general.cpp b/kppp/general.cpp
index 55f3b307..1dbe4aad 100644
--- a/kppp/general.cpp
+++ b/kppp/general.cpp
@@ -37,7 +37,7 @@
 #include "modemcmds.h"
 #include "devices.h"
 #include "pppdata.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqgrid.h>
 
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index e8176fa8..ec8647b7 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -38,13 +38,13 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h> // For BarIcon
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <twin.h>
diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp
index fd544486..badf77df 100644
--- a/kppp/loginterm.cpp
+++ b/kppp/loginterm.cpp
@@ -31,7 +31,7 @@
 #include "modem.h"
 
 #include <stdio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern KPPPWidget *p_kppp;
 
diff --git a/kppp/logview/export.h b/kppp/logview/export.h
index 04ed0005..fda394d3 100644
--- a/kppp/logview/export.h
+++ b/kppp/logview/export.h
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kwizard.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 class Export;
diff --git a/kppp/logview/log.cpp b/kppp/logview/log.cpp
index 8335e55c..61009d7b 100644
--- a/kppp/logview/log.cpp
+++ b/kppp/logview/log.cpp
@@ -27,7 +27,7 @@
 #include <tqdir.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index ea37aa70..b282f64b 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -24,7 +24,7 @@
 #include "log.h"
 #include "monthly.h"
 #include "main.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kpushbutton.h>
diff --git a/kppp/logview/main.h b/kppp/logview/main.h
index dcbf2cb8..ce386f63 100644
--- a/kppp/logview/main.h
+++ b/kppp/logview/main.h
@@ -23,7 +23,7 @@
 
 #include <tdemainwindow.h>
 #include <tqtabwidget.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include "monthly.h"
 
 class TopWidget : public TDEMainWindow {
diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp
index 0fd6e83e..e36a6219 100644
--- a/kppp/logview/monthly.cpp
+++ b/kppp/logview/monthly.cpp
@@ -24,11 +24,11 @@
 #include <tqheader.h>
 
 #include <kcalendarsystem.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "monthly.h"
 #include "export.h"
diff --git a/kppp/main.cpp b/kppp/main.cpp
index d7c40cf1..4d18b76b 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -48,9 +48,9 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "kpppwidget.h"
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 5eaa1404..94d484cf 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -32,11 +32,11 @@
 #include "pppdata.h"
 #include "modem.h"
 #include "miniterm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstdguiitem.h>
 
 #include <tqlayout.h>
diff --git a/kppp/modem.cpp b/kppp/modem.cpp
index 4fc3e503..ee75d417 100644
--- a/kppp/modem.cpp
+++ b/kppp/modem.cpp
@@ -36,7 +36,7 @@
 #include "modem.h"
 #include "pppdata.h"
 #include "requester.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
 #include <config.h>
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index 6f89ae90..43900295 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -29,7 +29,7 @@
 #include <kbuttonbox.h>
 #include <stdlib.h>
 #include <tdeapplication.h> // for getMiniIcon()
-#include <klocale.h>
+#include <tdelocale.h>
 #include "modemcmds.h"
 #include "pppdata.h"
 #include <twin.h>
diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp
index 3213d00b..a59bbb7d 100644
--- a/kppp/modemdb.cpp
+++ b/kppp/modemdb.cpp
@@ -36,7 +36,7 @@
 #include <kbuttonbox.h>
 #include <tqlayout.h>
 #include "modemdb.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tdeconfig.h>
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index dd7ed5a0..b91fe671 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -28,12 +28,12 @@
 #include <tqregexp.h>
 #include <tqlayout.h>
 #include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kpushbutton.h>
 #include "modeminfo.h"
 #include "modem.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
   : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder)
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index 4f15c17d..c064b714 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -34,9 +34,9 @@
 
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <twin.h>
 #include <kdialogbase.h>
 #include <tqvgroupbox.h>
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index 6a662be6..138cc663 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include "pppdargs.h"
 #include "pppdata.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 08b0aaf8..8702d403 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -27,11 +27,11 @@
 #include "pppdata.h"
 #include "runtests.h"
 #include "devices.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <assert.h>
 
 PPPData gpppdata;
diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp
index fe73a1ad..8ca0a652 100644
--- a/kppp/ppplog.cpp
+++ b/kppp/ppplog.cpp
@@ -43,11 +43,11 @@
 #include <tqlayout.h>
 
 #include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pppdata.h"
 #include "requester.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 int PPPL_MakeLog(TQStringList &list) {
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index dcf6f48e..cc5386e7 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -28,7 +28,7 @@
 #include <twin.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
index 703d9375..d88fbefb 100644
--- a/kppp/providerdb.cpp
+++ b/kppp/providerdb.cpp
@@ -33,7 +33,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include "providerdb.h"
diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp
index 7584c3c6..c3fc516e 100644
--- a/kppp/pwentry.cpp
+++ b/kppp/pwentry.cpp
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <tqapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include "pwentry.h"
 
 PWEntry::PWEntry( TQWidget *parent, const char *name )
diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp
index 41fc12c5..d5c60330 100644
--- a/kppp/ruleset.cpp
+++ b/kppp/ruleset.cpp
@@ -32,8 +32,8 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 RuleSet::RuleSet() {
diff --git a/kppp/runtests.cpp b/kppp/runtests.cpp
index 6e3f8f21..01e1437d 100644
--- a/kppp/runtests.cpp
+++ b/kppp/runtests.cpp
@@ -28,7 +28,7 @@
 #include "runtests.h"
 #include <ctype.h>
 #include <unistd.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -44,7 +44,7 @@
 #define _PATH_RESCONF "/etc/resolv.conf"
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "pppdata.h"
 
 // initial effective uid (main.cpp)
diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp
index 9949471e..03322b56 100644
--- a/krdc/keycapturedialog.cpp
+++ b/krdc/keycapturedialog.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define XK_XKB_KEYS
 #define XK_MISCELLANY
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 1cec72c0..750557f6 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -26,13 +26,13 @@
 #include <kcombobox.h>
 #include <kurl.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <tqdockarea.h>
 #include <tqlabel.h>
diff --git a/krdc/main.cpp b/krdc/main.cpp
index d97145a8..9252e6a0 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -19,8 +19,8 @@
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdewallet.h>
diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp
index 3afb0f81..88310d57 100644
--- a/krdc/maindialog.cpp
+++ b/krdc/maindialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 MainDialog::MainDialog( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "Remote Desktop Connection" ),
diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp
index a9ae12ce..93b39a43 100644
--- a/krdc/maindialogwidget.cpp
+++ b/krdc/maindialogwidget.cpp
@@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include "hostpreferences.h"
diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp
index cffbfc26..6ab55205 100644
--- a/krdc/preferencesdialog.cpp
+++ b/krdc/preferencesdialog.cpp
@@ -30,7 +30,7 @@
 #include <tqvbox.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name )
     : KDialogBase( Tabbed, i18n( "Preferences" ), Ok|Cancel, Ok, 
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 273f89d0..e20399df 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -21,8 +21,8 @@
 
 #include <tdeapplication.h>
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tdewallet.h>
 #include <kpassdlg.h>
diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp
index 42122549..e50dc7de 100644
--- a/krdc/rdp/rdphostpref.cpp
+++ b/krdc/rdp/rdphostpref.cpp
@@ -19,7 +19,7 @@
 
 #include "rdphostpref.h"
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 const TQString RdpHostPref::RdpType = "RDP";
 
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 751a2db3..c3edc19b 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -21,8 +21,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kpassdlg.h>
 #include <kdialogbase.h>
diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp
index 4cff3768..05ac4139 100644
--- a/krdc/vnc/vnchostpref.cpp
+++ b/krdc/vnc/vnchostpref.cpp
@@ -17,7 +17,7 @@
 
 #include "vnchostpref.h"
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 const TQString VncHostPref::VncType = "VNC";
 
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 50855f4f..b269b95a 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -30,7 +30,7 @@
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 4a5abecd..a446c6fc 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -29,8 +29,8 @@
 #include <knotifyclient.h>
 #include <ksockaddr.h>
 #include <kextsock.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 926c915c..069b5696 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -18,10 +18,10 @@
 #include "configuration.h"
 #include "kinetinterface.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <ksockaddr.h>
 #include <kactivelabel.h>
diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc
index d767b5a2..96ad06b9 100644
--- a/krfb/krfb/connectiondialog.cc
+++ b/krfb/krfb/connectiondialog.cc
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "New Connection" ),
diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc
index f3b202a9..59d62fb7 100644
--- a/krfb/krfb/invitedialog.cc
+++ b/krfb/krfb/invitedialog.cc
@@ -21,7 +21,7 @@
 #include "invitewidget.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqlabel.h>
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index d9d12ad8..3ec53e3f 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -29,8 +29,8 @@
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqobject.h>
 #include <tqwindowdefs.h>
 #include <tqcstring.h>
diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc
index a5664bcb..2949ba03 100644
--- a/krfb/krfb/personalinvitedialog.cc
+++ b/krfb/krfb/personalinvitedialog.cc
@@ -24,7 +24,7 @@
 
 #include <kactivelabel.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true, i18n( "Personal Invitation" ),
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 85673464..57fb1cbd 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -39,8 +39,8 @@
 #include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kextsock.h>
 #include <tqstring.h>
 #include <tqcursor.h>
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 06807967..84018384 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -19,9 +19,9 @@
 #include <tqtooltip.h>
 #include <kstdaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 47e52a25..03288515 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 8062cf57..03170168 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 
 TQPtrList<Server> Groups;
diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp
index d0c57537..6de1e845 100644
--- a/ksirc/KSPrefs/ksprefs.cpp
+++ b/ksirc/KSPrefs/ksprefs.cpp
@@ -9,7 +9,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <kdebug.h>
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index bb2d165f..8ce6311d 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -11,7 +11,7 @@
 
 
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp
index 6bf8d476..3cd9e2ff 100644
--- a/ksirc/KSPrefs/page_general.cpp
+++ b/ksirc/KSPrefs/page_general.cpp
@@ -10,7 +10,7 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include "page_general.h"
 #include "../servercontroller.h"
diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp
index ab098df9..5aacdb59 100644
--- a/ksirc/KSProgress/ksprogressdata.cpp
+++ b/ksirc/KSProgress/ksprogressdata.cpp
@@ -18,7 +18,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ksprogressData::ksprogressData
 (
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index d6488c45..f6afc2a1 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -8,7 +8,7 @@
 
 #include <tdeapplication.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ksticker.h"
 #include "speeddialog.h"
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index 342fae32..f11be8da 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -5,7 +5,7 @@
 #include <tqregexp.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <unistd.h>
 
diff --git a/ksirc/KSTicker/speeddialog.cpp b/ksirc/KSTicker/speeddialog.cpp
index 1abc8059..8bc3ca0d 100644
--- a/ksirc/KSTicker/speeddialog.cpp
+++ b/ksirc/KSTicker/speeddialog.cpp
@@ -7,7 +7,7 @@
 
  *********************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "speeddialog.h"
 
diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp
index f0a6a931..64f210ea 100644
--- a/ksirc/KSTicker/speeddialogData.cpp
+++ b/ksirc/KSTicker/speeddialogData.cpp
@@ -13,7 +13,7 @@
 #include "speeddialogData.h"
 
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tqlayout.h>
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index d6462405..f7cf4f69 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp
index cf7a4581..7cb71022 100644
--- a/ksirc/alistbox.cpp
+++ b/ksirc/alistbox.cpp
@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurldrag.h>
 
 aListBox::aListBox(TQWidget *parent, const char *name )
diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index 7f841450..b7a4f307 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -3,7 +3,7 @@
 #include "chanButtons.h"
 #include "chanButtons.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kstdguiitem.h>
diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp
index d5215485..04dfc6a4 100644
--- a/ksirc/chanparser.cpp
+++ b/ksirc/chanparser.cpp
@@ -15,8 +15,8 @@
 
 #include <tqregexp.h>
 #include <tqapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tqptrlist.h>
 
diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp
index 30364565..32f4be55 100644
--- a/ksirc/charSelector.cpp
+++ b/ksirc/charSelector.cpp
@@ -6,7 +6,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 charSelector::charSelector(TQWidget *parent, const char* name)
            : KDialog(parent, name, false)
diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp
index abac9198..781feb6e 100644
--- a/ksirc/colorpicker.cpp
+++ b/ksirc/colorpicker.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ColorPicker::ColorPicker( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true /*modal*/, i18n( "Pick Color" ),
diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp
index cc741d25..a7576c7f 100644
--- a/ksirc/dccManager.cpp
+++ b/ksirc/dccManager.cpp
@@ -12,7 +12,7 @@
 #include <tqsignal.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #define COL_FILE 1
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index aa03a0b6..b0e065c5 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -15,10 +15,10 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp
index d03543c0..d251c3cf 100644
--- a/ksirc/dccToplevel.cpp
+++ b/ksirc/dccToplevel.cpp
@@ -4,8 +4,8 @@
 
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 
 #include "dccManager.h"
 #include "dccToplevel.h"
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index 8f33b2ce..d6c4f923 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -9,10 +9,10 @@
 #include <tdeaccel.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 DisplayMgrMDI::DisplayMgrMDI()
 {
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index bc7ddc75..df1e8553 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -17,13 +17,13 @@
 #include <tqcursor.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <twin.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kpassivepopup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <tdeversion.h>
diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp
index f994cfa7..be0cdbb6 100644
--- a/ksirc/ioDCC.cpp
+++ b/ksirc/ioDCC.cpp
@@ -14,7 +14,7 @@
 #include "control_message.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassivepopup.h>
 
 #include <tqregexp.h>
diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp
index db0615a4..b197cbda 100644
--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@@ -77,7 +77,7 @@
 #include <tqlistbox.h>
 #include <tqtextcodec.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index 50ed150a..6fdca807 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -20,7 +20,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 947277c1..9e0049f9 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -109,8 +109,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 377ee2c8..b2ffb205 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index bce3ca9f..4e67b5d0 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -8,7 +8,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "mditoplevel.h"
diff --git a/ksirc/messageReceiver.cpp b/ksirc/messageReceiver.cpp
index becfa79a..3196bb49 100644
--- a/ksirc/messageReceiver.cpp
+++ b/ksirc/messageReceiver.cpp
@@ -2,7 +2,7 @@
 
 #include <tqtextcodec.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index fac84e6b..d47791e6 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -81,7 +81,7 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeconfig.h>
 #include <tdefontdialog.h>
 #include <kiconloader.h>
@@ -108,7 +108,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 
diff --git a/ksirc/servercontroller.dlg b/ksirc/servercontroller.dlg
index 7e515bdc..3aff0980 100644
--- a/ksirc/servercontroller.dlg
+++ b/ksirc/servercontroller.dlg
@@ -20,7 +20,7 @@ MaxSize {32767 32767}
 Grid {10}
 
 User {
-		UserClassHeader {kmenubar.h}
+		UserClassHeader {tdemenubar.h}
 		UserClassName {KMenuBar}
 		Rect {0 0 410 30}
 		Name {User_2}
diff --git a/ksirc/ssfeprompt.cpp b/ksirc/ssfeprompt.cpp
index bdf1aa6c..14d759fb 100644
--- a/ksirc/ssfeprompt.cpp
+++ b/ksirc/ssfeprompt.cpp
@@ -8,7 +8,7 @@
  *********************************************************************/
 
 #include "ssfeprompt.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #undef Inherited
 #define Inherited ssfepromptdata
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 47a16e58..76f24488 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -17,7 +17,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 5ad00a69..f3a83a4b 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -59,22 +59,22 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <knotifyclient.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kcharsets.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstdguiitem.h>
 
 extern DisplayMgr *displayMgr;
diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp
index fd05b49a..1387932d 100644
--- a/ksirc/usercontrolmenu.cpp
+++ b/ksirc/usercontrolmenu.cpp
@@ -2,7 +2,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQPtrList<UserControlMenu> UserControlMenu::UserMenu;
 
diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp
index 3091640b..103c152c 100644
--- a/ktalkd/kcmktalkd/answmachpage.cpp
+++ b/ktalkd/kcmktalkd/answmachpage.cpp
@@ -27,7 +27,7 @@
 #include <ksimpleconfig.h>
 
 #include <stdlib.h>
-#include <klocale.h> // for getenv
+#include <tdelocale.h> // for getenv
 
 KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, 
 	KSimpleConfig *_config) 
diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp
index 0c07c992..ea323ad6 100644
--- a/ktalkd/kcmktalkd/forwmachpage.cpp
+++ b/ktalkd/kcmktalkd/forwmachpage.cpp
@@ -24,7 +24,7 @@
 #include "forwmachpage.h"
 
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
 	KSimpleConfig *_config) 
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index 0975365c..89bf8db5 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -25,8 +25,8 @@
 #include "answmachpage.h"
 #include "forwmachpage.h"
 #include <ksimpleconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqtabwidget.h>
 #include <tqlayout.h>
 
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index 0752f7d7..da298c00 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -35,9 +35,9 @@
 #include <klineedit.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kaudioplayer.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <kurldrag.h>
 #include <kdialog.h>
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 1c5e89b5..1fbf43b9 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 
 #include <kaudioplayer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define RING_WAIT 30
 #define MAX_DLG_LIFE RING_WAIT
diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp
index 721834c9..42a74cb3 100644
--- a/lanbrowsing/kcmlisa/findnic.cpp
+++ b/lanbrowsing/kcmlisa/findnic.cpp
@@ -59,7 +59,7 @@
 
 #include "findnic.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksockaddr.h>
 
 NICList* findNICs()
diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index e60eb6f2..5809d51b 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -39,12 +39,12 @@
 
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <keditlistbox.h>
 #include <krestrictedline.h>
 #include <kdialogbase.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kdebug.h>
 
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp
index 252beadf..7026e3a6 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp
@@ -31,8 +31,8 @@
 #include <tqvbuttongroup.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krestrictedline.h>
 #include <keditlistbox.h>
 
diff --git a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
index 68e01989..144c7262 100644
--- a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp
index b7d12c39..7252785f 100644
--- a/lanbrowsing/kcmlisa/main.cpp
+++ b/lanbrowsing/kcmlisa/main.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
diff --git a/lanbrowsing/kcmlisa/portsettingsbar.cpp b/lanbrowsing/kcmlisa/portsettingsbar.cpp
index 3e94c730..2833a443 100644
--- a/lanbrowsing/kcmlisa/portsettingsbar.cpp
+++ b/lanbrowsing/kcmlisa/portsettingsbar.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "portsettingsbar.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp
index 53b5033d..820f09da 100644
--- a/lanbrowsing/kcmlisa/setupwizard.cpp
+++ b/lanbrowsing/kcmlisa/setupwizard.cpp
@@ -22,7 +22,7 @@
 
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <ksockaddr.h>
 #include <kdebug.h>
diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h
index 81b7e45b..c9f81dad 100644
--- a/lanbrowsing/kcmlisa/setupwizard.h
+++ b/lanbrowsing/kcmlisa/setupwizard.h
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <krestrictedline.h>
 #include <tqwizard.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
diff --git a/lanbrowsing/tdeio_lan/tdeio_lan.cpp b/lanbrowsing/tdeio_lan/tdeio_lan.cpp
index e573f7ea..4c24261d 100644
--- a/lanbrowsing/tdeio_lan/tdeio_lan.cpp
+++ b/lanbrowsing/tdeio_lan/tdeio_lan.cpp
@@ -22,10 +22,10 @@
 #endif
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
 
 #include <tqfile.h>
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index 65aa9cb3..a70baa9d 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -33,14 +33,14 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdesocketaddress.h>
 #include <kprotocolinfo.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 #include <tqmap.h>
diff --git a/tdednssd/kdedmodule/dnssdwatcher.cpp b/tdednssd/kdedmodule/dnssdwatcher.cpp
index 5b391423..8fd571e2 100644
--- a/tdednssd/kdedmodule/dnssdwatcher.cpp
+++ b/tdednssd/kdedmodule/dnssdwatcher.cpp
@@ -19,8 +19,8 @@
 #include "dnssdwatcher.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dnssd/servicebrowser.h>
 #include <kdirnotify_stub.h>
 #include "watcher.h"
diff --git a/tdefile-plugins/torrent/tdefile_torrent.cpp b/tdefile-plugins/torrent/tdefile_torrent.cpp
index d1f2217a..1a403a25 100644
--- a/tdefile-plugins/torrent/tdefile_torrent.cpp
+++ b/tdefile-plugins/torrent/tdefile_torrent.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 
 #include "tdefile_torrent.h"
diff --git a/wifi/interface_wireless.cpp b/wifi/interface_wireless.cpp
index 52513a59..59277473 100644
--- a/wifi/interface_wireless.cpp
+++ b/wifi/interface_wireless.cpp
@@ -29,7 +29,7 @@
 
 #include <iostream>
 #include <string>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kdebug.h>
 #include <tqstring.h>
diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index f14d375b..928c2b6f 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 #include <tqtable.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #ifndef WITHOUT_ARTS
 #include <arts/artsflow.h>
@@ -36,7 +36,7 @@
 
 #include <iostream>
 #include <string>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kprocio.h>
 #include <kdebug.h>
diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp
index ff5d2cf9..1b80bb13 100644
--- a/wifi/kcmwifi/ifconfigpage.cpp
+++ b/wifi/kcmwifi/ifconfigpage.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 603546f5..f26a2774 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <klineedit.h>
 
diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp
index c740df69..7ebb401b 100644
--- a/wifi/kcmwifi/mainconfig.cpp
+++ b/wifi/kcmwifi/mainconfig.cpp
@@ -24,8 +24,8 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 7a1cdac3..1958b475 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -20,11 +20,11 @@
 #include <tqfile.h>
 
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kprocio.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "wificonfig.h"
 
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 0500105c..21d19a07 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -32,15 +32,15 @@
 // include files for KDE
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksystemtray.h>
 #include <kprocess.h>
 #include <dcopclient.h>
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index c09aa33e..7f226199 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -7,11 +7,11 @@
          http://www.hackerbuero.org $
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kwireless.h"
 #include "kwirelesswidget.h"
diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp
index 362740e1..51b694cd 100644
--- a/wifi/kwireless/kwirelesswidget.cpp
+++ b/wifi/kwireless/kwirelesswidget.cpp
@@ -12,10 +12,10 @@
 #include <tqpen.h>
 #include <tqcolor.h>
 #include <tqpointarray.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kpassivepopup.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kwirelesswidget.h"
 #include "propertytable.h"
diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp
index 3efdbf98..9b8638e1 100644
--- a/wifi/kwireless/linuxwirelesswidget.cpp
+++ b/wifi/kwireless/linuxwirelesswidget.cpp
@@ -10,7 +10,7 @@
 #include <tqtooltip.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <unistd.h> // for ::close
 #include "linuxwirelesswidget.h"
 #include "config.h"
diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp
index 7c73b1c2..fb32d938 100644
--- a/wifi/kwireless/propertytable.cpp
+++ b/wifi/kwireless/propertytable.cpp
@@ -13,7 +13,7 @@
 #include <tqptrlist.h>
 #include <tqtextstream.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "propertytable.h"
 #include "kwirelesswidget.h"
 
diff --git a/wifi/locator.h b/wifi/locator.h
index b1629b19..c89a2057 100644
--- a/wifi/locator.h
+++ b/wifi/locator.h
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 class Interface_wireless;
 
diff --git a/wifi/main.cpp b/wifi/main.cpp
index c705185f..67074d43 100644
--- a/wifi/main.cpp
+++ b/wifi/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "kwifimanager.h"
diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp
index d7f07db7..08fb28b8 100644
--- a/wifi/networkscanning.cpp
+++ b/wifi/networkscanning.cpp
@@ -24,10 +24,10 @@
 #include <tqtable.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 #include "networkscanning.h"
 #include "interface_wireless.h"
diff --git a/wifi/speed.cpp b/wifi/speed.cpp
index 6fdff63d..9c0a1062 100644
--- a/wifi/speed.cpp
+++ b/wifi/speed.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "speed.h"
 #include "interface_wireless.h"
diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp
index 15295180..458b4abe 100644
--- a/wifi/statistics.cpp
+++ b/wifi/statistics.cpp
@@ -17,7 +17,7 @@
 
 #include <tqwidget.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "statistics.h"
 #include "interface_wireless.h"
 
diff --git a/wifi/status.cpp b/wifi/status.cpp
index 4d8b5784..3632342e 100644
--- a/wifi/status.cpp
+++ b/wifi/status.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "status.h"
 #include "interface_wireless.h"
 
diff --git a/wifi/strength.cpp b/wifi/strength.cpp
index 35d156bd..ef62322b 100644
--- a/wifi/strength.cpp
+++ b/wifi/strength.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "strength.h"
 #include "interface_wireless.h"