Rename additional header files to avoid conflicts with KDE4

102 files changed, 208 insertions, 208 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 6c85c48b7..161614bfe 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -63,7 +63,7 @@
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktip.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kxmlguiclient.h>
 #include <twin.h>
 #include <knotifyclient.h>
diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp
index 76985d1ac..989be2619 100644
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@@ -32,9 +32,9 @@
 #include <tqhgroupbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <klineedit.h>
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3ef70ea7d..d4d2e8b07 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -82,11 +82,11 @@
 #include <libkcal/calendarnull.h>
 #include <libkcal/htmlexportsettings.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <tdeconfig.h>
 #include <krun.h>
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index 7d7cdedbe..2be3d060e 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -26,8 +26,8 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "datechecker.h"
 
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index 4d85a7a4d..1d7e8bde8 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -29,8 +29,8 @@
 #include <kcalendarsystem.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KCal;
 
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index dd3f8a1ac..bb965ba24 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "koglobals.h"
 #include "navigatorbar.h"
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index 739dc9050..345629212 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -24,15 +24,15 @@
 */
 
 #include "eventarchiver.h"
-#include <kglobal.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include "koprefs.h"
 
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index 0cece6631..156ed7027 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -36,7 +36,7 @@
 #include <tqtextstream.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
@@ -48,8 +48,8 @@
 #include <kurlrequester.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/htmlexportsettings.h>
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index c8251ca61..cd44d9c8f 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -33,8 +33,8 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include <libkcal/calfilter.h>
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index d23c75285..b3de84ad7 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -51,17 +51,17 @@
 
 #include <tdeio/job.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
 
 #include <tqfile.h>
 #include <tqbuffer.h>
diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp
index eac14271b..519e103e7 100644
--- a/korganizer/freebusyurldialog.cpp
+++ b/korganizer/freebusyurldialog.cpp
@@ -28,7 +28,7 @@
 #include <libkcal/freebusyurlstore.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/korganizer/history.cpp b/korganizer/history.cpp
index 0b9e5d995..74f8c8a35 100644
--- a/korganizer/history.cpp
+++ b/korganizer/history.cpp
@@ -28,7 +28,7 @@
 #include <libkcal/calendar.h>
 #include <libkcal/incidence.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KCal;
diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp
index ee638fc77..4272f5dac 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -28,7 +28,7 @@
 #include "koprefs.h"
 #include "stdcalendar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp
index 20f409e77..e03eba318 100644
--- a/korganizer/incidencechanger.cpp
+++ b/korganizer/incidencechanger.cpp
@@ -31,8 +31,8 @@
 #include <libkcal/freebusy.h>
 #include <libkcal/dndfactory.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 bool IncidenceChanger::beginChange( Incidence *incidence,
                                     ResourceCalendar *res, const TQString &subRes )
