Rename additional header files to avoid conflicts with KDE4

59 files changed, 76 insertions, 76 deletions

diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc
index b1bf83dd..0a94f140 100644
--- a/kig/filters/cabri-filter.cc
+++ b/kig/filters/cabri-filter.cc
@@ -46,7 +46,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
  * a line:
diff --git a/kig/filters/drgeo-filter-chooser.cc b/kig/filters/drgeo-filter-chooser.cc
index 81fab837..89250235 100644
--- a/kig/filters/drgeo-filter-chooser.cc
+++ b/kig/filters/drgeo-filter-chooser.cc
@@ -20,8 +20,8 @@
 #include "drgeo-filter-chooser.moc"
 
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 13a3ca0f..2b7673ee 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -54,7 +54,7 @@
 #include <tqfile.h>
 #include <tqnamespace.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #undef DRGEO_DEBUG
 //#define DRGEO_DEBUG
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 8b3799d0..90cef343 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -45,8 +45,8 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 
 #include <map>
diff --git a/kig/filters/filter.cc b/kig/filters/filter.cc
index 81cd1ef4..6a543430 100644
--- a/kig/filters/filter.cc
+++ b/kig/filters/filter.cc
@@ -26,8 +26,8 @@
 #include "kseg-filter.h"
 #include "drgeo-filter.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 KigFilters* KigFilters::sThis;
 
