Rename additional header files to avoid conflicts with KDE4

52 files changed, 83 insertions, 83 deletions

diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index 1d7932cb..b6bd5162 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cc
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local includes.
 
diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h
index 059f3d3c..60d10645 100644
--- a/chalk/ui/kis_aboutdata.h
+++ b/chalk/ui/kis_aboutdata.h
@@ -21,7 +21,7 @@
 #define KIS_ABOUT_DATA_H_
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kofficeversion.h>
 #include <config.h>
 
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc
index 2ef11147..2b816f9c 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cc
@@ -24,7 +24,7 @@
 #include "tqimage.h"
 #include "config.h"
 #include LCMS_HEADER
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tqtooltip.h"
 
 #include "kis_view.h"
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc
index 0e06a781..db9aba98 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cc
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <koIconChooser.h>
 
 #include "kis_double_widget.h"
diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc
index 4dc0ed1b..bb80e75e 100644
--- a/chalk/ui/kis_clipboard.cc
+++ b/chalk/ui/kis_clipboard.cc
@@ -22,7 +22,7 @@
 #include <tqmessagebox.h>
 #include <tqbuffer.h>
 #include <tdemultipledrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdebug.h"
 
diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc
index 51681351..66e3a6b3 100644
--- a/chalk/ui/kis_cmb_composite.cc
+++ b/chalk/ui/kis_cmb_composite.cc
@@ -20,7 +20,7 @@
 
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kis_cmb_composite.h"
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc
index 2d7e80d9..92dc608f 100644
--- a/chalk/ui/kis_cmb_idlist.cc
+++ b/chalk/ui/kis_cmb_idlist.cc
@@ -20,7 +20,7 @@
 
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kis_id.h"
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc
index fe2b93fd..ae0ddfac 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cc
@@ -35,7 +35,7 @@
 #include <tqframe.h>
 
 #include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <koFrameButton.h>
 
diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc
index 375b16ee..64939c4a 100644
--- a/chalk/ui/kis_config.cc
+++ b/chalk/ui/kis_config.cc
@@ -17,9 +17,9 @@
  */
 #include <limits.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <config.h>
 
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index f4af08a1..6c57a7e6 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -31,10 +31,10 @@
 
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <koFrameButton.h>
 #include <tdeactioncollection.h>
 
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc
index d235259f..1802e6cf 100644
--- a/chalk/ui/kis_custom_brush.cc
+++ b/chalk/ui/kis_custom_brush.cc
@@ -23,9 +23,9 @@
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "kis_view.h"
 #include "kis_image.h"
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index 8bd36142..631b9abe 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -24,13 +24,13 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kcolordialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kis_view.h"
 #include "kis_palette.h"
diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc
index 8c2f22e2..edf92be1 100644
--- a/chalk/ui/kis_custom_pattern.cc
+++ b/chalk/ui/kis_custom_pattern.cc
@@ -22,9 +22,9 @@
 #include <tqimage.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "kis_view.h"
 #include "kis_image.h"
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc
index 159d966f..f7d75310 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cc
@@ -16,14 +16,14 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_filter_config_widget.h"
 #include "kis_transaction.h"
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc
index 9819228e..997887f0 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cc
@@ -16,14 +16,14 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_filter_config_widget.h"
 #include "kis_transaction.h"
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc
index 2d5e8a90..fcdfbd09 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cc
@@ -17,7 +17,7 @@
  */
 
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 
 #include "kis_factory.h"
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index ac8e14a3..00acde27 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -26,7 +26,7 @@
 #include <tqtextedit.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorcombo.h>
 
 #include <KoUnitWidgets.h>
diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc
index 500d29a1..832102c6 100644
--- a/chalk/ui/kis_dlg_layer_properties.cc
+++ b/chalk/ui/kis_dlg_layer_properties.cc
@@ -22,7 +22,7 @@
 #include <tqslider.h>
 #include <tqstring.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
 #include "kis_global.h"
diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc
index 4eb5a409..91f53a75 100644
--- a/chalk/ui/kis_dlg_new_layer.cc
+++ b/chalk/ui/kis_dlg_new_layer.cc
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index 7d1f5faa..5fbe96d5 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -46,7 +46,7 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
 
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index dafb63dd..60dbbfdd 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -36,11 +36,11 @@
 #include <kdebug.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
 #include <knotifyclient.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // KOffice
 #include <KoFilterManager.h>
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc
index 9048935b..154213b4 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cc
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index b7b84d88..848f99b7 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -22,7 +22,7 @@
 #include <tqframe.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 
 #include <kis_cursor.h>
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index c6343f39..e3674fc8 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -26,7 +26,7 @@
 #include "tqpainter.h"
 #include "tqpixmap.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "kis_types.h"
 #include "kis_paint_device.h"
diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc
index 098efb55..5022a28b 100644
--- a/chalk/ui/kis_gradient_chooser.cc
+++ b/chalk/ui/kis_gradient_chooser.cc
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 3325517a..255d3847 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_autogradient_resource.h"
 
diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp
index 04adc0c2..1852438d 100644
--- a/chalk/ui/kis_grid_manager.cpp
+++ b/chalk/ui/kis_grid_manager.cpp
@@ -32,7 +32,7 @@
 
 #include <tdeaction.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #include "kis_config.h"
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc
index 92573c9f..cb1b6938 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cc
@@ -40,8 +40,8 @@
 #include <tqvalidator.h>
 
 #include <knuminput.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <karrowbutton.h>
 
diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cc
index 36513c32..d33c3873 100644
--- a/chalk/ui/kis_itemchooser.cc
+++ b/chalk/ui/kis_itemchooser.cc
@@ -17,7 +17,7 @@
  */
 #include <tqvbox.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <koIconChooser.h>
 
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index 492548ef..bd195018 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kiconloader.h>
 
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 7e14dcf0..ba5fe219 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -37,13 +37,13 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <KoPartSelectAction.h>
 
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 756ab60e..7bb0b332 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -18,9 +18,9 @@
 */
 
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <KoPartSelectAction.h>
 #include <tqimage.h>
diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc
index 806998bf..e0269504 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.cc
+++ b/chalk/ui/kis_multi_bool_filter_widget.cc
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KisBoolWidgetParam::KisBoolWidgetParam(  bool ninitvalue, TQString nlabel, TQString nname) :
     initvalue(ninitvalue),
diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc
index 486bc770..9491f221 100644
--- a/chalk/ui/kis_multi_double_filter_widget.cc
+++ b/chalk/ui/kis_multi_double_filter_widget.cc
@@ -24,7 +24,7 @@
 
 #include <knuminput.h>
 #include <kis_filter_config_widget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, const char * name)
     : KDoubleNumInput(parent, name)
diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc
index 130a03d1..aef29d2c 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.cc
+++ b/chalk/ui/kis_multi_integer_filter_widget.cc
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, const char * name)
         : KIntNumInput(parent, name)
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index b2fcc212..6036ef74 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -24,12 +24,12 @@
 #include <tqlayout.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index 1a0de3db..2e17f651 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -39,12 +39,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index 5585a9a9..e04b0494 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -36,12 +36,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 5846a67b..4c05360e 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -21,7 +21,7 @@
 #include "tqimage.h"
 #include "tqpainter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "KoDocument.h"
 #include "KoDocumentChild.h"
diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc
index b05f62a0..741cba65 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cc
@@ -17,7 +17,7 @@
  */
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <koIconChooser.h>
 
 #include "kis_colorspace.h"
diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp
index dae4bd46..d128f220 100644
--- a/chalk/ui/kis_perspective_grid_manager.cpp
+++ b/chalk/ui/kis_perspective_grid_manager.cpp
@@ -21,8 +21,8 @@
 #include "kis_perspective_grid_manager.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kis_image.h"
 #include "kis_grid_drawer.h"
diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cc
index 64cd1171..3076bc00 100644
--- a/chalk/ui/kis_resourceserver.cc
+++ b/chalk/ui/kis_resourceserver.cc
@@ -25,7 +25,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index ca17d1ad..7d001586 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 
 #include <KoDocument.h>
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index 53b8fcee..02674741 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -21,7 +21,7 @@
 #include <tdeaction.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kis_tool.h"
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index eb961b33..759136f4 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_canvas_controller.h"
 #include "kis_canvas_subject.h"
diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h
index bc5171a8..afa6b9bc 100644
--- a/chalk/ui/kis_tool_factory.h
+++ b/chalk/ui/kis_tool_factory.h
@@ -19,7 +19,7 @@
 #ifndef KIS_TOOL_FACTORY_H_
 #define KIS_TOOL_FACTORY_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_id.h"
 #include "kis_types.h"
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index fe6ac1a2..787afee4 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_canvas_subject.h"
 #include "kis_undo_adapter.h"
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index 995a3fe4..143bd675 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 
diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc
index fa9d0c94..68ce4c69 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cc
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kis_tool_shape.h"
 #include "wdgshapeoptions.h"
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index dd406ac7..79575357 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -43,14 +43,14 @@
 
 // KDE
 #include <kis_meta_registry.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <dcopobject.h>
 #include <tdeaction.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kprinter.h>
 #include <kpushbutton.h>
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 5b1d4442..f7a9842d 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -28,11 +28,11 @@
 #include <tqcursor.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeaction.h>
 #include <tdetoolbar.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <KoDocument.h>
 
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 6b3ea463..bb82396a 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -32,11 +32,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>