From c6c85358d8f0ce34fcc524d58ab9a3898c171f61 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 25 Feb 2025 22:49:32 +0900
Subject: [PATCH] Use tdestandarddirs.h

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 dcoprss/cache.cpp                                           | 2 +-
 filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp | 2 +-
 filesharing/simple/fileshare.cpp                            | 2 +-
 kget/settings.cpp                                           | 2 +-
 kget/tdemainwidget.cpp                                      | 2 +-
 kget/transfer.cpp                                           | 2 +-
 kget/transferlist.cpp                                       | 2 +-
 knewsticker/common/newsengine.cpp                           | 2 +-
 knewsticker/common/newsiconmgr.cpp                          | 2 +-
 knewsticker/knewsticker.cpp                                 | 2 +-
 knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp       | 2 +-
 knewsticker/newsscroller.cpp                                | 2 +-
 kopete/kopete/chatwindow/chatmessagepart.cpp                | 2 +-
 kopete/kopete/chatwindow/kopetechatwindow.cpp               | 2 +-
 kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp   | 2 +-
 kopete/kopete/config/appearance/appearanceconfig.cpp        | 2 +-
 kopete/kopete/config/appearance/emoticonseditdialog.cpp     | 2 +-
 kopete/kopete/config/identity/globalidentitiesmanager.cpp   | 2 +-
 kopete/kopete/config/identity/kopeteidentityconfig.cpp      | 2 +-
 kopete/kopete/contactlist/kopetelviprops.cpp                | 2 +-
 kopete/kopete/kopeteballoon.cpp                             | 2 +-
 kopete/kopete/kopeteeditglobalidentitywidget.cpp            | 2 +-
 kopete/kopete/tdeconf_update/kopete-nameTracking.cpp        | 2 +-
 kopete/libkopete/kopetecontactlist.cpp                      | 2 +-
 kopete/libkopete/kopeteglobal.cpp                           | 2 +-
 kopete/libkopete/kopetemimetypehandler.cpp                  | 2 +-
 kopete/libkopete/kopetepicture.cpp                          | 2 +-
 kopete/libkopete/kopetepluginmanager.cpp                    | 2 +-
 kopete/libkopete/kopeteprefs.cpp                            | 2 +-
 kopete/libkopete/private/kopeteemoticons.cpp                | 2 +-
 kopete/libkopete/tests/kopetecontactlist_test.cpp           | 2 +-
 kopete/libkopete/tests/kopeteemoticontest.cpp               | 2 +-
 kopete/libkopete/tests/kopetemessage_test.cpp               | 2 +-
 kopete/libkopete/tests/kopetepasswordtest_program.cpp       | 2 +-
 kopete/libkopete/tests/kopetepropertiestest.cpp             | 2 +-
 kopete/libkopete/tests/kopetewallettest_program.cpp         | 2 +-
 kopete/libkopete/ui/kopetewidgets.cpp                       | 2 +-
 kopete/plugins/highlight/highlightconfig.cpp                | 2 +-
 kopete/plugins/history/converter.cpp                        | 2 +-
 kopete/plugins/history/historydialog.cpp                    | 2 +-
 kopete/plugins/history/historylogger.cpp                    | 2 +-
 kopete/plugins/latex/latexplugin.cpp                        | 2 +-
 kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp               | 2 +-
 kopete/plugins/statistics/statisticsdb.cpp                  | 2 +-
 kopete/plugins/statistics/statisticsdialog.cpp              | 2 +-
 kopete/plugins/statistics/statisticsplugin.cpp              | 2 +-
 kopete/plugins/webpresence/webpresenceplugin.cpp            | 2 +-
 kopete/protocols/irc/irccontactmanager.cpp                  | 2 +-
 kopete/protocols/irc/ircprotocol.cpp                        | 2 +-
 kopete/protocols/irc/libkirc/kircengine.cpp                 | 2 +-
 kopete/protocols/jabber/jabberbasecontact.cpp               | 2 +-
 kopete/protocols/jabber/jabbercapabilitiesmanager.cpp       | 2 +-
 kopete/protocols/jabber/jabbercontact.cpp                   | 2 +-
 kopete/protocols/jabber/jabberprotocol.cpp                  | 2 +-
 kopete/protocols/jabber/ui/dlgjabbervcard.cpp               | 2 +-
 kopete/protocols/msn/dispatcher.cpp                         | 2 +-
 kopete/protocols/msn/incomingtransfer.cpp                   | 2 +-
 kopete/protocols/msn/msnaccount.cpp                         | 2 +-
 kopete/protocols/msn/msncontact.cpp                         | 2 +-
 kopete/protocols/msn/msnnotifysocket.cpp                    | 2 +-
 kopete/protocols/msn/msnswitchboardsocket.cpp               | 2 +-
 kopete/protocols/msn/ui/msneditaccountwidget.cpp            | 2 +-
 kopete/protocols/oscar/aim/aimuserinfo.cpp                  | 2 +-
 kopete/protocols/oscar/icq/icqcontact.cpp                   | 2 +-
 kopete/protocols/oscar/oscaraccount.cpp                     | 2 +-
 kopete/protocols/winpopup/wpeditaccount.cpp                 | 2 +-
 kopete/protocols/winpopup/wpprotocol.cpp                    | 2 +-
 kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp   | 2 +-
 kopete/protocols/yahoo/yahooaccount.cpp                     | 2 +-
 kopete/protocols/yahoo/yahoocontact.cpp                     | 2 +-
 kopete/protocols/yahoo/yahooeditaccount.cpp                 | 2 +-
 kopete/protocols/yahoo/yahooverifyaccount.cpp               | 2 +-
 kppp/accounting.cpp                                         | 2 +-
 kppp/acctselect.cpp                                         | 2 +-
 kppp/kpppwidget.cpp                                         | 2 +-
 kppp/logview/log.cpp                                        | 2 +-
 kppp/main.cpp                                               | 2 +-
 kppp/providerdb.cpp                                         | 2 +-
 krdc/vnc/kvncview.cpp                                       | 2 +-
 krfb/kinetd/kinetd.cpp                                      | 2 +-
 ksirc/KSOpenkSirc/open_ksirc.cpp                            | 2 +-
 ksirc/KSOpenkSirc/serverFileParser.cpp                      | 2 +-
 ksirc/KSPrefs/page_looknfeel.cpp                            | 2 +-
 ksirc/dccNew.cpp                                            | 2 +-
 ksirc/iocontroller.cpp                                      | 2 +-
 ksirc/ksircprocess.cpp                                      | 2 +-
 ksirc/logfile.cpp                                           | 2 +-
 ksirc/servercontroller.cpp                                  | 2 +-
 ktalkd/kcmktalkd/soundpage.cpp                              | 2 +-
 ktalkd/ktalkd/readcfg++.cpp                                 | 2 +-
 ktalkd/ktalkdlg/ktalkdlg.cpp                                | 2 +-
 tdednssd/ioslave/dnssd.cpp                                  | 2 +-
 wifi/interface_wireless_wirelessextensions.cpp              | 2 +-
 wifi/kwifimanager.cpp                                       | 2 +-
 wifi/picture.cpp                                            | 2 +-
 wifi/strength.cpp                                           | 2 +-
 96 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/dcoprss/cache.cpp b/dcoprss/cache.cpp
