diff --git a/cervisia/cvsservice/Makefile.am b/cervisia/cvsservice/Makefile.am
index c06af8d2..565d1a9d 100644
--- a/cervisia/cvsservice/Makefile.am
+++ b/cervisia/cvsservice/Makefile.am
@@ -19,7 +19,7 @@ cvsservice_la_SOURCES = main.cpp cvsservice.cpp cvsjob.cpp \
 	cvsserviceutils.cpp cvsloginjob.cpp cvsloginjob.skel cvsloginjob.stub
 
 cvsaskpass_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-cvsaskpass_la_LIBADD = $(LIB_KDEUI)
+cvsaskpass_la_LIBADD = $(LIB_TDEUI)
 cvsaskpass_la_SOURCES = cvsaskpass.cpp
 
 include_HEADERS = cvsservice_stub.h cvsjob_stub.h repository_stub.h
@@ -30,7 +30,7 @@ noinst_HEADERS = cvsservice.h cvsjob.h repository.h cvsserviceutils.h \
 lib_LTLIBRARIES = libcvsservice.la
 
 libcvsservice_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:1
-libcvsservice_la_LIBADD = $(LIB_KDECORE)
+libcvsservice_la_LIBADD = $(LIB_TDECORE)
 libcvsservice_la_SOURCES = cvsservice.stub cvsjob.stub repository.stub dummy.cpp
 
 dummy.cpp:
diff --git a/kapptemplate/kapp/app-Makefile.am b/kapptemplate/kapp/app-Makefile.am
index 0405eba2..9c4c0498 100644
--- a/kapptemplate/kapp/app-Makefile.am
+++ b/kapptemplate/kapp/app-Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS   = ${APP_NAME_LC}.h ${APP_NAME_LC}view.h ${APP_NAME_LC}pref.h
 
 # client stuff
 ${APP_NAME_LC}_client_LDFLAGS = \$(KDE_RPATH) \$(all_libraries)
-${APP_NAME_LC}_client_LDADD   = \$(LIB_KDECORE)
+${APP_NAME_LC}_client_LDADD   = \$(LIB_TDECORE)
 ${APP_NAME_LC}_client_SOURCES = ${APP_NAME_LC}_client.cpp
 
 # let autotqmoc handle all of the meta source files (tqmoc)
diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am
index 0a3a3850..f33f29f9 100644
--- a/kbabel/catalogmanager/Makefile.am
+++ b/kbabel/catalogmanager/Makefile.am
@@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES =	catalogmanageriface.skel \
 libcatalogmanager_la_LIBADD =  ../commonui/libkbabelcommonui.la \
 ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \
 ./libsvn/libcatalogmanagersvn.la $(LIB_KIO)
-libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 
 catalogmanager_SOURCES = main.cpp
 
 # the libraries to link against.
 catalogmanager_LDADD   = libcatalogmanager.la
-catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # these are the headers for your project
 noinst_HEADERS   = catalogmanageriface.h catalogmanager.h \
diff --git a/kbabel/datatools/Makefile.am b/kbabel/datatools/Makefile.am
index 326c7737..d0460d4c 100644
--- a/kbabel/datatools/Makefile.am
+++ b/kbabel/datatools/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES         = $(all_includes)
 
 # which sources should be compiled for kbabeldict
 #libkbabeltools_la_SOURCES = toolaction.cpp kactionselector.cpp toolselectionwidget.cpp
-#libkbabeltools_la_LIBADD =  $(LIB_KDECORE) $(LIB_KIO)
+#libkbabeltools_la_LIBADD =  $(LIB_TDECORE) $(LIB_KIO)
 #libkbabeltools_la_LDFLAGS = $(all_libraries) -module -version-info 1:0:0 -no-undefined
 
 # these are the headers for your project
diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am
index 66b8caa4..3f5fffee 100644
--- a/kbabel/kbabel/Makefile.am
+++ b/kbabel/kbabel/Makefile.am
@@ -38,14 +38,14 @@ libkbabel_la_SOURCES =	kbbookmarkhandler.cpp \
 kde_kcfg_DATA=kbabel.kcfg
 
 libkbabel_la_LIBADD =  ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL)
-libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 
 kbabel_SOURCES = main.cpp
 
 # the libraries to link against.
 kbabel_LDADD   = libkbabel.la
-kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # these are the headers for your project
 noinst_HEADERS   = kbabel.h kbabelview.h \
