diff --git a/kbstateapplet/Makefile.am b/kbstateapplet/Makefile.am
index 0b58924..3c955d3 100644
--- a/kbstateapplet/Makefile.am
+++ b/kbstateapplet/Makefile.am
@@ -13,7 +13,7 @@ lnk_DATA = kbstateapplet.desktop
 EXTRA_DIST = $(lnk_DATA)
 
 kbstate_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kbstate_panelapplet_la_LIBADD = $(LIB_KDEUI)
+kbstate_panelapplet_la_LIBADD = $(LIB_TDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kbstateapplet.pot
diff --git a/kmag/Makefile.am b/kmag/Makefile.am
index b2e7c25..ad32498 100644
--- a/kmag/Makefile.am
+++ b/kmag/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = kmag
 ## INCLUDES were found outside kdevelop specific part
 
 kmag_SOURCES = kmagzoomview.cpp kmagselrect.cpp kmag.cpp main.cpp 
-kmag_LDADD   = $(LIB_KDEPRINT)
+kmag_LDADD   = $(LIB_TDEPRINT)
 
 
 EXTRA_DIST = main.cpp version.h kmag.cpp kmag.h kmagui.rc kmag.desktop lo32-app-kmag.png lo16-app-kmag.png kmagselrect.cpp kmagselrect.h hi16-app-kmag.png kmagzoomview.cpp kmagzoomview.h 
@@ -27,7 +27,7 @@ METASOURCES = AUTO
 KDE_OPTIONS = nofinal
 
 # the library search path. 
-kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kmag
 rc_DATA = kmagui.rc
diff --git a/kmag/kmag.kdevprj b/kmag/kmag.kdevprj
index 2871960..98720f3 100644
--- a/kmag/kmag.kdevprj
+++ b/kmag/kmag.kdevprj
@@ -22,7 +22,7 @@ bin_program=kmag
 cflags=
 cppflags=
 cxxflags=\s-O3
-ldadd=-ltdeprint $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ldadd=-ltdeprint $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 ldflags=\s  \s
 
 [General]
diff --git a/kmousetool/kmousetool/Makefile.am b/kmousetool/kmousetool/Makefile.am
index 84d06f8..b619b5a 100644
--- a/kmousetool/kmousetool/Makefile.am
+++ b/kmousetool/kmousetool/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = kmousetool
 
 kmousetool_SOURCES = kmousetoolui.ui mtstroke.cpp kmousetool.cpp main.cpp 
-kmousetool_LDADD   = -lXtst $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
+kmousetool_LDADD   = -lXtst $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
 
 SUBDIRS = pics 
 
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 messages: rc.cpp
 	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
diff --git a/kmouth/Makefile.am b/kmouth/Makefile.am
index 4188c38..a78d4a5 100644
--- a/kmouth/Makefile.am
+++ b/kmouth/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = kmouth
 
 kmouth_SOURCES = preferencesui.ui texttospeechconfigurationui.ui texttospeechconfigurationwidget.cpp optionsdialog.cpp configwizard.cpp phraseedit.cpp phraselist.cpp speech.cpp texttospeechsystem.cpp phraselistitem.cpp kmouth.cpp main.cpp 
-kmouth_LDADD   = ./phrasebook/libphrasebook.a ./wordcompletion/libwordcompletion.a -ltdeprint $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+kmouth_LDADD   = ./phrasebook/libphrasebook.a ./wordcompletion/libwordcompletion.a -ltdeprint $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
 
 SUBDIRS = icons phrasebook wordcompletion books . 
 
@@ -18,7 +18,7 @@ INCLUDES= -Iphrasebook -Iwordcompletion $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kmouth_LDFLAGS = $(all_libraries) -lkspell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmouth_LDFLAGS = $(all_libraries) -lkspell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kmouth
 rc_DATA = kmouthui.rc
diff --git a/ksayit/Freeverb_plugin/Makefile.am b/ksayit/Freeverb_plugin/Makefile.am
index 5da0f3b..91e101b 100644
--- a/ksayit/Freeverb_plugin/Makefile.am
+++ b/ksayit/Freeverb_plugin/Makefile.am
@@ -6,7 +6,7 @@ fxpluginsdir = $(kde_libraries)/trinity
 fxplugins_LTLIBRARIES = libFreeverb_plugin.la
 libFreeverb_plugin_la_LDFLAGS = -avoid-version -module -no-undefined \
 	$(all_libraries)
-libFreeverb_plugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) -lartskde\
+libFreeverb_plugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) -lartskde\
 	-lartsmodules
 noinst_HEADERS = freeverbsetupimpl.h ksayitfreeverblib.h kdeexportfix.h
 libFreeverb_plugin_la_SOURCES = freeverbsetupimpl.cpp freeverb_setup.ui \