index c4a566aa..635f91cb 100644
--- a/dcoprss/cache.cpp
+++ b/dcoprss/cache.cpp
@@ -26,7 +26,7 @@
 #include "xmlrpciface.h"
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqdatastream.h>
 #include <tqfile.h>
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 0d22dfa4..a228d233 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -27,7 +27,7 @@
 #include <tdefileshare.h>
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 #include <tdeglobal.h>
 
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 73888a81..532b7298 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -36,7 +36,7 @@
 #include <knfsshare.h>
 #include <ksambashare.h>
 #include <tdefileshare.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 3d456ff4..8ba4a674 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 0b3c8091..b20b78c8 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -52,7 +52,7 @@
 #include <kprotocolinfo.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 1da1b853..d8a853d7 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -32,7 +32,7 @@
 #include <ksimpleconfig.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <tdemessagebox.h>
 
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 3fed43b6..17f0b743 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp
index d62e5436..4b3b5c62 100644
--- a/knewsticker/common/newsengine.cpp
+++ b/knewsticker/common/newsengine.cpp
@@ -19,7 +19,7 @@
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqbuffer.h>
 
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index 8f4334ea..83381ef4 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -14,7 +14,7 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqbuffer.h>
 #include <tqfile.h>
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index ccb5fb6a..33368d21 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -24,7 +24,7 @@
 #include <knotifyclient.h>
 #include <tdeprocess.h>
 #include <tdeprotocolmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdestartupinfo.h>
 
 #include <tqcursor.h>
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 0c10ecc5..90366c95 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -22,7 +22,7 @@
 #include <tdelocale.h>
 #include <kurl.h>
 #include <kurllabel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 
 #include <tqmultilineedit.h>
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index 10f65964..35b11406 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -16,7 +16,7 @@
 #include <tqtimer.h>
 
 #include <kcursor.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 #include <tdemessagebox.h>
 
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index bf3af844..e76e6687 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -62,7 +62,7 @@
 #include <kurldrag.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 1de1cee7..1e7d495e 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -41,7 +41,7 @@
 #include <kstatusbar.h>
 #include <kpushbutton.h>
 #include <ktabwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
 #include <ksqueezedtextlabel.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
