Rename additional header files to avoid conflicts with KDE4

151 files changed, 293 insertions, 293 deletions

diff --git a/developer-doc/phb/src-examples.docbook b/developer-doc/phb/src-examples.docbook
index 8103cc8..1e12ed9 100644
--- a/developer-doc/phb/src-examples.docbook
+++ b/developer-doc/phb/src-examples.docbook
@@ -197,12 +197,12 @@ signals:
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/converter/convertertest.cpp b/kmymoney2/converter/convertertest.cpp
index bbe0ec4..04a8b58 100644
--- a/kmymoney2/converter/convertertest.cpp
+++ b/kmymoney2/converter/convertertest.cpp
@@ -26,9 +26,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "convertertest.h"
diff --git a/kmymoney2/converter/imymoneyreader.h b/kmymoney2/converter/imymoneyreader.h
index 92f8963..0a4f12d 100644
--- a/kmymoney2/converter/imymoneyreader.h
+++ b/kmymoney2/converter/imymoneyreader.h
@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index d617bb0..dcf7d56 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -32,9 +32,9 @@ email                : mte@users.sourceforge.net
 // ----------------------------------------------------------------------------
 // KDE Includes
 #ifndef _GNCFILEANON
-  #include <klocale.h>
+  #include <tdelocale.h>
   #include <tdeconfig.h>
-  #include <kmessagebox.h>
+  #include <tdemessagebox.h>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
index a40685f..803aa97 100644
--- a/kmymoney2/converter/mymoneyqifprofile.cpp
+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
@@ -24,9 +24,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 33c844b..a656da1 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -36,8 +36,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/kmymoney2/converter/mymoneyqifreader.h b/kmymoney2/converter/mymoneyqifreader.h
index e2f6638..6f9d5f0 100644
--- a/kmymoney2/converter/mymoneyqifreader.h
+++ b/kmymoney2/converter/mymoneyqifreader.h
@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kurl.h>
 
diff --git a/kmymoney2/converter/mymoneyqifwriter.cpp b/kmymoney2/converter/mymoneyqifwriter.cpp
index 9fed9d5..b9e3e9f 100644
--- a/kmymoney2/converter/mymoneyqifwriter.cpp
+++ b/kmymoney2/converter/mymoneyqifwriter.cpp
@@ -28,8 +28,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Headers
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 87fa409..1cd2f46 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -34,8 +34,8 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kmymoney2/converter/mymoneystatementreader.h b/kmymoney2/converter/mymoneystatementreader.h
index c0b2273..812a602 100644
--- a/kmymoney2/converter/mymoneystatementreader.h
+++ b/kmymoney2/converter/mymoneystatementreader.h
@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp
index 721e96a..fdf9cc9 100644
--- a/kmymoney2/converter/mymoneytemplate.cpp
+++ b/kmymoney2/converter/mymoneytemplate.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <ksavefile.h>
 
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index f211744..ab1849f 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -29,14 +29,14 @@
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kcalendarsystem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // ----------------------------------------------------------------------------
 // Project Headers
diff --git a/kmymoney2/dialogs/investactivities.cpp b/kmymoney2/dialogs/investactivities.cpp
index c5adc66..c9dd317 100644
--- a/kmymoney2/dialogs/investactivities.cpp
+++ b/kmymoney2/dialogs/investactivities.cpp
@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp
index b46e9d1..0ef0dae 100644
--- a/kmymoney2/dialogs/investtransactioneditor.cpp
+++ b/kmymoney2/dialogs/investtransactioneditor.cpp
@@ -30,10 +30,10 @@
 // KDE Includes
 
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp
index c60043b..5638498 100644
--- a/kmymoney2/dialogs/kaccountselectdlg.cpp
+++ b/kmymoney2/dialogs/kaccountselectdlg.cpp
@@ -28,11 +28,11 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>
diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp
index de1eadd..3f66233 100644
--- a/kmymoney2/dialogs/kbackupdlg.cpp
+++ b/kmymoney2/dialogs/kbackupdlg.cpp
@@ -28,13 +28,13 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tdeconfig.h>
 #include <kdirselectdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp
index 4d52af5..ef86bee 100644
--- a/kmymoney2/dialogs/kbalancechartdlg.cpp
+++ b/kmymoney2/dialogs/kbalancechartdlg.cpp
@@ -29,7 +29,7 @@
 // KDE Includes
 
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kbalancewarning.cpp b/kmymoney2/dialogs/kbalancewarning.cpp
index 542b993..05aa9e7 100644
--- a/kmymoney2/dialogs/kbalancewarning.cpp
+++ b/kmymoney2/dialogs/kbalancewarning.cpp
@@ -24,8 +24,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
index beb8e98..134e53d 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
@@ -22,10 +22,10 @@
 // KDE Includes
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp
index 69741ae..93212b4 100644
--- a/kmymoney2/dialogs/kchooseimportexportdlg.cpp
+++ b/kmymoney2/dialogs/kchooseimportexportdlg.cpp
@@ -17,8 +17,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqpixmap.h>
@@ -27,9 +27,9 @@
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kchooseimportexportdlg.h"
 
diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp
index 1337715..86dd313 100644
--- a/kmymoney2/dialogs/kcsvprogressdlg.cpp
+++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp
@@ -17,8 +17,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqpixmap.h>
@@ -35,9 +35,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp
index 63ad18c..1bc5997 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.cpp
+++ b/kmymoney2/dialogs/kcurrencycalculator.cpp
@@ -32,7 +32,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <kstdguiitem.h>
diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.cpp b/kmymoney2/dialogs/kcurrencyeditdlg.cpp
index dba022a..0a860a1 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlg.cpp
+++ b/kmymoney2/dialogs/kcurrencyeditdlg.cpp
@@ -36,11 +36,11 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp
index 77aec7c..b47794f 100644
--- a/kmymoney2/dialogs/keditequityentrydlg.cpp
+++ b/kmymoney2/dialogs/keditequityentrydlg.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
diff --git a/kmymoney2/dialogs/keditequityentrydlg.h b/kmymoney2/dialogs/keditequityentrydlg.h
index 049c66a..8a9fb83 100644
--- a/kmymoney2/dialogs/keditequityentrydlg.h
+++ b/kmymoney2/dialogs/keditequityentrydlg.h
@@ -31,7 +31,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp
index 4ad5362..3ba06a0 100644
--- a/kmymoney2/dialogs/keditloanwizard.cpp
+++ b/kmymoney2/dialogs/keditloanwizard.cpp
@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 
diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp
index 8f961f8..6ec37b8 100644
--- a/kmymoney2/dialogs/keditscheduledlg.cpp
+++ b/kmymoney2/dialogs/keditscheduledlg.cpp
@@ -28,8 +28,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <klineedit.h>
diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp
index c9e5d9f..e0d795f 100644
--- a/kmymoney2/dialogs/kendingbalancedlg.cpp
+++ b/kmymoney2/dialogs/kendingbalancedlg.cpp
@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kactivelabel.h>
diff --git a/kmymoney2/dialogs/kendingbalancedlg.h b/kmymoney2/dialogs/kendingbalancedlg.h
index 2cf78de..8ccb5d3 100644
--- a/kmymoney2/dialogs/kendingbalancedlg.h
+++ b/kmymoney2/dialogs/kendingbalancedlg.h
@@ -30,7 +30,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp
index daa8428..430578d 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.cpp
+++ b/kmymoney2/dialogs/kenterscheduledlg.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
index daecf87..b612d15 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
@@ -35,14 +35,14 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kprogress.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp
index f87e6b5..4cf6ecc 100644
--- a/kmymoney2/dialogs/kexportdlg.cpp
+++ b/kmymoney2/dialogs/kexportdlg.cpp
@@ -27,10 +27,10 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/dialogs/kfindtransactiondlg.cpp b/kmymoney2/dialogs/kfindtransactiondlg.cpp
index 6afb646..6a86d0d 100644
--- a/kmymoney2/dialogs/kfindtransactiondlg.cpp
+++ b/kmymoney2/dialogs/kfindtransactiondlg.cpp
@@ -28,8 +28,8 @@
 // KDE Includes
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp
index eca66ff..5ada14a 100644
--- a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp
+++ b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.cpp b/kmymoney2/dialogs/kgncpricesourcedlg.cpp
index c7286de..88dc13f 100644
--- a/kmymoney2/dialogs/kgncpricesourcedlg.cpp
+++ b/kmymoney2/dialogs/kgncpricesourcedlg.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp
index 03bdff4..c45faa2 100644
--- a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp
+++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp
@@ -24,7 +24,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditlistbox.h>
 #include <kled.h>
 
diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp
index 118db29..e6b1698 100644
--- a/kmymoney2/dialogs/kimportdlg.cpp
+++ b/kmymoney2/dialogs/kimportdlg.cpp
@@ -32,13 +32,13 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.cpp b/kmymoney2/dialogs/kmergetransactionsdlg.cpp
index 13b2cae..5682385 100644
--- a/kmymoney2/dialogs/kmergetransactionsdlg.cpp
+++ b/kmymoney2/dialogs/kmergetransactionsdlg.cpp
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kmymoneypricedlg.cpp b/kmymoney2/dialogs/kmymoneypricedlg.cpp
index 9d55b82..5824053 100644
--- a/kmymoney2/dialogs/kmymoneypricedlg.cpp
+++ b/kmymoney2/dialogs/kmymoneypricedlg.cpp
@@ -32,7 +32,7 @@
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp
index 439567b..07b5893 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.cpp
+++ b/kmymoney2/dialogs/kmymoneysplittable.cpp
@@ -36,10 +36,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecompletionbox.h>
 #include <kpushbutton.h>
 #include <tdepopupmenu.h>
diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp
index 7f964dc..ca57545 100644
--- a/kmymoney2/dialogs/knewaccountdlg.cpp
+++ b/kmymoney2/dialogs/knewaccountdlg.cpp
@@ -40,9 +40,9 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
@@ -50,7 +50,7 @@
 #include <kpushbutton.h>
 #include <kled.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/knewbankdlg.cpp b/kmymoney2/dialogs/knewbankdlg.cpp
index efbf3b5..136a5a8 100644
--- a/kmymoney2/dialogs/knewbankdlg.cpp
+++ b/kmymoney2/dialogs/knewbankdlg.cpp
@@ -27,10 +27,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
 #include <klineedit.h>
diff --git a/kmymoney2/dialogs/knewbankdlg.h b/kmymoney2/dialogs/knewbankdlg.h
index b76ddfd..e8daa03 100644
--- a/kmymoney2/dialogs/knewbankdlg.h
+++ b/kmymoney2/dialogs/knewbankdlg.h
@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/knewbudgetdlg.cpp b/kmymoney2/dialogs/knewbudgetdlg.cpp
index d584623..1db17ce 100644
--- a/kmymoney2/dialogs/knewbudgetdlg.cpp
+++ b/kmymoney2/dialogs/knewbudgetdlg.cpp
@@ -27,8 +27,8 @@
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/knewequityentrydlg.h b/kmymoney2/dialogs/knewequityentrydlg.h
index 1a92614..17732dd 100644
--- a/kmymoney2/dialogs/knewequityentrydlg.h
+++ b/kmymoney2/dialogs/knewequityentrydlg.h
@@ -24,7 +24,7 @@
 #define KNEWEQUITYENTRY_H
 
 #include <tqdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../dialogs/knewequityentrydecl.h"
 
diff --git a/kmymoney2/dialogs/knewfiledlg.cpp b/kmymoney2/dialogs/knewfiledlg.cpp
index 1fe8f88..79b9752 100644
--- a/kmymoney2/dialogs/knewfiledlg.cpp
+++ b/kmymoney2/dialogs/knewfiledlg.cpp
@@ -26,16 +26,16 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #if KDE_IS_VERSION(3,1,90)
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/knewfiledlg.h b/kmymoney2/dialogs/knewfiledlg.h
index e694ff1..e034084 100644
--- a/kmymoney2/dialogs/knewfiledlg.h
+++ b/kmymoney2/dialogs/knewfiledlg.h
@@ -23,7 +23,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp
index 3f782b0..4fcef59 100644
--- a/kmymoney2/dialogs/knewinvestmentwizard.cpp
+++ b/kmymoney2/dialogs/knewinvestmentwizard.cpp
@@ -27,9 +27,9 @@
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
index d75072b..b74f419 100644
--- a/kmymoney2/dialogs/knewloanwizard.cpp
+++ b/kmymoney2/dialogs/knewloanwizard.cpp
@@ -32,10 +32,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 
diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp b/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp
index 0387c86..ebd4e32 100644
--- a/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp
+++ b/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp
index 1db13f1..10e4982 100644
--- a/kmymoney2/dialogs/kpayeereassigndlg.cpp
+++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp
@@ -24,10 +24,10 @@
 // KDE Includes
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp
index ca78ee9..c66f495 100644
--- a/kmymoney2/dialogs/kreconciledlg.cpp
+++ b/kmymoney2/dialogs/kreconciledlg.cpp
@@ -14,9 +14,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 
diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
index a50cbfc..2211568 100644
--- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
+++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
@@ -57,7 +57,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp
index 72715aa..85a399d 100644
--- a/kmymoney2/dialogs/ksecuritylisteditor.cpp
+++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp
@@ -27,9 +27,9 @@
 #include <tdelistview.h>
 #include <kguiitem.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp
index 185b913..2a3d0f5 100644
--- a/kmymoney2/dialogs/ksplittransactiondlg.cpp
+++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp
@@ -35,10 +35,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kactivelabel.h>
 #include <kstdguiitem.h>
diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp
index a5cdb21..43cdc7a 100644
--- a/kmymoney2/dialogs/kstartdlg.cpp
+++ b/kmymoney2/dialogs/kstartdlg.cpp
@@ -35,13 +35,13 @@
 
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <tdefile.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/kstartdlg.h b/kmymoney2/dialogs/kstartdlg.h
index 463cd53..7e04414 100644
--- a/kmymoney2/dialogs/kstartdlg.h
+++ b/kmymoney2/dialogs/kstartdlg.h
@@ -22,7 +22,7 @@
 
 #include <kdialogbase.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontdialog.h>
 #include <kurlrequester.h>
 #include <kiconview.h>
diff --git a/kmymoney2/dialogs/kupdatestockpricedlg.h b/kmymoney2/dialogs/kupdatestockpricedlg.h
index 23b9f5d..f434bb1 100644
--- a/kmymoney2/dialogs/kupdatestockpricedlg.h
+++ b/kmymoney2/dialogs/kupdatestockpricedlg.h
@@ -37,7 +37,7 @@
 // KDE Includes
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
index 303e752..83f8270 100644
--- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
+++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
@@ -28,11 +28,11 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
index 07b5d18..90e3b06 100644
--- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
@@ -28,8 +28,8 @@
 #include <klineedit.h>
 #include <keditlistbox.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp
index 8eb85e5..d86b135 100644
--- a/kmymoney2/dialogs/settings/ksettingshome.cpp
+++ b/kmymoney2/dialogs/settings/ksettingshome.cpp
@@ -25,10 +25,10 @@
 
 #include <tdelistview.h>
 #include <kpushbutton.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
index 6afa4f4..a984fd5 100644
--- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
@@ -25,8 +25,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp
index 38b1745..0eed4ae 100644
--- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp
@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kpluginselector.h>
 
diff --git a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp
index a420de5..aaee1d5 100644
--- a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp
+++ b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp
@@ -23,11 +23,11 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/tdeselectdatabasedlg.cpp b/kmymoney2/dialogs/tdeselectdatabasedlg.cpp
index 093e3e1..30d91cc 100644
--- a/kmymoney2/dialogs/tdeselectdatabasedlg.cpp
+++ b/kmymoney2/dialogs/tdeselectdatabasedlg.cpp
@@ -37,8 +37,8 @@
 #include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <ktextbrowser.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp b/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp
index d918031..d3b686b 100644
--- a/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp
+++ b/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp
@@ -25,7 +25,7 @@
 #include <kstdguiitem.h>
 #include <tdeapplication.h>
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp
index eb6c7c7..8ff4dfe 100644
--- a/kmymoney2/dialogs/transactioneditor.cpp
+++ b/kmymoney2/dialogs/transactioneditor.cpp
@@ -28,12 +28,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/dialogs/transactionmatcher.cpp b/kmymoney2/dialogs/transactionmatcher.cpp
index c4a21da..f9f36a7 100644
--- a/kmymoney2/dialogs/transactionmatcher.cpp
+++ b/kmymoney2/dialogs/transactionmatcher.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 95885a3..fad3f89 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -50,13 +50,13 @@
 #include <tdeapplication.h>
 #include <tdeshortcut.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <ktip.h>
@@ -64,7 +64,7 @@
 #include <kprogress.h>
 #include <tdeio/netaccess.h>
 #include <dcopclient.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdeparts/componentfactory.h>
 #include <krun.h>
 #include <tdeconfigdialog.h>
