diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 12b0266ed..ff595ee3e 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -75,7 +75,7 @@ instead, everything else is source compatible.
 <UL>
 <LI>kapp.h is now tdeapplication.h</LI>
 <LI>kuniqueapp.h is now tdeuniqueapplication.h</LI>
-<LI>kstddirs.h is now kstandarddirs.h</LI>
+<LI>kstddirs.h is now tdestandarddirs.h</LI>
 <LI>kcolorbtn.h is now kcolorbutton.h</LI>
 <LI>kxmlgui.h is now kxmlguifactory.h</LI>
 <LI>kdatepik.h is now kdatepicker.h</LI>
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index 2744344e2..27e0845fa 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -21,7 +21,7 @@
 #include <flowsystem.h>
 #include <ksimpleconfig.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include "kartsserver.h"
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index ec06d261d..85b8f36ba 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -63,7 +63,7 @@
 #include <kaudiomanagerplay.h>
 #endif
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeuniqueapplication.h>
 #include <twin.h>
 
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index a87cdfa67..01dab8f47 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -3,7 +3,7 @@
 #include <tdeparts/componentfactory.h>
 #include <tdeapplication.h>
 #include <kdesktopfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdelocale.h>
 #include <tdemessagebox.h>
diff --git a/kab/addressbook.cpp b/kab/addressbook.cpp
index 5b62689e6..aa1ddfdfb 100644
--- a/kab/addressbook.cpp
+++ b/kab/addressbook.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index f3de71d8b..09111d14e 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -71,7 +71,7 @@
 #include <kregexpeditorinterface.h>
 #include <krun.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 #include <tqbuttongroup.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 84177de1f..57cecf8a0 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -68,7 +68,7 @@
 #include <kencodingfiledialog.h>
 #include <tdetempfile.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqtimer.h>
 #include <tqfile.h>
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 1f432468d..28cee1a3c 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -41,7 +41,7 @@
 #include <tdepopupmenu.h>
 #include <tdeglobalsettings.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index c20091fc1..2f91e476e 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeconfig.h>
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index 5fd486002..f4936ef23 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -29,7 +29,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeconfig.h>
 #include <tdeglobal.h>
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 001e478d4..40870e4b8 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeconfig.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index cc1654cd6..4419f0254 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -32,7 +32,7 @@
 #include <signal.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
 #include "test_regression.h"
diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index b5873cad8..afb2c81a6 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -21,7 +21,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <assert.h>
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index 921e55ab9..4259e69c7 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -22,7 +22,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 6f127caf2..a06170033 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -24,7 +24,7 @@
 #include "kmimetype.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <tdelocale.h>
 #include <kdebug.h>
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index 3903a6b39..a28eab9e9 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -22,7 +22,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index b85776166..64f07a550 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -22,7 +22,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 4d3cecbfa..85d796652 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -43,7 +43,7 @@
 #include <tdeprocess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdatastream.h>
 #include <tdeio/global.h>
 #include <kservicetype.h>
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 34a0c2fbf..ba9ba7d95 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -35,7 +35,7 @@
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeprocess.h>
 #include <kde_file.h>
 
diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp
index 4cf7a843e..945d70e91 100644
--- a/kded/tde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -30,7 +30,7 @@
 #include "tdelocale.h"
 #include "kservice.h"
 #include "kservicegroup.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 static TDECmdLineOptions options[] = {
    { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 },
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index 561bf9835..830d8c31e 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -45,7 +45,7 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksavefile.h>
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
diff --git a/kded/tdemimelist.cpp b/kded/tdemimelist.cpp
index 673520e52..8c70cc8f5 100644
--- a/kded/tdemimelist.cpp
+++ b/kded/tdemimelist.cpp
@@ -2,7 +2,7 @@
 #include <kservice.h>
 #include <kmimetype.h>
 #include <assert.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservicegroup.h>
 #include <kimageio.h>
 #include <kuserprofile.h>
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index 880a17576..6faace11f 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservice.h>
 #include <kde_file.h>
 
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index d44b979b5..f2238a67f 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -12,7 +12,7 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 #include <tqstring.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 #include <kdebug.h>
 #include <stdlib.h>
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 2b2868625..c394776b7 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -12,7 +12,7 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 #include <tqstring.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 #include <kdebug.h>
 #include <stdlib.h>
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 9719d226b..f1afaa0da 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -16,7 +16,7 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 #include <tqstring.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 #include <xslt.h>
 #include <tqfile.h>
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index cdff9bd86..2c2fb0583 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 
 #include "tdeio_help.h"
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 7973fbfbc..7798aac61 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -6,7 +6,7 @@
 #include <libxml/parserInternals.h>
 #include <libxml/catalog.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqdir.h>
 #include <tqregexp.h>
 #include <xslt.h>
diff --git a/tdeabc/address.cpp b/tdeabc/address.cpp
index 80dea4e61..9f47a279e 100644
--- a/tdeabc/address.cpp
+++ b/tdeabc/address.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include <tqfile.h>
diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp
index a472b2bd0..b124eddbe 100644
--- a/tdeabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -27,7 +27,7 @@
 #include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "errorhandler.h"
 #include "resource.h"
diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index ef6537e28..8922d76e7 100644
--- a/tdeabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -35,7 +35,7 @@
 #include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index 3456418de..cb2b93b58 100644
--- a/tdeabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -23,7 +23,7 @@
 #include <tqvaluelist.h>
 
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "distributionlist.h"
diff --git a/tdeabc/formatfactory.cpp b/tdeabc/formatfactory.cpp
index 921a960c4..656cfe0cb 100644
--- a/tdeabc/formatfactory.cpp
+++ b/tdeabc/formatfactory.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include <tqfile.h>
diff --git a/tdeabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
index 778a81ef7..af1728f3e 100644
--- a/tdeabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "addressbook.h"
 #include "addressee.h"
diff --git a/tdeabc/lock.cpp b/tdeabc/lock.cpp
index 9a08aa069..f5207f682 100644
--- a/tdeabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 #include <tqfile.h>
diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index 7502084aa..d3cde77c1 100644
--- a/tdeabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -34,7 +34,7 @@
 #include <kgenericfactory.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "addressbook.h"
diff --git a/tdeabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp
index 91512cfa6..0a4aba8f8 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.cpp
+++ b/tdeabc/plugins/dir/resourcedirconfig.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 
 #include "formatfactory.h"
diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index 2b25db4c4..f48790948 100644
--- a/tdeabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -35,7 +35,7 @@
 #include <tdeio/scheduler.h>
 #include <tdelocale.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "formatfactory.h"
 #include "resourcefileconfig.h"
diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 7995f3be1..6f9a67965 100644
--- a/tdeabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 
 #include <unistd.h>
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index f7c6ed36a..a2c5523af 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index 2d9c81788..de30c703f 100644
--- a/tdeabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -26,7 +26,7 @@
 #include <tdelocale.h>
 #include <tderesources/manager.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include "resource.h"
diff --git a/tdeabc/tdeab2tdeabc.cpp b/tdeabc/tdeab2tdeabc.cpp
index e346d9c7a..d20458288 100644
--- a/tdeabc/tdeab2tdeabc.cpp
+++ b/tdeabc/tdeab2tdeabc.cpp
@@ -30,7 +30,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "addressbook.h"
 #include "stdaddressbook.h"
diff --git a/tdeabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
index add322b75..a348d3b02 100644
--- a/tdeabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "stdaddressbook.h"
 
diff --git a/tdeabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp
index 96989a06d..e7b38dd6e 100644
--- a/tdeabc/tests/testaddressee.cpp
+++ b/tdeabc/tests/testaddressee.cpp
@@ -3,7 +3,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "addressbook.h"
 #include "plugins/file/resourcefile.h"
diff --git a/tdeabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
index e65d4379c..e422f8cde 100644
--- a/tdeabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -3,7 +3,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "addressbook.h"
 #include "addresseelist.h"
diff --git a/tdeabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp
index bf5347f4e..ee883f7ab 100644
--- a/tdeabc/tests/testaddressfmt.cpp
+++ b/tdeabc/tests/testaddressfmt.cpp
@@ -3,7 +3,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "addressbook.h"
 #include "address.h"
diff --git a/tdeabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp
index 2cc7effb4..33adc671f 100644
--- a/tdeabc/tests/testkabc.cpp
+++ b/tdeabc/tests/testkabc.cpp
@@ -3,7 +3,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqimage.h>
diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
index 4f2ea6809..421fb64df 100644
--- a/tdeabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kmdcodec.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 
 #include <VCard.h>
diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index 35dbcfbf4..4e99a34e9 100644
--- a/tdeconf_update/tdeconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -33,7 +33,7 @@
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <tdetempfile.h>
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index c989db4bd..73e54db02 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -57,8 +57,8 @@ install( FILES
     tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
     tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
-    kregexp.h kcompletion.h kstringhandler.h kstddirs.h
-    kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
+    kregexp.h kcompletion.h kstringhandler.h
+    kstandarddirs.h tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h tdecrash.h krfcdate.h kinstance.h
     kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
@@ -107,7 +107,7 @@ set( target tdecore )
 set( ${target}_SRCS
   libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
   tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
-  kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
+  kmanagerselection.cpp kdesktopfile.cpp tdestandarddirs.cpp
   ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp tdelocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index efc01568a..fef36b95d 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -59,7 +59,7 @@ ksavefile.cpp		Waldo Bastian <bastian@kde.org>
 tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
 ksocks.cpp
-kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
+tdestandarddirs.cpp	Waldo Bastian <bastian@kde.org>
 tdestartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
 tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 12d457d02..1f62c5d41 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -45,7 +45,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
 	tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
-	kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
+	kstandarddirs.h tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h tdecrash.h krfcdate.h \
 	kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
@@ -92,7 +92,7 @@ noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
 	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
-	kstandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \
+	tdestandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \
 	tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
 	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in
index 2597fddcc..8dde23486 100644
--- a/tdecore/configure.in.in
+++ b/tdecore/configure.in.in
@@ -1,4 +1,4 @@
-dnl Compile in the exec prefix to help kstandarddirs in finding dynamic libs
+dnl Compile in the exec prefix to help tdestandarddirs in finding dynamic libs
 AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
 
 dnl Compile in kde_bindir to safely find tdesu_stub.
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index 2e9a8a0ba..0da2ced26 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurl.h>
 
diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp
index 24d0193b2..d91338d1f 100644
--- a/tdecore/kcatalogue.cpp
+++ b/tdecore/kcatalogue.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 
 #include "kcatalogue.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file,
 	       const char *msgid);
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 368aaef5d..46dac11d8 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -29,7 +29,7 @@
 #include "tdeapplication.h"
 #include "tdeglobal.h"
 #include "kinstance.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 #include <tqmessagebox.h>
 #include <tdelocale.h>
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 3e262be3a..27b25858b 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -32,7 +32,7 @@
 #include "kurl.h"
 #include "tdeconfigbackend.h"
 #include "tdeapplication.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kmountpoint.h"
 #include "kcatalogue.h"
 #include "tdelocale.h"
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index db98fbffd..8c56990d8 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -29,7 +29,7 @@
 #include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index dd2cd2944..f0793f2c1 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -29,7 +29,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 8ae747948..c5fe83ccc 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -31,7 +31,7 @@
 #include "tdenetworkconnections.h"
 #endif
 #include "tdeaboutdata.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kdebug.h"
 #include "tdeglobal.h"
 #include "kmimesourcefactory.h"
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 2d33aa80b..ca77c5f8c 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -27,7 +27,7 @@
 
 #include "tdeapplication.h"
 #include "klibloader.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kdebug.h"
 #include "tdelocale.h"
 
diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp
index 0828911ef..e5a67e0f3 100644
--- a/tdecore/kmountpoint.cpp
+++ b/tdecore/kmountpoint.cpp
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 #include "kmountpoint.h"
 
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index eaac81754..7d4c675d7 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -24,7 +24,7 @@
 #include <tqptrstack.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp
index 7335e8e14..66f235e5e 100644
--- a/tdecore/kpalette.cpp
+++ b/tdecore/kpalette.cpp
@@ -23,7 +23,7 @@
 
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <ksavefile.h>
 #include <kstringhandler.h>
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index af48a5386..3d08cccd5 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -25,7 +25,7 @@
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp
index 115a44f25..19efdc465 100644
--- a/tdecore/kprotocolinfofactory.cpp
+++ b/tdecore/kprotocolinfofactory.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp
index 86f5bfefa..d801b7c9a 100644
--- a/tdecore/kpty.cpp
+++ b/tdecore/kpty.cpp
@@ -121,7 +121,7 @@ extern "C" {
 #endif
 
 #include <kdebug.h>
-#include <kstandarddirs.h>	// locate
+#include <tdestandarddirs.h>	// locate
 
 #ifndef CINTR
 #define CINTR	0x03
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index d9b8867af..9bf409c1c 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -38,7 +38,7 @@
 #include <kde_file.h>
 #include "tdeapplication.h"
 #include "ksavefile.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 KSaveFile::KSaveFile(const TQString &filename, int mode)
  : mTempFile(true)
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index dc359f17e..26a201f85 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -32,7 +32,7 @@
 #include <tqdir.h>
 
 #include "tdeglobal.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "tdeconfigbackend.h"
 
 #include "ksimpleconfig.h"
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 79085dce1..cf35a2c5a 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -1,729 +1 @@
-/*
-  This file is part of the KDE libraries
-  Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org>
-  Copyright (C) 1999 Stephan Kulow <coolo@kde.org>
-  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Library General Public License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to
-  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
-*/
-
-#ifndef _KSTANDARDDIRS_H
-#define _KSTANDARDDIRS_H
-
-#include <tqstring.h>
-#include <tqdict.h>
-#include <tqstringlist.h>
-#include <tdeglobal.h>
-
-class TDEConfig;
-class TDEStandardDirsPrivate;
-
-/**
- * @short Site-independent access to standard KDE directories.
- * @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org>
- *
- * This is one of the most central classes in tdelibs as
- * it provides a basic service: It knows where the files
- * reside on the user's hard disk. And it's meant to be the
- * only one that knows -- to make the real location as
- * transparent as possible to both the user and the applications.
- *
- * To this end it insulates the application from all information
- * and applications always refer to a file with a resource type
- * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world
- * the application would make no assumption where this file is and
- * leave it up to TDEStandardDirs::findResource("apps", "Home.desktop")
- * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop
- * or ::locate("data", "kgame/background.jpg") to return
- * /opt/kde/share/apps/kgame/background.jpg
- *
- * The main idea behind TDEStandardDirs is that there are several
- * toplevel prefixes below which the files lie. One of these prefixes is
- * the one where the user installed tdelibs, one is where the
- * application was installed, and one is $HOME/.trinity, but there
- * may be even more. Under these prefixes there are several well
- * defined suffixes where specific resource types are to be found.
- * For example, for the resource type "html" the suffixes could be
- * share/doc/HTML and share/doc/tde/HTML.
- * So the search algorithm basically appends to each prefix each registered
- * suffix and tries to locate the file there.
- * To make the thing even more complex, it's also possible to register
- * absolute paths that TDEStandardDirs looks up after not finding anything
- * in the former steps. They can be useful if the user wants to provide
- * specific directories that aren't in his $HOME/.trinity directory for,
- * for example, icons.
- *
- * <b>Standard resources that tdelibs allocates are:</b>\n
- *
- * @li apps - Applications menu (.desktop files).
- * @li cache - Cached information (e.g. favicons, web-pages)
- * @li cgi - CGIs to run from kdehelp.
- * @li config - Configuration files.
- * @li data - Where applications store data.
- * @li exe - Executables in $prefix/bin. findExe() for a function that takes $PATH into account.
- * @li html - HTML documentation.
- * @li icon - Icons, see TDEIconLoader.
- * @li lib - Libraries.
- * @li locale - Translation files for TDELocale.
- * @li mime - Mime types.
- * @li module - Module (dynamically loaded library).
- * @li tqtplugins - TQt plugins (dynamically loaded objects for TQt)
- * @li services - Services.
- * @li servicetypes - Service types.
- * @li scripts - Application scripting additions.
- * @li sound - Application sounds.
- * @li templates - Templates
- * @li wallpaper - Wallpapers.
- * @li tmp - Temporary files (specific for both current host and current user)
- * @li socket - UNIX Sockets (specific for both current host and current user)
- * @li emoticons - Emoticons themes  (Since KDE 3.4)
- *
- * A type that is added by the class TDEApplication if you use it, is
- * appdata. This one makes the use of the type data a bit easier as it
- * appends the name of the application.
- * So while you had to ::locate("data", "appname/filename") so you can
- * also write ::locate("appdata", "filename") if your TDEApplication instance
- * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
- * you use the global TDEStandardDirs object TDEGlobal::dirs()).
- * Please note though that you cannot use the "appdata"
- * type if you intend to use it in an applet for Kicker because 'appname' would
- * be "Kicker" instead of the applet's name. Therefore, for applets, you've got
- * to work around this by using ::locate("data", "appletname/filename").
- *
- * <b>TDEStandardDirs supports the following environment variables:</b>
- *
- * @li TDEDIRS: This may set an additional number of directory prefixes to
- *          search for resources. The directories should be separated
- *          by ':'. The directories are searched in the order they are
- *          specified.
- * @li TDEDIR:  Used for backwards compatibility. As TDEDIRS but only a single
- *          directory may be specified. If TDEDIRS is set TDEDIR is
- *          ignored.
- * @li TDEHOME: The directory where changes are saved to. This directory is
- *          used to search for resources first. If TDEHOME is not
- *          specified it defaults to "$HOME/.trinity"
- * @li TDEROOTHOME: Like TDEHOME, but used for the root user.
- *          If TDEROOTHOME is not set it defaults to the .kde directory in the
- *          home directory of root, usually "/root/.trinity".
- *          Note that the setting of $HOME is ignored in this case.
- *
- * @see TDEGlobalSettings
- */
-class TDECORE_EXPORT TDEStandardDirs
-{
-public:
-        /**
-	 * TDEStandardDirs' constructor. It just initializes the caches.
-	 **/
-	TDEStandardDirs( );
-
-	/**
-	 * TDEStandardDirs' destructor.
-	 */
-	virtual ~TDEStandardDirs();
-
-	/**
-	 * Adds another search dir to front of the @p fsstnd list.
-	 *
-	 * @li When compiling tdelibs, the prefix is added to this.
-	 * @li TDEDIRS or TDEDIR is taking into account
-	 * @li Additional dirs may be loaded from kdeglobals.
-	 *
-	 * @param dir The directory to append relative paths to.
-	 */
-	void addPrefix( const TQString& dir );
-
-	/**
-	 * Adds another search dir to front of the XDG_CONFIG_XXX list
-	 * of prefixes.
-	 * This prefix is only used for resources that start with "xdgconf-"
-	 *
-	 * @param dir The directory to append relative paths to.
-	 */
-	void addXdgConfigPrefix( const TQString& dir );
-
-	/**
-	 * Adds another search dir to front of the XDG_DATA_XXX list
-	 * of prefixes.
-	 * This prefix is only used for resources that start with "xdgdata-"
-	 *
-	 * @param dir The directory to append relative paths to.
-	 */
-	void addXdgDataPrefix( const TQString& dir );
-
-	/**
-	 * Adds suffixes for types.
-	 *
-	 * You may add as many as you need, but it is advised that there
-	 * is exactly one to make writing definite.
-	 * All basic types ( kde_default) are added by addKDEDefaults(),
-	 * but for those you can add more relative paths as well.
-	 *
-	 * The later a suffix is added, the higher its priority. Note, that the
-	 * suffix should end with / but doesn't have to start with one (as prefixes
-	 * should end with one). So adding a suffix for app_pics would look
-	 * like TDEGlobal::dirs()->addResourceType("app_pics", "share/app/pics");
-	 *
-	 * @param type Specifies a short descriptive string to access
-	 * files of this type.
-	 * @param relativename Specifies a directory relative to the root
-	 * of the KFSSTND.
-	 * @return true if successful, false otherwise.
-	 */
-	bool addResourceType( const char *type,
-			      const TQString& relativename );
-
-	/**
-	 * Adds absolute path at the end of the search path for
-	 * particular types (for example in case of icons where
-	 * the user specifies extra paths).
-	 *
-	 * You shouldn't need this
-	 * function in 99% of all cases besides adding user-given
-	 * paths.
-	 *
-	 * @param type Specifies a short descriptive string to access files
-	 * of this type.
-	 * @param absdir Points to directory where to look for this specific
-	 * type. Non-existant directories may be saved but pruned.
-	 * @return true if successful, false otherwise.
-	 */
-	bool addResourceDir( const char *type,
-			     const TQString& absdir);
-
-	/**
-	 * Tries to find a resource in the following order:
-	 * @li All PREFIX/\<relativename> paths (most recent first).
-	 * @li All absolute paths (most recent first).
-	 *
-	 * The filename should be a filename relative to the base dir
-	 * for resources. So is a way to get the path to libtdecore.la
-	 * to findResource("lib", "libtdecore.la"). TDEStandardDirs will
-	 * then look into the subdir lib of all elements of all prefixes
-	 * ($TDEDIRS) for a file libtdecore.la and return the path to
-	 * the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
-	 *
-	 * @param type The type of the wanted resource
-	 * @param filename A relative filename of the resource.
-	 *
-	 * @return A full path to the filename specified in the second
-	 *         argument, or TQString::null if not found.
-	 */
-	TQString findResource( const char *type,
-			      const TQString& filename ) const;
-
-	/**
-	 * Checks whether a resource is restricted as part of the KIOSK
-	 * framework. When a resource is restricted it means that user-
-	 * specific files in the resource are ignored.
-	 *
-	 * E.g. by restricting the "wallpaper" resource, only system-wide
-	 * installed wallpapers will be found by this class. Wallpapers
-	 * installed under the $TDEHOME directory will be ignored.
-	 *
-	 * @param type The type of the resource to check
-	 * @param relPath A relative path in the resource.
-	 *
-	 * @return True if the resource is restricted.
-	 * @since 3.1
-	 */
-	bool isRestrictedResource( const char *type,
-			      const TQString& relPath=TQString::null ) const;
-
-        /**
-         * Returns a number that identifies this version of the resource.
-         * When a change is made to the resource this number will change.
-         *
-	 * @param type The type of the wanted resource
-	 * @param filename A relative filename of the resource.
-	 * @param deep If true, all resources are taken into account
-	 *        otherwise only the one returned by findResource().
-	 *
-	 * @return A number identifying the current version of the
-	 *          resource.
-	 */
-	TQ_UINT32 calcResourceHash( const char *type,
-			      const TQString& filename, bool deep) const;
-
-	/**
-	 * Tries to find all directories whose names consist of the
-	 * specified type and a relative path. So would
-	 * findDirs("apps", "Settings") return
-	 * @li /opt/kde/share/applnk/Settings/
-	 * @li /home/joe/.trinity/share/applnk/Settings/
-	 *
-	 * Note that it appends / to the end of the directories,
-	 * so you can use this right away as directory names.
-	 *
-	 * @param type The type of the base directory.
-	 * @param reldir Relative directory.
-	 *
-	 * @return A list of matching directories, or an empty
-	 *         list if the resource specified is not found.
-	 */
-	TQStringList findDirs( const char *type,
-                              const TQString& reldir ) const;
-
-	/**
-	 * Tries to find the directory the file is in.
-	 * It works the same as findResource(), but it doesn't
-	 * return the filename but the name of the directory.
-	 *
-	 * This way the application can access a couple of files
-	 * that have been installed into the same directory without
-	 * having to look for each file.
-	 *
-	 * findResourceDir("lib", "libtdecore.la") would return the
-	 * path of the subdir libtdecore.la is found first in
-	 * (e.g. /opt/kde/lib/)
-	 *
-	 * @param type The type of the wanted resource
-	 * @param filename A relative filename of the resource.
-	 * @return The directory where the file specified in the second
-	 *         argument is located, or TQString::null if the type
-	 *         of resource specified is unknown or the resource
-	 *         cannot be found.
-	 */
-	TQString findResourceDir( const char *type,
-				 const TQString& filename) const;
-
-
-	/**
-	 * Tries to find all resources with the specified type.
-	 *
-	 * The function will look into all specified directories
-	 * and return all filenames in these directories.
-	 *
-	 * @param type The type of resource to locate directories for.
-	 * @param filter Only accept filenames that fit to filter. The filter
-	 *        may consist of an optional directory and a QRegExp
-	 *        wildcard expression. E.g. "images\*.jpg". Use TQString::null
-	 *        if you do not want a filter.
-	 * @param recursive Specifies if the function should decend
-	 *        into subdirectories.
-	 * @param unique If specified,  only return items which have
-	 *        unique suffixes - suppressing duplicated filenames.
-	 *
-	 * @return List of all the files whose filename matches the
-	 *         specified filter.
-	 */
-	TQStringList findAllResources( const char *type,
-				       const TQString& filter = TQString::null,
-				       bool recursive = false,
-				       bool unique = false) const;
-
-	/**
-	 * Tries to find all resources with the specified type.
-	 *
-	 * The function will look into all specified directories
-	 * and return all filenames (full and relative paths) in
-	 * these directories.
-	 *
-	 * @param type The type of resource to locate directories for.
-	 * @param filter Only accept filenames that fit to filter. The filter
-	 *        may consist of an optional directory and a QRegExp
-	 *        wildcard expression. E.g. "images\*.jpg". Use TQString::null
-	 *        if you do not want a filter.
-	 * @param recursive Specifies if the function should decend
-	 *        into subdirectories.
-	 * @param unique If specified,  only return items which have
-	 *        unique suffixes.
-	 * @param relPaths The list to store the relative paths into
-	 *        These can be used later to ::locate() the file
-	 *
-	 * @return List of all the files whose filename matches the
-	 *         specified filter.
-	 */
-	TQStringList findAllResources( const char *type,
-				       const TQString& filter,
-				       bool recursive,
-				       bool unique,
-				       TQStringList &relPaths) const;
-
-	/**
-	 * Returns a TQStringList list of pathnames in the system path.
-	 *
-	 * @param pstr  The path which will be searched. If this is
-	 * 		null (default), the $PATH environment variable will
-	 *		be searched.
-	 *
-	 * @return a TQStringList list of pathnames in the system path.
-	 */
-	static TQStringList systemPaths( const TQString& pstr=TQString::null );
-
-	/**
-	 * Finds the executable in the system path.
-	 *
-	 * A valid executable must
-	 * be a file and have its executable bit set.
-	 *
-	 * @param appname The name of the executable file for which to search.
-	 * @param pathstr The path which will be searched. If this is
-	 * 		null (default), the $PATH environment variable will
-	 *		be searched.
-	 * @param ignoreExecBit	If true, an existing file will be returned
-	 *			even if its executable bit is not set.
-	 *
-	 * @return The path of the executable. If it was not found,
-	 *         it will return TQString::null.
-	 * @see findAllExe()
-	 */
-	static TQString findExe( const TQString& appname,
-				const TQString& pathstr=TQString::null,
-				bool ignoreExecBit=false );
-
-	/**
-	 * Finds all occurrences of an executable in the system path.
-	 *
-	 * @param list	Will be filled with the pathnames of all the
-	 *		executables found. Will be empty if the executable
-	 *		was not found.
-	 * @param appname	The name of the executable for which to
-	 *	 		search.
-	 * @param pathstr	The path list which will be searched. If this
-	 *		is 0 (default), the $PATH environment variable will
-	 *		be searched.
-	 * @param ignoreExecBit If true, an existing file will be returned
-	 *			even if its executable bit is not set.
-	 *
-	 * @return The number of executables found, 0 if none were found.
-	 *
-	 * @see	findExe()
-	 */
-	static int findAllExe( TQStringList& list, const TQString& appname,
-			       const TQString& pathstr=TQString::null,
-			       bool ignoreExecBit=false );
-
-	/**
-	 * This function adds the defaults that are used by the current
-	 * KDE version.
-	 *
-	 * It's a series of addResourceTypes()
-	 * and addPrefix() calls.
-	 * You normally wouldn't call this function because it's called
-	 * for you from TDEGlobal.
-	 */
-	void addKDEDefaults();
-
-	/**
-	 * Reads customized entries out of the given config object and add
-	 * them via addResourceDirs().
-	 *
-	 * @param config The object the entries are read from. This should
-	 *        contain global config files
-	 * @return true if new config paths have been added
-	 * from @p config.
-	 **/
-	bool addCustomized(TDEConfig *config);
-
-	/**
-	 * This function is used internally by almost all other function as
-	 * it serves and fills the directories cache.
-         *
-	 * @param type The type of resource
-	 * @return The list of possible directories for the specified @p type.
-	 * The function updates the cache if possible.  If the resource
-	 * type specified is unknown, it will return an empty list.
-         * Note, that the directories are assured to exist beside the save
-         * location, which may not exist, but is returned anyway.
-	 */
-	TQStringList resourceDirs(const char *type) const;
-
-	/**
-	 * This function will return a list of all the types that TDEStandardDirs
-	 * supports.
-	 *
-	 * @return All types that KDE supports
-	 */
-	TQStringList allTypes() const;
-
-	/**
-	 * Finds a location to save files into for the given type
-	 * in the user's home directory.
-	 *
-	 * @param type The type of location to return.
-	 * @param suffix A subdirectory name.
-	 *             Makes it easier for you to create subdirectories.
-	 *   You can't pass filenames here, you _have_ to pass
-	 *       directory names only and add possible filename in
-	 *       that directory yourself. A directory name always has a
- 	 *       trailing slash ('/').
-	 * @param create If set, saveLocation() will create the directories
-	 *        needed (including those given by @p suffix).
-	 *
-	 * @return A path where resources of the specified type should be
-	 *         saved, or TQString::null if the resource type is unknown.
-	 */
-	 TQString saveLocation(const char *type,
-			      const TQString& suffix = TQString::null,
-			      bool create = true) const;
-
-        /**
-         * Converts an absolute path to a path relative to a certain
-         * resource.
-         *
-         * If "abs = ::locate(resource, rel)"
-         * then "rel = relativeLocation(resource, abs)" and vice versa.
-         *
-         * @param type The type of resource.
-         *
-         * @param absPath An absolute path to make relative.
-         *
-         * @return A relative path relative to resource @p type that
-         * will find @p absPath. If no such relative path exists, absPath
-         * will be returned unchanged.
-         */
-         TQString relativeLocation(const char *type, const TQString &absPath);
-
-	/**
-	 * Recursively creates still-missing directories in the given path.
-	 *
-	 * The resulting permissions will depend on the current umask setting.
-	 * permission = mode & ~umask.
-	 *
-	 * @param dir Absolute path of the directory to be made.
-	 * @param mode Directory permissions.
-	 * @return true if successful, false otherwise
-	 */
-	static bool makeDir(const TQString& dir, int mode = 0755);
-
-	/**
-	 * This returns a default relative path for the standard KDE
-	 * resource types. Below is a list of them so you get an idea
-	 * of what this is all about.
-	 *
-	 * @li data - share/apps
-	 * @li html - share/doc/tde/HTML
-	 * @li icon - share/icon
-	 * @li config - share/config
-	 * @li pixmap - share/pixmaps
-	 * @li apps - share/applnk
-	 * @li sound - share/sounds
-	 * @li locale - share/locale
-	 * @li services - share/services
-	 * @li servicetypes - share/servicetypes
-	 * @li mime - share/mimelnk
-	 * @li wallpaper - share/wallpapers
-	 * @li templates - share/templates
-	 * @li exe - bin
-	 * @li lib - lib
-	 *
-	 * @returns Static default for the specified resource.  You
-	 *          should probably be using locate() or locateLocal()
-	 *          instead.
-	 * @see locate()
-	 * @see locateLocal()
-	 */
-	static TQString kde_default(const char *type);
-
-	/**
-	 * @internal (for use by sycoca only)
-	 */
-	TQString kfsstnd_prefixes();
-
-	/**
-	 * @internal (for use by sycoca only)
-	 */
-	TQString kfsstnd_xdg_conf_prefixes();
-
-	/**
-	 * @internal (for use by sycoca only)
-	 */
-	TQString kfsstnd_xdg_data_prefixes();
-
-	/**
-	 * Returns the toplevel directory in which TDEStandardDirs
-	 * will store things. Most likely $HOME/.trinity
-	 * Don't use this function if you can use locateLocal
-	 * @return the toplevel directory
-	 */
-	TQString localtdedir() const;
-
-	/**
-	 * @internal
-	 * Returns the default toplevel directory where KDE is installed.
-	 */
-	static TQString kfsstnd_defaultprefix();
-
-	/**
-	 * @internal
-	 * Returns the default bin directory in which KDE executables are stored.
-	 */
-	static TQString kfsstnd_defaultbindir();
-
-	/**
-	 * @return $XDG_DATA_HOME
-	 * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
-	 */
-	TQString localxdgdatadir() const;
-
-	/**
-	 * @return $XDG_CONFIG_HOME
-	 * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
-	 */
-	TQString localxdgconfdir() const;
-
-	/**
-	 * Checks for existence and accessability of a file or directory.
-	 * Faster than creating a TQFileInfo first.
-	 * @param fullPath the path to check. IMPORTANT: must end with a slash if expected to be a directory
-	 *                 (and no slash for a file, obviously).
-	 * @return true if the directory exists
-	 */
-	static bool exists(const TQString &fullPath);
-
-	/**
-	 * Expands all symbolic links and resolves references to
-	 * '/./', '/../' and extra  '/' characters in @p dirname
-	 * and returns the canonicalized absolute pathname.
-	 * The resulting path will have no symbolic link, '/./'
-	 * or '/../' components.
-	 * @since 3.1
-	 */
-	static TQString realPath(const TQString &dirname);
-
-	/**
-	 * Expands all symbolic links and resolves references to
-	 * '/./', '/../' and extra  '/' characters in @p filename
-	 * and returns the canonicalized absolute pathname.
-	 * The resulting path will have no symbolic link, '/./'
-	 * or '/../' components.
-	 * @since 3.4
-	 */
-	static TQString realFilePath(const TQString &filename);
-
- private:
-
-	TQStringList prefixes;
-
-	// Directory dictionaries
-	TQDict<TQStringList> absolutes;
-	TQDict<TQStringList> relatives;
-
-	mutable TQDict<TQStringList> dircache;
-	mutable TQDict<TQString> savelocations;
-
-	// Disallow assignment and copy-construction
-	TDEStandardDirs( const TDEStandardDirs& );
-	TDEStandardDirs& operator= ( const TDEStandardDirs& );
-
-	bool addedCustoms;
-
-	class TDEStandardDirsPrivate;
-	TDEStandardDirsPrivate *d;
-
-	void checkConfig() const;
-	void applyDataRestrictions(const TQString &) const;
-	void createSpecialResource(const char*);
-
-        // Like their public counter parts but with an extra priority argument
-        // If priority is true, the directory is added directly after
-        // $TDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
-	void addPrefix( const TQString& dir, bool priority );
-	void addXdgConfigPrefix( const TQString& dir, bool priority );
-	void addXdgDataPrefix( const TQString& dir, bool priority );
-
-	// If priority is true, the directory is added before any other,
-	// otherwise after
-	bool addResourceType( const char *type,
-			      const TQString& relativename, bool priority );
-	bool addResourceDir( const char *type,
-			     const TQString& absdir, bool priority);
-};
-
-/**
- * \addtogroup locates Locate Functions
- *  @{
- * On The Usage Of 'locate' and 'locateLocal'
- *
- * Typical KDE applications use resource files in one out of
- * three ways:
- *
- * 1) A resource file is read but is never written. A system
- *    default is supplied but the user can override this
- *    default in his local .kde directory:
- *
- *    \code
- *    // Code example
- *    myFile = locate("appdata", "groups.lst");
- *    myData =  myReadGroups(myFile); // myFile may be null
- *    \endcode
- *
- * 2) A resource file is read and written. If the user has no
- *    local version of the file the system default is used.
- *    The resource file is always written to the users local
- *    .kde directory.
- *
- *    \code
- *    // Code example
- *    myFile = locate("appdata", "groups.lst")
- *    myData =  myReadGroups(myFile);
- *    ...
- *    doSomething(myData);
- *    ...
- *    myFile = locateLocal("appdata", "groups.lst");
- *    myWriteGroups(myFile, myData);
- *    \endcode
- *
- * 3) A resource file is read and written. No system default
- *    is used if the user has no local version of the file.
- *    The resource file is always written to the users local
- *    .kde directory.
- *
- *    \code
- *    // Code example
- *    myFile = locateLocal("appdata", "groups.lst");
- *    myData =  myReadGroups(myFile);
- *    ...
- *    doSomething(myData);
- *    ...
- *    myFile = locateLocal("appdata", "groups.lst");
- *    myWriteGroups(myFile, myData);
- *    \endcode
- **/
-
-/*!
- * \relates TDEStandardDirs
- * This function is just for convenience. It simply calls
- *instance->dirs()->\link TDEStandardDirs::findResource() findResource\endlink(type, filename).
- **/
-TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
-
-/*!
- * \relates TDEStandardDirs
- * This function is much like locate. However it returns a
- * filename suitable for writing to. No check is made if the
- * specified filename actually exists. Missing directories
- * are created. If filename is only a directory, without a
- * specific file, filename must have a trailing slash.
- *
- **/
-TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
-
-/*!
- * \relates TDEStandardDirs
- * This function is much like locate. No check is made if the
- * specified filename actually exists. Missing directories
- * are created if @p createDir is true. If filename is only
- * a directory, without a specific file,
- * filename must have a trailing slash.
- *
- **/
-TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = TDEGlobal::instance() );
-
-/*! @} */
-
-#endif // _KSTANDARDDIRS_H
+#include "tdestandarddirs.h"
diff --git a/tdecore/kstddirs.h b/tdecore/kstddirs.h
deleted file mode 100644
index a009a750d..000000000
--- a/tdecore/kstddirs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// kstddirs.h is the old name, use #include <kstandarddirs.h> from now on
-#ifdef KDE_NO_COMPAT
-#error kstddirs.h is the old name, use #include <kstandarddirs.h> from now on
-#else
-#include <kstandarddirs.h>
-#endif
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index a11e582f2..db954010e 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -51,7 +51,7 @@
 #include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempdir.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "tdeprocess.h"
 #include <kdebug.h>
 #include "kde_file.h"
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index c10c64e97..ed083f541 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -45,7 +45,7 @@
 
 #include "kdebug.h"
 #include "tdeglobal.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "tdeapplication.h"
 
 #include "kresolver.h"
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 14553d2e7..7c1eebbd2 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -1,7 +1,7 @@
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
 #include <stdio.h>
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index 86394d75d..2373a7a13 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -1,7 +1,7 @@
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
 #include <stdio.h>
diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp
index 48f41645d..318a38d50 100644
--- a/tdecore/tdeaboutdata.cpp
+++ b/tdecore/tdeaboutdata.cpp
@@ -21,7 +21,7 @@
 
 
 #include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 985817732..fb11f90d4 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -69,7 +69,7 @@
 #endif
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdestyle.h>
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index 68307dc85..4f67d5681 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -37,7 +37,7 @@
 
 #include "tdeconfig.h"
 #include "tdeglobal.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kstaticdeleter.h"
 #include <tqtimer.h>
 
diff --git a/tdecore/tdeconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp
index 6085fa6eb..ee1233e54 100644
--- a/tdecore/tdeconfig_compiler/example/autoexample.cpp
+++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp
@@ -31,7 +31,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfigdialog.h>
 
 #include <tqlabel.h>
diff --git a/tdecore/tdeconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp
index 157570d98..662e60d0f 100644
--- a/tdecore/tdeconfig_compiler/example/example.cpp
+++ b/tdecore/tdeconfig_compiler/example/example.cpp
@@ -28,7 +28,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index b950a3288..ec4b16b96 100644
--- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -34,7 +34,7 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <iostream>
 
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 43dc6eb0a..707f4fe69 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -45,7 +45,7 @@
 #include <tdeglobal.h>
 #include <tdeprocess.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksavefile.h>
 #include <kurl.h>
 #include <kde_file.h>
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index 39e491279..3f44fbc7e 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -35,7 +35,7 @@
 #include "tdeconfigbase.h"
 #include "tdeconfigbackend.h"
 #include "kdebug.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kstringhandler.h"
 
 class TDEConfigBase::TDEConfigBasePrivate
diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index 03dac6156..dafe485fc 100644
--- a/tdecore/tdeconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -23,7 +23,7 @@
 #include <tqvariant.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
 #include <kdebug.h>
diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp
index aeac6f744..f00a8467c 100644
--- a/tdecore/tdeglobal.cpp
+++ b/tdecore/tdeglobal.cpp
@@ -38,7 +38,7 @@
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 #endif
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinstance.h>
 #include "kstaticdeleter.h"
 
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 8540a4435..526970e1c 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -42,7 +42,7 @@ static TQRgb qt_colorref2qrgb(COLORREF col)
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdeshortcut.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kcharsets.h>
 #include <tdeaccel.h>
 #include <tdelocale.h>
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 59db6d0ae..a9e9be9da 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeglobal.h>
 #include <tdelocale.h>
diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp
index cb9016062..65194374d 100644
--- a/tdecore/tdehw/tderootsystemdevice.cpp
+++ b/tdecore/tdehw/tderootsystemdevice.cpp
@@ -28,7 +28,7 @@
 #include "tdeglobal.h"
 #include "tdeconfig.h"
 #include "tdeapplication.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 #include "config.h"
 
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index df5f90ab7..4ef9e71eb 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -34,7 +34,7 @@
 #include "tdeglobal.h"
 #include "kiconloader.h"
 #include "tdetempfile.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "tdehardwaredevices.h"
 #include "disksHelper.h"
 
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 3c6dc0cc8..07f3eea21 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -33,7 +33,7 @@
 
 #include "kcatalogue.h"
 #include "tdeglobal.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "ksimpleconfig.h"
 #include "kinstance.h"
 #include "tdeconfig.h"
diff --git a/tdecore/tdeprocess.cpp b/tdecore/tdeprocess.cpp
index e60f30118..185bd5a6f 100644
--- a/tdecore/tdeprocess.cpp
+++ b/tdecore/tdeprocess.cpp
@@ -72,7 +72,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kuser.h>
 
 
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/tdestandarddirs.cpp
similarity index 99%
rename from tdecore/kstandarddirs.cpp
rename to tdecore/tdestandarddirs.cpp
index 8a0b59c5f..89889367a 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/tdestandarddirs.cpp
@@ -1,4 +1,4 @@
-/* This file is part of the KDE libraries
+/* This file is part of the TDE libraries
    Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org>
    Copyright (C) 1999 Stephan Kulow <coolo@kde.org>
    Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
@@ -46,7 +46,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "tdeconfig.h"
 #include "kinstance.h"
 #include "kshell.h"
@@ -74,7 +74,7 @@ public:
    TQStringList xdgconf_prefixes;
 };
 
-// Singleton, with data shared by all kstandarddirs instances.
+// Singleton, with data shared by all tdestandarddirs instances.
 // Used in static methods like findExe()
 class TDEStandardDirsSingleton
 {
diff --git a/tdecore/tdestandarddirs.h b/tdecore/tdestandarddirs.h
new file mode 100644
index 000000000..b221ecd41
--- /dev/null
+++ b/tdecore/tdestandarddirs.h
@@ -0,0 +1,729 @@
+/*
+  This file is part of the TDE libraries
+  Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org>
+  Copyright (C) 1999 Stephan Kulow <coolo@kde.org>
+  Copyright (C) 1999 Waldo Bastian <bastian@kde.org>
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _TDESTANDARDDIRS_H
+#define _TDESTANDARDDIRS_H
+
+#include <tqstring.h>
+#include <tqdict.h>
+#include <tqstringlist.h>
+#include <tdeglobal.h>
+
+class TDEConfig;
+class TDEStandardDirsPrivate;
+
+/**
+ * @short Site-independent access to standard TDE directories.
+ * @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org>
+ *
+ * This is one of the most central classes in tdelibs as
+ * it provides a basic service: It knows where the files
+ * reside on the user's hard disk. And it's meant to be the
+ * only one that knows -- to make the real location as
+ * transparent as possible to both the user and the applications.
+ *
+ * To this end it insulates the application from all information
+ * and applications always refer to a file with a resource type
+ * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world
+ * the application would make no assumption where this file is and
+ * leave it up to TDEStandardDirs::findResource("apps", "Home.desktop")
+ * to apply this knowledge to return /opt/trinity/share/applnk/Home.desktop
+ * or ::locate("data", "kgame/background.jpg") to return
+ * /opt/trinity/share/apps/kgame/background.jpg
+ *
+ * The main idea behind TDEStandardDirs is that there are several
+ * toplevel prefixes below which the files lie. One of these prefixes is
+ * the one where the user installed tdelibs, one is where the
+ * application was installed, and one is $HOME/.trinity, but there
+ * may be even more. Under these prefixes there are several well
+ * defined suffixes where specific resource types are to be found.
+ * For example, for the resource type "html" the suffixes could be
+ * share/doc/HTML and share/doc/tde/HTML.
+ * So the search algorithm basically appends to each prefix each registered
+ * suffix and tries to locate the file there.
+ * To make the thing even more complex, it's also possible to register
+ * absolute paths that TDEStandardDirs looks up after not finding anything
+ * in the former steps. They can be useful if the user wants to provide
+ * specific directories that aren't in his $HOME/.trinity directory for,
+ * for example, icons.
+ *
+ * <b>Standard resources that tdelibs allocates are:</b>\n
+ *
+ * @li apps - Applications menu (.desktop files).
+ * @li cache - Cached information (e.g. favicons, web-pages)
+ * @li cgi - CGIs to run from tdehelp.
+ * @li config - Configuration files.
+ * @li data - Where applications store data.
+ * @li exe - Executables in $prefix/bin. findExe() for a function that takes $PATH into account.
+ * @li html - HTML documentation.
+ * @li icon - Icons, see TDEIconLoader.
+ * @li lib - Libraries.
+ * @li locale - Translation files for TDELocale.
+ * @li mime - Mime types.
+ * @li module - Module (dynamically loaded library).
+ * @li tqtplugins - TQt plugins (dynamically loaded objects for TQt)
+ * @li services - Services.
+ * @li servicetypes - Service types.
+ * @li scripts - Application scripting additions.
+ * @li sound - Application sounds.
+ * @li templates - Templates
+ * @li wallpaper - Wallpapers.
+ * @li tmp - Temporary files (specific for both current host and current user)
+ * @li socket - UNIX Sockets (specific for both current host and current user)
+ * @li emoticons - Emoticons themes  (Since KDE 3.4)
+ *
+ * A type that is added by the class TDEApplication if you use it, is
+ * appdata. This one makes the use of the type data a bit easier as it
+ * appends the name of the application.
+ * So while you had to ::locate("data", "appname/filename") so you can
+ * also write ::locate("appdata", "filename") if your TDEApplication instance
+ * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
+ * you use the global TDEStandardDirs object TDEGlobal::dirs()).
+ * Please note though that you cannot use the "appdata"
+ * type if you intend to use it in an applet for Kicker because 'appname' would
+ * be "Kicker" instead of the applet's name. Therefore, for applets, you've got
+ * to work around this by using ::locate("data", "appletname/filename").
+ *
+ * <b>TDEStandardDirs supports the following environment variables:</b>
+ *
+ * @li TDEDIRS: This may set an additional number of directory prefixes to
+ *          search for resources. The directories should be separated
+ *          by ':'. The directories are searched in the order they are
+ *          specified.
+ * @li TDEDIR:  Used for backwards compatibility. As TDEDIRS but only a single
+ *          directory may be specified. If TDEDIRS is set TDEDIR is
+ *          ignored.
+ * @li TDEHOME: The directory where changes are saved to. This directory is
+ *          used to search for resources first. If TDEHOME is not
+ *          specified it defaults to "$HOME/.trinity"
+ * @li TDEROOTHOME: Like TDEHOME, but used for the root user.
+ *          If TDEROOTHOME is not set it defaults to the .trinity directory in the
+ *          home directory of root, usually "/root/.trinity".
+ *          Note that the setting of $HOME is ignored in this case.
+ *
+ * @see TDEGlobalSettings
+ */
+class TDECORE_EXPORT TDEStandardDirs
+{
+public:
+        /**
+	 * TDEStandardDirs' constructor. It just initializes the caches.
+	 **/
+	TDEStandardDirs( );
+
+	/**
+	 * TDEStandardDirs' destructor.
+	 */
+	virtual ~TDEStandardDirs();
+
+	/**
+	 * Adds another search dir to front of the @p fsstnd list.
+	 *
+	 * @li When compiling tdelibs, the prefix is added to this.
+	 * @li TDEDIRS or TDEDIR is taking into account
+	 * @li Additional dirs may be loaded from tdeglobals.
+	 *
+	 * @param dir The directory to append relative paths to.
+	 */
+	void addPrefix( const TQString& dir );
+
+	/**
+	 * Adds another search dir to front of the XDG_CONFIG_XXX list
+	 * of prefixes.
+	 * This prefix is only used for resources that start with "xdgconf-"
+	 *
+	 * @param dir The directory to append relative paths to.
+	 */
+	void addXdgConfigPrefix( const TQString& dir );
+
+	/**
+	 * Adds another search dir to front of the XDG_DATA_XXX list
+	 * of prefixes.
+	 * This prefix is only used for resources that start with "xdgdata-"
+	 *
+	 * @param dir The directory to append relative paths to.
+	 */
+	void addXdgDataPrefix( const TQString& dir );
+
+	/**
+	 * Adds suffixes for types.
+	 *
+	 * You may add as many as you need, but it is advised that there
+	 * is exactly one to make writing definite.
+	 * All basic types (kde_default) are added by addKDEDefaults(),
+	 * but for those you can add more relative paths as well.
+	 *
+	 * The later a suffix is added, the higher its priority. Note, that the
+	 * suffix should end with / but doesn't have to start with one (as prefixes
+	 * should end with one). So adding a suffix for app_pics would look
+	 * like TDEGlobal::dirs()->addResourceType("app_pics", "share/app/pics");
+	 *
+	 * @param type Specifies a short descriptive string to access
+	 * files of this type.
+	 * @param relativename Specifies a directory relative to the root
+	 * of the KFSSTND.
+	 * @return true if successful, false otherwise.
+	 */
+	bool addResourceType( const char *type,
+			      const TQString& relativename );
+
+	/**
+	 * Adds absolute path at the end of the search path for
+	 * particular types (for example in case of icons where
+	 * the user specifies extra paths).
+	 *
+	 * You shouldn't need this
+	 * function in 99% of all cases besides adding user-given
+	 * paths.
+	 *
+	 * @param type Specifies a short descriptive string to access files
+	 * of this type.
+	 * @param absdir Points to directory where to look for this specific
+	 * type. Non-existant directories may be saved but pruned.
+	 * @return true if successful, false otherwise.
+	 */
+	bool addResourceDir( const char *type,
+			     const TQString& absdir);
+
+	/**
+	 * Tries to find a resource in the following order:
+	 * @li All PREFIX/\<relativename> paths (most recent first).
+	 * @li All absolute paths (most recent first).
+	 *
+	 * The filename should be a filename relative to the base dir
+	 * for resources. So is a way to get the path to libtdecore.la
+	 * to findResource("lib", "libtdecore.la"). TDEStandardDirs will
+	 * then look into the subdir lib of all elements of all prefixes
+	 * ($TDEDIRS) for a file libtdecore.la and return the path to
+	 * the first one it finds (e.g. /opt/trinity/lib/libtdecore.la)
+	 *
+	 * @param type The type of the wanted resource
+	 * @param filename A relative filename of the resource.
+	 *
+	 * @return A full path to the filename specified in the second
+	 *         argument, or TQString::null if not found.
+	 */
+	TQString findResource( const char *type,
+			      const TQString& filename ) const;
+
+	/**
+	 * Checks whether a resource is restricted as part of the KIOSK
+	 * framework. When a resource is restricted it means that user-
+	 * specific files in the resource are ignored.
+	 *
+	 * E.g. by restricting the "wallpaper" resource, only system-wide
+	 * installed wallpapers will be found by this class. Wallpapers
+	 * installed under the $TDEHOME directory will be ignored.
+	 *
+	 * @param type The type of the resource to check
+	 * @param relPath A relative path in the resource.
+	 *
+	 * @return True if the resource is restricted.
+	 * @since 3.1
+	 */
+	bool isRestrictedResource( const char *type,
+			      const TQString& relPath=TQString::null ) const;
+
+        /**
+         * Returns a number that identifies this version of the resource.
+         * When a change is made to the resource this number will change.
+         *
+	 * @param type The type of the wanted resource
+	 * @param filename A relative filename of the resource.
+	 * @param deep If true, all resources are taken into account
+	 *        otherwise only the one returned by findResource().
+	 *
+	 * @return A number identifying the current version of the
+	 *          resource.
+	 */
+	TQ_UINT32 calcResourceHash( const char *type,
+			      const TQString& filename, bool deep) const;
+
+	/**
+	 * Tries to find all directories whose names consist of the
+	 * specified type and a relative path. So would
+	 * findDirs("apps", "Settings") return
+	 * @li /opt/trinity/share/applnk/Settings/
+	 * @li /home/joe/.trinity/share/applnk/Settings/
+	 *
+	 * Note that it appends / to the end of the directories,
+	 * so you can use this right away as directory names.
+	 *
+	 * @param type The type of the base directory.
+	 * @param reldir Relative directory.
+	 *
+	 * @return A list of matching directories, or an empty
+	 *         list if the resource specified is not found.
+	 */
+	TQStringList findDirs( const char *type,
+                              const TQString& reldir ) const;
+
+	/**
+	 * Tries to find the directory the file is in.
+	 * It works the same as findResource(), but it doesn't
+	 * return the filename but the name of the directory.
+	 *
+	 * This way the application can access a couple of files
+	 * that have been installed into the same directory without
+	 * having to look for each file.
+	 *
+	 * findResourceDir("lib", "libtdecore.la") would return the
+	 * path of the subdir libtdecore.la is found first in
+	 * (e.g. /opt/trinity/lib/)
+	 *
+	 * @param type The type of the wanted resource
+	 * @param filename A relative filename of the resource.
+	 * @return The directory where the file specified in the second
+	 *         argument is located, or TQString::null if the type
+	 *         of resource specified is unknown or the resource
+	 *         cannot be found.
+	 */
+	TQString findResourceDir( const char *type,
+				 const TQString& filename) const;
+
+
+	/**
+	 * Tries to find all resources with the specified type.
+	 *
+	 * The function will look into all specified directories
+	 * and return all filenames in these directories.
+	 *
+	 * @param type The type of resource to locate directories for.
+	 * @param filter Only accept filenames that fit to filter. The filter
+	 *        may consist of an optional directory and a QRegExp
+	 *        wildcard expression. E.g. "images\*.jpg". Use TQString::null
+	 *        if you do not want a filter.
+	 * @param recursive Specifies if the function should decend
+	 *        into subdirectories.
+	 * @param unique If specified,  only return items which have
+	 *        unique suffixes - suppressing duplicated filenames.
+	 *
+	 * @return List of all the files whose filename matches the
+	 *         specified filter.
+	 */
+	TQStringList findAllResources( const char *type,
+				       const TQString& filter = TQString::null,
+				       bool recursive = false,
+				       bool unique = false) const;
+
+	/**
+	 * Tries to find all resources with the specified type.
+	 *
+	 * The function will look into all specified directories
+	 * and return all filenames (full and relative paths) in
+	 * these directories.
+	 *
+	 * @param type The type of resource to locate directories for.
+	 * @param filter Only accept filenames that fit to filter. The filter
+	 *        may consist of an optional directory and a QRegExp
+	 *        wildcard expression. E.g. "images\*.jpg". Use TQString::null
+	 *        if you do not want a filter.
+	 * @param recursive Specifies if the function should decend
+	 *        into subdirectories.
+	 * @param unique If specified,  only return items which have
+	 *        unique suffixes.
+	 * @param relPaths The list to store the relative paths into
+	 *        These can be used later to ::locate() the file
+	 *
+	 * @return List of all the files whose filename matches the
+	 *         specified filter.
+	 */
+	TQStringList findAllResources( const char *type,
+				       const TQString& filter,
+				       bool recursive,
+				       bool unique,
+				       TQStringList &relPaths) const;
+
+	/**
+	 * Returns a TQStringList list of pathnames in the system path.
+	 *
+	 * @param pstr  The path which will be searched. If this is
+	 * 		null (default), the $PATH environment variable will
+	 *		be searched.
+	 *
+	 * @return a TQStringList list of pathnames in the system path.
+	 */
+	static TQStringList systemPaths( const TQString& pstr=TQString::null );
+
+	/**
+	 * Finds the executable in the system path.
+	 *
+	 * A valid executable must
+	 * be a file and have its executable bit set.
+	 *
+	 * @param appname The name of the executable file for which to search.
+	 * @param pathstr The path which will be searched. If this is
+	 * 		null (default), the $PATH environment variable will
+	 *		be searched.
+	 * @param ignoreExecBit	If true, an existing file will be returned
+	 *			even if its executable bit is not set.
+	 *
+	 * @return The path of the executable. If it was not found,
+	 *         it will return TQString::null.
+	 * @see findAllExe()
+	 */
+	static TQString findExe( const TQString& appname,
+				const TQString& pathstr=TQString::null,
+				bool ignoreExecBit=false );
+
+	/**
+	 * Finds all occurrences of an executable in the system path.
+	 *
+	 * @param list	Will be filled with the pathnames of all the
+	 *		executables found. Will be empty if the executable
+	 *		was not found.
+	 * @param appname	The name of the executable for which to
+	 *	 		search.
+	 * @param pathstr	The path list which will be searched. If this
+	 *		is 0 (default), the $PATH environment variable will
+	 *		be searched.
+	 * @param ignoreExecBit If true, an existing file will be returned
+	 *			even if its executable bit is not set.
+	 *
+	 * @return The number of executables found, 0 if none were found.
+	 *
+	 * @see	findExe()
+	 */
+	static int findAllExe( TQStringList& list, const TQString& appname,
+			       const TQString& pathstr=TQString::null,
+			       bool ignoreExecBit=false );
+
+	/**
+	 * This function adds the defaults that are used by the current
+	 * TDE version.
+	 *
+	 * It's a series of addResourceTypes()
+	 * and addPrefix() calls.
+	 * You normally wouldn't call this function because it's called
+	 * for you from TDEGlobal.
+	 */
+	void addKDEDefaults();
+
+	/**
+	 * Reads customized entries out of the given config object and add
+	 * them via addResourceDirs().
+	 *
+	 * @param config The object the entries are read from. This should
+	 *        contain global config files
+	 * @return true if new config paths have been added
+	 * from @p config.
+	 **/
+	bool addCustomized(TDEConfig *config);
+
+	/**
+	 * This function is used internally by almost all other function as
+	 * it serves and fills the directories cache.
+         *
+	 * @param type The type of resource
+	 * @return The list of possible directories for the specified @p type.
+	 * The function updates the cache if possible.  If the resource
+	 * type specified is unknown, it will return an empty list.
+         * Note, that the directories are assured to exist beside the save
+         * location, which may not exist, but is returned anyway.
+	 */
+	TQStringList resourceDirs(const char *type) const;
+
+	/**
+	 * This function will return a list of all the types that TDEStandardDirs
+	 * supports.
+	 *
+	 * @return All types that TDE supports
+	 */
+	TQStringList allTypes() const;
+
+	/**
+	 * Finds a location to save files into for the given type
+	 * in the user's home directory.
+	 *
+	 * @param type The type of location to return.
+	 * @param suffix A subdirectory name.
+	 *             Makes it easier for you to create subdirectories.
+	 *   You can't pass filenames here, you _have_ to pass
+	 *       directory names only and add possible filename in
+	 *       that directory yourself. A directory name always has a
+ 	 *       trailing slash ('/').
+	 * @param create If set, saveLocation() will create the directories
+	 *        needed (including those given by @p suffix).
+	 *
+	 * @return A path where resources of the specified type should be
+	 *         saved, or TQString::null if the resource type is unknown.
+	 */
+	 TQString saveLocation(const char *type,
+			      const TQString& suffix = TQString::null,
+			      bool create = true) const;
+
+        /**
+         * Converts an absolute path to a path relative to a certain
+         * resource.
+         *
+         * If "abs = ::locate(resource, rel)"
+         * then "rel = relativeLocation(resource, abs)" and vice versa.
+         *
+         * @param type The type of resource.
+         *
+         * @param absPath An absolute path to make relative.
+         *
+         * @return A relative path relative to resource @p type that
+         * will find @p absPath. If no such relative path exists, absPath
+         * will be returned unchanged.
+         */
+         TQString relativeLocation(const char *type, const TQString &absPath);
+
+	/**
+	 * Recursively creates still-missing directories in the given path.
+	 *
+	 * The resulting permissions will depend on the current umask setting.
+	 * permission = mode & ~umask.
+	 *
+	 * @param dir Absolute path of the directory to be made.
+	 * @param mode Directory permissions.
+	 * @return true if successful, false otherwise
+	 */
+	static bool makeDir(const TQString& dir, int mode = 0755);
+
+	/**
+	 * This returns a default relative path for the standard TDE
+	 * resource types. Below is a list of them so you get an idea
+	 * of what this is all about.
+	 *
+	 * @li data - share/apps
+	 * @li html - share/doc/tde/HTML
+	 * @li icon - share/icon
+	 * @li config - share/config
+	 * @li pixmap - share/pixmaps
+	 * @li apps - share/applnk
+	 * @li sound - share/sounds
+	 * @li locale - share/locale
+	 * @li services - share/services
+	 * @li servicetypes - share/servicetypes
+	 * @li mime - share/mimelnk
+	 * @li wallpaper - share/wallpapers
+	 * @li templates - share/templates
+	 * @li exe - bin
+	 * @li lib - lib
+	 *
+	 * @returns Static default for the specified resource.  You
+	 *          should probably be using locate() or locateLocal()
+	 *          instead.
+	 * @see locate()
+	 * @see locateLocal()
+	 */
+	static TQString kde_default(const char *type);
+
+	/**
+	 * @internal (for use by sycoca only)
+	 */
+	TQString kfsstnd_prefixes();
+
+	/**
+	 * @internal (for use by sycoca only)
+	 */
+	TQString kfsstnd_xdg_conf_prefixes();
+
+	/**
+	 * @internal (for use by sycoca only)
+	 */
+	TQString kfsstnd_xdg_data_prefixes();
+
+	/**
+	 * Returns the toplevel directory in which TDEStandardDirs
+	 * will store things. Most likely $HOME/.trinity
+	 * Don't use this function if you can use locateLocal
+	 * @return the toplevel directory
+	 */
+	TQString localtdedir() const;
+
+	/**
+	 * @internal
+	 * Returns the default toplevel directory where TDE is installed.
+	 */
+	static TQString kfsstnd_defaultprefix();
+
+	/**
+	 * @internal
+	 * Returns the default bin directory in which TDE executables are stored.
+	 */
+	static TQString kfsstnd_defaultbindir();
+
+	/**
+	 * @return $XDG_DATA_HOME
+	 * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
+	 */
+	TQString localxdgdatadir() const;
+
+	/**
+	 * @return $XDG_CONFIG_HOME
+	 * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
+	 */
+	TQString localxdgconfdir() const;
+
+	/**
+	 * Checks for existence and accessability of a file or directory.
+	 * Faster than creating a TQFileInfo first.
+	 * @param fullPath the path to check. IMPORTANT: must end with a slash if expected to be a directory
+	 *                 (and no slash for a file, obviously).
+	 * @return true if the directory exists
+	 */
+	static bool exists(const TQString &fullPath);
+
+	/**
+	 * Expands all symbolic links and resolves references to
+	 * '/./', '/../' and extra  '/' characters in @p dirname
+	 * and returns the canonicalized absolute pathname.
+	 * The resulting path will have no symbolic link, '/./'
+	 * or '/../' components.
+	 * @since 3.1
+	 */
+	static TQString realPath(const TQString &dirname);
+
+	/**
+	 * Expands all symbolic links and resolves references to
+	 * '/./', '/../' and extra  '/' characters in @p filename
+	 * and returns the canonicalized absolute pathname.
+	 * The resulting path will have no symbolic link, '/./'
+	 * or '/../' components.
+	 * @since 3.4
+	 */
+	static TQString realFilePath(const TQString &filename);
+
+ private:
+
+	TQStringList prefixes;
+
+	// Directory dictionaries
+	TQDict<TQStringList> absolutes;
+	TQDict<TQStringList> relatives;
+
+	mutable TQDict<TQStringList> dircache;
+	mutable TQDict<TQString> savelocations;
+
+	// Disallow assignment and copy-construction
+	TDEStandardDirs( const TDEStandardDirs& );
+	TDEStandardDirs& operator= ( const TDEStandardDirs& );
+
+	bool addedCustoms;
+
+	class TDEStandardDirsPrivate;
+	TDEStandardDirsPrivate *d;
+
+	void checkConfig() const;
+	void applyDataRestrictions(const TQString &) const;
+	void createSpecialResource(const char*);
+
+        // Like their public counter parts but with an extra priority argument
+        // If priority is true, the directory is added directly after
+        // $TDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
+	void addPrefix( const TQString& dir, bool priority );
+	void addXdgConfigPrefix( const TQString& dir, bool priority );
+	void addXdgDataPrefix( const TQString& dir, bool priority );
+
+	// If priority is true, the directory is added before any other,
+	// otherwise after
+	bool addResourceType( const char *type,
+			      const TQString& relativename, bool priority );
+	bool addResourceDir( const char *type,
+			     const TQString& absdir, bool priority);
+};
+
+/**
+ * \addtogroup locates Locate Functions
+ *  @{
+ * On The Usage Of 'locate' and 'locateLocal'
+ *
+ * Typical TDE applications use resource files in one out of
+ * three ways:
+ *
+ * 1) A resource file is read but is never written. A system
+ *    default is supplied but the user can override this
+ *    default in his local .trinity directory:
+ *
+ *    \code
+ *    // Code example
+ *    myFile = locate("appdata", "groups.lst");
+ *    myData =  myReadGroups(myFile); // myFile may be null
+ *    \endcode
+ *
+ * 2) A resource file is read and written. If the user has no
+ *    local version of the file the system default is used.
+ *    The resource file is always written to the users local
+ *    .trinity directory.
+ *
+ *    \code
+ *    // Code example
+ *    myFile = locate("appdata", "groups.lst")
+ *    myData =  myReadGroups(myFile);
+ *    ...
+ *    doSomething(myData);
+ *    ...
+ *    myFile = locateLocal("appdata", "groups.lst");
+ *    myWriteGroups(myFile, myData);
+ *    \endcode
+ *
+ * 3) A resource file is read and written. No system default
+ *    is used if the user has no local version of the file.
+ *    The resource file is always written to the users local
+ *    .trinity directory.
+ *
+ *    \code
+ *    // Code example
+ *    myFile = locateLocal("appdata", "groups.lst");
+ *    myData =  myReadGroups(myFile);
+ *    ...
+ *    doSomething(myData);
+ *    ...
+ *    myFile = locateLocal("appdata", "groups.lst");
+ *    myWriteGroups(myFile, myData);
+ *    \endcode
+ **/
+
+/*!
+ * \relates TDEStandardDirs
+ * This function is just for convenience. It simply calls
+ *instance->dirs()->\link TDEStandardDirs::findResource() findResource\endlink(type, filename).
+ **/
+TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
+
+/*!
+ * \relates TDEStandardDirs
+ * This function is much like locate. However it returns a
+ * filename suitable for writing to. No check is made if the
+ * specified filename actually exists. Missing directories
+ * are created. If filename is only a directory, without a
+ * specific file, filename must have a trailing slash.
+ *
+ **/
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
+
+/*!
+ * \relates TDEStandardDirs
+ * This function is much like locate. No check is made if the
+ * specified filename actually exists. Missing directories
+ * are created if @p createDir is true. If filename is only
+ * a directory, without a specific file,
+ * filename must have a trailing slash.
+ *
+ **/
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = TDEGlobal::instance() );
+
+/*! @} */
+
+#endif // _TDESTANDARDDIRS_H
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index fff419532..80764faec 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -31,7 +31,7 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/tdecore/tdetempfile.cpp b/tdecore/tdetempfile.cpp
index 805d315a1..d498f1258 100644
--- a/tdecore/tdetempfile.cpp
+++ b/tdecore/tdetempfile.cpp
@@ -52,7 +52,7 @@
 #include "tdeapplication.h"
 #include "kinstance.h"
 #include "tdetempfile.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include "kde_file.h"
 #include "kdebug.h"
 