index 4eeccab7..ce52eb34 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
@@ -21,7 +21,7 @@
 #include <tqvaluestack.h>
 
 // KDE includes
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdirlister.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 704e8ab4..31b4b7bb 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -53,7 +53,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktextedit.h>
 #include <kurl.h> // TDENewStuff
 #include <kurlrequesterdlg.h>
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index 1432a328..4e182141 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -22,7 +22,7 @@
 
 #include <tdelocale.h>
 #include <tdelistview.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tqpixmap.h>
diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.cpp b/kopete/kopete/config/identity/globalidentitiesmanager.cpp
index e34e783d..d1dbd215 100644
--- a/kopete/kopete/config/identity/globalidentitiesmanager.cpp
+++ b/kopete/kopete/config/identity/globalidentitiesmanager.cpp
@@ -26,7 +26,7 @@
 #include <ksavefile.h>
 #include <tdelocale.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 // Kopete includes
 #include "kopetecontact.h"
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index c6419c13..73e11d86 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <kurlrequester.h>
 #include <kinputdialog.h>
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index e1472bd4..32599f53 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -42,7 +42,7 @@
 #include <tdeabc/addresseedialog.h>
 #include <tdeabc/stdaddressbook.h>
 #include <tdeabc/addressee.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "tdeabcpersistence.h"
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index 5f1ddd13..021bef2a 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -30,7 +30,7 @@
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprotocolinfo.h>
 #include <kurl.h>
 #include <krun.h>
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
index 6c80cd4c..8a138018 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdetoolbar.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
 #include <tdemessagebox.h>
diff --git a/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp b/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp
index e11d5781..ad2f179d 100644
--- a/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp
+++ b/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp
@@ -18,7 +18,7 @@
 #include <tqtextstream.h>
 #include <tqdom.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 static TQTextStream qcerr( stderr, IO_WriteOnly );
 
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index 67c67ff6..0d04f19a 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -28,7 +28,7 @@
 #include <tdeabc/stdaddressbook.h>
 #include <kdebug.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kopeteconfig.h>
 #include <tdeglobal.h>
 #include "kopetemetacontact.h"
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index 72b2a268..9d6f3705 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -25,7 +25,7 @@
 #include <kmimetype.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktar.h>
 #include <kzip.h>
 #include <kmimetype.h>
diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp
index 5decb0a9..8b58290a 100644
--- a/kopete/libkopete/kopetemimetypehandler.cpp
+++ b/kopete/libkopete/kopetemimetypehandler.cpp
@@ -28,7 +28,7 @@
 #include <kmimetype.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktar.h>
 
 namespace Kopete
diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp
index 74d85ffe..f026354b 100644
--- a/kopete/libkopete/kopetepicture.cpp
+++ b/kopete/libkopete/kopetepicture.cpp
@@ -21,7 +21,7 @@
 #include <tdeabc/picture.h>
 
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 namespace Kopete
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index eef7c5e5..f0b7a1ce 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -38,7 +38,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
 
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index a1f5741f..f72bbcd5 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -24,7 +24,7 @@
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #define KOPETE_DEFAULT_CHATSTYLE  "Kopete"
 
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 110367ad..84d23ccc 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeversion.h>
 
 #include <set>
diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp
index 71dade85..cf5ab7d6 100644
--- a/kopete/libkopete/tests/kopetecontactlist_test.cpp
+++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp
@@ -17,7 +17,7 @@
 
 #include <tqfile.h>
 #include <tqdir.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeunittest/module.h>
 #include "kopetecontactlist_test.h"
 
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index 5bc63506..b94a21e9 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <tdeunittest/module.h>
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index bf050695..835c63ba 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 #include <tdeprocess.h>
 #include <tdeunittest/module.h>
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index b53394b3..998800dd 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -26,7 +26,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp
index d6517757..6ee69967 100644
--- a/kopete/libkopete/tests/kopetepropertiestest.cpp
+++ b/kopete/libkopete/tests/kopetepropertiestest.cpp
@@ -26,7 +26,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kopetepropertiestest.h"
 
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index f127ba26..92dfec64 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -22,7 +22,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
 
diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp
index 49f57ae6..1547ac92 100644
--- a/kopete/libkopete/ui/kopetewidgets.cpp
+++ b/kopete/libkopete/ui/kopetewidgets.cpp
@@ -10,7 +10,7 @@
 #include <kopetelistview.h>
 #include <kopetelistviewsearchline.h>
 #ifndef EMBED_IMAGES
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #endif
 
 class KopeteWidgets : public TQWidgetPlugin
diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp
index 6385d6ed..2cb2ab0b 100644
--- a/kopete/plugins/highlight/highlightconfig.cpp
+++ b/kopete/plugins/highlight/highlightconfig.cpp
@@ -23,7 +23,7 @@
 #include <tqdom.h>
 
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include "filter.h"
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index cdd0acfd..be8bf8d3 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 6df41a26..30aec3d9 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -47,7 +47,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
 #include <kprogress.h>
diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp
index c82ea7c5..1d6bd4fc 100644
--- a/kopete/plugins/history/historylogger.cpp
+++ b/kopete/plugins/history/historylogger.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksavefile.h>
 
 #include "kopeteglobal.h"
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index 70bb1aaa..fba3dde3 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -23,7 +23,7 @@
 #include <tqstylesheet.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeprocess.h>
 #include <tdetempfile.h>
 #include <kmdcodec.h>
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 4beb20f5..99c4fc63 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -20,7 +20,7 @@
 
 #include <tqradiobutton.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kpushbutton.h>
 #include <kresolver.h>
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 48378f3c..0cf18047 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -23,7 +23,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeversion.h>
 
 #include "statisticsdb.h"
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index dd333b3a..976285a3 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -27,7 +27,7 @@
 #include "tdelocale.h"
 #include "tdelistview.h"
 #include "tdehtml_part.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kdatepicker.h"
 #include "ktimewidget.h"
 
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 04aeee06..96e2046d 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeversion.h>
 
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 638bd767..27a3d9e2 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -29,7 +29,7 @@
 #include <kgenericfactory.h>
 #include <tdemessagebox.h>
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #ifdef HAVE_XSLT
 #include <libxml/parser.h>
diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp
index 7f6c5625..e2688307 100644
--- a/kopete/protocols/irc/irccontactmanager.cpp
+++ b/kopete/protocols/irc/irccontactmanager.cpp
@@ -32,7 +32,7 @@
 #include <kopeteview.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqtimer.h>
 
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index a74ae8d4..6fd6b7e1 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -50,7 +50,7 @@
 #include <kiconloader.h>
 #include <tdemessagebox.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kuser.h>
 
 #include <tqcheckbox.h>
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 464e8883..486be024 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kextsock.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqtextcodec.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index f13c28a7..1e6dbb7a 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqtimer.h>
 #include <tqimage.h>
 #include <tqregexp.h>
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
index b4aeb5ad..01736331 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
@@ -26,7 +26,7 @@
 #include <tqdom.h>
 #include <tqtextstream.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <xmpp_tasks.h>
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 79b09508..6f49cb40 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -34,7 +34,7 @@
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kinputdialog.h>
 #include <kopeteview.h>
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index 7cc3be7a..4ddee317 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -23,7 +23,7 @@
 #include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klineeditdlg.h>
 
 #include <tqapplication.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 6dbc4456..c1bb33b8 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -39,7 +39,7 @@
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <kpixmapregionselectordialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 // libiris(XMPP backend) includes
 #include "im.h"
diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index 4c352de2..4d7fbb76 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -33,7 +33,7 @@ using P2P::OutgoingTransfer;
 // Kde includes
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 // TQt includes
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index ed5377f2..b60a4700 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -24,7 +24,7 @@ using P2P::Message;
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kserversocket.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 using namespace KNetwork;
 
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 8ff345f6..224fbed8 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -27,7 +27,7 @@
 #include <kinputdialog.h>
 #include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmdcodec.h>
 #include <tdelocale.h>
 
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 54230558..0d857748 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -29,7 +29,7 @@
 #include <tdefiledialog.h>
 #include <klineedit.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <krun.h>
 #include <tdetempfile.h>
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 0ce7b95a..7c75feb1 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -37,7 +37,7 @@
 #include <tdelocale.h>
 #include <kmdcodec.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <krun.h>
 #include <tdeio/job.h>
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 4a77d907..f3317ac3 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -41,7 +41,7 @@
 #include <tdetempfile.h>
 #include <tdeconfig.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 // for the display picture
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 600f0f15..9565d831 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -34,7 +34,7 @@
 #include <tdefiledialog.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index 561eef41..0de48fa2 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 2758d2c4..41587da4 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -32,7 +32,7 @@
 #include <kpassivepopup.h>
 #include <kinputdialog.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 683d92b2..84c29af4 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -46,7 +46,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kpassivepopup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "client.h"
 #include "connection.h"
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 9b688d9e..f6e43af4 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -34,7 +34,7 @@
 #include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 // Kopete Includes
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index a418d7e7..4a0c978b 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -28,7 +28,7 @@
 #include <kgenericfactory.h>
 #include <tdemessagebox.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 // Kopete Includes
 #include "kopeteaccountmanager.h"
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index 1dc3f84c..357fad4d 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -25,7 +25,7 @@
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include "yahootypes.h"
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 28d73f06..d26b52df 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -39,7 +39,7 @@
 #include <tdepopupmenu.h>
 #include <tdemessagebox.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 // Kopete
 #include <kopetechatsession.h>
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 3b3f2b85..0037fb4d 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -57,7 +57,7 @@
 #include <kurl.h>
 #include <tdeio/jobclasses.h>
 #include <kimageio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 
 YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact )
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index 2e6de47c..c8d586a5 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -35,7 +35,7 @@
 #include <tdefiledialog.h>
 #include <kpassdlg.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kpixmapregionselectordialog.h>
 
 // Kopete Includes
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index d2ccb943..85e62833 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -26,7 +26,7 @@
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 // Kopete Includes
 #include <yahooverifyaccountbase.h>
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp
index 99cbd65d..70a7d436 100644
--- a/kppp/accounting.cpp
+++ b/kppp/accounting.cpp
@@ -31,7 +31,7 @@
 
 #include <tqdir.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <time.h>
diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp
index cd4013dd..9285190c 100644
--- a/kppp/acctselect.cpp
+++ b/kppp/acctselect.cpp
@@ -43,7 +43,7 @@
 #include <tqwmatrix.h>
 #include <tqcheckbox.h>
 #include <kdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <krun.h>
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index dafde781..89eaa4e6 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -46,7 +46,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <khelpmenu.h>
 #include <kpushbutton.h>