diff --git a/kbabel/kbabeldict/Makefile.am b/kbabel/kbabeldict/Makefile.am
index 52ba9d2f..0503b819 100644
--- a/kbabel/kbabeldict/Makefile.am
+++ b/kbabel/kbabeldict/Makefile.am
@@ -18,21 +18,21 @@ INCLUDES         = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i
 # library for babeldict plugins
 lib_LTLIBRARIES = libkbabeldictplugin.la
 libkbabeldictplugin_la_SOURCES = searchengine.cpp 
-libkbabeldictplugin_la_LIBADD =  $(LIB_KDECORE)
-libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkbabeldictplugin_la_LIBADD =  $(LIB_TDECORE)
+libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libkbabeldict_la_SOURCES = kbabeldictbox.cpp \
             kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \
             aboutmoduledlg.cpp 
-libkbabeldict_la_LIBADD =  ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_KDEUI)
-libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkbabeldict_la_LIBADD =  ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_TDEUI)
+libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
 
 # the libraries to link against.
-kbabeldict_LDADD   = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kbabeldict_LDADD   = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # these are the headers for your project
 noinst_HEADERS   =  kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am b/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am
index 8504999a..c9e40c31 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am
+++ b/kbabel/kbabeldict/modules/dbsearchengine/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES         = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm
 kbabeldict_dbsearchengine_la_SOURCES = KDBSearchEngine.cpp preferenceswidget.cpp \
 	dbse_factory.cpp dbseprefwidget.ui database.cpp dbscan.cpp
 #database.cpp dbscan.cpp
-kbabeldict_dbsearchengine_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_DBIV)
+kbabeldict_dbsearchengine_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_DBIV)
 kbabeldict_dbsearchengine_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined \
 	$(DBIV_LDFLAGS)
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am b/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am
index cdcd3083..bb907c73 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES         = -I$(srcdir)/../.. -I$(srcdir)/../../../common $(all_includes)
 kbabeldict_dbsearchengine2_la_SOURCES = dbscan.cpp preferenceswidget.cpp dbse2.ui KDBSearchEngine2.cpp database.cpp dbentries.cpp dbse2_factory.cpp sourcedialog.ui algorithms.cpp chunk.cpp
 
 #kbabeldict_dbsearchengine2_la_SOURCES = KDBSearchEngine2.cpp  database.cpp dbentries.cpp dbse2_factory.cpp  
-kbabeldict_dbsearchengine2_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_DBIV)_cxx
+kbabeldict_dbsearchengine2_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_DBIV)_cxx
 kbabeldict_dbsearchengine2_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -L$(DBIV_LDFLAGS)
 
 
diff --git a/kbabel/kbabeldict/modules/poauxiliary/Makefile.am b/kbabel/kbabeldict/modules/poauxiliary/Makefile.am
index 75509337..cab9d75f 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/Makefile.am
+++ b/kbabel/kbabeldict/modules/poauxiliary/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES         = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm
 
 kbabeldict_poauxiliary_la_SOURCES = poauxiliary.cpp preferenceswidget.cpp\
                             pa_factory.cpp pwidget.ui
-kbabeldict_poauxiliary_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_KDEUI) $(LIB_KIO)
+kbabeldict_poauxiliary_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO)
 kbabeldict_poauxiliary_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 
 
diff --git a/kbabel/kbabeldict/modules/pocompendium/Makefile.am b/kbabel/kbabeldict/modules/pocompendium/Makefile.am
index b4fe4974..836d3f3d 100644
--- a/kbabel/kbabeldict/modules/pocompendium/Makefile.am
+++ b/kbabel/kbabeldict/modules/pocompendium/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES         = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm
 kbabeldict_pocompendium_la_SOURCES = pocompendium.cpp preferenceswidget.cpp \
                              pc_factory.cpp pwidget.ui compendiumdata.cpp
 
-kbabeldict_pocompendium_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_KDEUI) $(LIB_KIO)
+kbabeldict_pocompendium_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO)
 kbabeldict_pocompendium_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 
 
