From 71049a71c6648791e95cf421b19047415a2c4c84 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:54:06 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 atlantikdesigner/designer/boardinfo.cpp                 | 2 +-
 atlantikdesigner/designer/designer.cpp                  | 6 +++---
 atlantikdesigner/designer/editor.cpp                    | 4 ++--
 atlantikdesigner/designer/group.cpp                     | 4 ++--
 atlantikdesigner/designer/main.cpp                      | 4 ++--
 kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp         | 6 +++---
 kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp | 4 ++--
 kate/cppsymbolviewer/plugin_katesymbolviewer.cpp        | 2 +-
 kate/cppsymbolviewer/plugin_katesymbolviewer.h          | 2 +-
 kate/filelistloader/katefll_initplugin.cpp              | 2 +-
 kate/filelistloader/katefll_plugin.cpp                  | 6 +++---
 kate/filetemplates/plugin/filetemplates.cpp             | 8 ++++----
 kate/filetemplates/plugin/filetemplates.h               | 2 +-
 kate/helloworld/plugin_katehelloworld.cpp               | 2 +-
 kate/htmltools/plugin_katehtmltools.cpp                 | 2 +-
 kate/insertcommand/plugin_kateinsertcommand.cpp         | 4 ++--
 kate/insertcommand/plugin_kateinsertcommand.h           | 2 +-
 kate/kjswrapper/bindings.cpp                            | 2 +-
 kate/kjswrapper/plugin_katekjswrapper.h                 | 2 +-
 kate/kpybrowser/kpybrowser.cpp                          | 4 ++--
 kate/kpybrowser/pybrowse_part.cpp                       | 4 ++--
 kate/kpybrowser/pybrowse_part.h                         | 2 +-
 kate/make/plugin_katemake.cpp                           | 4 ++--
 kate/make/plugin_katemake.h                             | 2 +-
 kate/modeline/ModelinePlugin.cpp                        | 2 +-
 kate/openheader/plugin_kateopenheader.cpp               | 2 +-
 kate/snippets/plugin_katesnippets.cpp                   | 2 +-
 kate/snippets/plugin_katesnippets.h                     | 2 +-
 kate/tabbarextension/plugin_katetabbarextension.cpp     | 4 ++--
 kate/tabbarextension/plugin_katetabbarextension.h       | 2 +-
 kate/textfilter/plugin_katetextfilter.cpp               | 4 ++--
 kate/xmlcheck/plugin_katexmlcheck.cpp                   | 6 +++---
 kate/xmlcheck/plugin_katexmlcheck.h                     | 2 +-
 kate/xmltools/plugin_katexmltools.cpp                   | 6 +++---
 kate/xmltools/pseudo_dtd.cpp                            | 4 ++--
 kicker-applets/kbinaryclock/datepicker.cpp              | 2 +-
 kicker-applets/kbinaryclock/kbinaryclock.cpp            | 2 +-
 kicker-applets/kbinaryclock/kbinaryclock.h              | 2 +-
 kicker-applets/kolourpicker/kolourpicker.cpp            | 6 +++---
 kicker-applets/kolourpicker/simplebutton.cpp            | 2 +-
 kicker-applets/ktimemon/confdlg.cc                      | 4 ++--
 kicker-applets/ktimemon/sample.cc                       | 4 ++--
 kicker-applets/ktimemon/timemon.cc                      | 6 +++---
 kicker-applets/math/mathapplet.cpp                      | 6 +++---
 kicker-applets/math/parser.cpp                          | 4 ++--
 kicker-applets/mediacontrol/configfrontend.h            | 2 +-
 kicker-applets/mediacontrol/kscdInterface.cpp           | 2 +-
 kicker-applets/mediacontrol/mediacontrol.cpp            | 2 +-
 kicker-applets/mediacontrol/mediacontrol.h              | 2 +-
 kicker-applets/mediacontrol/mediacontrolconfig.cpp      | 4 ++--
 kicker-applets/mediacontrol/mpdInterface.cpp            | 2 +-
 kicker-applets/mediacontrol/mpdInterface.h              | 2 +-
 kicker-applets/mediacontrol/playerInterface.cpp         | 4 ++--
 kicker-applets/mediacontrol/simplebutton.cpp            | 2 +-
 konq-plugins/adblock/adblock.cpp                        | 4 ++--
 konq-plugins/adblock/adblockdialogue.cpp                | 2 +-
 konq-plugins/akregator/akregatorplugin.cpp              | 4 ++--
 konq-plugins/akregator/konqfeedicon.cpp                 | 2 +-
 konq-plugins/akregator/pluginbase.cpp                   | 2 +-
 konq-plugins/arkplugin/arkplugin.cpp                    | 2 +-
 konq-plugins/autorefresh/autorefresh.cpp                | 2 +-
 konq-plugins/babelfish/plugin_babelfish.cpp             | 4 ++--
 konq-plugins/crashes/crashesplugin.cpp                  | 2 +-
 konq-plugins/dirfilter/dirfilterplugin.cpp              | 4 ++--
 konq-plugins/domtreeviewer/domlistviewitem.cpp          | 2 +-
 konq-plugins/domtreeviewer/domtreecommands.cpp          | 2 +-
 konq-plugins/domtreeviewer/domtreeview.cpp              | 6 +++---
 konq-plugins/domtreeviewer/domtreewindow.cpp            | 6 +++---
 konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp     | 2 +-
 konq-plugins/fsview/fsview.cpp                          | 6 +++---
 konq-plugins/fsview/fsview_part.cpp                     | 6 +++---
 konq-plugins/fsview/inode.cpp                           | 4 ++--
 konq-plugins/fsview/main.cpp                            | 4 ++--
 konq-plugins/fsview/treemap.cpp                         | 2 +-
 konq-plugins/kimgalleryplugin/imgallerydialog.cpp       | 4 ++--
 konq-plugins/kimgalleryplugin/imgalleryplugin.cpp       | 6 +++---
 konq-plugins/kuick/kcmkuick/kcmkuick.cpp                | 4 ++--
 konq-plugins/kuick/kdirmenu.cpp                         | 2 +-
 konq-plugins/kuick/kimcontactmenu.cpp                   | 4 ++--
 konq-plugins/kuick/kmetamenu.cpp                        | 2 +-
 konq-plugins/kuick/kuick_plugin.cpp                     | 4 ++--
 konq-plugins/microformat/pluginbase.cpp                 | 2 +-
 konq-plugins/minitools/minitoolsplugin.cpp              | 2 +-
 konq-plugins/rellinks/plugin_rellinks.cpp               | 2 +-
 konq-plugins/rsync/rsyncplugin.cpp                      | 4 ++--
 konq-plugins/searchbar/searchbar.cpp                    | 6 +++---
 konq-plugins/sidebar/delicious/bookmarkListItem.cpp     | 4 ++--
 konq-plugins/sidebar/delicious/mainWidget.cpp           | 6 +++---
 konq-plugins/sidebar/delicious/plugin.cpp               | 4 ++--
 konq-plugins/sidebar/mediaplayer/engine.cpp             | 4 ++--
 konq-plugins/sidebar/mediaplayer/mediaplayer.cpp        | 6 +++---
 konq-plugins/sidebar/mediaplayer/mediawidget.cpp        | 2 +-
 konq-plugins/sidebar/mediaplayer/player.cpp             | 2 +-
 konq-plugins/sidebar/metabar/src/configdialog.cpp       | 2 +-
 konq-plugins/sidebar/metabar/src/defaultplugin.cpp      | 2 +-
 konq-plugins/sidebar/metabar/src/httpplugin.cpp         | 2 +-
 konq-plugins/sidebar/metabar/src/metabar.cpp            | 2 +-
 konq-plugins/sidebar/metabar/src/metabarwidget.cpp      | 4 ++--
 konq-plugins/sidebar/metabar/src/protocolplugin.cpp     | 2 +-
 konq-plugins/sidebar/metabar/src/remoteplugin.cpp       | 2 +-
 konq-plugins/sidebar/metabar/src/serviceloader.cpp      | 2 +-
 konq-plugins/sidebar/metabar/src/settingsplugin.cpp     | 2 +-
 konq-plugins/sidebar/newsticker/norsswidget.cpp         | 2 +-
 konq-plugins/sidebar/newsticker/sidebar_news.cpp        | 4 ++--
 konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp   | 8 ++++----
 konq-plugins/uachanger/uachangerplugin.cpp              | 6 +++---
 konq-plugins/validators/plugin_validators.cpp           | 4 ++--
 konq-plugins/validators/validatorsdialog.cpp            | 2 +-
 konq-plugins/webarchiver/archivedialog.cpp              | 6 +++---
 konq-plugins/webarchiver/archivedialog.h                | 2 +-
 konq-plugins/webarchiver/plugin_webarchiver.cpp         | 6 +++---
 ksig/ksig.cpp                                           | 6 +++---
 ksig/main.cpp                                           | 2 +-
 ksig/siglistview.cpp                                    | 2 +-
 ksig/siglistviewitem.cpp                                | 2 +-
 noatun-plugins/alarm/wakeup.cpp                         | 4 ++--
 noatun-plugins/alsaplayer/alsaplayerui.cpp              | 2 +-
 noatun-plugins/alsaplayer/configmodule.cpp              | 4 ++--
 noatun-plugins/alsaplayer/userinterface.cpp             | 4 ++--
 noatun-plugins/charlatan/charlatanui.cpp                | 2 +-
 noatun-plugins/charlatan/configmodule.cpp               | 4 ++--
 noatun-plugins/charlatan/userinterface.cpp              | 4 ++--
 noatun-plugins/dub/dub/dub.cpp                          | 4 ++--
 noatun-plugins/dub/dub/dubapp.cpp                       | 4 ++--
 noatun-plugins/dub/dub/dubconfigmodule.cpp              | 4 ++--
 noatun-plugins/dub/dub/dubplaylist.cpp                  | 4 ++--
 noatun-plugins/dub/dub/dubplaylistitem.cpp              | 4 ++--
 noatun-plugins/dub/dub/fileselectorwidget.cpp           | 4 ++--
 noatun-plugins/dub/dub/fileselectorwidget.h             | 2 +-
 noatun-plugins/ffrs/ffrs.cpp                            | 2 +-
 noatun-plugins/lyrics/cmodule.cpp                       | 4 ++--
 noatun-plugins/lyrics/cmodule.h                         | 2 +-
 noatun-plugins/lyrics/lyrics.cpp                        | 4 ++--
 noatun-plugins/nexscope/gui.cpp                         | 2 +-
 noatun-plugins/nexscope/nex.cpp                         | 2 +-
 noatun-plugins/nexscope/noatunplugin.cpp                | 4 ++--
 noatun-plugins/nexscope/renderers.cpp                   | 2 +-
 noatun-plugins/oblique/cmodule.cpp                      | 2 +-
 noatun-plugins/oblique/file.cpp                         | 2 +-
 noatun-plugins/oblique/kdatacollection.cpp              | 2 +-
 noatun-plugins/oblique/menu.cpp                         | 2 +-
 noatun-plugins/oblique/query.cpp                        | 2 +-
 noatun-plugins/oblique/tree.cpp                         | 2 +-
 noatun-plugins/oblique/view.cpp                         | 4 ++--
 noatun-plugins/pitchablespeed/pitchablespeed.cpp        | 2 +-
 noatun-plugins/synaescope/cmodule.cpp                   | 6 +++---
 noatun-plugins/synaescope/main.cpp                      | 2 +-
 noatun-plugins/synaescope/synaescope.cpp                | 4 ++--
 noatun-plugins/tippercanoe/synaescope.cpp               | 4 ++--
 noatun-plugins/tyler/file.cpp                           | 2 +-
 noatun-plugins/tyler/tyler.cpp                          | 4 ++--
 noatun-plugins/wavecapture/wavecapture.cpp              | 2 +-
 renamedlgplugins/audio/audiopreview.cpp                 | 2 +-
 renamedlgplugins/images/imagevisualizer.cpp             | 2 +-
 tdefile-plugins/desktop/tdefile_desktop.cpp             | 2 +-
 tdefile-plugins/lnk/lnkforward.cpp                      | 2 +-
 156 files changed, 255 insertions(+), 255 deletions(-)

diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp
index 56b561a..b29106c 100644
--- a/atlantikdesigner/designer/boardinfo.cpp
+++ b/atlantikdesigner/designer/boardinfo.cpp
@@ -7,7 +7,7 @@
 
 #include <kcolorbutton.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 05297ca..eaab1e5 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -17,12 +17,12 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index 3a61a5e..3301ba6 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -18,8 +18,8 @@
 #include <kdialogbase.h>
 #include <klineeditdlg.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index b284b82..2aca4f4 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -12,8 +12,8 @@
 #include <klineedit.h>
 #include <klineeditdlg.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 
diff --git a/atlantikdesigner/designer/main.cpp b/atlantikdesigner/designer/main.cpp
index 59b86aa..31ebf27 100644
--- a/atlantikdesigner/designer/main.cpp
+++ b/atlantikdesigner/designer/main.cpp
@@ -1,6 +1,6 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "designer.h"
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
 
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 
-	TDEApplication kapplication;
+	TDEApplication tdeapplication;
 
 	if (tdeapplication.isRestored())
 		RESTORE(AtlanticDesigner)
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index a068e4b..0548c38 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -34,10 +34,10 @@
 
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <kdebug.h>
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 48a3901..d6fc76b 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -22,8 +22,8 @@
 */
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <float.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index f2c8419..3bc152a 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -42,7 +42,7 @@
 #include "plugin_katesymbolviewer.moc"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
 #include <tdefiledialog.h>
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index ec3cf0a..7d2736f 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -37,7 +37,7 @@
 //#include <tqprocess.h>
 #include <tqregexp.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index a1d5ec7..7837b33 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -23,7 +23,7 @@
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index 8a6fd79..381c5b1 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -23,13 +23,13 @@
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 
 K_EXPORT_COMPONENT_FACTORY( katefll_plugin, KGenericFactory<PluginKateFileListLoader>( "katefll_loader" ) )
 
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 2153c4f..c8b9730 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -31,19 +31,19 @@
 #include <kdialogbase.h>
 #include <kdirwatch.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knewstuff/knewstuff.h>
 #include <knewstuff/entry.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 #include <kuser.h>
 #include <kxmlguifactory.h>
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index 29c0fff..a5c78ba 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -30,7 +30,7 @@
 #include <kate/viewmanager.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kwizard.h>
 
diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp
index e710c83..45424ab 100644
--- a/kate/helloworld/plugin_katehelloworld.cpp
+++ b/kate/helloworld/plugin_katehelloworld.cpp
@@ -3,7 +3,7 @@
 #include "plugin_katehelloworld.moc"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 K_EXPORT_COMPONENT_FACTORY( katehelloworldplugin, KGenericFactory<KatePluginHelloWorld>( "katehelloworld" ) )
diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp
index 02b2cba..d6fc512 100644
--- a/kate/htmltools/plugin_katehtmltools.cpp
+++ b/kate/htmltools/plugin_katehtmltools.cpp
@@ -21,7 +21,7 @@
 #include <klineeditdlg.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <cassert>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 7044777..9f89b0c 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index 1c96849..2c536c6 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -31,7 +31,7 @@
 #include <kcombobox.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
 
diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp
index 34bd1b0..13af0c7 100644
--- a/kate/kjswrapper/bindings.cpp
+++ b/kate/kjswrapper/bindings.cpp
@@ -8,7 +8,7 @@
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/jsfactory.h>
 #include <kjsembed/jsobjectproxy_imp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/value.h>
 #include <kdockwidget.h>
 #include <kate/application.h>
diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h
index 2f13588..5cd401b 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.h
+++ b/kate/kjswrapper/plugin_katekjswrapper.h
@@ -32,7 +32,7 @@
 #include <kcombobox.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
 #include <tqvaluelist.h>
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 71e667d..f7cef15 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -17,8 +17,8 @@
 
 #include "kpybrowser.h"
 #include <tqheader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include "kpybrowser.moc"
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index 61732b4..af71679 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -22,9 +22,9 @@
 
 #include <kgenericfactory.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqimage.h>
 #include <kdockwidget.h>
 
diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h
index c9e1eb7..dad5e51 100644
--- a/kate/kpybrowser/pybrowse_part.h
+++ b/kate/kpybrowser/pybrowse_part.h
@@ -29,7 +29,7 @@
 
 #include <kdockwidget.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include "kpybrowser.h"
 
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 3bf75e7..c9fdc86 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -45,8 +45,8 @@
 #include <kdebug.h>
 #include <kdockwidget.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kpassivepopup.h>
 #include <klineedit.h>
diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h
index cdc9399..e63b27b 100644
--- a/kate/make/plugin_katemake.h
+++ b/kate/make/plugin_katemake.h
@@ -46,7 +46,7 @@ class TQRegExp;
 #include <kdockwidget.h>
 #include <kiconloader.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 class PluginKateMakeView : public TQListView, public KXMLGUIClient
 {
diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp
index 7d05b9e..b077ccf 100644
--- a/kate/modeline/ModelinePlugin.cpp
+++ b/kate/modeline/ModelinePlugin.cpp
@@ -17,7 +17,7 @@
 
 #include <tqregexp.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index 139c49d..8e98207 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -21,7 +21,7 @@
 #include <tqfileinfo.h>
 #include <kgenericfactory.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index 629cc87..d895989 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -5,7 +5,7 @@
 #include "plugin_katesnippets.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
 
diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h
index cf04e06..a2667af 100644
--- a/kate/snippets/plugin_katesnippets.h
+++ b/kate/snippets/plugin_katesnippets.h
@@ -13,7 +13,7 @@
 #include <kate/view.h>
 #include <kate/viewmanager.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kate/toolviewmanager.h>
 
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 616f284..8ceb642 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -27,9 +27,9 @@
 #include "plugin_katetabbarextension.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <tdetoolbar.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 109c563..7ce300c 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -36,7 +36,7 @@
 #include <kate/pluginconfiginterfaceextension.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 
 #include <tqwidget.h>
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index d58601c..68ce831 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -21,8 +21,8 @@
 #include <tdeaction.h>
 #include <kinstance.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <cassert>
 #include <kdebug.h>
 #include <tqstring.h>
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index c5f3a7b..65a8b7c 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -45,10 +45,10 @@
 #include <kdebug.h>
 #include <kdockwidget.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kate/toolviewmanager.h>
 #include <kgenericfactory.h>
 
diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h
index e12a950..0fac0b9 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.h
+++ b/kate/xmlcheck/plugin_katexmlcheck.h
@@ -39,7 +39,7 @@
 #include <kdockwidget.h>
 #include <kiconloader.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient
 {
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 6ebd9d9..7533e0e 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -95,11 +95,11 @@ TODO:
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kgenericfactory.h>
 
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index 8726d8b..d06ad67 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -27,8 +27,8 @@
 #include <tqdom.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 PseudoDTD::PseudoDTD()
 {
diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp
index 3406e4a..1b66b04 100644
--- a/kicker-applets/kbinaryclock/datepicker.cpp
+++ b/kicker-applets/kbinaryclock/datepicker.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdatepicker.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 DatePicker::DatePicker(TQWidget *parent, const TQDate& date)
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 9b940d1..4738e75 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfigdialog.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqradiobutton.h>
 #include <kcolorbutton.h>
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h
index 695187e..0ada3f5 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.h
+++ b/kicker-applets/kbinaryclock/kbinaryclock.h
@@ -21,7 +21,7 @@
 
 #include <kpanelapplet.h>
 #include <tqevent.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <tqdatetime.h>
 #include <tqtooltip.h>
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index ae4cb41..8f82fe2 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -30,14 +30,14 @@ $Id$
 #include <tqtooltip.h>
 #include <tqcursor.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 #include "kolourpicker.h"
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index e81abe4..d15ac36 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>
diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc
index df3fffe..337f5c5 100644
--- a/kicker-applets/ktimemon/confdlg.cc
+++ b/kicker-applets/ktimemon/confdlg.cc
@@ -22,8 +22,8 @@
 
 #include <kcolorbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "confdlg.h"
diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc
index 99ea20b..4a486f2 100644
--- a/kicker-applets/ktimemon/sample.cc
+++ b/kicker-applets/ktimemon/sample.cc
@@ -34,8 +34,8 @@
 #endif
 
 #include <tqwidget.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "timemon.h"
 #include "sample.h"
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index ec90f08..8289b2d 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -18,12 +18,12 @@
 #include <tqtooltip.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "timemon.h"
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index a15fecc..83604ea 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -30,14 +30,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqhbox.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kurifilter.h>
 #include <kdialog.h>
 #include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 #include "parser.h"
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index 8a58064..6dc928b 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -33,8 +33,8 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // local includes
 #include "parser.h"
diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h
index bbae0bb..665facc 100644
--- a/kicker-applets/mediacontrol/configfrontend.h
+++ b/kicker-applets/mediacontrol/configfrontend.h
@@ -22,7 +22,7 @@
 #define CONFIGFRONTEND_H
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class ConfigFrontend : public TQObject
 {
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 0256de6..3d48204 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqstrlist.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define TIMER_FAST  250
 
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index e003d3f..e3f5c43 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -46,7 +46,7 @@
 
 #include <tdeapplication.h>
 #include <kipc.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <knotifyclient.h>
 #include <kbugreport.h>
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 561e58a..36898fc 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpanelapplet.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index d86b110..9df7362 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -35,10 +35,10 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index 98ba0cb..0f0e1c6 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -25,7 +25,7 @@
 
 #include <tqregexp.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h
index 5e1a0bd..6128330 100644
--- a/kicker-applets/mediacontrol/mpdInterface.h
+++ b/kicker-applets/mediacontrol/mpdInterface.h
@@ -24,7 +24,7 @@
 
 #include "playerInterface.h"
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsocket.h>
 #include <tqmutex.h>
 
diff --git a/kicker-applets/mediacontrol/playerInterface.cpp b/kicker-applets/mediacontrol/playerInterface.cpp
index 1b90cf0..9ada948 100644
--- a/kicker-applets/mediacontrol/playerInterface.cpp
+++ b/kicker-applets/mediacontrol/playerInterface.cpp
@@ -18,8 +18,8 @@
 #include "playerInterface.h"
 #include "playerInterface.moc"
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 PlayerInterface::PlayerInterface() { }   // Constructor
 PlayerInterface::~PlayerInterface() { }  // Destructor
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index e81abe4..d15ac36 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index cee8de1..8036b5e 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -35,11 +35,11 @@
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
 #include <kcmultidialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dom/html_document.h>
 #include <dom/html_image.h>
 #include <dom/html_inline.h>
diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp
index 8198dd3..4a69141 100644
--- a/konq-plugins/adblock/adblockdialogue.cpp
+++ b/konq-plugins/adblock/adblockdialogue.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>
 #include <tqlabel.h>
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 1cdaf64..dd6ec3c 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -29,14 +29,14 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konq_popupmenu.h>
 #include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqdir.h>
 #include <tqcstring.h>
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index 6f7157e..c1c061c 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -33,7 +33,7 @@
 #include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/statusbarextension.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp
index 57fd966..2086a1c 100644
--- a/konq-plugins/akregator/pluginbase.cpp
+++ b/konq-plugins/akregator/pluginbase.cpp
@@ -26,7 +26,7 @@
 #include <kprocess.h>
 #include <dcopref.h>
 #include <tdehtml_part.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "feeddetector.h"
 #include "pluginbase.h"
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 18ee0c0..091635d 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konq_popupmenu.h>
 #include <tdepopupmenu.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp
index 38e343b..53d26c0 100644
--- a/konq-plugins/autorefresh/autorefresh.cpp
+++ b/konq-plugins/autorefresh/autorefresh.cpp
@@ -12,7 +12,7 @@
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtimer.h>
 #include <kgenericfactory.h>
  
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index d04952e..834ca5c 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -22,8 +22,8 @@
 
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index c2018b6..dfe8e3b 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kinstance.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index dfafaf1..6aaf2b1 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -29,12 +29,12 @@
 #include <tdelistview.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 #include <kdirlister.h>
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index d956ceb..6940675 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -21,7 +21,7 @@
 #include <tqlistview.h>
 #include <tqapplication.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent )
   : TQListViewItem( parent ), m_node(node)
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index 0bbb918..68aab4a 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -23,7 +23,7 @@
 #include <dom/dom_doc.h>
 #include <dom/dom_exception.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmap.h>
 
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index c474414..6735ca2 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -51,12 +51,12 @@
 #include <kdialog.h>
 #include <keditcl.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtml_part.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tdeshortcut.h>
 #include <kstdguiitem.h>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index ee6946f..b8ce0cb 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -29,11 +29,11 @@
 #include <kcommand.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index 0a38c77..e8c3591 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -7,7 +7,7 @@
 #include <klibloader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include <tdehtml_part.h>
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index bda0446..8ad2ed0 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -28,9 +28,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 4f76c7c..bbfe98a 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -30,13 +30,13 @@
 #include <tdeparts/genericfactory.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kprotocolinfo.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // from tdebase/libkonq...
 #include <konq_operations.h>
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index 79e5326..b26917c 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -24,8 +24,8 @@
 #include <kurl.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "inode.h"
 #include "scan.h"
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index 9a112e6..1f6f268 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -7,8 +7,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include "fsview.h"
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index d0356ab..2f85060 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -29,7 +29,7 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 1214647..e86dd57 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
 #include <tqspinbox.h>
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdefontdialog.h>
 #include <kiconloader.h>
@@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
 #include <knuminput.h>
 #include <kcolorbutton.h>
 #include <kurlrequester.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 
 #include "imgallerydialog.h"
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index a3e7795..a4d255c 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -30,10 +30,10 @@ Boston, MA 02110-1301, USA.
 #include <tqstylesheet.h>
 
 #include <tdeaction.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <kimageio.h>
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index 9816d9b..c32d46e 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -16,8 +16,8 @@
 
 #include <tqlayout.h>
 #include <tqfile.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 04f0d18..8a9758f 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksimpleconfig.h>
 #include "kdirmenu.h"
diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp
index cdc5566..43abe10 100644
--- a/konq-plugins/kuick/kimcontactmenu.cpp
+++ b/konq-plugins/kuick/kimcontactmenu.cpp
@@ -28,8 +28,8 @@
 #include <tdeimproxy.h>
 
 #ifdef KIMCONTACTS_USE_KABC
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #endif
 
 #include "kimcontactmenu.h"
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index 1ec30e7..ecc37de 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <tdeimproxy.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 0b86358..6545366 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -26,9 +26,9 @@
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tdeimproxy.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konq_popupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <tqobject.h>
 #include <tdeio/jobclasses.h>
diff --git a/konq-plugins/microformat/pluginbase.cpp b/konq-plugins/microformat/pluginbase.cpp
index f722340..61d2a1f 100644
--- a/konq-plugins/microformat/pluginbase.cpp
+++ b/konq-plugins/microformat/pluginbase.cpp
@@ -23,7 +23,7 @@
 
 #include <kprocess.h>
 #include <dcopref.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "pluginbase.h"
 
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index c7fad81..c1c7eb6 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kinstance.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 6d7d93e..e58c43a 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -39,7 +39,7 @@
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeshortcut.h>
 #include <tdetoolbar.h>
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index 81da9d3..68816b1 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -69,14 +69,14 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 #include <twin.h>
 #include <kurl.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 9cc5410..03328f7 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -28,15 +28,15 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
 #include <kurifilter.h>
 
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
index 0229031..b5c7d31 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
@@ -21,8 +21,8 @@
 
 #include "bookmarkListItem.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time )
     : TDEListViewItem( parent ), m_desc( desc )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 02bfe8a..c979429 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -35,10 +35,10 @@
 #include <tdeio/job.h>
 #include <krfcdate.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kinputdialog.h>
 
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index 12bb9f2..f0783f2 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -24,8 +24,8 @@
 #include <tqstring.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 KonqSidebarDelicious::KonqSidebarDelicious( TDEInstance *instance, TQObject *parent,
                                             TQWidget *widgetParent, TQString &desktopName_,
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index 92343cc..d8d1fdd 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -28,8 +28,8 @@ extern "C"
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index b615e88..00e499c 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -16,14 +16,14 @@
  ***************************************************************************/
 
 #include "mediaplayer.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "mediaplayer.moc"
 #include <kdebug.h>
 #include <ksimpleconfig.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kdemacros.h>
 #include "mediawidget.h"
 
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
index 5130cbb..ad20c07 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqwidget.h>
diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp
index 38ac506..26904cf 100644
--- a/konq-plugins/sidebar/mediaplayer/player.cpp
+++ b/konq-plugins/sidebar/mediaplayer/player.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdemediaplayer/player.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 66d6827..1508c30 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -31,7 +31,7 @@
 #include <tqdatastream.h> 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 2b2147a..3677663 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <kicontheme.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <ktrader.h>
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index 1595d4e..5930589 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -27,7 +27,7 @@
 #include <kicontheme.h>
 #include <tdehtmlview.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <dcopref.h>
 #include <dcopclient.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index 08e38a0..d479417 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -1,7 +1,7 @@
 #include <kinstance.h>
 #include <tqstring.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "metabarwidget.h"
 #include "metabar.h"
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 18417cf..89e6e52 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -40,11 +40,11 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kdesktopfile.h>
 #include <kpropertiesdialog.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index a08a01c..877133b 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -25,7 +25,7 @@
 #include <kimageio.h>
 #include <kmdcodec.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <html_document.h>
 #include <html_image.h>
diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
index 395c2cb..9256731 100644
--- a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
@@ -21,7 +21,7 @@
 #include "remoteplugin.h"
 
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 RemotePlugin::RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name)
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 7bf310c..167009e 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -33,7 +33,7 @@
 #include <tdeaction.h>
 #include <tdeshortcut.h>
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 4a053dd..48b4afc 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -23,7 +23,7 @@
 
 #include <tdecmoduleinfo.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <html_document.h>
 #include <html_element.h>
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 602b189..599ef75 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -26,7 +26,7 @@
 #include <tqsizepolicy.h>
 #include <dcopref.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdeconfigdialog.h>
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index 335c642..5950200 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -33,8 +33,8 @@
 #include <tqwidgetstack.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdesktopfile.h>
 #include <kiconloader.h>
 #include <kdemacros.h>
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index 8449dd4..b9f56a0 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -22,13 +22,13 @@
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtml_part.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
 
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index ac463b5..5cc89c6 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -25,8 +25,8 @@
 #include <krun.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <ktrader.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
@@ -36,7 +36,7 @@
 #include <dcopref.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeaboutdata.h>
 
 #include "uachangerplugin.h"
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index f33c483..2ba435a 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -27,8 +27,8 @@
 /* $Id$ */
 
 #include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 27b5294..fefab5d 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqcombobox.h>
 #include <tdeconfig.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "validatorsdialog.h"
 #include "validatorsdialog.moc"
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index ac7f99f..01520df 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -23,13 +23,13 @@
 #include <tdehtml_part.h>
 #include "archiveviewbase.h"
 #include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktar.h>
 
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdehtml_part.h>
 #include <kdebug.h>
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index c64307d..5f3fb35 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -24,7 +24,7 @@
 #include <dom/html_document.h>
 
 #include <kdialogbase.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
 
 #include <tqstring.h>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index bf0b39b..eaeaadc 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -36,12 +36,12 @@
 #include <kinstance.h>
 
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdehtml_part.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "plugin_webarchiver.h"
 #include "archivedialog.h"
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 750666a..9a7a323 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -19,12 +19,12 @@
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <ktextedit.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqsplitter.h>
 
diff --git a/ksig/main.cpp b/ksig/main.cpp
index 86afa49..52d7548 100644
--- a/ksig/main.cpp
+++ b/ksig/main.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "ksig.h"
diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp
index e4fe168..8dfb514 100644
--- a/ksig/siglistview.cpp
+++ b/ksig/siglistview.cpp
@@ -21,7 +21,7 @@
 #include "siglistviewitem.h"
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SigListView *SigListView::listView = 0;
 
diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp
index 85fd343..637bf3d 100644
--- a/ksig/siglistviewitem.cpp
+++ b/ksig/siglistviewitem.cpp
@@ -17,7 +17,7 @@
 
 #include "siglistviewitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqregexp.h>
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index daa532e..0fa847e 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -19,7 +19,7 @@
 #include <noatun/player.h>
 #include <noatun/app.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "wakeup.h"
 #include "kminutespinbox.h"
 #include "kpercentspinbox.h"
diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp
index 0cd21a8..e7a5e6b 100644
--- a/noatun-plugins/alsaplayer/alsaplayerui.cpp
+++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "userinterface.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index ec0b123..58a35f8 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 4ec4867..146f503 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -37,9 +37,9 @@
 #include <kstatusbar.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp
index 36113ff..b4fa7f6 100644
--- a/noatun-plugins/charlatan/charlatanui.cpp
+++ b/noatun-plugins/charlatan/charlatanui.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "userinterface.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index f3ba458..97676f9 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 11c4988..85699bb 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -35,9 +35,9 @@
 #include <tqframe.h>
 #include <kurldrag.h>
 #include <kstatusbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 55cfbb1..cb67a1b 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -24,9 +24,9 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 63eb766..4107afd 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -20,9 +20,9 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 9de7eee..e6d3c23 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -13,8 +13,8 @@
 
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
 
diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp
index e7e1bef..20537a7 100644
--- a/noatun-plugins/dub/dub/dubplaylist.cpp
+++ b/noatun-plugins/dub/dub/dubplaylist.cpp
@@ -13,10 +13,10 @@
 
 //#include dubplaylist.cpp
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <noatun/playlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dub.h"
 #include "dubconfigmodule.h"
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index 065ebe9..50405b3 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -18,8 +18,8 @@
 #include <tdefile.h>
 #include <tdefileitem.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 DubPlaylistItem::DubPlaylistItem(const KFileItem& fItem)
  : fileItem(fItem)
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index 437f943..46ee269 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -25,9 +25,9 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include <kdebug.h>
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index 3f32cec..2bfc489 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -27,7 +27,7 @@
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class DubPlayListItem;
 
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 04ae3ef..1d219fa 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -5,7 +5,7 @@
 #include <math.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqtooltip.h>
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 5db1338..51aef3f 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -3,13 +3,13 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqvgroupbox.h>
 #include <tqgrid.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h
index 792625a..5bbcadc 100644
--- a/noatun-plugins/lyrics/cmodule.h
+++ b/noatun-plugins/lyrics/cmodule.h
@@ -3,7 +3,7 @@
 
 #include <noatun/pref.h>
 #include <tqvaluevector.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KLineEdit;
 class TDEListBox;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index ee359b3..a08726e 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -1,7 +1,7 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineeditdlg.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdehtmlview.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 62cd27a..c1b6756 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqdragobject.h>
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index d1cddc6..6d3cbd2 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -6,7 +6,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index e4401ad..25deaf6 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -2,8 +2,8 @@
 #include "noatunplugin.h"
 
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 extern "C"
diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp
index 538fa43..a0305ab 100644
--- a/noatun-plugins/nexscope/renderers.cpp
+++ b/noatun-plugins/nexscope/renderers.cpp
@@ -4,7 +4,7 @@
 #include <math.h>
 #include <iostream>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 structQt::HorizontalPair : public Renderer
 {
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 7882ff4..ce5caea 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -7,7 +7,7 @@
 
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp
index 6b0fd01..e51a5b0 100644
--- a/noatun-plugins/oblique/file.cpp
+++ b/noatun-plugins/oblique/file.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefilemetainfo.h>
 #include <kmimetype.h>
 
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index 4209d9b..443fc11 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -20,7 +20,7 @@
 #include "kdatacollection.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index b04945d..84a46c8 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -3,7 +3,7 @@
 
 #include "menu.h"
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tree.h"
 
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index 34ebe72..ed83c27 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdom.h>
 #include <tqfile.h>
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 4c83cc8..f86f624 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -10,7 +10,7 @@
 #include <tqpainter.h>
 #include <iostream>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <string.h>
 
 #include <noatun/player.h>
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 30da384..242e378 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -8,12 +8,12 @@
 #include <noatun/app.h>
 
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <tqlabel.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 #include <tqtabbar.h>
 
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
index 385ce53..5ebaf27 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
@@ -20,7 +20,7 @@
 #include <tqslider.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 extern "C"
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index a35de7c..d32bb17 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -19,9 +19,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index 4ff7148..4871d81 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -173,7 +173,7 @@ void warning(const char *str, bool)
 }
 
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 int main(void)
diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp
index 42ba321..e69e7af 100644
--- a/noatun-plugins/synaescope/synaescope.cpp
+++ b/noatun-plugins/synaescope/synaescope.cpp
@@ -9,8 +9,8 @@
 #include "cmodule.h"
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 extern "C"
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index 9818ab9..6100796 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -9,8 +9,8 @@
 #include <noatun/conversion.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tqframe.h>
diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp
index 9e5b209..432a7be 100644
--- a/noatun-plugins/tyler/file.cpp
+++ b/noatun-plugins/tyler/file.cpp
@@ -23,7 +23,7 @@ extern "C"
 }
 
 #include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 static TQString getDataPath(void)
diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp
index 25d844b..022f22a 100644
--- a/noatun-plugins/tyler/tyler.cpp
+++ b/noatun-plugins/tyler/tyler.cpp
@@ -5,8 +5,8 @@
 
 #include <noatun/conversion.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <noatun/app.h>
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index 44a1a77..2fe6f08 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -26,7 +26,7 @@
 #include <arts/soundserver.h>
 #include <arts/mcoputils.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index 533cc3c..3c9b616 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <tqvbox.h>
diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp
index 2ac153a..fec7a37 100644
--- a/renamedlgplugins/images/imagevisualizer.cpp
+++ b/renamedlgplugins/images/imagevisualizer.cpp
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurllabel.h>
 #include <tqvbox.h>
diff --git a/tdefile-plugins/desktop/tdefile_desktop.cpp b/tdefile-plugins/desktop/tdefile_desktop.cpp
index 2bcd930..993c628 100644
--- a/tdefile-plugins/desktop/tdefile_desktop.cpp
+++ b/tdefile-plugins/desktop/tdefile_desktop.cpp
@@ -20,7 +20,7 @@
 #include "tdefile_desktop.h"
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/tdefile-plugins/lnk/lnkforward.cpp b/tdefile-plugins/lnk/lnkforward.cpp
index 891e032..0dab038 100644
--- a/tdefile-plugins/lnk/lnkforward.cpp
+++ b/tdefile-plugins/lnk/lnkforward.cpp
@@ -27,7 +27,7 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kdebug.h>