Rename additional header files to avoid conflicts with KDE4

53 files changed, 81 insertions, 81 deletions

diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h
index d9b3b6f6..909fc6ef 100644
--- a/kword/KWAboutData.h
+++ b/kword/KWAboutData.h
@@ -21,7 +21,7 @@
 #define KWORD_ABOUTDATA
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kofficeversion.h>
 
 static const char* KWORD_DESCRIPTION=I18N_NOOP("KOffice Word Processor");
diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp
index a1bd1f5c..59380048 100644
--- a/kword/KWBgSpellCheck.cpp
+++ b/kword/KWBgSpellCheck.cpp
@@ -32,7 +32,7 @@ using namespace KSpell2;
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KWBgSpellCheck::KWBgSpellCheck(KWDocument *_doc)
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 27f1320f..11e23e27 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -50,11 +50,11 @@
 #include <KoStoreDrag.h>
 #include <KoPictureCollection.h>
 
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemultipledrag.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index d2adb65c..fec98ab7 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -44,7 +44,7 @@
 #include <KoStore.h>
 #include <KoOasisStore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqxml.h>
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 6853f2c7..6d1a28b2 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoUnitWidgets.h>
 #include <knuminput.h>
 #include <knumvalidator.h>
@@ -60,11 +60,11 @@
 using namespace KSpell2;
 
 #include <float.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <kurlrequesterdlg.h>
 #include <tdefiledialog.h>
 #include <tqtabwidget.h>
diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index ee235c9b..236c7357 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -27,7 +27,7 @@
 #include <KoParagDia.h>
 #include <KoUnitWidgets.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <tqradiobutton.h>
diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp
index 131192e9..7f17f55f 100644
--- a/kword/KWCreateBookmarkDia.cpp
+++ b/kword/KWCreateBookmarkDia.cpp
@@ -17,14 +17,14 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "KWDocument.h"
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "KWCommand.h"
 #include "KWCreateBookmarkDia.h"
 #include "KWCreateBookmarkDiaBase.h"
diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp
index 2577e0f5..40f391d1 100644
--- a/kword/KWDeleteDia.cpp
+++ b/kword/KWDeleteDia.cpp
@@ -22,7 +22,7 @@
 #include "KWDeleteDia.h"
 #include "KWView.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index e39947dc..f6595c00 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -34,12 +34,12 @@
 #include <KoSpeaker.h>
 
 // KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdelistviewsearchline.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <kpixmap.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index ece87a9a..2c446210 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -74,11 +74,11 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klibloader.h>
 #include <tdemultipledrag.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdespell.h>
 #include <kstandarddirs.h>
 
diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp
index 4a870af7..dd612b75 100644
--- a/kword/KWEditPersonnalExpression.cpp
+++ b/kword/KWEditPersonnalExpression.cpp
@@ -20,7 +20,7 @@
 #include "KWEditPersonnalExpression.h"
 #include "KWView.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineeditdlg.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp
index 24060cf2..4d9ec80b 100644
--- a/kword/KWFootNoteDia.cpp
+++ b/kword/KWFootNoteDia.cpp
@@ -24,7 +24,7 @@
 #include <tqvbox.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include "KWConfigFootNoteDia.h"
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index f54942a4..a6a31f7c 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -35,10 +35,10 @@
 #include <KoXmlNS.h>
 #include <KoXmlWriter.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <dcopobject.h>
 #include "KWordFormulaFrameSetIface.h"
 #include "KWordFormulaFrameSetEditIface.h"
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index 6c7fa4b2..66ef91b2 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -32,9 +32,9 @@
 #include <KoParagDia_p.h> // for KoBorderPreview
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp
index 65ae6fbb..a0cc5f81 100644
--- a/kword/KWFrameStyle.cpp
+++ b/kword/KWFrameStyle.cpp
@@ -28,7 +28,7 @@
 #include <KoXmlNS.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdom.h>
 
 KWFrameStyleCollection::KWFrameStyleCollection()
diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp
index b9ccbe16..3a5fec87 100644
--- a/kword/KWFrameStyleManager.cpp
+++ b/kword/KWFrameStyleManager.cpp
@@ -27,7 +27,7 @@
 #include <KoParagDia.h>
 
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqtabwidget.h>
diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp
index e3f6e98c..4a76e481 100644
--- a/kword/KWFrameView.cpp
+++ b/kword/KWFrameView.cpp
@@ -30,7 +30,7 @@
 
 #include "KoZoomHandler.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactionclasses.h>
 
 #include <tqapplication.h>
diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp
index cb1f40b5..b31f9789 100644
--- a/kword/KWImportStyleDia.cpp
+++ b/kword/KWImportStyleDia.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "KWDocument.h"
 
 #include <tqvbox.h>
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "KWImportStyleDia.h"
 #include <KoStore.h>
 #include <tqfile.h>
diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp
index 09764608..6bcd52db 100644
--- a/kword/KWInsertDia.cpp
+++ b/kword/KWInsertDia.cpp
@@ -22,7 +22,7 @@
 #include "KWTableFrameSet.h"
 #include "KWView.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqspinbox.h>
diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp
index 42ca6b22..1a818cb3 100644
--- a/kword/KWInsertPageDia.cpp
+++ b/kword/KWInsertPageDia.cpp
@@ -20,7 +20,7 @@
 
 
 #include "KWInsertPageDia.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
 #include <tqlayout.h>
diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp
index 9aad5b5b..55b8219e 100644
--- a/kword/KWInsertPicDia.cpp
+++ b/kword/KWInsertPicDia.cpp
@@ -26,7 +26,7 @@
 #include <tqscrollview.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kimageio.h>
 #include <tdeio/netaccess.h>
diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp
index 85b18a0a..b9bd0ed7 100644
--- a/kword/KWInsertTOCCommand.cpp
+++ b/kword/KWInsertTOCCommand.cpp
@@ -25,7 +25,7 @@
 #include "KWTextDocument.h"
 #include "KWTextParag.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 KWInsertTOCCommand::KWInsertTOCCommand( KWTextFrameSet * fs, KoTextParag *parag )
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 8ef08e91..b43e81c5 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -25,11 +25,11 @@
 #include <KoCustomVariablesDia.h>
 #include "defs.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kservice.h>
 #include <tdemainwindow.h>
diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp
index daaa8502..10867463 100644
--- a/kword/KWOasisLoader.cpp
+++ b/kword/KWOasisLoader.cpp
@@ -38,7 +38,7 @@
 #include <KoXmlNS.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvaluelist.h>
 #include <tqdom.h>
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 4ae07187..d347871a 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -30,7 +30,7 @@
 #include <KoXmlWriter.h>
 #include <KoXmlNS.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <assert.h>
diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp
index 2cc8443b..62f8ce2c 100644
--- a/kword/KWPictureFrameSet.cpp
+++ b/kword/KWPictureFrameSet.cpp
@@ -27,7 +27,7 @@
 #include <KoDom.h>
 #include <KoXmlNS.h>
 #include <KoXmlWriter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 //#define DEBUG_DRAW
diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp
index 08c2ada2..c4f5ce01 100644
--- a/kword/KWResizeTableDia.cpp
+++ b/kword/KWResizeTableDia.cpp
@@ -24,7 +24,7 @@
 #include "KWCommand.h"
 
 #include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 
diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp
index fe1f2c7f..9fab03f9 100644
--- a/kword/KWSortDia.cpp
+++ b/kword/KWSortDia.cpp
@@ -21,7 +21,7 @@
 
 #include "KWSortDia.h"
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp
index 5e988ea3..fd141c29 100644
--- a/kword/KWSplitCellDia.cpp
+++ b/kword/KWSplitCellDia.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int columns, unsigned int rows)
     : KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, parent, name, true)
diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp
index 9b1f462a..82b15bf1 100644
--- a/kword/KWStatisticsDialog.cpp
+++ b/kword/KWStatisticsDialog.cpp
@@ -19,7 +19,7 @@
 #include "KWStatisticsDialog.h"
 #include "KWDocument.h"
 #include "KWFrameSet.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp
index 013a2be6..6c68c32e 100644
--- a/kword/KWTableDia.cpp
+++ b/kword/KWTableDia.cpp
@@ -38,7 +38,7 @@
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <stdlib.h>
 
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index 902d5a78..f86596ff 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -46,9 +46,9 @@ DESCRIPTION
 #include <KoTextObject.h> // for customItemChar !
 #include <KoTextParag.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopobject.h>
 #include <tqapplication.h>
 #include <tqpopupmenu.h>
diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp
index 20016d49..e6bd2116 100644
--- a/kword/KWTableStyle.cpp
+++ b/kword/KWTableStyle.cpp
@@ -27,7 +27,7 @@
 #include <KoXmlNS.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdom.h>
 
 KWTableStyleCollection::KWTableStyleCollection()
diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp
index 4a9ad5ef..aff5a008 100644
--- a/kword/KWTableStyleManager.cpp
+++ b/kword/KWTableStyleManager.cpp
@@ -30,7 +30,7 @@
 #include "KWFrameStyleManager.h"
 #include "KWStyleManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kword/KWTableTemplate.cpp b/kword/KWTableTemplate.cpp
index 7f4b4682..a54ae259 100644
--- a/kword/KWTableTemplate.cpp
+++ b/kword/KWTableTemplate.cpp
@@ -24,7 +24,7 @@
 #include "KoParagStyle.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdom.h>
 
 
diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp
index d161ccf7..476fb9b9 100644
--- a/kword/KWTableTemplateSelector.cpp
+++ b/kword/KWTableTemplateSelector.cpp
@@ -27,7 +27,7 @@
 
 #include <KoRect.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp
index 29252045..33e1607c 100644
--- a/kword/KWTextDocument.cpp
+++ b/kword/KWTextDocument.cpp
@@ -33,8 +33,8 @@
 #include <KoDom.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 KWTextDocument::KWTextDocument( KWTextFrameSet * textfs, KoTextFormatCollection *fc, KoTextFormatter *formatter )
     : KoTextDocument( textfs->kWordDocument(), fc, formatter, false ), m_textfs( textfs )
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index 4df7bc1f..756cf576 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -54,9 +54,9 @@
 #include <KoOasisContext.h>
 #include <KoStore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqclipboard.h>
diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index e870c710..aae68085 100644
--- a/kword/KWTextParag.cpp
+++ b/kword/KWTextParag.cpp
@@ -31,8 +31,8 @@
 #include <KoXmlNS.h>
 #include <KoOasisStyles.h>
 
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 80666965..285bac45 100644
--- a/kword/KWVariable.cpp
+++ b/kword/KWVariable.cpp
@@ -32,7 +32,7 @@
 #include <KoXmlNS.h>
 #include <KoDom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 KWVariableSettings::KWVariableSettings() : KoVariableSettings()
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 4e3822a8..eb0022ce 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -108,13 +108,13 @@
 #include <kimageio.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/event.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurldrag.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index ef76bea0..c8bd6f3b 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 96512f8b..8453a5ec 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -25,10 +25,10 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kabc/distributionlist.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include "KWMailMergeKABC.h"
 #include "KWMailMergeKABCConfig.h"
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index 32a078a6..b5f0dfc3 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -26,7 +26,7 @@
 #include <tqdom.h>
 #include <tqguardedptr.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 #include "KWMailMergeDataSource.h"
 
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index c9c221dc..a75a8417 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -25,14 +25,14 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <krun.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
 
 #include "addresspicker.h"
 #include "KWMailMergeKABC.h"
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index 1024ecd0..056cefc2 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 #include <tdelistview.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include "KWMailMergeKABC.h"
 
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 63a02876..527d1e68 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -19,8 +19,8 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <kspread_map.h>
 
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index aa97d0b2..441c3207 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -24,7 +24,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <kspread_map.h>
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index c45d7527..08def7cd 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -2,7 +2,7 @@
 #include "KWQtSqlEasyFilter.moc"
 #include <tqtable.h>
 #include <tqscrollview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 2f0c1a73..538e36a6 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <tqsqldatabase.h>
 #include <tqguardedptr.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /******************************************************************
  *
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index c9b24ac3..29264c4e 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -21,7 +21,7 @@
 #define _SERIALLETTER_QtSql_POWER_PLUGIN_H_
 
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <tqsqldatabase.h>
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 2b3f711d..65534802 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -21,7 +21,7 @@
 #include "KWQtSqlSerialDataSource.moc"
 #include "KWQtSqlEasyFilter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqsqlcursor.h>
 #include <tqdatatable.h>
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 41e971be..22cde06d 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -32,7 +32,7 @@
 #include <tqsqlcursor.h>
 #include <tqdatatable.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>