diff --git a/configure.ac b/configure.ac
index 29d38a9..9363015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10377,7 +10377,7 @@ your TDE installation by exporting TDEDIR before running "configure".])
 
     dnl Set the variables
     TDE_CFLAGS="-I$tqt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DTQT_THREAD_SUPPORT"
-    TDE_LIBS="-L$tde_libdir -L$tqt_libdir -lkio -ltdeui -ltdecore -ltqt -ltqt-mt"
+    TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeio -ltdeui -ltdecore -ltqt -ltqt-mt"
 fi
 AC_SUBST(TDE_CFLAGS)
 AC_SUBST(TDE_LIBS)
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index b2df458..b8786fd 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_externals,tdeabdrv1,\
 ))
 
 $(eval $(call gb_Library_add_libs,tdeabdrv1,\
-	-lkabc \
+	-ltdeabc \
 ))
 
 $(eval $(call gb_Library_use_libraries,tdeabdrv1,\
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index fc4cc55..b14bbac 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/compbase3.hxx>
+#include <shell/kde_headers.h>
 
 namespace KABC
 {
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 46bbe13..83f4bd9 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -20,6 +20,7 @@
 #include "KDEInit.h"
 #include <osl/diagnose.h>
 #include <osl/process.h>
+
 #include <shell/kde_headers.h>
 
 namespace connectivity
diff --git a/shell/inc/shell/tde_defines.h b/shell/inc/shell/tde_defines.h
index 52e610c..a157688 100644
--- a/shell/inc/shell/tde_defines.h
+++ b/shell/inc/shell/tde_defines.h
@@ -88,6 +88,22 @@
 #define qt_xdisplay	tqt_xdisplay
 #define qVersion	tqVersion
 
+#define KAboutData	TDEAboutData
+#define KApplication	TDEApplication
+#define KCmdLineArgs	TDECmdLineArgs
+#define KConfig		TDEConfig
+#define KGlobal		TDEGlobal
+#define KGlobalSettings	TDEGlobalSettings
+#define KMainWindow	TDEMainWindow
+#define KStartupInfo	TDEStartupInfo
+#define KStyle		TDEStyle
+#define KToolBar	TDEToolBar
+
+#define drawKStylePrimitive	drawTDEStylePrimitive
+
+#define KIO		TDEIO
+#define KABC		TDEABC
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/shell/tde_headers.h b/shell/inc/shell/tde_headers.h
index d0f1444..ed3739e 100644
--- a/shell/inc/shell/tde_headers.h
+++ b/shell/inc/shell/tde_headers.h
@@ -68,27 +68,27 @@
 
 
 /* ********* TDE base headers */
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
-#include <kprotocolmanager.h>
-#include <kstartupinfo.h>
-#include <kstyle.h>
+#include <tdeemailsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemainwindow.h>
+#include <tdemenubar.h>
+#include <tdeprotocolmanager.h>
+#include <tdestartupinfo.h>
+#include <tdestyle.h>
 
 
 /* ********* TDE address book connectivity headers */
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/field.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/field.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include "tde_defines.h"
 
diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk
index 4c912e4..10af256 100644
--- a/vcl/Executable_tdefilepicker.mk
+++ b/vcl/Executable_tdefilepicker.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Executable_use_libraries,tdefilepicker,\
 
 $(eval $(call gb_Executable_add_libs,tdefilepicker,\
 	$(TDE_LIBS) \
-	-lkio -lX11 \
+	-ltdeio -lX11 \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index 1f9f663..064d06c 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -25,11 +25,11 @@
 
 #ifdef ENABLE_TDE
 #include <tqstringlist.h>
+#include <tdeapplication.h>
 #else // ENABLE_TDE
 #include <qstringlist.h>
-#endif // ENABLE_TDE
-
 #include <kapplication.h>
+#endif // ENABLE_TDE
 
 #if OSL_DEBUG_LEVEL > 1
 #include <iostream>
@@ -121,12 +121,18 @@ void KDECommandThread::handleCommand( const QString &rString, bool &bQuit )
 
     QString qCommand = pTokens->front();
     pTokens->pop_front();
+#if OSL_DEBUG_LEVEL > 1
+    ::std::cerr << "kdefilepicker first command: " << qCommand.latin1() << ::std::endl;
+#endif
 
     if ( qCommand == "exit" )
     {
         bQuit = true;
         kapp->exit();
         kapp->wakeUpGuiThread();
+#if OSL_DEBUG_LEVEL > 1
+        ::std::cerr << "kdefilepicker: exiting" << ::std::endl;
+#endif
     }
     else
         kapp->postEvent( m_pObject, new KDECommandEvent( qCommand, pTokens ) );
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index b0d20e4..5163079 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -42,13 +42,13 @@
 #endif
 
 #include <tdeversion.h>
-#include <kdiroperator.h>
-#include <kfiledialog.h>
-#include <kfilefiltercombo.h>
-#include <kio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdediroperator.h>
+#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h>
+#include <tdeio/netaccess.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 #else // ENABLE_TDE
 
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index e7638ea..046a1bc 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -28,8 +28,13 @@
 
 #include <cstddef>
 
+#ifdef ENABLE_TDE
+#include <tdefiledialog.h>
+#include <tdefilefiltercombo.h>
+#else // ENABLE_TDE
 #include <kfiledialog.h>
 #include <kfilefiltercombo.h>
+#endif // ENABLE_TDE
 
 class QGrid;
 class QHBox;
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index a18a969..df39e01 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -23,9 +23,16 @@
 #include <kdefilepicker.hxx>
 #include <kdecommandthread.hxx>
 
+#ifdef ENABLE_TDE
+#include <tqeventloop.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#else // ENABLE_TDE
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
+#endif // ENABLE_TDE
 
 #include <iostream>
 #include <stdlib.h>
@@ -40,6 +47,15 @@
 #define THIS_DESKENV_NAME_LOW "kde"
 #endif // ENABLE_TDE
 
+#ifdef ENABLE_TDE
+#define KAboutData TDEAboutData
+#define KCmdLineArgs TDECmdLineArgs
+#define KCmdLineOptions TDECmdLineOptions
+#define KCmdLineLastOption TDECmdLineLastOption
+#define KApplication TDEApplication
+#define KLocale TDELocale
+#endif // ENABLE_TDE
+
 //////////////////////////////////////////////////////////////////////////
 // Main
 //////////////////////////////////////////////////////////////////////////
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 5c8c482..2c1f034 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -21,8 +21,13 @@
 
 #include <kdemodalityfilter.hxx>
 
+#ifdef ENABLE_TDE
+#include <tdeapplication.h>
+#include <kdialogbase.h>
+#else // ENABLE_TDE
 #include <kapplication.h>
 #include <kdialogbase.h>
+#endif // ENABLE_TDE
 
 #include <netwm.h>
 #include <X11/Xlib.h>