diff --git a/tdecore/tdeuniqueapplication.cpp b/tdecore/tdeuniqueapplication.cpp
index 1614ac3d7..85904a622 100644
--- a/tdecore/tdeuniqueapplication.cpp
+++ b/tdecore/tdeuniqueapplication.cpp
@@ -35,7 +35,7 @@
 
 #include <dcopclient.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 
 #if defined TQ_WS_X11
diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt
index f4e8ae33c..9ad6e5117 100644
--- a/tdecore/tests/CMakeLists.txt
+++ b/tdecore/tests/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC
 )
 
 set( CHECKS
-  tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest kstandarddirstest
+  tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest tdestandarddirstest
   tdeuniqueapptest ktempfiletest krandomsequencetest kdebugtest
   ksocktest kstringhandlertest kcmdlineargstest tdeapptest kmemtest
   dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 53b611efc..b7d4dc88e 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes)
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
 check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest \
-	kstandarddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \
+	tdestandarddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \
 	kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \
 	kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
@@ -45,7 +45,7 @@ klocaletest_SOURCES = klocaletest.cpp
 #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp
 ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp
 kurltest_SOURCES = kurltest.cpp
-kstandarddirstest_SOURCES = kstandarddirstest.cpp
+tdestandarddirstest_SOURCES = tdestandarddirstest.cpp
 tdeprocesstest_SOURCES = tdeprocesstest.cpp
 tdeuniqueapptest_SOURCES = tdeuniqueapptest.cpp
 tdeapptest_SOURCES = tdeapptest.cpp
diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp
index 019db0690..38960bf1a 100644
--- a/tdecore/tests/ktempfiletest.cpp
+++ b/tdecore/tests/ktempfiletest.cpp
@@ -18,7 +18,7 @@
 
 #include "tdetempfile.h"
 #include "tdeapplication.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 #include <tqstring.h>
 
 #include <unistd.h>
diff --git a/tdecore/tests/kstandarddirstest.cpp b/tdecore/tests/tdestandarddirstest.cpp
similarity index 98%
rename from tdecore/tests/kstandarddirstest.cpp
rename to tdecore/tests/tdestandarddirstest.cpp
index ae6ea16bd..53d76a83c 100644
--- a/tdecore/tests/kstandarddirstest.cpp
+++ b/tdecore/tests/tdestandarddirstest.cpp
@@ -1,7 +1,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 
 int main(int argc, char **argv)
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index e9517584e..82d7d6604 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -55,7 +55,7 @@ using namespace DOM;
 #include "tdehtmlview.h"
 #include "tdehtml_part.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kcharsets.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 90ce501db..c68121f0e 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -22,7 +22,7 @@
 
 #include <tdelocale.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index cf7f12590..6b546196b 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -30,7 +30,7 @@
 #include <tdelocale.h>
 #include <tdeparts/browserextension.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeio/job.h>
 #include <tdeio/tdeprotocolmanager.h>
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index f5cea7644..44e74b976 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -27,7 +27,7 @@
 #include <tdediroperator.h> 
 #include <tdelistview.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h> 
 #include <netaccess.h>
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 5a5dbaa58..81d6d748a 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -54,7 +54,7 @@
 #include <kstringhandler.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <krun.h>
 #include <kurifilter.h>
 #include <kiconloader.h>
diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index df08f97d6..e578144c9 100644
--- a/tdehtml/tdehtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -22,7 +22,7 @@
 
 #include <kstaticdeleter.h>
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqintdict.h>
 #include <tqtimer.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 81cd2fa97..3b58afe8f 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -72,7 +72,7 @@ using namespace DOM;
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <tdeio/job.h>
 #include <tdeio/global.h>
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 8aac65a36..a351a5f74 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -71,7 +71,7 @@
 #include <knotifyclient.h>
 #include <kprinter.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdestdaccel.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 12769358e..c564dd92e 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -31,7 +31,7 @@
 #include <signal.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
 #include "test_regression.h"
diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp
index abc3c2ef3..860eff2ee 100644
--- a/tdeinit/autostart.cpp
+++ b/tdeinit/autostart.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <stdlib.h>
 
diff --git a/tdeinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp
index 9125b6cbf..b9a0e55b6 100644
--- a/tdeinit/tdedostartupconfig.cpp
+++ b/tdeinit/tdedostartupconfig.cpp
@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
index e8c7dd2ae..debe0be12 100644
--- a/tdeinit/tdeinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -53,7 +53,7 @@
 #include <tqregexp.h>
 #include <tqfont.h>
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index a65493979..371f1ba7b 100644
--- a/tdeinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
@@ -36,7 +36,7 @@
 #include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <kurl.h>
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cpp b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
index b2185d46e..ed8620a85 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cpp
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
@@ -23,7 +23,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqstring.h>
diff --git a/tdeio/bookmarks/kbookmarkmanager.cpp b/tdeio/bookmarks/kbookmarkmanager.cpp
index 56713b981..8a73b2b31 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cpp
+++ b/tdeio/bookmarks/kbookmarkmanager.cpp
@@ -23,7 +23,7 @@
 #include "kbookmarkimporter.h"
 #include <kdebug.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksavefile.h>
 #include <dcopref.h>
 #include <tqregexp.h>