diff --git a/kig/filters/kgeo-resource.h b/kig/filters/kgeo-resource.h
index f7af0f64..d2108b22 100644
--- a/kig/filters/kgeo-resource.h
+++ b/kig/filters/kgeo-resource.h
@@ -48,7 +48,7 @@
 
 #include <iostream>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ///////////////////////////////////////////////////////////////////
 // resource.h  -- contains macros used for commands
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 286f23cd..2028bf69 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -50,7 +50,7 @@
 #include <tqdatastream.h>
 #include <tqbuffer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KigFilterKSeg::KigFilterKSeg()
 {
diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc
index b6e267bb..3db2870b 100644
--- a/kig/filters/latexexporter.cc
+++ b/kig/filters/latexexporter.cc
@@ -49,8 +49,8 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #ifdef HAVE_TRUNC
 #define KDE_TRUNC(a)	trunc(a)
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index 652e1096..4ffe26a6 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -38,7 +38,7 @@
 
 #include <karchive.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 
diff --git a/kig/filters/svgexporter.cc b/kig/filters/svgexporter.cc
index e2cc41bd..7d724b31 100644
--- a/kig/filters/svgexporter.cc
+++ b/kig/filters/svgexporter.cc
@@ -31,8 +31,8 @@
 #include <tqpicture.h>
 #include <tqrect.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <map>
 
diff --git a/kig/kig/aboutdata.h b/kig/kig/aboutdata.h
index a20371a7..be6af4f4 100644
--- a/kig/kig/aboutdata.h
+++ b/kig/kig/aboutdata.h
@@ -16,7 +16,7 @@
 // 02110-1301, USA.
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "config.h"
 
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index d2073bb3..d6af88b2 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -32,8 +32,8 @@
 #include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <ktip.h>
diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h
index c21d4692..b7e4ac12 100644
--- a/kig/kig/kig_commands.h
+++ b/kig/kig/kig_commands.h
@@ -23,7 +23,7 @@
 #define KIG_COMMANDS_H
 
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "../objects/object_holder.h"
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 2cbf135a..3d830a70 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -47,12 +47,12 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index 954c96fc..7d988df4 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -38,7 +38,7 @@
 
 #include <kdebug.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
diff --git a/kig/kig/main.cpp b/kig/kig/main.cpp
index 72a92148..9923f9bf 100644
--- a/kig/kig/main.cpp
+++ b/kig/kig/main.cpp
@@ -23,7 +23,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kdebug.h>
 
diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc
index 85d0d110..d42ef8ad 100644
--- a/kig/misc/builtin_stuff.cc
+++ b/kig/misc/builtin_stuff.cc
@@ -42,7 +42,7 @@
 #include "../objects/vector_type.h"
 #include "../objects/polygon_type.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 void setupBuiltinStuff()
 {
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp
index 287bde1f..5e82d564 100644
--- a/kig/misc/common.cpp
+++ b/kig/misc/common.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <knumvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kinputdialog.h>
 #else
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 33ec67ce..194a008f 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -32,8 +32,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 
 #include <string>
diff --git a/kig/misc/goniometry.cc b/kig/misc/goniometry.cc
index 61e13358..ee4f75fa 100644
--- a/kig/misc/goniometry.cc
+++ b/kig/misc/goniometry.cc
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index 831a4b64..0d7b35d9 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -32,7 +32,7 @@
 #include "../objects/bogus_imp.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 
diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc
index 2d7ea08f..28d4dc74 100644
--- a/kig/misc/kigfiledialog.cc
+++ b/kig/misc/kigfiledialog.cc
@@ -21,8 +21,8 @@
 #include <tqfile.h>
 #include <tqpoint.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter,
               const TQString& caption,  TQWidget* parent )
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index ac7f9ac5..a596c87c 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -36,7 +36,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 
 class KigInputDialogPrivate
diff --git a/kig/misc/kigtransform.cpp b/kig/misc/kigtransform.cpp
index bc446403..2bb0e91a 100644
--- a/kig/misc/kigtransform.cpp
+++ b/kig/misc/kigtransform.cpp
@@ -26,7 +26,7 @@
 
 #include <cmath>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // Transformation getProjectiveTransformation ( int argsnum,
diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc
index d3a4fb4d..f0e0c3f7 100644
--- a/kig/misc/lists.cc
+++ b/kig/misc/lists.cc
@@ -24,8 +24,8 @@
 
 #include "config.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqdom.h>
diff --git a/kig/misc/object_constructor.cc b/kig/misc/object_constructor.cc
index f2b9f330..ae2a37d0 100644
--- a/kig/misc/object_constructor.cc
+++ b/kig/misc/object_constructor.cc
@@ -38,7 +38,7 @@
 
 #include <tqpen.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index da89b66c..7861c56e 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -26,7 +26,7 @@
 #include "../objects/transform_types.h"
 #include "../objects/object_type.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdom.h>
 
 class ObjectHierarchy::Node
diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc
index 51ac346e..9618bc90 100644
--- a/kig/misc/special_constructors.cc
+++ b/kig/misc/special_constructors.cc
@@ -54,7 +54,7 @@
 
 #include <tqpen.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index 1dab83d7..00686392 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -26,8 +26,8 @@
 #include <tdeapplication.h>
 #include <kicondialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index 67509396..12f0d57c 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -35,9 +35,9 @@
 #include "../objects/text_type.h"
 
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kig/modes/macro.cc b/kig/modes/macro.cc
index ba6f98ab..8fe16b4d 100644
--- a/kig/modes/macro.cc
+++ b/kig/modes/macro.cc
@@ -28,9 +28,9 @@
 #include "../objects/object_imp.h"
 
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <functional>
 #include <algorithm>
diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc
index 70123996..9a30c213 100644
--- a/kig/modes/normal.cc
+++ b/kig/modes/normal.cc
@@ -34,7 +34,7 @@
 #include <kcursor.h>
 #include <tdeaction.h>
 #include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 5c2528a6..eef5b1e3 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -54,9 +54,9 @@
 
 #include <tdeaction.h>
 #include <kcolordialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kinputdialog.h>
 #else
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 8660eaba..8847ee5a 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc
index b7b8f41e..76d724b1 100644
--- a/kig/objects/bogus_imp.cc
+++ b/kig/objects/bogus_imp.cc
@@ -19,7 +19,7 @@
 
 #include <tqcstring.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../misc/rect.h"
 
diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc
index 38522c22..16b3a5b7 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cc
@@ -27,7 +27,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 
diff --git a/kig/objects/circle_type.cc b/kig/objects/circle_type.cc
index 97d2f615..c47677ab 100644
--- a/kig/objects/circle_type.cc
+++ b/kig/objects/circle_type.cc
@@ -24,7 +24,7 @@
 
 #include "../misc/common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char constructcirclethroughpointstat[] = I18N_NOOP( "Construct a circle through this point" );
 
diff --git a/kig/objects/common.h b/kig/objects/common.h
index f1ea5b8d..f9d4517a 100644
--- a/kig/objects/common.h
+++ b/kig/objects/common.h
@@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <cassert>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class Coordinate;
 class KigDocument;
diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc
index 81331522..dcbd23fd 100644
--- a/kig/objects/conic_imp.cc
+++ b/kig/objects/conic_imp.cc
@@ -27,7 +27,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ObjectImp* ConicImp::transform( const Transformation& t ) const
 {
diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cc
index 34396369..be94cf56 100644
--- a/kig/objects/conic_types.cc
+++ b/kig/objects/conic_types.cc
@@ -28,7 +28,7 @@
 #include "../kig/kig_commands.h"
 #include "../kig/kig_part.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char conic_constructstatement[] = I18N_NOOP( "Construct a conic through this point" );
 
diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc
index 9fc8c53c..7fb5ec63 100644
--- a/kig/objects/cubic_imp.cc
+++ b/kig/objects/cubic_imp.cc
@@ -26,7 +26,7 @@
 #include "../kig/kig_view.h"
 
 #include <math.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 CubicImp::CubicImp( const CubicCartesianData& data )
   : CurveImp(), mdata( data )
diff --git a/kig/objects/cubic_type.cc b/kig/objects/cubic_type.cc
index c322b8c3..24bfbda4 100644
--- a/kig/objects/cubic_type.cc
+++ b/kig/objects/cubic_type.cc
@@ -21,7 +21,7 @@
 #include "point_imp.h"
 #include "bogus_imp.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char cubictpstatement[] = I18N_NOOP( "Construct a cubic curve through this point" );
 
diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc
index 804d498d..0718bc23 100644
--- a/kig/objects/intersection_types.cc
+++ b/kig/objects/intersection_types.cc
@@ -25,7 +25,7 @@
 #include "other_imp.h"
 #include "point_imp.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char intersectlinestat[] = I18N_NOOP( "Intersect with this line" );
 
diff --git a/kig/objects/inversion_type.cc b/kig/objects/inversion_type.cc
index 0ab77780..4f270582 100644
--- a/kig/objects/inversion_type.cc
+++ b/kig/objects/inversion_type.cc
@@ -24,7 +24,7 @@
 
 #include "../misc/common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char str1[] = I18N_NOOP( "Invert with respect to this circle" );
 static const char str2[] = I18N_NOOP( "Select the circle we want to invert against..." );
diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc
index a49078a1..4223000b 100644
--- a/kig/objects/line_imp.cc
+++ b/kig/objects/line_imp.cc
@@ -26,7 +26,7 @@
 #include "../misc/kigpainter.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 using namespace std;
diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cc
index a02cc80b..bd9a5f3e 100644
--- a/kig/objects/line_type.cc
+++ b/kig/objects/line_type.cc
@@ -31,7 +31,7 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const ArgsParser::spec argsspecSegmentAB[] =
 {
diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc
index edbdc88b..fcbfe7a7 100644
--- a/kig/objects/locus_imp.cc
+++ b/kig/objects/locus_imp.cc
@@ -26,7 +26,7 @@
 
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc
index 9a3ee679..1f7ad798 100644
--- a/kig/objects/object_imp.cc
+++ b/kig/objects/object_imp.cc
@@ -21,7 +21,7 @@
 
 #include "../misc/coordinate.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <map>
 
 class ObjectImpType::StaticPrivate
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc
index d095c238..dd184295 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cc
@@ -32,7 +32,7 @@
 
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 const ObjectImpFactory* ObjectImpFactory::instance()
 {
diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc
index ea85e4f8..3b2fc108 100644
--- a/kig/objects/object_type.cc
+++ b/kig/objects/object_type.cc
@@ -24,7 +24,7 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 const char* ObjectType::fullName() const
 {
diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc
index 137a3e93..5c063753 100644
--- a/kig/objects/other_imp.cc
+++ b/kig/objects/other_imp.cc
@@ -28,7 +28,7 @@
 #include "../misc/goniometry.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 #include <utility>
diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc
index 539f98b3..4cc4168c 100644
--- a/kig/objects/point_imp.cc
+++ b/kig/objects/point_imp.cc
@@ -24,7 +24,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 PointImp::PointImp( const Coordinate& c )
   : mc( c )
diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc
index 2acd8479..59f495b9 100644
--- a/kig/objects/point_type.cc
+++ b/kig/objects/point_type.cc
@@ -33,7 +33,7 @@
 #include "../kig/kig_view.h"
 #include "../kig/kig_commands.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const ArgsParser::spec argsspecFixedPoint[] =
 {
diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc
index 5c001df6..dd3ffa44 100644
--- a/kig/objects/polygon_imp.cc
+++ b/kig/objects/polygon_imp.cc
@@ -29,7 +29,7 @@
 #include "../kig/kig_document.h"
 #include "../kig/kig_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <cmath>
 
diff --git a/kig/objects/polygon_type.cc b/kig/objects/polygon_type.cc
index bca867da..cd1fb544 100644
--- a/kig/objects/polygon_type.cc
+++ b/kig/objects/polygon_type.cc
@@ -25,7 +25,7 @@
 
 #include "../misc/common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <cmath>
 #include <vector>
 
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index 6341e469..9cb4d9e2 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -29,7 +29,7 @@
 #include <tdeaction.h>
 //
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdepopupmenu.h>
 #include <ktextedit.h>
 #include <tdetexteditor/clipboardinterface.h>
diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc
index 2eb2da81..e799fac0 100644
--- a/kig/scripting/script-common.cc
+++ b/kig/scripting/script-common.cc
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct script_prop
 {
diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc
index 380189e6..1fd88405 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cc
@@ -35,7 +35,7 @@
 
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 void ScriptModeBase::dragRect( const TQPoint& p, KigWidget& w )
 {
diff --git a/kig/tdefile/tdefile_kig.cpp b/kig/tdefile/tdefile_kig.cpp
index 48042368..a1294641 100644
--- a/kig/tdefile/tdefile_kig.cpp
+++ b/kig/tdefile/tdefile_kig.cpp
@@ -26,8 +26,8 @@
 
 #include <karchive.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktar.h>