diff --git a/korganizer/interfaces/calendar/plugin.h b/korganizer/interfaces/calendar/plugin.h
index eb0f78927..853c3cdf0 100644
--- a/korganizer/interfaces/calendar/plugin.h
+++ b/korganizer/interfaces/calendar/plugin.h
@@ -21,7 +21,7 @@
 #ifndef KORG_PLUGIN_H
 #define KORG_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 
 namespace KOrg {
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index fe0bd96c0..a8ca0c582 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -26,9 +26,9 @@
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepimmacros.h>
 #include "korganizer/incidencechangerbase.h"
 
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 3594a8605..f92ae338b 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -34,14 +34,14 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <ktimeedit.h>
 #include <klineedit.h>
 #include <kactivelabel.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/journal.h>
 #include <libkcal/calendar.h>
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index dcf2a3ebd..230c992dc 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -31,9 +31,9 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include "koglobals.h"
 #include "koprefs.h"
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 484cc1657..b242c3065 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -35,10 +35,10 @@
 #include <tqlabel.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 "koagendaitem.h"
 #include "koprefs.h"
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 216f1dfd8..bba8840ac 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -29,17 +29,17 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kwordwrap.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
 #include <libtdepim/kvcarddrag.h>
 #include <libemailfunctions/email.h>
 #ifndef KORG_NOKABC
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
 #endif
 
 #include "koprefs.h"
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 869fe119b..7e68deebd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -43,10 +43,10 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kholidays.h>
 
 #include <libkcal/calendar.h>
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index ad9943593..8d6b6f61c 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -27,11 +27,11 @@
 #include <stdlib.h>
 #include <iostream>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 #include <kurl.h>
 
@@ -50,7 +50,7 @@
 #include "stdcalendar.h"
 
 #include "koapp.h"
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 using namespace std;
 
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 5f0da24a2..4411e9666 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -25,7 +25,7 @@
 #include "koglobals.h"
 
 #ifndef KORG_NOKABC
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
 #include <libtdepim/addressesdialog.h>
 #include <libtdepim/addresseelineedit.h>
 #endif
@@ -37,13 +37,13 @@
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include "distributionlist.h"
 #else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #endif
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 776304260..abe649595 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <libkcal/attendee.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 class TQBoxLayout;
 class TQComboBox;
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index 0b1d39dbe..9bc2adbc8 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kxmlguifactory.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqwidget.h>
 
diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp
index 883aba872..5341e1d03 100644
--- a/korganizer/kocounterdialog.cpp
+++ b/korganizer/kocounterdialog.cpp
@@ -23,7 +23,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 13de8f7ea..1c9bc93cb 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -30,9 +30,9 @@
 #include <tqpainter.h>
 #include <tqptrlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <libkcal/vcaldrag.h>
diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp
index 6d91d1187..1415eef59 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -43,7 +43,7 @@
 #include <tqwhatsthis.h>
 
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <libkcal/alarm.h>
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index b7aff0a28..77216a99e 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -34,13 +34,13 @@
 #include <libtdepim/kvcarddrag.h>
 #include <libtdepim/tdepimprotocols.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurldrag.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktempdir.h>
 #include <tdeio/netaccess.h>
 #include <kmimetype.h>
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index ebc70200b..4889906a3 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -46,16 +46,16 @@
 #include <tqvaluevector.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #ifndef KORG_NOKABC
-#include <kabc/addresseedialog.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addresseedialog.h>
+#include <tdeabc/vcardconverter.h>
 #include <libtdepim/addressesdialog.h>
 #include <libtdepim/addresseelineedit.h>
 #include <libtdepim/distributionlist.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #endif
 #include <libtdepim/kvcarddrag.h>
 #include <libemailfunctions/email.h>
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index c97ad4568..ee416efaf 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -31,17 +31,17 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #ifndef KORG_NOKABC
-#include <kabc/addresseedialog.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addresseedialog.h>
+#include <tdeabc/vcardconverter.h>
 #include <libtdepim/addressesdialog.h>
 #include <libtdepim/addresseelineedit.h>
 #include <libtdepim/distributionlist.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #endif
 
 #include <libkcal/event.h>
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 0ab854a96..304fea93f 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -39,12 +39,12 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 47cb603a8..49b4d9691 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -37,9 +37,9 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 3741acb3f..9b27c0638 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -33,8 +33,8 @@
 #include <kdateedit.h>
 #include <ktimeedit.h>
 //#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqgroupbox.h>
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 132c32901..5af7fd60f 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -36,9 +36,9 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 3aceab473..ac372db76 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -41,13 +41,13 @@
 #include <tqwhatsthis.h>
 
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <knumvalidator.h>
 #include <kcalendarsystem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <libtdepim/kdateedit.h>
 #include <libkcal/todo.h>
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index c24af1a06..c31c54322 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -32,8 +32,8 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <libkcal/incidenceformatter.h>
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 3d331ed07..ae4e4c20d 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -25,7 +25,7 @@
 #include <tqcursor.h>
 
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kurl.h>
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 587a60d06..9bd038d2a 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -25,10 +25,10 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
 
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 124c38fbe..ddd4fcde7 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -32,7 +32,7 @@
 #include <libkcal/incidenceformatter.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqcursor.h>
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index afbe84194..7e783695b 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -26,7 +26,7 @@
 
 #include "koeventviewer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent,
                                           const char *name, bool compact )
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index b3fd073b6..829e8858c 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -25,11 +25,11 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <kiconloader.h>
 
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 0673ec6ec..6e86c8575 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -45,7 +45,7 @@
 #include <libkcal/journal.h>
 #include <libkcal/incidenceformatter.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdirwatch.h>
 #include <tqfile.h>
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 74ad2855c..0cd128ccd 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -32,12 +32,12 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include <libtdepim/designerfields.h>
 #include <libtdepim/embeddedurlpage.h>
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index 867d447f4..b21146d09 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -35,8 +35,8 @@
 #include <libkcal/calendarlocal.h>
 #include <korganizer/baseview.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlayout.h>
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index f5d64ca6a..3bc78156f 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -31,7 +31,7 @@
 #include <tqlabel.h>
 #include <tqscrollview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <libkcal/calendar.h>
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d33f185d9..aa97348ca 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -30,10 +30,10 @@
 #include <tqcursor.h>
 #include <tqstyle.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/incidenceformatter.h>
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index c88b6383d..60855bdaf 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -25,10 +25,10 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp
index 6a0100aad..9c843b59d 100644
--- a/korganizer/komessagebox.cpp
+++ b/korganizer/komessagebox.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <tqpushbutton.h>
 