diff --git a/ksayit/KTTSD_Lib/Makefile.am b/ksayit/KTTSD_Lib/Makefile.am
index 0a26093..bd59341 100644
--- a/ksayit/KTTSD_Lib/Makefile.am
+++ b/ksayit/KTTSD_Lib/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
 METASOURCES = AUTO
 libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1
 lib_LTLIBRARIES = libKTTSD_Lib.la
-libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
+libKTTSD_Lib_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE)
 noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h
 
 kspeech_DIR = $(KTTS_KSPEECH_DIR)
diff --git a/ksayit/src/Makefile.am b/ksayit/src/Makefile.am
index 783f080..ff2dd4e 100644
--- a/ksayit/src/Makefile.am
+++ b/ksayit/src/Makefile.am
@@ -31,7 +31,7 @@ ksayit_SOURCES = doctreeviewimpl.cpp effectstack.cpp fxpluginhandler.cpp \
 		parasaxparser.cpp saxhandler.cpp ksayitbookmarkhandler.cpp contextmenuhandler.cpp docbookclasses.cpp \
 		docbookgenerator.cpp docbookparser.cpp
 
-ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lartsflow -lartsflow_idl
+ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lartsflow -lartsflow_idl
 ksayit_LDADD = $(top_builddir)/ksayit/KTTSD_Lib/libKTTSD_Lib.la $(LIB_KIO) \
 	-lartskde -lsoundserver_idl -lartsflow -lartsflow_idl
 
diff --git a/kttsd/filters/Makefile.am b/kttsd/filters/Makefile.am
index ef4d2d3..9c95218 100644
--- a/kttsd/filters/Makefile.am
+++ b/kttsd/filters/Makefile.am
@@ -17,10 +17,10 @@ check_PROGRAMS = testfilter
 
 testfilter_SOURCES = main.cpp
 
-testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testfilter_LDADD = \
 	$(top_builddir)/kttsd/libkttsd/libkttsd.la \
-	$(LIB_KDECORE)
+	$(LIB_TDECORE)
 
 kde_servicetypes_DATA = kttsd_filterplugin.desktop
 
diff --git a/kttsd/kttsd/Makefile.am b/kttsd/kttsd/Makefile.am
index e62610d..ba7e1c1 100644
--- a/kttsd/kttsd/Makefile.am
+++ b/kttsd/kttsd/Makefile.am
@@ -33,10 +33,10 @@ kttsd_SOURCES = \
 	filtermgr.cpp \
 	talkermgr.cpp
 
-kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kttsd_LDADD = \
 	$(top_builddir)/kttsd/libkttsd/libkttsd.la \
-	$(LIB_KDECORE) \
+	$(LIB_TDECORE) \
 	$(LIB_KIO) \
 	$(LIB_KUTILS)
 
diff --git a/kttsd/kttsmgr/Makefile.am b/kttsd/kttsmgr/Makefile.am
index b838b21..a973226 100644
--- a/kttsd/kttsmgr/Makefile.am
+++ b/kttsd/kttsmgr/Makefile.am
@@ -22,10 +22,10 @@ kttsmgr_SOURCES =  \
 	kspeechsink.skel \
 	kttsmgr.cpp
 
-kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kttsmgr_LDADD = \
 	$(LIB_KUTILS) \
-	$(LIB_KDEUI)
+	$(LIB_TDEUI)
 
 # Header files that should not be installed.
 noinst_HEADERS = kttsmgr.h
diff --git a/kttsd/plugins/hadifix/Makefile.am b/kttsd/plugins/hadifix/Makefile.am
index 35ca445..7f5a236 100644
--- a/kttsd/plugins/hadifix/Makefile.am
+++ b/kttsd/plugins/hadifix/Makefile.am
@@ -13,7 +13,7 @@ libkttsd_hadifixplugin_la_SOURCES = \
 	hadifixconfigui.ui \
 	voicefileui.ui
 libkttsd_hadifixplugin_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkttsd_hadifixplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/kttsd/libkttsd/libkttsd.la
+libkttsd_hadifixplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/kttsd/libkttsd/libkttsd.la
 
 services_DATA = kttsd_hadifixplugin.desktop
 servicesdir = $(kde_servicesdir)