diff --git a/kbabel/kbabeldict/modules/tmx/Makefile.am b/kbabel/kbabeldict/modules/tmx/Makefile.am
index f0f54b01..6a1769e1 100644
--- a/kbabel/kbabeldict/modules/tmx/Makefile.am
+++ b/kbabel/kbabeldict/modules/tmx/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES         = -I$(srcdir)/../.. -I../../../common -I$(srcdir)/../../../comm
 kbabeldict_tmxcompendium_la_SOURCES = tmxcompendium.cpp preferenceswidget.cpp \
                              pc_factory.cpp pwidget.ui tmxcompendiumdata.cpp
 
-kbabeldict_tmxcompendium_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_KDEUI) $(LIB_KIO)
+kbabeldict_tmxcompendium_la_LIBADD =  ../../libkbabeldictplugin.la ../../../common/libkbabelcommon.la $(LIB_TDEUI) $(LIB_KIO)
 kbabeldict_tmxcompendium_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 
 
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am
index 85ea75d3..20b6b0cc 100644
--- a/kbugbuster/Makefile.am
+++ b/kbugbuster/Makefile.am
@@ -11,7 +11,7 @@ bin_PROGRAMS = kbugbuster
 kbugbuster_SOURCES = main.cpp
 kbugbuster_LDADD   = -lkutils gui/libkbbmainwindow.la \
                      backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS)
-kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
 
 xdg_apps_DATA = kbugbuster.desktop
 
diff --git a/kcachegrind/kcachegrind/Makefile.am b/kcachegrind/kcachegrind/Makefile.am
index 5d7ca2e1..ce0c5351 100644
--- a/kcachegrind/kcachegrind/Makefile.am
+++ b/kcachegrind/kcachegrind/Makefile.am
@@ -44,7 +44,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kcachegrind
 rc_DATA = kcachegrindui.rc
diff --git a/kioslave/svn/svnhelper/Makefile.am b/kioslave/svn/svnhelper/Makefile.am
index 077177ca..db03a3ae 100644
--- a/kioslave/svn/svnhelper/Makefile.am
+++ b/kioslave/svn/svnhelper/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries)
 
 kio_svn_helper_SOURCES = kio_svn_helper.cpp subversioncheckout.ui subversionswitch.ui subversionlog.ui subversiondiff.ui
 
-kio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KIO) $(all_libraries)
+kio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KIO) $(all_libraries)
 
 servicemenudir = \
     $(kde_datadir)/konqueror/servicemenus
diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am
index 9d32056d..b749ac29 100644
--- a/kmtrace/Makefile.am
+++ b/kmtrace/Makefile.am
@@ -18,18 +18,18 @@
 #    Boston, MA 02110-1301, USA.
 
 AM_CPPFLAGS = -DQT_NO_ASCII_CAST -UQT_NO_COMPAT -O3
-LDADD = $(LIB_KDECORE) -liberty
+LDADD = $(LIB_TDECORE) -liberty
 INCLUDES = $(all_includes)
 
 bin_PROGRAMS = kmtrace demangle kmmatch
 kmtrace_SOURCES = kmtrace.cpp
-kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 demangle_SOURCES = demangle.cpp
-demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kmmatch_SOURCES = match.cpp
-kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 bin_SCRIPTS = kminspector
 
diff --git a/kompare/Makefile.am b/kompare/Makefile.am
index 2bec46d0..883cdf8b 100644
--- a/kompare/Makefile.am
+++ b/kompare/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS = kompare
 
 # the application source, library search path, and link libraries
 kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp
-kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kompare_LDADD   = $(LIB_KPARTS) \
 	$(top_builddir)/kompare/interfaces/libkompareinterface.la \
 	$(top_builddir)/kompare/libdialogpages/libdialogpages.la \
diff --git a/kspy/Makefile.am b/kspy/Makefile.am
index 37af3c20..07d8cdab 100644
--- a/kspy/Makefile.am
+++ b/kspy/Makefile.am
@@ -7,7 +7,7 @@ include_HEADERS = kspy.h
 
 noinst_HEADERS = spy.h navview.h propsview.h navviewitem.h receiversview.h classinfoview.h
 
-libkspy_la_LIBADD   =  $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)  $(LIBSOCKET)
+libkspy_la_LIBADD   =  $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)  $(LIBSOCKET)
 
 # set the include path for X, qt and KDE
 INCLUDES= $(all_includes)
diff --git a/kstartperf/Makefile.am b/kstartperf/Makefile.am
index 9214d389..5edba754 100644
--- a/kstartperf/Makefile.am
+++ b/kstartperf/Makefile.am
@@ -7,7 +7,7 @@ libkstartperf_la_SOURCES = libkstartperf.c
 
 bin_PROGRAMS = kstartperf
 kstartperf_LDFLAGS = $(all_libraries)
