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 6c85c48b..161614bf 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 76985d1a..989be261 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 3ef70ea7..d4d2e8b0 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 7d7cdedb..2be3d060 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 4d85a7a4..1d7e8bde 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 dd3f8a1a..bb965ba2 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 739dc905..34562921 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 0cece663..156ed702 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 c8251ca6..cd44d9c8 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 d23c7528..b3de84ad 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 eac14271..519e103e 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 0b9e5d99..74f8c8a3 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 ee638fc7..4272f5da 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 20f409e7..e03eba31 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 eb0f7892..853c3cdf 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 fe0bd96c..a8ca0c58 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 3594a860..f92ae338 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 dcf2a3eb..230c992d 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 484cc165..b242c306 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 216f1dfd..bba8840a 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 869fe119..7e68deeb 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 ad994359..8d6b6f61 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 5f0da24a..4411e966 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 77630426..abe64959 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 0b1d39db..9bc2adbc 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 883aba87..5341e1d0 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 13de8f7e..1c9bc93c 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 6d91d118..1415eef5 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 b7aff0a2..77216a99 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 ebc70200..4889906a 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 c97ad456..ee416efa 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 0ab854a9..304fea93 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 47cb603a..49b4d969 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 3741acb3..9b27c063 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 132c3290..5af7fd60 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 3aceab47..ac372db7 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 c24af1a0..c31c5432 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 3d331ed0..ae4e4c20 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 587a60d0..9bd038d2 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 124c38fb..ddd4fcde 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 afbe8419..7e783695 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 b3fd073b..829e8858 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 0673ec6e..6e86c857 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 74ad2855..0cd128cc 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 867d447f..b21146d0 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 f5d64ca6..3bc78156 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 d33f185d..aa97348c 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 c88b6383..60855bda 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 6a0100aa..9c843b59 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 2335fce7..561b9f8c 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 a741d7f2..c75523a9 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 a8f6acc3..f5f76e26 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 3cfbe171..08763b63 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 fc336946..edeffaf3 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 d1eb5347..f8f15add 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 7707e0ec..2a87c7fd 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 6dce7211..d44ac4a2 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 38b6310e..de4f839e 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 6bbcdaee..5646d709 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 ce09ca96..01ff6b2e 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 29e0a543..fcd2b7ce 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 cce2c88d..1b607169 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 3ee64db4..882afd94 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 6b59571d..9da33659 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 703ec040..c1e30eed 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 1e13f8a6..92d68f9f 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 ec53ba36..2ee92b12 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 b2a3b402..7b8ab992 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 671e15d3..c57cd6f2 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 8a022d8a..9090b949 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 e76d36b5..7cbd42eb 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 f14176fb..223cbb98 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 a8ad5858..5b3b47d8 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 e6695e53..1adefd20 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 55710bcc..106fc867 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 d998f37f..e457de38 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 a6dd2e5a..06f0b1b7 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 1381292e..39140715 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 06518853..a96859a6 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 c6afbb61..c4f5aa6e 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 bba30f62..4f5522ab 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 c84153a4..1ab7e259 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 db799727..dd47ae37 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 467e0257..d31a585c 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 41d54c24..c1021845 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 99c1422e..ae6435bf 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 8f0c3b66..033b6ba6 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 9c8b611e..60257623 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 d3ab6a6c..4b3df7ef 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 b1c156ee..8b0ff4b3 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 2753475f..dade7791 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 162b8a4e..ee9cc3f7 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 9551ac8a..575669a4 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 5d8b3462..f4d8ea84 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 2dd4953b..4a07cb4b 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 6d315c50..dd0f4552 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 ba86ce7f..1d406447 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 a7fcd544..481fd3fd 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 bbee8ca8..57209cd0 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 0d554edd..27a253c0 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 1753e037..c77711b0 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 236a7124..96644240 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>