diff --git a/charselectapplet/Makefile.am b/charselectapplet/Makefile.am
index 49a70a2..bd73d0b 100644
--- a/charselectapplet/Makefile.am
+++ b/charselectapplet/Makefile.am
@@ -13,7 +13,7 @@ lnk_DATA = kcharselectapplet.desktop
 EXTRA_DIST = $(lnk_DATA)
 
 kcharselect_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kcharselect_panelapplet_la_LIBADD = $(LIB_KDEUI)
+kcharselect_panelapplet_la_LIBADD = $(LIB_TDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kcharselectapplet.pot
diff --git a/kcalc/Makefile.am b/kcalc/Makefile.am
index e72f732..90242c3 100644
--- a/kcalc/Makefile.am
+++ b/kcalc/Makefile.am
@@ -19,7 +19,7 @@ noinst_HEADERS  = kcalc.h kcalc_button.h kcalc_const_button.h \
 			kcalctype.h dlabel.h stats.h
 
 kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
+kcalc_la_LIBADD = $(LIB_TDEUI) knumber/libknumber.la
 
 KDE_ICON = kcalc
 
diff --git a/kcalc/knumber/tests/Makefile.am b/kcalc/knumber/tests/Makefile.am
index be496fe..857a6d8 100644
--- a/kcalc/knumber/tests/Makefile.am
+++ b/kcalc/knumber/tests/Makefile.am
@@ -29,4 +29,4 @@ METASOURCES = AUTO
 
 knumbertest_SOURCES = knumbertest.cpp
 knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP)
-knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am
index f92a480..f4f8ad6 100644
--- a/kcharselect/Makefile.am
+++ b/kcharselect/Makefile.am
@@ -3,7 +3,7 @@ LDADD	= $(LIB_KFILE)
 bin_PROGRAMS = kcharselect
 
 kcharselect_SOURCES = kcharselectdia.cc main.cc
-kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kcharselect_METASOURCES = kcharselectdia.moc
 
 updatedir = $(kde_datadir)/kconf_update
diff --git a/kdelirc/irkick/Makefile.am b/kdelirc/irkick/Makefile.am
index eb7f6d8..b7d03f3 100644
--- a/kdelirc/irkick/Makefile.am
+++ b/kdelirc/irkick/Makefile.am
@@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = irkick.la
 
 CLEANFILES = dummy.cpp
 
-libirkick_common_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KSYCOCA) ../kdelirc/libkdelirc.la
+libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KSYCOCA) ../kdelirc/libkdelirc.la
 libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub klircclient.cpp
 
 libirkick_common_la_LDFLAGS = $(all_libraries)
@@ -32,7 +32,7 @@ dummy.cpp:
 #lib_LTLIBRARIES = libkded_irkick.la
 #libkded_irkick_la_SOURCES = irkick.cpp irkick.skel irkick.stub klircclient.cpp
 #libkded_irkick_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#libkded_irkick_la_LIBADD = $(LIB_KDECORE) ../kdelirc/libkdelirc.la
+#libkded_irkick_la_LIBADD = $(LIB_TDECORE) ../kdelirc/libkdelirc.la
 
 noinst_HEADERS = irkick.h klircclient.h irkick_stub.h
 
diff --git a/kdelirc/kcmlirc/Makefile.am b/kdelirc/kcmlirc/Makefile.am
index 57bdef8..f58be13 100644
--- a/kdelirc/kcmlirc/Makefile.am
+++ b/kdelirc/kcmlirc/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kcmlirc.la
 
 noinst_HEADERS = kcmlirc.h addaction.h addactionbase.h
 kcm_kcmlirc_la_SOURCES = selectprofile.ui newmode.ui kcmlircbase.ui kcmlirc.cpp addactionbase.ui addaction.cpp kcmlirc.skel editactionbase.ui editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp
-kcm_kcmlirc_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ../kdelirc/libkdelirc.la
+kcm_kcmlirc_la_LIBADD = $(LIB_TDEUI) $(LIB_KFILE) ../kdelirc/libkdelirc.la
 kcm_kcmlirc_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
 
 xdg_apps_DATA = kcmlirc.desktop
diff --git a/kdelirc/kdelirc/Makefile.am b/kdelirc/kdelirc/Makefile.am
index e4951ef..24422ba 100644
--- a/kdelirc/kdelirc/Makefile.am
+++ b/kdelirc/kdelirc/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libkdelirc.la
 noinst_HEADERS = iraction.h arguments.h iractions.h prototype.h modes.h mode.h profileserver.h remoteserver.h
 
 libkdelirc_la_SOURCES = iraction.cpp arguments.cpp iractions.cpp prototype.cpp modes.cpp mode.cpp profileserver.cpp remoteserver.cpp
-libkdelirc_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIBSOCKET)
+libkdelirc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET)
 
 ####### kdevelop will overwrite this part!!! (end)############
 # These paths are KDE specific. Use them:
@@ -34,7 +34,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE´s XML GUI builing
diff --git a/kdessh/Makefile.am b/kdessh/Makefile.am
index 09a20df..f69974f 100644
--- a/kdessh/Makefile.am
+++ b/kdessh/Makefile.am
@@ -6,8 +6,8 @@ INCLUDES= $(all_includes)
 ## kdessh
 bin_PROGRAMS = 	kdessh
 kdessh_SOURCES = kdessh.cpp sshdlg.cpp
-kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdessh_LDADD   = $(LIB_KDEUI) -ltdesu
+kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdessh_LDADD   = $(LIB_TDEUI) -ltdesu
 kdessh_METASOURCES =  AUTO
 noinst_HEADERS = sshdlg.h
 
diff --git a/kdf/Makefile.am b/kdf/Makefile.am
index e330362..866e345 100644
--- a/kdf/Makefile.am
+++ b/kdf/Makefile.am
@@ -9,11 +9,11 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp
 	disks.cpp listview.cpp optiondialog.cpp stdoption.cpp
 
 kdf_SOURCES = kdf.cpp 
-kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kdf_LDADD = libkdf_common.la $(LIB_KFILE)
 
 kwikdisk_SOURCES = kwikdisk.cpp 
-kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE)
 
 kde_module_LTLIBRARIES = kcm_kdf.la
diff --git a/kfloppy/Makefile.am b/kfloppy/Makefile.am
index 935f1b2..2cac206 100644
--- a/kfloppy/Makefile.am
+++ b/kfloppy/Makefile.am
@@ -1,5 +1,5 @@
-kfloppy_LDFLAGS	= $(all_libraries)  $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kfloppy_LDADD =  $(LIB_KDEUI) -lm
+kfloppy_LDFLAGS	= $(all_libraries)  $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfloppy_LDADD =  $(LIB_TDEUI) -lm
 INCLUDES =	$(all_includes)
 
 ####### Files
diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am
index ba303dd..03e1728 100644
--- a/kgpg/Makefile.am
+++ b/kgpg/Makefile.am
@@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg
 METASOURCES = AUTO
 
 # the library search path.
-kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 appsdir = $(kde_datadir)/kgpg
 apps_DATA = kgpg.rc listkeys.rc tips
diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am
index 973e352..87c0fe3 100644
--- a/khexedit/Makefile.am
+++ b/khexedit/Makefile.am
@@ -20,8 +20,8 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \
 exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h
 
 khexedit_METASOURCES = AUTO
-khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-khexedit_LDADD = $(LIB_KIO) $(LIB_KDEPRINT)
+khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+khexedit_LDADD = $(LIB_KIO) $(LIB_TDEPRINT)
 
 xdg_apps_DATA = khexedit.desktop
 
diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am
index c0c92cc..24a5dec 100644
--- a/khexedit/lib/Makefile.am
+++ b/khexedit/lib/Makefile.am
@@ -7,7 +7,7 @@ METASOURCES = AUTO
 # this library is used by the kbytesedit part and the khepart part
 lib_LTLIBRARIES =  libkhexeditcommon.la
 libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
-libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
+libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_TDECORE)
 libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
                                kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
                                kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
diff --git a/kjots/Makefile.am b/kjots/Makefile.am
index 453af81..38f23df 100644
--- a/kjots/Makefile.am
+++ b/kjots/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(all_includes)
-AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-LDADD =  $(LIB_KFILE) $(LIB_KDEPRINT)
+AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+LDADD =  $(LIB_KFILE) $(LIB_TDEPRINT)
 
 bin_PROGRAMS = kjots
 
diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am
index 9d755ed..bc58d54 100644
--- a/klaptopdaemon/Makefile.am
+++ b/klaptopdaemon/Makefile.am
@@ -4,30 +4,30 @@ lib_LTLIBRARIES = libkcmlaptop.la
 SUBDIRS = pics applnk
 
 libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp
-libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-libkcmlaptop_la_LIBADD  = $(LIB_KDEUI) 
+libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkcmlaptop_la_LIBADD  = $(LIB_TDEUI) 
 
 MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
 kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
-kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la
+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kded_klaptopdaemon_la_LIBADD   = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la
 
 klaptop_acpi_helper_SOURCES = acpi_helper.cpp
 klaptop_acpi_helper_LDADD = $(LIB_QT)
 
 klaptop_check_SOURCES = laptop_check.cpp 
-klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-klaptop_check_LDADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
+klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+klaptop_check_LDADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la
 
 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
 	acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp  
-kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module
-kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
+kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module
+kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la
 kcm_laptop_la_COMPILE_FIRST = crcresult.h
 
 AM_CPPFLAGS = $(all_includes)
 
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 KDE_OPTIONS = nofinal
 
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index e9b59d4..1a12793 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -32,7 +32,7 @@
 /*
  * TQLabel
  */