diff --git a/kppp/logview/log.cpp b/kppp/logview/log.cpp
index fe29180f..834367af 100644
--- a/kppp/logview/log.cpp
+++ b/kppp/logview/log.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 TQPtrList<LogInfo> logList;
diff --git a/kppp/main.cpp b/kppp/main.cpp
index 46d068aa..b6495e89 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -51,7 +51,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kpppwidget.h"
 #include "opener.h"
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
index 508b5f5f..37dbcce9 100644
--- a/kppp/providerdb.cpp
+++ b/kppp/providerdb.cpp
@@ -34,7 +34,7 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include "providerdb.h"
 #include "newwidget.h"
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index bff72382..013e4dfa 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kpassdlg.h>
 #include <kdialogbase.h>
 #include <tdewallet.h>
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 939bb382..28099696 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <kservicetype.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <ksockaddr.h>
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 6cf24358..69668966 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdemessagebox.h>
diff --git a/ksirc/KSOpenkSirc/serverFileParser.cpp b/ksirc/KSOpenkSirc/serverFileParser.cpp
index 59288d00..dd1a71f6 100644
--- a/ksirc/KSOpenkSirc/serverFileParser.cpp
+++ b/ksirc/KSOpenkSirc/serverFileParser.cpp
@@ -3,7 +3,7 @@
 #include <tqfile.h>
 #include <stdlib.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 extern TQPtrList<Server> Groups;
diff --git a/ksirc/KSPrefs/page_looknfeel.cpp b/ksirc/KSPrefs/page_looknfeel.cpp
index 82244bb7..d09b8a39 100644
--- a/ksirc/KSPrefs/page_looknfeel.cpp
+++ b/ksirc/KSPrefs/page_looknfeel.cpp
@@ -11,7 +11,7 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include "page_looknfeel.h"
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index c2e8bb1c..465d118b 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -14,7 +14,7 @@
 #include <tqlistbox.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp
index e2078bc2..cb984862 100644
--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@@ -83,7 +83,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 
 int KSircIOController::counter = 0;
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 53e85d39..a5a82800 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -112,7 +112,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 extern DisplayMgr *displayMgr;
diff --git a/ksirc/logfile.cpp b/ksirc/logfile.cpp
index 2246cd30..e1b54c63 100644
--- a/ksirc/logfile.cpp
+++ b/ksirc/logfile.cpp
@@ -11,7 +11,7 @@
 
 #include <tqdir.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 LogFile::LogFile( const TQString &channel, const TQString &server )
     : m_channel( channel ), m_server( server ), m_file( new TQFile() ),
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 4058c37e..6d78569f 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -88,7 +88,7 @@
 #include <twin.h>
 #include <kdebug.h>
 #include <tdestdaccel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index 1c2e7a08..dab372ae 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -34,7 +34,7 @@
 
 #include <klineedit.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kaudioplayer.h>
 #include <tdemessagebox.h>
diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp
index 4061431a..1fe374e1 100644
--- a/ktalkd/ktalkd/readcfg++.cpp
+++ b/ktalkd/ktalkd/readcfg++.cpp
@@ -51,7 +51,7 @@
 
 /* KDE & TQt includes */
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 #include <tqfile.h>
 
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 04205785..cd24a571 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -32,7 +32,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 
 #include <kaudioplayer.h>
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index 1bde468f..f1b1eee2 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -36,7 +36,7 @@
 #include <tdemessagebox.h>
 #include <kinstance.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdesocketaddress.h>
 #include <kprotocolinfo.h>
 #include <tdecmdlineargs.h>
diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index 61cdada0..ba998148 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -37,7 +37,7 @@
 #include <iostream>
 #include <string>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeprocio.h>
 #include <kdebug.h>
 #include <tqstring.h>
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 63426515..7d1302d4 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -35,7 +35,7 @@
 #include <tdemenubar.h>
 #include <tdelocale.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <kdebug.h>
diff --git a/wifi/picture.cpp b/wifi/picture.cpp
index 4c808e3f..b2db62eb 100644
--- a/wifi/picture.cpp
+++ b/wifi/picture.cpp
@@ -18,7 +18,7 @@
 #include <tqwidget.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include "picture.h"
 #include "interface_wireless.h"
 
diff --git a/wifi/strength.cpp b/wifi/strength.cpp
index ef62322b..c2539942 100644
--- a/wifi/strength.cpp
+++ b/wifi/strength.cpp
@@ -19,7 +19,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include "strength.h"