-kstartperf_LDADD = $(LIB_KDECORE)
+kstartperf_LDADD = $(LIB_TDECORE)
 kstartperf_SOURCES = kstartperf.cpp
 
 messages:
diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am
index f564c10f..6bf86a4a 100644
--- a/kuiviewer/Makefile.am
+++ b/kuiviewer/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer
 
 # the application source, library search path, and link libraries
 kuiviewer_SOURCES = main.cpp kuiviewer.cpp
-kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kuiviewer_LDADD   = $(LIB_KPARTS)
 
 xdg_apps_DATA =kuiviewer.desktop
@@ -57,7 +57,7 @@ partrc_DATA = kuiviewer_part.rc
 # THUMBNAIL SECTION
 #########################################################################
 quithumbnail_la_SOURCES = quicreator.cpp
-quithumbnail_la_LIBADD = $(LIB_KDECORE) -lqui
+quithumbnail_la_LIBADD = $(LIB_TDECORE) -lqui
 quithumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 services_DATA = designerthumbnail.desktop
 servicesdir = $(kde_servicesdir)
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am
index ca4a6392..5af6f67a 100644
--- a/kunittest/Makefile.am
+++ b/kunittest/Makefile.am
@@ -4,15 +4,15 @@ METASOURCES = AUTO
 
 lib_LTLIBRARIES = libkunittestgui.la
 libkunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel
-libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
-libkunittestgui_la_LIBADD = -lkunittest $(LIB_KDECORE)
+libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
+libkunittestgui_la_LIBADD = -lkunittest $(LIB_TDECORE)
 
 runnergui.lo : testerwidget.h
 
 bin_PROGRAMS = kunittestguimodrunner
 kunittestguimodrunner_SOURCES = guimodrunner.cpp
-kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
-kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_KDECORE) $(LIB_KIO)
+kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkunittest
+kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_TDECORE) $(LIB_KIO)
 
 noinst_HEADERS = dcopinterface.h
 libkunittestinclude_HEADERS = runnergui.h
diff --git a/kunittest/example/simple/Makefile.am b/kunittest/example/simple/Makefile.am
index 22ed8a80..5d7e3d57 100644
--- a/kunittest/example/simple/Makefile.am
+++ b/kunittest/example/simple/Makefile.am
@@ -4,11 +4,11 @@ METASOURCES = AUTO
 check_PROGRAMS = sampletests sampletestsgui
 
 sampletests_SOURCES = main.cpp sampletest.cpp
-sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 sampletests_LDADD = -lkunittest
 
 sampletestsgui_SOURCES = maingui.cpp sampletest.cpp
-sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 # Normally you would write -lkunittestgui here, but since the examples
 # are bundled with the library source code itself we don't want to
 # have you install the libraries before you can compile the examples.
diff --git a/poxml/Makefile.am b/poxml/Makefile.am
index 65a4499e..bd73dfb4 100644
--- a/poxml/Makefile.am
+++ b/poxml/Makefile.am
@@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 SUBDIRS = antlr
 
 split2po_SOURCES = split.cpp parser.cpp
-split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 split2po_LDADD = $(LIB_QT)
 
 xml2pot_SOURCES = xml2pot.cpp parser.cpp
-xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 xml2pot_LDADD = $(LIB_QT)
 
 po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
-po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT)
 
 swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
-swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 swappo_LDADD = antlr/src/libantlr.la $(LIB_QT)
 
 transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
-transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 transxx_LDADD = antlr/src/libantlr.la $(LIB_QT)
 
 parser:
diff --git a/scheck/Makefile.am b/scheck/Makefile.am
index 16d75c0d..ab20deb1 100644
--- a/scheck/Makefile.am
+++ b/scheck/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES =  $(all_includes)
 noinst_HEADERS = scheck.h bitmaps.h
 kde_style_LTLIBRARIES = scheck.la
 scheck_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-scheck_la_LIBADD = $(LIB_KDEUI)
+scheck_la_LIBADD = $(LIB_TDEUI)
 scheck_la_SOURCES = scheck.cpp
 scheck_la_METASOURCES = AUTO
 
