From 3971704ec5b8fc81d1a94a4e664c153fc0f2cdaa Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 25 Feb 2025 22:49:43 +0900
Subject: Use tdestandarddirs.h

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 akregator/src/akregator_part.cpp                        | 2 +-
 akregator/src/akregator_view.cpp                        | 2 +-
 akregator/src/articlelistview.cpp                       | 2 +-
 akregator/src/articleviewer.cpp                         | 2 +-
 akregator/src/feed.cpp                                  | 2 +-
 akregator/src/feediconmanager.cpp                       | 2 +-
 akregator/src/mainwindow.cpp                            | 2 +-
 akregator/src/mk4storage/feedstoragemk4impl.cpp         | 2 +-
 akregator/src/mk4storage/storagemk4impl.cpp             | 2 +-
 akregator/src/pageviewer.cpp                            | 2 +-
 akregator/src/searchbar.cpp                             | 2 +-
 certmanager/certmanager.cpp                             | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmebackend.cpp       | 2 +-
 certmanager/lib/backends/qgpgme/qgpgmejob.cpp           | 2 +-
 kaddressbook/addresseeeditorwidget.cpp                  | 2 +-
 kaddressbook/advancedcustomfields.cpp                   | 2 +-
 kaddressbook/freebusywidget.cpp                         | 2 +-
 kaddressbook/geowidget.cpp                              | 2 +-
 kaddressbook/kabcore.cpp                                | 2 +-
 kaddressbook/kcmconfigs/kcmkabcustomfields.cpp          | 2 +-
 kaddressbook/printing/detailledstyle.cpp                | 2 +-
 kaddressbook/printing/printstyle.cpp                    | 2 +-
 kaddressbook/thumbnailcreator/ldifvcardcreator.cpp      | 2 +-
 kaddressbook/xxport/bookmark_xxport.cpp                 | 2 +-
 kaddressbook/xxport/csvimportdialog.cpp                 | 2 +-
 kaddressbook/xxport/kde2_xxport.cpp                     | 2 +-
 kaddressbook/xxport/pab_xxport.cpp                      | 2 +-
 kalarm/alarmcalendar.cpp                                | 2 +-
 kalarm/daemon.cpp                                       | 2 +-
 kalarm/editdlg.cpp                                      | 2 +-
 kalarm/kalarmapp.cpp                                    | 2 +-
 kalarm/kalarmd/adconfigdata.cpp                         | 2 +-
 kalarm/kalarmd/alarmdaemon.cpp                          | 2 +-
 kalarm/kamail.cpp                                       | 2 +-
 kalarm/messagewin.cpp                                   | 2 +-
 kalarm/prefdlg.cpp                                      | 2 +-
 kalarm/preferences.cpp                                  | 2 +-
 kalarm/sounddlg.cpp                                     | 2 +-
 kalarm/soundpicker.cpp                                  | 2 +-
 kalarm/traywindow.cpp                                   | 2 +-
 kandy/src/kandy.cpp                                     | 2 +-
 kandy/src/kandyprefsdialog.cpp                          | 2 +-
 kandy/src/mobilemain.cpp                                | 2 +-
 karm/preferences.cpp                                    | 2 +-
 kmail/actionscheduler.cpp                               | 2 +-
 kmail/configuredialog.cpp                               | 2 +-
 kmail/configuredialog_p.cpp                             | 2 +-
 kmail/headerstyle.cpp                                   | 2 +-
 kmail/kmacctcachedimap.cpp                              | 2 +-
 kmail/kmcommands.cpp                                    | 2 +-
 kmail/kmcomposewin.cpp                                  | 2 +-
 kmail/kmfawidgets.cpp                                   | 2 +-
 kmail/kmfoldercachedimap.h                              | 2 +-
 kmail/kmfolderdir.cpp                                   | 2 +-
 kmail/kmfolderimap.h                                    | 2 +-
 kmail/kmkernel.cpp                                      | 2 +-
 kmail/kmmainwidget.cpp                                  | 2 +-
 kmail/kmreaderwin.cpp                                   | 2 +-
 kmail/kmstartup.cpp                                     | 2 +-
 kmail/objecttreeparser.cpp                              | 2 +-
 kmail/popaccount.cpp                                    | 2 +-
 kmail/urlhandlermanager.cpp                             | 2 +-
 kmailcvt/kimportpage.cpp                                | 2 +-
 kmailcvt/kselfilterpage.cpp                             | 2 +-
 kmobile/devices/gnokii/gnokii_mobile.cpp                | 2 +-
 kmobile/devices/skeleton/skeleton.cpp                   | 2 +-
 kmobile/kmobile.cpp                                     | 2 +-
 kmobile/kmobiledevice.cpp                               | 2 +-
 knode/articlewidget.cpp                                 | 2 +-
 knode/knaccountmanager.cpp                              | 2 +-
 knode/knarticlefilter.cpp                               | 2 +-
 knode/knconfig.cpp                                      | 2 +-
 knode/knconvert.cpp                                     | 2 +-
 knode/knfiltermanager.cpp                               | 2 +-
 knode/knfolder.cpp                                      | 2 +-
 knode/knfoldermanager.cpp                               | 2 +-
 knode/knnntpaccount.cpp                                 | 2 +-
 knotes/knote.cpp                                        | 2 +-
 knotes/knotehostdlg.cpp                                 | 2 +-
 knotes/knotesapp.cpp                                    | 2 +-
 knotes/knoteslegacy.cpp                                 | 2 +-
 knotes/resourcelocal.cpp                                | 2 +-
 kode/kodemain.cpp                                       | 2 +-
 kode/kxml_compiler/creator.cpp                          | 2 +-
 kode/kxml_compiler/creator.h                            | 2 +-
 kode/kxml_compiler/kxml_compiler.cpp                    | 2 +-
 kode/kxml_compiler/parser.cpp                           | 2 +-
 kode/kxml_compiler/parser.h                             | 2 +-
 konsolekalendar/konsolekalendaradd.cpp                  | 2 +-
 konsolekalendar/konsolekalendarvariables.cpp            | 2 +-
 konsolekalendar/main.cpp                                | 2 +-
 konsolekalendar/stdcalendar.cpp                         | 2 +-
 kontact/plugins/kmail/kmail_plugin.cpp                  | 2 +-
 kontact/plugins/knotes/summarywidget.cpp                | 2 +-
 kontact/plugins/korganizer/korganizerplugin.cpp         | 2 +-
 kontact/plugins/korganizer/summarywidget.cpp            | 2 +-
 kontact/plugins/korganizer/todosummarywidget.cpp        | 2 +-
 kontact/plugins/specialdates/sdsummarywidget.cpp        | 2 +-
 kontact/plugins/summary/summaryview_part.cpp            | 2 +-
 kontact/src/main.cpp                                    | 2 +-
 kontact/src/mainwindow.cpp                              | 2 +-
 kontact/src/profilemanager.cpp                          | 2 +-
 korganizer/actionmanager.cpp                            | 2 +-
 korganizer/calendarview.cpp                             | 2 +-
 korganizer/docprefs.cpp                                 | 2 +-
 korganizer/exportwebdialog.cpp                          | 2 +-
 korganizer/freebusymanager.cpp                          | 2 +-
 korganizer/freebusyurldialog.cpp                        | 2 +-
 korganizer/koagendaview.cpp                             | 2 +-
 korganizer/kocore.cpp                                   | 2 +-
 korganizer/koeditorgeneral.cpp                          | 2 +-
 korganizer/koeditorgeneralevent.cpp                     | 2 +-
 korganizer/koeditorgeneraltodo.cpp                      | 2 +-
 korganizer/koglobals.cpp                                | 2 +-
 korganizer/kogroupware.cpp                              | 2 +-
 korganizer/koincidenceeditor.cpp                        | 2 +-
 korganizer/komailclient.cpp                             | 2 +-
 korganizer/koprefsdialog.cpp                            | 2 +-
 korganizer/korgac/alarmdockwindow.cpp                   | 2 +-
 korganizer/korgac/koalarmclient.cpp                     | 2 +-
 korganizer/korgac/testalarmdlg.cpp                      | 2 +-
 korganizer/korganizer.cpp                               | 2 +-
 korganizer/korganizer_part.cpp                          | 2 +-
 korganizer/mailscheduler.cpp                            | 2 +-
 korganizer/plugins/datenums/configdialog.cpp            | 2 +-
 korganizer/plugins/datenums/datenums.cpp                | 2 +-
 korganizer/plugins/exchange/exchange.cpp                | 2 +-
 korganizer/plugins/exchange/exchangedialog.cpp          | 2 +-
 korganizer/plugins/hebrew/configdialog.cpp              | 2 +-
 korganizer/plugins/hebrew/hebrew.cpp                    | 2 +-
 korganizer/plugins/projectview/koprojectview.cpp        | 2 +-
 korganizer/plugins/projectview/projectview.cpp          | 2 +-
 korganizer/plugins/timespanview/kotimespanview.cpp      | 2 +-
 korganizer/plugins/timespanview/timespanview.cpp        | 2 +-
 korganizer/previewdialog.cpp                            | 2 +-
 korganizer/stdcalendar.cpp                              | 2 +-
 ktnef/gui/ktnefmain.cpp                                 | 2 +-
 libemailfunctions/idmapper.cpp                          | 2 +-
 libkcal/calendarresources.cpp                           | 2 +-
 libkcal/convertqtopia.cpp                               | 2 +-
 libkcal/dummyscheduler.cpp                              | 2 +-
 libkcal/freebusyurlstore.cpp                            | 2 +-
 libkcal/resourcecached.cpp                              | 2 +-
 libkcal/resourcelocal.cpp                               | 2 +-
 libkcal/resourcelocalconfig.cpp                         | 2 +-
 libkcal/resourcelocaldir.cpp                            | 2 +-
 libkcal/resourcelocaldirconfig.cpp                      | 2 +-
 libkcal/scheduler.cpp                                   | 2 +-
 libkholidays/kholidays.cpp                              | 2 +-
 libkpimexchange/core/exchangedownload.cpp               | 2 +-
 libkpimexchange/core/exchangeprogress.cpp               | 2 +-
 libtdepim/addresseelineedit.cpp                         | 2 +-
 libtdepim/addressesdialog.cpp                           | 2 +-
 libtdepim/alarmclient.cpp                               | 2 +-
 libtdepim/cfgc/autoexample.cpp                          | 2 +-
 libtdepim/cfgc/example.cpp                              | 2 +-
 libtdepim/designerfields.cpp                            | 2 +-
 libtdepim/kcmdesignerfields.cpp                         | 2 +-
 libtdepim/kimportdialog.cpp                             | 2 +-
 libtdepim/komposer/core/core.cpp                        | 2 +-
 libtdepim/komposer/core/pluginmanager.cpp               | 2 +-
 libtdepim/kpimprefs.cpp                                 | 2 +-
 libtdepim/kscoring.cpp                                  | 2 +-
 libtdepim/ldapclient.cpp                                | 2 +-
 libtdepim/linklocator.cpp                               | 2 +-
 libtdepim/pluginloaderbase.cpp                          | 2 +-
 libtdepim/tdeabcresourcecached.cpp                      | 2 +-
 libtdepim/tdeconfigpropagator.cpp                       | 2 +-
 plugins/kmail/bodypartformatter/text_calendar.cpp       | 2 +-
 plugins/kmail/bodypartformatter/text_xdiff.cpp          | 2 +-
 tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp  | 2 +-
 tderesources/birthdays/resourcetdeabc.cpp               | 2 +-
 tderesources/egroupware/kcal_resourcexmlrpc.cpp         | 2 +-
 tderesources/egroupware/knotes_resourcexmlrpc.cpp       | 2 +-
 tderesources/egroupware/tdeabc_resourcexmlrpc.cpp       | 2 +-
 tderesources/egroupware/todostatemapper.cpp             | 2 +-
 tderesources/exchange/resourceexchangeconfig.cpp        | 2 +-
 tderesources/featureplan/kcal_resourcefeatureplan.cpp   | 2 +-
 tderesources/groupware/kcal_resourcegroupware.cpp       | 2 +-
 tderesources/groupware/kcal_resourcegroupwareconfig.cpp | 2 +-
 tderesources/groupwise/kcal_resourcegroupwise.cpp       | 2 +-
 tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp | 2 +-
 tderesources/kolab/shared/resourcekolabbase.cpp         | 2 +-
 tderesources/remote/resourceremote.cpp                  | 2 +-
 tderesources/remote/resourceremoteconfig.cpp            | 2 +-
 tderesources/scalix/shared/resourcescalixbase.cpp       | 2 +-
 tderesources/slox/kcalresourceslox.cpp                  | 2 +-
 tderesources/slox/kcalresourcesloxconfig.cpp            | 2 +-
 tderesources/slox/sloxaccounts.cpp                      | 2 +-
 tderesources/slox/sloxfoldermanager.cpp                 | 2 +-
 tderesources/slox/tdeabcresourceslox.cpp                | 2 +-
 tderesources/tvanytime/kcal_resourcetvanytime.cpp       | 2 +-
 tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp | 2 +-
 wizards/kmailchanges.cpp                                | 2 +-
 194 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 36afe37c4..0dcf6b91c 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -40,7 +40,7 @@
 #include <knotifydialog.h>
 #include <tdepopupmenu.h>
 #include <kservice.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdaction.h>
 #include <tdetempfile.h>
 #include <ktrader.h>
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index e3b0d4b53..35d55057d 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -79,7 +79,7 @@
 #include <tdeprocess.h>
 #include <krun.h>
 #include <kshell.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 #include <kxmlguifactory.h>
 #include <tdeparts/partmanager.h>
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index 7731c7683..7cbe624f3 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -32,7 +32,7 @@
 #include "treenode.h"
 #include "treenodevisitor.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index cf195cd5c..e2259ad58 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -35,7 +35,7 @@
 #include <tdelocale.h>
 #include <tdeprocess.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kshell.h>
 #include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index 53b38f659..ef54e0823 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -34,7 +34,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "akregatorconfig.h"
 #include "article.h"
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index a6890e2be..39aad70d3 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
 
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 27fa8560f..b236d0017 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -43,7 +43,7 @@
 #include <tdemessagebox.h>
 #include <tdeparts/partmanager.h>
 #include <ksqueezedtextlabel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index 501b8b260..8a4af99ce 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 0331e0f1a..9c504c2f4 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index dfa5de64f..03d8a4db8 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -40,7 +40,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdestdaccel.h>
 #include <tdeparts/browserinterface.h>
 
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index 9e705ec53..a43f8bcda 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqapplication.h>
 #include <tqhbox.h>
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 33960cccb..f74673912 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -80,7 +80,7 @@
 #include <dcopclient.h>
 #include <tdetoolbar.h>
 #include <kstatusbar.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kkeydialog.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index ee4128bfd..86439bb99 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -43,7 +43,7 @@
 #include <gpgmepp/engineinfo.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqstring.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 71fe0b57c..8c378536f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -47,7 +47,7 @@
 #include <gpgmepp/data.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 16489cf2e..d2b79a920 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -47,7 +47,7 @@
 #include <tdemessagebox.h>
 #include <kseparator.h>
 #include <ksqueezedtextlabel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libtdepim/addresseelineedit.h>
 #include <libtdepim/categoryeditdialog.h>
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index 3f4a477db..994a348b2 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -37,7 +37,7 @@
 #include <kdatetimewidget.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libtdepim/designerfields.h>
 
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index f1d11f0b3..bf3472723 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -26,7 +26,7 @@
 
 #include <kdialog.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libkcal/freebusyurlstore.h>
 
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index b364202e1..e1bd2b10c 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqcheckbox.h>
 #include <tqfile.h>
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ace5600d0..00e6cfe5e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -59,7 +59,7 @@
 #include <kprotocolinfo.h>
 #include <kpushbutton.h>
 #include <tderesources/selectdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdguiitem.h>
 #include <kxmlguiclient.h>
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index f3c787a94..ae4209121 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -25,7 +25,7 @@
 
 #include "kabprefs.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqregexp.h>
 
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 73dc515e9..ee702058b 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -35,7 +35,7 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
 #include <kprinter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "ds_appearance.h"
 #include "printingwizard.h"
diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp
index 33ef9ab54..ca3fafb91 100644
--- a/kaddressbook/printing/printstyle.cpp
+++ b/kaddressbook/printing/printstyle.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <tqwidget.h>
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 5c0314c3c..35c05a214 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -39,7 +39,7 @@
 #include <tdeabc/ldifconverter.h>
 #include <tdeabc/vcardconverter.h>
 #include <kpixmapsplitter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 
 #include "ldifvcardcreator.h"
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index f22495268..0ab1bba88 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -27,7 +27,7 @@
 #include <kbookmarkmenu.h>
 #include <kbookmarkdombuilder.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "bookmark_xxport.h"
 
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index b77de93f7..8bcb0ffa1 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -41,7 +41,7 @@
 #include <kinputdialog.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "dateparser.h"
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index e142cde31..6783e4d68 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -29,7 +29,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <kurl.h>
 
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 7a8c271e3..4d890b377 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -30,7 +30,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <kurl.h>
 
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 9379ea07d..1e08590e1 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 1614b8614..264e0a5bd 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqiconset.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdemessagebox.h>
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index a95b35db3..5652ba660 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -49,7 +49,7 @@
 #include <kurlcompletion.h>
 #include <twin.h>
 #include <twinmodule.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <tdeabc/addresseedialog.h>
 #include <kdebug.h>
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index ed367f2e0..c0eb6b557 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -31,7 +31,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <dcopclient.h>
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index b0f7850d8..75179185c 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "adcalendar.h"
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 4f8066610..8759c171b 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -29,7 +29,7 @@
 #include <tqdatetime.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeprocess.h>
 #include <tdeio/netaccess.h>
 #include <dcopclient.h>
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 862160be0..b86b8262d 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdemessagebox.h>
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 5c15fcd6e..4e8c90a8e 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -34,7 +34,7 @@
 #include <tqtextedit.h>
 #include <tqtimer.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaction.h>
 #include <kstdguiitem.h>
 #include <tdeaboutdata.h>
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 59b903dc5..c2d200bd4 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -35,7 +35,7 @@
 
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kshell.h>
 #include <tdemessagebox.h>
 #include <tdeaboutdata.h>
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 8bf67957e..00ff26bb2 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeglobalsettings.h>
 #include <tdemessagebox.h>
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index a94bb6fe8..1ca5db6a3 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #ifdef WITHOUT_ARTS
 #include <kaudioplayer.h>
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index d9e431902..7c58e2062 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -31,7 +31,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #ifndef WITHOUT_ARTS
 #include <arts/kplayobjectfactory.h>
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 77b964d20..5c36bb1b2 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -29,7 +29,7 @@
 #include <tdeaboutdata.h>
 #include <tdepopupmenu.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 #include <tdeaccel.h>
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index cd2e9826f..643ecafae 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -41,7 +41,7 @@
 #include <kurlrequesterdlg.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kedittoolbar.h>
 #include <tdestdaccel.h>
 #include <tdeaction.h>
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index db7781dee..e852ccd65 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -42,7 +42,7 @@
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdefontdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 277ec288d..fd1b0a8f0 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -31,7 +31,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kedittoolbar.h>
 #include <kurldrag.h>
 
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 1663af377..3c04ee8f9 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -12,7 +12,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>          // lineEdit()
 #include <tdelocale.h>            // i18n
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "preferences.h"
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index ec892d002..e5b0bdf5a 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -48,7 +48,7 @@ using KMail::AccountManager;
 
 #include <tqtimer.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 using namespace KMail;
 typedef TQPtrList<KMMsgBase> KMMessageList;
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 822da2c78..2c0d619ef 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -92,7 +92,7 @@ using KMime::DateFormatter;
 #include <kurlrequester.h>
 #include <kseparator.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <knotifydialog.h>
 #include <tdeconfig.h>
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index f244bc8e6..f171830e6 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -21,7 +21,7 @@
 
 // other KDE headers:
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 6ad867a93..8d2890569 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -64,7 +64,7 @@ using namespace KPIM;
 #include <tqapplication.h>
 #include <tqregexp.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 namespace KMail {
 
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 4d07b1526..07c3eb0a1 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -49,7 +49,7 @@ using KMail::AccountManager;
 #include <tdeio/scheduler.h>
 #include <tdeio/slave.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index ed706defc..7f509078d 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -71,7 +71,7 @@
 #include <kprogress.h>
 #include <krun.h>
 #include <kbookmarkmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <tdeimproxy.h>
 #include <kuserprofile.h>
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index f4ead799a..2202deec2 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -103,7 +103,7 @@ using TDERecentAddress::RecentAddresses;
 #include <kuserprofile.h>
 #include <krun.h>
 #include <ktempdir.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 //#include <keditlistbox.h>
 #include "globalsettings.h"
 #include "replyphrases.h"
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 9aad593fc..938995994 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -14,7 +14,7 @@
 #include <kaudioplayer.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqlayout.h>
 #include <tqtooltip.h>
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 1e2af26ec..56e3dc27e 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -33,7 +33,7 @@
 #define kmfoldercachedimap_h
 
 #include <kdialogbase.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqvaluelist.h>
 #include <tqvaluevector.h>
 #include <tqptrlist.h>
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 6d673c4b0..541a8499e 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -13,7 +13,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 //=============================================================================
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 4113350aa..8ca73c294 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -32,7 +32,7 @@
 #include "tdeio/job.h"
 #include "tdeio/global.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqintdict.h>
 #include <tqdict.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 1978e092c..962271e6c 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -60,7 +60,7 @@ using KMail::FolderIface;
 #include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kprogress.h>
 #include <kpassivepopup.h>
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index ec46d773f..b1b1a5bbb 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -36,7 +36,7 @@
 #include <tdefiledialog.h>
 #include <ktip.h>
 #include <knotifydialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <kaddrbook.h>
 #include <tdeaccel.h>
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 09c3701f6..6a73b261d 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -92,7 +92,7 @@ using KMail::TeeHtmlWriter;
 #include <kuserprofile.h>
 #include <kcharsets.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>  // Sven's : for access and getpid
