Rename additional header files to avoid conflicts with KDE4

96 files changed, 137 insertions, 137 deletions

diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index e8d4d0d6b..ce8071c6a 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -31,7 +31,7 @@
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index efdb061a8..fd0630ecf 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -28,8 +28,8 @@ extern "C" {
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <KoDocumentInfo.h>
 
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index 5b4b56a05..9a44ed975 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -30,7 +30,7 @@
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 
diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp
index 33d9ec606..70e30a4a6 100644
--- a/filters/chalk/openexr/kis_openexr_export.cpp
+++ b/filters/chalk/openexr/kis_openexr_export.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <half.h>
 #include <ImfRgbaFile.h>
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index 795eb92e0..3956b640b 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -25,8 +25,8 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <KoDocumentInfo.h>
 
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index 1af33fd7c..873fdf2be 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -40,14 +40,14 @@
 #include <tqprogressdialog.h>
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kgenericfactory.h>
 #include <kdialogbase.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 
 #include <KoDocument.h>
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index becda194c..70e679387 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_wdg_options_tiff.h"
 
diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
index da399a53e..94f558240 100644
--- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
+++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
@@ -19,8 +19,8 @@
 
 #include "kis_tiff_writer_visitor.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <kis_annotation.h>
 #include <kis_colorspace.h>
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc
index e56646960..112c29d1c 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cc
@@ -25,11 +25,11 @@
 #include <kdebug.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "generic_filter.h"
 
diff --git a/filters/karbon/ai/ai88handler.cc b/filters/karbon/ai/ai88handler.cc
index 7b5019be6..87a937ae9 100644
--- a/filters/karbon/ai/ai88handler.cc
+++ b/filters/karbon/ai/ai88handler.cc
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "ai88handler.h"
 
 AI88Handler::AI88Handler(AIParserBase *delegate){
diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cc
index 220dbebaf..4bf4aec7e 100644
--- a/filters/karbon/eps/epsexportdlg.cc
+++ b/filters/karbon/eps/epsexportdlg.cc
@@ -23,7 +23,7 @@
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "epsexportdlg.h"
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc
index e25889c0b..bd272271e 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cc
@@ -21,7 +21,7 @@ DESCRIPTION
 */
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmimetype.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>
diff --git a/filters/kchart/bmp/bmpexport.cpp b/filters/kchart/bmp/bmpexport.cpp
index 5f00bb5e2..e0c69c30e 100644
--- a/filters/kchart/bmp/bmpexport.cpp
+++ b/filters/kchart/bmp/bmpexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/jpeg/jpegexport.cpp b/filters/kchart/jpeg/jpegexport.cpp
index 7d2bcec01..46bc5900b 100644
--- a/filters/kchart/jpeg/jpegexport.cpp
+++ b/filters/kchart/jpeg/jpegexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp
index faff17ff2..f2143c498 100644
--- a/filters/kchart/libimageexport/imageexport.cpp
+++ b/filters/kchart/libimageexport/imageexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/mng/mngexport.cpp b/filters/kchart/mng/mngexport.cpp
index e23e870c9..f7dfbe7c0 100644
--- a/filters/kchart/mng/mngexport.cpp
+++ b/filters/kchart/mng/mngexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/png/pngexport.cpp b/filters/kchart/png/pngexport.cpp
index 456ca8870..380cc4631 100644
--- a/filters/kchart/png/pngexport.cpp
+++ b/filters/kchart/png/pngexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc
index 1507f5369..062ccd9b0 100644
--- a/filters/kchart/svg/svgexport.cc
+++ b/filters/kchart/svg/svgexport.cc
@@ -20,7 +20,7 @@
 #include <tqpicture.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/xbm/xbmexport.cpp b/filters/kchart/xbm/xbmexport.cpp
index a0acd6485..29a117437 100644
--- a/filters/kchart/xbm/xbmexport.cpp
+++ b/filters/kchart/xbm/xbmexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kchart/xpm/xpmexport.cpp b/filters/kchart/xpm/xpmexport.cpp
index da5832d08..bde51290d 100644
--- a/filters/kchart/xpm/xpmexport.cpp
+++ b/filters/kchart/xpm/xpmexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc
index 589c1168a..d47e36bd3 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cc
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStoreDevice.h>
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc
index 5f4735a11..37951d2de 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cc
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStoreDevice.h>
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index 42143fa5e..b8fa07ed4 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -20,9 +20,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <KoFilterChain.h>
 
 #include <tqtextcodec.h>
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc
index ec605aff6..47b0d316f 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cc
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index 490787a8a..938fed782 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -29,8 +29,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kformulacontainer.h>
 #include <kformuladocument.h>
diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc
index e63aca887..35896ac1b 100644
--- a/filters/kformula/svg/svgexport.cc
+++ b/filters/kformula/svg/svgexport.cc
@@ -22,7 +22,7 @@
 #include <tqpainter.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp
index 93e37f6eb..0c977398f 100644
--- a/filters/kivio/imageexport/kivio_imageexport.cpp
+++ b/filters/kivio/imageexport/kivio_imageexport.cpp
@@ -27,8 +27,8 @@
 #include <tqsize.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
index 957bda633..1ed8fc0d2 100644
--- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp
+++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "kivio_imageexportwidget.h"
diff --git a/filters/kpresenter/bmp/bmpexport.cpp b/filters/kpresenter/bmp/bmpexport.cpp
index f7351a104..40edc1005 100644
--- a/filters/kpresenter/bmp/bmpexport.cpp
+++ b/filters/kpresenter/bmp/bmpexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/jpeg/jpegexport.cpp b/filters/kpresenter/jpeg/jpegexport.cpp
index 527111881..720d8244d 100644
--- a/filters/kpresenter/jpeg/jpegexport.cpp
+++ b/filters/kpresenter/jpeg/jpegexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc
index 8dd96c5fa..fc0f50cd0 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cc
@@ -24,7 +24,7 @@
 #include <KoFilterChain.h>
 #include <KoGlobal.h>
 #include <kprkword.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqsortedlist.h>
 #include <tqcolor.h>
diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp
index c4ceb2438..e203ca990 100644
--- a/filters/kpresenter/libimageexport/imageexport.cpp
+++ b/filters/kpresenter/libimageexport/imageexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/mng/mngexport.cpp b/filters/kpresenter/mng/mngexport.cpp
index 67ff47d50..d5de30d3d 100644
--- a/filters/kpresenter/mng/mngexport.cpp
+++ b/filters/kpresenter/mng/mngexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/png/pngexport.cpp b/filters/kpresenter/png/pngexport.cpp
index 8bb6b0546..cbece8f1a 100644
--- a/filters/kpresenter/png/pngexport.cpp
+++ b/filters/kpresenter/png/pngexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc
index 9eae5cd8e..5b6ed8928 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cc
@@ -21,7 +21,7 @@
 #include <tqpicture.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/xbm/xbmexport.cpp b/filters/kpresenter/xbm/xbmexport.cpp
index 16a0818a8..782dac96b 100644
--- a/filters/kpresenter/xbm/xbmexport.cpp
+++ b/filters/kpresenter/xbm/xbmexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kpresenter/xpm/xpmexport.cpp b/filters/kpresenter/xpm/xpmexport.cpp
index 87097f5f0..013f94599 100644
--- a/filters/kpresenter/xpm/xpmexport.cpp
+++ b/filters/kpresenter/xpm/xpmexport.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoFilterChain.h>
 #include <KoStore.h>
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index d4173bd32..1e721d165 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -36,9 +36,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 
 CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/)
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index c7a3b6c04..ceeb8b5ec 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -24,7 +24,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>
 #include <KoFilterManager.h>
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index c136fd91f..ebf1523ee 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -40,10 +40,10 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 
 using namespace KSpread;
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index f5c4262a1..72cadfa2b 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc
index 6121baaff..001b35a20 100644
--- a/filters/kspread/dbase/dbaseimport.cc
+++ b/filters/kspread/dbase/dbaseimport.cc
@@ -37,7 +37,7 @@
 #include <KoGlobal.h>
 #include <KoUnit.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 typedef KGenericFactory<DBaseImport, KoFilter> DBaseImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libdbaseimport, DBaseImportFactory( "kofficefilters" ) )
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index 05a57be69..28f5453e9 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -24,7 +24,7 @@
 #include <gnumericexport.h>
 #include <kdebug.h>
 #include <kfilterdev.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>
 #include <tqapplication.h>
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index 665a61610..856a84911 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 
 #include <gnumericimport.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kfilterdev.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index cff62773f..8df7e0ce2 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -25,8 +25,8 @@
 #include <tqtextcodec.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <exportdialog.h>
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc
index 0c0255252..6100dabe3 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -50,8 +50,8 @@
 
 //KDE Includes
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <tqcolor.h>
 
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc
index 090b4de1b..0e15acbe7 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc
@@ -30,14 +30,14 @@
 
 //KDE Includes
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <kcombobox.h>
 #include <tqradiobutton.h>
 #include <tqtextedit.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //Kexi Includes
 #include <kexidb/global.h>
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 6a53ee95a..b088afe14 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -27,12 +27,12 @@
 #include <tqcheckbox.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index c303a59ea..d9ebd7946 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 #include "kspreadlatexexportdiaImpl.h"
 
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index f092d6b15..2db60420f 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -31,10 +31,10 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <KoDocumentInfo.h>
 #include <KoFilterChain.h>
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 08ccaca7e..6dc3216ed 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <KoDocumentInfo.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <KoFilterChain.h>
 #include <KoGlobal.h>
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index ec4793d06..e282a7698 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>
 
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc
index 5e875ecd0..e9474364f 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cc
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ImportField.h"
 
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index ac432855f..1a023c8e5 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -19,7 +19,7 @@
 
 #include <tqfontinfo.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 #include <KoGlobal.h>
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index aec3373f8..bd6ea1e38 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -34,7 +34,7 @@
 #include <kmdcodec.h>
 #include <kfilterdev.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoPageLayout.h>
 #include <KoStore.h>
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index eb408d175..577fb72b9 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -23,12 +23,12 @@
 #include <tqbuttongroup.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <ExportDialogUI.h>
 #include <ExportDialog.h>
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index 45eaf0bfb..09c81a090 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -22,13 +22,13 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <ImportDialogUI.h>
 #include <ImportDialog.h>
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index c3d17203b..b7c4c0f5e 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -35,7 +35,7 @@
 #include <tqfontinfo.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 
 #include <KoGlobal.h>
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index 8199f173d..d222d7df4 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -22,7 +22,7 @@
 #include <tqtextcodec.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <KWEFBaseWorker.h>
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index faacff642..2388477c3 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -22,7 +22,7 @@
 #include <tqtextcodec.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <KWEFUtil.h>
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index e52f85c5a..5fc3fdc59 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -20,13 +20,13 @@
 
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqradiobutton.h>
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc
index 969ccd40b..eccdead1d 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cc
@@ -22,7 +22,7 @@
 #include <tqtextcodec.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <KWEFBaseWorker.h>
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index 05892740d..96f0b6c5b 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -25,7 +25,7 @@
 #include <tqdir.h>
 #include <tqpicture.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <KWEFUtil.h>
diff --git a/filters/kword/kword1.3/import/kword13document.cpp b/filters/kword/kword1.3/import/kword13document.cpp
index db75a02f4..747d88a4c 100644
--- a/filters/kword/kword1.3/import/kword13document.cpp
+++ b/filters/kword/kword1.3/import/kword13document.cpp
@@ -21,7 +21,7 @@
 #include <tqiodevice.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "kword13utils.h"
 #include "kword13layout.h"
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 47eed1e7d..9e10ad9cc 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kimageio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <KoFilterChain.h>
 #include <KoStoreDevice.h>
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index 7f246cad8..cc28136ae 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -25,7 +25,7 @@
 #include <tqimage.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmimetype.h>
 
 #include <kofficeversion.h>
diff --git a/filters/kword/kword1.3/import/kword13picture.cpp b/filters/kword/kword1.3/import/kword13picture.cpp
index c94d1e342..1fa6af723 100644
--- a/filters/kword/kword1.3/import/kword13picture.cpp
+++ b/filters/kword/kword1.3/import/kword13picture.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <KoStore.h>
 #include <KoStoreDevice.h>
diff --git a/filters/kword/latex/export/document.cc b/filters/kword/latex/export/document.cc
index 410e7b7f9..13d40415f 100644
--- a/filters/kword/latex/export/document.cc
+++ b/filters/kword/latex/export/document.cc
@@ -22,7 +22,7 @@
 #include <stdlib.h>		/* for atoi function    */
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <KoStore.h>
 
 #include <tqdir.h>
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index a0da3ee46..3498bcdb9 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -27,12 +27,12 @@
 #include <tqcheckbox.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc
index 083f23755..fed29704f 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cc
@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 #include "kwordlatexexportdia.h"
 
diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cc
index b67a73855..17c00b7d9 100644
--- a/filters/kword/latex/export/texlauncher.cc
+++ b/filters/kword/latex/export/texlauncher.cc
@@ -2,8 +2,8 @@
 #include "xml2latexparser.h"
 //#include "texgraphexport.h"
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <KoFilter.h>
 #include <KoStore.h>
 #include<tqtextstream.h>
diff --git a/filters/kword/latex/import/generator/kwordgenerator.cc b/filters/kword/latex/import/generator/kwordgenerator.cc
index 0b0e7aa31..945c3869b 100644
--- a/filters/kword/latex/import/generator/kwordgenerator.cc
+++ b/filters/kword/latex/import/generator/kwordgenerator.cc
@@ -18,7 +18,7 @@
  */
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqfile.h>
 
 #include <tqdom.h>
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc
index 00f069cf2..5bea13ccb 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cc
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 #include "lateximportdia.h"
 
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index 6a8d201b8..c69b7e901 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cc
@@ -36,7 +36,7 @@
 #include <lateximportdia.h>
 #include <lateximportdia.moc>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqptrlist.h>
 
 #include "latexparser.h"
diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h
index 360bfd8ce..1d8a3e57e 100644
--- a/filters/kword/latex/import/lateximportdia.h
+++ b/filters/kword/latex/import/lateximportdia.h
@@ -41,7 +41,7 @@
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopobject.h>
 
 #include <kdialogbase.h>
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index a3fca243f..b0a7913d8 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -37,8 +37,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <KoGlobal.h>
 #include <KoStore.h>
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 595c026cb..01b4813de 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQColor Conversion::color(int number, int defaultcolor, bool defaultWhite)
 {
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index ab70c79a4..043c1bc24 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -35,7 +35,7 @@
 #include <wv2/parserfactory.h>
 #include <wv2/paragraphproperties.h>
 #include <wv2/associatedstrings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoStore.h>
 #include <KoFilterChain.h>
 
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 242a6d392..775f8bce8 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -32,7 +32,7 @@
 #include <tqfont.h>
 #include <tqfontinfo.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 wvWare::U8 KWordReplacementHandler::hardLineBreak()
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index 004b5cc3c..cb9834913 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -20,9 +20,9 @@
 
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 73acf7414..216ace492 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -37,7 +37,7 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kzip.h>
 
 #include <KoPageLayout.h>
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc
index 22d9fed5d..259d97b5b 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cc
@@ -1,6 +1,6 @@
 #include "conversion.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQString Conversion::importAlignment( const TQString& align )
 {
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 6bd88ec9b..5e54ce06f 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -37,7 +37,7 @@
 #include <KoDocument.h>
 
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <KoFilterChain.h>
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 14d3d384a..0bd5a5a13 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -21,7 +21,7 @@
 
 #include <math.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "data.h"
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index 3236aa399..25a09f856 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -19,9 +19,9 @@
 
 #include "data.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 using namespace PDFImport;
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index 013d4cb3a..1513208d9 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp
index c8ecabcbe..c681ff013 100644
--- a/filters/kword/pdf/fstring.cpp
+++ b/filters/kword/pdf/fstring.cpp
@@ -19,7 +19,7 @@
 
 #include "fstring.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "data.h"
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 3cd0e1bfb..b2b2f1413 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <tqfontmetrics.h>
 #include <tqfontdatabase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "Link.h"
diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp
index 80ec92d08..b50e590ff 100644
--- a/filters/kword/pdf/pdfdocument.cpp
+++ b/filters/kword/pdf/pdfdocument.cpp
@@ -22,7 +22,7 @@
 #include <math.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "GlobalParams.h"
 #include "PDFDoc.h"
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 14dce1e26..eba2b645d 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -32,8 +32,8 @@
 #include <tqcolor.h>
 #include <tqdatetime.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <KWEFUtil.h>
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index eb8c467de..4b8d7e1bf 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -28,7 +28,7 @@
 #include <tqvaluelist.h>
 
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoPicture.h>
 #include <KoFilterManager.h>
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index 3cd6a01dc..a4a152175 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -29,8 +29,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include "exportsizedia.h"
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index 99879f285..ae0395a94 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -26,7 +26,7 @@ DESCRIPTION
 #include <olefilter.h>
 
 #include <tqfile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kgenericfactory.h>
 #include <kmimetype.h>
 #include <KoFilterChain.h>
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index be32e432c..bf141f903 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -25,13 +25,13 @@
 #include <tqcombobox.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <KoFilterManager.h>
diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc
index ee3fdf705..24dfb5477 100644
--- a/filters/xsltfilter/import/xsltimport.cc
+++ b/filters/xsltfilter/import/xsltimport.cc
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 #include "xsltimportdia.h"
 
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index a29638e6f..9052e4ecc 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -28,12 +28,12 @@
 #include <tqdir.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tderecentdocument.h>
 #include <KoFilterManager.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include <xsltproc.h>