summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2025-02-25 18:53:46 +0900
committerMichele Calgaro <[email protected]>2025-02-28 10:43:13 +0900
commita6b8cc41e27c15bb670aa7c0c0464b6eb44099e9 (patch)
tree74f9303eb3397985d5838dee0fbed0330b25f3e9
parent7bc34c7d4a07099da42038b83c543fb4274b1e56 (diff)
downloadkoffice-a6b8cc41e27c15bb670aa7c0c0464b6eb44099e9.tar.gz
koffice-a6b8cc41e27c15bb670aa7c0c0464b6eb44099e9.zip
Use tdestandarddirs.hHEADmaster
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp2
-rw-r--r--chalk/colorspaces/gray_u8/gray_plugin.cpp2
-rw-r--r--chalk/colorspaces/rgb_u8/rgb_plugin.cpp2
-rw-r--r--chalk/colorspaces/wet/wet_plugin.cpp2
-rw-r--r--chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp2
-rw-r--r--chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp2
-rw-r--r--chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp2
-rw-r--r--chalk/core/kis_meta_registry.cpp2
-rw-r--r--chalk/core/kis_paintop_registry.cpp2
-rw-r--r--chalk/plugins/filters/bumpmap/bumpmap.cpp2
-rw-r--r--chalk/plugins/filters/cimg/kis_cimg_filter.cpp2
-rw-r--r--chalk/plugins/filters/colorsfilters/colorsfilters.cpp2
-rw-r--r--chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp2
-rw-r--r--chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp2
-rw-r--r--chalk/plugins/filters/example/example.cpp2
-rw-r--r--chalk/plugins/filters/imageenhancement/imageenhancement.cpp2
-rw-r--r--chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp2
-rw-r--r--chalk/plugins/filters/levelfilter/levelfilter.cpp2
-rw-r--r--chalk/plugins/filters/noisefilter/noisefilter.cpp2
-rw-r--r--chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp2
-rw-r--r--chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp2
-rw-r--r--chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp2
-rw-r--r--chalk/plugins/filters/randompickfilter/randompickfilter.cpp2
-rw-r--r--chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp2
-rw-r--r--chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp2
-rw-r--r--chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp2
-rw-r--r--chalk/plugins/filters/threadtest/threadtest.cpp2
-rw-r--r--chalk/plugins/filters/wavefilter/wavefilter.cpp2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp2
-rw-r--r--chalk/plugins/tools/defaulttools/default_tools.cpp2
-rw-r--r--chalk/plugins/tools/selectiontools/selection_tools.cpp2
-rw-r--r--chalk/plugins/tools/tool_crop/tool_crop.cpp2
-rw-r--r--chalk/plugins/tools/tool_curves/tool_curves.cpp2
-rw-r--r--chalk/plugins/tools/tool_filter/tool_filter.cpp2
-rw-r--r--chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp2
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp2
-rw-r--r--chalk/plugins/tools/tool_polygon/tool_polygon.cpp2
-rw-r--r--chalk/plugins/tools/tool_polyline/tool_polyline.cpp2
-rw-r--r--chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp2
-rw-r--r--chalk/plugins/tools/tool_star/tool_star.cpp2
-rw-r--r--chalk/plugins/tools/tool_transform/tool_transform.cpp2
-rw-r--r--chalk/plugins/viewplugins/colorrange/colorrange.cpp2
-rw-r--r--chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp2
-rw-r--r--chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp2
-rw-r--r--chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp2
-rw-r--r--chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp2
-rw-r--r--chalk/plugins/viewplugins/histogram/histogram.cpp2
-rw-r--r--chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp2
-rw-r--r--chalk/plugins/viewplugins/history_docker/historydocker.cpp2
-rw-r--r--chalk/plugins/viewplugins/imagesize/imagesize.cpp2
-rw-r--r--chalk/plugins/viewplugins/modify_selection/modify_selection.cpp2
-rw-r--r--chalk/plugins/viewplugins/performancetest/perftest.cpp2
-rw-r--r--chalk/plugins/viewplugins/rotateimage/rotateimage.cpp2
-rw-r--r--chalk/plugins/viewplugins/screenshot/screenshot.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/scripting.cpp2
-rw-r--r--chalk/plugins/viewplugins/selectopaque/selectopaque.cpp2
-rw-r--r--chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp2
-rw-r--r--chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp2
-rw-r--r--chalk/plugins/viewplugins/shearimage/shearimage.cpp2
-rw-r--r--chalk/plugins/viewplugins/substrate/substrate.cpp2
-rw-r--r--chalk/plugins/viewplugins/variations/variations.cpp2
-rw-r--r--chalk/ui/kis_controlframe.cpp2
-rw-r--r--chalk/ui/kis_cursor.cpp2
-rw-r--r--chalk/ui/kis_custom_brush.cpp2
-rw-r--r--chalk/ui/kis_custom_palette.cpp2
-rw-r--r--chalk/ui/kis_custom_pattern.cpp2
-rw-r--r--chalk/ui/kis_factory.cpp2
-rw-r--r--chalk/ui/kis_itemchooser.cpp2
-rw-r--r--chalk/ui/kis_paintop_box.cpp2
-rw-r--r--chalk/ui/kis_resourceserver.cpp2
-rw-r--r--filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp2
-rw-r--r--filters/kword/latex/export/kwordlatexexportdia.cpp2
-rw-r--r--filters/xsltfilter/export/xsltexportdia.cpp2
-rw-r--r--filters/xsltfilter/import/xsltimportdia.cpp2
-rw-r--r--karbon/dialogs/vstrokedlg.cpp2
-rw-r--r--karbon/karbon_factory.cpp2
-rw-r--r--karbon/karbon_resourceserver.cpp2
-rw-r--r--kchart/kchartBackgroundPixmapConfigPage.cpp2
-rw-r--r--kchart/kchart_factory.cpp2
-rw-r--r--kchart/kchart_part.cpp2
-rw-r--r--kchart/kchart_view.cpp2
-rw-r--r--kexi/3rdparty/kolibs/koGlobal.cpp3
-rw-r--r--kexi/core/kexidbconnectionset.cpp2
-rw-r--r--kexi/core/kexiprojectconnectiondata.cpp2
-rw-r--r--kexi/core/kexiprojectdata.cpp2
-rw-r--r--kexi/core/kexitemplateloader.cpp2
-rw-r--r--kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp2
-rw-r--r--kexi/main/keximainwindowimpl.cpp2
-rw-r--r--kexi/main/startup/KexiStartup_p.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp2
-rw-r--r--kformula/kformula_doc.cpp2
-rw-r--r--kformula/kformula_factory.cpp2
-rw-r--r--kivio/kiviopart/kivio_doc.cpp2
-rw-r--r--kivio/kiviopart/kivio_factory.cpp2
-rw-r--r--kivio/kiviopart/kivioarrowheadaction.cpp2
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp2
-rw-r--r--kivio/kiviopart/kiviostencilsetinstaller.cpp2
-rw-r--r--kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp2
-rw-r--r--kivio/plugins/kivioconnectortool/tool_connector.cpp2
-rw-r--r--kivio/plugins/kiviosmlconnector/tool_connector.cpp2
-rw-r--r--kivio/plugins/kiviotexttool/tool_text.cpp2
-rw-r--r--koshell/koshell_shell.cpp2
-rw-r--r--kplato/kptconfigbehaviorpanel.cpp2
-rw-r--r--kplato/kptfactory.cpp2
-rw-r--r--kplato/kptpart.cpp2
-rw-r--r--kplato/kptreportview.cpp2
-rw-r--r--kplato/kptview.cpp2
-rw-r--r--kpresenter/KPrAutoformObject.cpp2
-rw-r--r--kpresenter/KPrDocument.cpp2
-rw-r--r--kpresenter/KPrEffectDia.cpp2
-rw-r--r--kpresenter/KPrFactory.cpp2
-rw-r--r--kpresenter/KPrMSPresentationSetup.cpp2
-rw-r--r--kpresenter/KPrSlideTransitionDia.cpp2
-rw-r--r--kpresenter/KPrTransEffectDia.cpp2
-rw-r--r--kpresenter/KPrView.cpp2
-rw-r--r--kpresenter/KPrWebPresentation.cpp2
-rw-r--r--kpresenter/autoformEdit/AFChoose.cpp2
-rw-r--r--kspread/dialogs/kspread_dlg_format.cpp2
-rw-r--r--kspread/functions.cpp2
-rw-r--r--kspread/kspread_doc.cpp2
-rw-r--r--kspread/kspread_factory.cpp2
-rw-r--r--kspread/kspread_view.cpp2
-rw-r--r--kspread/plugins/scripting/scripting.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_doc.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_factory.cpp2
-rw-r--r--kugar/part/kugar_factory.cpp2
-rw-r--r--kugar/part/kugar_part.cpp2
-rw-r--r--kugar/part/kugar_view.cpp2
-rw-r--r--kword/KWConfig.cpp2
-rw-r--r--kword/KWDocument.cpp2
-rw-r--r--kword/KWEditPersonnalExpression.cpp2
-rw-r--r--kword/KWFactory.cpp2
-rw-r--r--kword/KWTableTemplateSelector.cpp2
-rw-r--r--kword/KWView.cpp2
-rw-r--r--lib/kformula/fontstyle.cpp2
-rw-r--r--lib/kformula/kformuladocument.cpp2
-rw-r--r--lib/kformula/symboltable.cpp2
-rw-r--r--lib/kofficecore/KoApplication.cpp2
-rw-r--r--lib/kofficecore/KoGlobal.cpp3
-rw-r--r--lib/kofficecore/KoMainWindow.cpp2
-rw-r--r--lib/kofficecore/KoTemplates.cpp2
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.cpp2
-rw-r--r--lib/kotext/KoAutoFormat.cpp2
-rw-r--r--lib/kotext/KoAutoFormatDia.cpp2
-rw-r--r--lib/kotext/KoTextView.cpp2
-rw-r--r--lib/kotext/kohyphen/kohyphen.cpp2
-rw-r--r--lib/kross/main/scriptaction.cpp2
-rw-r--r--lib/kross/main/scriptguiclient.cpp3
-rw-r--r--lib/kross/main/wdgscriptsmanager.cpp2
-rw-r--r--lib/kross/python/pythoninterpreter.cpp2
-rw-r--r--lib/kross/test/testwindow.cpp2
-rw-r--r--plugins/scan/scan.cpp2
-rw-r--r--tools/thesaurus/main.h2
153 files changed, 153 insertions, 156 deletions
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
index 588e286c..9373576f 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cpp b/chalk/colorspaces/gray_u8/gray_plugin.cpp
index 7f177eea..9c0e8c3d 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cpp
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cpp
@@ -21,7 +21,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cpp b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
index 33f18b17..6c07c1b4 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/wet/wet_plugin.cpp b/chalk/colorspaces/wet/wet_plugin.cpp
index 896ef2a6..ee94a8f9 100644
--- a/chalk/colorspaces/wet/wet_plugin.cpp
+++ b/chalk/colorspaces/wet/wet_plugin.cpp
@@ -33,7 +33,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
index 97c892b2..d91eb3d9 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
@@ -21,7 +21,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
index c53f6ea0..23fa9433 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
@@ -28,7 +28,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
index e56e4cc8..3b9363ce 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
@@ -21,7 +21,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/core/kis_meta_registry.cpp b/chalk/core/kis_meta_registry.cpp
index 4bde87b2..6bc6388f 100644
--- a/chalk/core/kis_meta_registry.cpp
+++ b/chalk/core/kis_meta_registry.cpp
@@ -17,7 +17,7 @@
*/
#include <tqstringlist.h>
#include <tqdir.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <config.h>
diff --git a/chalk/core/kis_paintop_registry.cpp b/chalk/core/kis_paintop_registry.cpp
index d549c3ad..0a4678ed 100644
--- a/chalk/core/kis_paintop_registry.cpp
+++ b/chalk/core/kis_paintop_registry.cpp
@@ -22,7 +22,7 @@
#include <kinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cpp b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index de2bc4ff..3af2dec5 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cpp
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp
@@ -45,7 +45,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cpp b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
index c8be0a6f..198ad336 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index 332cb67f..aea756ca 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
index 1eb2984e..5dbe7f29 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
index 0d6974e0..e17bb452 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/example/example.cpp b/chalk/plugins/filters/example/example.cpp
index a9ade724..60f95984 100644
--- a/chalk/plugins/filters/example/example.cpp
+++ b/chalk/plugins/filters/example/example.cpp
@@ -25,7 +25,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
index cb7153c1..e9ec0050 100644
--- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
+++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
index 6b26ab11..6c5bcb4d 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
@@ -35,7 +35,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kis_image.h>
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cpp b/chalk/plugins/filters/levelfilter/levelfilter.cpp
index 89114378..74800d6c 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cpp
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cpp b/chalk/plugins/filters/noisefilter/noisefilter.cpp
index d8609ba2..ceaaf4f7 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cpp
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cpp
@@ -32,7 +32,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kis_image.h>
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
index de869a42..18660459 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
index a6b77df7..c257b012 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
index acb8c2e1..62150343 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
index 74368802..69754494 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
@@ -32,7 +32,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kis_image.h>
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
index 698961a8..a4bc4e71 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
index a0cf20f1..af8412c7 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
index 623fc690..bc9fa4fa 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/threadtest/threadtest.cpp b/chalk/plugins/filters/threadtest/threadtest.cpp
index 8477c09c..d8ce09d9 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cpp
+++ b/chalk/plugins/filters/threadtest/threadtest.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cpp b/chalk/plugins/filters/wavefilter/wavefilter.cpp
index 9f9777bf..0a2f315b 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cpp
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cpp
@@ -33,7 +33,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kis_image.h>
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
index 6e1d3f75..5b7274b8 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cpp b/chalk/plugins/tools/defaulttools/default_tools.cpp
index 6f1bedbb..8b82a264 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cpp
+++ b/chalk/plugins/tools/defaulttools/default_tools.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cpp b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index f34a3b34..050540a3 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cpp
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cpp b/chalk/plugins/tools/tool_crop/tool_crop.cpp
index 30df11ec..d2a10d59 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cpp
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cpp b/chalk/plugins/tools/tool_curves/tool_curves.cpp
index 28f65604..b518d4da 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cpp
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cpp b/chalk/plugins/tools/tool_filter/tool_filter.cpp
index 484a7d9f..bf3ce59f 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cpp
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
index 2f326965..c4eca864 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
index 73705264..1c866ff0 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cpp b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
index f903551f..6f1f41fb 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cpp b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
index d6abff71..d83096ef 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
index af807017..211e2842 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
@@ -28,7 +28,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_star/tool_star.cpp b/chalk/plugins/tools/tool_star/tool_star.cpp
index 7309e8a1..fac94dac 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cpp
+++ b/chalk/plugins/tools/tool_star/tool_star.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cpp b/chalk/plugins/tools/tool_transform/tool_transform.cpp
index 0f0dde27..d572d3ca 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cpp
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cpp b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index 722467d2..603f5863 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cpp
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index 50702d80..56a6fed9 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 97c2c17e..4df7e8c4 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
index 5f79231a..f81edf17 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
index f469c667..1e55ea1d 100644
--- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
+++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kopalettemanager.h>
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cpp b/chalk/plugins/viewplugins/histogram/histogram.cpp
index d8b95640..5342d43a 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cpp
+++ b/chalk/plugins/viewplugins/histogram/histogram.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 0ba11d4a..23bff9d7 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
@@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cpp b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
index 85e4df40..4bd0bdcb 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cpp
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cpp b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index 644592b2..de4746a0 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cpp
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 89ccd171..f67d6b81 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cpp b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index b3fdcb44..7dd0ddd5 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cpp
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp
@@ -35,7 +35,7 @@
#include <kinstance.h>
#include <kdialogbase.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 47bec8d9..9f2b4f9f 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index c0a1a4d7..881be0a7 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -24,7 +24,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <KoView.h>
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp
index dff94b36..b2f03f56 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cpp
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
@@ -31,7 +31,7 @@
#include <kinstance.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#define KROSS_MAIN_EXPORT TDE_EXPORT
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index b3ed5cf5..c8e09c7e 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
index ba8c6b84..0e948176 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
index ecf98d37..e3dec5dd 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cpp b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index dca6a45d..6096f523 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cpp
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cpp b/chalk/plugins/viewplugins/substrate/substrate.cpp
index 9b6411d4..518805ec 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cpp
+++ b/chalk/plugins/viewplugins/substrate/substrate.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/variations/variations.cpp b/chalk/plugins/viewplugins/variations/variations.cpp
index 4a4e06d6..0f19f8a5 100644
--- a/chalk/plugins/viewplugins/variations/variations.cpp
+++ b/chalk/plugins/viewplugins/variations/variations.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp
index 67abd397..35803fc2 100644
--- a/chalk/ui/kis_controlframe.cpp
+++ b/chalk/ui/kis_controlframe.cpp
@@ -32,7 +32,7 @@
#include <tdetoolbar.h>
#include <tdemainwindow.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdelocale.h>
#include <koFrameButton.h>
diff --git a/chalk/ui/kis_cursor.cpp b/chalk/ui/kis_cursor.cpp
index 146dc286..2d2e8999 100644
--- a/chalk/ui/kis_cursor.cpp
+++ b/chalk/ui/kis_cursor.cpp
@@ -26,7 +26,7 @@
#include <kcursor.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kis_cursor.h"
#include "kis_factory.h"
diff --git a/chalk/ui/kis_custom_brush.cpp b/chalk/ui/kis_custom_brush.cpp
index 76f514e4..d4454505 100644
--- a/chalk/ui/kis_custom_brush.cpp
+++ b/chalk/ui/kis_custom_brush.cpp
@@ -24,7 +24,7 @@
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include "kis_view.h"
diff --git a/chalk/ui/kis_custom_palette.cpp b/chalk/ui/kis_custom_palette.cpp
index b6172529..c66e4e78 100644
--- a/chalk/ui/kis_custom_palette.cpp
+++ b/chalk/ui/kis_custom_palette.cpp
@@ -25,7 +25,7 @@
#include <tqvalidator.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kcolordialog.h>
#include <kinputdialog.h>
diff --git a/chalk/ui/kis_custom_pattern.cpp b/chalk/ui/kis_custom_pattern.cpp
index e8b3a12a..121e80a1 100644
--- a/chalk/ui/kis_custom_pattern.cpp
+++ b/chalk/ui/kis_custom_pattern.cpp
@@ -23,7 +23,7 @@
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include "kis_view.h"
diff --git a/chalk/ui/kis_factory.cpp b/chalk/ui/kis_factory.cpp
index e9e51e48..cbcf1a7e 100644
--- a/chalk/ui/kis_factory.cpp
+++ b/chalk/ui/kis_factory.cpp
@@ -27,7 +27,7 @@
#include <kinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include "kis_aboutdata.h"
diff --git a/chalk/ui/kis_itemchooser.cpp b/chalk/ui/kis_itemchooser.cpp
index 661ef284..09c66573 100644
--- a/chalk/ui/kis_itemchooser.cpp
+++ b/chalk/ui/kis_itemchooser.cpp
@@ -18,7 +18,7 @@
#include <tqvbox.h>
#include <kinstance.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <koIconChooser.h>
#include "kis_itemchooser.h"
diff --git a/chalk/ui/kis_paintop_box.cpp b/chalk/ui/kis_paintop_box.cpp
index e0aa9285..dbff1e1d 100644
--- a/chalk/ui/kis_paintop_box.cpp
+++ b/chalk/ui/kis_paintop_box.cpp
@@ -32,7 +32,7 @@
#include <tdeglobalsettings.h>
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kis_paintop_registry.h>
#include <kis_view.h>
diff --git a/chalk/ui/kis_resourceserver.cpp b/chalk/ui/kis_resourceserver.cpp
index 333bccd1..31151011 100644
--- a/chalk/ui/kis_resourceserver.cpp
+++ b/chalk/ui/kis_resourceserver.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinstance.h>
#include "kis_resource.h"
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
index 2b383b7e..46bc8749 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
@@ -30,7 +30,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tderecentdocument.h>
#include <tdetempfile.h>
#include <kurlrequester.h>
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cpp b/filters/kword/latex/export/kwordlatexexportdia.cpp
index 69f596bd..6df44c56 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cpp
+++ b/filters/kword/latex/export/kwordlatexexportdia.cpp
@@ -30,7 +30,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tderecentdocument.h>
#include <tdetempfile.h>
#include <kurlrequester.h>
diff --git a/filters/xsltfilter/export/xsltexportdia.cpp b/filters/xsltfilter/export/xsltexportdia.cpp
index 054a4517..f0cbcbeb 100644
--- a/filters/xsltfilter/export/xsltexportdia.cpp
+++ b/filters/xsltfilter/export/xsltexportdia.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeversion.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tderecentdocument.h>
#include <tdetempfile.h>
#include <tdefiledialog.h>
diff --git a/filters/xsltfilter/import/xsltimportdia.cpp b/filters/xsltfilter/import/xsltimportdia.cpp
index 7877bb58..7b79efd1 100644
--- a/filters/xsltfilter/import/xsltimportdia.cpp
+++ b/filters/xsltfilter/import/xsltimportdia.cpp
@@ -29,7 +29,7 @@
#include <tdeapplication.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tderecentdocument.h>
#include <KoFilterManager.h>
diff --git a/karbon/dialogs/vstrokedlg.cpp b/karbon/dialogs/vstrokedlg.cpp
index 5611beaf..06c83474 100644
--- a/karbon/dialogs/vstrokedlg.cpp
+++ b/karbon/dialogs/vstrokedlg.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/karbon_factory.cpp b/karbon/karbon_factory.cpp
index 6dd94ed3..ee24b8c1 100644
--- a/karbon/karbon_factory.cpp
+++ b/karbon/karbon_factory.cpp
@@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/plugin.h>
diff --git a/karbon/karbon_resourceserver.cpp b/karbon/karbon_resourceserver.cpp
index c44d48e7..57b138cd 100644
--- a/karbon/karbon_resourceserver.cpp
+++ b/karbon/karbon_resourceserver.cpp
@@ -27,7 +27,7 @@
#include <tdeglobal.h>
#include <kinstance.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <kogradientmanager.h>
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cpp b/kchart/kchartBackgroundPixmapConfigPage.cpp
index d4bb9fb8..73a81bb2 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cpp
+++ b/kchart/kchartBackgroundPixmapConfigPage.cpp
@@ -22,7 +22,7 @@
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdefiledialog.h>
#include <tdemessagebox.h>
#include <kdebug.h>
diff --git a/kchart/kchart_factory.cpp b/kchart/kchart_factory.cpp
index ff00f205..56a1b428 100644
--- a/kchart/kchart_factory.cpp
+++ b/kchart/kchart_factory.cpp
@@ -12,7 +12,7 @@
#include <kinstance.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
namespace KChart
{
diff --git a/kchart/kchart_part.cpp b/kchart/kchart_part.cpp
index fffed0a0..c552f3ca 100644
--- a/kchart/kchart_part.cpp
+++ b/kchart/kchart_part.cpp
@@ -25,7 +25,7 @@ using std::cerr;
#include <KoOasisStore.h>
#include <KoOasisLoadingContext.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <kdebug.h>
diff --git a/kchart/kchart_view.cpp b/kchart/kchart_view.cpp
index 4b5e511d..eb5464d2 100644
--- a/kchart/kchart_view.cpp
+++ b/kchart/kchart_view.cpp
@@ -17,7 +17,7 @@
#include <kiconloader.h>
#include <kdebug.h>
#include <kprinter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <dcopobject.h>
#include <kxmlguifactory.h>
diff --git a/kexi/3rdparty/kolibs/koGlobal.cpp b/kexi/3rdparty/kolibs/koGlobal.cpp
index 03c1b3e1..92167f27 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cpp
+++ b/kexi/3rdparty/kolibs/koGlobal.cpp
@@ -27,11 +27,10 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include <kimageio.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
KoGlobal* KoGlobal::s_global = 0L;
diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp
index b608c46d..80f061fe 100644
--- a/kexi/core/kexidbconnectionset.cpp
+++ b/kexi/core/kexidbconnectionset.cpp
@@ -21,7 +21,7 @@
#include "kexidbshortcutfile.h"
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp
index 52567288..6c8731f1 100644
--- a/kexi/core/kexiprojectconnectiondata.cpp
+++ b/kexi/core/kexiprojectconnectiondata.cpp
@@ -26,7 +26,7 @@
#include <tqregexp.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index 53daea99..24848755 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -27,7 +27,7 @@
#include <tqregexp.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index 6319684d..c3c18c1b 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -19,7 +19,7 @@
#include "kexitemplateloader.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tdeconfig.h>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index af315dca..5cf5fb6a 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -20,7 +20,7 @@
#include <kexidb/global.h>
#include "sqlitevacuum.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprogress.h>
#include <kdebug.h>
#include <tdelocale.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 349d390a..4a736374 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -50,7 +50,7 @@
#include <tdeglobalsettings.h>
#include <tdeparts/componentfactory.h>
#include <ktip.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kpushbutton.h>
#include <ktextbrowser.h>
#include <kiconloader.h>
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index d6f8d255..15a460b2 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -19,7 +19,7 @@
#include "KexiStartup_p.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprogress.h>
#include <tdeprocess.h>
#include <kdebug.h>
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 2fec335d..e8c878d9 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -36,7 +36,7 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kimageio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include <kimageeffect.h>
#include <tdestdaccel.h>
diff --git a/kformula/kformula_doc.cpp b/kformula/kformula_doc.cpp
index 23ec4977..dbbb1bad 100644
--- a/kformula/kformula_doc.cpp
+++ b/kformula/kformula_doc.cpp
@@ -44,7 +44,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <KoXmlWriter.h>
#include <KoStoreDevice.h>
diff --git a/kformula/kformula_factory.cpp b/kformula/kformula_factory.cpp
index 1aebcfbd..bfcd850e 100644
--- a/kformula/kformula_factory.cpp
+++ b/kformula/kformula_factory.cpp
@@ -7,7 +7,7 @@
#include <tdefiledialog.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tqstringlist.h>
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 16c02a8e..80f1575c 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -67,7 +67,7 @@
#include <tqvaluelist.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdepopupmenu.h>
#include <tdemenubar.h>
#include <kiconloader.h>
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 9ad0b44b..f4af6917 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -22,7 +22,7 @@
#include <tdelocale.h>
#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 7c611848..77a28849 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <tdetoolbarbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString &pix,
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index ba48b32e..13fc0dcc 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -21,7 +21,7 @@
#include "kiviostencilsetaction.h"
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdetoolbar.h>
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index 2b5d533d..c9e933ab 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -33,7 +33,7 @@
#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktar.h>
#include <karchive.h>
#include <kguiitem.h>
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index c3860658..8bb14b76 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -27,7 +27,7 @@
#include <tqtextbrowser.h>
#include <tqsplitter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdelistview.h>
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index 1a7870b1..45450008 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <KoPoint.h>
#include <KoZoomHandler.h>
#include <tdelocale.h>
diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index f5d67099..e726c6c9 100644
--- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
@@ -21,7 +21,7 @@
#include <tqcursor.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <KoPoint.h>
#include <KoZoomHandler.h>
#include <tdeactionclasses.h>
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 9c1d9486..368dca91 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -21,7 +21,7 @@
#include <tqcursor.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <KoPoint.h>
#include <tdelocale.h>
diff --git a/koshell/koshell_shell.cpp b/koshell/koshell_shell.cpp
index 0043f871..ce5f4e3d 100644
--- a/koshell/koshell_shell.cpp
+++ b/koshell/koshell_shell.cpp
@@ -38,7 +38,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kkeydialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <klibloader.h>
#include <tdepopupmenu.h>
#include <kservice.h>
diff --git a/kplato/kptconfigbehaviorpanel.cpp b/kplato/kptconfigbehaviorpanel.cpp
index f721ae23..6bfc2a52 100644
--- a/kplato/kptconfigbehaviorpanel.cpp
+++ b/kplato/kptconfigbehaviorpanel.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kcommand.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tqlayout.h>
diff --git a/kplato/kptfactory.cpp b/kplato/kptfactory.cpp
index 7d66a740..71bc656c 100644
--- a/kplato/kptfactory.cpp
+++ b/kplato/kptfactory.cpp
@@ -24,7 +24,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
namespace KPlato
{
diff --git a/kplato/kptpart.cpp b/kplato/kptpart.cpp
index ddebf0f0..0647cb2a 100644
--- a/kplato/kptpart.cpp
+++ b/kplato/kptpart.cpp
@@ -37,7 +37,7 @@
#include <tdeconfig.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcommand.h>
#include <KoTemplateChooseDia.h>
#include <KoCommandHistory.h>
diff --git a/kplato/kptreportview.cpp b/kplato/kptreportview.cpp
index b346eef2..1818c336 100644
--- a/kplato/kptreportview.cpp
+++ b/kplato/kptreportview.cpp
@@ -32,7 +32,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdetoolbar.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
diff --git a/kplato/kptview.cpp b/kplato/kptview.cpp
index feb8c221..4b74eab2 100644
--- a/kplato/kptview.cpp
+++ b/kplato/kptview.cpp
@@ -56,7 +56,7 @@
#include <kstatusbar.h>
#include <kxmlguifactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include <kcommand.h>
#include <tdefiledialog.h>
diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp
index 38bd779d..ba90bc19 100644
--- a/kpresenter/KPrAutoformObject.cpp
+++ b/kpresenter/KPrAutoformObject.cpp
@@ -30,7 +30,7 @@
#include <tqdom.h>
#include <tqpainter.h>
#include <tqwmatrix.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <KoTextZoomHandler.h>
#include <math.h>
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 7b019f14..afdce451 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -61,7 +61,7 @@
#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <tdeprocess.h>
#include <tdeio/netaccess.h>
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index 9ef5020c..675893e9 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -44,7 +44,7 @@
#include <knuminput.h>
#include <kurlrequester.h>
#include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdefiledialog.h>
KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<KPrObject>& _objs,
diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp
index 3579afc5..21f3d8be 100644
--- a/kpresenter/KPrFactory.cpp
+++ b/kpresenter/KPrFactory.cpp
@@ -21,7 +21,7 @@
#include "KPrDocument.h"
#include "KPrAboutData.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinstance.h>
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index c5aa7f9f..0128df60 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -53,7 +53,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index cf9172b4..405fb170 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -23,7 +23,7 @@
#include <tdefiledialog.h>
#include <tdelocale.h>
#include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 52bab259..d2d831d5 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -51,7 +51,7 @@
#include <knuminput.h>
#include <kiconloader.h>
#include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdefiledialog.h>
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index f9e255d9..24582ff9 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -107,7 +107,7 @@
#include <stdlib.h>
#include <signal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "KPrViewIface.h"
#include "KPrConfig.h"
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 54dd10da..886a4716 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -26,7 +26,7 @@
#include "KPrCanvas.h"
#include "KPrPage.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <unistd.h>
#include <sys/types.h>
#include <tdetempfile.h>
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index a9483b7e..093c13a8 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kicondialog.h>
#include <KPrFactory.h>
diff --git a/kspread/dialogs/kspread_dlg_format.cpp b/kspread/dialogs/kspread_dlg_format.cpp
index 3b304f1d..c4135655 100644
--- a/kspread/dialogs/kspread_dlg_format.cpp
+++ b/kspread/dialogs/kspread_dlg_format.cpp
@@ -31,7 +31,7 @@
#include <kbuttonbox.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include "kspread_dlg_format.h"
diff --git a/kspread/functions.cpp b/kspread/functions.cpp
index fa485171..69f96fa0 100644
--- a/kspread/functions.cpp
+++ b/kspread/functions.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include "kspread_factory.h"
diff --git a/kspread/kspread_doc.cpp b/kspread/kspread_doc.cpp
index 229216d3..40653344 100644
--- a/kspread/kspread_doc.cpp
+++ b/kspread/kspread_doc.cpp
@@ -38,7 +38,7 @@
#include <tqfont.h>
#include <tqpair.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdemessagebox.h>
diff --git a/kspread/kspread_factory.cpp b/kspread/kspread_factory.cpp
index 861b9d96..c0ba8b59 100644
--- a/kspread/kspread_factory.cpp
+++ b/kspread/kspread_factory.cpp
@@ -18,7 +18,7 @@
*/
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kspread_aboutdata.h"
#include "kspread_doc.h"
diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp
index 8bdff42b..0fa43885 100644
--- a/kspread/kspread_view.cpp
+++ b/kspread/kspread_view.cpp
@@ -65,7 +65,7 @@
#include <tdespelldlg.h>
#include <kstatusbar.h>
#include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <tdeparts/partmanager.h>
#include <tdelistview.h>
diff --git a/kspread/plugins/scripting/scripting.cpp b/kspread/plugins/scripting/scripting.cpp
index ca5ef267..e6b58e08 100644
--- a/kspread/plugins/scripting/scripting.cpp
+++ b/kspread/plugins/scripting/scripting.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#define KROSS_MAIN_EXPORT TDE_EXPORT
#include <main/manager.h>
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 68d3cdc5..e0fc5b1a 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -24,7 +24,7 @@
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcommand.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index 518eceb5..5e7fd5e9 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -24,7 +24,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
TDEInstance* KudesignerFactory::s_global = 0L;
TDEAboutData* KudesignerFactory::s_aboutData = 0L;
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index 9cd323c0..134d54f7 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -4,7 +4,7 @@
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tdeglobal.h>
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 9b5d62c5..ea1f60f7 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -5,7 +5,7 @@
#include <tdeapplication.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index 2f08cc3e..97aeb0a4 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -5,7 +5,7 @@
#include <tdeapplication.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index efee2e57..653f9efe 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -62,7 +62,7 @@ using namespace KSpell2;
#include <float.h>
#include <tdemessagebox.h>
#include <tdelistview.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeglobal.h>
#include <kurlrequesterdlg.h>
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index c6469ace..78c92768 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -80,7 +80,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdespell.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdespell2/settings.h>
diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp
index 1517516c..1d77ae07 100644
--- a/kword/KWEditPersonnalExpression.cpp
+++ b/kword/KWEditPersonnalExpression.cpp
@@ -23,7 +23,7 @@
#include <tdelocale.h>
#include <klineeditdlg.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqpushbutton.h>
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp
index 1cd3f498..fbce08e1 100644
--- a/kword/KWFactory.cpp
+++ b/kword/KWFactory.cpp
@@ -21,7 +21,7 @@
#include "KWAboutData.h"
#include "KWDocument.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp
index 0a5f9e89..731c8ff0 100644
--- a/kword/KWTableTemplateSelector.cpp
+++ b/kword/KWTableTemplateSelector.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 278ea451..e332b4c5 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -110,7 +110,7 @@
#include <tdeio/netaccess.h>
#include <tdemessagebox.h>
#include <tdeparts/event.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstatusbar.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
diff --git a/lib/kformula/fontstyle.cpp b/lib/kformula/fontstyle.cpp
index 33f9e9f7..84048c85 100644
--- a/lib/kformula/fontstyle.cpp
+++ b/lib/kformula/fontstyle.cpp
@@ -25,7 +25,7 @@
#include <kstaticdeleter.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <tdemessagebox.h>
diff --git a/lib/kformula/kformuladocument.cpp b/lib/kformula/kformuladocument.cpp
index 3efd3780..24d7c650 100644
--- a/lib/kformula/kformuladocument.cpp
+++ b/lib/kformula/kformuladocument.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <KoDocument.h>
diff --git a/lib/kformula/symboltable.cpp b/lib/kformula/symboltable.cpp
index a25e1b15..28811c69 100644
--- a/lib/kformula/symboltable.cpp
+++ b/lib/kformula/symboltable.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "symboltable.h"
#include "contextstyle.h"
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 436bf127..b50ab857 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kdesktopfile.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <stdlib.h>
void tqt_generate_epsf( bool b );
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index b7c0ea57..0bc10c3c 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -27,11 +27,10 @@
#include <tdeglobal.h>
#include <tdelocale.h>
#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include <kimageio.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
#include <locale.h>
KoGlobal* KoGlobal::s_global = 0L;
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index daaeaba5..747a21e4 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -38,7 +38,7 @@
#include <kstdaction.h>
#include <tdeapplication.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/netaccess.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 7e86257b..072c04a0 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -29,7 +29,7 @@
#include <tdeversion.h>
#include <kinstance.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
#include <tdelocale.h>
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index ae827d75..48ae5188 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -41,7 +41,7 @@
#include <kinputdialog.h>
#include <tdemessagebox.h>
#include <kimageio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 414d848e..79be55da 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -33,7 +33,7 @@
#include <tdelocale.h>
#include <kinstance.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <kcommand.h>
//#include <KoTextFormat.h>
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index b62812d8..24841502 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdelistview.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index 86f87a54..866eb0f0 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -27,7 +27,7 @@
#include "KoVariable.h"
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdestdaccel.h>
#include <kdebug.h>
#include <kinstance.h>
diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp
index f8dcba33..c1ecef52 100644
--- a/lib/kotext/kohyphen/kohyphen.cpp
+++ b/lib/kotext/kohyphen/kohyphen.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include "kohyphen.h"
diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp
index e8cbd4a6..7b6eb7eb 100644
--- a/lib/kross/main/scriptaction.cpp
+++ b/lib/kross/main/scriptaction.cpp
@@ -25,7 +25,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kmimetype.h>
using namespace Kross::Api;
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 75e2c2b0..79164592 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -24,14 +24,13 @@
#include <tdeapplication.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kmimetype.h>
#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <tdelocale.h>
#include <kurl.h>
#include <ktar.h>
-#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 0af1be7d..7abb6efb 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -32,7 +32,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetoolbar.h>
#if KDE_IS_VERSION(3, 4, 0)
diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp
index 4128a301..7d560af2 100644
--- a/lib/kross/python/pythoninterpreter.cpp
+++ b/lib/kross/python/pythoninterpreter.cpp
@@ -25,7 +25,7 @@
#include "../api/variant.h"
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#if defined(TQ_WS_WIN)
#define PYPATHDELIMITER ";"
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index 9e6908f5..55d0f186 100644
--- a/lib/kross/test/testwindow.cpp
+++ b/lib/kross/test/testwindow.cpp
@@ -32,7 +32,7 @@
#include <kpushbutton.h>
#include <tdepopupmenu.h>
#include <tdemenubar.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode)
: TDEMainWindow()
diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp
index 2d115ebe..a7157c2c 100644
--- a/plugins/scan/scan.cpp
+++ b/plugins/scan/scan.cpp
@@ -21,7 +21,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kscan.h>
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 8d1c585a..57c84a21 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -55,7 +55,7 @@
#include <tdeprocess.h>
#include <kpushbutton.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurl.h>
class TQToolButton;