diff --git a/kmymoney2/kmymoneyglobalsettings.cpp b/kmymoney2/kmymoneyglobalsettings.cpp
index 533e884..ee5d5ae 100644
--- a/kmymoney2/kmymoneyglobalsettings.cpp
+++ b/kmymoney2/kmymoneyglobalsettings.cpp
@@ -22,7 +22,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp
index ef2fe74..5c3f1b0 100644
--- a/kmymoney2/kmymoneyutils.cpp
+++ b/kmymoney2/kmymoneyutils.cpp
@@ -26,10 +26,10 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#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/kmymoney2/kstartuplogo.cpp b/kmymoney2/kstartuplogo.cpp
index 645804f..84f734f 100644
--- a/kmymoney2/kstartuplogo.cpp
+++ b/kmymoney2/kstartuplogo.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp
index 2f17bd2..342cd14 100644
--- a/kmymoney2/main.cpp
+++ b/kmymoney2/main.cpp
@@ -33,10 +33,10 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktip.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
index 569a9ae..56c0112 100644
--- a/kmymoney2/mymoney/mymoneyaccount.cpp
+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
index bd8eb15..2c78d8f 100644
--- a/kmymoney2/mymoney/mymoneyfile.cpp
+++ b/kmymoney2/mymoney/mymoneyfile.cpp
@@ -27,7 +27,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/mymoney/mymoneyinstitution.cpp b/kmymoney2/mymoney/mymoneyinstitution.cpp
index c604f18..b9ab329 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.cpp
+++ b/kmymoney2/mymoney/mymoneyinstitution.cpp
@@ -21,7 +21,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/mymoney/mymoneymoney.h b/kmymoney2/mymoney/mymoneymoney.h
index 6ff1cae..f857b8f 100644
--- a/kmymoney2/mymoney/mymoneymoney.h
+++ b/kmymoney2/mymoney/mymoneymoney.h
@@ -76,7 +76,7 @@ public:
   };
 
   enum signPosition {
-    // keep those in sync with the ones defined in klocale.h
+    // keep those in sync with the ones defined in tdelocale.h
     ParensAround = 0,
     BeforeQuantityMoney = 1,
     AfterQuantityMoney = 2,
diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp
index 32584f1..d2ac663 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduled.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/mymoney/mymoneyscheduletest.cpp b/kmymoney2/mymoney/mymoneyscheduletest.cpp
index 8287f1f..ae45e97 100644
--- a/kmymoney2/mymoney/mymoneyscheduletest.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduletest.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 // Include internationalization
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mymoneyscheduletest.h"
 
diff --git a/kmymoney2/mymoney/mymoneysecurity.cpp b/kmymoney2/mymoney/mymoneysecurity.cpp
index 7b42b84..a6c1ab8 100644
--- a/kmymoney2/mymoney/mymoneysecurity.cpp
+++ b/kmymoney2/mymoney/mymoneysecurity.cpp
@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index 7f325e6..17ac410 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -32,7 +32,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index 063687a..2f1d67e 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -31,7 +31,7 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
index a875135..63e3aa5 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
@@ -34,10 +34,10 @@
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
index 0355ffe..a23fd71 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
@@ -33,9 +33,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
index ec2d4a0..c658293 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
@@ -35,7 +35,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kled.h>
 #include <kcombobox.h>
 
diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
index 60a3aae..1217d8a 100644
--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
@@ -33,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
index a20db83..bcb3f23 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
@@ -32,7 +32,7 @@
 #include <tdefile.h>
 #include <kurl.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp
index d6fed01..34bc1e1 100644
--- a/kmymoney2/plugins/ofximport/ofxpartner.cpp
+++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp
@@ -40,8 +40,8 @@
 
 
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp
index d217b49..7dbe31c 100644
--- a/kmymoney2/plugins/pluginloader.cpp
+++ b/kmymoney2/plugins/pluginloader.cpp
@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <kpluginselector.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/reports/listtable.cpp b/kmymoney2/reports/listtable.cpp
index 504c865..74ee403 100644
--- a/kmymoney2/reports/listtable.cpp
+++ b/kmymoney2/reports/listtable.cpp
@@ -28,7 +28,7 @@
 // This is just needed for i18n().  Once I figure out how to handle i18n
 // without using this macro directly, I'll be freed of KDE dependency.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/reports/objectinfotable.cpp b/kmymoney2/reports/objectinfotable.cpp
index ef4af13..8202865 100644
--- a/kmymoney2/reports/objectinfotable.cpp
+++ b/kmymoney2/reports/objectinfotable.cpp
@@ -28,7 +28,7 @@
 // This is just needed for i18n().  Once I figure out how to handle i18n
 // without using this macro directly, I'll be freed of KDE dependency.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/reports/pivotgrid.cpp b/kmymoney2/reports/pivotgrid.cpp
index 6a3f773..914fba9 100644
--- a/kmymoney2/reports/pivotgrid.cpp
+++ b/kmymoney2/reports/pivotgrid.cpp
@@ -39,8 +39,8 @@
 // (e.g. MyMoneyAccount::Checkings) into their text representation.  We also
 // use that text representation in the core data structure of the report. (Ace)
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 
diff --git a/kmymoney2/reports/pivotgridtest.cpp b/kmymoney2/reports/pivotgridtest.cpp
index 5b8dd54..2a7335c 100644
--- a/kmymoney2/reports/pivotgridtest.cpp
+++ b/kmymoney2/reports/pivotgridtest.cpp
@@ -22,9 +22,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // DOH, mmreport.h uses this without including it!!
diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
index e41215b..0b1d53a 100644
--- a/kmymoney2/reports/pivottable.cpp
+++ b/kmymoney2/reports/pivottable.cpp
@@ -40,8 +40,8 @@
 // (e.g. MyMoneyAccount::Checkings) into their text representation.  We also
 // use that text representation in the core data structure of the report. (Ace)
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 
diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp
index b2962e1..cf201a5 100644
--- a/kmymoney2/reports/pivottabletest.cpp
+++ b/kmymoney2/reports/pivottabletest.cpp
@@ -22,9 +22,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // DOH, mmreport.h uses this without including it!!
diff --git a/kmymoney2/reports/querytable.cpp b/kmymoney2/reports/querytable.cpp
index ef5de34..a3b1eef 100644
--- a/kmymoney2/reports/querytable.cpp
+++ b/kmymoney2/reports/querytable.cpp
@@ -34,7 +34,7 @@
 // This is just needed for i18n().  Once I figure out how to handle i18n
 // without using this macro directly, I'll be freed of KDE dependency.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/reports/querytabletest.cpp b/kmymoney2/reports/querytabletest.cpp
index f19832e..d4cf5ab 100644
--- a/kmymoney2/reports/querytabletest.cpp
+++ b/kmymoney2/reports/querytabletest.cpp
@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "querytabletest.h"
diff --git a/kmymoney2/reports/reportaccount.cpp b/kmymoney2/reports/reportaccount.cpp
index 477580d..c8ee493 100644
--- a/kmymoney2/reports/reportaccount.cpp
+++ b/kmymoney2/reports/reportaccount.cpp
@@ -28,7 +28,7 @@
 // (e.g. MyMoneyAccount::Checkings) into their text representation.  We also
 // use that text representation in the core data structure of the report. (Ace)
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/reports/reportstestcommon.cpp b/kmymoney2/reports/reportstestcommon.cpp
index a64f04e..bc330f0 100644
--- a/kmymoney2/reports/reportstestcommon.cpp
+++ b/kmymoney2/reports/reportstestcommon.cpp
@@ -22,9 +22,9 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kreportsviewtest.h"
diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp
index 1dbced9..e2ac90b 100644
--- a/kmymoney2/views/kaccountsview.cpp
+++ b/kmymoney2/views/kaccountsview.cpp
@@ -26,7 +26,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kiconview.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp
index cb3049b..bd43dbb 100644
--- a/kmymoney2/views/kbudgetview.cpp
+++ b/kmymoney2/views/kbudgetview.cpp
@@ -34,10 +34,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp
index 1c08e62..f431576 100644
--- a/kmymoney2/views/kcategoriesview.cpp
+++ b/kmymoney2/views/kcategoriesview.cpp
@@ -29,7 +29,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp
index a102fcd..f4c706b 100644
--- a/kmymoney2/views/kforecastview.cpp
+++ b/kmymoney2/views/kforecastview.cpp
@@ -28,7 +28,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 
diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index 0ea4fe3..18546c0 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -28,10 +28,10 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index d51f908..8c0ba14 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -37,8 +37,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdehtmlview.h>
 #include <tdeconfig.h>
@@ -46,10 +46,10 @@
 #include <tdemainwindow.h>
 #include <tdeactioncollection.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp
index 87c0fc1..5838d24 100644
--- a/kmymoney2/views/kinstitutionsview.cpp
+++ b/kmymoney2/views/kinstitutionsview.cpp
@@ -25,7 +25,7 @@
 // KDE Includes
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp
index 9edf43a..9b7f479 100644
--- a/kmymoney2/views/kinvestmentview.cpp
+++ b/kmymoney2/views/kinvestmentview.cpp
@@ -24,7 +24,7 @@
 // KDE Includes
 
 #include "kdecompat.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kmymoneyfile.cpp b/kmymoney2/views/kmymoneyfile.cpp
index 76d3ea1..9f9e3ca 100644
--- a/kmymoney2/views/kmymoneyfile.cpp
+++ b/kmymoney2/views/kmymoneyfile.cpp
@@ -25,7 +25,7 @@
  */
 #if 0
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kmymoneyfile.h"
 #include "../mymoney/storage/mymoneyseqaccessmgr.h"
diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index a5b4ef5..ba127b6 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -43,15 +43,15 @@
 #include "kdecompat.h"
 
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 #include <kfilterdev.h>
 #include <kfilterbase.h>
diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index 65bd90d..c615ecd 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -45,9 +45,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index e8b9d46..e4d6e6e 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -49,17 +49,17 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdehtmlview.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp
index d509521..c3971e0 100644
--- a/kmymoney2/views/kscheduledlistitem.cpp
+++ b/kmymoney2/views/kscheduledlistitem.cpp
@@ -30,9 +30,9 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp
index ed52339..5893f93 100644
--- a/kmymoney2/views/kscheduledview.cpp
+++ b/kmymoney2/views/kscheduledview.cpp
@@ -33,12 +33,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 #include <tdelistviewsearchline.h>
diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp
index 1c90f8e..22af851 100644
--- a/kmymoney2/widgets/kaccounttemplateselector.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselector.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
 #include <ktextedit.h>
diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
index 40c6f3e..a68806d 100644
--- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #ifndef KMM_I18N
 #define KMM_I18N
 inline TQString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }
diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp
index 1ee3520..3552156 100644
--- a/kmymoney2/widgets/kbudgetvalues.cpp
+++ b/kmymoney2/widgets/kbudgetvalues.cpp
@@ -30,10 +30,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.cpp b/kmymoney2/widgets/kbudgetvaluesdecl.cpp
index f33b87f..b61c5e5 100644
--- a/kmymoney2/widgets/kbudgetvaluesdecl.cpp
+++ b/kmymoney2/widgets/kbudgetvaluesdecl.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #ifndef KMM_I18N
 #define KMM_I18N
 inline TQString kmm_i18n(const char* msg, const char* ctx) { return i18n(ctx, msg); }
diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp
index 17f8756..e3f37d5 100644
--- a/kmymoney2/widgets/kmymoneyaccountselector.cpp
+++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp
@@ -34,7 +34,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp
index c67c7b0..bcd2e33 100644
--- a/kmymoney2/widgets/kmymoneyaccounttree.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp
@@ -31,9 +31,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
index f943d57..1689719 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
@@ -31,9 +31,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
index ec198d6..72400f2 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
@@ -17,7 +17,7 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp
index 3e9ab7b..ff75732 100644
--- a/kmymoney2/widgets/kmymoneybriefschedule.cpp
+++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp
@@ -31,8 +31,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 
diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp
index cf3f7e6..3f01010 100644
--- a/kmymoney2/widgets/kmymoneycalculator.cpp
+++ b/kmymoney2/widgets/kmymoneycalculator.cpp
@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index a5d9622..09142e9 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -60,9 +60,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kdebug.h>
diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp
index 99474f3..9fb0563 100644
--- a/kmymoney2/widgets/kmymoneycategory.cpp
+++ b/kmymoney2/widgets/kmymoneycategory.cpp
@@ -27,7 +27,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
index 915e8d3..f816b21 100644
--- a/kmymoney2/widgets/kmymoneycombo.cpp
+++ b/kmymoney2/widgets/kmymoneycombo.cpp
@@ -26,7 +26,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index eedd535..bb76c90 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -34,8 +34,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <tdeshortcut.h>
diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp
index 07f8b8a..3ccbcb9 100644
--- a/kmymoney2/widgets/kmymoneydatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneydatetbl.cpp
@@ -55,10 +55,10 @@
 // KDE Includes
 #include "kdecompat.h"
 #include <kdatetbl.h> // Use the classes available for maximum re-use
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #if KDE_IS_VERSION(3,2,0)
diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp
index cb04111..586686d 100644
--- a/kmymoney2/widgets/kmymoneyedit.cpp
+++ b/kmymoney2/widgets/kmymoneyedit.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp
index afc7d6b..e2dc761 100644
--- a/kmymoney2/widgets/kmymoneygpgconfig.cpp
+++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp
@@ -25,8 +25,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kled.h>
 
diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp
index b7c96ab..e6e3791 100644
--- a/kmymoney2/widgets/kmymoneylineedit.cpp
+++ b/kmymoney2/widgets/kmymoneylineedit.cpp
@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
index 6f04112..3b1c485 100644
--- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
+++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
@@ -24,8 +24,8 @@
 // KDE Includes
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp
index 83b9ba5..86d32a4 100644
--- a/kmymoney2/widgets/kmymoneypriceview.cpp
+++ b/kmymoney2/widgets/kmymoneypriceview.cpp
@@ -32,12 +32,12 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
index 68eaf48..33bf247 100644
--- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp
@@ -27,9 +27,9 @@
 
 // ----------------------------------------------------------------------------
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
index 964b0f6..f793859 100644
--- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
@@ -53,9 +53,9 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 #include "kdecompat.h"
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp
index b73f458..ae006cd 100644
--- a/kmymoney2/widgets/kmymoneytitlelabel.cpp
+++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp
@@ -26,10 +26,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
index c9190c9..e210350 100644
--- a/kmymoney2/widgets/kmymoneywizard.cpp
+++ b/kmymoney2/widgets/kmymoneywizard.cpp
@@ -27,10 +27,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp
index 51bde1f..78c379a 100644
--- a/kmymoney2/widgets/register.cpp
+++ b/kmymoney2/widgets/register.cpp
@@ -30,8 +30,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/kmymoney2/widgets/registersearchline.cpp b/kmymoney2/widgets/registersearchline.cpp
index 626db9b..65a79be 100644
--- a/kmymoney2/widgets/registersearchline.cpp
+++ b/kmymoney2/widgets/registersearchline.cpp
@@ -28,7 +28,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/scheduledtransaction.cpp b/kmymoney2/widgets/scheduledtransaction.cpp
index cb47fdb..8f15207 100644
--- a/kmymoney2/widgets/scheduledtransaction.cpp
+++ b/kmymoney2/widgets/scheduledtransaction.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
diff --git a/kmymoney2/widgets/stdtransactiondownloaded.cpp b/kmymoney2/widgets/stdtransactiondownloaded.cpp
index caabdbf..d62927c 100644
--- a/kmymoney2/widgets/stdtransactiondownloaded.cpp
+++ b/kmymoney2/widgets/stdtransactiondownloaded.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp
index 9900c3c..372dfca 100644
--- a/kmymoney2/widgets/stdtransactionmatched.cpp
+++ b/kmymoney2/widgets/stdtransactionmatched.cpp
@@ -23,7 +23,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/widgets/tdelistviewsearchline.cpp b/kmymoney2/widgets/tdelistviewsearchline.cpp
index 4c72bdf..bc6ccf5 100644
--- a/kmymoney2/widgets/tdelistviewsearchline.cpp
+++ b/kmymoney2/widgets/tdelistviewsearchline.cpp
@@ -23,7 +23,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqapplication.h>
 #include <tqtimer.h>
diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp
index 2773258..684e960 100644
--- a/kmymoney2/widgets/transaction.cpp
+++ b/kmymoney2/widgets/transaction.cpp
@@ -25,8 +25,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kmymoney2/widgets/transactionform.cpp b/kmymoney2/widgets/transactionform.cpp
index 281bcc5..9d94110 100644
--- a/kmymoney2/widgets/transactionform.cpp
+++ b/kmymoney2/widgets/transactionform.cpp
@@ -29,8 +29,8 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 
diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h
index 2bf069f..34d0b04 100644
--- a/kmymoney2/widgets/transactionsortoption.ui.h
+++ b/kmymoney2/widgets/transactionsortoption.ui.h
@@ -14,7 +14,7 @@
 // KDE Includes
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
index f3ead6f..91f32c4 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
@@ -29,10 +29,10 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
index ba21d88..52823df 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
@@ -30,7 +30,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
@@ -39,9 +39,9 @@
 #include <kurlrequester.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
-#include <kmessagebox.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/wizards/wizardpages/currency.cpp b/kmymoney2/wizards/wizardpages/currency.cpp
index 7e5a939..8dc1da4 100644
--- a/kmymoney2/wizards/wizardpages/currency.cpp
+++ b/kmymoney2/wizards/wizardpages/currency.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/wizards/wizardpages/userinfo.cpp b/kmymoney2/wizards/wizardpages/userinfo.cpp
index 5eebf2a..2bf500f 100644
--- a/kmymoney2/wizards/wizardpages/userinfo.cpp
+++ b/kmymoney2/wizards/wizardpages/userinfo.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 // KDE Includes
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 // ----------------------------------------------------------------------------
diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
index 590bc3d..07aa319 100644
--- a/libkgpgfile/kgpgfile.cpp
+++ b/libkgpgfile/kgpgfile.cpp
@@ -35,7 +35,7 @@
 // KDE Includes
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kpassdlg.h>
 #include <klibloader.h>