diff --git a/tdeio/kssl/kssl.cpp b/tdeio/kssl/kssl.cpp
index 0f34a55da..9131ce8d9 100644
--- a/tdeio/kssl/kssl.cpp
+++ b/tdeio/kssl/kssl.cpp
@@ -40,7 +40,7 @@
 #include "kssl.h"
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksock.h>
 #include <ksockaddr.h>
 
diff --git a/tdeio/kssl/ksslcertificate.cpp b/tdeio/kssl/ksslcertificate.cpp
index 774553939..d3f784fec 100644
--- a/tdeio/kssl/ksslcertificate.cpp
+++ b/tdeio/kssl/ksslcertificate.cpp
@@ -35,7 +35,7 @@
 #include "ksslcertchain.h"
 #include "ksslutils.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmdcodec.h>
 #include <tdelocale.h>
 #include <tqdatetime.h>
diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp
index d7fb0e936..2e0b80399 100644
--- a/tdeio/kssl/ksslinfodlg.cpp
+++ b/tdeio/kssl/ksslinfodlg.cpp
@@ -39,7 +39,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kurllabel.h>
 #include <kstdguiitem.h>
-//#include <kstandarddirs.h>
+//#include <tdestandarddirs.h>
 //#include <krun.h>
 #include <kcombobox.h>
 #include "ksslcertificate.h"
diff --git a/tdeio/kssl/ksslkeygen.cpp b/tdeio/kssl/ksslkeygen.cpp
index aad837d7d..595b4ebcd 100644
--- a/tdeio/kssl/ksslkeygen.cpp
+++ b/tdeio/kssl/ksslkeygen.cpp
@@ -29,7 +29,7 @@
 #include <tdemessagebox.h>
 #include <kopenssl.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <tdewallet.h>
 
diff --git a/tdeio/kssl/ksslsettings.cpp b/tdeio/kssl/ksslsettings.cpp
index aaf17cf97..354120d8d 100644
--- a/tdeio/kssl/ksslsettings.cpp
+++ b/tdeio/kssl/ksslsettings.cpp
@@ -33,7 +33,7 @@
 
 #include "ksslsettings.h"
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 // this hack provided by Malte Starostik to avoid glibc/openssl bug
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index 3a04d93f0..83d0b8412 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tqdatetime.h>
 
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 6c8f722d7..dc1d95ced 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kpassdlg.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdewalletentry.h>
 #include <twin.h>
 
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 40e26ed43..7a6241299 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -26,7 +26,7 @@
 
 #include <ksqueezedtextlabel.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index fd6eca83d..77f3ebef0 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <kservice.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfigbase.h>
 #include <kopenwith.h>
 
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index a73f34915..8a5de95ee 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
 #include <kiconview.h>
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index 140b2fded..3b6468016 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -19,7 +19,7 @@
 #include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdefiledialog.h>
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index 24e1227ab..37d748f65 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -33,7 +33,7 @@
 #include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <tdeio/netaccess.h>
 
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index b1fdbaacc..7524c063b 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -45,7 +45,7 @@
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kuserprofile.h>
 #include <kurlcompletion.h>
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index aa25ac10f..c8e324a2d 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -99,7 +99,7 @@ extern "C" {
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/job.h>
 #include <tdeio/chmodjob.h>
 #include <tdeio/renamedlg.h>
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index 1518b48e5..a2147aa30 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -22,7 +22,7 @@
 #include <kbookmarkimporter.h>
 #include <kbookmarkdombuilder.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "tdefiledialog.h"
 #include "tdefilebookmarkhandler.h"
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index e1e911400..60c017459 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -65,7 +65,7 @@
 #include <kpushbutton.h>
 #include <tderecentdirs.h>
 #include <kshell.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <kstaticdeleter.h>
 #include <tdetoolbar.h>
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 9e3770b6c..6e775ebc1 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -29,7 +29,7 @@
 #include <tdeprocio.h>
 #include <tdelocale.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index 066953f3a..dfd09ee53 100644
--- a/tdeio/tdefile/tdefilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -29,7 +29,7 @@
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 
 KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name )
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index e9c87f5b6..928f4a070 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -26,7 +26,7 @@
 #include <tdefileitem.h>
 #include <tdefileview.h>
 #include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <tdeio/job.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index aa82344c1..66111595b 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "config-tdefile.h"
 #include "tdefileview.h"
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index ac299978f..dbaf876bd 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -27,7 +27,7 @@
  */
 #include <tderecentdirs.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 
 #define MAX_DIR_HISTORY 3
diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp
index 84fad4138..8c7205ca1 100644
--- a/tdeio/tdefile/tderecentdocument.cpp
+++ b/tdeio/tdefile/tderecentdocument.cpp
@@ -27,7 +27,7 @@
  */
 #include <tderecentdocument.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/tdeio/tdeio/authinfo.cpp b/tdeio/tdeio/authinfo.cpp
index b95a40585..e8c89e5ff 100644
--- a/tdeio/tdeio/authinfo.cpp
+++ b/tdeio/tdeio/authinfo.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksavefile.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 27467875a..653c5a144 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <tdeprocess.h>
 #include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <klineedit.h>
 
diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp
index 8d67808df..903bf7775 100644
--- a/tdeio/tdeio/kdatatool.cpp
+++ b/tdeio/tdeio/kdatatool.cpp
@@ -20,7 +20,7 @@
 
 #include "kdatatool.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klibloader.h>
 #include <kdebug.h>
 #include <kinstance.h>
diff --git a/tdeio/tdeio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp
index d3768d297..c5835e251 100644
--- a/tdeio/tdeio/kimageio.cpp
+++ b/tdeio/tdeio/kimageio.cpp
@@ -12,7 +12,7 @@
 
 #include <tqdir.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqstring.h>
 #include <tqregexp.h>
 #include <tqvaluelist.h>
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index 42f4d676c..a511324c0 100644
--- a/tdeio/tdeio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <tqfile.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <klargefile.h>
 #include <assert.h>
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 0555e2285..3be10a07c 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -54,7 +54,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 #include <tdesycoca.h>
 #include <kde_file.h>
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 3dda0cc19..b28820444 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -46,7 +46,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeprocess.h>
 #include <dcopclient.h>
 #include <tqfile.h>
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index c69c982fb..34cd7816e 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -45,7 +45,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeconfigbase.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 
 #include "kservicefactory.h"
diff --git a/tdeio/tdeio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp
index abd6ec61e..346088bbb 100644
--- a/tdeio/tdeio/kservicefactory.cpp
+++ b/tdeio/tdeio/kservicefactory.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 KServiceFactory::KServiceFactory()
diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp
index e0ec1321e..fb86c35fa 100644
--- a/tdeio/tdeio/kservicegroup.cpp
+++ b/tdeio/tdeio/kservicegroup.cpp
@@ -20,7 +20,7 @@
 
 #include <kiconloader.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <ksortablevaluelist.h>
diff --git a/tdeio/tdeio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp
index 3caf9c027..077ed800b 100644
--- a/tdeio/tdeio/kservicegroupfactory.cpp
+++ b/tdeio/tdeio/kservicegroupfactory.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 KServiceGroupFactory::KServiceGroupFactory()
  : KSycocaFactory( KST_KServiceGroupFactory )
diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 74b47e69b..6d90954b4 100644
--- a/tdeio/tdeio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -36,7 +36,7 @@
 #include <kfilterbase.h>
 
 #include "ktar.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 ////////////////////////////////////////////////////////////////////////
 /////////////////////////// KTar ///////////////////////////////////
diff --git a/tdeio/tdeio/ktrader.cpp b/tdeio/tdeio/ktrader.cpp
index 7ef39638e..6e01d2bcf 100644
--- a/tdeio/tdeio/ktrader.cpp
+++ b/tdeio/tdeio/ktrader.cpp
@@ -23,7 +23,7 @@
 #include <tqbuffer.h>
 
 #include <kuserprofile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
 
diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index 63c13ff22..112244d80 100644
--- a/tdeio/tdeio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 using namespace TDEIO;
 
diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index d1820a69e..b4e9396ef 100644
--- a/tdeio/tdeio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -45,7 +45,7 @@
 #include <ktrader.h>
 #include <kmdcodec.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeio/kservice.h>
 
diff --git a/tdeio/tdeio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp
index 9c6b33b0a..d16137cad 100644
--- a/tdeio/tdeio/sessiondata.cpp
+++ b/tdeio/tdeio/sessiondata.cpp
@@ -28,7 +28,7 @@
 #include <kcharsets.h>
 #include <dcopclient.h>
 #include <tdeprotocolmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdesu/client.h>
 #include <tdeio/slaveconfig.h>
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index 915c4fa55..0954d3932 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdetempfile.h>
 #include <ksock.h>
diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index 584d4e5e2..84280ddcd 100644
--- a/tdeio/tdeio/tdefileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -25,7 +25,7 @@
 #include <tdeprocio.h>
 #include <tdelocale.h>
 #include <kstaticdeleter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <stdio.h>
diff --git a/tdeio/tdeio/tdeprotocolmanager.cpp b/tdeio/tdeio/tdeprotocolmanager.cpp
index 6f64fe922..492b83401 100644
--- a/tdeio/tdeio/tdeprotocolmanager.cpp
+++ b/tdeio/tdeio/tdeprotocolmanager.cpp
@@ -26,7 +26,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klibloader.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 6905907c2..d3515b9bc 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <tdeio/job.h>
diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index 632960031..0b5692f59 100644
--- a/tdeio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
@@ -3,7 +3,7 @@
 #include <kservice.h>
 #include <kmimetype.h>
 #include <assert.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservicegroup.h>
 #include <kimageio.h>
 #include <kprotocolinfo.h>
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 0b3e6621d..57732e6c6 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksimpleconfig.h>
 
 #include <tqdir.h>
diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index 9747f2d0f..035c4593f 100644
--- a/tdeio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -22,7 +22,7 @@
 #include <kservice.h>
 #include <kmimetype.h>
 #include <assert.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservicegroup.h>
 #include <kimageio.h>
 #include <kprotocolinfo.h>
diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp
index 7559ca773..d404b8ab4 100644
--- a/tdeioslave/file/file.cpp
+++ b/tdeioslave/file/file.cpp
@@ -83,14 +83,13 @@
 #include <limits.h>
 #include <tdeprocess.h>
 #include <kmountpoint.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #ifdef HAVE_VOLMGT
 #include <volmgt.h>
 #include <sys/mnttab.h>
 #endif
 
-#include <kstandarddirs.h>
 #include <tdeio/ioslave_defaults.h>
 #include <klargefile.h>
 #include <tdeglobal.h>
diff --git a/tdeioslave/http/http.cpp b/tdeioslave/http/http.cpp
index 7d9fd72dc..5cc638bd0 100644
--- a/tdeioslave/http/http.cpp
+++ b/tdeioslave/http/http.cpp
@@ -63,7 +63,7 @@
 #include <dcopclient.h>
 #include <kdatastream.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kremoteencoding.h>
 
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index 3ea4b6fe2..08ca740b2 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 #include <tdeprotocolmanager.h>
 
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index 738b64eba..372d4281a 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kcookiejar.h"
 #include "kcookiewin.h"
