Rename additional header files to avoid conflicts with KDE4

40 files changed, 68 insertions, 68 deletions

diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h
index 53e8365e3..f85a74c6e 100644
--- a/kpresenter/KPrAboutData.h
+++ b/kpresenter/KPrAboutData.h
@@ -21,7 +21,7 @@
 #define KPRESENTER_ABOUTDATA
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kofficeversion.h>
 
 static const char* description=I18N_NOOP("KOffice Presentation Tool");
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index a6985239a..dd4078e62 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -35,7 +35,7 @@
 #include <tqdatetime.h>
 
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kbuttonbox.h>
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index 4b09382a4..177553d16 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 using namespace std;
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <KoStore.h>
 #include <KoStoreDevice.h>
 #include <KoGenStyles.h>
diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp
index 0493c64d6..11358ba5d 100644
--- a/kpresenter/KPrBgSpellCheck.cpp
+++ b/kpresenter/KPrBgSpellCheck.cpp
@@ -32,7 +32,7 @@ using namespace KSpell2;
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc)
     : KoBgSpellCheck(Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ), _doc )
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 7734835ad..7b7312d09 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -29,7 +29,7 @@
 #include <tqwhatsthis.h>
 #include <tqwidgetstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index f98ddb0f9..0c119b806 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -40,15 +40,15 @@
 
 #include <tdeapplication.h>
 #include <kmimemagic.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kprinter.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemultipledrag.h>
 #include <tdeconfig.h>
 #include <kurl.h>
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 23b121a25..fde8efbf0 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeapplication.h>
 #include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
@@ -67,7 +67,7 @@
 #include <tdefontdialog.h>
 #include <klineedit.h>
 #include <KoRect.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeversion.h>
 #include <kurlrequesterdlg.h>
 #include <tdelistview.h>
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 61eebe235..175dfc936 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -26,8 +26,8 @@
 #include <tqapplication.h>
 #include <tqlayout.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "KPrPage.h"
 #include "KPrDocument.h"
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 098c7eb07..c914b094c 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -57,12 +57,12 @@
 #include <KoGlobal.h>
 #include <tdeapplication.h>
 #include <kurldrag.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tdeio/netaccess.h>
 
@@ -99,7 +99,7 @@
 #include "KPrBackground.h"
 #include "KPrNoteBar.h"
 #include "KPrBgSpellCheck.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <KoCommandHistory.h>
 #include "KoApplication.h"
 #include <KoOasisStyles.h>
diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp
index 0b0c7646f..fe2283b2b 100644
--- a/kpresenter/KPrDuplicateObjDia.cpp
+++ b/kpresenter/KPrDuplicateObjDia.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index b65b724b5..955d249b7 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -39,8 +39,8 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kbuttonbox.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp
index 75671e286..a0e9965a6 100644
--- a/kpresenter/KPrGeneralProperty.cpp
+++ b/kpresenter/KPrGeneralProperty.cpp
@@ -26,7 +26,7 @@
 #include <tqlineedit.h>
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoUnitWidgets.h>
 
 #include <KoGeneralPropertyUi.h>
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index c170f1597..0caacc289 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "KPrDocument.h"
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index 078a39189..9f6985e76 100644
--- a/kpresenter/KPrImageEffectDia.cpp
+++ b/kpresenter/KPrImageEffectDia.cpp
@@ -26,7 +26,7 @@
 #include <tqimage.h>
 
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
 
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index 1cd4d9ff7..fec859672 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -18,14 +18,14 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "KPrDocument.h"
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "KPrImportStyleDia.h"
 #include <KoStore.h>
 #include <tqfile.h>
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index f362f03d2..3f9687682 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -31,7 +31,7 @@
 #include "KPrPage.h"
 
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqdir.h>
 #include <tqframe.h>
@@ -48,11 +48,11 @@
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index 532fbb6e2..e4fe30e29 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "marginui.h"
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index ba07c8b69..35d8bcd0d 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index 80b935520..9548d259c 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -25,11 +25,11 @@
 #include <tqsimplerichtext.h>
 #include <tqlabel.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kprinter.h>
 #include <kdebug.h>
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "KPrNoteBar.h"
 #include "KPrView.h"
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index 7b39be509..99d450099 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -29,7 +29,7 @@
 
 #include "KPrGradient.h"
 #include "KoPointArray.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoPoint.h>
 #include <KoSize.h>
 #include <KoRect.h>
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 81c5a412f..fc57515d9 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -60,7 +60,7 @@
 #include <KoVariable.h>
 #include <KoGenStyles.h>
 #include <KoXmlWriter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqbuffer.h>
 #include <tqregexp.h>
 #include <tqfile.h>
diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp
index 753b184ad..37f4cab7d 100644
--- a/kpresenter/KPrPenStyleWidget.cpp
+++ b/kpresenter/KPrPenStyleWidget.cpp
@@ -29,7 +29,7 @@
 
 #include <kcolorbutton.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 
diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp
index fa51abf42..1a7b3079d 100644
--- a/kpresenter/KPrPgConfDia.cpp
+++ b/kpresenter/KPrPgConfDia.cpp
@@ -42,8 +42,8 @@
 #include <tqwhatsthis.h>
 
 #include <kcolorbutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tqslider.h>
 
diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp
index 7c7e788a1..dbb30557b 100644
--- a/kpresenter/KPrPieProperty.cpp
+++ b/kpresenter/KPrPieProperty.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "global.h"
diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp
index 4d8cf1555..40cc785a5 100644
--- a/kpresenter/KPrPolygonProperty.cpp
+++ b/kpresenter/KPrPolygonProperty.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "polygonpropertyui.h"
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index aae5659ef..679362665 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tdelistview.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name,
                                       KPrDocument *_doc, TQStringList _durationListString,
diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index cf496a153..284b2eede 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -26,7 +26,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 
 // local includes
diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp
index 80681763e..841b68412 100644
--- a/kpresenter/KPrPropertyEditor.cpp
+++ b/kpresenter/KPrPropertyEditor.cpp
@@ -33,7 +33,7 @@
 #include "KPrTextProperty.h"
 #include "KPrObjectProperties.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPage *page, KPrDocument *doc )
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index 3e28c7483..e6521ed77 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -26,7 +26,7 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "KPrRotationDialogImpl.h"
diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp
index e46e80fdb..d27306659 100644
--- a/kpresenter/KPrShadowDialogImpl.cpp
+++ b/kpresenter/KPrShadowDialogImpl.cpp
@@ -5,7 +5,7 @@
 #include <tqbuttongroup.h>
 
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "KPrShadowDialogImpl.h"
 #include "KPrTextPreview.h"
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index 00ee81395..96783d8d0 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -30,8 +30,8 @@
 #include <tqtooltip.h>
 
 #include <kwordwrap.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 #include <knotifyclient.h>
 #include <kiconview.h>
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 88d1c9aca..8dd46db54 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -22,7 +22,7 @@
 #include "KPrSlideTransitionDia.h"
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 35961bab9..2d02f6ccd 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -42,8 +42,8 @@
 #include "KPrTextObjectIface.h"
 #include <KoOasisContext.h>
 #include <KoStyleStack.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdemultipledrag.h>
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index a0610cec7..c69c39a16 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "KPrMarginWidget.h"
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index b4f9d144c..aeee98bc8 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -47,7 +47,7 @@
 
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kurl.h>
diff --git a/kpresenter/KPrVariableCollection.cpp b/kpresenter/KPrVariableCollection.cpp
index d7312e756..50be1efad 100644
--- a/kpresenter/KPrVariableCollection.cpp
+++ b/kpresenter/KPrVariableCollection.cpp
@@ -22,7 +22,7 @@
 #include <KoVariable.h>
 #include "KPrDocument.h"
 #include "KPrCommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <KoXmlNS.h>
 #include <KoDom.h>
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 6f2e23588..583b7af74 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -20,7 +20,7 @@
 
 #include <kprinter.h>
 #include <tdeaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqpainter.h>
 #include <tqscrollbar.h>
 #include <tqpopupmenu.h>
@@ -65,7 +65,7 @@
 
 #include <dcopclient.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
@@ -76,15 +76,15 @@
 #include "KPrMSPresentationSetup.h"
 #include "KPrTextObject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
 #include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
 #include <tdeparts/event.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kcolorbutton.h>
 #include <kprocess.h>
 
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 6f93acbab..90053b31c 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -30,7 +30,7 @@
 #include <kstandarddirs.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
@@ -54,16 +54,16 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kbuttonbox.h>
 #include <ksimpleconfig.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kcharsets.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index 9c4e2e5e8..3e8543c94 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -26,7 +26,7 @@
 #include <tqdir.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kpresenter/main.cpp b/kpresenter/main.cpp
index 4113d3411..b3ab9ec8c 100644
--- a/kpresenter/main.cpp
+++ b/kpresenter/main.cpp
@@ -23,7 +23,7 @@
 
 #include <dcopclient.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 static const TDECmdLineOptions options[]=