diff --git a/amor/Makefile.am b/amor/Makefile.am
index 4dba6ab..e5b1cce 100644
--- a/amor/Makefile.am
+++ b/amor/Makefile.am
@@ -15,7 +15,7 @@ amor_SOURCES	= amordialog.cpp amor.cpp amorwidget.cpp main.cpp amoranim.cpp amor
 include_HEADERS = AmorIface.h
 
 # the library search path
-amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kmoon/Makefile.am b/kmoon/Makefile.am
index c2875c1..293dd82 100644
--- a/kmoon/Makefile.am
+++ b/kmoon/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kmoon_panelapplet.la
 
 kmoon_panelapplet_la_SOURCES = kmoonapplet.cpp phases.cpp kmoondlg.cpp kmoonwidget.cpp
 kmoon_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kmoon_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
+kmoon_panelapplet_la_LIBADD = $(LIB_TDESYCOCA)
 
 lnkdir = $(kde_datadir)/kicker/applets
 lnk_DATA = kmoonapplet.desktop
diff --git a/kodo/Makefile.am b/kodo/Makefile.am
index 83ffb06..9e1e1b1 100644
--- a/kodo/Makefile.am
+++ b/kodo/Makefile.am
@@ -7,7 +7,7 @@ kodo_SOURCES = main.cpp kodometer.cpp kimagenumber.cpp
 METASOURCES = AUTO
 
 # the library search path.
-kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kodo_LDADD   = $(LIB_TDEUI)
 
 messages:
diff --git a/kteatime/Makefile.am b/kteatime/Makefile.am
index 9178d19..b825d9d 100644
--- a/kteatime/Makefile.am
+++ b/kteatime/Makefile.am
@@ -6,10 +6,10 @@ bin_PROGRAMS = kteatime
 kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp
 
 kteatime_METASOURCES = AUTO
-kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-# LIB_KIO needed for KNotifyDialog
-kteatime_LDADD = $(LIB_TDEUI) $(LIB_KIO)
+# LIB_TDEIO needed for KNotifyDialog
+kteatime_LDADD = $(LIB_TDEUI) $(LIB_TDEIO)
 
 KDE_ICON = kteatime
 
diff --git a/ktux/Makefile.am b/ktux/Makefile.am
index 2a32b32..183d347 100644
--- a/ktux/Makefile.am
+++ b/ktux/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = ktux
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # the libraries to link against.
 ktux_LDADD   = $(LIB_TDEUI) -ltdescreensaver
diff --git a/kweather/Makefile.am b/kweather/Makefile.am
index d95a4bb..e439de5 100644
--- a/kweather/Makefile.am
+++ b/kweather/Makefile.am
@@ -38,7 +38,7 @@ station_DATA = stations.dat
 kcm_weather_la_SOURCES = kcmweather.cpp prefdialogdata.ui weatherservice.stub
 kcm_weather_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                          -avoid-version -no-undefined
-kcm_weather_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+kcm_weather_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
 
 kcm_weatherservice_la_SOURCES = kcmweatherservice.cpp serviceconfigwidget.cpp \
                                 serviceconfigdata.ui weatherservice.stub
@@ -48,7 +48,7 @@ kcm_weatherservice_la_LIBADD = $(LIB_TDEUI)
 
 #weather_sidebar_la_SOURCES = sidebarwidgetbase.ui sidebarwidget.cpp dockwidget.cpp weatherbar.cpp weatherbar.skel
 #weather_sidebar_la_LDFLAGS = $(all_libraries) -module -no-undefined
-#weather_sidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin
+#weather_sidebar_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin
 
 #globalentrydir   = $(kde_datadir)/konqsidebartng/entries
 #globalentry_DATA = weatherbar.desktop
@@ -56,8 +56,8 @@ kcm_weatherservice_la_LIBADD = $(LIB_TDEUI)
 #globaladddir   = $(kde_datadir)/konqsidebartng/add
 #globaladd_DATA = weatherbar_add.desktop
 
-kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kweatherservice_LDADD = $(LIB_KIO)
+kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kweatherservice_LDADD = $(LIB_TDEIO)
 kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \
                           weatherservice.cpp weatherservice.skel \
                           stationdatabase.cpp sun.cpp weatherservice.stub
diff --git a/kworldwatch/Makefile.am b/kworldwatch/Makefile.am
index bd4cdf0..41ea9f4 100644
--- a/kworldwatch/Makefile.am
+++ b/kworldwatch/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
 
 kworldclock_SOURCES = main.cpp 
 kworldclock_LDADD = libww.la $(LIB_TDEUI) -ltdefx
-kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 xdg_apps_DATA= kworldclock.desktop
 
@@ -35,7 +35,7 @@ tabdir = $(kde_datadir)/kworldclock
 EXTRA_DIST = $(lnk_DATA)
 
 ww_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-ww_panelapplet_la_LIBADD = libww.la $(LIB_KSYCOCA) 
+ww_panelapplet_la_LIBADD = libww.la $(LIB_TDESYCOCA) 
 
 messages: rc.cpp
 	$(XGETTEXT) rc.cpp $(kworldclock_SOURCES) $(libww_la_SOURCES) -o $(podir)/kworldclock.pot