-class KDEUI_EXPORT KRichTextLabel : public TQLabel {
+class TDEUI_EXPORT KRichTextLabel : public TQLabel {
   Q_OBJECT
   TQ_OBJECT
 
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/Makefile.am b/kmilo/kmilo_kvaio/kcmkvaio/Makefile.am
index 6555b6c..a6aa873 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/Makefile.am
+++ b/kmilo/kmilo_kvaio/kcmkvaio/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kvaio.la
 kcm_kvaio_la_SOURCES = kcmkvaio_general.ui main.cpp
 
 kcm_kvaio_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-kcm_kvaio_la_LIBADD = ../kvaiodriverinterface.lo $(LIB_KDEUI)
+kcm_kvaio_la_LIBADD = ../kvaiodriverinterface.lo $(LIB_TDEUI)
 
 INCLUDES= $(all_includes)
  
diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am
index f7118bb..d6dea21 100644
--- a/kregexpeditor/Makefile.am
+++ b/kregexpeditor/Makefile.am
@@ -46,7 +46,7 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
 
 bin_PROGRAMS = kregexpeditor
 kregexpeditor_SOURCES = main.cpp
-kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kregexpeditor_LDADD =  libkregexpeditorcommon.la $(LIB_KIO)
 kregexpeditor_INCLUDES =  $(all_includes)
 
diff --git a/ksim/Makefile.am b/ksim/Makefile.am
index c8102cb..d44081b 100644
--- a/ksim/Makefile.am
+++ b/ksim/Makefile.am
@@ -10,7 +10,7 @@ ksim_panelextension_la_SOURCES = ksim.cpp ksimview.cpp ksimview.skel \
                              themeprefs.cpp
 
 ksim_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-ksim_panelextension_la_LIBADD = ./library/libksimcore.la libsysteminfo.la $(LIB_KIO) $(LIB_KDEUI)
+ksim_panelextension_la_LIBADD = ./library/libksimcore.la libsysteminfo.la $(LIB_KIO) $(LIB_TDEUI)
 
 SUBDIRS = themes library monitors pics
 EXTRA_DIST = ksim.desktop
diff --git a/ksim/library/Makefile.am b/ksim/library/Makefile.am
index f3b834f..03096a0 100644
--- a/ksim/library/Makefile.am
+++ b/ksim/library/Makefile.am
@@ -7,7 +7,7 @@ libksimcore_la_SOURCES = common.cpp themeloader.cpp \
                                         pluginmodule.cpp ksimconfig.cpp
 
 libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
-libksimcore_la_LIBADD = $(LIB_KDEUI)
+libksimcore_la_LIBADD = $(LIB_TDEUI)
 
 ksiminclude_HEADERS = common.h themeloader.h \
                                         chart.h label.h \
diff --git a/ktimer/Makefile.am b/ktimer/Makefile.am
index 77b6319..ad3d47d 100644
--- a/ktimer/Makefile.am
+++ b/ktimer/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(all_includes)
-AM_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-LDADD =  $(LIB_KDEUI) $(LIB_KFILE)
+AM_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+LDADD =  $(LIB_TDEUI) $(LIB_KFILE)
 
 bin_PROGRAMS = ktimer
 
diff --git a/kwallet/Makefile.am b/kwallet/Makefile.am
index 731f9c4..2c451ca 100644
--- a/kwallet/Makefile.am
+++ b/kwallet/Makefile.am
@@ -7,7 +7,7 @@ kwalletmanager_SOURCES = walletwidget.ui kwalletmanager.cpp \
 			kwalletmanager.skel main.cpp kwalletpopup.cpp \
 			kwalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
 			kbetterthankdialogbase.ui
-kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kwalletmanager_LDADD   = $(LIB_KIO) -lkwalletclient
 METASOURCES = AUTO
 noinst_HEADERS = kwalletmanager.h kwalletpopup.h walletwidget.h kwalleteditor.h\
diff --git a/kwallet/konfigurator/Makefile.am b/kwallet/konfigurator/Makefile.am
index fab7551..74be145 100644
--- a/kwallet/konfigurator/Makefile.am
+++ b/kwallet/konfigurator/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kcm_kwallet.la
 kcm_kwallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
 kcm_kwallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kwallet_la_LIBADD = $(LIB_KDEUI) -lkwalletclient
+kcm_kwallet_la_LIBADD = $(LIB_TDEUI) -lkwalletclient
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwallet.pot
diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am
index 14c38e7..1bdfd1b 100644
--- a/superkaramba/src/Makefile.am
+++ b/superkaramba/src/Makefile.am
@@ -40,9 +40,9 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
 
 # kde_cfg_DATA = superkaramba.kcfg
 
-superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
-superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
+superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
+superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 
 # this is where the desktop file will go
 shelldesktopdir = $(kde_appsdir)/Utilities