diff --git a/configure.ac b/configure.ac
index 401352a31068..0ea3acf969c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10258,7 +10258,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 -DQT_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 b2df458fd4a0..b8786fdba677 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 fc4cc55b7b69..b14bbac334f9 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 46bbe1360af4..83f4bd98f970 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 52e610c72020..0dc91e931cee 100644
--- a/shell/inc/shell/tde_defines.h
+++ b/shell/inc/shell/tde_defines.h
@@ -26,67 +26,83 @@
 #ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H
 #define INCLUDED_VCL_TDE_DEFINE_HEADERS_H
 
-#define QObject		TQObject
-#define QWidget		TQWidget
-#define QVBox		TQVBox
-#define QHBox		TQHBox
-#define QGrid		TQGrid
-#define QString		TQString
-#define QStringList	TQStringList
-#define QCustomEvent	TQCustomEvent
-#define QMutex		TQMutex
-#define QEvent		TQEvent
-#define QFont		TQFont
-#define QDateTime	TQDateTime
-#define QThread		TQThread
-#define QStyle		TQStyle
-#define QApplication	TQApplication
-#define QRect		TQRect
-#define QProgressBar	TQProgressBar
-#define QPopupMenu	TQPopupMenu
-#define QMenuBar	TQMenuBar
-#define QToolButton	TQToolButton
-#define QToolBar	TQToolBar
-#define QScrollBar	TQScrollBar
-#define QListView	TQListView
-#define QSpinWidget	TQSpinWidget
-#define QScrollBar	TQScrollBar
-#define QLineEdit	TQLineEdit
-#define QComboBox	TQComboBox
-#define QCheckBox	TQCheckBox
-#define QRadioButton	TQRadioButton
-#define QPushButton	TQPushButton
-#define QPainter	TQPainter
-#define QResizeEvent	TQResizeEvent
-#define QShowEvent	TQShowEvent
-#define QPoint		TQPoint
-#define QDialog		TQDialog
-#define QFile		TQFile
-#define QLabel		TQLabel
-#define QObjectList	TQObjectList
-#define QCString	TQCString
-#define QRegExp		TQRegExp
-#define QSessionManager	TQSessionManager
-#define QPaintDevice	TQPaintDevice
-#define QTextIStream	TQTextIStream
-#define QTextStream	TQTextStream
-#define QMutexLocker	TQMutexLocker
-#define QValueList	TQValueList
-#define QTab		TQTab
-#define QTabBar		TQTabBar
-#define QTabWidget	TQTabWidget
-#define QMainWindow	TQMainWindow
-#define QPixmap		TQPixmap
-#define QColorGroup	TQColorGroup
-#define QStyleOption	TQStyleOption
-#define QSize		TQSize
-#define QMenuItem	TQMenuItem
-#define QFontInfo	TQFontInfo
+#define QObject         TQObject
+#define QWidget         TQWidget
+#define QVBox           TQVBox
+#define QHBox           TQHBox
+#define QGrid           TQGrid
+#define QString         TQString
+#define QStringList     TQStringList
+#define QCustomEvent    TQCustomEvent
+#define QMutex          TQMutex
+#define QEvent          TQEvent
+#define QFont           TQFont
+#define QDateTime       TQDateTime
+#define QThread         TQThread
+#define QStyle          TQStyle
+#define QApplication    TQApplication
+#define QRect           TQRect
+#define QProgressBar    TQProgressBar
+#define QPopupMenu      TQPopupMenu
+#define QMenuBar        TQMenuBar
+#define QToolButton     TQToolButton
+#define QToolBar        TQToolBar
+#define QScrollBar      TQScrollBar
+#define QListView       TQListView
+#define QSpinWidget     TQSpinWidget
+#define QScrollBar      TQScrollBar
+#define QLineEdit       TQLineEdit
+#define QComboBox       TQComboBox
+#define QCheckBox       TQCheckBox
+#define QRadioButton    TQRadioButton
+#define QPushButton     TQPushButton
+#define QPainter        TQPainter
+#define QResizeEvent    TQResizeEvent
+#define QShowEvent      TQShowEvent
+#define QPoint          TQPoint
+#define QDialog         TQDialog
+#define QFile           TQFile
+#define QLabel          TQLabel
+#define QObjectList     TQObjectList
+#define QCString        TQCString
+#define QRegExp         TQRegExp
+#define QSessionManager TQSessionManager
+#define QPaintDevice    TQPaintDevice
+#define QTextIStream    TQTextIStream
+#define QTextStream     TQTextStream
+#define QMutexLocker    TQMutexLocker
+#define QValueList      TQValueList
+#define QTab            TQTab
+#define QTabBar         TQTabBar
+#define QTabWidget      TQTabWidget
+#define QMainWindow     TQMainWindow
+#define QPixmap         TQPixmap
+#define QColorGroup     TQColorGroup
+#define QStyleOption    TQStyleOption
+#define QSize           TQSize
+#define QMenuItem       TQMenuItem
+#define QFontInfo       TQFontInfo
 
-#define qSwap		tqSwap
-#define qt_cast		tqt_cast
-#define qt_xdisplay	tqt_xdisplay
-#define qVersion	tqVersion
+#define qSwap           tqSwap
+#define qt_cast         tqt_cast
+#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
 
diff --git a/shell/inc/shell/tde_headers.h b/shell/inc/shell/tde_headers.h
index d0f14447dd7b..ed3739eb2e43 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 4c912e4779ad..10af256719ba 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 1f9f663fa15d..064d06c610bd 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 b0d20e4a43f4..5163079b4eb8 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 e7638eaa0e91..046a1bc92645 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 a18a9695f2f7..df39e01e43ca 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 5c8c482478fe..2c1f03475425 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>