diff --git a/dcoppython/test/dcopserver/kdedcoptest.cpp b/dcoppython/test/dcopserver/kdedcoptest.cpp
index 106e0a18..d9ebd557 100644
--- a/dcoppython/test/dcopserver/kdedcoptest.cpp
+++ b/dcoppython/test/dcopserver/kdedcoptest.cpp
@@ -7,7 +7,7 @@
 #include <tqlabel.h>
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KDEDcopTest::KDEDcopTest()
     : TDEMainWindow( 0, "KDEDcopTest" )
diff --git a/dcoppython/test/dcopserver/main.cpp b/dcoppython/test/dcopserver/main.cpp
index 1a99f280..458986eb 100644
--- a/dcoppython/test/dcopserver/main.cpp
+++ b/dcoppython/test/dcopserver/main.cpp
@@ -6,7 +6,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *description =
     I18N_NOOP("A TDE KPart Application");
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index c6fea653..f2cd6054 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$)
 {
     my ( $node, $addInclude, $debugMe ) = @_;
     my $sourcename = $node->{Source}->{astNodeName};
-    if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+    if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
 #    die "Empty source name for $node->{astNodeName}" if ( $sourcename eq '' );
@@ -3624,7 +3624,7 @@ sub generateMethod($$$$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -4155,7 +4155,7 @@ sub generateAllMethods($$$$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
 #    die "Empty source name for $classNode->{astNodeName} $classNode->{Source}->{astNodeName}" if ( $sourcename eq '' );
@@ -4164,7 +4164,7 @@ sub generateAllMethods($$$$$$$$)
     	$addInclude->{$sourcename} = 1;
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index a96f65b9..80056bc1 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -1732,7 +1732,7 @@ sub generateMethod($$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -2124,7 +2124,7 @@ sub generateAllMethods($$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
     die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@@ -2148,7 +2148,7 @@ sub generateAllMethods($$$$$$)
 	if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 0bd049bf..68dfef34 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -1777,7 +1777,7 @@ sub generateMethod($$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -2317,7 +2317,7 @@ sub generateAllMethods($$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
     die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@@ -2339,7 +2339,7 @@ sub generateAllMethods($$$$$$)
 	if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(tdeio/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 90cb276a..fa3722d2 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -230,7 +230,7 @@ BEGIN
    'TQStyle::SubControls' => 'int',
 );
 
-$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
+$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
 
 }
 
diff --git a/kdejava/koala/kdejava/KComboBox.cpp b/kdejava/koala/kdejava/KComboBox.cpp
index 6cc9fedc..c81014db 100644
--- a/kdejava/koala/kdejava/KComboBox.cpp
+++ b/kdejava/koala/kdejava/KComboBox.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcombobox.h>
 #include <kcompletion.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index 7a4da366..7d338807 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -20,12 +20,12 @@
 #include <tqiconset.h>
 #include <tdeversion.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdrawutil.h>
 #include <tqstring.h>
 #include <kprotocolinfo.h>
 #include <ksslutils.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kprinter.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KDEJavaSlot.h b/kdejava/koala/kdejava/KDEJavaSlot.h
index fb997abe..d7565c9b 100644
--- a/kdejava/koala/kdejava/KDEJavaSlot.h
+++ b/kdejava/koala/kdejava/KDEJavaSlot.h
@@ -32,7 +32,7 @@
 #include <kdockwidget.h>
 #include <kdualcolorbtn.h>
 #include <tdefileview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdelistview.h>
 #include <kprocio.h>
 #include <kprocess.h>
diff --git a/kdejava/koala/kdejava/KDirOperator.cpp b/kdejava/koala/kdejava/KDirOperator.cpp
index faaea6ae..da2f5dce 100644
--- a/kdejava/koala/kdejava/KDirOperator.cpp
+++ b/kdejava/koala/kdejava/KDirOperator.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tqdir.h>
 #include <tdeparts/browserextension.h>
 #include <tdeaction.h>
diff --git a/kdejava/koala/kdejava/KEMailSettings.cpp b/kdejava/koala/kdejava/KEMailSettings.cpp
index d43c7abf..53d7a6db 100644
--- a/kdejava/koala/kdejava/KEMailSettings.cpp
+++ b/kdejava/koala/kdejava/KEMailSettings.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/KLineEdit.cpp b/kdejava/koala/kdejava/KLineEdit.cpp
index 05a57d0e..a7443c0b 100644
--- a/kdejava/koala/kdejava/KLineEdit.cpp
+++ b/kdejava/koala/kdejava/KLineEdit.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
 #include <kcompletion.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KMenuBar.cpp b/kdejava/koala/kdejava/KMenuBar.cpp
index 5f96707c..3c91ad48 100644
--- a/kdejava/koala/kdejava/KMenuBar.cpp
+++ b/kdejava/koala/kdejava/KMenuBar.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsize.h>
 #include <tqrect.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KMessageBox.cpp b/kdejava/koala/kdejava/KMessageBox.cpp
index 5cd133b6..29365b9b 100644
--- a/kdejava/koala/kdejava/KMessageBox.cpp
+++ b/kdejava/koala/kdejava/KMessageBox.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqpixmap.h>
 #include <tqmessagebox.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KProtocolManager.cpp b/kdejava/koala/kdejava/KProtocolManager.cpp
index ba0bb159..cbc669d7 100644
--- a/kdejava/koala/kdejava/KProtocolManager.cpp
+++ b/kdejava/koala/kdejava/KProtocolManager.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KTempFile.cpp b/kdejava/koala/kdejava/KTempFile.cpp
index 752060c3..f5175045 100644
--- a/kdejava/koala/kdejava/KTempFile.cpp
+++ b/kdejava/koala/kdejava/KTempFile.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDECompletion.cpp b/kdejava/koala/kdejava/TDECompletion.cpp
index fed037fc..86d8c78e 100644
--- a/kdejava/koala/kdejava/TDECompletion.cpp
+++ b/kdejava/koala/kdejava/TDECompletion.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcompletion.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/TDECompletionBase.cpp b/kdejava/koala/kdejava/TDECompletionBase.cpp
index bd790987..fab40c49 100644
--- a/kdejava/koala/kdejava/TDECompletionBase.cpp
+++ b/kdejava/koala/kdejava/TDECompletionBase.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcompletion.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/TDEGlobal.cpp b/kdejava/koala/kdejava/TDEGlobal.cpp
index 954fb27a..52f536a1 100644
--- a/kdejava/koala/kdejava/TDEGlobal.cpp
+++ b/kdejava/koala/kdejava/TDEGlobal.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEGlobalSettings.cpp b/kdejava/koala/kdejava/TDEGlobalSettings.cpp
index 86acf6b0..35f2864f 100644
--- a/kdejava/koala/kdejava/TDEGlobalSettings.cpp
+++ b/kdejava/koala/kdejava/TDEGlobalSettings.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqrect.h>
 #include <tqfont.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/TDELocale.cpp b/kdejava/koala/kdejava/TDELocale.cpp
index 86ea6d9d..f747a285 100644
--- a/kdejava/koala/kdejava/TDELocale.cpp
+++ b/kdejava/koala/kdejava/TDELocale.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdatetime.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/org/kde/koala/KHelpMenu.java b/kdejava/koala/org/kde/koala/KHelpMenu.java
index 48a32b33..bb408c66 100644
--- a/kdejava/koala/org/kde/koala/KHelpMenu.java
+++ b/kdejava/koala/org/kde/koala/KHelpMenu.java
@@ -18,7 +18,7 @@ import org.kde.qt.TQObject;
  The usage is simple:
  <pre>
  mHelpMenu = new KHelpMenu( this, <someText> );
- kmenubar.insertItem(i18n("&Help"), mHelpMenu.menu() );
+ tdemenubar.insertItem(i18n("&Help"), mHelpMenu.menu() );
  </pre>
  or if you just want to open a dialog box:
  <pre>
diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp
index 91dcf708..024a8764 100644
--- a/kjsembed/bindings/netaccess_imp.cpp
+++ b/kjsembed/bindings/netaccess_imp.cpp
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 namespace KJSEmbed {
 namespace Bindings {
diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp
index 6d4f674f..b2f50cba 100644
--- a/kjsembed/builtins/qdir_imp.cpp
+++ b/kjsembed/builtins/qdir_imp.cpp
@@ -6,7 +6,7 @@
 #include <kjs/object.h>
 
 #ifndef QT_ONLY
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #endif
 
diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp
index 1c79bb35..1ead6bbf 100644
--- a/kjsembed/builtins/qfile_imp.cpp
+++ b/kjsembed/builtins/qfile_imp.cpp
@@ -6,7 +6,7 @@
 #include <tqfont.h>
 
 #ifndef QT_ONLY
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #endif
 
diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp
index 7bf44e1b..22a6917c 100644
--- a/kjsembed/builtins/resources.cpp
+++ b/kjsembed/builtins/resources.cpp
@@ -19,7 +19,7 @@
 
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <jsproxy.h>
 #include <jsbinding.h>
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp
index 75c15024..a4ced6dd 100644
--- a/kjsembed/cpptests/jsaccess/jsaccess.cpp
+++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/interpreter.h>
 
 #include <kjsembed/jsconsolewidget.h>
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 5092c27f..906e0691 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -51,7 +51,7 @@
 #include <tdelistview.h>
 #include <kurl.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <ksystemtray.h>
 #include <tdepopupmenu.h>
diff --git a/kjsembed/docs/embedding/simple-embed/main.cpp b/kjsembed/docs/embedding/simple-embed/main.cpp
index be2e894b..f7f4a9d1 100644
--- a/kjsembed/docs/embedding/simple-embed/main.cpp
+++ b/kjsembed/docs/embedding/simple-embed/main.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");
diff --git a/kjsembed/global.h b/kjsembed/global.h
index e2e4a652..7ab55e96 100644
--- a/kjsembed/global.h
+++ b/kjsembed/global.h
@@ -67,7 +67,7 @@ KJSEMBED_EXPORT TQTextStream *conerr();
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #else // QT_ONLY
 
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index d9f307d9..4aebd73d 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -27,9 +27,9 @@
 #ifndef QT_ONLY
 
 #include "global.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstddirs.h>
 #include "ksimpleprocess.h"
 
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index 3ac44494..57015a6d 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -25,10 +25,10 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <ktextedit.h>
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 2dbbe8e2..faac7212 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -48,7 +48,7 @@
 #include <dcopclient.h>
 #include <tdeaction.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kservice.h>
 #include <ksystemtray.h>
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 16f318bf..ed8718ea 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -29,7 +29,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 
 #include <kjs/interpreter.h>
diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp
index 0a7ee1cc..c65449ee 100644
--- a/kjsembed/ksimpleprocess.cpp
+++ b/kjsembed/ksimpleprocess.cpp
@@ -20,7 +20,7 @@
  */
 #include "ksimpleprocess.h"
 #include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 static TQStringList  splitArgList( const TQString &args)
 {
 	TQStringList returnArgs = TQStringList::split( ' ', args);
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index 70884cd5..b896481c 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <jsfactory.h>
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index 90143e4b..e311dfff 100644
--- a/kjsembed/plugins/imagefx_plugin.cpp
+++ b/kjsembed/plugins/imagefx_plugin.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 #include <kjsembed/jsfactory.h>
diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp
index 94107e33..9ad274b4 100644
--- a/kjsembed/testkjsembed.cpp
+++ b/kjsembed/testkjsembed.cpp
@@ -20,7 +20,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/interpreter.h>
 
 #include <jsconsolewidget.h>
diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp
index 7fe664c3..b3ff219e 100644
--- a/kjsembed/tests/testkjsembed.cpp
+++ b/kjsembed/tests/testkjsembed.cpp
@@ -20,7 +20,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kjs/interpreter.h>
 
 #include <kjsembed/jsconsolewidget.h>
diff --git a/kjsembed/tools/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl
index 91bad62b..f23e5e80 100644
--- a/kjsembed/tools/doxygen2cons_cpp.xsl
+++ b/kjsembed/tools/doxygen2cons_cpp.xsl
@@ -5,7 +5,7 @@
 <xsl:variable name="clazz" select="compoundname" />
 <xsl:variable name="consmeth" select="sectiondef/memberdef[@kind='function' and @prot='public']" />
 
-#include &lt;klocale.h>
+#include &lt;tdelocale.h>
 #include &lt;kjs/object.h>
 
 #include &lt;<xsl:value-of select="includes" />>
diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl
index c485188c..a2be08d4 100644
--- a/kjsembed/tools/doxygen2imp_cpp.xsl
+++ b/kjsembed/tools/doxygen2imp_cpp.xsl
@@ -11,7 +11,7 @@
 #include &lt;qpixmap.h>
 #include &lt;qfont.h>
 
-#include &lt;klocale.h>
+#include &lt;tdelocale.h>
 #include &lt;kjs/object.h>
 #include &lt;kdebug.h>
 
diff --git a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
index 052526b6..f1f44f70 100644
--- a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
+++ b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
@@ -30,9 +30,9 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/smoke/kde/kde_header_list b/smoke/kde/kde_header_list
index 86dcb55b..f6491c4f 100644
--- a/smoke/kde/kde_header_list
+++ b/smoke/kde/kde_header_list
@@ -124,7 +124,7 @@ kdialog.h
 kdirlister.h
 kdirnotify.h
 kdirnotify_stub.h
-kdiroperator.h
+tdediroperator.h
 kdirselectdialog.h
 kdirsize.h
 kdirwatch.h
@@ -137,7 +137,7 @@ kdualcolorbutton.h
 keditcl.h
 keditlistbox.h
 kedittoolbar.h
-kemailsettings.h
+tdeemailsettings.h
 kextendedsocket.h
 kextsock.h
 tdefiledetailview.h
@@ -164,8 +164,8 @@ tdefontdialog.h
 tdefontrequester.h
 kgenericfactory.h
 kglobalaccel.h
-kglobal.h
-kglobalsettings.h
+tdeglobal.h
+tdeglobalsettings.h
 kguiitem.h
 khelpmenu.h
 tdehtmldefaults.h
@@ -198,7 +198,7 @@ klineedit.h
 tdelistbox.h
 tdelistview.h
 tdelistviewsearchline.h
-klocale.h
+tdelocale.h
 kmacroexpander.h
 tdemainwindow.h
 tdemainwindowiface.h
@@ -215,8 +215,8 @@ tdemdimainfrm.h
 tdemdinulliterator.h
 tdemditaskbar.h
 tdemditoolviewaccessor.h
-kmenubar.h
-kmessagebox.h
+tdemenubar.h
+tdemessagebox.h
 kmimemagic.h
 kmimesourcefactory.h
 kmimetype.h
@@ -258,7 +258,7 @@ kprogress.h
 kpropertiesdialog.h
 kpropsdlg.h
 kprotocolinfo.h
-kprotocolmanager.h
+tdeprotocolmanager.h
 kpty.h
 kpushbutton.h
 krandomsequence.h
@@ -322,7 +322,7 @@ ksslutils.h
 ksslx509map.h
 ksslx509v3.h
 kstandarddirs.h
-kstartupinfo.h
+tdestartupinfo.h
 kstaticdeleter.h
 kstatusbar.h
 tdestdaccel.h
@@ -342,7 +342,7 @@ ktabctl.h
 ktabwidget.h
 ktar.h
 ktempdir.h
-ktempfile.h
+tdetempfile.h
 ktextbrowser.h
 ktextedit.h
 ktimewidget.h