Use tdeinstance.h

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

52 files changed, 52 insertions, 52 deletions

diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cpp b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index 3af2dec55..dd37908f9 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 <tdestandarddirs.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 198ad3364..ff7dd3743 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index aea756ca8..b0fb4fea5 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 <tdestandarddirs.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 5dbe7f292..b76295c09 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 <tdestandarddirs.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 e17bb4523..3fa19be19 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/example/example.cpp b/chalk/plugins/filters/example/example.cpp
index 60f959848..a67f801c3 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
index e9ec00507..6bbd4f933 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
index 6c5bcb4da..90f14ed2e 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 74800d6cd..12fa93a07 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cpp b/chalk/plugins/filters/noisefilter/noisefilter.cpp
index ceaaf4f70..711719b51 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 186604595..e38d588ff 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 <tdestandarddirs.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 c257b0124..d022d3857 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 <tdestandarddirs.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 621503435..92f1d159b 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
index 697544944..aea1da7b5 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 a4bc4e713..5b7b6ee9c 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 <tdestandarddirs.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 af8412c7b..f0c9e5df5 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 <tdestandarddirs.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 bc9fa4fae..7ada21c3f 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/threadtest/threadtest.cpp b/chalk/plugins/filters/threadtest/threadtest.cpp
index d8ce09d92..df4dab0fe 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cpp b/chalk/plugins/filters/wavefilter/wavefilter.cpp
index 0a2f315b8..aec0c2e61 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 5b7274b84..bccdbe81c 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 <tdestandarddirs.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 8b82a264f..0894e722e 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cpp b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index 050540a32..59cb950eb 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 <tdestandarddirs.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 d2a10d593..24248a03e 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 <tdestandarddirs.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 b518d4dad..4446c810d 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 <tdestandarddirs.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 bf3ce59fd..8e1c247bb 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 <tdestandarddirs.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 c4eca864d..fbcdccb7a 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 <tdestandarddirs.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 1c866ff0a..5cb7ed6df 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 <tdestandarddirs.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 6f1f41fb7..630162985 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 <tdestandarddirs.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 d83096efa..f399c9e21 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 <tdestandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
index 211e28429..547ceeb47 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 <tdestandarddirs.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 fac94dac4..ceec24090 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 <tdestandarddirs.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 d572d3caf..528a7a755 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 <tdestandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cpp b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index 603f58631..bc40e0e42 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index 56a6fed92..3477d7342 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 4df7e8c46..210c28c58 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 <tdestandarddirs.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 f81edf179..17dd73442 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cpp b/chalk/plugins/viewplugins/histogram/histogram.cpp
index 5342d43a3..4f553db56 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 23bff9d76..95016fba7 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cpp b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
index 4bd0bdcb5..7d8df9b25 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cpp b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index de4746a0c..2904f6dbf 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 <tdestandarddirs.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 f67d6b81b..25bc77a7d 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cpp b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index 7dd0ddd5c..23ad2019b 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 <tdestandarddirs.h>
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 9f2b4f9f1..7682cf6c2 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index 881be0a7f..92977925e 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp
index b2f03f564..59a144466 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 <tdestandarddirs.h>
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index c8e09c7e2..ef9e27128 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 <tdestandarddirs.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 0e948176c..788592aab 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 <tdestandarddirs.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 e3dec5dd7..2c64a7a5f 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cpp b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index 6096f5233..e58d73a71 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cpp b/chalk/plugins/viewplugins/substrate/substrate.cpp
index 518805ec7..d7b8708bd 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 <tdestandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/variations/variations.cpp b/chalk/plugins/viewplugins/variations/variations.cpp
index 0f19f8a58..8a2d52d2d 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 <tdestandarddirs.h>
 #include <tdetempfile.h>