diff --git a/korganizer/komessagebox.h b/korganizer/komessagebox.h
index 2335fce77..561b9f8c2 100644
--- a/korganizer/komessagebox.h
+++ b/korganizer/komessagebox.h
@@ -25,7 +25,7 @@
 
 #include <kguiitem.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqmessagebox.h>
 #include <tqstring.h>
 
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index a741d7f2b..c75523a9c 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -38,8 +38,8 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kwordwrap.h>
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a8f6acc3e..f5f76e26f 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -33,12 +33,12 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <kstaticdeleter.h>
 #include <kstringhandler.h>
 
@@ -48,7 +48,7 @@
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identity.h>
 #include <libemailfunctions/email.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <ktimezones.h>
 #include "kocore.h"
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 3cfbe1711..08763b63a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -46,12 +46,12 @@
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <kcalendarsystem.h>
 #include <ktrader.h>
 #include <kpushbutton.h>
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index fc3369461..edeffaf38 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -40,11 +40,11 @@
 #include <tdeconfig.h>
 #include <kdcopservicestarter.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kaudioplayer.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index d1eb5347a..f8f15addf 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -28,14 +28,14 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 7707e0eca..2a87c7fd2 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -33,7 +33,7 @@
 
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <twin.h>
 
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 6dce72116..d44ac4a2e 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -24,9 +24,9 @@
 
 #include <stdlib.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kuniqueapplication.h>
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 38b6310e0..de4f839e6 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -27,7 +27,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 6bbcdaeea..5646d709e 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -54,7 +54,7 @@
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
@@ -63,9 +63,9 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <twin.h>
diff --git a/korganizer/korganizer.kcfg b/korganizer/korganizer.kcfg
index ce09ca969..01ff6b2e7 100644
--- a/korganizer/korganizer.kcfg
+++ b/korganizer/korganizer.kcfg
@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name="korganizerrc"/>
-  <include>klocale.h</include>
+  <include>tdelocale.h</include>
 
   <group name="General">
     <entry type="Bool" key="Auto Save">
diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h
index 29e0a543e..fcd2b7ce4 100644
--- a/korganizer/korganizer_options.h
+++ b/korganizer/korganizer_options.h
@@ -27,7 +27,7 @@
 #define KORGANIZER_OPTIONS_H
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const TDECmdLineOptions korganizer_options[] =
 {
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index cce2c88d1..1b607169c 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -42,14 +42,14 @@
 
 #include <tdepopupmenu.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstatusbar.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/partmanager.h>
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 3ee64db4f..882afd943 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -25,7 +25,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <calendar/plugin.h>
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 6b59571da..9da336594 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -31,8 +31,8 @@
 #include <tqdatetime.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 703ec040b..c1e30eedd 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -30,10 +30,10 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/calhelper.h>
 #include <libkcal/icaldrag.h>
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 1e13f8a6a..92d68f9f4 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -31,7 +31,7 @@
 
 #include <libkcal/incidenceformatter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index ec53ba360..2ee92b12d 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -29,7 +29,7 @@
 #include <libkcal/calendarresources.h>
 #include <tdeactioncollection.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "actionmanager.h"
 #include "calendarview.h"
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index b2a3b402d..7b8ab9921 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -28,11 +28,11 @@
 #include <tqfileinfo.h>
 #include <tqlabel.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/incidenceformatter.h>
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index 671e15d3d..c57cd6f28 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 8a022d8ab..9090b949c 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -26,11 +26,11 @@
 #include "koapp.h"
 #include "aboutdata.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "korganizer.h"
 #include "korganizer_options.h"
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index e76d36b50..7cbd42ebb 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -25,7 +25,7 @@
 
 #include <libkcal/calendarresources.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqlayout.h>
 #include <tqvbox.h>
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f14176fb8..223cbb98e 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "koglobals.h"
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index a8ad5858d..5b3b47d84 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -23,10 +23,10 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index e6695e53c..1adefd207 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -26,10 +26,10 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "korganizer/korganizer.h"
 #include "korganizer/calendarview.h"
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 55710bcc8..106fc8672 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <exchangeaccount.h>
 
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index d998f37f3..e457de38a 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -21,10 +21,10 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index a6dd2e5a8..06f0b1b7d 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -18,10 +18,10 @@
 */
 #include "configdialog.h"
 #include "configdialog.moc"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/korganizer/plugins/hebrew/converter.cpp b/korganizer/plugins/hebrew/converter.cpp
index 1381292e6..39140715f 100644
--- a/korganizer/plugins/hebrew/converter.cpp
+++ b/korganizer/plugins/hebrew/converter.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                                       *
  ***************************************************************************/
 #include "converter.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 Converter::Converter()
 {
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index 065188537..a96859a6c 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp
index c6afbb613..c4f5aa6ee 100644
--- a/korganizer/plugins/hebrew/holiday.cpp
+++ b/korganizer/plugins/hebrew/holiday.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                                       *
  ***************************************************************************/
 #include "holiday.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 bool Holiday::CholP;
 bool Holiday::OmerP;
diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp
index bba30f620..4f5522ab7 100644
--- a/korganizer/plugins/hebrew/parsha.cpp
+++ b/korganizer/plugins/hebrew/parsha.cpp
@@ -9,7 +9,7 @@
  *   (at your option) any later version.                                                       *
  ***************************************************************************/
 #include "parsha.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQStringList Parsha::parshiot_names;
 
diff --git a/korganizer/plugins/printing/journal/journalprint.h b/korganizer/plugins/printing/journal/journalprint.h
index c84153a47..1ab7e2597 100644
--- a/korganizer/plugins/printing/journal/journalprint.h
+++ b/korganizer/plugins/printing/journal/journalprint.h
@@ -24,7 +24,7 @@
 #ifndef JOURNALPRINT_H
 #define JOURNALPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/list/listprint.h b/korganizer/plugins/printing/list/listprint.h
index db7997272..dd47ae374 100644
--- a/korganizer/plugins/printing/list/listprint.h
+++ b/korganizer/plugins/printing/list/listprint.h
@@ -24,7 +24,7 @@
 #ifndef LISTPRINT_H
 #define LISTPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.h b/korganizer/plugins/printing/whatsnext/whatsnextprint.h
index 467e02571..d31a585cc 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.h
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.h
@@ -24,7 +24,7 @@
 #ifndef WHATSNEXTPRINT_H
 #define WHATSNEXTPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 41d54c243..c10218457 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
diff --git a/korganizer/plugins/printing/year/yearprint.h b/korganizer/plugins/printing/year/yearprint.h
index 99c1422e0..ae6435bf3 100644
--- a/korganizer/plugins/printing/year/yearprint.h
+++ b/korganizer/plugins/printing/year/yearprint.h
@@ -24,7 +24,7 @@
 #ifndef YEARPRINT_H
 #define YEARPRINT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 8f0c3b662..033b6ba64 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -30,10 +30,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 9c8b611e0..602576234 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -22,10 +22,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "koprojectview.h"
 
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index d3ab6a6cf..4b3df7ef7 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -22,10 +22,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kotimespanview.h"
 
diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index b1c156ee5..8b0ff4b39 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqheader.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <libkcal/event.h>
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index 2753475f9..dade7791b 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -32,13 +32,13 @@
 #include "koprefs.h"
 #include "stdcalendar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libkcal/calendarlocal.h>
 
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqlabel.h>
diff --git a/korganizer/printing/calprintdefaultplugins.h b/korganizer/printing/calprintdefaultplugins.h
index 162b8a4e8..ee9cc3f72 100644
--- a/korganizer/printing/calprintdefaultplugins.h
+++ b/korganizer/printing/calprintdefaultplugins.h
@@ -26,7 +26,7 @@
 #define CALPRINTDEFAULTPLUGINS_H
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "calprintpluginbase.h"
 
 #ifndef KORG_NOPRINTER
diff --git a/korganizer/printing/cellitem.cpp b/korganizer/printing/cellitem.cpp
index 9551ac8ae..575669a42 100644
--- a/korganizer/printing/cellitem.cpp
+++ b/korganizer/printing/cellitem.cpp
@@ -24,7 +24,7 @@
 
 #include "cellitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqintdict.h>
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index 5d8b3462e..f4d8ea84f 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -26,10 +26,10 @@
 #include <kdebug.h>
 #include <tqlistview.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #ifndef KORG_NOKABC
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
 #endif
 #include <libkcal/attendee.h>
 
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 2dd4953bb..4a07cb4b7 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -31,10 +31,10 @@
 #include <kcolordialog.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <tderesources/resource.h>
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 6d315c50a..dd0f4552c 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <libkcal/calendar.h>
 
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index ba86ce7f6..1d4064478 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp
index a7fcd5442..481fd3fd4 100644
--- a/korganizer/stdcalendar.cpp
+++ b/korganizer/stdcalendar.cpp
@@ -27,7 +27,7 @@
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 using namespace KOrg;
diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp
index bbee8ca80..57209cd05 100644
--- a/korganizer/templatemanagementdialog.cpp
+++ b/korganizer/templatemanagementdialog.cpp
@@ -42,8 +42,8 @@
 
 #include <kpushbutton.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStringList &templates )
     :KDialogBase( parent, "template_management_dialog", true,
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 0d554edd4..27a253c09 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 #include <tqdatetime.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "koglobals.h"
 #include "kocore.h"
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 1753e0376..c77711b00 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -28,9 +28,9 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "koprefs.h"
 
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 236a71244..966442401 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -37,13 +37,13 @@ using namespace KCal;
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>