diff --git a/scripts/kde-build b/scripts/kde-build
index 34fbf372..ffafb38e 100755
--- a/scripts/kde-build
+++ b/scripts/kde-build
@@ -400,7 +400,7 @@ if [ -n "$specifiedModules" ]; then
   modules=$( echo $specifiedModules | sed -e 's/\///g' )
 else
   if [ "$ONLYLISTEDMODULES" = yes ]; then
-    if [ "$USEKDESUPPORT" = yes ]; then
+    if [ "$USETDESUPPORT" = yes ]; then
       modules="tdesupport $critical_modules $KDEMODULES"
     else
       modules="$critical_modules $KDEMODULES"
diff --git a/scripts/kde-buildrc b/scripts/kde-buildrc
index 51489e10..d2225ed5 100644
--- a/scripts/kde-buildrc
+++ b/scripts/kde-buildrc
@@ -46,7 +46,7 @@ COMPRESSLOGS="no"
 
 # Whether or not you want to compile and install the tdesupport module.
 #
-USEKDESUPPORT="yes"
+USETDESUPPORT="yes"
 
 # Add modules you want to get compiled to this space-seperated list. Note that
 # you don't have to mention the fundamental modules 'arts, 'tdesupport',
@@ -109,7 +109,7 @@ ANONSVNROOT="svn://anonsvn.kde.org/home/kde"
 # you can specify a module specific branch in through PATH_ARTS
 #
 SUBDIR="/trunk/KDE/@MODULE@"
-SUBDIR_KDESUPPORT=/trunk/tdesupport
+SUBDIR_TDESUPPORT=/trunk/tdesupport
 for esubdir in libs multimedia sysadmin office addons graphics network pim toys utils; do
   var=SUBDIR_EXTRAGEAR_`echo $esubdir | tr 'a-z' 'A-Z'`
   eval "$var=/trunk/extragear/$esubdir"
@@ -159,7 +159,7 @@ INCREMENTAL_BUILD="yes"
 # be replaced with underscores.
 #
 CONFIGUREFLAGS="--enable-debug --disable-closure"
-# example: CONFIGUREFLAGS_KDEPIM="$CONFIGUREFLAGS --enable-debug=full"
+# example: CONFIGUREFLAGS_TDEPIM="$CONFIGUREFLAGS --enable-debug=full"
 # example: CONFIGUREFLAGS_KDEEXTRAGEAR_2="$CONFIGUREFLAGS --without-java"
 
 # Set it to the path for unsermake if you want to test it instead of
diff --git a/umbrello/umbrello/Makefile.am b/umbrello/umbrello/Makefile.am
index 2c625a1e..b19ecb18 100644
--- a/umbrello/umbrello/Makefile.am
+++ b/umbrello/umbrello/Makefile.am
@@ -113,8 +113,8 @@ widget_factory.cpp \
 widget_utils.cpp \
 worktoolbar.cpp
 
-#umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO)
+#umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_KIO)
+umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_KIO)
 
 ## See section "dnl Not GPL compatible" in ../configure.in.in
 # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am
index 0309fdc6..3d2b7aec 100644
--- a/umbrello/umbrello/docgenerators/Makefile.am
+++ b/umbrello/umbrello/docgenerators/Makefile.am
@@ -2,14 +2,14 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr
 METASOURCES = AUTO
 bin_PROGRAMS = umbodoc
 
-AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 umbodoc_COMPILE_FIRST = version.h
 umbodoc_SOURCES = main.cpp
-umbodoc_LDADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
+umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 noinst_LTLIBRARIES = libdocgenerators.la
 noinst_HEADERS = docbookgenerator.h version.h
 libdocgenerators_la_SOURCES = docbookgenerator.h docbookgenerator.cpp xhtmlgenerator.cpp
-libdocgenerators_la_LIBADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
+libdocgenerators_la_LIBADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 
 appdir=$(kde_datadir)/umbrello
 app_DATA = xmi2docbook.xsl docbook2xhtml.xsl xmi.css common.ent
diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj
index fb5060a6..6f584c8d 100644
--- a/umbrello/uml.kdevprj
+++ b/umbrello/uml.kdevprj
@@ -4,7 +4,7 @@ bin_program=umbrello
 cflags=
 cppflags=
 cxxflags=\s-O0 -g3 -Wall
-ldadd=-lfl $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ldadd=-lfl $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 ldflags=\s                   -Iuml/classparser -Iuml/dialogs -Iuml/clipboard
 
 [General]