summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp2
-rw-r--r--chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp2
-rw-r--r--chalk/colorspaces/gray_u16/gray_u16_plugin.cpp2
-rw-r--r--chalk/colorspaces/gray_u8/gray_plugin.cpp2
-rw-r--r--chalk/colorspaces/lms_f32/lms_f32_plugin.cpp2
-rw-r--r--chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp2
-rw-r--r--chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp2
-rw-r--r--chalk/colorspaces/rgb_u16/rgb_u16_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/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp2
-rw-r--r--chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.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/convolutionfilters/convolutionfilters.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/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_factory.cpp2
-rw-r--r--chalk/ui/kis_itemchooser.cpp2
-rw-r--r--chalk/ui/kis_resourceserver.cpp2
-rw-r--r--doc/chalk/developers-plugins.docbook2
-rw-r--r--example/example_factory.cpp2
-rw-r--r--filters/karbon/xfig/xfigimport_factory.cpp2
-rw-r--r--karbon/karbon_factory.cpp2
-rw-r--r--karbon/karbon_resourceserver.cpp2
-rw-r--r--kchart/kchart_factory.cpp2
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp2
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp2
-rw-r--r--kexi/tests/newapi/main.cpp2
-rw-r--r--kexi/tests/newapi/mysqlcursor.cpp2
-rw-r--r--kexi/tests/parser/main.cpp2
-rw-r--r--kexi/tests/widgets/kexidbdrivercombotest.cpp2
-rw-r--r--kformula/kfconfig.cpp2
-rw-r--r--kformula/kformula_factory.cpp2
-rw-r--r--kivio/kiviopart/kivio_factory.cpp2
-rw-r--r--kivio/plugins/kivioconnectortool/plugin.cpp2
-rw-r--r--kivio/plugins/kivioselecttool/plugin.cpp2
-rw-r--r--kivio/plugins/kiviosmlconnector/plugin.cpp2
-rw-r--r--kivio/plugins/kiviotexttool/plugin.cpp2
-rw-r--r--kivio/plugins/kiviozoomtool/plugin.cpp2
-rw-r--r--kounavail/kounavail.cpp2
-rw-r--r--kplato/kptfactory.cpp2
-rw-r--r--kpresenter/KPrFactory.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/KWMailMergeDataSource.h2
-rw-r--r--lib/kofficecore/KoDetailsPane.cpp2
-rw-r--r--lib/kofficecore/KoOpenPane.cpp2
-rw-r--r--lib/kofficecore/KoTemplates.cpp2
-rw-r--r--lib/kofficecore/tests/filter_graph.cpp2
-rw-r--r--lib/kofficecore/tests/filterchain_test.cpp2
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp2
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.cpp2
-rw-r--r--lib/kotext/KoAutoFormat.cpp2
-rw-r--r--lib/kotext/KoTextView.cpp2
-rw-r--r--lib/kotext/KoVariable.cpp2
-rw-r--r--lib/kross/runner/main.cpp2
-rw-r--r--lib/kross/test/main.cpp2
-rw-r--r--plugins/scan/scan.cpp2
-rw-r--r--tools/spell/main.cpp2
114 files changed, 114 insertions, 114 deletions
diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
index 4195ff225..5989d185e 100644
--- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
+++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
index 588e286cd..4447029a6 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp b/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
index 7c1896f94..4c8625c34 100644
--- a/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
+++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cpp b/chalk/colorspaces/gray_u8/gray_plugin.cpp
index 7f177eea1..43b37fe39 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cpp
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cpp
@@ -19,7 +19,7 @@
*/
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp b/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
index 2c83ccd6c..4dd99f05a 100644
--- a/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
+++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
@@ -21,7 +21,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
index 32505bc88..16012ef53 100644
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
index adc540ac0..a521ae43c 100644
--- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
+++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
index da6e6e427..8fb195bce 100644
--- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
+++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cpp b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
index 33f18b17f..bc7964e2a 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/wet/wet_plugin.cpp b/chalk/colorspaces/wet/wet_plugin.cpp
index 896ef2a6d..083567179 100644
--- a/chalk/colorspaces/wet/wet_plugin.cpp
+++ b/chalk/colorspaces/wet/wet_plugin.cpp
@@ -31,7 +31,7 @@
#include <tdeactionclasses.h>
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
index 97c892b2b..4fb4f60d0 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
@@ -19,7 +19,7 @@
*/
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
index c53f6ea08..a48ebc95a 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
index e56e4cc88..cd2c0d196 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
@@ -19,7 +19,7 @@
*/
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
index 4371a20a4..5b52489d7 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
index 6c3ac2437..1f2b845d3 100644
--- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
+++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
@@ -20,7 +20,7 @@
#include "ycbcr_u8_plugin.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/chalk/core/kis_paintop_registry.cpp b/chalk/core/kis_paintop_registry.cpp
index d549c3ad5..21459f3d6 100644
--- a/chalk/core/kis_paintop_registry.cpp
+++ b/chalk/core/kis_paintop_registry.cpp
@@ -19,7 +19,7 @@
#include <tqwidget.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cpp b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index de2bc4ffb..c8d61c784 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cpp
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp
@@ -43,7 +43,7 @@
#include <knuminput.h>
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cpp b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
index c8be0a6f6..caa4a303a 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index 332cb67f5..0c74f93a1 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
index 89a20500a..6ce0c35fa 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <kis_convolution_painter.h>
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
index 1eb2984ef..bbae22e56 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
index 0d6974e0c..e6a39f4f1 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/example/example.cpp b/chalk/plugins/filters/example/example.cpp
index a9ade7249..62cd095a5 100644
--- a/chalk/plugins/filters/example/example.cpp
+++ b/chalk/plugins/filters/example/example.cpp
@@ -23,7 +23,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
index cb7153c1d..878af6dd9 100644
--- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
+++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
index 6b26ab11a..05f8d6ff7 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cpp b/chalk/plugins/filters/levelfilter/levelfilter.cpp
index 891143783..0f043131a 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cpp
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cpp b/chalk/plugins/filters/noisefilter/noisefilter.cpp
index d8609ba2b..7e02c1245 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cpp
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
index de869a424..4ecdde482 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
index a6b77df76..b37cbdf40 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
index acb8c2e17..a912d52fe 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
index 74368802a..d4a5e79be 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kgenericfactory.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
index 698961a82..b88a34933 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
index a0cf20f17..52fd9ab5b 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
index 623fc690b..4d2f1b38d 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/threadtest/threadtest.cpp b/chalk/plugins/filters/threadtest/threadtest.cpp
index 8477c09c7..694c8e521 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cpp
+++ b/chalk/plugins/filters/threadtest/threadtest.cpp
@@ -25,7 +25,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cpp b/chalk/plugins/filters/wavefilter/wavefilter.cpp
index 9f9777bf6..648c21cdd 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cpp
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
index 6e1d3f754..fc6902902 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
@@ -19,7 +19,7 @@
*/
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cpp b/chalk/plugins/tools/defaulttools/default_tools.cpp
index 6f1bedbbf..ee5436730 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cpp
+++ b/chalk/plugins/tools/defaulttools/default_tools.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cpp b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index f34a3b34c..2d33bd15d 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cpp
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cpp b/chalk/plugins/tools/tool_crop/tool_crop.cpp
index 30df11ec3..d12237121 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cpp
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cpp b/chalk/plugins/tools/tool_curves/tool_curves.cpp
index 28f65604a..c2e783e0e 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cpp
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cpp
@@ -25,7 +25,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cpp b/chalk/plugins/tools/tool_filter/tool_filter.cpp
index 484a7d9f3..96155d285 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cpp
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
index 2f326965b..147267bad 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
index 73705264b..6bbc898c1 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cpp b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
index f903551fb..23277a22d 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cpp b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
index d6abff71a..b762fe29f 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
index af8070171..893234e9f 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/tools/tool_star/tool_star.cpp b/chalk/plugins/tools/tool_star/tool_star.cpp
index 7309e8a1a..1d9bcd005 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cpp
+++ b/chalk/plugins/tools/tool_star/tool_star.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cpp b/chalk/plugins/tools/tool_transform/tool_transform.cpp
index 0f0dde27d..835066e25 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cpp
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cpp b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index 722467d21..82f9ef87f 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cpp
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index 50702d80f..ffb7a9924 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 97c2c17ed..11f5b6dbc 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
index 5f79231ae..feaf2536e 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cpp b/chalk/plugins/viewplugins/histogram/histogram.cpp
index d8b95640e..7fb40521e 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cpp
+++ b/chalk/plugins/viewplugins/histogram/histogram.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 0ba11d4ab..2ad1f6611 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
@@ -21,7 +21,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cpp b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
index 85e4df406..24fef3022 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cpp
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cpp b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index 644592b2e..a3e12c579 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cpp
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 89ccd171d..9e00d8da1 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cpp b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index b3fdcb445..83214cb23 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cpp
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp
@@ -32,7 +32,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdialogbase.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 47bec8d91..fca28d892 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index c0a1a4d75..158f9edee 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -22,7 +22,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp
index dff94b36a..e7848468b 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cpp
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
@@ -28,7 +28,7 @@
#include <tdefiledialog.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index b3ed5cf51..8cc18d272 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
index ba8c6b84a..3b9563ef1 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
@@ -27,7 +27,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.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 ecf98d373..67e0fd8dc 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
@@ -20,7 +20,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cpp b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index dca6a45d0..5a31601bf 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cpp
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cpp b/chalk/plugins/viewplugins/substrate/substrate.cpp
index 9b6411d4c..deb7cf1aa 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cpp
+++ b/chalk/plugins/viewplugins/substrate/substrate.cpp
@@ -24,7 +24,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/variations/variations.cpp b/chalk/plugins/viewplugins/variations/variations.cpp
index 4a4e06d62..f0aeb412d 100644
--- a/chalk/plugins/viewplugins/variations/variations.cpp
+++ b/chalk/plugins/viewplugins/variations/variations.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/chalk/ui/kis_factory.cpp b/chalk/ui/kis_factory.cpp
index e9e51e487..21d4ccecc 100644
--- a/chalk/ui/kis_factory.cpp
+++ b/chalk/ui/kis_factory.cpp
@@ -24,7 +24,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
diff --git a/chalk/ui/kis_itemchooser.cpp b/chalk/ui/kis_itemchooser.cpp
index 661ef284d..00d94ba28 100644
--- a/chalk/ui/kis_itemchooser.cpp
+++ b/chalk/ui/kis_itemchooser.cpp
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <tqvbox.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <koIconChooser.h>
diff --git a/chalk/ui/kis_resourceserver.cpp b/chalk/ui/kis_resourceserver.cpp
index 333bccd1d..6fd5b29ae 100644
--- a/chalk/ui/kis_resourceserver.cpp
+++ b/chalk/ui/kis_resourceserver.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include "kis_resource.h"
#include "kis_factory.h"
diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook
index ebd5f6647..dcbe273a4 100644
--- a/doc/chalk/developers-plugins.docbook
+++ b/doc/chalk/developers-plugins.docbook
@@ -294,7 +294,7 @@ public:
<para>
And an implementation file:
<programlisting>
-#include &lt;kinstance.h&gt;
+#include &lt;tdeinstance.h&gt;
#include &lt;kgenericfactory.h&gt;
#include &lt;kis_tool_registry.h&gt;
diff --git a/example/example_factory.cpp b/example/example_factory.cpp
index 9564e5fae..1a022050b 100644
--- a/example/example_factory.cpp
+++ b/example/example_factory.cpp
@@ -20,7 +20,7 @@
#include <example_factory.h>
#include <example_part.h>
#include <example_aboutdata.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/filters/karbon/xfig/xfigimport_factory.cpp b/filters/karbon/xfig/xfigimport_factory.cpp
index 1e2311997..1a6ba710c 100644
--- a/filters/karbon/xfig/xfigimport_factory.cpp
+++ b/filters/karbon/xfig/xfigimport_factory.cpp
@@ -25,7 +25,7 @@ DESCRIPTION
#include "xfigimport_factory.moc"
#include "xfigimport.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory )
diff --git a/karbon/karbon_factory.cpp b/karbon/karbon_factory.cpp
index 6dd94ed36..11611b12c 100644
--- a/karbon/karbon_factory.cpp
+++ b/karbon/karbon_factory.cpp
@@ -21,7 +21,7 @@
#include <tdeaboutdata.h>
#include <tdeglobal.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <ktrader.h>
diff --git a/karbon/karbon_resourceserver.cpp b/karbon/karbon_resourceserver.cpp
index c44d48e7d..c52429c9e 100644
--- a/karbon/karbon_resourceserver.cpp
+++ b/karbon/karbon_resourceserver.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/kchart/kchart_factory.cpp b/kchart/kchart_factory.cpp
index ff00f2058..c32a5b35a 100644
--- a/kchart/kchart_factory.cpp
+++ b/kchart/kchart_factory.cpp
@@ -9,7 +9,7 @@
#include "kchart_aboutdata.h"
#include "kchart_part.h"
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index c200dc333..aa8c3fa45 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -27,7 +27,7 @@
#include <tdeversion.h>
#include <tdeaction.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 7c9dd7742..0a9e88acb 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -27,7 +27,7 @@
#include <tdeversion.h>
#include <tdeaction.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index de382d2fb..9fdaf3ed7 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -38,7 +38,7 @@
#include <tdelocale.h>
#include <tdeversion.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
#include <kpushbutton.h>
#include <kjanuswidget.h>
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index a4cb54f03..9994caf9a 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
#include <tdeaboutdata.h>
diff --git a/kexi/tests/newapi/mysqlcursor.cpp b/kexi/tests/newapi/mysqlcursor.cpp
index 426c65aa1..3eab7bf6c 100644
--- a/kexi/tests/newapi/mysqlcursor.cpp
+++ b/kexi/tests/newapi/mysqlcursor.cpp
@@ -1,6 +1,6 @@
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kexidb/drivermanager.h>
#include <kexidb/driver.h>
diff --git a/kexi/tests/parser/main.cpp b/kexi/tests/parser/main.cpp
index 1b5f80991..830f8418b 100644
--- a/kexi/tests/parser/main.cpp
+++ b/kexi/tests/parser/main.cpp
@@ -4,7 +4,7 @@
#include <tqfileinfo.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kexidb/drivermanager.h>
#include <kexidb/driver.h>
diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp
index 86e127324..a3546897f 100644
--- a/kexi/tests/widgets/kexidbdrivercombotest.cpp
+++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kexidb/drivermanager.h>
#include <widget/kexidbdrivercombobox.h>
diff --git a/kformula/kfconfig.cpp b/kformula/kfconfig.cpp
index 228fb0665..2478dd1c3 100644
--- a/kformula/kfconfig.cpp
+++ b/kformula/kfconfig.cpp
@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include "kfconfig.h"
diff --git a/kformula/kformula_factory.cpp b/kformula/kformula_factory.cpp
index 1aebcfbd7..8bbff787c 100644
--- a/kformula/kformula_factory.cpp
+++ b/kformula/kformula_factory.cpp
@@ -2,7 +2,7 @@
#include "kformula_doc.h"
#include "kformula_aboutdata.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 9ad0b44bc..b26a4b13e 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -21,7 +21,7 @@
#include "kivio_aboutdata.h"
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp
index e55d4f9e4..9340d36c7 100644
--- a/kivio/plugins/kivioconnectortool/plugin.cpp
+++ b/kivio/plugins/kivioconnectortool/plugin.cpp
@@ -21,7 +21,7 @@
#include "kivio_view.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
/***************************************************
diff --git a/kivio/plugins/kivioselecttool/plugin.cpp b/kivio/plugins/kivioselecttool/plugin.cpp
index 9107adac4..18ce6ca5c 100644
--- a/kivio/plugins/kivioselecttool/plugin.cpp
+++ b/kivio/plugins/kivioselecttool/plugin.cpp
@@ -21,7 +21,7 @@
#include "kivio_view.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
/***************************************************
diff --git a/kivio/plugins/kiviosmlconnector/plugin.cpp b/kivio/plugins/kiviosmlconnector/plugin.cpp
index 3f01b2635..2e1fa8007 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.cpp
+++ b/kivio/plugins/kiviosmlconnector/plugin.cpp
@@ -21,7 +21,7 @@
#include "kivio_view.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
/***************************************************
diff --git a/kivio/plugins/kiviotexttool/plugin.cpp b/kivio/plugins/kiviotexttool/plugin.cpp
index 7e0ec4dc9..d50a4af64 100644
--- a/kivio/plugins/kiviotexttool/plugin.cpp
+++ b/kivio/plugins/kiviotexttool/plugin.cpp
@@ -21,7 +21,7 @@
#include "kivio_view.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
/***************************************************
diff --git a/kivio/plugins/kiviozoomtool/plugin.cpp b/kivio/plugins/kiviozoomtool/plugin.cpp
index cccdfaec3..3efdd2329 100644
--- a/kivio/plugins/kiviozoomtool/plugin.cpp
+++ b/kivio/plugins/kiviozoomtool/plugin.cpp
@@ -21,7 +21,7 @@
#include "kivio_view.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
/***************************************************
diff --git a/kounavail/kounavail.cpp b/kounavail/kounavail.cpp
index f48de60bb..07684b8e5 100644
--- a/kounavail/kounavail.cpp
+++ b/kounavail/kounavail.cpp
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <tqiconset.h>
#include <tdeaction.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kstdaction.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
diff --git a/kplato/kptfactory.cpp b/kplato/kptfactory.cpp
index 7d66a7406..4738cec9f 100644
--- a/kplato/kptfactory.cpp
+++ b/kplato/kptfactory.cpp
@@ -20,7 +20,7 @@
#include "kptfactory.h"
#include "kptpart.h"
#include "kptaboutdata.h"
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp
index 3579afc58..46d81b014 100644
--- a/kpresenter/KPrFactory.cpp
+++ b/kpresenter/KPrFactory.cpp
@@ -22,7 +22,7 @@
#include "KPrAboutData.h"
#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
TDEInstance* KPrFactory::s_global = 0;
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index 518eceb5d..ca2d39f86 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -20,7 +20,7 @@
#include <kudesigner_factory.h>
#include <kudesigner_doc.h>
#include <kudesigner_aboutdata.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index 9cd323c0f..eb000b059 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -5,7 +5,7 @@
#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeaboutdata.h>
#include <tdeglobal.h>
#include <kiconloader.h>
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index e1d0a2761..43a0a97a9 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -6,7 +6,7 @@
#include <tdeapplication.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kstdaction.h>
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index 2f08cc3e0..b84bcf1bf 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -6,7 +6,7 @@
#include <tdeapplication.h>
#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kstdaction.h>
diff --git a/kword/KWMailMergeDataSource.h b/kword/KWMailMergeDataSource.h
index 2cdafa767..52e030afc 100644
--- a/kword/KWMailMergeDataSource.h
+++ b/kword/KWMailMergeDataSource.h
@@ -22,7 +22,7 @@
#define _SERIALLETTER_INTERFACE_H_
#include <tqcstring.h>
#include <tqdom.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tqmap.h>
#include <tqobject.h>
#include <dcopobject.h>
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 457f29440..1ca4ab734 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -30,7 +30,7 @@
#include <tqevent.h>
#include <tqsplitter.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdelistview.h>
#include <kpushbutton.h>
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 0e38706a3..97775dd2e 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -31,7 +31,7 @@
#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kpushbutton.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 7e86257b4..2343a3e1c 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -27,7 +27,7 @@
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <tdeversion.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index 8ef386cb1..619dd8a5f 100644
--- a/lib/kofficecore/tests/filter_graph.cpp
+++ b/lib/kofficecore/tests/filter_graph.cpp
@@ -20,7 +20,7 @@
#include <tqfile.h>
#include <KoQueryTrader.h>
#include <KoFilterManager.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
int main( int /*argc*/, char ** /*argv*/ )
diff --git a/lib/kofficecore/tests/filterchain_test.cpp b/lib/kofficecore/tests/filterchain_test.cpp
index 27594d294..a77b70991 100644
--- a/lib/kofficecore/tests/filterchain_test.cpp
+++ b/lib/kofficecore/tests/filterchain_test.cpp
@@ -19,7 +19,7 @@
#include <KoFilterChain.h>
#include <KoFilterManager.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
int main( int /*argc*/, char ** /*argv*/ )
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index a33087f3d..7a59b0f3d 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <KoFilterManager.h>
#include <KoTemplates.h>
#include <KoDocument.h>
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index ae827d756..59f5dd994 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -50,7 +50,7 @@
#include <tdeconfig.h>
#include <stdlib.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
class KoTemplateCreateDiaPrivate {
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 9b45d3719..e81cd46f5 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -31,7 +31,7 @@
#include <tdeversion.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tdeglobal.h>
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index 6e6d55db4..d8b6051ad 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -30,7 +30,7 @@
#include <kstandarddirs.h>
#include <tdestdaccel.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdatatool.h>
#include <krun.h>
#include <tdemessagebox.h>
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 33e28ffdf..06e74da58 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -42,7 +42,7 @@
#include <kdialogbase.h>
#include <tdeconfig.h>
#include <tdeversion.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kcalendarsystem.h>
#include <tdeaboutdata.h>
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index ebb812f99..eff19cd26 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -26,7 +26,7 @@
#include <tqfile.h>
// KDE
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index 146e0c200..66caaf0a9 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -39,7 +39,7 @@
#include <tqfile.h>
// KDE
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp
index 2d115ebee..1303d2eef 100644
--- a/plugins/scan/scan.cpp
+++ b/plugins/scan/scan.cpp
@@ -19,7 +19,7 @@
#include <tdelocale.h>
#include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdetempfile.h>
diff --git a/tools/spell/main.cpp b/tools/spell/main.cpp
index c37ac3632..a3eb14992 100644
--- a/tools/spell/main.cpp
+++ b/tools/spell/main.cpp
@@ -22,7 +22,7 @@
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeconfig.h>
#include <kgenericfactory.h>
#include <klibloader.h>