diff --git a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
index 9d720d6c4..29c808abb 100644
--- a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "../kcookiejar.cpp"
 
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index 8f4317cc3..611b71c8c 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -48,7 +48,7 @@ extern "C" {
 #include <tdecmdlineargs.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 /* return application name */
 extern const char *__progname;
diff --git a/tdemarkdown/markdown_part.cpp b/tdemarkdown/markdown_part.cpp
index 255ed7280..a77df6d88 100644
--- a/tdemarkdown/markdown_part.cpp
+++ b/tdemarkdown/markdown_part.cpp
@@ -13,7 +13,7 @@
 #include <tqfile.h>
 
 #include <tdeparts/genericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdehtmlview.h>
 
diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp
index 4e8ad57f4..5f54af9bd 100644
--- a/tdenewstuff/engine.cpp
+++ b/tdenewstuff/engine.cpp
@@ -28,7 +28,7 @@
 #include <tdeio/job.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "knewstuff.h"
 #include "downloaddialog.h"
diff --git a/tdenewstuff/knewstuff.cpp b/tdenewstuff/knewstuff.cpp
index 3fb2b72ce..fe3358698 100644
--- a/tdenewstuff/knewstuff.cpp
+++ b/tdenewstuff/knewstuff.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "engine.h"
 
diff --git a/tdenewstuff/knewstuffgeneric.cpp b/tdenewstuff/knewstuffgeneric.cpp
index 0480b1983..2bc7ac788 100644
--- a/tdenewstuff/knewstuffgeneric.cpp
+++ b/tdenewstuff/knewstuffgeneric.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <tdeprocess.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kmimemagic.h>
 #include <ktar.h>
diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp
index d2c81ae35..27e7f2989 100644
--- a/tdenewstuff/knewstuffsecure.cpp
+++ b/tdenewstuff/knewstuffsecure.cpp
@@ -22,7 +22,7 @@
 #include <tdeio/netaccess.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
 
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index bf96f6c7b..ab3a4c384 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -27,7 +27,7 @@
 #include <kuserprofile.h>
 #include <tdetempfile.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <assert.h>
 
 using namespace KParts;
diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp
index e7ce785ac..7a1bd5703 100644
--- a/tdeparts/dockmainwindow.cpp
+++ b/tdeparts/dockmainwindow.cpp
@@ -27,7 +27,7 @@
 #include <kstatusbar.h>
 #include <kinstance.h>
 #include <khelpmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqapplication.h>
 
 #include <kdebug.h>
diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp
index 26adbd838..2e6d2b7c3 100644
--- a/tdeparts/mainwindow.cpp
+++ b/tdeparts/mainwindow.cpp
@@ -25,7 +25,7 @@
 #include <kinstance.h>
 #include <kstatusbar.h>
 #include <khelpmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqapplication.h>
 #include <kxmlguifactory.h>
 
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index b65106ea7..9a558ee01 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -37,7 +37,7 @@
 #include <tdetempfile.h>
 #include <tdemessagebox.h>
 #include <tdeio/job.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefiledialog.h>
 #include <kdirnotify_stub.h>
 
diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp
index 196a4a78c..5225de500 100644
--- a/tdeparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -31,7 +31,7 @@
 
 #include <klibloader.h>
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kxmlguifactory.h>
 #include <tdelocale.h>
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index e44e4c2e2..319c970a8 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -8,7 +8,7 @@
 #include <tqdir.h>
 
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 #include <tdeaction.h>
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 723343303..e955a5463 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -1,5 +1,5 @@
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdelocale.h>
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index eae4e80af..0ecabbfca 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -8,7 +8,7 @@
 #include <tqdir.h>
 
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 #include <tdeaction.h>
diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index 9ab7b7d69..84de3ac1d 100644
--- a/tdeparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -14,7 +14,7 @@
 #include <tdeaction.h>
 #include <tdelocale.h>
 #include <kstatusbar.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 NotepadPart::NotepadPart( TQWidget* parentWidget, const char*,
                           TQObject* parent, const char* name,
diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
index 8a788cad3..206c93e37 100644
--- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 TQString Comment::comment()
 {
diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
index 52db651d3..cb952ed4b 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqlayout.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/imageposition.cpp b/tdeprint/cups/imageposition.cpp
index 436af9ac4..851738c42 100644
--- a/tdeprint/cups/imageposition.cpp
+++ b/tdeprint/cups/imageposition.cpp
@@ -20,7 +20,7 @@
 #include "imageposition.h"
 
 #include <tqpainter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 static void draw3DPage(TQPainter *p, TQRect r)
 {
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 3a0c711bd..8dffc7125 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -44,7 +44,7 @@
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdesocketbase.h>
 #include <klibloader.h>
 #include <tdemessagebox.h>
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index 0c6eb4770..86acb1e8a 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -35,7 +35,7 @@
 #include <tdelocale.h>
 #include <knuminput.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 : KPrintDialogPage(parent, name)
diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp
index 7923ea729..e3443677e 100644
--- a/tdeprint/ext/kextprinterimpl.cpp
+++ b/tdeprint/ext/kextprinterimpl.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
 
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index df3949903..1e1c4c20b 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -20,7 +20,7 @@
 #include "kfoomaticprinterimpl.h"
 #include "kprinter.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 216d4c14b..d63ca2872 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -33,7 +33,7 @@
 
 #include <klibloader.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 3393edc58..eed2c53ec 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -28,7 +28,7 @@
 
 #include <zlib.h>
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index 84da26fe9..f664ab66c 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -25,7 +25,7 @@
 #include "driver.h"
 
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <ksimpleconfig.h>
 #include <tdelocale.h>
diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp
index 5759664c8..f41a5551d 100644
--- a/tdeprint/kmthreadjob.cpp
+++ b/tdeprint/kmthreadjob.cpp
@@ -24,7 +24,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqstringlist.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index 4bf58b3c1..46b7fd46f 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -29,7 +29,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 518a0a903..c3f74316e 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -34,7 +34,7 @@
 #include <tqdir.h>
 #include <tqguardedptr.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <krun.h>
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index 2318a09a0..f833e9464 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -35,7 +35,7 @@
 #include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kmimemagic.h>
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index abd41c213..c9316bad9 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -33,7 +33,7 @@
 #include <kuserprofile.h>
 #include <krun.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kdebug.h>
diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp
index 82731d69f..d9f3fc456 100644
--- a/tdeprint/kxmlcommand.cpp
+++ b/tdeprint/kxmlcommand.cpp
@@ -29,7 +29,7 @@
 #include <tqinputdialog.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdialogbase.h>
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index 843e73409..5caecda55 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name)
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index 0157515ec..affe4051d 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeprocess.h>
 
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index fe6a6aa7b..e636f94cf 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kmacroexpander.h>
 
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index fa20b17da..6d7e5e9ab 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index acb0e0c2d..dd4c3a72e 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -30,7 +30,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 03a75001a..3de216f22 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 #include "kmlprmanager.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqfile.h>
 #include <stdlib.h>
 
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 6547f2532..da6a571e3 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <tqptrlist.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <tdeprocess.h>
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index 0e9be16ac..64e78397a 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -22,7 +22,7 @@
 #include "kmjob.h"
 #include "lprsettings.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqtextstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp
index 051407ac2..aca879833 100644
--- a/tdeprint/lpr/lpqhelper.cpp
+++ b/tdeprint/lpr/lpqhelper.cpp
@@ -22,7 +22,7 @@
 #include "kpipeprocess.h"
 #include "lprsettings.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeprocess.h>
 #include <kdebug.h>
 
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index 960f5adb8..5732b6808 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -30,7 +30,7 @@
 #include <tqtextstream.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 LPRngToolHandler::LPRngToolHandler(KMManager *mgr)
 : LprHandler("lprngtool", mgr)
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index aae4bbe03..74c3c62c6 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -30,7 +30,7 @@
 #include "foomatic2loader.h"
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeprocess.h>
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 50020aec9..3d0fa8638 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -26,7 +26,7 @@
 #include <tqdir.h>
 #include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 KMDBCreator::KMDBCreator(TQObject *parent, const char *name)
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 11c717ff4..5234dd6d6 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqfileinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 411f86325..57e5cb445 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -35,7 +35,7 @@
 #include <tdelistbox.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 KMInstancePage::KMInstancePage(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index bcad038a4..744ed73dd 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -53,7 +53,7 @@
 #include <klibloader.h>
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeprocess.h>
 
diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp
index a0be8f8b8..f047b7c11 100644
--- a/tdeprint/management/sidepixmap.cpp
+++ b/tdeprint/management/sidepixmap.cpp
@@ -20,7 +20,7 @@
 #include "sidepixmap.h"
 
 #include <tqpainter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 SidePixmap::SidePixmap(TQWidget *parent, const char *name)
 : TQFrame(parent, name)
diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp
index 7b8ceac2d..1b7fbdc2e 100644
--- a/tdeprint/rlpr/kmrlprmanager.cpp
+++ b/tdeprint/rlpr/kmrlprmanager.cpp
@@ -25,7 +25,7 @@
 #include <tqtextstream.h>
 #include <tqmap.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 09653930c..e844367fe 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -24,7 +24,7 @@
 #include "kmprinter.h"
 
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
 
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index 36cc935ec..25ab20f5c 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -38,7 +38,7 @@
 
 #include "tdeprintcheck.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <tqfile.h>
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index fee09c62e..c425bfe6a 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -31,7 +31,7 @@
 #include <tqlabel.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <tdeapplication.h>
 #include <tqlayout.h>
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index 8d51332e4..232d10740 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -27,7 +27,7 @@
 #include <tdemacros.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index 8b1443168..f857fdd95 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -31,7 +31,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <tdelistview.h>
 #include <kbuttonbox.h>
diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp
index bb6c31a53..a39a4574a 100644
--- a/tderesources/factory.cpp
+++ b/tderesources/factory.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include <tqfile.h>
diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp
index e08c0bd87..f5fdc74f4 100644
--- a/tderesources/managerimpl.cpp
+++ b/tderesources/managerimpl.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "resource.h"
 #include "factory.h"
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index e34053f55..a99a245c7 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -86,7 +86,7 @@
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index d6ea4d916..a3a6ced31 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -65,7 +65,7 @@
 #include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
diff --git a/tdestyles/kthemestyle/tdestyledirs.cpp b/tdestyles/kthemestyle/tdestyledirs.cpp
index 9f795e1e2..bcb208601 100644
--- a/tdestyles/kthemestyle/tdestyledirs.cpp
+++ b/tdestyles/kthemestyle/tdestyledirs.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include "tdestyledirs.h"
 
 TDEStyleDirs* TDEStyleDirs::instance = 0;
diff --git a/tdestyles/kthemestyle/tdestyledirs.h b/tdestyles/kthemestyle/tdestyledirs.h
index 2a42fd2ba..b70315c84 100644
--- a/tdestyles/kthemestyle/tdestyledirs.h
+++ b/tdestyles/kthemestyle/tdestyledirs.h
@@ -25,7 +25,7 @@
 
 #include <tqsettings.h>
 #include <tqstringlist.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 /**
 * @short Access to the standard KDE directories for the pixmap style
diff --git a/tdestyles/utils/installtheme/main.cpp b/tdestyles/utils/installtheme/main.cpp
index d73a8c7d6..aa81b7254 100644
--- a/tdestyles/utils/installtheme/main.cpp
+++ b/tdestyles/utils/installtheme/main.cpp
@@ -30,7 +30,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 static const char desc[] = I18N_NOOP("TDE Tool to build a cache list of all pixmap themes installed");
 static const char ver[] = "0.9.1";
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index 3ccb30c65..54ba1dc00 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -34,7 +34,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kde_file.h>
 
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index 1d56128da..3cbea8ec6 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -50,7 +50,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "process.h"
 #include "tdesu_pty.h"
diff --git a/tdesu/ssh.cpp b/tdesu/ssh.cpp
index e75f33d69..1f543579c 100644
--- a/tdesu/ssh.cpp
+++ b/tdesu/ssh.cpp
@@ -33,7 +33,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "ssh.h"
 #include "kcookie.h"
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index 778d99da0..b46d0ae0b 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "su.h"
 #include "kcookie.h"
diff --git a/tdesu/tdesu_pty.cpp b/tdesu/tdesu_pty.cpp
index 8559512af..c4139dd35 100644
--- a/tdesu/tdesu_pty.cpp
+++ b/tdesu/tdesu_pty.cpp
@@ -41,7 +41,7 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include "tdesu_pty.h"
 
 // stdlib.h is meant to declare the prototypes but doesn't :(
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 8cc107834..a99f44020 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -34,7 +34,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeprocess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
 #include <kurllabel.h>
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 0d594c8f4..04bc15016 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -31,7 +31,7 @@
 #include <tqtextstream.h>
 
 #include <tdeaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index ac7eb4cf5..ac2e72601 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -41,7 +41,7 @@
 #include <tdepopupmenu.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kswitchlanguagedialog.h"
 
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index c34801777..e9532137f 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -41,7 +41,7 @@
 #include <tdemessagebox.h>
 #include <tdeaboutdialog.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprogress.h>
 
 #include <sys/time.h>
diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp
index f6488847f..7fcfe091c 100644
--- a/tdeui/ktimezonewidget.cpp
+++ b/tdeui/ktimezonewidget.cpp
@@ -22,7 +22,7 @@
 #include <tdefile.h>
 #include <tdelistview.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktimezones.h>
 #include <ktimezonewidget.h>
 #include <tqpixmap.h>
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index f9202bd30..7152e18bb 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <ktextbrowser.h>
 #include <kiconeffect.h>
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index e52cc31bc..7b2657376 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -29,7 +29,7 @@
 #include <tqguardedptr.h>
 
 #include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 8e9b376b2..07e5af78c 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -37,7 +37,7 @@
 #include <kinstance.h>
 #include <tdeglobal.h>
 #include <tdeshortcut.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kkeydialog.h>
 
 using namespace KXMLGUI;
diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp
index b29d482f3..4fa0e381f 100644
--- a/tdeui/tdeabouttde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -23,7 +23,7 @@
 #include <tdeabouttde.h>
 #include <tdeapplication.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal )
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index eaa9f244a..b068477de 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -54,7 +54,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 
 class TDEToggleAction::TDEToggleActionPrivate
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index 2b657a7a8..b903a3a90 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -51,7 +51,7 @@
 #include <tqlineedit.h>
 #include <tdelistbox.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 33eb53676..a62633930 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -47,7 +47,7 @@
 #include <tdemainwindow.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 #if defined TQ_WS_X11
 #include <netwm.h>
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index c08c03a8c..0c4bff8a6 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -1,6 +1,6 @@
 #include "kpanelmenutest.h"
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <dcopclient.h>
 
 TestWidget::TestWidget(TQWidget *parent, const char *name)
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index d32593094..10dbe0844 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -7,7 +7,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqlineedit.h>
 #include <tqdir.h>
 
diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
index 7c6222a11..0e39a9f59 100644
--- a/tdeui/tests/tdetoolbarlabelactiontest.cpp
+++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp
@@ -22,7 +22,7 @@
 #include <tdemainwindow.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetoolbarlabelaction.h>
 #include <ksqueezedtextlabel.h> 
 #include <kdebug.h>
diff --git a/tdeunittest/runner.cpp b/tdeunittest/runner.cpp
index c63b6ed6c..f7f1ef52f 100644
--- a/tdeunittest/runner.cpp
+++ b/tdeunittest/runner.cpp
@@ -36,7 +36,7 @@ using namespace std;
 #include <kdebug.h>
 #include <klibloader.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "runner.h"
 #include "tester.h"
diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index 95a37ae53..9a5613745 100644
--- a/tdeutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tdeconfigbase.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdesktopfile.h>
 #include <kservice.h>
 
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index af771bd8f..ac8caf25b 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -41,7 +41,7 @@
 #include <kdialog.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktabctl.h>
 #include <tdecmoduleinfo.h>
 #include <tqvaluelist.h>
diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 609d8cb16..6aeccd3c8 100644
--- a/tdeutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -29,7 +29,7 @@
 #include "ksettings/dispatcher.h"
 #include "ksettings/componentsdialog.h"
 #include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index b94603601..91a1814d4 100644
--- a/tdeutils/tdecmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
@@ -26,7 +26,7 @@
 #include <kdesktopfile.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include "tdecmoduleinfo.h"
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 85724a0a3..17ebd94b2 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -45,7 +45,7 @@
 #include <tdelocale.h>
 #include <tdeprocess.h>
 #include <kservice.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kuser.h>
 
 #include <X11/Xlib.h>
diff --git a/tdewallet/backend/tdewalletbackend.cpp b/tdewallet/backend/tdewalletbackend.cpp
index 83e37a49a..978335e67 100644
--- a/tdewallet/backend/tdewalletbackend.cpp
+++ b/tdewallet/backend/tdewalletbackend.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kmdcodec.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 54e618b70..09c91ac8c 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -6,7 +6,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/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index bdfc73f8f..692db372e 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -6,7 +6,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/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 307a4e846..235730b57 100644
--- a/tdewallet/tests/tdewalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -6,7 +6,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/tdewidgets/maketdewidgets.cpp b/tdewidgets/maketdewidgets.cpp
index b46e6d669..ca3daf732 100644
--- a/tdewidgets/maketdewidgets.cpp
+++ b/tdewidgets/maketdewidgets.cpp
@@ -21,7 +21,7 @@ static const char classHeader[] = 	"/**\n"
                                    	"*/\n"
 					"#include <tqwidgetplugin.h>\n";
 static const char classDef[] = "#ifndef EMBED_IMAGES\n"
-                                "#include <kstandarddirs.h>\n"
+                                "#include <tdestandarddirs.h>\n"
                                 "#endif\n"
                                 "\n"
                                 "class %PluginName : public TQWidgetPlugin\n"
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 7ad7d4414..5e9a8ce1d 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -45,7 +45,7 @@ kurldrag.cpp \
 kurl.cpp \
 kidna.cpp \
 kstaticdeleter.cpp \
-kstandarddirs.cpp \
+tdestandarddirs.cpp \
 tdeconfig.cpp \
 tdeconfigdialogmanager.cpp \
 kcharsets.cpp \