diff --git a/acinclude.m4 b/acinclude.m4
index e602d8d..ce1d418 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2068,8 +2068,8 @@ if test $kde_qtver = 3; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2099,13 +2099,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
diff --git a/config.log b/config.log
index f20c554..28c275c 100644
--- a/config.log
+++ b/config.log
@@ -194,11 +194,11 @@ LIBUTIL=''
 LIBZ=''
 LIB_KAB=''
 LIB_KABC=''
-LIB_KDECORE=''
+LIB_TDECORE=''
 LIB_KDED=''
-LIB_KDEPIM=''
-LIB_KDEPRINT=''
-LIB_KDEUI=''
+LIB_TDEPIM=''
+LIB_TDEPRINT=''
+LIB_TDEUI=''
 LIB_KDNSSD=''
 LIB_KFILE=''
 LIB_KFM=''
diff --git a/src/coff/xml/Makefile.am b/src/coff/xml/Makefile.am
index 368e2e7..0344114 100644
--- a/src/coff/xml/Makefile.am
+++ b/src/coff/xml/Makefile.am
@@ -10,5 +10,5 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
 	$(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
-xml_coff_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_coff_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
 xml_coff_parser_DEPENDENCIES = $(OBJECTS)
diff --git a/src/common/common/Makefile.am b/src/common/common/Makefile.am
index 1a6e344..678798e 100644
--- a/src/common/common/Makefile.am
+++ b/src/common/common/Makefile.am
@@ -4,6 +4,6 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = bitvalue.cpp group.cpp misc.cpp number.cpp purl_base.cpp \
 		storage.cpp synchronous.cpp version_data.cpp
-libcommon_la_LDFLAGS = $(all_libraries) $(LIB_KDECORE)
+libcommon_la_LDFLAGS = $(all_libraries) $(LIB_TDECORE)
 
 
diff --git a/src/common/nokde/nokde_kaboutdata.h b/src/common/nokde/nokde_kaboutdata.h
index 01a8e74..1331836 100644
--- a/src/common/nokde/nokde_kaboutdata.h
+++ b/src/common/nokde/nokde_kaboutdata.h
@@ -59,7 +59,7 @@ class KAboutDataPrivate;
  *                   "joe.user@host.org", 0);
  *   KCmdLineArgs::init(argc, argv, &about);
  */