+#include <tdestandarddirs.h>  // Sven's : for access and getpid
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index dd8a43865..827f7eb78 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -25,7 +25,7 @@
 
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <tdecrash.h>
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 3d0593cc3..a93c89c9a 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -91,7 +91,7 @@
 #include <tdeglobal.h>
 #include <tdehtml_part.h>
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 #include <kiconloader.h>
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 97ec2b6c3..12af2bdc3 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -38,7 +38,7 @@ using KPIM::BroadcastStatus;
 #include "accountmanager.h"
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdemainwindow.h>
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 35fef3d6f..927f6a2e7 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -45,7 +45,7 @@
 #include "callback.h"
 #include "stl_util.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 #include <tdeimproxy.h>
 #include <kurl.h>
diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp
index 90da2e9c6..bc6d784d8 100644
--- a/kmailcvt/kimportpage.cpp
+++ b/kmailcvt/kimportpage.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqlabel.h>
 
 #include "kimportpage.h"
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index ef3d95773..732f6719a 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqtextedit.h>
 #include <tqcheckbox.h> 
 #include <tdelocale.h>
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index ceadf2416..68b085c14 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -27,7 +27,7 @@
 
 #include <klibloader.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 1b70016f7..f0744aef0 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -21,7 +21,7 @@
 #include <tqstringlist.h>
 
 #include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 
 #include <tdeio/global.h>
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index c7535f526..3e41e6dd6 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -42,7 +42,7 @@
 
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kmobile.h"
 #include "pref.h"
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index 723946477..4fb07c865 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -31,7 +31,7 @@
 #include <tqfile.h>
 
 #include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include "kmobiledevice.h"
 #include <tdemessagebox.h>
 #include <tdeconfig.h>
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 3419c960d..60ac8e9ae 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -40,7 +40,7 @@
 #include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <kurl.h>
 #include <tdeglobal.h>
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 45c219365..0fcbe0e84 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -20,7 +20,7 @@
 #include <ksimpleconfig.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdewallet.h>
 
 #include "kngroupmanager.h"
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 8a708e29f..69c2acee0 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -12,7 +12,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 052b02ffd..a36c188da 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -23,7 +23,7 @@
 #include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 0b699ee65..dce0df7a0 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -21,7 +21,7 @@
 #include <tdefiledialog.h>
 #include <kseparator.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klineedit.h>
 #include <tdeprocess.h>
 #include <tdeapplication.h>
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index a80853ea4..80e1fdb8b 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -17,7 +17,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 
 #include "utilities.h"
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index ee4449faa..bad20f6b8 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -15,7 +15,7 @@
 #include <tqfileinfo.h>
 
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index 2b6d1cc1b..f4f4a22a2 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -16,7 +16,7 @@
 
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "knglobals.h"
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index c5536c96a..2328a1376 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -13,7 +13,7 @@
 */
 
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "utilities.h"
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 118836bf5..e0ac842a9 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -44,7 +44,7 @@
 #include <kcolordrag.h>
 #include <kiconeffect.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kfind.h>
 #include <tdeprocess.h>
diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp
index 15a32c66d..11abfce13 100644
--- a/knotes/knotehostdlg.cpp
+++ b/knotes/knotehostdlg.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kcombobox.h>
 
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 313b5cea0..e22d4baf7 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -29,7 +29,7 @@
 #include <ksystemtray.h>
 #include <tdelocale.h>
 #include <kiconeffect.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdepopupmenu.h>
 #include <khelpmenu.h>
 #include <kfind.h>
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index fb832a5b8..dd08063e4 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 #include <tdeglobal.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <tdeio/netaccess.h>
 
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index e5d4d6e5e..5f797ef94 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -33,7 +33,7 @@
 
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libkcal/icalformat.h>
 
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index a14d42554..1aada5352 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -34,7 +34,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <ksavefile.h>
 #include <tdeprocess.h>
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index 26eb2e22a..70d2eead8 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -34,7 +34,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h
index 39cac4c6b..0e0af4423 100644
--- a/kode/kxml_compiler/creator.h
+++ b/kode/kxml_compiler/creator.h
@@ -36,7 +36,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index 317515b6b..f3d557b7c 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -34,7 +34,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 5fc72f97a..23ca86f28 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -33,7 +33,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h
index 9f0f21a18..2c2e7faf0 100644
--- a/kode/kxml_compiler/parser.h
+++ b/kode/kxml_compiler/parser.h
@@ -33,7 +33,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp
index 75828ed37..24a84d8c0 100644
--- a/konsolekalendar/konsolekalendaradd.cpp
+++ b/konsolekalendar/konsolekalendaradd.cpp
@@ -37,7 +37,7 @@
 #include <tqobject.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include <libkcal/calendarlocal.h>
diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp
index fddb77d90..c2630d047 100644
--- a/konsolekalendar/konsolekalendarvariables.cpp
+++ b/konsolekalendar/konsolekalendarvariables.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqdatetime.h>
 #include <tqstring.h>
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index a68af033c..ff281ab22 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -50,7 +50,7 @@
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <libkcal/calformat.h>
diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp
index 0c871b811..9225c0329 100644
--- a/konsolekalendar/stdcalendar.cpp
+++ b/konsolekalendar/stdcalendar.cpp
@@ -27,7 +27,7 @@
 #include <libtdepim/kpimprefs.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurl.h>
 
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index f56bfabdb..8d9c670a3 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -29,7 +29,7 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tdeparts/componentfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <tdetempfile.h>
 
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 89ae1ec15..d7269fac2 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kurllabel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <knotes/resourcenotes.h>
 #include <knotes/resourcemanager.h>
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 72d78b688..69cdd7576 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -35,7 +35,7 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 #include <dcopclient.h>
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 6a3c04325..8400b83ee 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -32,7 +32,7 @@
 #include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurllabel.h>
 #include <libkcal/event.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index bdab72a9b..2fb9bf957 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -32,7 +32,7 @@
 #include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurllabel.h>
 #include <libkcal/resourcecalendar.h>
 #include <libkcal/resourcelocal.h>
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index ea783de86..083392efe 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -39,7 +39,7 @@
 #include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurllabel.h>
 #include <libkcal/event.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 0fea7ac8b..fec7f36cb 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -37,7 +37,7 @@
 #include <tdemessagebox.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqscrollview.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 2ec3aa8bd..1602a300e 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -30,7 +30,7 @@
 #include <tdestartupinfo.h>
 #include <tdeuniqueapplication.h>
 #include <twin.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 #include "plugin.h"
 
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 3fb4714b7..27af94f59 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -52,7 +52,7 @@
 #include <ksettings/dialog.h>
 #include <ksettings/dispatcher.h>
 #include <tdeshortcut.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <ktip.h>
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 0d87b9bf7..80941e022 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
 
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 1a1fb9cd0..6e43d25db 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -61,7 +61,7 @@
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktip.h>
 #include <tdetempfile.h>
 #include <kxmlguiclient.h>
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index dbee755fc..239f8522d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -84,7 +84,7 @@
 
 #include <tdeglobal.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 #include <tdemessagebox.h>
 #include <knotifyclient.h>
diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp
index 1ac91835f..4bea8a8ab 100644
--- a/korganizer/docprefs.cpp
+++ b/korganizer/docprefs.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "docprefs.h"
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index a6b09b780..8eb09d04a 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -42,7 +42,7 @@
 #include <klineedit.h>
 #include <kurl.h>
 #include <tdeio/job.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include "koglobals.h"
 #include <kurlrequester.h>
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 8f41a837c..4d9c027b0 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -59,7 +59,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeabc/stdaddressbook.h>
 #include <tdeabc/addressee.h>
 
diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp
index 519e103e7..189021fc3 100644
--- a/korganizer/freebusyurldialog.cpp
+++ b/korganizer/freebusyurldialog.cpp
@@ -30,7 +30,7 @@
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 1bde3dbea..7df989cb8 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -41,7 +41,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index 9bc2adbc8..5ff8a0d4c 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kxmlguifactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include <tqwidget.h>
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index c8c70277e..54504198a 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -47,7 +47,7 @@
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <ksqueezedtextlabel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktextedit.h>
 #include <krestrictedline.h>
 
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 2772fbeec..5f2ecae67 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -41,7 +41,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktextedit.h>
 
 #include <libkcal/event.h>
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index b871575be..80a6456ff 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -40,7 +40,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 #include <ktextedit.h>
 
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 829e8858c..5d7b06e28 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <kstaticdeleter.h>
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 5c8342ac3..bbb8dc018 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -46,7 +46,7 @@
 #include <libkcal/incidenceformatter.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdirwatch.h>
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 499a4580c..72defee42 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 8ce25fb7f..a03db92a8 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <kurl.h>
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 67cd215d4..3d89d4374 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -56,7 +56,7 @@
 #include <ktrader.h>
 #include <kpushbutton.h>
 #include <kocore.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kholidays.h>
 #include <kurlrequester.h>
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index c61517c89..c5960b765 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <tdepopupmenu.h>
 #include <tdemessagebox.h>
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index a09a5c1d2..e102c1dcc 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -31,7 +31,7 @@
 
 #include <libkcal/calendarresources.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeapplication.h>
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index de4f839e6..1f4fcfb23 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -30,7 +30,7 @@
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "alarmdialog.h"
 
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 88f51fd32..363ee43ee 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -57,7 +57,7 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdestdaccel.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index f04e21f9b..12cdc3d56 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -46,7 +46,7 @@
 #include <kiconloader.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeprocess.h>
 #include <tdetempfile.h>
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index c57cd6f28..666869ce0 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -27,7 +27,7 @@
 #include <tqregexp.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <libkcal/calendar.h>
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 5b3b47d84..7882d6bd2 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 
 #include "configdialog.h"
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index 468095a9b..ad3e8ea8f 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -20,7 +20,7 @@
 #include "datenums.h"
 #include "koglobals.h"
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "configdialog.h"
 #include <kcalendarsystem.h>
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 3a55cba90..bb91a5b18 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index e457de38a..416c86c9f 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -25,7 +25,7 @@
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 
 #include "exchangedialog.h"
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index 06f0b1b7d..b90e09de9 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 
 ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok,
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index a96859a6c..c3bb5f23d 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kcalendarsystem.h>
 #include <kcalendarsystemfactory.h>
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index d27380526..d0eb72987 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -35,7 +35,7 @@
 #include <kiconloader.h>
 #include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libkcal/vcaldrag.h>
 
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index db354184d..5a39a7ba0 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 00910bfe1..8b5f4a820 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <libkcal/calendar.h>
 
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 5ff4cf0ac..56d46ebd5 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index 8e77504a9..ddf803963 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -36,7 +36,7 @@
 
 #include <libkcal/calendarlocal.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 #include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp
index 481fd3fd4..067997185 100644
--- a/korganizer/stdcalendar.cpp
+++ b/korganizer/stdcalendar.cpp
@@ -26,7 +26,7 @@
 
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurl.h>
 
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 70a43d928..057cb1660 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -37,7 +37,7 @@
 #include <tqdir.h>
 #include <tdeprocess.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdialogbase.h>
diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp
index 34bcf6cc0..9e197af54 100644
--- a/libemailfunctions/idmapper.cpp
+++ b/libemailfunctions/idmapper.cpp
@@ -22,7 +22,7 @@
 
 #include "idmapper.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index 2787a89c0..bee2bf319 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -33,7 +33,7 @@
 #include <tqptrlist.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include "vcaldrag.h"
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index a626231f4..e6273c5a3 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -30,7 +30,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <iostream>
 
diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp
index 7a824f08a..c3cc61232 100644
--- a/libkcal/dummyscheduler.cpp
+++ b/libkcal/dummyscheduler.cpp
@@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "event.h"
 #include "icalformat.h"
diff --git a/libkcal/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp
index a4a42b5ca..03204f35c 100644
--- a/libkcal/freebusyurlstore.cpp
+++ b/libkcal/freebusyurlstore.cpp
@@ -23,7 +23,7 @@
 
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 using namespace KCal;
 
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index dcd161ced..aeb7e44e5 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "event.h"
 #include "exceptions.h"
diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp
index 7651daf58..f6ba2b8fe 100644
--- a/libkcal/resourcelocal.cpp
+++ b/libkcal/resourcelocal.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp
index 0999aaaef..5d3c40ffe 100644
--- a/libkcal/resourcelocalconfig.cpp
+++ b/libkcal/resourcelocalconfig.cpp
@@ -28,7 +28,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index 0c22cae50..d3d19f0b0 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -31,7 +31,7 @@
 #include <tdelocale.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp
index afe9c95b1..5725452f3 100644
--- a/libkcal/resourcelocaldirconfig.cpp
+++ b/libkcal/resourcelocaldirconfig.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index c398a77ca..3481f9cb2 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -23,7 +23,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "calhelper.h"
 #include "event.h"
diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp
index ec9a770f7..44ed99def 100644
--- a/libkholidays/kholidays.cpp
+++ b/libkholidays/kholidays.cpp
@@ -20,7 +20,7 @@
 
 #include <tqfile.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "kholidays.h"
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 55cecd1f5..035d8565e 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <tdeaction.h>
diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp
index 7d52711f1..5106059c1 100644
--- a/libkpimexchange/core/exchangeprogress.cpp
+++ b/libkpimexchange/core/exchangeprogress.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 
 #include "exchangeprogress.h"
diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 77128b7a4..19d2cb53e 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -44,7 +44,7 @@
 #include <tdecompletionbox.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index e604bae93..f67a10713 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -50,7 +50,7 @@
 #include <tdeprocess.h>
 #include <kpushbutton.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqdict.h>
 #include <tqlayout.h>
diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp
index 14d0a58bb..6007f14e1 100644
--- a/libtdepim/alarmclient.cpp
+++ b/libtdepim/alarmclient.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index 746c07141..3dc1827a6 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/autoexample.cpp
@@ -31,7 +31,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kautoconfigdialog.h>
 
 #include <tqlabel.h>
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index 8af18fc37..2decd110d 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -28,7 +28,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libtdepim/kprefsdialog.h>
 
diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp
index c93ae6f36..332885490 100644
--- a/libtdepim/designerfields.cpp
+++ b/libtdepim/designerfields.cpp
@@ -34,7 +34,7 @@
 #include <kdatetimewidget.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "designerfields.h"
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index d9f9a3db0..777565a19 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -41,7 +41,7 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kactivelabel.h>
 #include <kdirwatch.h>
 #include <tdefiledialog.h>
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index 207fd845a..0043c5802 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -44,7 +44,7 @@
 #include <tdelocale.h>
 #include <kprogress.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 82c6ef17f..1a6d9c1c6 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -34,7 +34,7 @@
 #include <kstdaction.h>
 #include <tdelistbox.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeshortcut.h>
 #include <tdelocale.h>
 #include <kstatusbar.h>
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 15218eacf..293203aab 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -35,7 +35,7 @@
 #include <kplugininfo.h>
 #include <ksettings/dispatcher.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
 
diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp
index d58ca447e..7d7afb963 100644
--- a/libtdepim/kpimprefs.cpp
+++ b/libtdepim/kpimprefs.cpp
@@ -27,7 +27,7 @@
 
 #include <tqstring.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp
index b0ebf72dd..62f1a21a9 100644
--- a/libtdepim/kscoring.cpp
+++ b/libtdepim/kscoring.cpp
@@ -28,7 +28,7 @@
 #include <tqtextview.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 55d8362b3..ef911bf7e 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -37,7 +37,7 @@
 #include <kdirwatch.h>
 #include <kmdcodec.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include "ldapclient.h"
diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp
index 1de43268f..8092ed85b 100644
--- a/libtdepim/linklocator.cpp
+++ b/libtdepim/linklocator.cpp
@@ -24,7 +24,7 @@
 #include "pimemoticons.h"
 #include <tdeversion.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kmdcodec.h>
 #include <kdebug.h>
diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp
index 090c2fb7e..fc0281415 100644
--- a/libtdepim/pluginloaderbase.cpp
+++ b/libtdepim/pluginloaderbase.cpp
@@ -23,7 +23,7 @@
 
 #include <ksimpleconfig.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klibloader.h>
 #include <tdeglobal.h>
 #include <kdebug.h>
diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp
index 63eb2f75a..22f13e0e0 100644
--- a/libtdepim/tdeabcresourcecached.cpp
+++ b/libtdepim/tdeabcresourcecached.cpp
@@ -23,7 +23,7 @@
 #include <tdeabc/vcardconverter.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "tdeabcresourcecached.h"
 
diff --git a/libtdepim/tdeconfigpropagator.cpp b/libtdepim/tdeconfigpropagator.cpp
index 01ed31ab3..f802bdb93 100644
--- a/libtdepim/tdeconfigpropagator.cpp
+++ b/libtdepim/tdeconfigpropagator.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeconfigskeleton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <tdelocale.h>
 
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index be9efe5b9..a6ea8bc50 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -67,7 +67,7 @@
 #include <kdebug.h>
 #include <kdcopservicestarter.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdetempfile.h>
 #include <kmdcodec.h>
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 8d4937c7f..7a229f03e 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -44,7 +44,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 
 #include <tqurl.h>
diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
index 9228e1f47..881ce2a26 100644
--- a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
+++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeabc/stdaddressbook.h>
 #include <libtdepim/distributionlist.h>
diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp
index 2e937a7d5..0917f6adc 100644
--- a/tderesources/birthdays/resourcetdeabc.cpp
+++ b/tderesources/birthdays/resourcetdeabc.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/job.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeabc/stdaddressbook.h>
 #include <tdeabc/locknull.h>
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 9ccc24b53..7e63ac420 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tderesources/configwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 #include <libtdepim/kpimprefs.h>
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 05306c876..80262ed72 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index 4e95f792d..232eb94fd 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <libkcal/freebusyurlstore.h>
 #include <libtdepim/kpimprefs.h>
diff --git a/tderesources/egroupware/todostatemapper.cpp b/tderesources/egroupware/todostatemapper.cpp
index 531b298f5..977425597 100644
--- a/tderesources/egroupware/todostatemapper.cpp
+++ b/tderesources/egroupware/todostatemapper.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "todostatemapper.h"
 
diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp
index 57ad9d0f6..5d2de94ae 100644
--- a/tderesources/exchange/resourceexchangeconfig.cpp
+++ b/tderesources/exchange/resourceexchangeconfig.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 
 #include "exchangeaccount.h"
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp
index f5c7ee5fd..6db450549 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tderesources/configwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 #include <libtdepim/kpimprefs.h>
diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp
index f3897d79e..56d61b52a 100644
--- a/tderesources/groupware/kcal_resourcegroupware.cpp
+++ b/tderesources/groupware/kcal_resourcegroupware.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tderesources/configwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 #include <libtdepim/kpimprefs.h>
diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp
index 305118f14..e851cf3de 100644
--- a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp
+++ b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp
@@ -26,7 +26,7 @@
 
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klineedit.h>
 
 #include <libkcal/resourcecachedconfig.h>
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp
index 6c3db3a89..b75492e14 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tderesources/configwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 #include <libtdepim/kpimprefs.h>
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
index bd081f5e1..0ef362317 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -28,7 +28,7 @@
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klineedit.h>
 
 #include <libkcal/resourcecachedconfig.h>
diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp
index ce53bad39..600c13931 100644
--- a/tderesources/kolab/shared/resourcekolabbase.cpp
+++ b/tderesources/kolab/shared/resourcekolabbase.cpp
@@ -37,7 +37,7 @@
 #include <folderselectdialog.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinputdialog.h>
 #include <kurl.h>
 #include <tdetempfile.h>
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index 9ee4aef52..4f81329af 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -31,7 +31,7 @@
 #include <tdeio/job.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libkcal/icalformat.h>
 #include <libkcal/exceptions.h>
diff --git a/tderesources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp
index 381134b01..ca822f01f 100644
--- a/tderesources/remote/resourceremoteconfig.cpp
+++ b/tderesources/remote/resourceremoteconfig.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 
 #include <libkcal/resourcecachedconfig.h>
diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp
index 6108230c0..f9b104236 100644
--- a/tderesources/scalix/shared/resourcescalixbase.cpp
+++ b/tderesources/scalix/shared/resourcescalixbase.cpp
@@ -36,7 +36,7 @@
 #include <folderselectdialog.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinputdialog.h>
 #include <kurl.h>
 #include <tdetempfile.h>
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index e93b89444..530c2907e 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -33,7 +33,7 @@
 #include <tdeio/job.h>
 #include <tdeio/davjob.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp
index 8652263f5..402d853c8 100644
--- a/tderesources/slox/kcalresourcesloxconfig.cpp
+++ b/tderesources/slox/kcalresourcesloxconfig.cpp
@@ -26,7 +26,7 @@
 
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index e5ba26512..fdfd1eca8 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -27,7 +27,7 @@
 
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/job.h>
 #include <tdeio/davjob.h>
 #include <kstringhandler.h>
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index b862a388d..4e89d8de9 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -25,7 +25,7 @@
 #include <tdeio/job.h>
 #include <tdeio/davjob.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "sloxbase.h"
 #include "sloxfolder.h"
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index d77347d3d..bcd719bad 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <libtdepim/kpimprefs.h>
 #include <libtdepim/progressmanager.h>
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
index 44b3e324b..d2fccbb86 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tderesources/configwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <tdetempfile.h>
 #include <ktar.h>
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index 8405e2f03..e298ff20e 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -29,7 +29,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 //#include <kdialogbase.h>
-//#include <kstandarddirs.h>
+//#include <tdestandarddirs.h>
 #include <klineedit.h>
 
 #include <libkcal/resourcecachedconfig.h>
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 1915702e5..b3e9297d8 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeemailsettings.h>
 #include <identitymanager.h>
 #include <identity.h>
-- 
cgit v1.2.1