-class KDECORE_EXPORT KAboutPerson
+class TDECORE_EXPORT KAboutPerson
 {
 public:
     /**
@@ -139,7 +139,7 @@ class KAboutTranslatorPrivate;
  * translator information is generated dynamically from the translation
  * of a dummy string.
 */
-class KDECORE_EXPORT KAboutTranslator
+class TDECORE_EXPORT KAboutTranslator
 {
 public:
     /**
@@ -187,7 +187,7 @@ private:
  * classes.
  * @author Espen Sand (espen@kde.org), David Faure (faure@kde.org)
  */
-class KDECORE_EXPORT KAboutData
+class TDECORE_EXPORT KAboutData
 {
   public:
   /**
diff --git a/src/common/nokde/nokde_kcmdlineargs.h b/src/common/nokde/nokde_kcmdlineargs.h
index 8808d94..28d7d40 100644
--- a/src/common/nokde/nokde_kcmdlineargs.h
+++ b/src/common/nokde/nokde_kcmdlineargs.h
@@ -48,7 +48,7 @@ typedef TQValueList<TQCString> QCStringList;
  *
  * @see KCmdLineArgs for additional usage information
  */
-struct KDECORE_EXPORT KCmdLineOptions
+struct TDECORE_EXPORT KCmdLineOptions
 {
    /**
     * The name of the argument as it should be called on the command line and
@@ -230,7 +230,7 @@ class KCmdLineArgsPrivate;
  *  @author Waldo Bastian
  *  @version 0.0.4
  */
-class KDECORE_EXPORT KCmdLineArgs
+class TDECORE_EXPORT KCmdLineArgs
 {
   friend class KApplication;
   friend class KUniqueApplication;
diff --git a/src/common/nokde/nokde_klocale.h b/src/common/nokde/nokde_klocale.h
index 9a3e361..90b5f47 100644
--- a/src/common/nokde/nokde_klocale.h
+++ b/src/common/nokde/nokde_klocale.h
@@ -1,8 +1,8 @@
 #ifndef NOKDE_KLOCALE_H
 #define NOKDE_KLOCALE_H
 
-#undef KDECORE_EXPORT
-#define KDECORE_EXPORT
+#undef TDECORE_EXPORT
+#define TDECORE_EXPORT
 
 #undef KDE_DEPRECATED
 #define KDE_DEPRECATED
diff --git a/src/devices/mem24/xml/Makefile.am b/src/devices/mem24/xml/Makefile.am
index 88a4305..6883266 100644
--- a/src/devices/mem24/xml/Makefile.am
+++ b/src/devices/mem24/xml/Makefile.am
@@ -9,4 +9,4 @@ mem24_xml_to_data_DEPENDENCIES = $(top_builddir)/src/devices/mem24/base/libmem24
 	$(top_builddir)/src/common/common/libcommon.la
 mem24_xml_to_data_LDADD = $(top_builddir)/src/devices/mem24/base/libmem24base.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
-	$(top_builddir)/src/common/common/libcommon.la $(LIB_KDECORE)
+	$(top_builddir)/src/common/common/libcommon.la $(LIB_TDECORE)
diff --git a/src/devices/pic/xml/Makefile.am b/src/devices/pic/xml/Makefile.am
index a941f8d..9ebb9f3 100644
--- a/src/devices/pic/xml/Makefile.am
+++ b/src/devices/pic/xml/Makefile.am
@@ -9,4 +9,4 @@ pic_xml_to_data_DEPENDENCIES = $(top_builddir)/src/devices/pic/base/libpicbase.l
 	$(top_builddir)/src/common/common/libcommon.la
 pic_xml_to_data_LDADD = $(top_builddir)/src/devices/pic/base/libpicbase.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
-	$(top_builddir)/src/common/common/libcommon.la $(LIB_KDECORE)
+	$(top_builddir)/src/common/common/libcommon.la $(LIB_TDECORE)
diff --git a/src/piklab-coff/Makefile.am b/src/piklab-coff/Makefile.am
index 93ebf94..6ad9294 100644
--- a/src/piklab-coff/Makefile.am
+++ b/src/piklab-coff/Makefile.am
@@ -12,5 +12,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \
       $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
 piklab_coff_DEPENDENCIES = $(OBJ)
 piklab_coff_LDADD = $(OBJ) $(LIB_KIO)
-piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 piklab_coff_SOURCES = main.cpp
diff --git a/src/piklab-hex/Makefile.am b/src/piklab-hex/Makefile.am
index 464576b..5617b1d 100644
--- a/src/piklab-hex/Makefile.am
+++ b/src/piklab-hex/Makefile.am
@@ -11,5 +11,5 @@ OBJ =   $(top_builddir)/src/common/cli/libcli.la \
 	$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
 piklab_hex_DEPENDENCIES = $(OBJ)
 piklab_hex_LDADD = $(OBJ) $(LIB_KIO)
-piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 piklab_hex_SOURCES = main.cpp
diff --git a/src/piklab-prog/Makefile.am b/src/piklab-prog/Makefile.am
index 6d4598d..215a7ff 100644
--- a/src/piklab-prog/Makefile.am
+++ b/src/piklab-prog/Makefile.am
@@ -27,5 +27,5 @@ OBJ =   $(top_builddir)/src/progs/list/libproglistnoui.la \
 	$(top_builddir)/src/common/common/libcommon.la
 piklab_prog_DEPENDENCIES = $(OBJ)
 piklab_prog_LDADD = $(OBJ) $(LIB_KIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS)
-piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp
diff --git a/src/piklab-test/checksum/Makefile.am b/src/piklab-test/checksum/Makefile.am
index 3b4964a..865461a 100644
--- a/src/piklab-test/checksum/Makefile.am
+++ b/src/piklab-test/checksum/Makefile.am
@@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
       $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
 checksum_check_DEPENDENCIES = $(OBJ)
 checksum_check_LDADD = $(OBJ) $(LIB_KIO)
-checksum_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE)
+checksum_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE)
 checksum_check_SOURCES = checksum_check.cpp
diff --git a/src/piklab-test/generators/Makefile.am b/src/piklab-test/generators/Makefile.am
index d379594..41850d2 100644
--- a/src/piklab-test/generators/Makefile.am
+++ b/src/piklab-test/generators/Makefile.am
@@ -17,15 +17,15 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
 
 gputils_config_generator_check_DEPENDENCIES = $(OBJ)
 gputils_config_generator_check_LDADD = $(OBJ) $(LIB_KIO)
-gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 gputils_config_generator_check_SOURCES = gputils_config_generator_check.cpp
 
 gputils_template_generator_check_DEPENDENCIES = $(OBJ)
 gputils_template_generator_check_LDADD = $(OBJ) $(LIB_KIO)
-gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp
 
 sdcc_config_generator_check_DEPENDENCIES = $(OBJ)
 sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_KIO)
-sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 sdcc_config_generator_check_SOURCES = sdcc_config_generator_check.cpp
diff --git a/src/piklab-test/misc/Makefile.am b/src/piklab-test/misc/Makefile.am
index f3769d7..d6d6b6c 100644
--- a/src/piklab-test/misc/Makefile.am
+++ b/src/piklab-test/misc/Makefile.am
@@ -6,5 +6,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common
       $(top_builddir)/src/common/global/libglobal.la $(top_builddir)/src/common/common/libcommon.la
 misc_check_DEPENDENCIES = $(OBJ)
 misc_check_LDADD = $(OBJ) $(LIB_KIO)
-misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 misc_check_SOURCES = misc_check.cpp
diff --git a/src/piklab-test/save_load_memory/Makefile.am b/src/piklab-test/save_load_memory/Makefile.am
index 65387b4..4c9375a 100644
--- a/src/piklab-test/save_load_memory/Makefile.am
+++ b/src/piklab-test/save_load_memory/Makefile.am
@@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
       $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
 save_load_memory_check_DEPENDENCIES = $(OBJ)
 save_load_memory_check_LDADD = $(OBJ) $(LIB_KIO)
-save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 save_load_memory_check_SOURCES = save_load_memory_check.cpp
diff --git a/src/piklab/Makefile.am b/src/piklab/Makefile.am
index d244e28..6ce837a 100644
--- a/src/piklab/Makefile.am
+++ b/src/piklab/Makefile.am
@@ -59,5 +59,5 @@ OBJS = $(top_builddir)/src/libgui/libgui.la \
 	$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
 piklab_LDADD = $(OBJS) -lktexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
 piklab_DEPENDENCIES = $(OBJS)
-piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 piklab_SOURCES = main.cpp
diff --git a/src/progs/direct/xml/Makefile.am b/src/progs/direct/xml/Makefile.am
index dd1f678..bd7120a 100644
--- a/src/progs/direct/xml/Makefile.am
+++ b/src/progs/direct/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
 xml_direct_parser_DEPENDENCIES = $(OBJECTS)
-xml_direct_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_direct_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/icd1/xml/Makefile.am b/src/progs/icd1/xml/Makefile.am
index dab961c..4e5acd3 100644
--- a/src/progs/icd1/xml/Makefile.am
+++ b/src/progs/icd1/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
 xml_icd1_parser_DEPENDENCIES = $(OBJECTS)
-xml_icd1_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_icd1_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/icd2/xml/Makefile.am b/src/progs/icd2/xml/Makefile.am
index 52af4ee..addfac5 100644
--- a/src/progs/icd2/xml/Makefile.am
+++ b/src/progs/icd2/xml/Makefile.am
@@ -12,4 +12,4 @@ OBJECTS = $(top_builddir)/src/progs/icd2/icd2_data/libicd2data.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
 xml_icd2_parser_DEPENDENCIES = $(OBJECTS)
-xml_icd2_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_icd2_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/picdem_bootloader/xml/Makefile.am b/src/progs/picdem_bootloader/xml/Makefile.am
index 5ed38e6..6c5fd8c 100644
--- a/src/progs/picdem_bootloader/xml/Makefile.am
+++ b/src/progs/picdem_bootloader/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
           $(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
           $(top_builddir)/src/common/common/libcommon.la
 xml_picdem_bootloader_parser_DEPENDENCIES = $(OBJECTS)
-xml_picdem_bootloader_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_picdem_bootloader_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/pickit1/xml/Makefile.am b/src/progs/pickit1/xml/Makefile.am
index f0cc91a..890b03b 100644
--- a/src/progs/pickit1/xml/Makefile.am
+++ b/src/progs/pickit1/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
 xml_pickit1_parser_DEPENDENCIES = $(OBJECTS)
-xml_pickit1_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_pickit1_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/pickit2/xml/Makefile.am b/src/progs/pickit2/xml/Makefile.am
index 5e8197e..4627fdb 100644
--- a/src/progs/pickit2/xml/Makefile.am
+++ b/src/progs/pickit2/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
 xml_pickit2_parser_DEPENDENCIES = $(OBJECTS)
-xml_pickit2_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_pickit2_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/pickit2_bootloader/xml/Makefile.am b/src/progs/pickit2_bootloader/xml/Makefile.am
index 899aa3b..88148af 100644
--- a/src/progs/pickit2_bootloader/xml/Makefile.am
+++ b/src/progs/pickit2_bootloader/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
           $(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
           $(top_builddir)/src/common/common/libcommon.la
 xml_pickit2_bootloader_parser_DEPENDENCIES = $(OBJECTS)
-xml_pickit2_bootloader_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_pickit2_bootloader_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/psp/xml/Makefile.am b/src/progs/psp/xml/Makefile.am
index 156e485..27aa4b2 100644
--- a/src/progs/psp/xml/Makefile.am
+++ b/src/progs/psp/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
 	$(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
 	$(top_builddir)/src/common/common/libcommon.la
 xml_psp_parser_DEPENDENCIES = $(OBJECTS)
-xml_psp_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_psp_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)
diff --git a/src/progs/tbl_bootloader/xml/Makefile.am b/src/progs/tbl_bootloader/xml/Makefile.am
index 609ca90..24c667d 100644
--- a/src/progs/tbl_bootloader/xml/Makefile.am
+++ b/src/progs/tbl_bootloader/xml/Makefile.am
@@ -11,4 +11,4 @@ OBJECTS = $(top_builddir)/src/devices/list/libdevicelistnoui.la \
           $(top_builddir)/src/xml_to_data/libxmltodata.la $(top_builddir)/src/devices/base/libdevicebase.la \
           $(top_builddir)/src/common/common/libcommon.la
 xml_tbl_bootloader_parser_DEPENDENCIES = $(OBJECTS)
-xml_tbl_bootloader_parser_LDADD = $(OBJECTS) $(LIB_KDECORE)
+xml_tbl_bootloader_parser_LDADD = $(OBJECTS) $(LIB_TDECORE)