Rename additional instances of KDE to TDE

456 files changed, 1091 insertions, 1091 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5837d0f0a..2ac4ce683 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,8 +101,8 @@ endif( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i?86" OR ${CMAKE_SYSTEM_PROCESSOR} STR
 ##### check for operating system ################
 
 if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
-  set( KDEINIT_SETUID 1 )
-  set( KDEINIT_OOM_PROTECT 1 )
+  set( TDEINIT_SETUID 1 )
+  set( TDEINIT_OOM_PROTECT 1 )
 endif( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
 
 
@@ -408,13 +408,13 @@ endif( __PATH_SU )
 # FIXME for unknown reason cmake cannot find sudo
 # find_program( __PATH_SUDO "sudo" )
 set( __PATH_SUDO "/usr/bin/sudo" )
-if( WITH_SUDO_KDESU_BACKEND )
+if( WITH_SUDO_TDESU_BACKEND )
   if( __PATH_SUDO )
     set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} )
   else( __PATH_SUDO )
     message( FATAL_ERROR "sudo was chosen as tdesu backend, but was not found in path." )
   endif( __PATH_SUDO )
-endif( WITH_SUDO_KDESU_BACKEND )
+endif( WITH_SUDO_TDESU_BACKEND )
 
 
 #### set some constants #########################
@@ -533,7 +533,7 @@ if( NOT FREETYPE_FOUND )
     message(FATAL_ERROR "\nfreetype2 are required, but not found on your system" )
 endif( NOT FREETYPE_FOUND )
 
-set( KDEINIT_USE_FONTCONFIG 1 )
+set( TDEINIT_USE_FONTCONFIG 1 )
 
 
 ##### check for fontconfig ######################
@@ -629,12 +629,12 @@ endif( WITH_ARTS )
 
 ##### check for Xft #############################
 
-if( KDEINIT_USE_XFT )
+if( TDEINIT_USE_XFT )
   pkg_search_module( XFT xft )
   if( NOT XFT_FOUND )
       message(FATAL_ERROR "\nXft are required, but not found on your system" )
   endif( NOT XFT_FOUND )
-endif( KDEINIT_USE_XFT )
+endif( TDEINIT_USE_XFT )
 
 
 ##### check for libart ##########################
diff --git a/arts/kde/Makefile.am b/arts/kde/Makefile.am
index f402c136f..74d397374 100644
--- a/arts/kde/Makefile.am
+++ b/arts/kde/Makefile.am
@@ -8,7 +8,7 @@ libartskde_la_SOURCES = artskde.cc kioinputstream_impl.cpp kplayobject.cc \
                         kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
                         kvideowidget.cpp kplayobjectcreator.cc \
                         kaudiomanagerplay.cpp
-libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_KDECORE) -lkmedia2_idl -lartsflow $(LIB_KDEUI) $(LIB_X11)
+libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
 libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 libartskde_la_METASOURCES = AUTO
 libartskde_la_COMPILE_FIRST = artskde.h
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index fea1a9e9c..115eed4b8 100644
--- a/arts/knotify/Makefile.am
+++ b/arts/knotify/Makefile.am
@@ -7,15 +7,15 @@ kde_module_LTLIBRARIES = knotify.la
 
 knotify_la_SOURCES	= knotify.cpp knotify.skel
 if include_ARTS
-knotify_la_LIBADD	= -lsoundserver_idl $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) -lartsflow_idl -lmcop
+knotify_la_LIBADD	= -lsoundserver_idl $(LIB_TDEUI) $(top_builddir)/arts/kde/libartskde.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) -lartsflow_idl -lmcop
 endif
 knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
 knotify_la_METASOURCES = AUTO
 
 check_PROGRAMS		= knotifytest
 knotifytest_SOURCES	= knotifytest.cpp
-knotifytest_LDADD	= $(LIB_KDECORE)
-knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+knotifytest_LDADD	= $(LIB_TDECORE)
+knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS	=  knotify.h
 
diff --git a/config.h.cmake b/config.h.cmake
index cc009095f..111c9ccc1 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -690,13 +690,13 @@
 #define KDEDIR "@KDEDIR@"
 
 /* Enable prevention against poor Linux OOM-killer */
-#cmakedefine KDEINIT_OOM_PROTECT 1
+#cmakedefine TDEINIT_OOM_PROTECT 1
 
 /* Use FontConfig in tdeinit */
-#cmakedefine KDEINIT_USE_FONTCONFIG 1
+#cmakedefine TDEINIT_USE_FONTCONFIG 1
 
 /* Use Xft preinitialization in tdeinit */
-#cmakedefine KDEINIT_USE_XFT 1
+#cmakedefine TDEINIT_USE_XFT 1
 
 /* Suffix for lib directories */
 #define KDELIBSUFF "@KDELIBSUFF@"
diff --git a/configure.in.in b/configure.in.in
index 5eae312c6..c2badfa92 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -250,13 +250,13 @@ AC_SUBST(LIBICE)
 
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
 AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
-AC_SUBST(LIB_KDECORE, '$(top_builddir)/tdecore/libtdecore.la')
-AC_SUBST(LIB_KDEUI, '$(top_builddir)/tdeui/libtdeui.la')
+AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
+AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
 AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
 AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
-AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
+AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
 AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
 AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index 187395189..837cc486d 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -50,15 +50,15 @@ dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
 
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
 
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testdcop_SOURCES = testdcop.cpp
 testdcop_LDADD = libDCOP.la
 
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
 dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
 
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testdcopc_SOURCES = testdcopc.c dcopc.c
 testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
 
diff --git a/dcop/dcopidl/dcopidl_output.kidl b/dcop/dcopidl/dcopidl_output.kidl
index 83df49a81..678ff6732 100644
--- a/dcop/dcopidl/dcopidl_output.kidl
+++ b/dcop/dcopidl/dcopidl_output.kidl
@@ -5,7 +5,7 @@
 <INCLUDE>qstring.h</INCLUDE>
 <CLASS>
     <NAME>Test</NAME>
-    <LINK_SCOPE>KDEUI_EXPORT</LINK_SCOPE>
+    <LINK_SCOPE>TDEUI_EXPORT</LINK_SCOPE>
     <SUPER>MyNamespace::MyParentClass</SUPER>
     <SUPER>DCOPObject</SUPER>
     <SUPER>QValueList&lt;<TYPE>QString</TYPE>&gt;</SUPER>
diff --git a/dcop/dcopidl/dcopidl_test.h b/dcop/dcopidl/dcopidl_test.h
index 6d57167e2..2e896fb52 100644
--- a/dcop/dcopidl/dcopidl_test.h
+++ b/dcop/dcopidl/dcopidl_test.h
@@ -30,7 +30,7 @@ namespace KMail {
  * geiseri at some point in the near future.
  * blah di blah
  **/
-class KDEUI_EXPORT Test : public MyNamespace::MyParentClass, virtual public DCOPObject,
+class TDEUI_EXPORT Test : public MyNamespace::MyParentClass, virtual public DCOPObject,
              public TQValueList<TQString>
 {
     K_DCOP
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index 8a2436c6c..a6c72a888 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -8,7 +8,7 @@
 // stub:
 //    - includes to super relationship, a bit much to test, needs multiple files?
 
-class KDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject
+class TDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject
 {
    Q_OBJECT
    K_DCOP
diff --git a/dcop/tests/Makefile.am b/dcop/tests/Makefile.am
index 16d8ac7e0..d6bf54ac7 100644
--- a/dcop/tests/Makefile.am
+++ b/dcop/tests/Makefile.am
@@ -12,11 +12,11 @@ METASOURCES = AUTO
 check_PROGRAMS = dcop_test driver
 
 dcop_test_SOURCES = test.cpp test.skel
-dcop_test_LDADD = $(LIB_KDECORE)
+dcop_test_LDADD = $(LIB_TDECORE)
 dcop_test_LDFLAGS = $(KDE_RPATH)
 
 driver_SOURCES = driver.cpp test.stub
-driver_LDADD = $(LIB_KDECORE)
+driver_LDADD = $(LIB_TDECORE)
 driver_LDFLAGS = $(KDE_RPATH)
 
 CLEANFILES = batch.generated definitions.generated driver.generated shell.generated test.h
diff --git a/doc/api/Doxyfile.local b/doc/api/Doxyfile.local
index 0f5343b57..e5622aca3 100644
--- a/doc/api/Doxyfile.local
+++ b/doc/api/Doxyfile.local
@@ -1,5 +1,5 @@
 ## Predefined macros, to remove all the _EXPORT things
 ## from function definitions.
-PREDEFINED = KDECORE_EXPORT="" \
-	KDEUI_EXPORT="" \
+PREDEFINED = TDECORE_EXPORT="" \
+	TDEUI_EXPORT="" \
 	Q_OS_UNIX=""
diff --git a/interfaces/kimproxy/library/Makefile.am b/interfaces/kimproxy/library/Makefile.am
index 17ff95343..94f2974ac 100644
--- a/interfaces/kimproxy/library/Makefile.am
+++ b/interfaces/kimproxy/library/Makefile.am
@@ -16,7 +16,7 @@ kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
 
 lib_LTLIBRARIES =  libkimproxy.la
 libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI)
+libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
 libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
 
 kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
diff --git a/interfaces/kmediaplayer/Makefile.am b/interfaces/kmediaplayer/Makefile.am
index 9819f9040..5b26d844e 100644
--- a/interfaces/kmediaplayer/Makefile.am
+++ b/interfaces/kmediaplayer/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkmediaplayer.la
 
 libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
 libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
+libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
 libkmediaplayer_la_METASOURCES = AUTO
 
 kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am b/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
index a40cff821..e4232cd78 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
+++ b/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfileaudiopreview.la
 
 kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
 kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
 
 noinst_HEADERS = kfileaudiopreview.h
 
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am
index 1d60cae7d..ede5f4fa0 100644
--- a/interfaces/kscript/Makefile.am
+++ b/interfaces/kscript/Makefile.am
@@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_
 #lib_LTLIBRARIES = libkscriptloader.la libkscript.la
 lib_LTLIBRARIES = libkscript.la
 #libkscriptloader_la_SOURCES = scriptloader.cpp
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
 
 libkscript_la_SOURCES = scriptmanager.cpp
 libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
 kscriptincludedir = $(includedir)
diff --git a/interfaces/kscript/sample/Makefile.am b/interfaces/kscript/sample/Makefile.am
index 8781a41fb..5dae5193f 100644
--- a/interfaces/kscript/sample/Makefile.am
+++ b/interfaces/kscript/sample/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libshellscript.la
 
 libshellscript_la_SOURCES = shellscript.cpp
 libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
+libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
 
 METASOURCES = AUTO
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/ktexteditor/Makefile.am
index 8881648ef..cc41c788f 100644
--- a/interfaces/ktexteditor/Makefile.am
+++ b/interfaces/ktexteditor/Makefile.am
@@ -22,8 +22,8 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
 
 
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
+libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
 
 ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 799249021..1c62aaced 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=$(all_includes)
 check_PROGRAMS=test
 test_SOURCES=main.cc
-test_LDADD=$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkio
+test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lkio
 test_LDFLAGS=$(all_libraries)
 METASOURCES=AUTO
diff --git a/kabc/Makefile.am b/kabc/Makefile.am
index 76e37e2b0..c4aa489e7 100644
--- a/kabc/Makefile.am
+++ b/kabc/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
 lib_LTLIBRARIES = libkabc.la
 libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
 libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
-                    $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE)
+                    $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
 libkabc_la_COMPILE_FIRST = addressee.h
 
 libkabc_la_SOURCES = \
@@ -52,7 +52,7 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = kab2kabc
 
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kab2kabc_LDADD = libkabc.la ../kab/libkab.la
 kab2kabc_SOURCES = kab2kabc.cpp
 
diff --git a/kabc/formats/Makefile.am b/kabc/formats/Makefile.am
index 0b5978b20..57c2caaa3 100644
--- a/kabc/formats/Makefile.am
+++ b/kabc/formats/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kabcformat_binary.la
 kabcformat_binary_la_SOURCES = binaryformat.cpp
 kabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                 -no-undefined
-kabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_KDECORE)
+kabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE)
 kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 # these are the headers for your project
diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am
index d06588266..f5c0c2523 100644
--- a/kabc/plugins/dir/Makefile.am
+++ b/kabc/plugins/dir/Makefile.am
@@ -6,13 +6,13 @@ noinst_HEADERS = resourcedirconfig.h
 lib_LTLIBRARIES = libkabc_dir.la
 libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
 libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
-libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
+libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
 libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_dir.la
 kabc_dir_la_SOURCES = resourcedirplugin.cpp
 kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_KDECORE)
+kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_TDECORE)
 
 METASOURCES = AUTO
 
diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am
index 2edbfe9c7..3060bfab5 100644
--- a/kabc/plugins/file/Makefile.am
+++ b/kabc/plugins/file/Makefile.am
@@ -6,14 +6,14 @@ noinst_HEADERS   = resourcefileconfig.h
 lib_LTLIBRARIES = libkabc_file.la
 libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
 libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_KDECORE) $(LIB_KDEUI)
+libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
 libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 
 kde_module_LTLIBRARIES = kabc_file.la
 kabc_file_la_SOURCES = resourcefileplugin.cpp
 kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_KDECORE)
+kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE)
 kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 METASOURCES = AUTO
diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am
index 1198070c9..97cd9089c 100644
--- a/kabc/plugins/ldapkio/Makefile.am
+++ b/kabc/plugins/ldapkio/Makefile.am
@@ -6,13 +6,13 @@ noinst_HEADERS = resourceldapkioconfig.h
 lib_LTLIBRARIES = libkabc_ldapkio.la
 libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
 libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KDEUI) $(LIB_KDECORE)
+libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE)
 libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_ldapkio.la
 kabc_ldapkio_la_SOURCES = resourceldapkioplugin.cpp
 kabc_ldapkio_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_ldapkio_la_LIBADD	= libkabc_ldapkio.la $(LIB_QT) $(LIB_KDECORE)
+kabc_ldapkio_la_LIBADD	= libkabc_ldapkio.la $(LIB_QT) $(LIB_TDECORE)
 
 METASOURCES = AUTO
 
diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am
index 3c40ccb63..3af688026 100644
--- a/kabc/tests/Makefile.am
+++ b/kabc/tests/Makefile.am
@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
 testlock_LDFLAGS = $(all_libraries)
 testlock_SOURCES = testlock.cpp
 
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testldapclient_SOURCES = testldapclient.cpp
 
 EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
   testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
 
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testkabc_SOURCES = testkabc.cpp
 
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testaddressee_SOURCES = testaddressee.cpp
 
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testaddresseelist_SOURCES = testaddresseelist.cpp
 
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testaddressfmt_SOURCES = testaddressfmt.cpp
 
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testkabcdlg_SOURCES = testkabcdlg.cpp
 
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testdistlist_SOURCES = testdistlist.cpp
 
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
 
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
 bigread_SOURCES = bigread.cpp
 
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
 bigwrite_SOURCES = bigwrite.cpp
 
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testdb_SOURCES = testdb.cpp
 
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kabcargl_SOURCES = kabcargl.cpp
 
diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am
index 94d08e292..738faff03 100644
--- a/kabc/vcard/Makefile.am
+++ b/kabc/vcard/Makefile.am
@@ -8,14 +8,14 @@ lib_LTLIBRARIES = libvcard.la
 
 libvcard_la_SOURCES = vCard-all.cpp
 libvcard_la_LDFLAGS = $(all_libraries)
-libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 check_PROGRAMS = testwrite testread
 
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testwrite_LDADD = libvcard.la 
 testwrite_SOURCES = testwrite.cpp
 
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testread_LDADD = libvcard.la 
 testread_SOURCES = testread.cpp
diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am
index 5978a8f38..e698c687a 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/kabc/vcardparser/Makefile.am
@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
 
 check_PROGRAMS = testread testwrite testread2
 
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 testread_SOURCES = testread.cpp
 
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 testread2_SOURCES = testread2.cpp testutils.cpp
 
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 testwrite_SOURCES = testwrite.cpp
 
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 9520fa750..94065cb3c 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = document.moc view.moc
 lib_LTLIBRARIES = libkatepartinterfaces.la
 
 libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KDECORE)
+libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
 libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 
 kateinclude_HEADERS = document.h view.h
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 5b9cea187..746c35813 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -16,7 +16,7 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \
 
 libkatepart_la_SOURCES = dummy.cpp
 
-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_KDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
 
 libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
diff --git a/kate/plugins/insertfile/Makefile.am b/kate/plugins/insertfile/Makefile.am
index b9a4981ae..fc8b1e228 100644
--- a/kate/plugins/insertfile/Makefile.am
+++ b/kate/plugins/insertfile/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = ktexteditor_insertfile.la
 
 ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
+ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
 ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
 insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
diff --git a/kate/plugins/isearch/Makefile.am b/kate/plugins/isearch/Makefile.am
index 3e630a0c7..f71da53e7 100644
--- a/kate/plugins/isearch/Makefile.am
+++ b/kate/plugins/isearch/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = ktexteditor_isearch.la
 
 ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
-ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
 isearchdatadir = $(kde_datadir)/ktexteditor_isearch
diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am
index aa1e68bba..210fa69e8 100644
--- a/kate/plugins/kdatatool/Makefile.am
+++ b/kate/plugins/kdatatool/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = ktexteditor_kdatatool.la
 
 ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
-ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KDEUI)
+ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
 ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool
diff --git a/kate/plugins/wordcompletion/Makefile.am b/kate/plugins/wordcompletion/Makefile.am
index 3dcab0ffd..e79d02fb5 100644
--- a/kate/plugins/wordcompletion/Makefile.am
+++ b/kate/plugins/wordcompletion/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la
 
 ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
-ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
diff --git a/kcert/Makefile.am b/kcert/Makefile.am
index e568f558a..e5885a494 100644
--- a/kcert/Makefile.am
+++ b/kcert/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = libkcertpart.la
 libkcertpart_la_SOURCES	= kcertpart.cc
 
 libkcertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KDECORE)
+libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
 libkcertpart_la_DEPENDENCIES = $(LIB_KPARTS)
 
 libkcertpart_la_METASOURCES = AUTO
diff --git a/kcmshell/Makefile.am b/kcmshell/Makefile.am
index bc89bed8f..6e12d9053 100644
--- a/kcmshell/Makefile.am
+++ b/kcmshell/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS =
 tdeinit_LTLIBRARIES = kcmshell.la
 
 kcmshell_la_SOURCES = main.cpp main.skel
-kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
+kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
 kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 noinst_HEADERS = main.h
diff --git a/kconf_update/Makefile.am b/kconf_update/Makefile.am
index 34e03cf8d..afe3864d9 100644
--- a/kconf_update/Makefile.am
+++ b/kconf_update/Makefile.am
@@ -23,7 +23,7 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = kconf_update.la
 
 kconf_update_la_SOURCES = kconf_update.cpp
-kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+kconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
diff --git a/kded/Makefile.am b/kded/Makefile.am
index c91804b4b..a536a0ab3 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -23,11 +23,11 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
 
 kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 kded_la_SOURCES = kded.cpp kdedmodule.cpp
 
 kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
 kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 				kbuildservicefactory.cpp \
 				kbuildservicegroupfactory.cpp \
@@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 
 bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
 
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdontchangethehostname_LDADD = $(LIB_KDECORE) 
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdontchangethehostname_LDADD = $(LIB_TDECORE) 
 kdontchangethehostname_SOURCES = khostname.cpp
 
-kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kmimelist_LDADD = ../kio/libkio.la
 kmimelist_SOURCES = kmimelist.cpp
 
-kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kde_menu_LDADD = $(LIB_KIO)
 kde_menu_SOURCES = kde-menu.cpp
 
diff --git a/kded/test/Makefile.am b/kded/test/Makefile.am
index 788ea1a5f..90a17aa22 100644
--- a/kded/test/Makefile.am
+++ b/kded/test/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kded_test.la
 kded_test_la_SOURCES = test.cpp test.skel
 kded_test_la_METASOURCES = AUTO
 kded_test_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_test_la_LIBADD = $(LIB_KDECORE)
+kded_test_la_LIBADD = $(LIB_TDECORE)
 
 servicesdir = $(kde_servicesdir)/kded
 services_DATA = test.desktop
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index cb5934e88..d5be1e908 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -25,12 +25,12 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
 
 bin_PROGRAMS = makekdewidgets
 makekdewidgets_SOURCES = makekdewidgets.cpp
-makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
 
 kde_widget_LTLIBRARIES = kdewidgets.la
 kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
 
 kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index 608f95b6b..f5aab5ebe 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -11,11 +11,11 @@ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
 kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
 
 kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
+kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
 kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
+kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
 kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = kio_help.h
@@ -24,7 +24,7 @@ kdelnk_DATA = help.protocol ghelp.protocol
 kdelnkdir = $(kde_servicesdir)
 
 bin_PROGRAMS = meinproc 
-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_KDECORE)
+meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_TDECORE)
 meinproc_SOURCES = meinproc.cpp
 
 xslt_pure.o: xslt.cpp
diff --git a/khtml/Makefile.am b/khtml/Makefile.am
index 61e3a5865..51acc5a2d 100644
--- a/khtml/Makefile.am
+++ b/khtml/Makefile.am
@@ -57,7 +57,7 @@ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
 	$(LIBTHAI) \
 	$(top_builddir)/tdeprint/libtdeprint.la  \
 	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
+	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
 
 # init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
 dummy.cpp: $(srcdir)/Makefile.am
diff --git a/khtml/java/Makefile.am b/khtml/java/Makefile.am
index 590d33325..a6b719262 100644
--- a/khtml/java/Makefile.am
+++ b/khtml/java/Makefile.am
@@ -32,6 +32,6 @@ kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \
         kjavadownloader.cpp kjavaappletviewer.cpp
 
 kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
-kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
 
 kde_services_DATA= kjavaappletviewer.desktop
diff --git a/khtml/kmultipart/Makefile.am b/khtml/kmultipart/Makefile.am
index 9cdae7168..b79df405d 100644
--- a/khtml/kmultipart/Makefile.am
+++ b/khtml/kmultipart/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/khtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/
 kde_module_LTLIBRARIES = libkmultipart.la
 
 libkmultipart_la_SOURCES = kmultipart.cpp
-libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBZ)
+libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
 libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
 libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am
index bfdcc38b9..ad833c292 100644
--- a/kimgio/Makefile.am
+++ b/kimgio/Makefile.am
@@ -37,7 +37,7 @@ kimg_xview_la_LIBADD  = $(LIB_QT)
 
 kimg_eps_la_SOURCES = eps.cpp
 kimg_eps_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-kimg_eps_la_LIBADD  = $(LIB_KDECORE) $(LIB_QT)
+kimg_eps_la_LIBADD  = $(LIB_TDECORE) $(LIB_QT)
 
 kimg_ico_la_SOURCES = ico.cpp
 kimg_ico_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index d5b637ee4..b2680ece0 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -131,9 +131,9 @@ tde_add_executable( ${target} AUTOMOC
 
 set( target start_tdeinit )
 
-if( KDEINIT_SETUID )
+if( TDEINIT_SETUID )
   set( _setuid SETUID )
-endif( KDEINIT_SETUID )
+endif( TDEINIT_SETUID )
 
 tde_add_executable( ${target} ${_setuid}
   SOURCES start_tdeinit.c
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
index 952f32a46..ef329980a 100644
--- a/kinit/Makefile.am
+++ b/kinit/Makefile.am
@@ -15,7 +15,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(KDEINIT_XFT_INCLUDES)
+INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(TDEINIT_XFT_INCLUDES)
 
 SUBDIRS = . tests
 
@@ -56,7 +56,7 @@ kwrapper_SOURCES = kwrapper.c
 kwrapper_LDADD = $(LIBSOCKET)
 
 klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
 
 kstartupconfig_SOURCES  = kstartupconfig.cpp
@@ -64,7 +64,7 @@ kstartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
 kdostartupconfig_SOURCES = kdostartupconfig.cpp
 kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                            $(KDE_RPATH)
-kdostartupconfig_LDADD  = $(LIB_KDECORE)
+kdostartupconfig_LDADD  = $(LIB_TDECORE)
 
 start_tdeinit_SOURCES = start_tdeinit.c
 tdeinitpath = $(bindir)/tdeinit
@@ -85,7 +85,7 @@ dummy.cpp:
 	echo > dummy.cpp
 
 install-exec-hook:
-	@if test \${KDEINIT_SETUID} != 0; then \
+	@if test \${TDEINIT_SETUID} != 0; then \
 		(chown 0 $(DESTDIR)$(bindir)/start_tdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_tdeinit) || echo "Please make start_tdeinit setuid root" ; \
 	fi
 
diff --git a/kinit/configure.in.in b/kinit/configure.in.in
index 6330594b6..1d14ee592 100644
--- a/kinit/configure.in.in
+++ b/kinit/configure.in.in
@@ -1,6 +1,6 @@
-KDEINIT_USE_XFT=1
+TDEINIT_USE_XFT=1
 dnl check if Qt is linked against Xft
-KDE_CHECK_LIB(qt-mt,XftInit,[],[KDEINIT_USE_XFT=])
+KDE_CHECK_LIB(qt-mt,XftInit,[],[TDEINIT_USE_XFT=])
 
 dnl Xft requires freetype to compile
 KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
@@ -12,7 +12,7 @@ if test -n "$PKGCONFIG"; then
   if test -n "$vers" && test "$vers" -ge 1000000
   then
      FONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
-     KDEINIT_FONTCONFIG=1
+     TDEINIT_FONTCONFIG=1
   fi
 fi
 
@@ -21,39 +21,39 @@ if test -n "$FONTCONFIG_CONFIG"; then
   if test -n "$vers" && test "$vers" -ge 1000000
   then
      FONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
-     KDEINIT_FONTCONFIG=1
+     TDEINIT_FONTCONFIG=1
   fi
 fi
 
-KDE_FIND_PATH(freetype-config, KDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin])
-if test -n "$KDEINIT_FREETYPE_CONFIG"; then
-    KDEINIT_XFT_INCLUDES="`$KDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS"
+KDE_FIND_PATH(freetype-config, TDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin])
+if test -n "$TDEINIT_FREETYPE_CONFIG"; then
+    TDEINIT_XFT_INCLUDES="`$TDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS"
     tdeinit_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS"
-    KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[KDEINIT_USE_XFT=])
+    CPPFLAGS="$CPPFLAGS $TDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS"
+    KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[TDEINIT_USE_XFT=])
     CPPFLAGS=$tdeinit_cppflags
 else
-    KDEINIT_USE_XFT=
+    TDEINIT_USE_XFT=
 fi
 
-if test -n "$KDEINIT_USE_XFT"; then
-    AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit])
+if test -n "$TDEINIT_USE_XFT"; then
+    AC_DEFINE(TDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit])
 fi
-if test -n "$KDEINIT_FONTCONFIG"; then
-    AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit])
+if test -n "$TDEINIT_FONTCONFIG"; then
+    AC_DEFINE(TDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit])
 fi
-AC_SUBST(KDEINIT_XFT_INCLUDES)
+AC_SUBST(TDEINIT_XFT_INCLUDES)
 
 AC_MSG_CHECKING(whether to make tdeinit setuid root in order to protect it from bad Linux OOM-killer)
 tdeinit_setuid=
 case $target_os in
     linux*)
         AC_MSG_RESULT(yes)
-        KDEINIT_SETUID=1
-        AC_DEFINE(KDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer])
+        TDEINIT_SETUID=1
+        AC_DEFINE(TDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer])
         ;;
     *)  AC_MSG_RESULT(no)
-        KDEINIT_SETUID=0
+        TDEINIT_SETUID=0
         ;;
 esac
-AC_SUBST(KDEINIT_SETUID)
+AC_SUBST(TDEINIT_SETUID)
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 2527dfb56..16e4e60ef 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -97,7 +97,7 @@
 # endif
 #endif
 
-#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
+#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG)
 #include <X11/Xft/Xft.h>
 extern "C" FcBool XftInitFtLibrary (void);
 #include <fontconfig/fontconfig.h>
@@ -386,7 +386,7 @@ TQCString execpath_avoid_loops( const TQCString& exec, int envc, const char* env
      return execpath;
 }
 
-#ifdef KDEINIT_OOM_PROTECT
+#ifdef TDEINIT_OOM_PROTECT
 static int oom_pipe = -1;
 
 static void oom_protect_sighandler( int ) {
@@ -892,7 +892,7 @@ static void init_tdeinit_socket()
      {
         fprintf(stderr, "tdeinit: Shutting down running client.\n");
         klauncher_header request_header;
-        request_header.cmd = LAUNCHER_TERMINATE_KDEINIT;
+        request_header.cmd = LAUNCHER_TERMINATE_TDEINIT;
         request_header.arg_length = 0;
         write(s, &request_header, sizeof(request_header));
         sleep(1); // Give it some time
@@ -1298,7 +1298,7 @@ static void handle_launcher_request(int sock = -1)
        tdeinit_xio_errhandler( 0L );
 #endif
    }
-   else if (request_header.cmd == LAUNCHER_TERMINATE_KDEINIT)
+   else if (request_header.cmd == LAUNCHER_TERMINATE_TDEINIT)
    {
 #ifndef NDEBUG
        fprintf(stderr,"tdeinit: Killing tdeinit/klauncher.\n");
@@ -1401,7 +1401,7 @@ static void handle_requests(pid_t waitForPid)
          int sock = accept(d.wrapper, (struct sockaddr *)&client, &sClient);
          if (sock >= 0)
          {
-#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
+#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG)
             if( FcGetVersion() < 20390 && !FcConfigUptoDate(NULL))
                FcInitReinitialize();
 #endif
@@ -1422,7 +1422,7 @@ static void handle_requests(pid_t waitForPid)
          int sock = accept(d.wrapper_old, (struct sockaddr *)&client, &sClient);
          if (sock >= 0)
          {
-#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
+#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG)
             if( FcGetVersion() < 20390 && !FcConfigUptoDate(NULL))
                FcInitReinitialize();
 #endif
@@ -1708,7 +1708,7 @@ int main(int argc, char **argv, char **envp)
          keep_running = 0;
       if (strcmp(safe_argv[i], "--new-startup") == 0)
          new_startup = 1;
-#ifdef KDEINIT_OOM_PROTECT
+#ifdef TDEINIT_OOM_PROTECT
       if (strcmp(safe_argv[i], "--oom-pipe") == 0 && i+1<argc)
          oom_pipe = atol(argv[i+1]);
 #endif
@@ -1829,7 +1829,7 @@ int main(int argc, char **argv, char **envp)
 #endif
 
    {
-#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
+#if defined(TDEINIT_USE_XFT) && defined(TDEINIT_USE_FONTCONFIG)
       if( FcGetVersion() < 20390 )
       {
         XftInit(0);
@@ -1872,7 +1872,7 @@ int main(int argc, char **argv, char **envp)
          handle_requests(pid);
       }
       else if (safe_argv[i][0] == '-'
-#ifdef KDEINIT_OOM_PROTECT
+#ifdef TDEINIT_OOM_PROTECT
           || isdigit(safe_argv[i][0])
 #endif
           )
diff --git a/kinit/klauncher_cmds.h b/kinit/klauncher_cmds.h
index 11105907b..54b13f45a 100644
--- a/kinit/klauncher_cmds.h
+++ b/kinit/klauncher_cmds.h
@@ -102,11 +102,11 @@ typedef struct
 #define LAUNCHER_TERMINATE_KDE 7
 
 /*
- * LAUNCHER_TERMINATE_KDEINIT
+ * LAUNCHER_TERMINATE_TDEINIT
  *
  * Suicide is painless
  */
-#define LAUNCHER_TERMINATE_KDEINIT	8
+#define LAUNCHER_TERMINATE_TDEINIT	8
 
 #define LAUNCHER_DEBUG_WAIT		9
 /*
diff --git a/kinit/start_tdeinit.c b/kinit/start_tdeinit.c
index 9d2626057..e46aaa49f 100644
--- a/kinit/start_tdeinit.c
+++ b/kinit/start_tdeinit.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef KDEINIT_OOM_PROTECT
+#ifdef TDEINIT_OOM_PROTECT
 
 /*
  Prevent getting killed by bad heuristic in Linux OOM-killer.
diff --git a/kinit/start_tdeinit_wrapper.c b/kinit/start_tdeinit_wrapper.c
index eb26b0387..0328f3e43 100644
--- a/kinit/start_tdeinit_wrapper.c
+++ b/kinit/start_tdeinit_wrapper.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef KDEINIT_OOM_PROTECT
+#ifdef TDEINIT_OOM_PROTECT
 
 /*
  The start_tdeinit wrapper is setuid, which means some shell variables like LD_LIBRARY_PATH
diff --git a/kio/Makefile.am b/kio/Makefile.am
index c2792330a..4a28986ef 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -32,7 +32,7 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
 	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
 	../tdeui/libtdeui.la ../tdesu/libtdesu.la \
 	../kwallet/client/libkwalletclient.la \
-	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 kde_mime_DATA = magic
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp
index 73a960ea0..f297907e0 100644
--- a/kio/kio/kprotocolinfo.cpp
+++ b/kio/kio/kprotocolinfo.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifdef MAKE_KDECORE_LIB //needed for proper linkage (win32)
+#ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
 #undef KIO_EXPORT
 #define KIO_EXPORT KDE_EXPORT
 #endif
@@ -32,7 +32,7 @@
 
 KProtocolInfo* KProtocolInfo::findProtocol(const KURL &url)
 {
-#ifdef MAKE_KDECORE_LIB
+#ifdef MAKE_TDECORE_LIB
    return 0;
 #else
    TQString protocol = url.protocol();
diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h
index 1dad7915f..a3c579034 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/kio/kio/kprotocolinfo.h
@@ -97,7 +97,7 @@ public:
    * the whole URL.
    */
  static bool isKnownProtocol( const TQString& protocol )
-#ifdef KPROTOCOLINFO_KDECORE
+#ifdef KPROTOCOLINFO_TDECORE
   KDE_WEAK_SYMBOL
 #endif
   ;
@@ -226,7 +226,7 @@ public:
    * the whole URL.
    */
  static bool isHelperProtocol( const TQString& protocol )
-#ifdef KPROTOCOLINFO_KDECORE
+#ifdef KPROTOCOLINFO_TDECORE
   KDE_WEAK_SYMBOL
 #endif
   ;
@@ -254,7 +254,7 @@ public:
    * the whole URL.
    */
   static bool isFilterProtocol( const TQString& protocol )
-#ifdef KPROTOCOLINFO_KDECORE
+#ifdef KPROTOCOLINFO_TDECORE
   KDE_WEAK_SYMBOL
 #endif
   ;
diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am
index 98fc1987d..277a62974 100644
--- a/kio/kioexec/Makefile.am
+++ b/kio/kioexec/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
 bin_PROGRAMS = kioexec
 
 kioexec_SOURCES = main.cpp
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kioexec_LDADD   = $(LIB_KIO)
 
 noinst_HEADERS = main.h
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index eb2ee3bc4..863055f61 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am
index 3d05c0003..cfa5a4c3e 100644
--- a/kio/misc/Makefile.am
+++ b/kio/misc/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = kmailservice ktelnetservice
 observer_DIR = $(top_srcdir)/kio/kio
 
 kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
-kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
 kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
@@ -37,12 +37,12 @@ METASOURCES = AUTO
 kde_services_DATA = kio_uiserver.desktop
 
 kmailservice_SOURCES = kmailservice.cpp
-kmailservice_LDADD = $(LIB_KDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmailservice_LDADD = $(LIB_TDECORE)
+kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 ktelnetservice_SOURCES = ktelnetservice.cpp
-ktelnetservice_LDADD = $(LIB_KDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktelnetservice_LDADD = $(LIB_TDEUI)
+ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
index c0ede6f62..ad5a377a2 100644
--- a/kio/misc/kfile/Makefile.am
+++ b/kio/misc/kfile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
 
 bin_PROGRAMS = kfile
 kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kfile_LDADD = $(LIB_KIO)
 
diff --git a/kio/misc/kntlm/Makefile.am b/kio/misc/kntlm/Makefile.am
index 7136310d9..91efaf40f 100644
--- a/kio/misc/kntlm/Makefile.am
+++ b/kio/misc/kntlm/Makefile.am
@@ -8,5 +8,5 @@ kntlminclude_HEADERS = kntlm.h
 
 libkntlm_la_SOURCES = kntlm.cpp des.cpp
 libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libkntlm_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am
index 65047f343..beb6a4b86 100644
--- a/kio/misc/kpac/Makefile.am
+++ b/kio/misc/kpac/Makefile.am
@@ -11,7 +11,7 @@ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
                              downloader.cpp discovery.cpp
 kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
-	$(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIBRESOLV)
+	$(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIBRESOLV)
 
 kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
 kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am
index a9b461159..f3efb2b2c 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/kio/misc/ksendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
 INCLUDES= -I$(srcdir)/.. $(all_includes)
 
 ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 ksendbugmail_LDADD = ../../libkio.la
 
 METASOURCES = AUTO
diff --git a/kio/misc/kssld/Makefile.am b/kio/misc/kssld/Makefile.am
index a87478d65..18193018e 100644
--- a/kio/misc/kssld/Makefile.am
+++ b/kio/misc/kssld/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kss
 kde_module_LTLIBRARIES = kded_kssld.la
 
 kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
 kded_kssld_la_SOURCES = kssld.cpp kssld.skel
 
 METASOURCES = AUTO
diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/kwalletd/Makefile.am
index 6876ba596..1d5b1313c 100644
--- a/kio/misc/kwalletd/Makefile.am
+++ b/kio/misc/kwalletd/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top
 kde_module_LTLIBRARIES = kded_kwalletd.la
 
 kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KDEUI)
+kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
 kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
 
 METASOURCES = AUTO
diff --git a/kio/misc/tdesasl/Makefile.am b/kio/misc/tdesasl/Makefile.am
index d308e6770..4dd36a6d7 100644
--- a/kio/misc/tdesasl/Makefile.am
+++ b/kio/misc/tdesasl/Makefile.am
@@ -8,5 +8,5 @@ tdesaslinclude_HEADERS = tdesasl.h
 
 libtdesasl_la_SOURCES = tdesasl.cpp
 libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
-libtdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+libtdesasl_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h
index 5f0279f34..824b49863 100644
--- a/kio/misc/tdesasl/tdesasl.h
+++ b/kio/misc/tdesasl/tdesasl.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KDESASL_H
-#define KDESASL_H
+#ifndef TDESASL_H
+#define TDESASL_H
 
 #include <tqstring.h>
 
diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am
index 34acd24f6..fe0b6d7ca 100644
--- a/kio/tests/Makefile.am
+++ b/kio/tests/Makefile.am
@@ -18,7 +18,7 @@
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
 LDADD = $(LIB_KIO)
-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
 
 check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
                  kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
diff --git a/kioslave/bzip2/Makefile.am b/kioslave/bzip2/Makefile.am
index 9efd77a4c..9353959ab 100644
--- a/kioslave/bzip2/Makefile.am
+++ b/kioslave/bzip2/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kbzip2filter.la
 
 kbzip2filter_la_SOURCES = kbzip2filter.cpp
-kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
+kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
 kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kde_services_DATA = kbzip2filter.desktop
diff --git a/kioslave/file/Makefile.am b/kioslave/file/Makefile.am
index 0f26c723a..4c06affa8 100644
--- a/kioslave/file/Makefile.am
+++ b/kioslave/file/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 kde_module_LTLIBRARIES = kio_file.la
 
 kio_file_la_SOURCES = file.cc
-kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(ACL_LIBS)
+kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
 kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
 noinst_HEADERS = file.h
 
diff --git a/kioslave/ftp/Makefile.am b/kioslave/ftp/Makefile.am
index eeb5f061c..c062d6430 100644
--- a/kioslave/ftp/Makefile.am
+++ b/kioslave/ftp/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
 kde_module_LTLIBRARIES = kio_ftp.la
 
 kio_ftp_la_SOURCES = ftp.cc
-kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
 kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 
 noinst_HEADERS = ftp.h
diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am
index 578ec1b17..3da565fb7 100644
--- a/kioslave/gzip/Makefile.am
+++ b/kioslave/gzip/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/kio $(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
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kgzipfilter.la
 
 kgzipfilter_la_SOURCES = kgzipfilter.cpp
-kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ) $(LIB_QT) $(LIB_KDECORE)
+kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ) $(LIB_QT) $(LIB_TDECORE)
 kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kde_services_DATA = kgzipfilter.desktop
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
index 117867715..b0f027c1f 100644
--- a/kioslave/http/Makefile.am
+++ b/kioslave/http/Makefile.am
@@ -15,11 +15,11 @@ kde_module_LTLIBRARIES = kio_http.la
 
 kio_http_la_SOURCES = http.cc
 kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_KDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
+kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
 kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
 
 kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
+kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
 
 noinst_HEADERS = http.h
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index 163d618e1..367e10efa 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -13,12 +13,12 @@ kde_module_LTLIBRARIES = kded_kcookiejar.la
 kcookiejar_la_SOURCES = main.cpp
 METASOURCES = AUTO
 kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcookiejar_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+kcookiejar_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 
 kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
 			kcookieserver.skel kcookiewin.cpp 
 kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_X11) $(LIB_KDEUI) $(top_builddir)/kded/libtdeinit_kded.la
+kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_X11) $(LIB_TDEUI) $(top_builddir)/kded/libtdeinit_kded.la
 
 kded_DATA = kcookiejar.desktop
 kdeddir = $(kde_servicesdir)/kded
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am
index 9ac6cb000..d6ae0a17f 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/kioslave/http/kcookiejar/tests/Makefile.am
@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
 
 kcookiejartest_SOURCES = kcookiejartest.cpp 
 kcookiejartest_LDADD   = $(LIB_KIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 check-local: kcookiejartest
 	./kcookiejartest $(srcdir)/cookie.test
diff --git a/kioslave/iso/Makefile.am b/kioslave/iso/Makefile.am
index 8151bec5c..1e6411c4b 100644
--- a/kioslave/iso/Makefile.am
+++ b/kioslave/iso/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 kio_iso_la_METASOURCES=AUTO
 
 kio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
-kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO)
+kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
 
 kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am
index 98b5632f6..29d0d5329 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/kioslave/metainfo/Makefile.am
@@ -2,13 +2,13 @@
 ## Makefile.am of kdebase/kioslave/metainfo
 
 INCLUDES = $(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
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kio_metainfo.la
 
 kio_metainfo_la_SOURCES = metainfo.cpp
-kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
 kio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = metainfo.h 
diff --git a/kmdi/Makefile.am b/kmdi/Makefile.am
index 4bad40aaf..5e176dc17 100644
--- a/kmdi/Makefile.am
+++ b/kmdi/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kmdi/res -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(t
 
 lib_LTLIBRARIES = libkmdi.la
 libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_X11)
+libkmdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
 
 libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
                      kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
diff --git a/kmdi/kmdi/Makefile.am b/kmdi/kmdi/Makefile.am
index 7ca3c5a89..7f16a30dd 100644
--- a/kmdi/kmdi/Makefile.am
+++ b/kmdi/kmdi/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_inc
 
 lib_LTLIBRARIES = libkmdi2.la
 libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+libkmdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
 
 libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
 
diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am
index e9d178f37..50272b343 100644
--- a/knewstuff/Makefile.am
+++ b/knewstuff/Makefile.am
@@ -5,24 +5,24 @@ METASOURCES = AUTO
 lib_LTLIBRARIES = libknewstuff.la
 
 libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
-libknewstuff_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+libknewstuff_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
   knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
 
 bin_PROGRAMS = khotnewstuff
 
-khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 khotnewstuff_LDADD = libknewstuff.la
 khotnewstuff_SOURCES = khotnewstuff.cpp
 
 EXTRA_PROGRAMS = testnewstuff ghns
 
-testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testnewstuff_LDADD   = libknewstuff.la
 testnewstuff_SOURCES = testnewstuff.cpp
 
-ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 ghns_LDADD   = libknewstuff.la
 ghns_SOURCES = ghns.cpp
 
diff --git a/kparts/Makefile.am b/kparts/Makefile.am
index 3eaaa82ab..e4991bbbd 100644
--- a/kparts/Makefile.am
+++ b/kparts/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
 INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl \
 	-I$(top_srcdir)/kfile $(all_includes)
 libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
-libkparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
+libkparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
 check-local:
 	(cd tests && $(MAKE) check )
diff --git a/kresources/Makefile.am b/kresources/Makefile.am
index ca3113b6a..315968e78 100644
--- a/kresources/Makefile.am
+++ b/kresources/Makefile.am
@@ -15,7 +15,7 @@ libkresources_la_SOURCES = resource.cpp \
   configpage.cpp
 
 libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
+libkresources_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
 
 kresincludedir = $(includedir)/kresources
 kresinclude_HEADERS = resource.h \
@@ -32,12 +32,12 @@ kde_module_LTLIBRARIES = kcm_kresources.la
 
 kcm_kresources_la_SOURCES = kcmkresources.cpp
 kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 
 
 check_PROGRAMS = testresources
 
-testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 testresources_LDADD   = libkresources.la
 testresources_SOURCES = testresources.cpp
 
diff --git a/kspell2/plugins/aspell/Makefile.am b/kspell2/plugins/aspell/Makefile.am
index dca63b51d..b3eb64f33 100644
--- a/kspell2/plugins/aspell/Makefile.am
+++ b/kspell2/plugins/aspell/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kspell_aspell.la
 kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
 
 kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_KDECORE)
+kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
 
 service_DATA = kspell_aspell.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/hspell/Makefile.am b/kspell2/plugins/hspell/Makefile.am
index e45ae1aae..ebc78472a 100644
--- a/kspell2/plugins/hspell/Makefile.am
+++ b/kspell2/plugins/hspell/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kspell_hspell.la
 kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
 
 kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_KDECORE)
+kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
 
 service_DATA = kspell_hspell.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/ispell/Makefile.am b/kspell2/plugins/ispell/Makefile.am
index 6bbaab94a..2605fe249 100644
--- a/kspell2/plugins/ispell/Makefile.am
+++ b/kspell2/plugins/ispell/Makefile.am
@@ -18,7 +18,7 @@ kspell_ispell_la_SOURCES = kspell_ispellclient.cpp kspell_ispelldict.cpp \
 	ispell_checker.cpp
 
 kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_KDECORE)
+kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_TDECORE)
 
 service_DATA = kspell_ispell.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kspell2/tests/Makefile.am b/kspell2/tests/Makefile.am
index 7ab5943d3..b47c45927 100644
--- a/kspell2/tests/Makefile.am
+++ b/kspell2/tests/Makefile.am
@@ -6,19 +6,19 @@ check_PROGRAMS = test test_filter backgroundtest \
 	test_dialog test_highlighter test_configdialog
 
 test_SOURCES = test.cpp
-test_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+test_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
 
 test_filter_SOURCES = test_filter.cpp
-test_filter_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+test_filter_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
 
 backgroundtest_SOURCES = backgroundtest.cpp
-backgroundtest_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+backgroundtest_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
 
 test_dialog_SOURCES = test_dialog.cpp
-test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
+test_dialog_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
 
 test_highlighter_SOURCES = test_highlighter.cpp
-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
+test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
 
 test_configdialog_SOURCES = test_configdialog.cpp
-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
+test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
diff --git a/kspell2/ui/Makefile.am b/kspell2/ui/Makefile.am
index 4fa9a4cf3..bc1fe608b 100644
--- a/kspell2/ui/Makefile.am
+++ b/kspell2/ui/Makefile.am
@@ -18,4 +18,4 @@ dialog.lo: kspell2ui.h
 
 libkspell2_la_SOURCES = dialog.cpp
 libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la  $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE)
+libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE)
diff --git a/kstyles/highcontrast/config/Makefile.am b/kstyles/highcontrast/config/Makefile.am
index e94d5a46c..7aa7535a2 100644
--- a/kstyles/highcontrast/config/Makefile.am
+++ b/kstyles/highcontrast/config/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
 noinst_HEADERS = highcontrastconfig.h
 kde_module_LTLIBRARIES = kstyle_highcontrast_config.la
 kstyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE)
+kstyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE)
 kstyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
 kstyle_highcontrast_config_la_METASOURCES = AUTO
 
diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am
index 87e68132b..83e1d4a03 100644
--- a/kstyles/keramik/Makefile.am
+++ b/kstyles/keramik/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
 
 genembed_SOURCES = genembed.cpp
 genembed_LDADD = ../../tdefx/libtdefx.la
-genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
 	 pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\
diff --git a/kstyles/klegacy/Makefile.am b/kstyles/klegacy/Makefile.am
index 872ccd75d..9bdee9267 100644
--- a/kstyles/klegacy/Makefile.am
+++ b/kstyles/klegacy/Makefile.am
@@ -3,6 +3,6 @@ INCLUDES= $(all_includes)
 noinst_HEADERS = klegacystyle.h
 lib_LTLIBRARIES = klegacystyle.la
 klegacystyle_la_LDFLAGS = $(all_libraries) -module  -avoid-version -no-undefined 
-klegacystyle_la_LIBADD = $(LIB_KDECORE) 
+klegacystyle_la_LIBADD = $(LIB_TDECORE) 
 klegacystyle_la_SOURCES = klegacystyle.cpp plugin.cpp
 klegacystyle_la_METASOURCES = AUTO
diff --git a/kstyles/plastik/config/Makefile.am b/kstyles/plastik/config/Makefile.am
index aeae1c5e5..887c7ea89 100644
--- a/kstyles/plastik/config/Makefile.am
+++ b/kstyles/plastik/config/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
 noinst_HEADERS = plastikconf.h
 kde_module_LTLIBRARIES = kstyle_plastik_config.la
 kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_plastik_config_la_LIBADD  = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+kstyle_plastik_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
 kstyle_plastik_config_la_SOURCES = plastikconf.cpp
 kstyle_plastik_config_la_METASOURCES = AUTO
 
diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am
index f2f88dbbc..2d7fab839 100644
--- a/kstyles/utils/installtheme/Makefile.am
+++ b/kstyles/utils/installtheme/Makefile.am
@@ -10,9 +10,9 @@ bin_PROGRAMS = 	kinstalltheme
 kinstalltheme_SOURCES = main.cpp 
 
 # the library search path. 
-kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
-kinstalltheme_LDADD = $(LIB_QT) $(LIB_KDECORE)
+kinstalltheme_LDADD = $(LIB_QT) $(LIB_TDECORE)
 
diff --git a/kstyles/web/Makefile.am b/kstyles/web/Makefile.am
index daa26a19d..4047973e1 100644
--- a/kstyles/web/Makefile.am
+++ b/kstyles/web/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES              = $(all_includes)
 lib_LTLIBRARIES       = webstyle.la
 webstyle_la_LDFLAGS   = $(all_libraries) -module -avoid-version -no-undefined 
-webstyle_la_LIBADD    = $(LIB_KDEUI)
+webstyle_la_LIBADD    = $(LIB_TDEUI)
 webstyle_la_SOURCES   = webstyle.cpp plugin.cpp
 noinst_HEADERS        = webstyle.h 
 
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am
index e8702425c..9ce5040d7 100644
--- a/kunittest/Makefile.am
+++ b/kunittest/Makefile.am
@@ -4,14 +4,14 @@ METASOURCES = AUTO
 lib_LTLIBRARIES = libkunittest.la
 libkunittest_la_SOURCES = runner.cpp tester.cpp
 libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
-libkunittest_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+libkunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 libkunittestinclude_HEADERS = runner.h tester.h module.h
 libkunittestincludedir = $(includedir)/kunittest
 
 bin_PROGRAMS = kunittestmodrunner
-kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kunittestmodrunner_LDADD = libkunittest.la $(LIB_KDECORE)
+kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kunittestmodrunner_LDADD = libkunittest.la $(LIB_TDECORE)
 kunittestmodrunner_SOURCES = modrunner.cpp
 
 # The check_ target makes sure we don't install the modules,
diff --git a/kutils/Makefile.am b/kutils/Makefile.am
index 5377b6cf5..d8ebcf156 100644
--- a/kutils/Makefile.am
+++ b/kutils/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
 lib_LTLIBRARIES   = libkutils.la
 libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 # Needs KTrader
-libkutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_X11)
+libkutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
 
 libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
                        kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp \
diff --git a/kwallet/client/Makefile.am b/kwallet/client/Makefile.am
index 2aba4cb8d..8ea320dc7 100644
--- a/kwallet/client/Makefile.am
+++ b/kwallet/client/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir) $(all_includes)
 lib_LTLIBRARIES = libkwalletclient.la
 
 libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
-libkwalletclient_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libkwalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 libkwalletclient_la_SOURCES =   kwallet.skel \
 				kwallet.cc
 
diff --git a/kwallet/tests/Makefile.am b/kwallet/tests/Makefile.am
index cdcec5859..d3d9ecb99 100644
--- a/kwallet/tests/Makefile.am
+++ b/kwallet/tests/Makefile.am
@@ -6,15 +6,15 @@ check_PROGRAMS = kwalletasync kwalletsync kwalletboth
 kwalletasync_SOURCES = kwalletasync.cpp kwallettest.cpp
 kwalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
 kwalletasync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_KDECORE) $(LIB_QT)
+	$(LIB_TDECORE) $(LIB_QT)
 
 kwalletsync_SOURCES = kwalletsync.cpp
 kwalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
 kwalletsync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_KDECORE) $(LIB_QT)
+	$(LIB_TDECORE) $(LIB_QT)
 
 kwalletboth_SOURCES = kwalletboth.cpp kwallettest.cpp
 kwalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
 kwalletboth_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_KDECORE) $(LIB_QT)
+	$(LIB_TDECORE) $(LIB_QT)
 INCLUDES = -I$(top_srcdir)/kwallet/client
diff --git a/libkscreensaver/Makefile.am b/libkscreensaver/Makefile.am
index b3b314748..36e5b999b 100644
--- a/libkscreensaver/Makefile.am
+++ b/libkscreensaver/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libkscreensaver.la
 libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
-libkscreensaver_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE) $(LIB_X11)
+libkscreensaver_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
 if undefined_symbols_allowed
 libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
 else
diff --git a/networkstatus/Makefile.am b/networkstatus/Makefile.am
index e495f7910..310356258 100644
--- a/networkstatus/Makefile.am
+++ b/networkstatus/Makefile.am
@@ -7,18 +7,18 @@ INCLUDES = -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = kded_networkstatus.la 
 lib_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la
 
-libnetworkstatus_la_LIBADD = $(LIB_KDECORE)
+libnetworkstatus_la_LIBADD = $(LIB_TDECORE)
 libnetworkstatus_la_LDFLAGS = $(all_libraries)
 libnetworkstatus_la_SOURCES = networkstatuscommon.cpp
 
-libconnectionmanager_la_LIBADD = $(LIB_KDECORE)
+libconnectionmanager_la_LIBADD = $(LIB_TDECORE)
 libconnectionmanager_la_LDFLAGS = $(all_libraries)
 libconnectionmanager_la_SOURCES = connectionmanager.cpp networkstatusindicator.cpp connectionmanager.skel clientiface.stub networkstatusiface.stub
 
 kded_networkstatus_la_SOURCES = networkstatus.cpp networkstatus.skel \
 	clientiface.skel serviceiface.skel network.cpp
 #kclientiface.skel serviceiface.skel
-kded_networkstatus_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) ./libnetworkstatus.la
+kded_networkstatus_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) ./libnetworkstatus.la
 kded_networkstatus_la_LDFLAGS = $(all_libraries) -module -avoid-version 
 
 servicesdir = $(kde_servicesdir)/kded
diff --git a/pics/Makefile.am b/pics/Makefile.am
index db7b3e33b..6d7eebc3b 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -9,8 +9,8 @@ endif
 bin_PROGRAMS = $(KSVGTOPNG)
 
 ksvgtopng_SOURCES = ksvgtopng.cpp
-ksvgtopng_LDADD =  $(LIB_KDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
-ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksvgtopng_LDADD =  $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
+ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 install-data-local:
 	-rm -f $(DESTDIR)$(kde_icondir)/default.kde
diff --git a/tdecore/fakes.c b/tdecore/fakes.c
index 14f162eca..b64f55d25 100644
--- a/tdecore/fakes.c
+++ b/tdecore/fakes.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
+TDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
     int i;
     char * a;
 
@@ -75,7 +75,7 @@ KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
 extern char ** environ;
 #endif
 
-KDECORE_EXPORT void unsetenv (name)
+TDECORE_EXPORT void unsetenv (name)
      const char *name;
 {
   size_t len;
@@ -186,7 +186,7 @@ int seteuid(uid_t euid)
 
    Returns a file descriptor open on the file for reading and writing.  */
 
-KDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
+TDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
 {
   static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
   char *XXXXXX;
@@ -238,7 +238,7 @@ KDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
 #endif /* !HAVE_MKSTEMPS */
 
 #ifndef HAVE_MKSTEMP
-KDECORE_EXPORT int mkstemp (char* _template)
+TDECORE_EXPORT int mkstemp (char* _template)
 {
   return mkstemps( _template, 0 );
 }
@@ -265,7 +265,7 @@ KDECORE_EXPORT int mkstemp (char* _template)
 
    Returns a file descriptor open on the file for reading and writing.  */
 
-KDECORE_EXPORT char* mkdtemp (char* _template)
+TDECORE_EXPORT char* mkdtemp (char* _template)
 {
   static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
   char *XXXXXX;
@@ -315,7 +315,7 @@ KDECORE_EXPORT char* mkdtemp (char* _template)
 #ifndef ENOTSUP
 #define ENOTSUP 134 /* Not supported */
 #endif
-KDECORE_EXPORT int revoke(const char *tty)
+TDECORE_EXPORT int revoke(const char *tty)
 {
         errno = ENOTSUP;
         return -1;
@@ -324,7 +324,7 @@ KDECORE_EXPORT int revoke(const char *tty)
 
 #ifndef HAVE_STRLCPY
 #include <string.h>
-KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
+TDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
 {
     unsigned long len, ret = strlen(s);
 
@@ -343,7 +343,7 @@ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsi
 
 #ifndef HAVE_STRLCAT
 #include <string.h>
-KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
+TDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
 {
     char *cp;
     unsigned long ret, len1, len2 = strlen(s);
diff --git a/tdecore/kaboutdata.h b/tdecore/kaboutdata.h
index 3165c89d9..b9eceb678 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/kaboutdata.h
@@ -51,7 +51,7 @@ class KAboutDataPrivate;
  *   KCmdLineArgs::init(argc, argv, &about);
  * \endcode
  */
-class KDECORE_EXPORT KAboutPerson
+class TDECORE_EXPORT KAboutPerson
 {
 public:
     /**
@@ -131,7 +131,7 @@ class KAboutTranslatorPrivate;
  * translator information is generated dynamically from the translation
  * of a dummy string.
 */
-class KDECORE_EXPORT KAboutTranslator
+class TDECORE_EXPORT KAboutTranslator
 {
 public:
     /**
@@ -179,7 +179,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/tdecore/kaccel.h b/tdecore/kaccel.h
index 7bdf9e0e7..b223be9bb 100644
--- a/tdecore/kaccel.h
+++ b/tdecore/kaccel.h
@@ -90,7 +90,7 @@ class KAccelPrivate;
  * @see KKeyDialog
  */
 
-class KDECORE_EXPORT KAccel : public TQAccel
+class TDECORE_EXPORT KAccel : public TQAccel
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h
index d55e4517c..470c70559 100644
--- a/tdecore/kaccelaction.h
+++ b/tdecore/kaccelaction.h
@@ -69,7 +69,7 @@ class KConfigBase;
  * @see KKeyChooser
  * @see KKeyDialog
  */
-class KDECORE_EXPORT KAccelAction
+class TDECORE_EXPORT KAccelAction
 {
  public:
         /**
@@ -366,7 +366,7 @@ class KDECORE_EXPORT KAccelAction
  * @short A collection of accelerator actions
  * @see KAccelAction
  */
-class KDECORE_EXPORT KAccelActions
+class TDECORE_EXPORT KAccelActions
 {
  public:
        /**
diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h
index 07e3f4833..082f09324 100644
--- a/tdecore/kaccelbase.h
+++ b/tdecore/kaccelbase.h
@@ -118,7 +118,7 @@ class TQWidget;
  * @short Configurable key binding support.
  */
 
-class KDECORE_EXPORT KAccelBase
+class TDECORE_EXPORT KAccelBase
 {
  public:
 	/** Initialization mode of the KAccelBase, used in constructor. */
diff --git a/tdecore/kaccelmanager.h b/tdecore/kaccelmanager.h
index 21655fd9c..69846dad2 100644
--- a/tdecore/kaccelmanager.h
+++ b/tdecore/kaccelmanager.h
@@ -37,7 +37,7 @@ class TQString;
  * @since 3.1
 */
 
-class KDECORE_EXPORT KAcceleratorManager
+class TDECORE_EXPORT KAcceleratorManager
 {
 public:
 
diff --git a/tdecore/kaccelprivate.h b/tdecore/kaccelprivate.h
index 0a6cdc19b..8d009b950 100644
--- a/tdecore/kaccelprivate.h
+++ b/tdecore/kaccelprivate.h
@@ -9,7 +9,7 @@ class KAccelAction;
 /**
  * @internal
  */
-class KDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
+class TDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/kallocator.h b/tdecore/kallocator.h
index 2fed42c85..2d5d39f2a 100644
--- a/tdecore/kallocator.h
+++ b/tdecore/kallocator.h
@@ -43,7 +43,7 @@ class KZoneAllocatorPrivate;
  * memory though.
  * @author Waldo Bastian <bastian@kde.org>, Michael Matz <matz@kde.org>
  */
-class KDECORE_EXPORT KZoneAllocator
+class TDECORE_EXPORT KZoneAllocator
 {
 public:
     /**
diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h
index 448f08d66..76e62ca64 100644
--- a/tdecore/kappdcopiface.h
+++ b/tdecore/kappdcopiface.h
@@ -34,7 +34,7 @@ dcop interface to all KDE applications that use it.
 @short DCOP interface to KApplication.
 @author Ian Reinhart Geiser <geiseri@yahoo.com>
 */
-class KDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
+class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
 {
 K_DCOP
 
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 9fdcfbcb9..6fad03069 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -200,7 +200,7 @@ static int x11_error(Display *dpy, XErrorEvent *ev) {
 
 // duplicated from patched Qt, so that there won't be unresolved symbols if Qt gets
 // replaced by unpatched one
-KDECORE_EXPORT bool qt_qclipboard_bailout_hack = false;
+TDECORE_EXPORT bool qt_qclipboard_bailout_hack = false;
 
 template class TQPtrList<KSessionManaged>;
 
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index f1be3bfb8..bec523a0b 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -93,7 +93,7 @@ class KApplicationPrivate;
 * @short Controls and provides information to all KDE applications.
 * @author Matthias Kalle Dalheimer <kalle@kde.org>
 */
-class KDECORE_EXPORT KApplication : public TQApplication, public KInstance
+class TDECORE_EXPORT KApplication : public TQApplication, public KInstance
 {
 
   Q_OBJECT
@@ -1562,7 +1562,7 @@ private:
  * @param mode     The access mode, as in the access() system call.
  * @return Whether the access is allowed, true = Access allowed
  */
-KDECORE_EXPORT bool checkAccess(const TQString& pathname, int mode);
+TDECORE_EXPORT bool checkAccess(const TQString& pathname, int mode);
 
 class KSessionManagedPrivate;
 
@@ -1582,7 +1582,7 @@ class KSessionManagedPrivate;
   @short Highlevel access to session management.
   @author Matthias Ettrich <ettrich@kde.org>
  */
-class KDECORE_EXPORT KSessionManaged
+class TDECORE_EXPORT KSessionManaged
 {
 public:
   KSessionManaged();
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index ad2fe1e30..f72bbffd2 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -39,7 +39,7 @@ class KAsyncIOPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short Asynchronous I/O support
  */
-class KDECORE_EXPORT KAsyncIO:
+class TDECORE_EXPORT KAsyncIO:
 #ifdef USE_QT4
 #else // USE_QT4
 public TQObject,
diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h
index 81ca2cdf7..f9a8c0ca8 100644
--- a/tdecore/kaudioplayer.h
+++ b/tdecore/kaudioplayer.h
@@ -53,7 +53,7 @@ class KAudioPlayerPrivate;
  *
  */
 //REVISED: hausmann
-class KDECORE_EXPORT KAudioPlayer : public TQObject {
+class TDECORE_EXPORT KAudioPlayer : public TQObject {
 Q_OBJECT
 public:
 	/**
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index abdb68f80..8c53d0676 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -53,7 +53,7 @@ class KBufferedIOPrivate;
  * @author Thiago Macieira <thiagom@mail.com>
  * @short Buffered I/O
  */
-class KDECORE_EXPORT KBufferedIO: public KAsyncIO
+class TDECORE_EXPORT KBufferedIO: public KAsyncIO
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/kcalendarsystem.h b/tdecore/kcalendarsystem.h
index 826539a65..1fbfb017c 100644
--- a/tdecore/kcalendarsystem.h
+++ b/tdecore/kcalendarsystem.h
@@ -39,7 +39,7 @@ class KCalendarSystemPrivate;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystem
+class TDECORE_EXPORT KCalendarSystem
 {
 public:
   /**
diff --git a/tdecore/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h
index 0ceae43b9..3517d4c86 100644
--- a/tdecore/kcalendarsystemfactory.h
+++ b/tdecore/kcalendarsystemfactory.h
@@ -33,7 +33,7 @@ class KLocale;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemFactory
+class TDECORE_EXPORT KCalendarSystemFactory
 {
 public:
   KCalendarSystemFactory ();
diff --git a/tdecore/kcalendarsystemgregorian.h b/tdecore/kcalendarsystemgregorian.h
index b116c40f4..98fd10e90 100644
--- a/tdecore/kcalendarsystemgregorian.h
+++ b/tdecore/kcalendarsystemgregorian.h
@@ -40,7 +40,7 @@ class KCalendarSystemGregorianPrivate;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemGregorian: public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemGregorian: public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcalendarsystemhebrew.h b/tdecore/kcalendarsystemhebrew.h
index ec0d82ba2..728954c58 100644
--- a/tdecore/kcalendarsystemhebrew.h
+++ b/tdecore/kcalendarsystemhebrew.h
@@ -42,7 +42,7 @@ class KCalendarSystemHebrewPrivate;
  * @author Hans Petter Bieker <bieker@kde.org>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemHebrew : public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemHebrew : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcalendarsystemhijri.h b/tdecore/kcalendarsystemhijri.h
index 214b7a50a..444f938c7 100644
--- a/tdecore/kcalendarsystemhijri.h
+++ b/tdecore/kcalendarsystemhijri.h
@@ -40,7 +40,7 @@ class KCalendarSystemHijriPrivate;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemHijri : public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemHijri : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcalendarsystemjalali.h b/tdecore/kcalendarsystemjalali.h
index e7ec99fe3..e5dd56681 100644
--- a/tdecore/kcalendarsystemjalali.h
+++ b/tdecore/kcalendarsystemjalali.h
@@ -33,7 +33,7 @@ class KCalendarSystemJalaliPrivate;
 /**
  Jalali calendar type implementation
 */
-class KDECORE_EXPORT KCalendarSystemJalali : public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemJalali : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcatalogue.h b/tdecore/kcatalogue.h
index 0658b9000..2cee80feb 100644
--- a/tdecore/kcatalogue.h
+++ b/tdecore/kcatalogue.h
@@ -34,7 +34,7 @@ class KCataloguePrivate;
  * @see KLocale
  */
 //REVISED: hausmann
-class KDECORE_EXPORT KCatalogue
+class TDECORE_EXPORT KCatalogue
 {
 public:
   /**
diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h
index 32c91148a..d3b4eec41 100644
--- a/tdecore/kcharsets.h
+++ b/tdecore/kcharsets.h
@@ -40,7 +40,7 @@ class TQTextCodec;
  *
  * @author Lars Knoll <knoll@kde.org>
  */
-class KDECORE_EXPORT KCharsets
+class TDECORE_EXPORT KCharsets
 {
     friend class KGlobal;
 
diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h
index 6a9439be6..7f25b4380 100644
--- a/tdecore/kcheckaccelerators.h
+++ b/tdecore/kcheckaccelerators.h
@@ -63,7 +63,7 @@ class TQTextView;
  there are shown all conflicts grouped by accelerator, and a list of all used
  accelerators.
 */
-class KDECORE_EXPORT KCheckAccelerators : public TQObject
+class TDECORE_EXPORT KCheckAccelerators : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index 9432d70aa..bd6605b6b 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -33,7 +33,7 @@
  * @since 3.1
  * @internal
  */
-class KDECORE_EXPORT KClipboardSynchronizer : public TQObject
+class TDECORE_EXPORT KClipboardSynchronizer : public TQObject
 {
     Q_OBJECT
 
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index b4386c629..08a2a6614 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -37,7 +37,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
@@ -219,7 +219,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/tdecore/kcompletion.h b/tdecore/kcompletion.h
index f6c8f0f82..e6ac36758 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -129,7 +129,7 @@ class TQPopupMenu;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDECORE_EXPORT KCompletion : public TQObject
+class TDECORE_EXPORT KCompletion : public TQObject
 {
     Q_ENUMS( CompOrder )
     Q_PROPERTY( CompOrder order READ order WRITE setOrder )
@@ -612,7 +612,7 @@ class KCompletionMatchesPrivate;
  *
  * @short List for keeping matches returned from KCompletion
  */
-class KDECORE_EXPORT KCompletionMatches : public KCompletionMatchesList
+class TDECORE_EXPORT KCompletionMatches : public KCompletionMatchesList
 {
 public:
     KCompletionMatches( bool sort );
@@ -660,7 +660,7 @@ private:
  * @short An abstract class for adding text completion support to widgets.
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KDECORE_EXPORT KCompletionBase
+class TDECORE_EXPORT KCompletionBase
 {
 public:
     /**
diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h
index 1ce613faa..fcfea7243 100644
--- a/tdecore/kcompletion_private.h
+++ b/tdecore/kcompletion_private.h
@@ -31,7 +31,7 @@ class KCompTreeNode;
 /**
  * @internal
  */
-class KDECORE_EXPORT KCompTreeNodeList
+class TDECORE_EXPORT KCompTreeNodeList
 {
 public:
     KCompTreeNodeList() : first(0), last(0), m_count(0) {}
@@ -81,7 +81,7 @@ typedef KCompTreeNodeList KCompTreeChildren;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @internal
  */
-class KDECORE_EXPORT KCompTreeNode : public TQChar
+class TDECORE_EXPORT KCompTreeNode : public TQChar
 {
 public:
     KCompTreeNode() : TQChar(), myWeight(0) {}
@@ -146,7 +146,7 @@ typedef KSortableValueList<TQString> KCompletionMatchesList;
 /**
  * @internal
  */
-class KDECORE_EXPORT KCompletionMatchesWrapper
+class TDECORE_EXPORT KCompletionMatchesWrapper
 {
 public:
     KCompletionMatchesWrapper( bool sort = false )
diff --git a/tdecore/kconfig.h b/tdecore/kconfig.h
index 19ff09314..e3eb52f64 100644
--- a/tdecore/kconfig.h
+++ b/tdecore/kconfig.h
@@ -40,7 +40,7 @@ class KConfigPrivate;
 * @see KGlobal::config(), KConfigBase, KSimpleConfig
 * @short KDE Configuration Management class
 */
-class KDECORE_EXPORT KConfig : public KConfigBase
+class TDECORE_EXPORT KConfig : public KConfigBase
 {
   Q_OBJECT
 
@@ -270,7 +270,7 @@ private:
  * KSharedConfig provides a reference counted, shared memory variant
  * of KConfig.
  */
-class KDECORE_EXPORT KSharedConfig : public KConfig, public KShared
+class TDECORE_EXPORT KSharedConfig : public KConfig, public KShared
 {
   friend class TQValueList<KSharedConfig*>;
 public:
diff --git a/tdecore/kconfig_compiler/Makefile.am b/tdecore/kconfig_compiler/Makefile.am
index d7b1400a4..5a3b0f2e8 100644
--- a/tdecore/kconfig_compiler/Makefile.am
+++ b/tdecore/kconfig_compiler/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 
 bin_PROGRAMS = kconfig_compiler
 
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kconfig_compiler_LDADD = $(LIB_KDECORE)
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kconfig_compiler_LDADD = $(LIB_TDECORE)
 kconfig_compiler_SOURCES = kconfig_compiler.cpp
 
 TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/kconfig_compiler/example/Makefile.am
index 9c0454ad8..5009a3e6a 100644
--- a/tdecore/kconfig_compiler/example/Makefile.am
+++ b/tdecore/kconfig_compiler/example/Makefile.am
@@ -3,12 +3,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 check_PROGRAMS = example # autoexample
 EXTRA_PROGRAMS = autoexample
 
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-example_LDADD = $(LIB_KDECORE)
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+example_LDADD = $(LIB_TDECORE)
 example_SOURCES = example.cpp exampleprefs_base.cpp
 
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
 autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
   autoexample.cpp  
 
diff --git a/tdecore/kconfig_compiler/tests/Makefile.am b/tdecore/kconfig_compiler/tests/Makefile.am
index 0b47449fa..9462c800b 100644
--- a/tdecore/kconfig_compiler/tests/Makefile.am
+++ b/tdecore/kconfig_compiler/tests/Makefile.am
@@ -14,44 +14,44 @@ CLEANFILES = test1.cpp test1.h \
 						 test_dpointer.cpp test_dpointer.h \
              md5sums
 
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test1_LDADD = $(LIB_KDECORE)
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test1_LDADD = $(LIB_TDECORE)
 test1_SOURCES = test1main.cpp test1.cpp
 
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test2_LDADD = $(LIB_KDECORE)
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test2_LDADD = $(LIB_TDECORE)
 test2_SOURCES = test2main.cpp test2.cpp
 
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test3_LDADD = $(LIB_KDECORE)
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test3_LDADD = $(LIB_TDECORE)
 test3_SOURCES = test3main.cpp test3.cpp
 
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test4_LDADD = $(LIB_KDECORE)
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test4_LDADD = $(LIB_TDECORE)
 test4_SOURCES = test4main.cpp test4.cpp
 
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test5_LDADD = $(LIB_KDECORE)
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test5_LDADD = $(LIB_TDECORE)
 test5_SOURCES = test5main.cpp test5.cpp
 
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test6_LDADD = $(LIB_KDECORE)
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test6_LDADD = $(LIB_TDECORE)
 test6_SOURCES = test6main.cpp test6.cpp
 
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test7_LDADD = $(LIB_KDECORE)
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test7_LDADD = $(LIB_TDECORE)
 test7_SOURCES = test7main.cpp test7.cpp
 
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test8_LDADD = $(LIB_KDECORE)
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test8_LDADD = $(LIB_TDECORE)
 test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
 
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test9_LDADD = $(LIB_KDECORE)
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test9_LDADD = $(LIB_TDECORE)
 test9_SOURCES = test9main.cpp test9.cpp
 
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test_dpointer_LDADD = $(LIB_KDECORE)
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_dpointer_LDADD = $(LIB_TDECORE)
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
 
 check_LTLIBRARIES = kunittest_kconfigcompiler_test.la
diff --git a/tdecore/kconfigbackend.h b/tdecore/kconfigbackend.h
index 3b2418330..cb0947203 100644
--- a/tdecore/kconfigbackend.h
+++ b/tdecore/kconfigbackend.h
@@ -45,7 +45,7 @@ class KConfigBackEndPrivate;
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  * @short KDE Configuration file loading/saving abstract base class
  */
-class KDECORE_EXPORT KConfigBackEnd
+class TDECORE_EXPORT KConfigBackEnd
 {
   friend class KConfig;
   friend class KSharedConfig;
@@ -188,7 +188,7 @@ protected:
  * @author Preston Brown <pbrown@kde.org>,
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  */
-class KDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd
+class TDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd
 {
 
 public:
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 4f3dd545b..13d2a1761 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -67,7 +67,7 @@ class KConfigGroup;
  * @see KSimpleConfig
  * @see KSharedConfig
  */
-class KDECORE_EXPORT KConfigBase : public TQObject
+class TDECORE_EXPORT KConfigBase : public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
@@ -2056,7 +2056,7 @@ class KConfigGroupSaverPrivate;
   * @short Helper class for easier use of KConfig/KSimpleConfig groups
   */
 
-class KDECORE_EXPORT KConfigGroupSaver // KDE4 remove
+class TDECORE_EXPORT KConfigGroupSaver // KDE4 remove
 {
 public:
   /**
@@ -2100,7 +2100,7 @@ class KConfigGroupPrivate;
 /**
  * A KConfigBase derived class for one specific group in a KConfig object.
  */
-class KDECORE_EXPORT KConfigGroup: public KConfigBase
+class TDECORE_EXPORT KConfigGroup: public KConfigBase
 {
 public:
    /**
diff --git a/tdecore/kconfigdata.h b/tdecore/kconfigdata.h
index e514b2781..940c54305 100644
--- a/tdecore/kconfigdata.h
+++ b/tdecore/kconfigdata.h
@@ -29,7 +29,7 @@
  * map/dict/list config node entry.
  * @internal
  */
-struct KDECORE_EXPORT KEntry
+struct TDECORE_EXPORT KEntry
 {
   KEntry()
     : mValue(0), bDirty(false), bNLS(false), 
@@ -66,7 +66,7 @@ struct KDECORE_EXPORT KEntry
  * to which it belongs.
  * @internal
  */
-struct KDECORE_EXPORT KEntryKey
+struct TDECORE_EXPORT KEntryKey
 {
   KEntryKey(const TQCString& _group = 0,
 	    const TQCString& _key = 0)
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h
index d0b385b60..3c268e487 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/kconfigdialogmanager.h
@@ -75,7 +75,7 @@ class TQSqlPropertyMap;
  * @author Benjamin C Meyer <ben+kdelibs at meyerhome dot net>
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KConfigDialogManager : public TQObject {
+class TDECORE_EXPORT KConfigDialogManager : public TQObject {
 
 Q_OBJECT
 
diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h
index c3e9f4a57..a43327da1 100644
--- a/tdecore/kconfigskeleton.h
+++ b/tdecore/kconfigskeleton.h
@@ -47,7 +47,7 @@
    * addItem() functions of KConfigSkeleton instead. If you subclass this class you will
    * have to register instances with the function KConfigSkeleton::addItem().
    */
-  class KDECORE_EXPORT KConfigSkeletonItem
+  class TDECORE_EXPORT KConfigSkeletonItem
   {
   public:
     typedef TQValueList < KConfigSkeletonItem * >List;
@@ -362,14 +362,14 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
    * subclasses yourself, but you can use \ref kconfig_compiler to automatically
    * generate the C++ code from an XML description of the configuration options.
    */
-class KDECORE_EXPORT KConfigSkeleton
+class TDECORE_EXPORT KConfigSkeleton
 {
 public:
 
   /**
    * Class for handling a string preferences item.
    */
-  class KDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString >
+  class TDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString >
   {
   public:
     enum Type { Normal, Password, Path };
@@ -391,7 +391,7 @@ public:
   /**
    * Class for handling a password preferences item.
    */
-  class KDECORE_EXPORT ItemPassword:public ItemString
+  class TDECORE_EXPORT ItemPassword:public ItemString
   {
   public:
     ItemPassword(const TQString & group, const TQString & key,
@@ -402,7 +402,7 @@ public:
   /**
    * Class for handling a path preferences item.
    */
-  class KDECORE_EXPORT ItemPath:public ItemString
+  class TDECORE_EXPORT ItemPath:public ItemString
   {
   public:
     ItemPath(const TQString & group, const TQString & key,
@@ -414,7 +414,7 @@ public:
   /**
    * Class for handling a TQVariant preferences item.
    */
-  class KDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant >
+  class TDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant >
   {
   public:
     ItemProperty(const TQString & group, const TQString & key,
@@ -429,7 +429,7 @@ public:
   /**
    * Class for handling a bool preferences item.
    */
-  class KDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool >
+  class TDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool >
   {
   public:
     ItemBool(const TQString & group, const TQString & key, bool & reference,
@@ -444,7 +444,7 @@ public:
   /**
    * Class for handling an integer preferences item.
    */
-  class KDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int >
+  class TDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int >
   {
   public:
     ItemInt(const TQString & group, const TQString & key, int &reference,
@@ -469,7 +469,7 @@ public:
   /**
    * Class for handling an 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
+  class TDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
   {
   public:
     ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference,
@@ -495,7 +495,7 @@ public:
   /**
    * Class for handling enums.
    */
-  class KDECORE_EXPORT ItemEnum:public ItemInt
+  class TDECORE_EXPORT ItemEnum:public ItemInt
   {
   public:
     struct Choice
@@ -521,7 +521,7 @@ public:
   /**
    * Class for handling an unsingend integer preferences item.
    */
-  class KDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int >
+  class TDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int >
   {
   public:
     ItemUInt(const TQString & group, const TQString & key,
@@ -547,7 +547,7 @@ public:
   /**
    * Class for hanlding a long integer preferences item.
    */
-  class KDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long >
+  class TDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long >
   {
   public:
     ItemLong(const TQString & group, const TQString & key, long &reference,
@@ -573,7 +573,7 @@ public:
   /**
    * Class for handling an unsigned long integer preferences item.
    */
-  class KDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long >
+  class TDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long >
   {
   public:
     ItemULong(const TQString & group, const TQString & key,
@@ -598,7 +598,7 @@ public:
   /**
    * Class for handling unsigned 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
+  class TDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
   {
   public:
     ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference,
@@ -624,7 +624,7 @@ public:
   /**
    * Class for handling a floating point preference item.
    */
-  class KDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double >
+  class TDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double >
   {
   public:
     ItemDouble(const TQString & group, const TQString & key,
@@ -650,7 +650,7 @@ public:
   /**
    * Class for handling a color preferences item.
    */
-  class KDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor >
+  class TDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor >
   {
   public:
     ItemColor(const TQString & group, const TQString & key,
@@ -666,7 +666,7 @@ public:
   /**
    * Class for handling a font preferences item.
    */
-  class KDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont >
+  class TDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont >
   {
   public:
     ItemFont(const TQString & group, const TQString & key, TQFont & reference,
@@ -681,7 +681,7 @@ public:
   /**
    * Class for handling a TQRect preferences item.
    */
-  class KDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect >
+  class TDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect >
   {
   public:
     ItemRect(const TQString & group, const TQString & key, TQRect & reference,
@@ -696,7 +696,7 @@ public:
   /**
    * Class for handling a TQPoint preferences item.
    */
-  class KDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint >
+  class TDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint >
   {
   public:
     ItemPoint(const TQString & group, const TQString & key, TQPoint & reference,
@@ -711,7 +711,7 @@ public:
   /**
    * Class for handling a TQSize preferences item.
    */
-  class KDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize >
+  class TDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize >
   {
   public:
     ItemSize(const TQString & group, const TQString & key, TQSize & reference,
@@ -726,7 +726,7 @@ public:
   /**
    * Class for handling a TQDateTime preferences item.
    */
-  class KDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime >
+  class TDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime >
   {
   public:
     ItemDateTime(const TQString & group, const TQString & key,
@@ -742,7 +742,7 @@ public:
   /**
    * Class for handling a string list preferences item.
    */
-  class KDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList >
+  class TDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList >
   {
   public:
     ItemStringList(const TQString & group, const TQString & key,
@@ -758,7 +758,7 @@ public:
   /**
    * Class for handling a path list preferences item.
    */
-  class KDECORE_EXPORT ItemPathList:public ItemStringList
+  class TDECORE_EXPORT ItemPathList:public ItemStringList
   {
   public:
     ItemPathList(const TQString & group, const TQString & key,
@@ -773,7 +773,7 @@ public:
   /**
    * Class for handling an integer list preferences item.
    */
-  class KDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > >
+  class TDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > >
   {
   public:
     ItemIntList(const TQString & group, const TQString & key,
diff --git a/tdecore/kcrash.h b/tdecore/kcrash.h
index 31a802f3d..197f61f87 100644
--- a/tdecore/kcrash.h
+++ b/tdecore/kcrash.h
@@ -34,7 +34,7 @@
  * be called by the default crash handler, giving the application a chance
  * to save its data.
  */
-class KDECORE_EXPORT KCrash
+class TDECORE_EXPORT KCrash
 {
  private: // ;o)
   static const char *appName;
diff --git a/tdecore/kdcoppropertyproxy.h b/tdecore/kdcoppropertyproxy.h
index 9bc7736e3..a5b1e4b22 100644
--- a/tdecore/kdcoppropertyproxy.h
+++ b/tdecore/kdcoppropertyproxy.h
@@ -36,7 +36,7 @@ class KDCOPPropertyProxyPrivate;
  * "setFoo( TQString )" and "TQString foo()" automatically into the corresponding
  * setProperty/property calls.
  */
-class KDECORE_EXPORT KDCOPPropertyProxy
+class TDECORE_EXPORT KDCOPPropertyProxy
 {
 public:
   /**
diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h
index 0a7d2546f..e9cf141f7 100644
--- a/tdecore/kdebug.h
+++ b/tdecore/kdebug.h
@@ -77,7 +77,7 @@ class kdbgstreamprivate;
  * \endcode
  * @see kndbgstream
  */
-class KDECORE_EXPORT kdbgstream {
+class TDECORE_EXPORT kdbgstream {
  public:
   /**
    * @internal
@@ -437,7 +437,7 @@ inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
  */
 inline kdbgstream &flush( kdbgstream &s) { s.flush(); return s; }
 
-KDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
+TDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
 
 /**
  * \relates KGlobal
@@ -445,7 +445,7 @@ KDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
  * nothing.
  * @see kndDebug()
  */
-class KDECORE_EXPORT kndbgstream {
+class TDECORE_EXPORT kndbgstream {
  public:
     /// Default constructor.
     kndbgstream() {}
@@ -596,14 +596,14 @@ inline kndbgstream &perror( kndbgstream & s) { return s; }
  * @param area an id to identify the output, 0 for default
  * @see kndDebug()
  */
-KDECORE_EXPORT kdbgstream kdDebug(int area = 0);
-KDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdDebug(int area = 0);
+TDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0);
 /**
  * \relates KGlobal
  * Returns a backtrace.
  * @return a backtrace
  */
-KDECORE_EXPORT TQString kdBacktrace();
+TDECORE_EXPORT TQString kdBacktrace();
 /**
  * \relates KGlobal
  * Returns a backtrace.
@@ -611,7 +611,7 @@ KDECORE_EXPORT TQString kdBacktrace();
  * @return a backtrace
  * @since 3.1
  */
-KDECORE_EXPORT TQString kdBacktrace(int levels);
+TDECORE_EXPORT TQString kdBacktrace(int levels);
 /**
  * Returns a dummy debug stream. The stream does not print anything.
  * @param area an id to identify the output, 0 for default
@@ -628,31 +628,31 @@ inline TQString kndBacktrace(int) { return TQString::null; }
  * information.
  * @param area an id to identify the output, 0 for default
  */
-KDECORE_EXPORT kdbgstream kdWarning(int area = 0);
-KDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdWarning(int area = 0);
+TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0);
 /**
  * \relates KGlobal
  * Returns an error stream. You can use it to print error
  * information.
  * @param area an id to identify the output, 0 for default
  */
-KDECORE_EXPORT kdbgstream kdError(int area = 0);
-KDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdError(int area = 0);
+TDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0);
 /**
  * \relates KGlobal
  * Returns a fatal error stream. You can use it to print fatal error
  * information.
  * @param area an id to identify the output, 0 for default
  */
-KDECORE_EXPORT kdbgstream kdFatal(int area = 0);
-KDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdFatal(int area = 0);
+TDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0);
 
 /**
  * \relates KGlobal
  * Deletes the kdebugrc cache and therefore forces KDebug to reread the
  * config file
  */
-KDECORE_EXPORT void kdClearDebugConfig();
+TDECORE_EXPORT void kdClearDebugConfig();
 
 /** @} */
 
diff --git a/tdecore/kdebugdcopiface.h b/tdecore/kdebugdcopiface.h
index 44e4bcf71..c6100f58a 100644
--- a/tdecore/kdebugdcopiface.h
+++ b/tdecore/kdebugdcopiface.h
@@ -27,7 +27,7 @@
 /**
  * @short DCOP interface to KDebug.
  **/
-class KDECORE_EXPORT KDebugDCOPIface : virtual public DCOPObject
+class TDECORE_EXPORT KDebugDCOPIface : virtual public DCOPObject
 {
 	K_DCOP
 public:
diff --git a/tdecore/kdelibs_export.h b/tdecore/kdelibs_export.h
index 220657d0b..44ac7c2dd 100644
--- a/tdecore/kdelibs_export.h
+++ b/tdecore/kdelibs_export.h
@@ -32,17 +32,17 @@
 #else /* Q_OS_UNIX */
 
 /* export statements for unix */
-#define KDECORE_EXPORT KDE_EXPORT
-#define KDEUI_EXPORT KDE_EXPORT
-#define KDEFX_EXPORT KDE_EXPORT
-#define KDEPRINT_EXPORT KDE_EXPORT
+#define TDECORE_EXPORT KDE_EXPORT
+#define TDEUI_EXPORT KDE_EXPORT
+#define TDEFX_EXPORT KDE_EXPORT
+#define TDEPRINT_EXPORT KDE_EXPORT
 #define KDNSSD_EXPORT KDE_EXPORT
 #define KIO_EXPORT KDE_EXPORT
 #define DCOP_EXPORT KDE_EXPORT
 #define KPARTS_EXPORT KDE_EXPORT
 #define KTEXTEDITOR_EXPORT KDE_EXPORT
 #define KABC_EXPORT KDE_EXPORT
-#define KDESU_EXPORT KDE_EXPORT
+#define TDESU_EXPORT KDE_EXPORT
 #define KVCARD_EXPORT KDE_EXPORT
 #define KRESOURCES_EXPORT KDE_EXPORT
 #define KSTYLE_EXPORT KDE_EXPORT
@@ -70,14 +70,14 @@
 /* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
 #ifdef KDE_DEPRECATED
-# ifndef KDECORE_EXPORT_DEPRECATED
-#  define KDECORE_EXPORT_DEPRECATED KDE_DEPRECATED KDECORE_EXPORT
+# ifndef TDECORE_EXPORT_DEPRECATED
+#  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
 # endif
 # ifndef KIO_EXPORT_DEPRECATED
 #  define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
 # endif
-# ifndef KDEUI_EXPORT_DEPRECATED
-#  define KDEUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEUI_EXPORT
+# ifndef TDEUI_EXPORT_DEPRECATED
+#  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
 # endif
 # ifndef KABC_EXPORT_DEPRECATED
 #  define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index bb705b696..2d6b251d8 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -31,7 +31,7 @@ class KDesktopFilePrivate;
  * @see  KConfigBase  KConfig
  * @short KDE Desktop File Management class
  */
-class KDECORE_EXPORT KDesktopFile : public KConfig
+class TDECORE_EXPORT KDesktopFile : public KConfig
 {
   Q_OBJECT
 
diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h
index 5f8c3dc8c..22027fb4f 100644
--- a/tdecore/kdeversion.h
+++ b/tdecore/kdeversion.h
@@ -46,34 +46,34 @@ namespace KDE
      * @return the version number, encoded in a single uint
      * @since 3.2
      */
-    KDECORE_EXPORT unsigned int version();
+    TDECORE_EXPORT unsigned int version();
     /**
      * Returns the major number of KDE's version, e.g.
      * 3 for KDE 3.1.2. 
      * @return the major version number
      * @since 3.1
      */
-    KDECORE_EXPORT unsigned int versionMajor();
+    TDECORE_EXPORT unsigned int versionMajor();
     /**
      * Returns the minor number of KDE's version, e.g.
      * 1 for KDE 3.1.2. 
      * @return the minor version number
      * @since 3.1
      */
-    KDECORE_EXPORT unsigned int versionMinor();
+    TDECORE_EXPORT unsigned int versionMinor();
     /**
      * Returns the release of KDE's version, e.g.
      * 2 for KDE 3.1.2. 
      * @return the release number
      * @since 3.1
      */
-    KDECORE_EXPORT unsigned int versionRelease();
+    TDECORE_EXPORT unsigned int versionRelease();
     /**
      * Returns the KDE version as string, e.g. "3.1.2".
      * @return the KDE version. You can keep the string forever
      * @since 3.1
      */
-    KDECORE_EXPORT const char *versionString();
+    TDECORE_EXPORT const char *versionString();
 }
 
 #endif // _KDE_VERSION_H_
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 24957dd47..3f6a46411 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -92,7 +92,7 @@ class KExtendedSocketPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
  */
-class KDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1039,7 +1039,7 @@ private:
  * Contains information about an internet address. It wraps addrinfo,
  * see getaddrinfo(3) for more information.
  */
-class KDECORE_EXPORT KAddressInfo
+class TDECORE_EXPORT KAddressInfo
 {
 private:
   addrinfo *ai;
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 08e12767e..e2f55b007 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -41,7 +41,7 @@ class TQString;
  * @see KStaticDeleterBase
  * @author Sirtaj Singh Kang (taj@kde.org)
  */
-class KDECORE_EXPORT KGlobal
+class TDECORE_EXPORT KGlobal
 {
 public:
 
@@ -216,7 +216,7 @@ inline const T& kClamp( const T& x, const T& low, const T& high )
  * qstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i'
  * @since 3.4
  */
-int KDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
+int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
  
 
 /**
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 4eee753dc..7fb44a021 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -42,7 +42,7 @@ class KGlobalAccelPrivate;
 * @see KKeyDialog
 * @short Configurable global shortcut support
 */
-class KDECORE_EXPORT KGlobalAccel : public TQObject
+class TDECORE_EXPORT KGlobalAccel : public TQObject
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index 07a6f2ccb..b4c809f2e 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -45,7 +45,7 @@ class KURL;
  *
  * @author David Faure <faure@kde.org>
  */
-class KDECORE_EXPORT KGlobalSettings
+class TDECORE_EXPORT KGlobalSettings
 {
   public:
 
diff --git a/tdecore/kiconeffect.h b/tdecore/kiconeffect.h
index a8e7b685e..7aec46b7b 100644
--- a/tdecore/kiconeffect.h
+++ b/tdecore/kiconeffect.h
@@ -31,7 +31,7 @@ class KIconEffectPrivate;
  * in a toolbar gray.
  * @see KIcon
  */
-class KDECORE_EXPORT KIconEffect
+class TDECORE_EXPORT KIconEffect
 {
 public:
   /**
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index b7f1478f6..db5a8ff5a 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -74,7 +74,7 @@ class KIconEffect;
  * "User".
  *
  */
-class KDECORE_EXPORT KIconLoader
+class TDECORE_EXPORT KIconLoader
 {
 public:
 
@@ -445,7 +445,7 @@ public:
  * \relates KIconLoader
  * Load a desktop icon.
  */
-KDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
 		    int state=KIcon::DefaultState,
 		    KInstance *instance=KGlobal::instance());
 
@@ -453,40 +453,40 @@ KDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
  * \relates KIconLoader
  * Load a desktop icon.
  */
-KDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a desktop icon, and apply the necessary effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a toolbar icon.
  */
-KDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
 	KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a toolbar icon.
  */
-KDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a toolbar icon, and apply the necessary effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a small icon.
  */
-KDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
 		  int state=KIcon::DefaultState,
 		  KInstance *instance=KGlobal::instance());
 
@@ -494,20 +494,20 @@ KDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
  * \relates KIconLoader
  * Load a small icon.
  */
-KDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a small icon, and apply the necessary effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a main toolbar icon.
  */
-KDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
+TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
 		    int state=KIcon::DefaultState,
 		    KInstance *instance=KGlobal::instance());
 
@@ -515,39 +515,39 @@ KDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
  * \relates KIconLoader
  * Load a main toolbar icon.
  */
-KDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a main toolbar icon, and apply the effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a user icon. User icons are searched in $appdir/pics.
  */
-KDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
 	KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a user icon. User icons are searched in $appdir/pics.
  */
-KDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a user icon, and apply the effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
+TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
 	KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Returns the current icon size for a specific group.
  */
-KDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance());
+TDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance());
 
 #endif // __KIconLoader_h_Included__
diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h
index d8e29d339..5db2855f7 100644
--- a/tdecore/kicontheme.h
+++ b/tdecore/kicontheme.h
@@ -33,7 +33,7 @@ class KIconPrivate;
  * @see KIconTheme
  * @see KIconLoader
  */
-class KDECORE_EXPORT KIcon
+class TDECORE_EXPORT KIcon
 {
 public:
     KIcon() { size = 0; }
@@ -184,7 +184,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro
  * iconloader but can be used by others too.
  * @see KIconLoader
  */
-class KDECORE_EXPORT KIconTheme
+class TDECORE_EXPORT KIconTheme
 {
 public:
     /**
diff --git a/tdecore/kidna.h b/tdecore/kidna.h
index 9feac63b5..8d2d7d937 100644
--- a/tdecore/kidna.h
+++ b/tdecore/kidna.h
@@ -31,7 +31,7 @@ namespace KIDNA {
      *
      * If conversion is not possible, an empty string is returned.
      */
-    KDECORE_EXPORT TQCString toAsciiCString(const TQString &idna);
+    TDECORE_EXPORT TQCString toAsciiCString(const TQString &idna);
 
     /**
      * Converts an International Domain Name @p idna to 
@@ -39,13 +39,13 @@ namespace KIDNA {
      *
      * If conversion is not possible, an empty string is returned.
      */
-    KDECORE_EXPORT TQString toAscii(const TQString &idna);
+    TDECORE_EXPORT TQString toAscii(const TQString &idna);
 
     /**
      * Converts an International Domain Name @p idna to 
      * its UNICODE representation
      */
-    KDECORE_EXPORT TQString toUnicode(const TQString &idna);
+    TDECORE_EXPORT TQString toUnicode(const TQString &idna);
 }
 
 #endif /* _KIDNA_H */
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index bb11183db..97434c385 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -40,7 +40,7 @@ class KSharedConfig;
  *
  * @author Torben Weis
  */
-class KDECORE_EXPORT KInstance
+class TDECORE_EXPORT KInstance
 {
     friend class KStandardDirs;
 
diff --git a/tdecore/kipc.h b/tdecore/kipc.h
index 384620cde..35ba3f18e 100644
--- a/tdecore/kipc.h
+++ b/tdecore/kipc.h
@@ -46,7 +46,7 @@
  * @see KApplication::kipcMessage()
  * @author Geert Jansen <jansen@kde.org>
  */
-class KDECORE_EXPORT KIPC
+class TDECORE_EXPORT KIPC
 {
 public:
     /**
diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h
index 47b4ad677..cf29fcabc 100644
--- a/tdecore/kkeynative.h
+++ b/tdecore/kkeynative.h
@@ -34,7 +34,7 @@ class KKeyNativePrivate;
  * Representation of a key in the format native of the windowing system (eg. X11).
  * @see KKey
  */
-class KDECORE_EXPORT KKeyNative
+class TDECORE_EXPORT KKeyNative
 {
  public:
 	/**
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index de7157210..440fbb5e3 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -671,7 +671,7 @@ bool modXToModQt( uint modX, int& modQt )
 	return modToModQt( modX, modQt );
 }
 
-KDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s )
+TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s )
 {
 	int modQt = 0;
 	if (s & Qt::ShiftButton) modQt |= KKey::SHIFT;
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index 7935c0ce4..ce3fa2fed 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/kkeyserver_x11.h
@@ -44,7 +44,7 @@ namespace KKeyServer
 	 * @see KKey
 	 * @see KKeyServer
 	 */
-	struct KDECORE_EXPORT Sym
+	struct TDECORE_EXPORT Sym
 	{
 	 public:
 		/// the actual value of the symbol
@@ -134,7 +134,7 @@ namespace KKeyServer
 	 * Represents a key press.
 	 * @see KKey
 	 */
-	struct KDECORE_EXPORT Key
+	struct TDECORE_EXPORT Key
 	{
 		/// Code for native Keys in Qt
 		enum { CODE_FOR_QT = 256 };
@@ -241,7 +241,7 @@ namespace KKeyServer
 	/**
 	 * TODO: please document this class
 	 */
-	struct KDECORE_EXPORT Variations
+	struct TDECORE_EXPORT Variations
 	{
 		enum { MAX_VARIATIONS = 4 };
 
@@ -257,14 +257,14 @@ namespace KKeyServer
 	};
 
 	/// TODO: please document
-	KDECORE_EXPORT bool initializeMods();
+	TDECORE_EXPORT bool initializeMods();
 
 	/**
 	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the generic flags to check
 	 * @return the window system specific flags
 	 */
-	KDECORE_EXPORT uint modX( KKey::ModFlag modFlag );
+	TDECORE_EXPORT uint modX( KKey::ModFlag modFlag );
 
 	/**
 	 * Returns true if the current keyboard layout supports the Win key.
@@ -272,42 +272,42 @@ namespace KKeyServer
 	 * @return true if the keyboard has a Win key
 	 * @see modXWin()
 	 */
-	KDECORE_EXPORT bool keyboardHasWinKey();
+	TDECORE_EXPORT bool keyboardHasWinKey();
 
 	/**
 	 * Returns the X11 Shift modifier mask/flag.
 	 * @return the X11 Shift modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXShift();
+	TDECORE_EXPORT uint modXShift();
 
 	/**
 	 * Returns the X11 Lock modifier mask/flag.
 	 * @return the X11 Lock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXLock();
+	TDECORE_EXPORT uint modXLock();
 
 	/**
 	 * Returns the X11 Ctrl modifier mask/flag.
 	 * @return the X11 Ctrl modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXCtrl();
+	TDECORE_EXPORT uint modXCtrl();
 
 	/**
 	 * Returns the X11 Alt (Mod1) modifier mask/flag.
 	 * @return the X11 Alt (Mod1) modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXAlt();
+	TDECORE_EXPORT uint modXAlt();
 
 	/**
 	 * Returns the X11 NumLock modifier mask/flag.
 	 * @return the X11 NumLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXNumLock();
+	TDECORE_EXPORT uint modXNumLock();
 
 	/**
 	 * Returns the X11 Win (Mod3) modifier mask/flag.
@@ -315,14 +315,14 @@ namespace KKeyServer
 	 * @see keyboardHasWinKey()
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXWin();
+	TDECORE_EXPORT uint modXWin();
 
 	/**
 	 * Returns the X11 ScrollLock modifier mask/flag.
 	 * @return the X11 ScrollLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXScrollLock();
+	TDECORE_EXPORT uint modXScrollLock();
 
 	/**
 	 * Returns the X11 Mode_switch modifier mask/flag. 
@@ -330,7 +330,7 @@ namespace KKeyServer
 	 * @see accelModMaskX()
 	 * @since 3.5
 	 */
-	KDECORE_EXPORT uint modXModeSwitch();
+	TDECORE_EXPORT uint modXModeSwitch();
 
 	/**
 	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
@@ -343,7 +343,7 @@ namespace KKeyServer
 	 * @see modXWin()
 	 * @see modXScrollLock()
 	 */
-	KDECORE_EXPORT uint accelModMaskX();
+	TDECORE_EXPORT uint accelModMaskX();
 
 	/**
 	 * Extracts the symbol from the given Qt key and
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see Sym
 	 */
-	KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given Qt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
 	 */
-	KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a Qt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see Sym
 	 */
-	KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see KKey
 	 */
-	KDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -397,7 +397,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see KKey
 	 */
-	KDECORE_EXPORT bool modToModX( uint mod, uint& modX );
+	TDECORE_EXPORT bool modToModX( uint mod, uint& modX );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -409,12 +409,12 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 */
 	//wrapped for win32
-	KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
 
 	/**
 	 * Converts the Qt-compatible button state to x11 modifier. 
 	 */
-	KDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
+	TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -425,7 +425,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see KKey
 	 */
-	KDECORE_EXPORT bool modXToMod( uint modX, uint& mod );
+	TDECORE_EXPORT bool modXToMod( uint modX, uint& mod );
 
 	/**
 	 * Converts a X11 key code and a mask of ORed X11 modifiers
@@ -438,12 +438,12 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see Sym
 	 */
-	KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );
+	TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );
 
 	/**
 	 * @internal
 	 */
-	KDECORE_EXPORT TQString modToStringInternal( uint mod );
+	TDECORE_EXPORT TQString modToStringInternal( uint mod );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to a
@@ -451,7 +451,7 @@ namespace KKeyServer
 	 * @param mod the mask of ORed KKey::ModFlag modifiers
 	 * @return the user-readable string
 	 */
-	KDECORE_EXPORT TQString modToStringUser( uint mod );
+	TDECORE_EXPORT TQString modToStringUser( uint mod );
 
 	/**
 	 * Converts the modifier given as user-readable string
@@ -459,19 +459,19 @@ namespace KKeyServer
          * @internal
          * @since 3.5
 	 */
-	KDECORE_EXPORT uint stringUserToMod( const TQString& mod );
+	TDECORE_EXPORT uint stringUserToMod( const TQString& mod );
 
 	/**
 	 * @internal
 	 * Unimplemented?
 	 */
-	KDECORE_EXPORT bool stringToSymMod( const TQString&, uint& sym, uint& mod );
+	TDECORE_EXPORT bool stringToSymMod( const TQString&, uint& sym, uint& mod );
 
 	/**
 	 * @internal
 	 * Unimplemented?
 	 */
-	KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 0d372237d..aa88db925 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -47,7 +47,7 @@ class KLibraryPrivate;
  * @see KLibLoader
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibrary : public TQObject
+class TDECORE_EXPORT KLibrary : public TQObject
 {
     friend class KLibLoader;
     friend class TQAsciiDict<KLibrary>;
@@ -139,7 +139,7 @@ class KLibWrapPrivate;
  * @see KLibrary
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibLoader : public TQObject
+class TDECORE_EXPORT KLibLoader : public TQObject
 {
     friend class KLibrary;
 
@@ -330,7 +330,7 @@ private:
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibFactory : public TQObject
+class TDECORE_EXPORT KLibFactory : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 9bca02077..e94143fb6 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -75,7 +75,7 @@ class KCalendarSystem;
  *  for e.g. German umlauts or French accents should be recoded to
  *  UTF-8)
  **/
-KDECORE_EXPORT TQString i18n(const char *text);
+TDECORE_EXPORT TQString i18n(const char *text);
 
 /**
  * \relates KLocale
@@ -84,7 +84,7 @@ KDECORE_EXPORT TQString i18n(const char *text);
  *  text.
  *  @see translate
  **/
-KDECORE_EXPORT TQString i18n(const char *comment, const char *text);
+TDECORE_EXPORT TQString i18n(const char *comment, const char *text);
 
 /**
  * \relates KLocale
@@ -97,7 +97,7 @@ KDECORE_EXPORT TQString i18n(const char *comment, const char *text);
  *          depending on n
  *  @see translate
  **/
-KDECORE_EXPORT TQString i18n(const char *singular, const char *plural, unsigned long n);
+TDECORE_EXPORT TQString i18n(const char *singular, const char *plural, unsigned long n);
 
 /**
  * \relates KLocale
@@ -121,7 +121,7 @@ inline TQString tr2i18n(const char* message, const char* =0) {
   * Hans Petter Bieker <bieker@kde.org>, Lukas Tinkl <lukas.tinkl@suse.cz>
   * @short class for supporting locale settings and national language
   */
-class KDECORE_EXPORT KLocale
+class TDECORE_EXPORT KLocale
 {
   friend class KGlobal; // for initInstance()
 public:
diff --git a/tdecore/klockfile.h b/tdecore/klockfile.h
index fac66831a..61968bf0f 100644
--- a/tdecore/klockfile.h
+++ b/tdecore/klockfile.h
@@ -30,7 +30,7 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.3
  */
-class KDECORE_EXPORT KLockFile : public KShared
+class TDECORE_EXPORT KLockFile : public KShared
 {
 public:
    typedef KSharedPtr<KLockFile> Ptr;
diff --git a/tdecore/kmacroexpander.h b/tdecore/kmacroexpander.h
index 226264990..4244efb18 100644
--- a/tdecore/kmacroexpander.h
+++ b/tdecore/kmacroexpander.h
@@ -34,7 +34,7 @@
  * @since 3.1.3
  * @author Oswald Buddenhagen <ossi@kde.org>
  */
-class KDECORE_EXPORT KMacroExpanderBase {
+class TDECORE_EXPORT KMacroExpanderBase {
 
 public:
     /**
@@ -188,7 +188,7 @@ private:
  * @since 3.3
  * @author Oswald Buddenhagen <ossi@kde.org>
  */
-class KDECORE_EXPORT KWordMacroExpander : public KMacroExpanderBase {
+class TDECORE_EXPORT KWordMacroExpander : public KMacroExpanderBase {
 
 public:
     /**
@@ -221,7 +221,7 @@ protected:
  * @since 3.3
  * @author Oswald Buddenhagen <ossi@kde.org>
  */
-class KDECORE_EXPORT KCharMacroExpander : public KMacroExpanderBase {
+class TDECORE_EXPORT KCharMacroExpander : public KMacroExpanderBase {
 
 public:
     /**
@@ -270,7 +270,7 @@ namespace KMacroExpander {
      * // s is now "% Title: /tmp/myfile.txt:My File";
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
 
     /**
      * Perform safe macro expansion (substitution) on a string for use
@@ -295,7 +295,7 @@ namespace KMacroExpander {
      * system(TQFile::encodeName(s));
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
 
     /**
      * Perform safe macro expansion (substitution) on a string.
@@ -320,7 +320,7 @@ namespace KMacroExpander {
      * // s is now "Title: /tmp/myfile.txt-My File";
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
 
     /**
      * Perform safe macro expansion (substitution) on a string for use
@@ -348,18 +348,18 @@ namespace KMacroExpander {
      * system(TQFile::encodeName(s));
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
 
     /**
      * Same as above, except that the macros expand to string lists that
      * are simply join(" ")ed together.
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
     /**
      * Same as above, except that the macros expand to string lists that
      * are simply join(" ")ed together.
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
 
     /**
      * Same as above, except that the macros expand to string lists.
@@ -367,14 +367,14 @@ namespace KMacroExpander {
      * join(" ")ed together; otherwise every element expands to a separate
      * quoted string.
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
     /**
      * Same as above, except that the macros expand to string lists.
      * If the macro appears inside a quoted string, the list is simply
      * join(" ")ed together; otherwise every element expands to a separate
      * quoted string.
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
 }
 
 #endif /* _KMACROEXPANDER_H */
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index 384f5d23f..669451e68 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -47,7 +47,7 @@ class KSelectionOwnerPrivate;
  @since 3.2
  @short ICCCM manager selection owner
 */
-class KDECORE_EXPORT KSelectionOwner
+class TDECORE_EXPORT KSelectionOwner
     : public TQObject
     {
     Q_OBJECT
@@ -170,7 +170,7 @@ class KSelectionWatcherPrivate;
  @since 3.2
  @short ICCCM manager selection watching
 */
-class KDECORE_EXPORT KSelectionWatcher
+class TDECORE_EXPORT KSelectionWatcher
     : public TQObject
     {
     Q_OBJECT
diff --git a/tdecore/kmdcodec.h b/tdecore/kmdcodec.h
index d4bd8dfb0..a45cc3290 100644
--- a/tdecore/kmdcodec.h
+++ b/tdecore/kmdcodec.h
@@ -71,7 +71,7 @@
  * @author Dawit Alemayehu <adawit@kde.org>
  * @author Rik Hemsley <rik@kde.org>
  */
-class KDECORE_EXPORT KCodecs
+class TDECORE_EXPORT KCodecs
 {
 public:
 
@@ -399,7 +399,7 @@ class KMD5Private;
  * @author Dirk Mueller <mueller@kde.org>, Dawit Alemayehu <adawit@kde.org>
  */
 
-class KDECORE_EXPORT KMD5
+class TDECORE_EXPORT KMD5
 {
 public:
 
@@ -574,7 +574,7 @@ private:
  *
  * The class usage is the same as KMD5.
  */
-class KDECORE_EXPORT KMD4
+class TDECORE_EXPORT KMD4
 {
 public:
 
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index 536ead0b8..bf5b67d4c 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -37,7 +37,7 @@ class KInstance;
  *
  * @author Peter Putzer <putzer@kde.org>
  */
-class KDECORE_EXPORT KMimeSourceFactory : public TQMimeSourceFactory
+class TDECORE_EXPORT KMimeSourceFactory : public TQMimeSourceFactory
 {
 public:
 
diff --git a/tdecore/kmountpoint.h b/tdecore/kmountpoint.h
index fd4fe9c5d..e68fb23ab 100644
--- a/tdecore/kmountpoint.h
+++ b/tdecore/kmountpoint.h
@@ -32,7 +32,7 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class KDECORE_EXPORT KMountPoint : public KShared
+class TDECORE_EXPORT KMountPoint : public KShared
 {
    typedef signed long long int filesize_t;
 public:
diff --git a/tdecore/kmultipledrag.h b/tdecore/kmultipledrag.h
index 2490ec694..361bdcae7 100644
--- a/tdecore/kmultipledrag.h
+++ b/tdecore/kmultipledrag.h
@@ -51,7 +51,7 @@ class KMultipleDragPrivate;
  *
  * @author David Faure <faure@kde.org>
  */
-class KDECORE_EXPORT KMultipleDrag : public TQDragObject
+class TDECORE_EXPORT KMultipleDrag : public TQDragObject
 {
     Q_OBJECT
 
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 2de3e297d..ae7acbb79 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -93,7 +93,7 @@ namespace KNotifyClient
      *
      * @short Enables KNotifyClient to use a different KInstance
      */
-    class KDECORE_EXPORT Instance
+    class TDECORE_EXPORT Instance
     {
     public:
         /**
@@ -175,7 +175,7 @@ namespace KNotifyClient
 	 * first triggered.
 	 * @return true if daemon is running (always true at the moment)
 	 **/
-	KDECORE_EXPORT bool startDaemon();
+	TDECORE_EXPORT bool startDaemon();
 
 //#ifndef KDE_NO_COMPAT
 	/**
@@ -185,7 +185,7 @@ namespace KNotifyClient
 	 *             the user connected the event to sound, only. Can be TQString::null.
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	KDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED;
+	TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED;
 
 	/**
 	 * @deprecated
@@ -194,7 +194,7 @@ namespace KNotifyClient
 	 * @param text The text explaining the event you raise. Can be TQString::null.
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	KDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED;
+	TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED;
 
 	/**
 	 * @deprecated
@@ -206,7 +206,7 @@ namespace KNotifyClient
 	 * @param file The log file to append the message to if selected with @p present
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	KDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default,
+	TDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default,
 	                             const TQString &sound=TQString::null, const TQString &file=TQString::null) KDE_DEPRECATED;
 	
 //#endif
@@ -227,7 +227,7 @@ namespace KNotifyClient
 	 * @since 3.1.1
 	 */
 	// KDE4: use WId instead of int
-	KDECORE_EXPORT int event( int winId, const TQString& message,
+	TDECORE_EXPORT int event( int winId, const TQString& message,
                               const TQString& text = TQString::null );
 
 	/**
@@ -242,7 +242,7 @@ namespace KNotifyClient
 	 * @since 3.1.1
 	 */
 	// KDE4: use WId instead of int
-	KDECORE_EXPORT int event( int winId, StandardEvent event,
+	TDECORE_EXPORT int event( int winId, StandardEvent event,
                               const TQString& text = TQString::null );
 
 	/**
@@ -260,7 +260,7 @@ namespace KNotifyClient
 	 * @since 3.1.1
 	 */
 	// KDE4: use WId instead of int
-	KDECORE_EXPORT int userEvent(int winId, const TQString &text=TQString::null, int present=Default, int level=Default,
+	TDECORE_EXPORT int userEvent(int winId, const TQString &text=TQString::null, int present=Default, int level=Default,
 	                      const TQString &sound=TQString::null, const TQString &file=TQString::null);
 	
 	/**
@@ -271,7 +271,7 @@ namespace KNotifyClient
 	 * \endcode
 	 * @param reason the reason, can be TQString::null.
 	 */
-	KDECORE_EXPORT void beep(const TQString& reason=TQString::null);
+	TDECORE_EXPORT void beep(const TQString& reason=TQString::null);
 
 	/**
 	 * Gets the presentation associated with a certain event name
@@ -282,7 +282,7 @@ namespace KNotifyClient
 	 * @param eventname the event name to check
 	 * @return the presentation methods
 	 */
-	KDECORE_EXPORT int getPresentation(const TQString &eventname);
+	TDECORE_EXPORT int getPresentation(const TQString &eventname);
 	
 	/**
 	 * Gets the default file associated with a certain event name
@@ -292,7 +292,7 @@ namespace KNotifyClient
 	 * @param present the presentation method
 	 * @return the associated file. Can be TQString::null if not found.
 	 */
-	KDECORE_EXPORT TQString getFile(const TQString &eventname, int present);
+	TDECORE_EXPORT TQString getFile(const TQString &eventname, int present);
 	
 	/**
 	 * Gets the default presentation for the event of this program.
@@ -302,7 +302,7 @@ namespace KNotifyClient
 	 * \endcode
 	 * @return the presentation methods
 	 */
-	KDECORE_EXPORT int getDefaultPresentation(const TQString &eventname);
+	TDECORE_EXPORT int getDefaultPresentation(const TQString &eventname);
 	
 	/**
 	 * Gets the default File for the event of this program.
@@ -313,13 +313,13 @@ namespace KNotifyClient
 	 * @param present the presentation method
 	 * @return the default file. Can be TQString::null if not found.
 	 */
-	KDECORE_EXPORT TQString getDefaultFile(const TQString &eventname, int present);
+	TDECORE_EXPORT TQString getDefaultFile(const TQString &eventname, int present);
 
 	/**
 	 * Shortcut to KNotifyClient::Instance::current() :)
 	 * @returns the current KInstance.
 	 */
-	KDECORE_EXPORT KInstance * instance();
+	TDECORE_EXPORT KInstance * instance();
 }
 
 #endif
diff --git a/tdecore/kpalette.h b/tdecore/kpalette.h
index 4f9c74029..332e34a6b 100644
--- a/tdecore/kpalette.h
+++ b/tdecore/kpalette.h
@@ -43,7 +43,7 @@ class KPalettePrivate;
  *
  * @author Waldo Bastian (bastian@kde.org)
  **/
-class KDECORE_EXPORT KPalette
+class TDECORE_EXPORT KPalette
 {
 public:
    /**
diff --git a/tdecore/kpixmapprovider.h b/tdecore/kpixmapprovider.h
index 8b3c653af..362bf32b2 100644
--- a/tdecore/kpixmapprovider.h
+++ b/tdecore/kpixmapprovider.h
@@ -35,7 +35,7 @@
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @short an abstract interface for looking up icons
  */
-class KDECORE_EXPORT KPixmapProvider
+class TDECORE_EXPORT KPixmapProvider
 {
 public:
     virtual ~KPixmapProvider();
diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h
index 0e534f4ad..9a596334b 100644
--- a/tdecore/kprocctrl.h
+++ b/tdecore/kprocctrl.h
@@ -36,7 +36,7 @@ class TQSocketNotifier;
  *
  * This class takes care of the actual (UN*X) signal handling.
  */
-class KDECORE_EXPORT KProcessController : public TQObject
+class TDECORE_EXPORT KProcessController : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index a07df060e..17551c873 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -127,7 +127,7 @@ class KPty;
  * @author Christian Czezatke e9025461@student.tuwien.ac.at
  *
  **/
-class KDECORE_EXPORT KProcess : public TQObject
+class TDECORE_EXPORT KProcess : public TQObject
 {
   Q_OBJECT
 
@@ -901,7 +901,7 @@ class KShellProcessPrivate;
 *   	processes through a shell.
 *   @author Christian Czezatke <e9025461@student.tuwien.ac.at>
 */
-class KDECORE_EXPORT KShellProcess: public KProcess
+class TDECORE_EXPORT KShellProcess: public KProcess
 {
   Q_OBJECT
 
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index 89c69008e..406a0f01b 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -47,7 +47,7 @@ class TQTextCodec;
  **/
 
 
-class KDECORE_EXPORT KProcIO : public KProcess
+class TDECORE_EXPORT KProcIO : public KProcess
 {
   Q_OBJECT
 
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 66ce97760..93692c735 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -16,12 +16,12 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifdef MAKE_KDECORE_LIB //needed for proper linkage (win32)
+#ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
 #undef KIO_EXPORT
 #define KIO_EXPORT KDE_EXPORT
 #endif
 
-#define KPROTOCOLINFO_KDECORE
+#define KPROTOCOLINFO_TDECORE
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
 
diff --git a/tdecore/kprotocolinfofactory.h b/tdecore/kprotocolinfofactory.h
index f710e8ecc..6a10ac1e3 100644
--- a/tdecore/kprotocolinfofactory.h
+++ b/tdecore/kprotocolinfofactory.h
@@ -37,7 +37,7 @@ class KProtocolInfoPrivate;
  *
  * @short Factory for KProtocolInfo
  */
-class KDECORE_EXPORT KProtocolInfoFactory : public KSycocaFactory
+class TDECORE_EXPORT KProtocolInfoFactory : public KSycocaFactory
 { 
   K_SYCOCAFACTORY( KST_KProtocolInfoFactory )
 public:
diff --git a/tdecore/kpty.h b/tdecore/kpty.h
index 5b9a94112..bb166f4a0 100644
--- a/tdecore/kpty.h
+++ b/tdecore/kpty.h
@@ -37,7 +37,7 @@ struct KPtyPrivate;
  *
  * @since 3.2
  **/
-class KDECORE_EXPORT KPty {
+class TDECORE_EXPORT KPty {
 
 public:
 
diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h
index 383eee9ce..621cb0d68 100644
--- a/tdecore/krandomsequence.h
+++ b/tdecore/krandomsequence.h
@@ -36,7 +36,7 @@ class TQGList;
  *
  * @author Sean Harmer <sh@astro.keele.ac.uk>
  */
-class KDECORE_EXPORT KRandomSequence
+class TDECORE_EXPORT KRandomSequence
 {
 public: 
   /**
diff --git a/tdecore/kregexp.h b/tdecore/kregexp.h
index 88d16a3c7..50f755ed9 100644
--- a/tdecore/kregexp.h
+++ b/tdecore/kregexp.h
@@ -57,7 +57,7 @@ class KRegExpPrivate;
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KDE_DEPRECATED KRegExp
+class TDECORE_EXPORT KDE_DEPRECATED KRegExp
 {
 public:
 
diff --git a/tdecore/krfcdate.h b/tdecore/krfcdate.h
index ade819622..ca4f309c7 100644
--- a/tdecore/krfcdate.h
+++ b/tdecore/krfcdate.h
@@ -29,7 +29,7 @@
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KRFCDate
+class TDECORE_EXPORT KRFCDate
 {
 public:
    /**
diff --git a/tdecore/krootprop.h b/tdecore/krootprop.h
index 6d6a43a24..b1f6497c9 100644
--- a/tdecore/krootprop.h
+++ b/tdecore/krootprop.h
@@ -43,7 +43,7 @@ class KRootPropPrivate;
 * @see  KConfig::KConfig
 * @author Mark Donohoe (donohe@kde.org)
 */
-class KDECORE_EXPORT KRootProp
+class TDECORE_EXPORT KRootProp
 {
 private:	
   Atom atom;
diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h
index 448c9ca1a..7cf4bc7e9 100644
--- a/tdecore/ksavefile.h
+++ b/tdecore/ksavefile.h
@@ -38,7 +38,7 @@ class KSaveFilePrivate;
  *   Some error occurred, no changes have been written whatsoever and the
  *   old file is still in place.
  */
-class KDECORE_EXPORT KSaveFile
+class TDECORE_EXPORT KSaveFile
 {
 public:
    /**
diff --git a/tdecore/ksharedptr.h b/tdecore/ksharedptr.h
index ada08413b..8338145cc 100644
--- a/tdecore/ksharedptr.h
+++ b/tdecore/ksharedptr.h
@@ -37,7 +37,7 @@
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KShared {
+class TDECORE_EXPORT KShared {
 public:
    /**
     * Standard constructor.  This will initialize the reference count
diff --git a/tdecore/kshell.h b/tdecore/kshell.h
index 2e9f3ad98..8f18603cd 100644
--- a/tdecore/kshell.h
+++ b/tdecore/kshell.h
@@ -90,7 +90,7 @@ namespace KShell {
      *  target, see Errors
      * @return a list of unquoted words or an empty list if an error occurred
      */
-    KDECORE_EXPORT TQStringList splitArgs( const TQString &cmd, int flags = 0, int *err = 0 );
+    TDECORE_EXPORT TQStringList splitArgs( const TQString &cmd, int flags = 0, int *err = 0 );
 
     /**
      * Quotes and joins @p args together according to POSIX shell rules.
@@ -98,7 +98,7 @@ namespace KShell {
      * @param args a list of strings to quote and join
      * @return a command suitable for shell execution
      */
-    KDECORE_EXPORT TQString joinArgs( const TQStringList &args );
+    TDECORE_EXPORT TQString joinArgs( const TQStringList &args );
 
     /**
      * Same as above, but $'' is used instead of '' for the quoting.
@@ -110,7 +110,7 @@ namespace KShell {
      * @param args a list of strings to quote and join
      * @return a command suitable for shell execution
      */
-    KDECORE_EXPORT TQString joinArgsDQ( const TQStringList &args );
+    TDECORE_EXPORT TQString joinArgsDQ( const TQStringList &args );
 
     /**
      * Quotes and joins @p argv together according to POSIX shell rules.
@@ -121,7 +121,7 @@ namespace KShell {
      *  @p argv must be null-terminated.
      * @return a command suitable for shell execution
      */
-    KDECORE_EXPORT TQString joinArgs( const char * const *argv, int argc = -1 );
+    TDECORE_EXPORT TQString joinArgs( const char * const *argv, int argc = -1 );
 
     /**
      * Performs tilde expansion on @p path. Interprets "~/path" and
@@ -130,7 +130,7 @@ namespace KShell {
      * @param path the path to tilde-expand
      * @return the expanded path
      */
-    KDECORE_EXPORT TQString tildeExpand( const TQString &path );
+    TDECORE_EXPORT TQString tildeExpand( const TQString &path );
 
     /**
      * Obtain a @p user's home directory.
@@ -139,7 +139,7 @@ namespace KShell {
      *  An empty string denotes the current user.
      * @return The user's home directory.
      */
-    KDECORE_EXPORT TQString homeDir( const TQString &user );
+    TDECORE_EXPORT TQString homeDir( const TQString &user );
 
 }
 
diff --git a/tdecore/kshortcut.h b/tdecore/kshortcut.h
index 7d62a0041..ee4a269f3 100644
--- a/tdecore/kshortcut.h
+++ b/tdecore/kshortcut.h
@@ -37,7 +37,7 @@ class KKeyNative;
 * @see KShortcut
 */
 
-class KDECORE_EXPORT KKey
+class TDECORE_EXPORT KKey
 {
  public:
         /**
@@ -285,7 +285,7 @@ class KDECORE_EXPORT KKey
 * @see KShortcut
 */
 
-class KDECORE_EXPORT KKeySequence
+class TDECORE_EXPORT KKeySequence
 {
  public:
         /// Defines the maximum length of the key sequence
@@ -540,7 +540,7 @@ class KDECORE_EXPORT KKeySequence
 * 
 */
 
-class KDECORE_EXPORT KShortcut
+class TDECORE_EXPORT KShortcut
 {
  public:
         /**
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 4896bc30a..bd1482880 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -45,7 +45,7 @@ class KShortcut;
  *
  * @short Base class for accessing accelerator lists
  */
-class KDECORE_EXPORT KShortcutList
+class TDECORE_EXPORT KShortcutList
 {
  public:
         /**
@@ -195,7 +195,7 @@ class KGlobalAccel;
  * KShortcutList implementation to access KAccel and
  * KGlobalAccel lists.
  */
-class KDECORE_EXPORT KAccelShortcutList : public KShortcutList
+class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
 {
  public:
         /**
@@ -260,7 +260,7 @@ namespace KStdAccel {
  * KShortcutList implementation that accesses KStdAccel
  * actions.
  */
-class KDECORE_EXPORT ShortcutList : public KShortcutList
+class TDECORE_EXPORT ShortcutList : public KShortcutList
 {
  public:
         /**
diff --git a/tdecore/kshortcutmenu.h b/tdecore/kshortcutmenu.h
index aa641e201..2c682342d 100644
--- a/tdecore/kshortcutmenu.h
+++ b/tdecore/kshortcutmenu.h
@@ -32,7 +32,7 @@ class KAccelActions;
 /**
  * @internal
  */
-class KDECORE_EXPORT KShortcutMenu : public TQPopupMenu
+class TDECORE_EXPORT KShortcutMenu : public TQPopupMenu
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index 89d380512..c7efeecfa 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -38,7 +38,7 @@ class KSimpleConfigPrivate;
  * @see KConfigBase KConfig
  * @short KDE Configuration Management class with deletion ability
  */
-class KDECORE_EXPORT KSimpleConfig : public KConfig
+class TDECORE_EXPORT KSimpleConfig : public KConfig
 {
   Q_OBJECT
 
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 5c3eced8a..7f4f0b178 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -88,7 +88,7 @@ class KServerSocketPrivate;
  * @author Torben Weis <weis@uni-frankfurt.de>
  * @short A TCP/IP client socket.
  */
-class KDECORE_EXPORT KSocket : public TQObject
+class TDECORE_EXPORT KSocket : public TQObject
 {
     Q_OBJECT
 public:
@@ -251,7 +251,7 @@ private:
  *
  * @author Torben Weis <weis@stud.uni-frankfurt.de>
 */
-class KDECORE_EXPORT KServerSocket : public TQObject
+class TDECORE_EXPORT KServerSocket : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index 04ae350aa..2510d1218 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -43,7 +43,7 @@ class KSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a socket address.
  */
-class KDECORE_EXPORT KSocketAddress: public TQObject
+class TDECORE_EXPORT KSocketAddress: public TQObject
 {
   Q_OBJECT
 protected:
@@ -230,7 +230,7 @@ class KInetSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an Internet socket address
  */
-class KDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress
 {
   Q_OBJECT
 public:
@@ -581,7 +581,7 @@ class KUnixSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a Unix socket address
  */
-class KDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress
 {
   Q_OBJECT
 public:
diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h
index a95de56d4..add847aba 100644
--- a/tdecore/ksocks.h
+++ b/tdecore/ksocks.h
@@ -45,7 +45,7 @@ typedef unsigned ksocklen_t;
  *
  * @short Access to a SOCKS Proxy.
  */
-class KDECORE_EXPORT KSocks {
+class TDECORE_EXPORT KSocks {
    friend class KStaticDeleter<KSocks>;
 
 public:
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 3f1fd14c1..ed4cff3c0 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -122,7 +122,7 @@ class KStandardDirsPrivate;
  *
  * @see KGlobalSettings
  */
-class KDECORE_EXPORT KStandardDirs
+class TDECORE_EXPORT KStandardDirs
 {
 public:
         /**
@@ -700,7 +700,7 @@ public:
  * This function is just for convenience. It simply calls
  *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
  **/
-KDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
 
 /*!
  * \relates KStandardDirs
@@ -711,7 +711,7 @@ KDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
  * specific file, filename must have a trailing slash.
  *
  **/
-KDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
 
 /*!
  * \relates KStandardDirs
@@ -722,7 +722,7 @@ KDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
  * filename must have a trailing slash.
  *
  **/
-KDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() );
 
 /*! @} */
 
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index 807e484c5..d14213dc7 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -64,7 +64,7 @@ class KStartupInfoPrivate;
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class KDECORE_EXPORT KStartupInfo
+class TDECORE_EXPORT KStartupInfo
     : public TQObject
     {
     Q_OBJECT
@@ -392,7 +392,7 @@ class KStartupInfoIdPrivate;
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class KDECORE_EXPORT KStartupInfoId
+class TDECORE_EXPORT KStartupInfoId
     {
     public:
 	/**
@@ -465,7 +465,7 @@ class KStartupInfoDataPrivate;
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class KDECORE_EXPORT KStartupInfoData
+class TDECORE_EXPORT KStartupInfoData
     {
     public:
 	/**
diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h
index ee3e5755c..61b4a8e4a 100644
--- a/tdecore/kstaticdeleter.h
+++ b/tdecore/kstaticdeleter.h
@@ -36,7 +36,7 @@
  * @see KGlobal::unregisterStaticDeleter()
  * @see KGlobal::deleteStaticDeleters()
  */
-class KDECORE_EXPORT KStaticDeleterBase {
+class TDECORE_EXPORT KStaticDeleterBase {
 public:
     virtual ~KStaticDeleterBase() { }
     /**
diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp
index 85f8dda20..cb2d9dbba 100644
--- a/tdecore/kstdaccel.cpp
+++ b/tdecore/kstdaccel.cpp
@@ -376,16 +376,16 @@ bool ShortcutList::save() const
 	return writeSettings( TQString::null, 0, false, true );
 }
 
-KDECORE_EXPORT TQString action(StdAccel id)
+TDECORE_EXPORT TQString action(StdAccel id)
 	{ return name(id); }
-KDECORE_EXPORT TQString description(StdAccel id)
+TDECORE_EXPORT TQString description(StdAccel id)
 	{ return label(id); }
-KDECORE_EXPORT int key(StdAccel id)
+TDECORE_EXPORT int key(StdAccel id)
 	{ return shortcut(id).keyCodeQt(); }
-KDECORE_EXPORT int defaultKey(StdAccel id)
+TDECORE_EXPORT int defaultKey(StdAccel id)
 	{ return shortcutDefault(id).keyCodeQt(); }
 
-KDECORE_EXPORT bool isEqual(const TQKeyEvent* ev, int keyQt)
+TDECORE_EXPORT bool isEqual(const TQKeyEvent* ev, int keyQt)
 {
 	KKey key1( ev ), key2( keyQt );
 	return key1 == key2;
diff --git a/tdecore/kstdaccel.h b/tdecore/kstdaccel.h
index 9f379b210..6707cc3d2 100644
--- a/tdecore/kstdaccel.h
+++ b/tdecore/kstdaccel.h
@@ -87,28 +87,28 @@ namespace KStdAccel
    * Returns the keybinding for @p accel.
    * @param id the id of the accelerator
    */
-  KDECORE_EXPORT const KShortcut& shortcut(StdAccel id);
+  TDECORE_EXPORT const KShortcut& shortcut(StdAccel id);
 
   /**
    * Returns a unique name for the given accel.
    * @param id the id of the accelerator
    * @return the unique name of the accelerator
    */
-  KDECORE_EXPORT TQString name(StdAccel id);
+  TDECORE_EXPORT TQString name(StdAccel id);
 
   /**
    * Returns a localized label for user-visible display.
    * @param id the id of the accelerator
    * @return a localized label for the accelerator
    */
-  KDECORE_EXPORT TQString label(StdAccel id);
+  TDECORE_EXPORT TQString label(StdAccel id);
 
   /**
    * Returns an extended WhatsThis description for the given accelerator.
    * @param id the id of the accelerator
    * @return a localized description of the accelerator
    */
-  KDECORE_EXPORT TQString whatsThis(StdAccel id);
+  TDECORE_EXPORT TQString whatsThis(StdAccel id);
 
   /**
    * Return the StdAccel id of the standard accel action which
@@ -118,7 +118,7 @@ namespace KStdAccel
    * @return the id of the standard accelerator, or AccelNone if there
    *          is none
    */
-  KDECORE_EXPORT StdAccel findStdAccel( const KKeySequence &keySeq );
+  TDECORE_EXPORT StdAccel findStdAccel( const KKeySequence &keySeq );
 
   /**
    * Returns the hardcoded default shortcut for @p id.
@@ -126,348 +126,348 @@ namespace KStdAccel
    * @param id the id of the accelerator
    * @return the default shortcut of the accelerator
    */
-  KDECORE_EXPORT KShortcut shortcutDefault(StdAccel id);
+  TDECORE_EXPORT KShortcut shortcutDefault(StdAccel id);
   /**
    * Returns the hardcoded default 3 modifier shortcut for @p id.
    * This does not take into account the user's configuration.
    * @param id the id of the accelerator
    * @return the default 3 modifier shortcut
    */
-  KDECORE_EXPORT KShortcut shortcutDefault3(StdAccel id);
+  TDECORE_EXPORT KShortcut shortcutDefault3(StdAccel id);
   /**
    * Returns the hardcoded default 4 modifier shortcut for @p id.
    * This does not take into account the user's configuration.
    * @param id the id of the accelerator
    * @return the default 4 modifier shortcut
    */
-  KDECORE_EXPORT KShortcut shortcutDefault4(StdAccel id);
+  TDECORE_EXPORT KShortcut shortcutDefault4(StdAccel id);
 
   /**
    * Open file. Default: Ctrl-o
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& open();
+  TDECORE_EXPORT const KShortcut& open();
 
   /**
    * Create a new document (or whatever). Default: Ctrl-n
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& openNew();
+  TDECORE_EXPORT const KShortcut& openNew();
 
   /**
    * Close current document. Default: Ctrl-w
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& close();
+  TDECORE_EXPORT const KShortcut& close();
 
   /**
    * Save current document. Default: Ctrl-s
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& save();
+  TDECORE_EXPORT const KShortcut& save();
 
   /**
    * Print current document. Default: Ctrl-p
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& print();
+  TDECORE_EXPORT const KShortcut& print();
 
   /**
    * Quit the program. Default: Ctrl-q
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& quit();
+  TDECORE_EXPORT const KShortcut& quit();
 
   /**
    * Undo last operation. Default: Ctrl-z
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& undo();
+  TDECORE_EXPORT const KShortcut& undo();
 
   /**
    * Redo. Default: Shift-Ctrl-z
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& redo();
+  TDECORE_EXPORT const KShortcut& redo();
 
   /**
    * Cut selected area and store it in the clipboard. Default: Ctrl-x
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& cut();
+  TDECORE_EXPORT const KShortcut& cut();
 
   /**
    * Copy selected area into the clipboard. Default: Ctrl-c
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& copy();
+  TDECORE_EXPORT const KShortcut& copy();
 
   /**
    * Paste contents of clipboard at mouse/cursor position. Default: Ctrl-v
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& paste();
+  TDECORE_EXPORT const KShortcut& paste();
 
   /**
    * Paste the selection at mouse/cursor position. Default: Ctrl-Shift-Insert
    * @return the shortcut of the standard accelerator
    * @since 3.4
    */
-  KDECORE_EXPORT const KShortcut& pasteSelection();
+  TDECORE_EXPORT const KShortcut& pasteSelection();
 
   /**
    * Reload. Default: Ctrl-A
    * @return the shortcut of the standard accelerator
    **/
-  KDECORE_EXPORT const KShortcut& selectAll();
+  TDECORE_EXPORT const KShortcut& selectAll();
 
   /**
    * Delete a word back from mouse/cursor position. Default: Ctrl-Backspace
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& deleteWordBack();
+  TDECORE_EXPORT const KShortcut& deleteWordBack();
 
   /**
    * Delete a word forward from mouse/cursor position. Default: Ctrl-Delete
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& deleteWordForward();
+  TDECORE_EXPORT const KShortcut& deleteWordForward();
 
   /**
    * Find, search. Default: Ctrl-f
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& find();
+  TDECORE_EXPORT const KShortcut& find();
 
   /**
    * Find/search next. Default: F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& findNext();
+  TDECORE_EXPORT const KShortcut& findNext();
 
   /**
    * Find/search previous. Default: Shift-F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& findPrev();
+  TDECORE_EXPORT const KShortcut& findPrev();
 
   /**
    * Find and replace matches. Default: Ctrl-r
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& replace();
+  TDECORE_EXPORT const KShortcut& replace();
 
   /**
    * Zoom in. Default: Ctrl-Plus
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& zoomIn();
+  TDECORE_EXPORT const KShortcut& zoomIn();
 
   /**
    * Zoom out. Default: Ctrl-Minus
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& zoomOut();
+  TDECORE_EXPORT const KShortcut& zoomOut();
 
   /**
    * Toggle insert/overwrite (with visual feedback, e.g. in the statusbar). Default: Insert
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& insert();
+  TDECORE_EXPORT const KShortcut& insert();
 
   /**
    * Goto beginning of the document. Default: Ctrl-Home
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& home();
+  TDECORE_EXPORT const KShortcut& home();
 
   /**
    * Goto end of the document. Default: Ctrl-End
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& end();
+  TDECORE_EXPORT const KShortcut& end();
 
   /**
    * Goto beginning of current line. Default: Home
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& beginningOfLine();
+  TDECORE_EXPORT const KShortcut& beginningOfLine();
 
   /**
    * Goto end of current line. Default: End
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& endOfLine();
+  TDECORE_EXPORT const KShortcut& endOfLine();
 
   /**
    * Scroll up one page. Default: Prior
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& prior();
+  TDECORE_EXPORT const KShortcut& prior();
 
   /**
    * Scroll down one page. Default: Next
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& next();
+  TDECORE_EXPORT const KShortcut& next();
 
   /**
    * Go to line. Default: Ctrl+G
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& gotoLine();
+  TDECORE_EXPORT const KShortcut& gotoLine();
 
   /**
    * Add current page to bookmarks. Default: Ctrl+B
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& addBookmark();
+  TDECORE_EXPORT const KShortcut& addBookmark();
 
   /**
    * Next Tab. Default: Ctrl-<
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  KDECORE_EXPORT const KShortcut& tabNext();
+  TDECORE_EXPORT const KShortcut& tabNext();
 
   /**
    * Previous Tab. Default: Ctrl->
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  KDECORE_EXPORT const KShortcut& tabPrev();
+  TDECORE_EXPORT const KShortcut& tabPrev();
 
   /**
    * Full Screen Mode. Default: Ctrl+Shift+F
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  KDECORE_EXPORT const KShortcut& fullScreen();
+  TDECORE_EXPORT const KShortcut& fullScreen();
 
   /**
    * Help the user in the current situation. Default: F1
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& help();
+  TDECORE_EXPORT const KShortcut& help();
 
   /**
    * Complete text in input widgets. Default Ctrl+E
    * @return the shortcut of the standard accelerator
    **/
-  KDECORE_EXPORT const KShortcut& completion();
+  TDECORE_EXPORT const KShortcut& completion();
 
   /**
    * Iterate through a list when completion returns
    * multiple items. Default: Ctrl+Up
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& prevCompletion();
+  TDECORE_EXPORT const KShortcut& prevCompletion();
 
   /**
    * Iterate through a list when completion returns
    * multiple items. Default: Ctrl+Down
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& nextCompletion();
+  TDECORE_EXPORT const KShortcut& nextCompletion();
 
   /**
    * Find a string within another string or list of strings.
    * Default: Ctrl-T
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& substringCompletion();
+  TDECORE_EXPORT const KShortcut& substringCompletion();
 
   /**
    * Help users iterate through a list of entries. Default: Up
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& rotateUp();
+  TDECORE_EXPORT const KShortcut& rotateUp();
 
   /**
    * Help users iterate through a list of entries. Default: Down
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& rotateDown();
+  TDECORE_EXPORT const KShortcut& rotateDown();
 
   /**
    * popup a context menu. Default: Menu
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& popupMenuContext();
+  TDECORE_EXPORT const KShortcut& popupMenuContext();
 
   /**
    * What's This button. Default: Shift+F1
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& whatsThis();
+  TDECORE_EXPORT const KShortcut& whatsThis();
 
   /**
    * Reload. Default: F5
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& reload();
+  TDECORE_EXPORT const KShortcut& reload();
 
   /**
    * Up. Default: Alt+Up
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& up();
+  TDECORE_EXPORT const KShortcut& up();
 
   /**
    * Back. Default: Alt+Left
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& back();
+  TDECORE_EXPORT const KShortcut& back();
 
   /**
    * Forward. Default: ALT+Right
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& forward();
+  TDECORE_EXPORT const KShortcut& forward();
 
   /**
    * BackwardWord. Default: Ctrl+Left
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& backwardWord();
+  TDECORE_EXPORT const KShortcut& backwardWord();
 
   /**
    * ForwardWord. Default: Ctrl+Right
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& forwardWord();
+  TDECORE_EXPORT const KShortcut& forwardWord();
 
   /**
    * Show Menu Bar.  Default: Ctrl-M
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& showMenubar();
+  TDECORE_EXPORT const KShortcut& showMenubar();
 
 #if !defined(KDE_NO_COMPAT) && !defined(__KSTDACCEL_CPP_)
   /**
    * @deprecated
    * Obsolete.  Use name().  Returns a string representation for @p accel.
    */
-  KDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED;
+  TDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use desc().  Returns a localized description of @p accel.
    */
-  KDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED;
+  TDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use shortcut().  Returns the keybinding for @p accel.
    */
-  KDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED;
+  TDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use shortcutDefault().
    */
-  KDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED;
+  TDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED;
 
   /**
    * @deprecated.  Use KKey(const TQKeyEvent*) == KKey(int).
@@ -484,7 +484,7 @@ namespace KStdAccel
    *
    * @return true if the int value matches the integer representation of the QKeyEvent
    */
-  KDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED;
+  TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED;
 #endif // !KDE_NO_COMPAT
 
 }
diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h
index 47075a066..23b765134 100644
--- a/tdecore/kstringhandler.h
+++ b/tdecore/kstringhandler.h
@@ -66,7 +66,7 @@
  * @author Ian Zepp <icszepp@islc.net>
  * @see KShell
  */
-class KDECORE_EXPORT KStringHandler
+class TDECORE_EXPORT KStringHandler
 {
 public:
     /** Returns the nth word in the string if found
diff --git a/tdecore/ksycoca.h b/tdecore/ksycoca.h
index 52e712989..1d3d32d88 100644
--- a/tdecore/ksycoca.h
+++ b/tdecore/ksycoca.h
@@ -41,7 +41,7 @@ class KSycocaFactoryList;
  * @internal
  * Read-only SYstem COnfiguration CAche
  */
-class KDECORE_EXPORT KSycoca : public TQObject, public DCOPObject
+class TDECORE_EXPORT KSycoca : public TQObject, public DCOPObject
 {
   Q_OBJECT
   K_DCOP
diff --git a/tdecore/ksycocadict.h b/tdecore/ksycocadict.h
index 0cf5eb257..592d6bfef 100644
--- a/tdecore/ksycocadict.h
+++ b/tdecore/ksycocadict.h
@@ -31,7 +31,7 @@ class KSycocaDictStringList;
  * @internal
  * Hash table implementation for the sycoca database file
  */
-class KDECORE_EXPORT KSycocaDict
+class TDECORE_EXPORT KSycocaDict
 {
 public:
    /**
diff --git a/tdecore/ksycocaentry.h b/tdecore/ksycocaentry.h
index 5e3fa2d37..a3cb9595f 100644
--- a/tdecore/ksycocaentry.h
+++ b/tdecore/ksycocaentry.h
@@ -34,7 +34,7 @@ class TQDataStream;
  * @internal
  * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html 
  */
-class KDECORE_EXPORT KSycocaEntry : public KShared
+class TDECORE_EXPORT KSycocaEntry : public KShared
 {
  
 public:
diff --git a/tdecore/ksycocafactory.h b/tdecore/ksycocafactory.h
index 536da2864..100047834 100644
--- a/tdecore/ksycocafactory.h
+++ b/tdecore/ksycocafactory.h
@@ -36,7 +36,7 @@ typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
  * @internal
  * Base class for sycoca factories
  */
-class KDECORE_EXPORT KSycocaFactory
+class TDECORE_EXPORT KSycocaFactory
 {
 public:
    virtual KSycocaFactoryId factoryId() const = 0;
@@ -134,7 +134,7 @@ protected:
 /** This, instead of a typedef, allows to declare "class ..." in header files
  * @internal
  */
-class KDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
 {
 public:
    KSycocaFactoryList() { }
diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h
index 491a14c4c..92917e780 100644
--- a/tdecore/ktempdir.h
+++ b/tdecore/ktempdir.h
@@ -50,7 +50,7 @@ class KTempDirPrivate;
  * @since 3.2
  * @author Joseph Wenninger <jowenn@kde.org>
  */
-class KDECORE_EXPORT KTempDir
+class TDECORE_EXPORT KTempDir
 {
 public:
    /**
diff --git a/tdecore/ktempfile.h b/tdecore/ktempfile.h
index 5b18bf779..18503a534 100644
--- a/tdecore/ktempfile.h
+++ b/tdecore/ktempfile.h
@@ -52,7 +52,7 @@ class KTempFilePrivate;
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KTempFile
+class TDECORE_EXPORT KTempFile
 {
    friend class KSaveFile;
 public:
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h
index 3055f202f..77d0ef169 100644
--- a/tdecore/ktimezones.h
+++ b/tdecore/ktimezones.h
@@ -48,7 +48,7 @@ class KTimezonesPrivate;
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezoneSource :
+class TDECORE_EXPORT KTimezoneSource :
     public KShared
 {
 public:
@@ -82,7 +82,7 @@ private:
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezone
+class TDECORE_EXPORT KTimezone
 {
 public:
     /**
@@ -222,7 +222,7 @@ private:
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezoneDetails
+class TDECORE_EXPORT KTimezoneDetails
 {
 public:
     KTimezoneDetails();
@@ -293,7 +293,7 @@ private:
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezones
+class TDECORE_EXPORT KTimezones
 {
 public:
     KTimezones();
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index f5c4bcc18..973837850 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -45,7 +45,7 @@ class KUniqueApplicationPrivate;
  * @see KApplication DCOPObject
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
+class TDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
 {
   Q_OBJECT
 public:
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index eaa0291b9..0fb86a1c8 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -124,7 +124,7 @@ class KURLPrivate;
  *
  *  @author  Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KURL
+class TDECORE_EXPORT KURL
 {
 public:
   /**
@@ -184,7 +184,7 @@ public:
    * @see KURL
    * @see QValueList
    */
-  class KDECORE_EXPORT List : public TQValueList<KURL>
+  class TDECORE_EXPORT List : public TQValueList<KURL>
   {
   public:
     /**
@@ -1793,8 +1793,8 @@ private:
   unsigned short int m_iPort;
   TQString m_strPath_encoded;
 
-  friend KDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
-  friend KDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
+  friend TDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
+  friend TDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
 private:
   KURLPrivate* d;
 };
@@ -1806,7 +1806,7 @@ private:
  * are nevertheless considered to be unequal.
  * That means no malformed URL equals anything else.
  */
-KDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2 );
+TDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2 );
 
 /**
  * \relates KURL
@@ -1820,9 +1820,9 @@ KDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2 );
  * @param _ignore_trailing Described in KURL::cmp
  * @param _ignore_ref If true, disables comparison of HTML-style references.
  */
-KDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2, bool _ignore_trailing, bool _ignore_ref );
+TDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2, bool _ignore_trailing, bool _ignore_ref );
 
-KDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
-KDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
+TDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
+TDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
 
 #endif
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index 019119600..15dc2d1ad 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -41,7 +41,7 @@ class KURLDragPrivate;
  * To create a drag object, use the KURLDrag constructor.
  * To handle drops, use TQUriDrag::canDecode() and KURLDrag::decode()
  */
-class KDECORE_EXPORT KURLDrag : public TQUriDrag
+class TDECORE_EXPORT KURLDrag : public TQUriDrag
 {
 public:
   /**
diff --git a/tdecore/kuser.h b/tdecore/kuser.h
index 5c43b6b69..12b511f9f 100644
--- a/tdecore/kuser.h
+++ b/tdecore/kuser.h
@@ -42,7 +42,7 @@ template <class T> class TQValueList;
  * @author Tim Jansen <tim@tjansen.de>
  * @since 3.2
  */
-class KDECORE_EXPORT KUser {
+class TDECORE_EXPORT KUser {
 
 public:
 
@@ -253,7 +253,7 @@ struct group;
  * @author Jan Schaefer <j_schaef@informatik.uni-kl.de>
  * @since 3.3
  */
-class KDECORE_EXPORT KUserGroup {
+class TDECORE_EXPORT KUserGroup {
 
 public:
 
diff --git a/tdecore/kvmallocator.h b/tdecore/kvmallocator.h
index 50ce78e8d..5cfacb6c3 100644
--- a/tdecore/kvmallocator.h
+++ b/tdecore/kvmallocator.h
@@ -36,7 +36,7 @@ class KVMAllocatorPrivate;
  * 
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KVMAllocator
+class TDECORE_EXPORT KVMAllocator
 {
 public:
     struct Block;
diff --git a/tdecore/kwin.h b/tdecore/kwin.h
index 36cccb125..d3df42bd6 100644
--- a/tdecore/kwin.h
+++ b/tdecore/kwin.h
@@ -58,7 +58,7 @@ class NETWinInfo;
  * @see NetWinInfo
  * @author Matthias Ettrich (ettrich@kde.org)
 */
-class KDECORE_EXPORT KWin
+class TDECORE_EXPORT KWin
 {
 public:
 
@@ -466,7 +466,7 @@ public:
     /**
      * @deprecated Use WindowInfo .
      */
-    struct KDECORE_EXPORT Info
+    struct TDECORE_EXPORT Info
     {
       /// The window's id.
 	WId win;
@@ -519,7 +519,7 @@ private:
  * Information about a window.
  * @since 3.2
  */
-class KDECORE_EXPORT KWin::WindowInfo
+class TDECORE_EXPORT KWin::WindowInfo
 {
 public:
     /**
diff --git a/tdecore/kwinmodule.h b/tdecore/kwinmodule.h
index 6083d9b85..261449a16 100644
--- a/tdecore/kwinmodule.h
+++ b/tdecore/kwinmodule.h
@@ -53,7 +53,7 @@ class KWinModulePrivate;
  * @short Base class for KDE Window Manager modules.
  * @author Matthias Ettrich (ettrich@kde.org)
  */
-class KDECORE_EXPORT KWinModule : public TQObject
+class TDECORE_EXPORT KWinModule : public TQObject
 {
     Q_OBJECT
 
diff --git a/tdecore/kxerrorhandler.h b/tdecore/kxerrorhandler.h
index 9c0bd1e24..ab017ace2 100644
--- a/tdecore/kxerrorhandler.h
+++ b/tdecore/kxerrorhandler.h
@@ -54,7 +54,7 @@
  * @author Lubos Lunak <l.lunak@kde.org>
  * @short Handler for X errors
  */
-class KDECORE_EXPORT KXErrorHandler
+class TDECORE_EXPORT KXErrorHandler
     {
     public:
         /**
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index a5604c817..34fc559ac 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -49,7 +49,7 @@ class KXMessagesPrivate;
  * @author Lubos Lunak <l.lunak@kde.org>
  */
 // KDE4 - make this internal for KStartupInfo only?
-class KDECORE_EXPORT KXMessages
+class TDECORE_EXPORT KXMessages
     : public TQWidget
     {
     Q_OBJECT
diff --git a/tdecore/netsupp.h b/tdecore/netsupp.h
index a94040d44..3519d7a35 100644
--- a/tdecore/netsupp.h
+++ b/tdecore/netsupp.h
@@ -162,10 +162,10 @@ struct kde_addrinfo
   int origin;
 };
 
-extern KDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
+extern TDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
 			   const struct addrinfo* hint,
 			   struct kde_addrinfo** result);
-extern KDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *p);
+extern TDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *p);
 
 #if !defined(HAVE_GETADDRINFO) || defined(HAVE_BROKEN_GETADDRINFO)
 
@@ -253,15 +253,15 @@ struct addrinfo
 namespace KDE
 {
   /** \internal */
-  extern KDECORE_EXPORT int getaddrinfo(const char *name, const char *service,
+  extern TDECORE_EXPORT int getaddrinfo(const char *name, const char *service,
 			 const struct addrinfo* hint,
 			 struct addrinfo** result);
   /** \internal */
-  extern KDECORE_EXPORT void freeaddrinfo(struct addrinfo* ai);
+  extern TDECORE_EXPORT void freeaddrinfo(struct addrinfo* ai);
   /** \internal */
-  extern KDECORE_EXPORT char *gai_strerror(int errorcode);
+  extern TDECORE_EXPORT char *gai_strerror(int errorcode);
   /** \internal */
-  extern KDECORE_EXPORT int getnameinfo(const struct sockaddr *sa,
+  extern TDECORE_EXPORT int getnameinfo(const struct sockaddr *sa,
 			 unsigned int salen,
 			 char *host, size_t hostlen,
 			 char *serv, size_t servlen,
@@ -281,7 +281,7 @@ namespace KDE
 namespace KDE
 {
   /** \internal */
-  extern KDECORE_EXPORT int inet_pton(int af, const char *cp, void* buf);
+  extern TDECORE_EXPORT int inet_pton(int af, const char *cp, void* buf);
 }
 
 # define inet_pton	KDE::inet_pton
@@ -292,7 +292,7 @@ namespace KDE
 namespace KDE
 {
   /** \internal */
-  extern KDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len);
+  extern TDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len);
 }
 
 # define inet_ntop	KDE::inet_ntop
diff --git a/tdecore/netsupp_win32.cpp b/tdecore/netsupp_win32.cpp
index 316c5f4cd..fcdb8bef3 100644
--- a/tdecore/netsupp_win32.cpp
+++ b/tdecore/netsupp_win32.cpp
@@ -23,12 +23,12 @@
 
 #include "netsupp.h"
 
-KDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *ai)
+TDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *ai)
 {
 	//TODO
 }
 
-KDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
+TDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
 		    const struct addrinfo* hint,
 		    struct kde_addrinfo** result)
 {
@@ -37,7 +37,7 @@ KDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
 	return err;
 }
 
-KDECORE_EXPORT char *gai_strerror(int errorcode)
+TDECORE_EXPORT char *gai_strerror(int errorcode)
 {
   return 0;
 }
@@ -51,13 +51,13 @@ int getnameinfo(const struct sockaddr *sa,
 	return -1;
 }
 
-KDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
+TDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 {
 	//TODO
 	return 0;
 }
 
-KDECORE_EXPORT int inet_pton(int af, const char *cp, void *buf)
+TDECORE_EXPORT int inet_pton(int af, const char *cp, void *buf)
 {
 	//TODO
 	return -1;
diff --git a/tdecore/netwm.h b/tdecore/netwm.h
index cc39ada1d..18d5041fe 100644
--- a/tdecore/netwm.h
+++ b/tdecore/netwm.h
@@ -55,7 +55,7 @@ template <class Z> class NETRArray;
    @see KWin
  **/
 
-class KDECORE_EXPORT NETRootInfo : public NET {
+class TDECORE_EXPORT NETRootInfo : public NET {
 public:
     /**
         Indexes for the properties array.
@@ -775,7 +775,7 @@ private:
  use it instead of NETRootInfo and override also the added virtual methods.
  @since 3.2
 */
-class KDECORE_EXPORT NETRootInfo2
+class TDECORE_EXPORT NETRootInfo2
     : public NETRootInfo
 {
 public:
@@ -847,7 +847,7 @@ protected:
  use it instead of NETRootInfo and override also the added virtual methods.
  @since 3.3
 */
-class KDECORE_EXPORT NETRootInfo3
+class TDECORE_EXPORT NETRootInfo3
     : public NETRootInfo2
 {
 public:
@@ -899,7 +899,7 @@ protected:
  use it instead of NETRootInfo and override also the added virtual methods.
  @since 3.5
 */
-class KDECORE_EXPORT NETRootInfo4
+class TDECORE_EXPORT NETRootInfo4
     : public NETRootInfo3
 {
 public:
@@ -936,7 +936,7 @@ protected:
    @see http://www.freedesktop.org/standards/wm-spec/
  **/
 
-class KDECORE_EXPORT NETWinInfo : public NET {
+class TDECORE_EXPORT NETWinInfo : public NET {
 public:
     /**
         Indexes for the properties array.
diff --git a/tdecore/netwm_def.h b/tdecore/netwm_def.h
index 1f6860243..c2a8e49b0 100644
--- a/tdecore/netwm_def.h
+++ b/tdecore/netwm_def.h
@@ -232,7 +232,7 @@ struct NETStrut {
   @see http://www.freedesktop.org/standards/wm-spec/
  **/
 
-class KDECORE_EXPORT NET {
+class TDECORE_EXPORT NET {
 public:
     /**
        Application role.  This is used internally to determine how several action
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 8f9dde92c..dffffb5e8 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -55,7 +55,7 @@ class KBufferedSocketPrivate;
  * @see KNetwork::KStreamSocket, KNetwork::KServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class KDECORE_EXPORT KBufferedSocket: public KStreamSocket
+class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 75e796ffc..8228015a0 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -50,7 +50,7 @@ class KClientSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KClientSocketBase :
+class TDECORE_EXPORT KClientSocketBase :
 #ifdef USE_QT4
 #else // USE_QT4
 public TQObject,
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index becbe404a..62b17a0c3 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -48,7 +48,7 @@ class KResolverEntry;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KDatagramPacket
+class TDECORE_EXPORT KDatagramPacket
 {
   TQByteArray m_data;
   KSocketAddress m_address;
@@ -177,7 +177,7 @@ class KDatagramSocketPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KDatagramSocket: public KClientSocketBase
+class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h
index 7c9908ad5..65c2a8f4f 100644
--- a/tdecore/network/khttpproxysocketdevice.h
+++ b/tdecore/network/khttpproxysocketdevice.h
@@ -40,7 +40,7 @@ class KHttpProxySocketDevicePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice
+class TDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice
 {
 public:
   /**
diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/kmulticastsocket.h
index 7fbd6e0f2..848e64491 100644
--- a/tdecore/network/kmulticastsocket.h
+++ b/tdecore/network/kmulticastsocket.h
@@ -45,7 +45,7 @@ class KMulticastSocketPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KMulticastSocket: public KDatagramSocket
+class TDECORE_EXPORT KMulticastSocket: public KDatagramSocket
 {
   // Q_add-it-here_OBJECT
 public:
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index 069428904..1b13d676b 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -63,7 +63,7 @@ class KResolverEntryPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolverEntry
+class TDECORE_EXPORT KResolverEntry
 {
 public:
   /**
@@ -194,7 +194,7 @@ class KResolverResultsPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolverResults: public TQValueList<KResolverEntry>
+class TDECORE_EXPORT KResolverResults: public TQValueList<KResolverEntry>
 {
 public:
   /**
@@ -292,7 +292,7 @@ class KResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolver: public TQObject
+class TDECORE_EXPORT KResolver: public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 1f26f4a2a..044606a63 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -47,7 +47,7 @@ class KReverseResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KReverseResolver: public TQObject
+class TDECORE_EXPORT KReverseResolver: public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index a07ed54a1..c8cef3db3 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -104,7 +104,7 @@ class KServerSocketPrivate;
  * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class KDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
+class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/ksocketaddress.h b/tdecore/network/ksocketaddress.h
index 75deb60ae..6f7869323 100644
--- a/tdecore/network/ksocketaddress.h
+++ b/tdecore/network/ksocketaddress.h
@@ -59,7 +59,7 @@ class KUnixSocketAddress;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KIpAddress
+class TDECORE_EXPORT KIpAddress
 {
 public:
   /**
@@ -420,7 +420,7 @@ class KSocketAddressData;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KSocketAddress
+class TDECORE_EXPORT KSocketAddress
 {
 public:
   /**
@@ -648,7 +648,7 @@ public:				// static
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KInetSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public KSocketAddress
 {
   friend class KSocketAddress;
 public:
@@ -837,7 +837,7 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KUnixSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public KSocketAddress
 {
   friend class KSocketAddress;
 public:
diff --git a/tdecore/network/ksocketbase.h b/tdecore/network/ksocketbase.h
index 8a94cbbcb..dd1e1e515 100644
--- a/tdecore/network/ksocketbase.h
+++ b/tdecore/network/ksocketbase.h
@@ -94,7 +94,7 @@ class KSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KSocketBase
+class TDECORE_EXPORT KSocketBase
 {
 public:
   /**
@@ -440,7 +440,7 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase
+class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase
 {
 public:
   /**
@@ -689,7 +689,7 @@ protected:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase
+class TDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase
 {
 public:
   /**
diff --git a/tdecore/network/ksocketdevice.h b/tdecore/network/ksocketdevice.h
index 7c288b722..8b972c2cc 100644
--- a/tdecore/network/ksocketdevice.h
+++ b/tdecore/network/ksocketdevice.h
@@ -47,7 +47,7 @@ class KSocketDevicePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
+class TDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
 {
 public:
   /**
diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h
index 4db5d1e01..e622b3abc 100644
--- a/tdecore/network/ksockssocketdevice.h
+++ b/tdecore/network/ksockssocketdevice.h
@@ -37,7 +37,7 @@ namespace KNetwork {
  *
  * @warning This code is untested!
  */
-class KDECORE_EXPORT KSocksSocketDevice: public KSocketDevice
+class TDECORE_EXPORT KSocksSocketDevice: public KSocketDevice
 {
 public:
   /** 
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 9b58bf23a..0308eb9ab 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -94,7 +94,7 @@ class KStreamSocketPrivate;
  * @see KNetwork::KBufferedSocket, KNetwork::KServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class KDECORE_EXPORT KStreamSocket: public KClientSocketBase
+class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/svgicons/ksvgiconengine.h b/tdecore/svgicons/ksvgiconengine.h
index 3ef2063e9..b4fe50ed4 100644
--- a/tdecore/svgicons/ksvgiconengine.h
+++ b/tdecore/svgicons/ksvgiconengine.h
@@ -27,7 +27,7 @@
 
 class KSVGIconPainter;
 
-class KDECORE_EXPORT KSVGIconEngine
+class TDECORE_EXPORT KSVGIconEngine
 {
 public:
 	KSVGIconEngine();
diff --git a/tdecore/svgicons/ksvgiconpainter.h b/tdecore/svgicons/ksvgiconpainter.h
index 6b00d9d7c..b80eccea8 100644
--- a/tdecore/svgicons/ksvgiconpainter.h
+++ b/tdecore/svgicons/ksvgiconpainter.h
@@ -30,7 +30,7 @@ class TQWMatrix;
 class TQDomElement;
 class TQPointArray;
 
-class KDECORE_EXPORT KSVGIconPainter
+class TDECORE_EXPORT KSVGIconPainter
 {
 public:
 	KSVGIconPainter(int width, int height);
diff --git a/tdefx/kcpuinfo.h b/tdefx/kcpuinfo.h
index ce39ded82..69c840e46 100644
--- a/tdefx/kcpuinfo.h
+++ b/tdefx/kcpuinfo.h
@@ -36,7 +36,7 @@
  *
  * @since 3.2
  */
-class KDEFX_EXPORT KCPUInfo
+class TDEFX_EXPORT KCPUInfo
 {
     public:
        /**
diff --git a/tdefx/kdrawutil.cpp b/tdefx/kdrawutil.cpp
index 83fe7d300..0610865cb 100644
--- a/tdefx/kdrawutil.cpp
+++ b/tdefx/kdrawutil.cpp
@@ -18,7 +18,7 @@
 #include "kdrawutil.h"
 #include <tqdrawutil.h>
 
-KDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
+TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
                      const TQColorGroup &g, bool sunken,
                      const TQBrush *fill)
 {
@@ -40,13 +40,13 @@ KDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
 }
 
 
-KDEFX_EXPORT void kDrawNextButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
+TDEFX_EXPORT void kDrawNextButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
                      bool sunken, const TQBrush *fill)
 {
     kDrawNextButton(p, r.x(), r.y(), r.width(), r.height(), g, sunken, fill);
 }
 
-KDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
+TDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
                    const TQColorGroup &g, bool sunken, const TQBrush *fill)
 {
     TQPen oldPen = p->pen();
@@ -90,13 +90,13 @@ KDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
     p->setPen(oldPen);
 }
 
-KDEFX_EXPORT void kDrawBeButton(TQPainter *p, TQRect &r, const TQColorGroup &g, bool sunken,
+TDEFX_EXPORT void kDrawBeButton(TQPainter *p, TQRect &r, const TQColorGroup &g, bool sunken,
                    const TQBrush *fill)
 {
     kDrawBeButton(p, r.x(), r.y(), r.width(), r.height(), g, sunken, fill);
 }
 
-KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
+TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
                       bool sunken)
 {
     int x, y, x2, y2;
@@ -136,7 +136,7 @@ KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, const TQRect &r, const TQColorG
         qDrawWinPanel(p, x, y, r.width(), r.height(), g, sunken);
 }
 
-KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
+TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
                       const TQColorGroup &g, bool sunken)
 {
     TQRect r(x, y, w, h);
@@ -145,7 +145,7 @@ KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
 
 #define QCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2)
 
-KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear)
+TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear)
 {
     // round edge fills
     static const TQCOORD btm_left_fill[]={ 0,0,1,0,2,0,3,0,4,0,0,1,1,1,2,1,3,1,4,1,
@@ -194,7 +194,7 @@ KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool
         p->fillRect(x, y, w, h, fillBrush);
 }
 
-KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h)
+TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h)
 {
     // using a bunch of TQRect lines seems much more efficient than bitmaps or
     // point arrays, even tho it uses more statements
@@ -214,7 +214,7 @@ KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h)
     r += TQRect(x2, y+6, 1, h-12);
 }
 
-KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y,
+TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y,
                    TQBitmap *lightColor, TQBitmap *midColor,
                    TQBitmap *midlightColor, TQBitmap *darkColor,
                    TQBitmap *blackColor, TQBitmap *whiteColor)
@@ -236,7 +236,7 @@ KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
     }
 }
 
-KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y, int w,
+TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y, int w,
                    int h, bool isXBitmaps, const uchar *lightColor,
                    const uchar *midColor, const uchar *midlightColor,
                    const uchar *darkColor, const uchar *blackColor,
diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h
index 6aa0f3c44..76d6070c3 100644
--- a/tdefx/kdrawutil.h
+++ b/tdefx/kdrawutil.h
@@ -45,14 +45,14 @@
  * @param fill    The brush to use for filling the interior of the button.
  *                Pass @a null to prevent the button from being filled.
  */
-KDEFX_EXPORT void kDrawNextButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
+TDEFX_EXPORT void kDrawNextButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
                      bool sunken=false, const TQBrush *fill=0);
 
 /**
  * @relates KStyle
  * @overload
  */
-KDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
+TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
                      const TQColorGroup &g, bool sunken=false, 
                      const TQBrush *fill=0);
 
@@ -69,7 +69,7 @@ KDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
  * @param fill    The brush to use for filling the interior of the button.
  *                Pass @a null to prevent the button from being filled.
  */
-KDEFX_EXPORT void kDrawBeButton(TQPainter *p, TQRect &r, const TQColorGroup &g,
+TDEFX_EXPORT void kDrawBeButton(TQPainter *p, TQRect &r, const TQColorGroup &g,
                    bool sunken=false, const TQBrush *fill=0);
 
 /**
@@ -77,7 +77,7 @@ KDEFX_EXPORT void kDrawBeButton(TQPainter *p, TQRect &r, const TQColorGroup &g,
  * @c \#include @c <kdrawutil.h>
  * @overload
  */
-KDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
+TDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
                    const TQColorGroup &g, bool sunken=false, 
                    const TQBrush *fill=0);
 
@@ -93,14 +93,14 @@ KDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
  * @param g       Specifies the shading colors.
  * @param sunken  Whether to draw the button as sunken (pressed) or not.
  */
-KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
+TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, const TQRect &r, const TQColorGroup &g,
                       bool sunken=false);
 
 /**
  * @relates KStyle
  * @overload
  */
-KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
+TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
                       const TQColorGroup &g, bool sunken=false);
 
 /**
@@ -118,7 +118,7 @@ KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
  *
  * @see kDrawRoundButton() and kDrawRoundMask()
  */
-KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
+TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
 
 /**
  * @relates KStyle
@@ -135,7 +135,7 @@ KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
  * @param clear  Whether to clear the rectangle specified by @p (x, y, w, h) to
  *               Qt::color0 before drawing the mask.
  */
-KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false);
+TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false);
 
 /**
  * @relates KStyle
@@ -161,7 +161,7 @@ KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool
  *
  * @see QColorGroup
  */
-KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y,
+TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y,
                    TQBitmap *lightColor=0, TQBitmap *midColor=0,
                    TQBitmap *midlightColor=0, TQBitmap *darkColor=0,
                    TQBitmap *blackColor=0, TQBitmap *whiteColor=0);
@@ -171,7 +171,7 @@ KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
  * @c \#include @c <kdrawutil.h>
  * @overload
  */
- KDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y, int w,
+ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int y, int w,
                    int h, bool isXBitmaps=true, const uchar *lightColor = 0,
                    const uchar *midColor=0, const uchar *midlightColor=0,
                    const uchar *darkColor=0, const uchar *blackColor=0,
diff --git a/tdefx/kimageeffect.h b/tdefx/kimageeffect.h
index 8d73e5bfb..77a6fc9c1 100644
--- a/tdefx/kimageeffect.h
+++ b/tdefx/kimageeffect.h
@@ -47,7 +47,7 @@ class TQRect;
  * just call the static methods. They are encapsulated here merely to provide
  * a common namespace.
  */
-class KDEFX_EXPORT KImageEffect
+class TDEFX_EXPORT KImageEffect
 {
 public:
     /**
diff --git a/tdefx/kpixmap.h b/tdefx/kpixmap.h
index 34397791e..a9cade98f 100644
--- a/tdefx/kpixmap.h
+++ b/tdefx/kpixmap.h
@@ -54,7 +54,7 @@ class KPixmapPrivate;
  * @author Mark Donohoe (donohoe@kde.org)
  * @version $Id$
  */
-class KDEFX_EXPORT KPixmap : public TQPixmap
+class TDEFX_EXPORT KPixmap : public TQPixmap
 {
 public:
 	/**
diff --git a/tdefx/kpixmapeffect.h b/tdefx/kpixmapeffect.h
index c0c8ac68c..79df92856 100644
--- a/tdefx/kpixmapeffect.h
+++ b/tdefx/kpixmapeffect.h
@@ -24,7 +24,7 @@ class TQColor;
  * just call the static methods. They are encapsulated here merely to provide
  * a common namespace.
  */
-class KDEFX_EXPORT KPixmapEffect
+class TDEFX_EXPORT KPixmapEffect
 {
 public:
     enum GradientType { VerticalGradient, HorizontalGradient,
diff --git a/tdefx/kpixmapsplitter.h b/tdefx/kpixmapsplitter.h
index 84b5a8647..3cb25ca97 100644
--- a/tdefx/kpixmapsplitter.h
+++ b/tdefx/kpixmapsplitter.h
@@ -50,7 +50,7 @@ class KPixmapSplitterPrivate;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEFX_EXPORT KPixmapSplitter
+class TDEFX_EXPORT KPixmapSplitter
 {
 public:
     /**
diff --git a/tdefx/kstyle.h b/tdefx/kstyle.h
index 42bd1a231..9f87af881 100644
--- a/tdefx/kstyle.h
+++ b/tdefx/kstyle.h
@@ -54,7 +54,7 @@ struct KStylePrivate;
  * @author Karol Szwed (gallium@kde.org)
  * @version $Id$
  */
-class KDEFX_EXPORT KStyle: public TQCommonStyle
+class TDEFX_EXPORT KStyle: public TQCommonStyle
 {
 	Q_OBJECT
 	TQ_OBJECT
diff --git a/tdeprint/CMakeLists.txt b/tdeprint/CMakeLists.txt
index bdbacc0bb..a7a97809f 100644
--- a/tdeprint/CMakeLists.txt
+++ b/tdeprint/CMakeLists.txt
@@ -121,4 +121,4 @@ tde_add_library( ${target} SHARED AUTOMOC
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
-set_target_properties( ${target}-shared PROPERTIES COMPILE_FLAGS -D_KDEPRINT_COMPILE )
+set_target_properties( ${target}-shared PROPERTIES COMPILE_FLAGS -D_TDEPRINT_COMPILE )
diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am
index fecf25c64..b70e46e93 100644
--- a/tdeprint/Makefile.am
+++ b/tdeprint/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 if include_cups_SUBDIR
 CUPSSUBDIR=cups
@@ -11,7 +11,7 @@ INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/kded -I$(top_srcdir) $(all_inclu
 kde_module_LTLIBRARIES = kded_tdeprintd.la
 
 kded_tdeprintd_la_SOURCES = tdeprintd.skel tdeprintd.cpp kprintprocess.cpp
-kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(top_builddir)/kded/libtdeinit_kded.la
+kded_tdeprintd_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(top_builddir)/kded/libtdeinit_kded.la
 kded_tdeprintd_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #kded_tdeprintd_la_METASOURCES = AUTO
 
@@ -30,7 +30,7 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp
 
 libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)
+libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
 libtdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
 libtdeprint_la_METASOURCES = AUTO
 
diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt
index 2166cc08f..62c48618c 100644
--- a/tdeprint/cups/CMakeLists.txt
+++ b/tdeprint/cups/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( cupsdconf2 )
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am
index 6f3d7edec..64e8b997d 100644
--- a/tdeprint/cups/Makefile.am
+++ b/tdeprint/cups/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 SUBDIRS = cupsdconf2
 
@@ -15,7 +15,7 @@ tdeprint_cups_la_SOURCES = cupsinfos.cpp ipprequest.cpp kmcupsfactory.cpp kmcups
 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
 				  kptagspage.cpp
 tdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+tdeprint_cups_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
 tdeprint_cups_la_METASOURCES = AUTO
 
 noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am
index 434af6a3c..eb7e42159 100644
--- a/tdeprint/cups/cupsdconf2/Makefile.am
+++ b/tdeprint/cups/cupsdconf2/Makefile.am
@@ -15,7 +15,7 @@ cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.
 			  qdirmultilineedit.cpp sizewidget.cpp main.cpp
 cupsdconf_la_METASOURCES = AUTO
 cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
-cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 
 noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
 		 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index e6338eb8c..bc91f9ffe 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -55,11 +55,11 @@ static TQString	pass_string;
 extern "C"
 {
 #include "cups-util.h"
-	KDEPRINT_EXPORT bool restartServer(TQString& msg)
+	TDEPRINT_EXPORT bool restartServer(TQString& msg)
 	{
 		return CupsdDialog::restartServer(msg);
 	}
-	KDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg)
+	TDEPRINT_EXPORT bool configureServer(TQWidget *parent, TQString& msg)
 	{
 		dynamically_loaded = true;
 		bool result = CupsdDialog::configure(TQString::null, parent, &msg);
diff --git a/tdeprint/driver.h b/tdeprint/driver.h
index 7064e5335..423f8c85b 100644
--- a/tdeprint/driver.h
+++ b/tdeprint/driver.h
@@ -21,7 +21,7 @@
 #ifndef DRIVER_H
 #define DRIVER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -58,7 +58,7 @@ class DrPageSize;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrBase
+class TDEPRINT_EXPORT DrBase
 {
 public:
 	enum Type { Base = 0, Main, ChoiceGroup, Group, String, Integer, Float, List, Boolean };
@@ -103,7 +103,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrGroup : public DrBase
+class TDEPRINT_EXPORT DrGroup : public DrBase
 {
 public:
 	DrGroup();
@@ -150,7 +150,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrMain : public DrGroup
+class TDEPRINT_EXPORT DrMain : public DrGroup
 {
 public:
 	DrMain();
@@ -202,7 +202,7 @@ public:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrStringOption : public DrBase
+class TDEPRINT_EXPORT DrStringOption : public DrBase
 {
 public:
 	DrStringOption();
@@ -226,7 +226,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrIntegerOption : public DrBase
+class TDEPRINT_EXPORT DrIntegerOption : public DrBase
 {
 public:
 	DrIntegerOption();
@@ -251,7 +251,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrFloatOption : public DrBase
+class TDEPRINT_EXPORT DrFloatOption : public DrBase
 {
 public:
 	DrFloatOption();
@@ -276,7 +276,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrListOption : public DrBase
+class TDEPRINT_EXPORT DrListOption : public DrBase
 {
 public:
 	DrListOption();
@@ -308,7 +308,7 @@ protected:
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT DrBooleanOption : public DrListOption
+class TDEPRINT_EXPORT DrBooleanOption : public DrListOption
 {
 	/* just an overloaded class, with different type */
 public:
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index 4ec06c5fa..e0ba373ca 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -30,13 +30,13 @@
 class DrOptionView;
 class DrMain;
 
-class KDEPRINT_EXPORT DrListView : public KListView
+class TDEPRINT_EXPORT DrListView : public KListView
 {
 public:
 	DrListView(TQWidget *parent = 0, const char *name = 0);
 };
 
-class KDEPRINT_EXPORT DriverView : public TQWidget
+class TDEPRINT_EXPORT DriverView : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/ext/CMakeLists.txt b/tdeprint/ext/CMakeLists.txt
index 9f4b2d629..83b1e3dab 100644
--- a/tdeprint/ext/CMakeLists.txt
+++ b/tdeprint/ext/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/ext/Makefile.am b/tdeprint/ext/Makefile.am
index 66e547c9d..1cfccec43 100644
--- a/tdeprint/ext/Makefile.am
+++ b/tdeprint/ext/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes)
 
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdeprint_ext.la
 
 tdeprint_ext_la_SOURCES = kmextfactory.cpp kmextmanager.cpp kextprinterimpl.cpp kmextuimanager.cpp
 tdeprint_ext_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_ext_la_LIBADD = $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
+tdeprint_ext_la_LIBADD = $(LIB_TDEPRINT) $(LIB_QT) $(LIB_TDECORE)
 tdeprint_ext_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmextmanager.h kextprinterimpl.h kmextuimanager.h
diff --git a/tdeprint/foomatic2loader.h b/tdeprint/foomatic2loader.h
index 19cfc9d9d..dc2419f87 100644
--- a/tdeprint/foomatic2loader.h
+++ b/tdeprint/foomatic2loader.h
@@ -28,7 +28,7 @@
 class DrBase;
 class DrMain;
 
-class KDEPRINT_EXPORT Foomatic2Loader
+class TDEPRINT_EXPORT Foomatic2Loader
 {
 public:
 	Foomatic2Loader();
diff --git a/tdeprint/kmdbentry.h b/tdeprint/kmdbentry.h
index cccec92b6..e2ca1dfd0 100644
--- a/tdeprint/kmdbentry.h
+++ b/tdeprint/kmdbentry.h
@@ -25,7 +25,7 @@
 
 #include <kdelibs_export.h>
 
-struct KDEPRINT_EXPORT KMDBEntry
+struct TDEPRINT_EXPORT KMDBEntry
 {
 	// the file location of the driver
 	TQString	file;
diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h
index 168385f6e..8bfc9961d 100644
--- a/tdeprint/kmfactory.h
+++ b/tdeprint/kmfactory.h
@@ -42,7 +42,7 @@ class KLibFactory;
 class KConfig;
 class KPReloadObject;
 
-class KDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
+class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
 {
 	Q_OBJECT
 	K_DCOP
diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h
index d8fed5e8d..b4a31bf50 100644
--- a/tdeprint/kmjob.h
+++ b/tdeprint/kmjob.h
@@ -21,7 +21,7 @@
 #ifndef KMJOB_H
 #define KMJOB_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -37,7 +37,7 @@
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJob : public KMObject
+class TDEPRINT_EXPORT KMJob : public KMObject
 {
 public:
 	enum JobAction {
diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h
index 89cabaa7c..cfdf09bfc 100644
--- a/tdeprint/kmjobmanager.h
+++ b/tdeprint/kmjobmanager.h
@@ -20,7 +20,7 @@
 #ifndef KMJOBMANAGER_H
 #define KMJOBMANAGER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -43,7 +43,7 @@ class KAction;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJobManager : public TQObject
+class TDEPRINT_EXPORT KMJobManager : public TQObject
 {
 	Q_OBJECT
 
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index df78adcd3..d5742bb39 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -20,7 +20,7 @@
 #ifndef KMMANAGER_H
 #define KMMANAGER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -45,7 +45,7 @@ class PrinterFilter;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMManager : public TQObject
+class TDEPRINT_EXPORT KMManager : public TQObject
 {
 	Q_OBJECT
 
diff --git a/tdeprint/kmobject.h b/tdeprint/kmobject.h
index 5b9358c49..40dd329f7 100644
--- a/tdeprint/kmobject.h
+++ b/tdeprint/kmobject.h
@@ -21,7 +21,7 @@
 #ifndef KMOBJECT_H
 #define KMOBJECT_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/kmprinter.h b/tdeprint/kmprinter.h
index c6c2995e9..ed77c4776 100644
--- a/tdeprint/kmprinter.h
+++ b/tdeprint/kmprinter.h
@@ -20,7 +20,7 @@
 #ifndef KMPRINTER_H
 #define KMPRINTER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -43,7 +43,7 @@ class TQWidget;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMPrinter : public KMObject
+class TDEPRINT_EXPORT KMPrinter : public KMObject
 {
 public:
 	enum PrinterType {
diff --git a/tdeprint/kmuimanager.h b/tdeprint/kmuimanager.h
index 248ad4ed7..e59c61e40 100644
--- a/tdeprint/kmuimanager.h
+++ b/tdeprint/kmuimanager.h
@@ -33,7 +33,7 @@ class KPrinterPropertyDialog;
 class KMConfigDialog;
 class TQListView;
 
-class KDEPRINT_EXPORT KMUiManager : public TQObject
+class TDEPRINT_EXPORT KMUiManager : public TQObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kmvirtualmanager.h b/tdeprint/kmvirtualmanager.h
index 1b7ab4867..db6ea9a51 100644
--- a/tdeprint/kmvirtualmanager.h
+++ b/tdeprint/kmvirtualmanager.h
@@ -32,7 +32,7 @@ class KMPrinter;
 class KMManager;
 class TQWidget;
 
-class KDEPRINT_EXPORT KMVirtualManager : public TQObject, public KPReloadObject
+class TDEPRINT_EXPORT KMVirtualManager : public TQObject, public KPReloadObject
 {
 public:
 	KMVirtualManager(KMManager *parent = 0, const char *name = 0);
diff --git a/tdeprint/kpcopiespage.h b/tdeprint/kpcopiespage.h
index 1e1532ce9..ddb2b4f2a 100644
--- a/tdeprint/kpcopiespage.h
+++ b/tdeprint/kpcopiespage.h
@@ -31,7 +31,7 @@ class TQSpinBox;
 class TQLabel;
 class KPrinter;
 
-class KDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject
+class TDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kpdriverpage.h b/tdeprint/kpdriverpage.h
index 5c3936e49..fbf4cc19a 100644
--- a/tdeprint/kpdriverpage.h
+++ b/tdeprint/kpdriverpage.h
@@ -24,7 +24,7 @@
 
 class DriverView;
 
-class KDEPRINT_EXPORT KPDriverPage : public KPrintDialogPage
+class TDEPRINT_EXPORT KPDriverPage : public KPrintDialogPage
 {
 public:
 	KPDriverPage(KMPrinter *p, DrMain *d = 0, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/kpgeneralpage.h b/tdeprint/kpgeneralpage.h
index 2a211ab04..dc8eef580 100644
--- a/tdeprint/kpgeneralpage.h
+++ b/tdeprint/kpgeneralpage.h
@@ -28,7 +28,7 @@ class TQButtonGroup;
 class TQGroupBox;
 class TQLabel;
 
-class KDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage
+class TDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kpipeprocess.h b/tdeprint/kpipeprocess.h
index 0ead3da78..ca0b5ebb3 100644
--- a/tdeprint/kpipeprocess.h
+++ b/tdeprint/kpipeprocess.h
@@ -25,7 +25,7 @@
 
 #include <kdelibs_export.h>
 
-class KDEPRINT_EXPORT KPipeProcess : public TQFile
+class TDEPRINT_EXPORT KPipeProcess : public TQFile
 {
 public:
 	KPipeProcess(const TQString& cmd = TQString::null, int mode = IO_ReadOnly);
diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h
index 0ab4361f4..8a57ce9e6 100644
--- a/tdeprint/kpqtpage.h
+++ b/tdeprint/kpqtpage.h
@@ -29,7 +29,7 @@ class TQComboBox;
 class TQLabel;
 class DrMain;
 
-class KDEPRINT_EXPORT KPQtPage : public KPrintDialogPage
+class TDEPRINT_EXPORT KPQtPage : public KPrintDialogPage
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kpreloadobject.h b/tdeprint/kpreloadobject.h
index 09bbe97d6..14b5e9314 100644
--- a/tdeprint/kpreloadobject.h
+++ b/tdeprint/kpreloadobject.h
@@ -22,7 +22,7 @@
 
 #include <kdelibs_export.h>
 
-class KDEPRINT_EXPORT KPReloadObject
+class TDEPRINT_EXPORT KPReloadObject
 {
 friend class KMFactory;
 public:
diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h
index f6ba35d34..5c8688e8f 100644
--- a/tdeprint/kprintaction.h
+++ b/tdeprint/kprintaction.h
@@ -24,7 +24,7 @@
 
 class KPrinter;
 
-class KDEPRINT_EXPORT KPrintAction : public KActionMenu
+class TDEPRINT_EXPORT KPrintAction : public KActionMenu
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprintdialog.h b/tdeprint/kprintdialog.h
index 77484ca58..c6329b304 100644
--- a/tdeprint/kprintdialog.h
+++ b/tdeprint/kprintdialog.h
@@ -20,7 +20,7 @@
 #ifndef KPRINTDIALOG_H
 #define KPRINTDIALOG_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -38,7 +38,7 @@ class KPrintDialogPage;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject
+class TDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h
index d9b44b6ea..aebf3acf7 100644
--- a/tdeprint/kprintdialogpage.h
+++ b/tdeprint/kprintdialogpage.h
@@ -87,7 +87,7 @@ class DrMain;
  * @short Base class for customized print dialog pages.
  * @see KPrinter
  */
-class KDEPRINT_EXPORT KPrintDialogPage : public TQWidget
+class TDEPRINT_EXPORT KPrintDialogPage : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h
index 4910c23ef..7d7e7ea4d 100644
--- a/tdeprint/kprinter.h
+++ b/tdeprint/kprinter.h
@@ -79,13 +79,13 @@ class DrPageSize;
  * KPrintDialogPage and adding the page using addDialogPage().
  *
  * When compiling an application that uses KPrinter, you must link to -ltdeprint, which when
- * using the standard KDE build framework can be done by adding $(LIB_KDEPRINT) to _LDADD.
+ * using the standard KDE build framework can be done by adding $(LIB_TDEPRINT) to _LDADD.
  *
  * @short The central interface class to access the KDE print system.
  * @author Michael Goffioul
  * @see TQPrinter, KPrintDialogPage
  */
-class KDEPRINT_EXPORT KPrinter : public TQPaintDevice, public KPReloadObject
+class TDEPRINT_EXPORT KPrinter : public TQPaintDevice, public KPReloadObject
 {
 friend class KPrinterWrapper;
 friend class KPrinterImpl;
@@ -769,8 +769,8 @@ protected:
 
 // Utility functions
 
-KDEPRINT_EXPORT KPrinter::PageSize pageNameToPageSize(const TQString& name);
-KDEPRINT_EXPORT const char* pageSizeToPageName(KPrinter::PageSize s);
+TDEPRINT_EXPORT KPrinter::PageSize pageNameToPageSize(const TQString& name);
+TDEPRINT_EXPORT const char* pageSizeToPageName(KPrinter::PageSize s);
 /**
  * DO NOT USE, WILL BE REMOVED.
  * @obsolete
diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h
index 618d9a429..e8cbecc04 100644
--- a/tdeprint/kprinterimpl.h
+++ b/tdeprint/kprinterimpl.h
@@ -31,7 +31,7 @@
 class KPrinter;
 class KMPrinter;
 
-class KDEPRINT_EXPORT KPrinterImpl : public TQObject
+class TDEPRINT_EXPORT KPrinterImpl : public TQObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprinterpropertydialog.h b/tdeprint/kprinterpropertydialog.h
index 98a37d8bd..e76f38212 100644
--- a/tdeprint/kprinterpropertydialog.h
+++ b/tdeprint/kprinterpropertydialog.h
@@ -30,7 +30,7 @@ class KPrintDialogPage;
 class DrMain;
 class TQTabWidget;
 
-class KDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase
+class TDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kxmlcommand.h b/tdeprint/kxmlcommand.h
index a0ba90c56..657194c2a 100644
--- a/tdeprint/kxmlcommand.h
+++ b/tdeprint/kxmlcommand.h
@@ -30,7 +30,7 @@ class DrMain;
 class DrGroup;
 class DrBase;
 
-class KDEPRINT_EXPORT KXmlCommand : public TQObject
+class TDEPRINT_EXPORT KXmlCommand : public TQObject
 {
 	friend class KXmlCommandManager;
 
@@ -86,7 +86,7 @@ private:
 	KXmlCommandPrivate	*d;
 };
 
-class KDEPRINT_EXPORT KXmlCommandManager : public TQObject
+class TDEPRINT_EXPORT KXmlCommandManager : public TQObject
 {
 public:
 	enum IO_CheckType	{ None = 0, Basic, Advanced };
diff --git a/tdeprint/lpdunix/CMakeLists.txt b/tdeprint/lpdunix/CMakeLists.txt
index 5b30cf46c..8bbe9bf27 100644
--- a/tdeprint/lpdunix/CMakeLists.txt
+++ b/tdeprint/lpdunix/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/lpdunix/Makefile.am b/tdeprint/lpdunix/Makefile.am
index 019ead755..a93163db6 100644
--- a/tdeprint/lpdunix/Makefile.am
+++ b/tdeprint/lpdunix/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint $(all_includes)
 
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdeprint_lpdunix.la
 
 tdeprint_lpdunix_la_SOURCES = kmlpdunixfactory.cpp kmlpdunixmanager.cpp klpdunixprinterimpl.cpp kmlpdunixuimanager.cpp
 tdeprint_lpdunix_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_lpdunix_la_LIBADD =  $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT)
+tdeprint_lpdunix_la_LIBADD =  $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT)
 tdeprint_lpdunix_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmlpdunixmanager.h klpdunixprinterimpl.h kmlpdunixuimanager.h
diff --git a/tdeprint/lpr/CMakeLists.txt b/tdeprint/lpr/CMakeLists.txt
index c893411b1..7e7725ce6 100644
--- a/tdeprint/lpr/CMakeLists.txt
+++ b/tdeprint/lpr/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/lpr/Makefile.am b/tdeprint/lpr/Makefile.am
index a9039888f..3793d982b 100644
--- a/tdeprint/lpr/Makefile.am
+++ b/tdeprint/lpr/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
 
@@ -14,7 +14,7 @@ tdeprint_lpr_la_SOURCES = printcapreader.cpp lprhandler.cpp \
 			     editentrydialog.cpp
 tdeprint_lpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 tdeprint_lpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la \
-    $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE)
+    $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE)
 tdeprint_lpr_la_METASOURCES = AUTO
 
 noinst_HEADERS = printcapreader.h \
diff --git a/tdeprint/lpr/lprhandler.h b/tdeprint/lpr/lprhandler.h
index e0e66e146..840c9bbd9 100644
--- a/tdeprint/lpr/lprhandler.h
+++ b/tdeprint/lpr/lprhandler.h
@@ -20,7 +20,7 @@
 #ifndef LPRHANDLER_H
 #define LPRHANDLER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h
index 01abbeeb3..7b0bf14e7 100644
--- a/tdeprint/lpr/lprsettings.h
+++ b/tdeprint/lpr/lprsettings.h
@@ -20,7 +20,7 @@
 #ifndef LPRSETTINGS_H
 #define LPRSETTINGS_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/lpr/printcapentry.h b/tdeprint/lpr/printcapentry.h
index f8ba99197..b2d3931a8 100644
--- a/tdeprint/lpr/printcapentry.h
+++ b/tdeprint/lpr/printcapentry.h
@@ -20,7 +20,7 @@
 #ifndef PRINTCAPENTRY_H
 #define PRINTCAPENTRY_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt
index 0e12299e6..ccaf2a70a 100644
--- a/tdeprint/management/CMakeLists.txt
+++ b/tdeprint/management/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index 34f8de935..f0d1acd9f 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
 
@@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = kaddprinterwizard.la
 bin_PROGRAMS = 
 
 kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
-kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI)
+kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_TDEUI)
 kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
 
 libtdeprint_management_la_SOURCES = \
@@ -26,12 +26,12 @@ libtdeprint_management_la_SOURCES = \
 	pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
 libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 libtdeprint_management_la_METASOURCES = AUTO
 
 libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp
 libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 
 tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h
 tdeprintdir = $(includedir)/tdeprint
diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h
index de04bc154..6a47995cc 100644
--- a/tdeprint/management/kmconfigdialog.h
+++ b/tdeprint/management/kmconfigdialog.h
@@ -25,7 +25,7 @@
 
 #include "kmconfigpage.h"
 
-class KDEPRINT_EXPORT KMConfigDialog : public KDialogBase
+class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index d56fbde8b..ac0495ab8 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -26,7 +26,7 @@
 
 class KConfig;
 
-class KDEPRINT_EXPORT KMConfigPage : public TQWidget
+class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index 650fe4b15..20f07976f 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -20,7 +20,7 @@
 #ifndef KMJOBVIEWER_H
 #define KMJOBVIEWER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -46,7 +46,7 @@ class TQCheckBox;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject
+class TDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index 0d05692d9..dea30d8ff 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -20,7 +20,7 @@
 #ifndef KMMAINVIEW_H
 #define KMMAINVIEW_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -50,7 +50,7 @@ class TQMenuBar;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
+class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
 {
 	Q_OBJECT
 public:
@@ -128,6 +128,6 @@ private:
 	KToolBar *m_menubar;
 };
 
-KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
+TDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
 
 #endif
diff --git a/tdeprint/management/kmprinterpage.h b/tdeprint/management/kmprinterpage.h
index 25e5b1c12..44d12e356 100644
--- a/tdeprint/management/kmprinterpage.h
+++ b/tdeprint/management/kmprinterpage.h
@@ -20,7 +20,7 @@
 #ifndef KMPRINTERPAGE_H
 #define KMPRINTERPAGE_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
diff --git a/tdeprint/management/kmpropbackend.h b/tdeprint/management/kmpropbackend.h
index 01249d348..8f5768294 100644
--- a/tdeprint/management/kmpropbackend.h
+++ b/tdeprint/management/kmpropbackend.h
@@ -26,7 +26,7 @@
 
 class TQLabel;
 
-class KDEPRINT_EXPORT KMPropBackend : public KMPropWidget
+class TDEPRINT_EXPORT KMPropBackend : public KMPropWidget
 {
 public:
 	KMPropBackend(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmpropdriver.h b/tdeprint/management/kmpropdriver.h
index 247431762..ebc22cb5c 100644
--- a/tdeprint/management/kmpropdriver.h
+++ b/tdeprint/management/kmpropdriver.h
@@ -26,7 +26,7 @@
 
 class TQLabel;
 
-class KDEPRINT_EXPORT KMPropDriver : public KMPropWidget
+class TDEPRINT_EXPORT KMPropDriver : public KMPropWidget
 {
 public:
 	KMPropDriver(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h
index d13338750..3994e9a93 100644
--- a/tdeprint/management/kmpropertypage.h
+++ b/tdeprint/management/kmpropertypage.h
@@ -29,7 +29,7 @@
 class KMPropWidget;
 class KMPrinter;
 
-class KDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject
+class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmpropmembers.h b/tdeprint/management/kmpropmembers.h
index 90330681e..9b8d789d2 100644
--- a/tdeprint/management/kmpropmembers.h
+++ b/tdeprint/management/kmpropmembers.h
@@ -24,7 +24,7 @@
 
 class TQTextView;
 
-class KDEPRINT_EXPORT KMPropMembers : public KMPropWidget
+class TDEPRINT_EXPORT KMPropMembers : public KMPropWidget
 {
 public:
 	KMPropMembers(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h
index 83148bc72..45773ba0f 100644
--- a/tdeprint/management/kmpropwidget.h
+++ b/tdeprint/management/kmpropwidget.h
@@ -27,7 +27,7 @@
 class KMPrinter;
 class KMWizard;
 
-class KDEPRINT_EXPORT KMPropWidget : public TQWidget
+class TDEPRINT_EXPORT KMPropWidget : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h
index eb40e7957..6c5cf4b9c 100644
--- a/tdeprint/management/kmtimer.h
+++ b/tdeprint/management/kmtimer.h
@@ -20,7 +20,7 @@
 #ifndef KMTIMER_H
 #define KMTIMER_H
 
-#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ )
+#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ )
 #warning internal header, do not use except if you are a KDEPrint developer
 #endif
 
@@ -34,7 +34,7 @@
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMTimer : public TQTimer
+class TDEPRINT_EXPORT KMTimer : public TQTimer
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmwbackend.h b/tdeprint/management/kmwbackend.h
index 223123b4f..7b7b92708 100644
--- a/tdeprint/management/kmwbackend.h
+++ b/tdeprint/management/kmwbackend.h
@@ -27,7 +27,7 @@
 class TQButtonGroup;
 class TQVBoxLayout;
 
-class KDEPRINT_EXPORT KMWBackend : public KMWizardPage
+class TDEPRINT_EXPORT KMWBackend : public KMWizardPage
 {
 public:
 	KMWBackend(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmwinfobase.h b/tdeprint/management/kmwinfobase.h
index 9a2b6464e..ee9e09b22 100644
--- a/tdeprint/management/kmwinfobase.h
+++ b/tdeprint/management/kmwinfobase.h
@@ -26,7 +26,7 @@
 class TQLabel;
 class TQLineEdit;
 
-class KDEPRINT_EXPORT KMWInfoBase : public KMWizardPage
+class TDEPRINT_EXPORT KMWInfoBase : public KMWizardPage
 {
 public:
 	KMWInfoBase(int n = 1, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h
index 5a2dcb6ea..f5331b87b 100644
--- a/tdeprint/management/kmwizard.h
+++ b/tdeprint/management/kmwizard.h
@@ -34,7 +34,7 @@ class KMPrinter;
 class KMWBackend;
 class SidePixmap;
 
-class KDEPRINT_EXPORT KMWizard : public TQDialog
+class TDEPRINT_EXPORT KMWizard : public TQDialog
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h
index 61fe938b7..207f065b7 100644
--- a/tdeprint/management/kmwizardpage.h
+++ b/tdeprint/management/kmwizardpage.h
@@ -26,7 +26,7 @@
 
 class KMPrinter;
 
-class KDEPRINT_EXPORT KMWizardPage : public TQWidget
+class TDEPRINT_EXPORT KMWizardPage : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h
index 0efc299f9..dbd89f73b 100644
--- a/tdeprint/management/kxmlcommandselector.h
+++ b/tdeprint/management/kxmlcommandselector.h
@@ -32,7 +32,7 @@ class TQLabel;
 class TQPushButton;
 class KDialogBase;
 
-class KDEPRINT_EXPORT KXmlCommandSelector : public TQWidget
+class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h
index 3d56bb03e..80a017676 100644
--- a/tdeprint/management/networkscanner.h
+++ b/tdeprint/management/networkscanner.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 
 
-class KDEPRINT_EXPORT NetworkScanner : public TQWidget
+class TDEPRINT_EXPORT NetworkScanner : public TQWidget
 {
 	Q_OBJECT
 
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index fb355b597..0bb368ed2 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -22,7 +22,7 @@
 
 #include <kaction.h>
 
-class KDEPRINT_EXPORT PluginAction : public KAction
+class TDEPRINT_EXPORT PluginAction : public KAction
 {
 	Q_OBJECT
 
diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h
index a9730883e..54f7a1f5e 100644
--- a/tdeprint/management/sidepixmap.h
+++ b/tdeprint/management/sidepixmap.h
@@ -25,7 +25,7 @@
 
 #include <kdelibs_export.h>
 
-class KDEPRINT_EXPORT SidePixmap : public TQFrame
+class TDEPRINT_EXPORT SidePixmap : public TQFrame
 {
 public:
 	SidePixmap(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp
index 8d4027f75..d15ef791f 100644
--- a/tdeprint/management/tdeprint_management_module.cpp
+++ b/tdeprint/management/tdeprint_management_module.cpp
@@ -32,18 +32,18 @@
 
 extern "C"
 {
-	KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent)
+	TDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent)
 	{
                 return tdeprint_management_add_printer_wizard( parent );
 	}
 
-	KDEPRINT_EXPORT bool config_dialog(TQWidget *parent)
+	TDEPRINT_EXPORT bool config_dialog(TQWidget *parent)
 	{
 		KMConfigDialog	dlg(parent);
 		return dlg.exec();
 	}
 
-	KDEPRINT_EXPORT TQString select_command( TQWidget* parent )
+	TDEPRINT_EXPORT TQString select_command( TQWidget* parent )
 	{
 		KDialogBase dlg( parent, 0, true, i18n( "Select Command" ), KDialogBase::Ok|KDialogBase::Cancel );
 		KXmlCommandSelector *xmlSel = new KXmlCommandSelector( false, &dlg, "CommandSelector", &dlg );
diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h
index bca3a2c00..6be534d4a 100644
--- a/tdeprint/marginwidget.h
+++ b/tdeprint/marginwidget.h
@@ -30,7 +30,7 @@ class MarginPreview;
 class TQCheckBox;
 class TQComboBox;
 
-class KDEPRINT_EXPORT MarginWidget : public TQWidget
+class TDEPRINT_EXPORT MarginWidget : public TQWidget
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h
index 44e211808..a66855289 100644
--- a/tdeprint/messagewindow.h
+++ b/tdeprint/messagewindow.h
@@ -27,7 +27,7 @@
 
 class TQLabel;
 
-class KDEPRINT_EXPORT MessageWindow : public TQWidget
+class TDEPRINT_EXPORT MessageWindow : public TQWidget
 {
 	Q_OBJECT
 
diff --git a/tdeprint/plugincombobox.h b/tdeprint/plugincombobox.h
index 668407e14..fc217667b 100644
--- a/tdeprint/plugincombobox.h
+++ b/tdeprint/plugincombobox.h
@@ -28,7 +28,7 @@
 class TQComboBox;
 class TQLabel;
 
-class KDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject
+class TDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/ppdloader.h b/tdeprint/ppdloader.h
index c4eb9fbb5..70b5d1feb 100644
--- a/tdeprint/ppdloader.h
+++ b/tdeprint/ppdloader.h
@@ -33,7 +33,7 @@ class DrBase;
 class DrMain;
 struct PS_private;
 
-class KDEPRINT_EXPORT PPDLoader
+class TDEPRINT_EXPORT PPDLoader
 {
 public:
 	PPDLoader();
diff --git a/tdeprint/rlpr/CMakeLists.txt b/tdeprint/rlpr/CMakeLists.txt
index f8468a0dc..65624f184 100644
--- a/tdeprint/rlpr/CMakeLists.txt
+++ b/tdeprint/rlpr/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_definitions(
-  -D_KDEPRINT_COMPILE
+  -D_TDEPRINT_COMPILE
 )
 
 include_directories(
diff --git a/tdeprint/rlpr/Makefile.am b/tdeprint/rlpr/Makefile.am
index 1946fed94..a62a7ca4d 100644
--- a/tdeprint/rlpr/Makefile.am
+++ b/tdeprint/rlpr/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -D_KDEPRINT_COMPILE
+AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management $(all_includes)
 
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = tdeprint_rlpr.la
 tdeprint_rlpr_la_SOURCES = kmrlprfactory.cpp kmrlprmanager.cpp krlprprinterimpl.cpp kmrlpruimanager.cpp \
 			      kmwrlpr.cpp kmproprlpr.cpp kmproxywidget.cpp kmconfigproxy.cpp
 tdeprint_rlpr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_KDEPRINT) $(LIB_KDECORE) $(LIB_KDEUI)
+tdeprint_rlpr_la_LIBADD = $(top_builddir)/tdeprint/management/libtdeprint_management.la $(LIB_QT) $(LIB_TDEPRINT) $(LIB_TDECORE) $(LIB_TDEUI)
 tdeprint_rlpr_la_METASOURCES = AUTO
 
 noinst_HEADERS = kmrlprmanager.h krlprprinterimpl.h kmrlpruimanager.h kmwrlpr.h kmproprlpr.h \
diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h
index ae1264a97..0bb28cc28 100644
--- a/tdeprint/tdeprintcheck.h
+++ b/tdeprint/tdeprintcheck.h
@@ -17,15 +17,15 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KDEPRINTCHECK_H
-#define KDEPRINTCHECK_H
+#ifndef TDEPRINTCHECK_H
+#define TDEPRINTCHECK_H
 
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kconfig.h>
 #include <kurl.h>
 
-class KDEPRINT_EXPORT KdeprintChecker
+class TDEPRINT_EXPORT KdeprintChecker
 {
 public:
 	static bool check(KConfig *conf, const TQString& group = TQString::null);
diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h
index 597ffbc5b..51cd09877 100644
--- a/tdeprint/tdeprintd.h
+++ b/tdeprint/tdeprintd.h
@@ -17,8 +17,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KDEPRINTD_H
-#define KDEPRINTD_H
+#ifndef TDEPRINTD_H
+#define TDEPRINTD_H
 
 #include <kdedmodule.h>
 #include <tqptrlist.h>
diff --git a/tdeprint/tools/escputil/Makefile.am b/tdeprint/tools/escputil/Makefile.am
index ac7620ef1..143f4ca11 100644
--- a/tdeprint/tools/escputil/Makefile.am
+++ b/tdeprint/tools/escputil/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeprint_tool_escputil.la
 tdeprint_tool_escputil_la_SOURCES = escpwidget.cpp
 tdeprint_tool_escputil_la_METASOURCES = AUTO
 tdeprint_tool_escputil_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-tdeprint_tool_escputil_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+tdeprint_tool_escputil_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
 
 noinst_HEADERS = escpwidget.h
 
diff --git a/tdeprint/util.h b/tdeprint/util.h
index db4ad1cd6..6b966d7c0 100644
--- a/tdeprint/util.h
+++ b/tdeprint/util.h
@@ -32,8 +32,8 @@ void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& print
 // as other SMB tools (smbspool) doesn't seem to support encoding. This
 // utilities allow to continue working KURL class (and encoding) within
 // KDEPrint, but without encoding outside KDEPrint (shoudl fix bug #38733)
-KDEPRINT_EXPORT TQString buildSmbURI( const TQString& work, const TQString& server, const TQString& printer, const TQString& user, const TQString& passwd );
-KDEPRINT_EXPORT bool splitSmbURI( const TQString& uri, TQString& work, TQString& server, TQString& printer, TQString& user, TQString& passwd );
+TDEPRINT_EXPORT TQString buildSmbURI( const TQString& work, const TQString& server, const TQString& printer, const TQString& user, const TQString& passwd );
+TDEPRINT_EXPORT bool splitSmbURI( const TQString& uri, TQString& work, TQString& server, TQString& printer, TQString& user, TQString& passwd );
 
 static const struct pagesizestruct
 {
diff --git a/tdesu/Makefile.am b/tdesu/Makefile.am
index 847a21ee1..926f3df5d 100644
--- a/tdesu/Makefile.am
+++ b/tdesu/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
 lib_LTLIBRARIES = libtdesu.la
 libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp
 libtdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
-libtdesu_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libtdesu_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 libtdesu_la_NMCHECK = $(srcdir)/libtdesu.nmcheck
 libtdesu_la_NMCHECKWEAK = $(srcdir)/libtdesu_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \
 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck
diff --git a/tdesu/client.h b/tdesu/client.h
index 420d5dadd..def5c25e6 100644
--- a/tdesu/client.h
+++ b/tdesu/client.h
@@ -47,7 +47,7 @@ typedef TQValueList<TQCString> QCStringList;
  * See setVar, delVar, delGroup.
  */
 
-class KDESU_EXPORT KDEsuClient {
+class TDESU_EXPORT KDEsuClient {
 public:
     KDEsuClient();
     ~KDEsuClient();
diff --git a/tdesu/kcookie.h b/tdesu/kcookie.h
index 713922011..4f63ebdb7 100644
--- a/tdesu/kcookie.h
+++ b/tdesu/kcookie.h
@@ -24,7 +24,7 @@ typedef TQValueList<TQCString> QCStringList;
  * program (X11 and DCOP cookies).
  */
 
-class KDESU_EXPORT KCookie
+class TDESU_EXPORT KCookie
 {
 public:
     KCookie();
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index d52308f63..09deda5bf 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -363,9 +363,9 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
     // set temporarily LC_ALL to C, for su (to be able to parse "Password:")
     const char* old_lc_all = getenv( "LC_ALL" );
     if( old_lc_all != NULL )
-        setenv( "KDESU_LC_ALL", old_lc_all, 1 );
+        setenv( "TDESU_LC_ALL", old_lc_all, 1 );
     else
-        unsetenv( "KDESU_LC_ALL" );
+        unsetenv( "TDESU_LC_ALL" );
     setenv("LC_ALL", "C", 1);
 
     // From now on, terminal output goes through the tty.
diff --git a/tdesu/process.h b/tdesu/process.h
index ec3af9a62..a6ac77dc7 100644
--- a/tdesu/process.h
+++ b/tdesu/process.h
@@ -33,7 +33,7 @@ typedef TQValueList<TQCString> QCStringList;
  * This means that programs which require a terminal will work.
  */
 
-class KDESU_EXPORT PtyProcess
+class TDESU_EXPORT PtyProcess
 {
 public:
     PtyProcess();
diff --git a/tdesu/ssh.h b/tdesu/ssh.h
index c84c56d02..65787de71 100644
--- a/tdesu/ssh.h
+++ b/tdesu/ssh.h
@@ -23,7 +23,7 @@
  * Executes a remote command, using ssh.
  */
 
-class KDESU_EXPORT SshProcess: public StubProcess
+class TDESU_EXPORT SshProcess: public StubProcess
 {
 public:
     SshProcess(const TQCString &host=0, const TQCString &user=0, const TQCString &command=0);
diff --git a/tdesu/stub.h b/tdesu/stub.h
index 8bfc70a7f..1281c5512 100644
--- a/tdesu/stub.h
+++ b/tdesu/stub.h
@@ -29,7 +29,7 @@ typedef TQValueList<TQCString> QCStringList;
  * StubProcess extends PtyProcess with functionality to chat with tdesu_stub.
  */
 
-class KDESU_EXPORT StubProcess: public PtyProcess
+class TDESU_EXPORT StubProcess: public PtyProcess
 {
 public:
     StubProcess();
diff --git a/tdesu/su.h b/tdesu/su.h
index dcb67a14c..edf1bb75e 100644
--- a/tdesu/su.h
+++ b/tdesu/su.h
@@ -23,7 +23,7 @@
  * Executes a command under elevated privileges, using su.
  */
 
-class KDESU_EXPORT SuProcess: public StubProcess
+class TDESU_EXPORT SuProcess: public StubProcess
 {
 public:
     SuProcess(const TQCString &user=0, const TQCString &command=0);
diff --git a/tdesu/tdesu_pty.h b/tdesu/tdesu_pty.h
index 1dab49dcb..4b5c5a9f4 100644
--- a/tdesu/tdesu_pty.h
+++ b/tdesu/tdesu_pty.h
@@ -22,7 +22,7 @@
 
 #include <kdelibs_export.h>
 
-class KDESU_EXPORT PTY {
+class TDESU_EXPORT PTY {
 
 public:
     /**
diff --git a/tdesu/tdesu_stub.c b/tdesu/tdesu_stub.c
index 5e1f09c24..f8054a313 100644
--- a/tdesu/tdesu_stub.c
+++ b/tdesu/tdesu_stub.c
@@ -237,7 +237,7 @@ int main()
     xsetenv("PATH", params[P_PATH].value);
     xsetenv("DESKTOP_STARTUP_ID", params[P_APP_STARTUP_ID].value);
 
-    tdesu_lc_all = getenv( "KDESU_LC_ALL" );
+    tdesu_lc_all = getenv( "TDESU_LC_ALL" );
     if( tdesu_lc_all != NULL )
         xsetenv("LC_ALL",tdesu_lc_all);
     else
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index 284a37409..08428cc23 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -9,9 +9,9 @@
 #
 #################################################
 
-if( BUILD_KDEUI_TESTS )
+if( BUILD_TDEUI_TESTS )
   add_subdirectory( tests )
-endif( BUILD_KDEUI_TESTS )
+endif( BUILD_TDEUI_TESTS )
 
 add_subdirectory( about )
 add_subdirectory( kdetrayproxy )
diff --git a/tdeui/kaboutapplication.h b/tdeui/kaboutapplication.h
index d8356ce66..58145aa45 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/kaboutapplication.h
@@ -41,7 +41,7 @@
  * @author Waldo Bastian (bastian@kde.org) and Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KAboutApplication : public KAboutDialog
+class TDEUI_EXPORT KAboutApplication : public KAboutDialog
 {
   public:
     /**
diff --git a/tdeui/kaboutdialog.h b/tdeui/kaboutdialog.h
index 345bc9f2c..9c87feb8e 100644
--- a/tdeui/kaboutdialog.h
+++ b/tdeui/kaboutdialog.h
@@ -47,7 +47,7 @@ class KAboutContainerPrivate;
 /**
  *  KAboutContainer can be used to make a application specific AboutDialog.
  */
-class KDEUI_EXPORT KAboutContainer : public TQFrame
+class TDEUI_EXPORT KAboutContainer : public TQFrame
 {
   Q_OBJECT
 
@@ -89,7 +89,7 @@ class KAboutContributorPrivate;
  * Used internally by KAboutWidget
  * @internal
  */
-class KDEUI_EXPORT KAboutContributor : public TQFrame
+class TDEUI_EXPORT KAboutContributor : public TQFrame
 {
   Q_OBJECT
 
@@ -147,7 +147,7 @@ class KDEUI_EXPORT KAboutContributor : public TQFrame
  *
  * It has a minimum size set.
  */
-class KDEUI_EXPORT KAboutWidget : public TQWidget
+class TDEUI_EXPORT KAboutWidget : public TQWidget
 {
   Q_OBJECT
 
@@ -280,7 +280,7 @@ class KAboutDialogPrivate;
  * @author Mirko Boehm (mirko@kde.org) and Espen Sand (espensa@online.no)
  * @see KDialogBase
  */
-class KDEUI_EXPORT KAboutDialog : public KDialogBase
+class TDEUI_EXPORT KAboutDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/kaboutkde.h b/tdeui/kaboutkde.h
index 07e325dd8..017d0f220 100644
--- a/tdeui/kaboutkde.h
+++ b/tdeui/kaboutkde.h
@@ -37,7 +37,7 @@
  * @author Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KAboutKDE : public KAboutDialog
+class TDEUI_EXPORT KAboutKDE : public KAboutDialog
 {
   public:
     /**
diff --git a/tdeui/kaction.h b/tdeui/kaction.h
index 203272256..44e77a4d5 100644
--- a/tdeui/kaction.h
+++ b/tdeui/kaction.h
@@ -199,7 +199,7 @@ class KMainWindow;
  *
  * @see KStdAction
  */
-class KDEUI_EXPORT KAction : public TQObject
+class TDEUI_EXPORT KAction : public TQObject
 {
   friend class KActionCollection;
   Q_OBJECT
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index 1a1096aa7..2974cbdb2 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -65,7 +65,7 @@ class KMainWindow;
  *  This action provides two states: checked or not.
  *
  */
-class KDEUI_EXPORT KToggleAction : public KAction
+class TDEUI_EXPORT KToggleAction : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -228,7 +228,7 @@ private:
  * An action that operates like a radio button. At any given time
  * only a single action from the group will be active.
  */
-class KDEUI_EXPORT KRadioAction : public KToggleAction
+class TDEUI_EXPORT KRadioAction : public KToggleAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -328,7 +328,7 @@ private:
  *  the formerly checked item becomes unchecked.
  *  There can be only one item checked at a time.
  */
-class KDEUI_EXPORT KSelectAction : public KAction
+class TDEUI_EXPORT KSelectAction : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -581,7 +581,7 @@ private:
 /**
  * @deprecated Use KSelectAction instead.
  */
-class KDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction
+class TDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -697,7 +697,7 @@ private:
  *
  *  @author Michael Koch
  */
-class KDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSelectAction
+class TDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSelectAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -907,7 +907,7 @@ private:
   KRecentFilesActionPrivate *d;
 };
 
-class KDEUI_EXPORT KFontAction : public KSelectAction
+class TDEUI_EXPORT KFontAction : public KSelectAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -958,7 +958,7 @@ private:
     KFontActionPrivate *d;
 };
 
-class KDEUI_EXPORT KFontSizeAction : public KSelectAction
+class TDEUI_EXPORT KFontSizeAction : public KSelectAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1017,7 +1017,7 @@ private:
  * If you want a submenu for selecting one tool among many (without icons), see KSelectAction.
  * See also setDelayed about the main action.
  */
-class KDEUI_EXPORT KActionMenu : public KAction
+class TDEUI_EXPORT KActionMenu : public KAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1091,7 +1091,7 @@ private:
  * that has more detail in a toolbar than in a menu (e.g. tool chooser
  * with "Other" leading to a dialog...).
  */
-class KDEUI_EXPORT KToolBarPopupAction : public KAction
+class TDEUI_EXPORT KToolBarPopupAction : public KAction
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1214,7 +1214,7 @@ private:
  * visibility has changed, whenever it changes.
  * @since 3.1
  */
-class KDEUI_EXPORT KToggleToolBarAction : public KToggleAction
+class TDEUI_EXPORT KToggleToolBarAction : public KToggleAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1261,7 +1261,7 @@ private:
  * still needs to explicitly set the window state though.
  * @since 3.2
  */
-class KDEUI_EXPORT KToggleFullScreenAction : public KToggleAction
+class TDEUI_EXPORT KToggleFullScreenAction : public KToggleAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1306,7 +1306,7 @@ private:
  * An action that automatically embeds a widget into a
  * toolbar.
  */
-class KDEUI_EXPORT KWidgetAction : public KAction
+class TDEUI_EXPORT KWidgetAction : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1351,7 +1351,7 @@ private:
     KWidgetActionPrivate *d;
 };
 
-class KDEUI_EXPORT KActionSeparator : public KAction
+class TDEUI_EXPORT KActionSeparator : public KAction
 {
     Q_OBJECT
     TQ_OBJECT
@@ -1378,7 +1378,7 @@ private:
  *
  * @since 3.2
  */
-class KDEUI_EXPORT KPasteTextAction: public KAction
+class TDEUI_EXPORT KPasteTextAction: public KAction
 {
     Q_OBJECT
     TQ_OBJECT
diff --git a/tdeui/kactioncollection.h b/tdeui/kactioncollection.h
index 971bc862f..8111effaf 100644
--- a/tdeui/kactioncollection.h
+++ b/tdeui/kactioncollection.h
@@ -75,7 +75,7 @@ typedef TQValueList<KAction *> KActionPtrList;
  *           statusBar(), TQT_SLOT( clear() ) );
  * \endcode
  */
-class KDEUI_EXPORT KActionCollection : public TQObject
+class TDEUI_EXPORT KActionCollection : public TQObject
 {
   friend class KAction;
   friend class KXMLGUIClient;
diff --git a/tdeui/kactionselector.h b/tdeui/kactionselector.h
index 03c5ab5da..8d38911bf 100644
--- a/tdeui/kactionselector.h
+++ b/tdeui/kactionselector.h
@@ -76,7 +76,7 @@ class KActionSelectorPrivate;
     @author Anders Lund <anders@alweb.dk>
 */
 
-class KDEUI_EXPORT KActionSelector : public TQWidget {
+class TDEUI_EXPORT KActionSelector : public TQWidget {
   Q_OBJECT
   Q_ENUMS( ButtonIconSize InsertionPolicy )
   Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/kactionshortcutlist.h
index a7b8d303e..c61a7e2a8 100644
--- a/tdeui/kactionshortcutlist.h
+++ b/tdeui/kactionshortcutlist.h
@@ -9,7 +9,7 @@
 //---------------------------------------------------------------------
 
 class KAccelShortcutListPrivate;
-class KDEUI_EXPORT KActionShortcutList : public KShortcutList
+class TDEUI_EXPORT KActionShortcutList : public KShortcutList
 {
  public:
 	KActionShortcutList( KActionCollection* );
@@ -47,7 +47,7 @@ class KDEUI_EXPORT KActionShortcutList : public KShortcutList
 //---------------------------------------------------------------------
 
 class KAccelShortcutListPrivate;
-class KDEUI_EXPORT KActionPtrShortcutList : public KShortcutList
+class TDEUI_EXPORT KActionPtrShortcutList : public KShortcutList
 {
  public:
 	KActionPtrShortcutList( KActionPtrList& );
diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h
index 1220c9ce8..422dcfa5c 100644
--- a/tdeui/kactivelabel.h
+++ b/tdeui/kactivelabel.h
@@ -34,7 +34,7 @@ class KActiveLabelPrivate;
   * @author Waldo Bastian (bastian@kde.org)
   * @version $Id$
   */
-class KDEUI_EXPORT KActiveLabel : public TQTextBrowser
+class TDEUI_EXPORT KActiveLabel : public TQTextBrowser
 {
     Q_OBJECT
 public:
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index 68f33d1b0..2caf74b4a 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -52,7 +52,7 @@ class KAnimWidgetPrivate;
  *
  * @author Kurt Granroth <granroth@kde.org>
  */
-class KDEUI_EXPORT KAnimWidget : public TQFrame
+class TDEUI_EXPORT KAnimWidget : public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( int size READ size WRITE setSize )
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index 9c0c1f032..96c2be8e6 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -35,7 +35,7 @@ class KArrowButtonPrivate;
  *
  * @author Frerich Raabe
  */
-class KDEUI_EXPORT KArrowButton : public TQPushButton
+class TDEUI_EXPORT KArrowButton : public TQPushButton
 {
 	Q_OBJECT
 	Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h
index 6c473c9dd..a55819e2b 100644
--- a/tdeui/kauthicon.h
+++ b/tdeui/kauthicon.h
@@ -44,7 +44,7 @@ class KAuthIconPrivate;
  * @see KRootPermsIcon, KWritePermsIcon
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDEUI_EXPORT KAuthIcon : public TQWidget
+class TDEUI_EXPORT KAuthIcon : public TQWidget
 {
   Q_OBJECT
 
@@ -100,7 +100,7 @@ class KRootPermsIconPrivate;
  * @see KAuthIcon
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDEUI_EXPORT KRootPermsIcon : public KAuthIcon
+class TDEUI_EXPORT KRootPermsIcon : public KAuthIcon
 {
   Q_OBJECT
 
@@ -132,7 +132,7 @@ class KWritePermsIconPrivate;
  * @see KAuthIcon
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDEUI_EXPORT KWritePermsIcon : public KAuthIcon
+class TDEUI_EXPORT KWritePermsIcon : public KAuthIcon
 {
   Q_OBJECT
   Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index d97d760f2..cff575dad 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -39,7 +39,7 @@ class KBugReportPrivate;
  *
  * @author David Faure <faure@kde.org>
  */
-class KDEUI_EXPORT KBugReport : public KDialogBase
+class TDEUI_EXPORT KBugReport : public KDialogBase
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h
index 03de09008..d30b1b94d 100644
--- a/tdeui/kbuttonbox.h
+++ b/tdeui/kbuttonbox.h
@@ -39,7 +39,7 @@ class KButtonBoxPrivate;
  * @version $Id$
  **/
 
-class KDEUI_EXPORT KButtonBox : public TQWidget
+class TDEUI_EXPORT KButtonBox : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h
index 5e1532fb6..7aa9ca78f 100644
--- a/tdeui/kcharselect.h
+++ b/tdeui/kcharselect.h
@@ -48,7 +48,7 @@ class KCharSelectPrivate;
  * @author Reginald Stadlbauer <reggie@kde.org>
  */
 
-class KDEUI_EXPORT KCharSelectTable : public TQGridView
+class TDEUI_EXPORT KCharSelectTable : public TQGridView
 {
     Q_OBJECT
 
@@ -137,7 +137,7 @@ private:
  * @author Reginald Stadlbauer <reggie@kde.org>
  */
 
-class KDEUI_EXPORT KCharSelect : public TQVBox
+class TDEUI_EXPORT KCharSelect : public TQVBox
 {
     Q_OBJECT
     Q_PROPERTY( TQString fontFamily READ font WRITE setFont )
diff --git a/tdeui/kcmenumngr.h b/tdeui/kcmenumngr.h
index ce05f6b9d..605fa43c2 100644
--- a/tdeui/kcmenumngr.h
+++ b/tdeui/kcmenumngr.h
@@ -75,7 +75,7 @@ If the popup menu is invoked with the keyboard shortcut, it's shown at
 the position of the micro focus hint of the widget ( TQWidget::microFocusHint() ).
 */
 
-class KDEUI_EXPORT KContextMenuManager : public TQObject
+class TDEUI_EXPORT KContextMenuManager : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h
index 268c3800a..eec6c7f3e 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/kcmodule.h
@@ -66,7 +66,7 @@ class KInstance;
  *
  * @author Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
  */
-class KDEUI_EXPORT KCModule : public TQWidget
+class TDEUI_EXPORT KCModule : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h
index e1a9b1dc8..ebc3f59a4 100644
--- a/tdeui/kcolorbutton.h
+++ b/tdeui/kcolorbutton.h
@@ -34,7 +34,7 @@ class KColorButtonPrivate;
 *
 * \image html kcolorbutton.png "KDE Color Button"
 */
-class KDEUI_EXPORT KColorButton : public TQPushButton
+class TDEUI_EXPORT KColorButton : public TQPushButton
 {
     Q_OBJECT
     Q_PROPERTY( TQColor color READ color WRITE setColor )
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index aefac504f..cb3970f47 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -36,7 +36,7 @@ class KColorComboInternal;
 /**
  * Combobox for colors.
  */
-class KDEUI_EXPORT KColorCombo : public TQComboBox
+class TDEUI_EXPORT KColorCombo : public TQComboBox
 {
     Q_OBJECT
     Q_PROPERTY( TQColor color READ color WRITE setColor )
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index 7a1a66d6d..20c9f799d 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -55,7 +55,7 @@ class KColorCells;
  * @see KXYSelector, KValueSelector, KColorDialog
  * @author Martin Jones (mjones@kde.org)
 */
-class KDEUI_EXPORT KHSSelector : public KXYSelector
+class TDEUI_EXPORT KHSSelector : public KXYSelector
 {
   Q_OBJECT
 
@@ -99,7 +99,7 @@ class KValueSelectorPrivate;
  * @see KHSSelector, KColorDialog
  * @author Martin Jones (mjones@kde.org)
  */
-class KDEUI_EXPORT KValueSelector : public KSelector
+class TDEUI_EXPORT KValueSelector : public KSelector
 {
   Q_OBJECT
 
@@ -161,7 +161,7 @@ private:
  *
  * @author Waldo Bastian <bastian@kde.org>
  **/
-class KDEUI_EXPORT KColor : public TQColor
+class TDEUI_EXPORT KColor : public TQColor
 {
 public:
   KColor();
@@ -195,7 +195,7 @@ private:
  *
  * @author Waldo Bastian <bastian@kde.org>
  **/
-class KDEUI_EXPORT KPaletteTable : public TQWidget
+class TDEUI_EXPORT KPaletteTable : public TQWidget
 {
   Q_OBJECT
 public:
@@ -250,7 +250,7 @@ private:
 *
 * @author Martin Jones <mjones@kde.org>
 */
-class KDEUI_EXPORT KColorCells : public TQGridView
+class TDEUI_EXPORT KColorCells : public TQGridView
 {
   Q_OBJECT
 public:
@@ -308,7 +308,7 @@ private:
  * automatically handles drag and drop from and on the widget.
  *
  */
-class KDEUI_EXPORT KColorPatch : public TQFrame
+class TDEUI_EXPORT KColorPatch : public TQFrame
 {
   Q_OBJECT
 public:
@@ -374,7 +374,7 @@ private:
  * the currently selected color is a KColorPatch.
  *
  **/
-class KDEUI_EXPORT KColorDialog : public KDialogBase
+class TDEUI_EXPORT KColorDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h
index e33e5796f..9c834bdf7 100644
--- a/tdeui/kcolordrag.h
+++ b/tdeui/kcolordrag.h
@@ -33,7 +33,7 @@ class KColorDragPrivate;
  *
  * See the Qt drag'n'drop documentation.
  */
-class KDEUI_EXPORT KColorDrag : public TQStoredDrag {
+class TDEUI_EXPORT KColorDrag : public TQStoredDrag {
     Q_OBJECT
 
 public:
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index d7d07e4b6..93ae6535e 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -148,7 +148,7 @@ class KURL;
  *
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
+class TDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
 {
   Q_OBJECT
   Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
@@ -537,7 +537,7 @@ class KPixmapProvider;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEUI_EXPORT KHistoryCombo : public KComboBox
+class TDEUI_EXPORT KHistoryCombo : public KComboBox
 {
     Q_OBJECT
     Q_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems )
@@ -796,7 +796,7 @@ private:
     KHistoryComboPrivate* const d;
 };
 
-class KDEUI_EXPORT KHistoryComboEditor : public KDialogBase
+class TDEUI_EXPORT KHistoryComboEditor : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index 97fa3c2e2..8ba782a2a 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -34,7 +34,7 @@ class TQPopupMenu;
  * The abstract base class for all Commands. Commands are used to
  * store information needed for Undo/Redo functionality...
  */
-class KDEUI_EXPORT KCommand
+class TDEUI_EXPORT KCommand
 {
 protected:
     /**
@@ -75,7 +75,7 @@ protected:
  * It is more memory-efficient to use KCommand and to implement the name() method,
  * but in some cases it's more simple or more flexible to store the name at creation time.
  */
-class KDEUI_EXPORT KNamedCommand : public KCommand
+class TDEUI_EXPORT KNamedCommand : public KCommand
 {
 protected:
     /**
@@ -107,7 +107,7 @@ protected:
  * It will appear as one to the user and in the command history,
  * but it can use the implementation of multiple commands internally.
  */
-class KDEUI_EXPORT KMacroCommand : public KNamedCommand
+class TDEUI_EXPORT KMacroCommand : public KNamedCommand
 {
 public:
     /**
@@ -153,7 +153,7 @@ protected:
  * undo/redo actions in the menu and changes the text according
  * to the name of the command.
  */
-class KDEUI_EXPORT KCommandHistory : public TQObject {
+class TDEUI_EXPORT KCommandHistory : public TQObject {
     Q_OBJECT
 public:
     /**
diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h
index 9ae7d124b..9d6b33a49 100644
--- a/tdeui/kcompletionbox.h
+++ b/tdeui/kcompletionbox.h
@@ -40,7 +40,7 @@ class TQEvent;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEUI_EXPORT KCompletionBox : public KListBox
+class TDEUI_EXPORT KCompletionBox : public KListBox
 {
     Q_OBJECT
     Q_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
diff --git a/tdeui/kconfigdialog.h b/tdeui/kconfigdialog.h
index 6c2061e88..167834c85 100644
--- a/tdeui/kconfigdialog.h
+++ b/tdeui/kconfigdialog.h
@@ -69,7 +69,7 @@ class KConfigDialogManager;
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class KDEUI_EXPORT KConfigDialog : public KDialogBase {
+class TDEUI_EXPORT KConfigDialog : public KDialogBase {
 Q_OBJECT
 
 signals:
diff --git a/tdeui/kcursor.h b/tdeui/kcursor.h
index 19bcd2348..6838445b2 100644
--- a/tdeui/kcursor.h
+++ b/tdeui/kcursor.h
@@ -42,7 +42,7 @@ class TQWidget;
  *
  * @author Kurt Granroth <granroth@kde.org>
  */
-class KDEUI_EXPORT KCursor : public TQt
+class TDEUI_EXPORT KCursor : public TQt
 {
 public:
     /**
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index fb51732f3..08d030ac5 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -48,7 +48,7 @@ class KDateTable;
  *     @author Tim Gilman, Mirko Boehm
  *
  **/
-class KDEUI_EXPORT KDatePicker: public TQFrame
+class TDEUI_EXPORT KDatePicker: public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( TQDate date READ date WRITE setDate)
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 8e7ca0022..762089793 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -37,7 +37,7 @@ class KPopupMenu;
 * @version $Id$
 * @author Stephan Binner
 */
-class KDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit
+class TDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit
 {
   Q_OBJECT
 protected:
@@ -64,7 +64,7 @@ private:
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDEUI_EXPORT KDateInternalMonthPicker : public TQGridView
+class TDEUI_EXPORT KDateInternalMonthPicker : public TQGridView
 {
   Q_OBJECT
 protected:
@@ -137,7 +137,7 @@ private:
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit
+class TDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit
 {
   Q_OBJECT
 protected:
@@ -163,7 +163,7 @@ private:
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KDEUI_EXPORT KPopupFrame : public TQFrame
+class TDEUI_EXPORT KPopupFrame : public TQFrame
 {
   Q_OBJECT
 protected:
@@ -238,7 +238,7 @@ private:
 /**
 * Validates user-entered dates.
 */
-class KDEUI_EXPORT KDateValidator : public TQValidator
+class TDEUI_EXPORT KDateValidator : public TQValidator
 {
 public:
     KDateValidator(TQWidget* parent=0, const char* name=0);
@@ -260,7 +260,7 @@ public:
  * @version $Id$
  * @author Tim Gilman, Mirko Boehm
  */
-class KDEUI_EXPORT KDateTable : public TQGridView
+class TDEUI_EXPORT KDateTable : public TQGridView
 {
     Q_OBJECT
     Q_PROPERTY( TQDate date READ getDate WRITE setDate )
diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h
index 5f14ddcef..35439e459 100644
--- a/tdeui/kdatetimewidget.h
+++ b/tdeui/kdatetimewidget.h
@@ -37,7 +37,7 @@
  * @version $Id$
  * @since 3.2
  */
-class KDEUI_EXPORT KDateTimeWidget : public TQWidget
+class TDEUI_EXPORT KDateTimeWidget : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h
index 63c5b1eea..fbb192434 100644
--- a/tdeui/kdatewidget.h
+++ b/tdeui/kdatewidget.h
@@ -33,7 +33,7 @@
 *
 * @version $Id$
 */
-class KDEUI_EXPORT KDateWidget : public TQWidget
+class TDEUI_EXPORT KDateWidget : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQDate date READ date WRITE setDate )
diff --git a/tdeui/kdcopactionproxy.h b/tdeui/kdcopactionproxy.h
index 5b0ffdc1c..7b5c2039e 100644
--- a/tdeui/kdcopactionproxy.h
+++ b/tdeui/kdcopactionproxy.h
@@ -36,7 +36,7 @@ class KAction;
  * This class can generate DCOP object ids for given action objects, which it automatically
  * processes, as being a DCOPObjectProxy .
  */
-class KDEUI_EXPORT KDCOPActionProxy : public DCOPObjectProxy
+class TDEUI_EXPORT KDCOPActionProxy : public DCOPObjectProxy
 {
 public:
   /**
diff --git a/tdeui/kdetrayproxy/Makefile.am b/tdeui/kdetrayproxy/Makefile.am
index 01dc87082..39782b925 100644
--- a/tdeui/kdetrayproxy/Makefile.am
+++ b/tdeui/kdetrayproxy/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_kdetrayproxy.la
 INCLUDES= -I$(top_srcdir)/kded $(all_includes)
 kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
 kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kdetrayproxy_la_LIBADD = $(LIB_TDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 METASOURCES = AUTO
 
diff --git a/tdeui/kdialog.h b/tdeui/kdialog.h
index 274ce8b33..e829cb4ca 100644
--- a/tdeui/kdialog.h
+++ b/tdeui/kdialog.h
@@ -49,7 +49,7 @@ class TQLayoutItem;
  * @see KDialogBase
  * @author Thomas Tanghus <tanghus@earthling.net>, Espen Sand <espensa@online.no>
  */
-class KDEUI_EXPORT KDialog : public TQDialog
+class TDEUI_EXPORT KDialog : public TQDialog
 {
   Q_OBJECT
 
@@ -186,7 +186,7 @@ class KDEUI_EXPORT KDialog : public TQDialog
   * @author Waldo Bastian <bastian@kde.org>
   */
 class KDialogQueuePrivate;
-class KDEUI_EXPORT KDialogQueue : public TQObject
+class TDEUI_EXPORT KDialogQueue : public TQObject
 {
       Q_OBJECT
 
@@ -215,7 +215,7 @@ protected:
   *
   * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
   */
-class KDEUI_EXPORT KSMModalDialogHeader : public TQWidget
+class TDEUI_EXPORT KSMModalDialogHeader : public TQWidget
 {
       Q_OBJECT
 
@@ -234,7 +234,7 @@ public:
   * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
   */
 class TQLabel;
-class KDEUI_EXPORT KSMModalDialog : public TQWidget
+class TDEUI_EXPORT KSMModalDialog : public TQWidget
 {
       Q_OBJECT
 
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index bd49764bb..ad33e24a0 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -188,7 +188,7 @@ class KDialogBaseTile;
  *
  * @author Mirko Boehm (mirko@kde.org) and Espen Sand (espen@kde.org)
  */
-class KDEUI_EXPORT KDialogBase : public KDialog
+class TDEUI_EXPORT KDialogBase : public KDialog
 {
   Q_OBJECT
 
diff --git a/tdeui/kdialogbase_priv.h b/tdeui/kdialogbase_priv.h
index d38ef884a..84db3b84f 100644
--- a/tdeui/kdialogbase_priv.h
+++ b/tdeui/kdialogbase_priv.h
@@ -28,7 +28,7 @@
  * Used internally by KDialogBase.
  * @internal
  */
-class KDEUI_EXPORT KDialogBaseButton : public KPushButton
+class TDEUI_EXPORT KDialogBaseButton : public KPushButton
 {
   Q_OBJECT
 
@@ -45,7 +45,7 @@ class KDEUI_EXPORT KDialogBaseButton : public KPushButton
  * Used internally by KDialogBase.
  * @internal
  */
-class KDEUI_EXPORT KDialogBaseTile : public TQObject
+class TDEUI_EXPORT KDialogBaseTile : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index 019cd9e55..daf6368b8 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -100,7 +100,7 @@ namespace KMDI
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
+class TDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
 {
   Q_OBJECT
   TQ_OBJECT
@@ -150,7 +150,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
+class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
 {
   Q_OBJECT
   TQ_OBJECT
@@ -196,7 +196,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
+class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
 {
   Q_OBJECT
   TQ_OBJECT
@@ -238,7 +238,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
+class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
 {
   Q_OBJECT
   TQ_OBJECT
@@ -364,7 +364,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockTabGroup : public TQTabWidget
+class TDEUI_EXPORT KDockTabGroup : public TQTabWidget
 {
   Q_OBJECT
   TQ_OBJECT
@@ -425,7 +425,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidget: public TQWidget
+class TDEUI_EXPORT KDockWidget: public TQWidget
 {
   Q_OBJECT
   TQ_OBJECT
@@ -912,7 +912,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockManager: public TQObject
+class TDEUI_EXPORT KDockManager: public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1311,7 +1311,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockMainWindow : public KMainWindow
+class TDEUI_EXPORT KDockMainWindow : public KMainWindow
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1482,7 +1482,7 @@ private:
   KDockMainWindowPrivate *d;
 };
 
-class KDEUI_EXPORT KDockArea : public TQWidget
+class TDEUI_EXPORT KDockArea : public TQWidget
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdeui/kdockwidget_p.h b/tdeui/kdockwidget_p.h
index 98af140ff..9ee9e8e73 100644
--- a/tdeui/kdockwidget_p.h
+++ b/tdeui/kdockwidget_p.h
@@ -40,7 +40,7 @@ COMPATIBLE. THIS HEADER IS ONLY INSTALLED, BECAUSE IT IS NEEDED IN
 #include <tqstringlist.h>
 // Add some describing comment !!
 
-class KDEUI_EXPORT KDockContainer
+class TDEUI_EXPORT KDockContainer
 {
 public:
   KDockContainer();
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index 8e7323a7a..e97a5affd 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -41,9 +41,9 @@ class KDockContainer;
  *
  * @author Max Judin.
  */
-class KDEUI_EXPORT KDockSplitter : public TQWidget
+class TDEUI_EXPORT KDockSplitter : public TQWidget
 {
-  // NOTE: in theory the KDEUI_EXPORT above shouldn't be there, but it's needed for kexi,
+  // NOTE: in theory the TDEUI_EXPORT above shouldn't be there, but it's needed for kexi,
   // which copies the whole definition of the class to be able to access separatorPosInPercent etc. 
   // This needs real fixing in KDE4.
   
@@ -245,7 +245,7 @@ private:
  *
  * @author Max Judin.
 */
-class KDEUI_EXPORT KDockButton_Private : public TQPushButton
+class TDEUI_EXPORT KDockButton_Private : public TQPushButton
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index a78b6a82a..aff55c1e1 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -45,7 +45,7 @@ class TQBitmap;
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KDEUI_EXPORT KDualColorButton : public TQWidget
+class TDEUI_EXPORT KDualColorButton : public TQWidget
 {
     Q_OBJECT
     Q_ENUMS( DualColor )
diff --git a/tdeui/keditcl.h b/tdeui/keditcl.h
index 35316027c..a11789d59 100644
--- a/tdeui/keditcl.h
+++ b/tdeui/keditcl.h
@@ -34,7 +34,7 @@ class KHistoryCombo;
 class KIntNumInput;
 class TQVButtonGroup;
 
-class KDEUI_EXPORT KEdGotoLine : public KDialogBase
+class TDEUI_EXPORT KEdGotoLine : public KDialogBase
 {
     Q_OBJECT
 
@@ -56,7 +56,7 @@ private:
 };
 
 ///
-class KDEUI_EXPORT KEdFind : public KDialogBase
+class TDEUI_EXPORT KEdFind : public KDialogBase
 {
     Q_OBJECT
     Q_PROPERTY( TQString text READ getText WRITE setText )
@@ -106,7 +106,7 @@ private:
 };
 
 ///
-class KDEUI_EXPORT KEdReplace : public KDialogBase
+class TDEUI_EXPORT KEdReplace : public KDialogBase
 {
     Q_OBJECT
 
@@ -168,7 +168,7 @@ private:
  * @author Bernd Johannes Wuebben <wuebben@math.cornell.edu>, Waldo Bastian <bastian@kde.org>
  **/
 
-class KDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit
+class TDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit
 {
     Q_OBJECT
 
diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h
index bd8b19a64..069907a62 100644
--- a/tdeui/keditlistbox.h
+++ b/tdeui/keditlistbox.h
@@ -41,7 +41,7 @@ class KEditListBoxPrivate;
  * \image html keditlistbox.png "KDE Edit List Box Widget"
  *
  */
-class KDEUI_EXPORT KEditListBox : public TQGroupBox
+class TDEUI_EXPORT KEditListBox : public TQGroupBox
 {
    Q_OBJECT
    TQ_OBJECT
@@ -247,25 +247,25 @@ public:
     class CustomEditor
     {
     public:
-        KDEUI_EXPORT CustomEditor()
+        TDEUI_EXPORT CustomEditor()
             : m_representationWidget( 0L ),
               m_lineEdit( 0L ) {}
-        KDEUI_EXPORT CustomEditor( TQWidget *repWidget, KLineEdit *edit )
+        TDEUI_EXPORT CustomEditor( TQWidget *repWidget, KLineEdit *edit )
             : m_representationWidget( repWidget ),
               m_lineEdit( edit ) {}
-        KDEUI_EXPORT CustomEditor( KComboBox *combo );
+        TDEUI_EXPORT CustomEditor( KComboBox *combo );
 
-        KDEUI_EXPORT void setRepresentationWidget( TQWidget *repWidget ) {
+        TDEUI_EXPORT void setRepresentationWidget( TQWidget *repWidget ) {
             m_representationWidget = repWidget;
         }
-        KDEUI_EXPORT void setLineEdit( KLineEdit *edit ) {
+        TDEUI_EXPORT void setLineEdit( KLineEdit *edit ) {
             m_lineEdit = edit;
         }
 
-        KDEUI_EXPORT virtual TQWidget   *representationWidget() const {
+        TDEUI_EXPORT virtual TQWidget   *representationWidget() const {
             return m_representationWidget;
         }
-        KDEUI_EXPORT  virtual KLineEdit *lineEdit() const {
+        TDEUI_EXPORT  virtual KLineEdit *lineEdit() const {
             return m_lineEdit;
         }
 
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h
index 9033ff17f..4fcd5ac38 100644
--- a/tdeui/kedittoolbar.h
+++ b/tdeui/kedittoolbar.h
@@ -107,7 +107,7 @@ namespace
  * @author Kurt Granroth <granroth@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KEditToolbar : public KDialogBase
+class TDEUI_EXPORT KEditToolbar : public KDialogBase
 {
     Q_OBJECT
 public:
@@ -267,7 +267,7 @@ private:
  * @author Kurt Granroth <granroth@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient
+class TDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kfontcombo.h b/tdeui/kfontcombo.h
index 8a2a5f07c..aec6618a4 100644
--- a/tdeui/kfontcombo.h
+++ b/tdeui/kfontcombo.h
@@ -32,7 +32,7 @@
  *
  * @author Malte Starostik <malte@kde.org>
  */
-class KDEUI_EXPORT KFontCombo : public KComboBox
+class TDEUI_EXPORT KFontCombo : public KComboBox
 {
     Q_OBJECT
     Q_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
diff --git a/tdeui/kfontdialog.h b/tdeui/kfontdialog.h
index bc5b817eb..a4ce7e59b 100644
--- a/tdeui/kfontdialog.h
+++ b/tdeui/kfontdialog.h
@@ -51,7 +51,7 @@ class KIntNumInput;
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KFontChooser : public TQWidget
+class TDEUI_EXPORT KFontChooser : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQFont font READ font WRITE setFont )
@@ -336,7 +336,7 @@ private:
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KFontDialog : public KDialogBase  {
+class TDEUI_EXPORT KFontDialog : public KDialogBase  {
     Q_OBJECT
 
 public:
diff --git a/tdeui/kfontrequester.h b/tdeui/kfontrequester.h
index 859c61499..a397ffcd7 100644
--- a/tdeui/kfontrequester.h
+++ b/tdeui/kfontrequester.h
@@ -41,7 +41,7 @@ class TQPushButton;
  * @author Nadeem Hasan <nhasan@kde.org>
  *
  */
-class KDEUI_EXPORT KFontRequester : public TQWidget
+class TDEUI_EXPORT KFontRequester : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index d5946b0d3..586998d48 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -35,7 +35,7 @@
  * @author Holger Freyther <freyher@yahoo.com>
  * @see KStdGuiItem
  */
-class KDEUI_EXPORT KGuiItem
+class TDEUI_EXPORT KGuiItem
 {
 public:
     KGuiItem();
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index 331ef0875..9a87c4f1b 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -128,7 +128,7 @@ class KHelpMenuPrivate;
  * @author Espen Sand (espen@kde.org)
  */
 
-class KDEUI_EXPORT KHelpMenu : public TQObject
+class TDEUI_EXPORT KHelpMenu : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 5d2735d10..5071f263c 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -39,7 +39,7 @@
  * TQIconView::selectionChanged() signal.
  *
  **/
-class KDEUI_EXPORT KIconView : public TQIconView
+class TDEUI_EXPORT KIconView : public TQIconView
 {
   friend class KIconViewItem;
   Q_OBJECT
@@ -223,7 +223,7 @@ class KWordWrap;
  *
  * @author David Faure <david@mandrakesoft.com>
  */
-class KDEUI_EXPORT KIconViewItem : public TQIconViewItem
+class TDEUI_EXPORT KIconViewItem : public TQIconViewItem
 {
 public:
     // Need to redefine all the constructors - I want Java !
diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h
index 9b11c5f2d..5fb05787f 100644
--- a/tdeui/kiconviewsearchline.h
+++ b/tdeui/kiconviewsearchline.h
@@ -35,7 +35,7 @@ class TQIconViewItem;
  *
  * @since 3.3
  */
-class KDEUI_EXPORT KIconViewSearchLine : public KLineEdit
+class TDEUI_EXPORT KIconViewSearchLine : public KLineEdit
 {
   Q_OBJECT
 
diff --git a/tdeui/kinputdialog.h b/tdeui/kinputdialog.h
index 76a5db2dd..f7326460d 100644
--- a/tdeui/kinputdialog.h
+++ b/tdeui/kinputdialog.h
@@ -45,7 +45,7 @@ class KInputDialogPrivate;
  * @since 3.2
  * @author Nadeem Hasan <nhasan@kde.org>
  */
-class KDEUI_EXPORT KInputDialog : public KDialogBase
+class TDEUI_EXPORT KInputDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index fc3eb2f27..cbf42abca 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -64,7 +64,7 @@ class KGuiItem;
  *
  * @author Espen Sand (espen@kde.org)
  */
-class KDEUI_EXPORT KJanusWidget : public TQWidget
+class TDEUI_EXPORT KJanusWidget : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 97895f8fe..34f5f1ac9 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -37,7 +37,7 @@
  * @author Mark Donohoe <donohoe@kde.org>
  * @internal
  */
-class KDEUI_EXPORT KKeyButton: public TQPushButton
+class TDEUI_EXPORT KKeyButton: public TQPushButton
 {
 	Q_OBJECT
 
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index 8b7390e0e..4df3e2ecd 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -55,7 +55,7 @@ class KKeyChooserItem;
  * @see KKeyDialog
  * @author Nicolas Hadacek <hadacek@via.ecp.fr>
  */
-class KDEUI_EXPORT KKeyChooser : public TQWidget
+class TDEUI_EXPORT KKeyChooser : public TQWidget
 {
 	Q_OBJECT
  public:
@@ -271,7 +271,7 @@ typedef KKeyChooser KKeyChooser;
  *
  * @author Nicolas Hadacek <hadacek@via.ecp.fr>
  */
-class KDEUI_EXPORT KKeyDialog : public KDialogBase
+class TDEUI_EXPORT KKeyDialog : public KDialogBase
 {
 	Q_OBJECT
 
diff --git a/tdeui/klanguagebutton.h b/tdeui/klanguagebutton.h
index 4b381abe9..f15bd5a98 100644
--- a/tdeui/klanguagebutton.h
+++ b/tdeui/klanguagebutton.h
@@ -44,7 +44,7 @@ class TQPopupMenu;
  * Combined version of KTagCombo and KLanguageCombo but using a QPushButton
  * instead.
  */
-class KDEUI_EXPORT KLanguageButton : public TQWidget
+class TDEUI_EXPORT KLanguageButton : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index aebf6ce26..0a2c532ed 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -288,7 +288,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
     paint.drawEllipse( scale, scale, width - scale*2, width - scale*2 );
 
     // Draw the bright light spot of the LED now, using modified "old"
-    // painter routine taken from KDEUI´s KLed widget:
+    // painter routine taken from TDEUI´s KLed widget:
 
     // Setting the new width of the pen is essential to avoid "pixelized"
     // shadow like it can be observed with the old LED code
@@ -384,7 +384,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
     paint.drawEllipse( scale, scale, width - scale*2, width - scale*2 );
 
     // Draw the bright light spot of the LED now, using modified "old"
-    // painter routine taken from KDEUI´s KLed widget:
+    // painter routine taken from TDEUI´s KLed widget:
 
     // Setting the new width of the pen is essential to avoid "pixelized"
     // shadow like it can be observed with the old LED code
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 4e95705e0..f060c8925 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -42,7 +42,7 @@ class TQColor;
  *
  * @author Joerg Habenicht, Richard J. Moore (rich@kde.org) 1998, 1999
  */
-class KDEUI_EXPORT KLed : public TQWidget
+class TDEUI_EXPORT KLed : public TQWidget
 {
     Q_OBJECT
     Q_ENUMS( State Shape Look )
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index 3bc12738a..2f683fea0 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -142,7 +142,7 @@ class KURL;
  * @author Dawit Alemayehu <adawit@kde.org>
  */
 
-class KDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
+class TDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
 {
     friend class KComboBox;
 
diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h
index ac8d834e4..efa4b4a4a 100644
--- a/tdeui/klineeditdlg.h
+++ b/tdeui/klineeditdlg.h
@@ -37,7 +37,7 @@ class TQValidator;
  * @author David Faure <faure@kde.org>, layout management by Preston Brown <pbrown@kde.org>
  */
 
-class KDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
+class TDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
 {
   Q_OBJECT
 public:
diff --git a/tdeui/klistbox.h b/tdeui/klistbox.h
index 48d8cd1dc..810c5bfdd 100644
--- a/tdeui/klistbox.h
+++ b/tdeui/klistbox.h
@@ -37,7 +37,7 @@
  * settings.  If you want to get informed when the user selects
  * something connect to the TQListBox::selectionChanged() signal.
  **/
-class KDEUI_EXPORT KListBox : public TQListBox
+class TDEUI_EXPORT KListBox : public TQListBox
 {
     Q_OBJECT
 
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index a4e7d4b85..b15f9c9ce 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -50,7 +50,7 @@ class KLineEdit;
  * Reimplement dragObject() and (possibly) startDrag(),
  * and setDragEnabled(true).
  */
-class KDEUI_EXPORT KListView : public TQListView
+class TDEUI_EXPORT KListView : public TQListView
 {
   friend class KListViewItem;
 
@@ -1007,7 +1007,7 @@ private:
  *
  * @short listview item with alternate background color support
  */
-class KDEUI_EXPORT KListViewItem : public TQListViewItem
+class TDEUI_EXPORT KListViewItem : public TQListViewItem
 {
   friend class KListView;
 public:
diff --git a/tdeui/klistviewlineedit.h b/tdeui/klistviewlineedit.h
index 72f2555ed..f08997925 100644
--- a/tdeui/klistviewlineedit.h
+++ b/tdeui/klistviewlineedit.h
@@ -25,7 +25,7 @@
  * the editor for a KListView.  please don't use this.
  * @internal
  **/
-class KDEUI_EXPORT KListViewLineEdit : public KLineEdit
+class TDEUI_EXPORT KListViewLineEdit : public KLineEdit
 {
 Q_OBJECT
 public:
diff --git a/tdeui/klistviewsearchline.h b/tdeui/klistviewsearchline.h
index 4b7427803..f763aad72 100644
--- a/tdeui/klistviewsearchline.h
+++ b/tdeui/klistviewsearchline.h
@@ -44,7 +44,7 @@ class TQToolButton;
  * @since 3.3
  */
 
-class KDEUI_EXPORT KListViewSearchLine : public KLineEdit
+class TDEUI_EXPORT KListViewSearchLine : public KLineEdit
 {
     Q_OBJECT
 
@@ -216,7 +216,7 @@ private:
  *
  * @since 3.4
  */
-class KDEUI_EXPORT KListViewSearchLineWidget : public TQHBox
+class TDEUI_EXPORT KListViewSearchLineWidget : public TQHBox
 {
     Q_OBJECT
 
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index 035cdb772..d8aa59ff0 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -95,7 +95,7 @@ class DCOPObject;
 
  */
 
-class KDEUI_EXPORT KMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
+class TDEUI_EXPORT KMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
 {
     friend class KMWSessionManaged;
     Q_OBJECT
diff --git a/tdeui/kmainwindowiface.h b/tdeui/kmainwindowiface.h
index f7f7a0bb8..58ca74e2c 100644
--- a/tdeui/kmainwindowiface.h
+++ b/tdeui/kmainwindowiface.h
@@ -37,7 +37,7 @@ class KMainWindow;
  *
  * @author Ian Reinhart Geiser <geiseri@yahoo.com>
  */
-class KDEUI_EXPORT KMainWindowInterface : virtual public DCOPObject
+class TDEUI_EXPORT KMainWindowInterface : virtual public DCOPObject
 {
 K_DCOP
 
diff --git a/tdeui/kmenubar.h b/tdeui/kmenubar.h
index 5dcf56484..68cb24dd8 100644
--- a/tdeui/kmenubar.h
+++ b/tdeui/kmenubar.h
@@ -39,7 +39,7 @@
  * @version $Id$
 */
 
-class KDEUI_EXPORT KMenuBar : public TQMenuBar
+class TDEUI_EXPORT KMenuBar : public TQMenuBar
 {
     Q_OBJECT
 
diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h
index a543e106f..419d1edc7 100644
--- a/tdeui/kmessagebox.h
+++ b/tdeui/kmessagebox.h
@@ -41,7 +41,7 @@ class KDialogBase;
   *
   * @author Waldo Bastian (bastian@kde.org)
   */
-class KDEUI_EXPORT KMessageBox
+class TDEUI_EXPORT KMessageBox
 {
 public:
   /**
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index dd43092ef..3c4cb15f7 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -46,7 +46,7 @@ class KIntSpinBox;
  * for a different variable type
  *
  */
-class KDEUI_EXPORT KNumInput : public TQWidget
+class TDEUI_EXPORT KNumInput : public TQWidget
 {
     Q_OBJECT
     TQ_OBJECT
@@ -185,7 +185,7 @@ private:
  * @version $Id$
  */
 
-class KDEUI_EXPORT KIntNumInput : public KNumInput
+class TDEUI_EXPORT KIntNumInput : public KNumInput
 {
     Q_OBJECT
     TQ_OBJECT
@@ -431,7 +431,7 @@ class KDoubleLine;
  * @see KIntNumInput, KDoubleSpinBox
  */
 
-class KDEUI_EXPORT KDoubleNumInput : public KNumInput
+class TDEUI_EXPORT KDoubleNumInput : public KNumInput
 {
     Q_OBJECT
     TQ_OBJECT
@@ -704,7 +704,7 @@ private:
  *  The class provides an easy interface to use other
  *  numeric systems than the decimal.
  */
-class KDEUI_EXPORT KIntSpinBox : public TQSpinBox
+class TDEUI_EXPORT KIntSpinBox : public TQSpinBox
 {
     Q_OBJECT
     TQ_OBJECT
@@ -835,7 +835,7 @@ private:
    @since 3.1
 **/
 
-class KDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
+class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
   Q_OBJECT
   TQ_OBJECT
   Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 90bf1cbaf..04d5bf272 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -41,7 +41,7 @@ class TQString;
   @author Glen Parker <glenebob@nwlink.com>
   @version 0.0.1
 */
-class KDEUI_EXPORT KIntValidator : public TQValidator {
+class TDEUI_EXPORT KIntValidator : public TQValidator {
 
   public:
     /**
@@ -106,7 +106,7 @@ class KFloatValidatorPrivate;
   @author Glen Parker <glenebob@nwlink.com>
   @version 0.0.1
 */
-class KDEUI_EXPORT KFloatValidator : public TQValidator {
+class TDEUI_EXPORT KFloatValidator : public TQValidator {
 
   public:
     /**
@@ -178,7 +178,7 @@ class KDEUI_EXPORT KFloatValidator : public TQValidator {
    @since 3.1
 **/
 
-class KDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
+class TDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
   Q_OBJECT
   Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
 public:
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 34adf910a..29c62d2d8 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -94,7 +94,7 @@ class TQPopupMenu;
  *
  * @author Matthias Elter <elter@kde.org>
  **/
-class KDEUI_EXPORT KPanelApplet : public TQFrame
+class TDEUI_EXPORT KPanelApplet : public TQFrame
 {
     Q_OBJECT
 
diff --git a/tdeui/kpanelappmenu.h b/tdeui/kpanelappmenu.h
index 8df6c613b..f83d874c5 100644
--- a/tdeui/kpanelappmenu.h
+++ b/tdeui/kpanelappmenu.h
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject
+class TDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject
 {
     Q_OBJECT
 public:
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index d1131638d..c96cc3545 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -94,7 +94,7 @@ class KPanelExtensionPrivate;
  *
  * @author Matthias Elter <elter@kde.org>
  **/
-class KDEUI_EXPORT KPanelExtension : public TQFrame
+class TDEUI_EXPORT KPanelExtension : public TQFrame
 {
     Q_OBJECT
 
diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h
index 7db6393b2..ceffc6995 100644
--- a/tdeui/kpanelmenu.h
+++ b/tdeui/kpanelmenu.h
@@ -50,7 +50,7 @@ class KPanelMenuPrivate;
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
-class KDEUI_EXPORT KPanelMenu : public KPopupMenu
+class TDEUI_EXPORT KPanelMenu : public KPopupMenu
 {
     Q_OBJECT
 
diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h
index 91a861f40..de83bb36c 100644
--- a/tdeui/kpassdlg.h
+++ b/tdeui/kpassdlg.h
@@ -36,7 +36,7 @@ class TQWidget;
  * The widget uses the user's global "echo mode" setting.
  */
 
-class KDEUI_EXPORT KPasswordEdit
+class TDEUI_EXPORT KPasswordEdit
     : public TQLineEdit
 {
     Q_OBJECT
@@ -163,7 +163,7 @@ private:
  * @author Geert Jansen <jansen@kde.org>
  */
 
-class KDEUI_EXPORT KPasswordDialog
+class TDEUI_EXPORT KPasswordDialog
     : public KDialogBase
 {
     Q_OBJECT
diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h
index f1bbd7298..feacfe314 100644
--- a/tdeui/kpassivepopup.h
+++ b/tdeui/kpassivepopup.h
@@ -65,7 +65,7 @@ class TQVBox;
  * @author Richard Moore, rich@kde.org
  * @author Sascha Cunz, sascha.cunz@tiscali.de
  */
-class KDEUI_EXPORT KPassivePopup : public TQFrame
+class TDEUI_EXPORT KPassivePopup : public TQFrame
 {
     Q_OBJECT
     Q_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete )
diff --git a/tdeui/kpixmapio.h b/tdeui/kpixmapio.h
index 62bde1c35..8d69221fd 100644
--- a/tdeui/kpixmapio.h
+++ b/tdeui/kpixmapio.h
@@ -84,7 +84,7 @@ struct KPixmapIOPrivate;
  * point in using it.
  */
 
-class KDEUI_EXPORT KPixmapIO
+class TDEUI_EXPORT KPixmapIO
 {
 public:
     KPixmapIO();
diff --git a/tdeui/kpixmapregionselectordialog.h b/tdeui/kpixmapregionselectordialog.h
index 5828ecdc1..a78e9439f 100644
--- a/tdeui/kpixmapregionselectordialog.h
+++ b/tdeui/kpixmapregionselectordialog.h
@@ -39,7 +39,7 @@
  * @author Antonio Larrosa <larrosa@kde.org>
  * @since 3.4
  */ 
-class KDEUI_EXPORT KPixmapRegionSelectorDialog : public KDialogBase
+class TDEUI_EXPORT KPixmapRegionSelectorDialog : public KDialogBase
 {
 public:
    /**
diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h
index 6bd518c93..0e7f13e98 100644
--- a/tdeui/kpixmapregionselectorwidget.h
+++ b/tdeui/kpixmapregionselectorwidget.h
@@ -41,7 +41,7 @@ class KPopupMenu;
  * @author Antonio Larrosa <larrosa@kde.org>
  * @since 3.4
  */
-class KDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget
+class TDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget
 {
    Q_OBJECT
 public:
diff --git a/tdeui/kpopupmenu.h b/tdeui/kpopupmenu.h
index 8c593601c..0eab09715 100644
--- a/tdeui/kpopupmenu.h
+++ b/tdeui/kpopupmenu.h
@@ -35,7 +35,7 @@
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KDEUI_EXPORT KPopupTitle : public TQWidget
+class TDEUI_EXPORT KPopupTitle : public TQWidget
 {
     Q_OBJECT
 
@@ -120,7 +120,7 @@ private:
  * @author Daniel M. Duley <mosfet@kde.org>
  * @author Hamish Rodda <rodda@kde.org>
  */
-class KDEUI_EXPORT KPopupMenu : public TQPopupMenu {
+class TDEUI_EXPORT KPopupMenu : public TQPopupMenu {
     Q_OBJECT
     TQ_OBJECT
 public:
diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h
index e17cf0040..49dce88c0 100644
--- a/tdeui/kprogress.h
+++ b/tdeui/kprogress.h
@@ -43,7 +43,7 @@
  *
  * @author Aaron Seigo
  */
-class KDEUI_EXPORT KProgress : public TQProgressBar
+class TDEUI_EXPORT KProgress : public TQProgressBar
 {
   Q_OBJECT
 
@@ -184,7 +184,7 @@ private:
  * @short A dialog with a progress bar
  * @author Aaron J. Seigo
  */
-class KDEUI_EXPORT KProgressDialog : public KDialogBase
+class TDEUI_EXPORT KProgressDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h
index 08db1be8a..448b37abe 100644
--- a/tdeui/kprogressbox.h
+++ b/tdeui/kprogressbox.h
@@ -51,7 +51,7 @@
  * @short A dialog with a progress bar and text box.
  * @author Timothy Pearson
  */
-class KDEUI_EXPORT KProgressBoxDialog : public KDialogBase
+class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h
index b0664c807..725262947 100644
--- a/tdeui/kpushbutton.h
+++ b/tdeui/kpushbutton.h
@@ -34,7 +34,7 @@ class TQDragObject;
  * @short A TQPushButton with drag-support and KGuiItem support
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDEUI_EXPORT KPushButton : public TQPushButton
+class TDEUI_EXPORT KPushButton : public TQPushButton
 {
     Q_OBJECT
     Q_PROPERTY(int stdItem READ guiItm WRITE setGuiItm )
diff --git a/tdeui/krestrictedline.h b/tdeui/krestrictedline.h
index 7d13f40ca..4ea96219a 100644
--- a/tdeui/krestrictedline.h
+++ b/tdeui/krestrictedline.h
@@ -41,7 +41,7 @@
  *
  * @author Michael Wiedmann <mw@miwie.in-berlin.de>
  */
-class KDEUI_EXPORT KRestrictedLine : public KLineEdit
+class TDEUI_EXPORT KRestrictedLine : public KLineEdit
 {
   Q_OBJECT
   Q_PROPERTY( TQString validChars READ validChars WRITE setValidChars )
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 532bc9758..c773780ed 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -43,7 +43,7 @@ class KRootPixmapData;
  * @author Geert Jansen <jansen@kde.org>
  * @version $Id$
  */
-class KDEUI_EXPORT KRootPixmap: public TQObject
+class TDEUI_EXPORT KRootPixmap: public TQObject
 {
     Q_OBJECT
 
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index 1abeb5985..efb9b1412 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -68,7 +68,7 @@
  * @short A ruler widget.
  * @author Jörg Habenicht
  */
-class KDEUI_EXPORT KRuler : public TQFrame
+class TDEUI_EXPORT KRuler : public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index 7663a2c5f..c3741488f 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -84,7 +84,7 @@ enum KSpellClients {
  * @see KSpell
  */
 
-class KDEUI_EXPORT KSpellConfig : public TQWidget
+class TDEUI_EXPORT KSpellConfig : public TQWidget
 {
   Q_OBJECT
 
diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h
index 5611e6c3e..263e415f1 100644
--- a/tdeui/kscrollview.h
+++ b/tdeui/kscrollview.h
@@ -27,7 +27,7 @@
  *
  *
  **/
-class KDEUI_EXPORT KScrollView : public TQScrollView
+class TDEUI_EXPORT KScrollView : public TQScrollView
 {
   Q_OBJECT
 
diff --git a/tdeui/kselect.h b/tdeui/kselect.h
index 7a1c1ef4d..387f5cf09 100644
--- a/tdeui/kselect.h
+++ b/tdeui/kselect.h
@@ -40,7 +40,7 @@
  * A custom drawing routine for the widget surface has
  * to be provided by the subclass.
  */
-class KDEUI_EXPORT KXYSelector : public TQWidget
+class TDEUI_EXPORT KXYSelector : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( int xValue READ xValue WRITE setXValue )
@@ -156,7 +156,7 @@ private:
  * A custom drawing routine for the widget surface has
  * to be provided by the subclass.
  */
-class KDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl
+class TDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl
 {
   Q_OBJECT
   Q_PROPERTY( int value READ value WRITE setValue )
@@ -290,7 +290,7 @@ private:
  * \image html kgradientselector.png "KDE Gradient Selector Widget"
  *
  **/
-class KDEUI_EXPORT KGradientSelector : public KSelector
+class TDEUI_EXPORT KGradientSelector : public KSelector
 {
   Q_OBJECT
 
diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h
index 885f39ed5..171b13235 100644
--- a/tdeui/kseparator.h
+++ b/tdeui/kseparator.h
@@ -30,7 +30,7 @@
  * @author Michael Roth <mroth@wirlweb.de>
  * @version $Id$
 */
-class KDEUI_EXPORT KSeparator : public TQFrame
+class TDEUI_EXPORT KSeparator : public TQFrame
 {
   Q_OBJECT
   Q_PROPERTY( int orientation READ orientation WRITE setOrientation )
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index d1e3f9026..43f110983 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -53,7 +53,7 @@ class KSharedPixmapPrivate;
  * @version $Id$
  *
  */
-class KDEUI_EXPORT KSharedPixmap: 
+class TDEUI_EXPORT KSharedPixmap: 
     public TQWidget,
     public KPixmap
 {
diff --git a/tdeui/kshortcutdialog.h b/tdeui/kshortcutdialog.h
index d843f6fb0..e1f7643be 100644
--- a/tdeui/kshortcutdialog.h
+++ b/tdeui/kshortcutdialog.h
@@ -38,7 +38,7 @@ class KShortcutDialogAdvanced;
  * @see KKeyDialog
  * @since 3.4
  */
-class KDEUI_EXPORT KShortcutDialog : public KDialogBase
+class TDEUI_EXPORT KShortcutDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
diff --git a/tdeui/kspell.h b/tdeui/kspell.h
index def1f4f3a..95f07cee4 100644
--- a/tdeui/kspell.h
+++ b/tdeui/kspell.h
@@ -43,7 +43,7 @@ class KSpellDlg;
  * @see KSpellConfig, KSyntaxHighlighter
  */
 
-class KDEUI_EXPORT KSpell : public TQObject
+class TDEUI_EXPORT KSpell : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kspelldlg.h b/tdeui/kspelldlg.h
index 42960862e..c42476814 100644
--- a/tdeui/kspelldlg.h
+++ b/tdeui/kspelldlg.h
@@ -43,7 +43,7 @@ enum KS_RESULT {
   KS_CONFIG=     9
 };
 
-class KDEUI_EXPORT KSpellDlg : public KDialogBase
+class TDEUI_EXPORT KSpellDlg : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/ksplashscreen.h b/tdeui/ksplashscreen.h
index 38cee3413..79aebf57d 100644
--- a/tdeui/ksplashscreen.h
+++ b/tdeui/ksplashscreen.h
@@ -38,7 +38,7 @@ class TQPixmap;
  *  @author Chris Howells (howells@kde.org)
  *  @since 3.2
  */
-class KDEUI_EXPORT KSplashScreen : public TQSplashScreen
+class TDEUI_EXPORT KSplashScreen : public TQSplashScreen
 {
   Q_OBJECT
 
diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h
index 7d69e7ef1..b6a46f57f 100644
--- a/tdeui/ksqueezedtextlabel.h
+++ b/tdeui/ksqueezedtextlabel.h
@@ -43,7 +43,7 @@
 /*
  * QLabel
  */
-class KDEUI_EXPORT KSqueezedTextLabel : public TQLabel {
+class TDEUI_EXPORT KSqueezedTextLabel : public TQLabel {
   Q_OBJECT
 
 public:
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index bacc700bb..11a034552 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -32,7 +32,7 @@ class KStatusBar;
  *  Internal label class for use in KStatusBar
  *  @internal
  */
-class KDEUI_EXPORT KStatusBarLabel : public TQLabel
+class TDEUI_EXPORT KStatusBarLabel : public TQLabel
 {
   Q_OBJECT
 
@@ -84,7 +84,7 @@ signals:
 
  *  @see KActionCollection
  */
-class KDEUI_EXPORT KStatusBar : public TQStatusBar
+class TDEUI_EXPORT KStatusBar : public TQStatusBar
 {
   Q_OBJECT
 
diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h
index ba0845caf..cfbd9a376 100644
--- a/tdeui/kstdaction.h
+++ b/tdeui/kstdaction.h
@@ -165,7 +165,7 @@ namespace KStdAction
 	 * Creates an action corresponding to the
 	 * KStdAction::StdAction enum.
 	 */
-	KDEUI_EXPORT KAction* create( StdAction id, const char *name,
+	TDEUI_EXPORT KAction* create( StdAction id, const char *name,
 		const TQObject *recvr, const char *slot,
 		KActionCollection* parent );
 
@@ -186,7 +186,7 @@ namespace KStdAction
 	/**
 	 * This will return the internal name of a given standard action.
 	 */
-	KDEUI_EXPORT const char* name( StdAction id );
+	TDEUI_EXPORT const char* name( StdAction id );
 
         /// @obsolete. Use name()
 	inline const char* stdName(StdAction act_enum) { return name( act_enum ); }
@@ -196,17 +196,17 @@ namespace KStdAction
          * to give those heigher weight.
 	 * @since 3.1
         */
-        KDEUI_EXPORT TQStringList stdNames();
+        TDEUI_EXPORT TQStringList stdNames();
 
 	/**
 	 * Create a new document or window.
 	 */
-	KDEUI_EXPORT KAction *openNew(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT KAction *openNew(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Open an existing file.
 	 */
-	KDEUI_EXPORT KAction *open(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT KAction *open(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Open a recently used document. The signature of the slot being called
@@ -217,86 +217,86 @@ namespace KStdAction
 	 * @param parent parent widget
 	 * @param name name of widget
 	 */
-	KDEUI_EXPORT KRecentFilesAction *openRecent(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT KRecentFilesAction *openRecent(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Save the current document.
 	 */
-	KDEUI_EXPORT KAction *save(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *save(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Save the current document under a different name.
 	*/
-	KDEUI_EXPORT KAction *saveAs(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *saveAs(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Revert the current document to the last saved version
 	* (essentially will undo all changes).
 	*/
-	KDEUI_EXPORT KAction *revert(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *revert(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Close the current document.
 	*/
-	KDEUI_EXPORT KAction *close(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *close(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Print the current document.
 	*/
-	KDEUI_EXPORT KAction *print(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *print(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Show a print preview of the current document.
 	*/
-	KDEUI_EXPORT KAction *printPreview(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *printPreview(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Mail this document.
 	*/
-	KDEUI_EXPORT KAction *mail(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *mail(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Quit the program.
 	*/
-	KDEUI_EXPORT KAction *quit(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *quit(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Undo the last operation.
 	*/
-	KDEUI_EXPORT KAction *undo(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *undo(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Redo the last operation.
 	*/
-	KDEUI_EXPORT KAction *redo(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *redo(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Cut selected area and store it in the clipboard.
 	*/
-	KDEUI_EXPORT KAction *cut(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *cut(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Copy the selected area into the clipboard.
 	*/
-	KDEUI_EXPORT KAction *copy(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *copy(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Paste the contents of clipboard at the current mouse or cursor
 	* position.
 	*/
-	KDEUI_EXPORT KAction *paste(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *paste(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -305,190 +305,190 @@ namespace KStdAction
 	* menu if Klipper is running.
 	* @since 3.2
 	*/
-	KDEUI_EXPORT KAction *pasteText(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *pasteText(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Clear the content of the focus widget
 	* @since 3.2
 	*/
-	KDEUI_EXPORT KAction *clear(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *clear(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Select all elements in the current document.
 	*/
-	KDEUI_EXPORT KAction *selectAll(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *selectAll(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Deselect any selected elements in the current document.
 	*/
-	KDEUI_EXPORT KAction *deselect(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *deselect(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Initiate a 'find' request in the current document.
 	*/
-	KDEUI_EXPORT KAction *find(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *find(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find the next instance of a stored 'find'.
 	*/
-	KDEUI_EXPORT KAction *findNext(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *findNext(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find a previous instance of a stored 'find'.
 	*/
-	KDEUI_EXPORT KAction *findPrev(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *findPrev(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find and replace matches.
 	*/
-	KDEUI_EXPORT KAction *replace(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *replace(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* View the document at its actual size.
 	*/
-	KDEUI_EXPORT KAction *actualSize(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *actualSize(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the size of the current window.
 	*/
-	KDEUI_EXPORT KAction *fitToPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *fitToPage(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the width of the current window.
 	*/
-	KDEUI_EXPORT KAction *fitToWidth(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *fitToWidth(const TQObject *recvr, const char *slot,
 		KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the height of the current window.
 	*/
-	KDEUI_EXPORT KAction *fitToHeight(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *fitToHeight(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Zoom in.
 	*/
-	KDEUI_EXPORT KAction *zoomIn(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *zoomIn(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Zoom out.
 	*/
-	KDEUI_EXPORT KAction *zoomOut(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *zoomOut(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Popup a zoom dialog.
 	*/
-	KDEUI_EXPORT KAction *zoom(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *zoom(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Redisplay or redraw the document.
 	*/
-	KDEUI_EXPORT KAction *redisplay(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *redisplay(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move up (web style menu).
 	*/
-	KDEUI_EXPORT KAction *up(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *up(const TQObject *recvr, const char *slot,
 			KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move back (web style menu).
 	*/
-	KDEUI_EXPORT KAction *back(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *back(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move forward (web style menu).
 	*/
-	KDEUI_EXPORT KAction *forward(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *forward(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to the "Home" position or document.
 	*/
-	KDEUI_EXPORT KAction *home(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *home(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Scroll up one page.
 	*/
-	KDEUI_EXPORT KAction *prior(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *prior(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Scroll down one page.
 	*/
-	KDEUI_EXPORT KAction *next(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *next(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to somewhere in general.
 	*/
-	KDEUI_EXPORT KAction *goTo(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *goTo(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 
 	/**
 	* Go to a specific page (dialog).
 	*/
-	KDEUI_EXPORT KAction *gotoPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *gotoPage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to a specific line (dialog).
 	*/
-	KDEUI_EXPORT KAction *gotoLine(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *gotoLine(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Jump to the first page.
 	*/
-	KDEUI_EXPORT KAction *firstPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *firstPage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Jump to the last page.
 	*/
-	KDEUI_EXPORT KAction *lastPage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *lastPage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Add the current page to the bookmarks tree.
 	*/
-	KDEUI_EXPORT KAction *addBookmark(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *addBookmark(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Edit the application bookmarks.
 	*/
-	KDEUI_EXPORT KAction *editBookmarks(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *editBookmarks(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Pop up the spell checker.
 	*/
-	KDEUI_EXPORT KAction *spelling(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *spelling(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 
 	/**
 	* Show/Hide the menubar.
 	*/
-	KDEUI_EXPORT KToggleAction *showMenubar(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleAction *showMenubar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -498,7 +498,7 @@ namespace KStdAction
 	* Show/Hide the primary toolbar.
 	* @since 3.1
 	*/
-	KDEUI_EXPORT KToggleAction *showToolbar(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleAction *showToolbar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
 	/**
 	* @obsolete. toolbar actions are created automatically now in the
@@ -506,26 +506,26 @@ namespace KStdAction
 	* See: KMainWindow::setStandardToolBarMenuEnabled(bool);
 	* Show/Hide the primary toolbar.
 	*/
-	KDEUI_EXPORT KToggleToolBarAction *showToolbar(const char* toolBarName,
+	TDEUI_EXPORT KToggleToolBarAction *showToolbar(const char* toolBarName,
 					KActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
 
 	/**
 	* Show/Hide the statusbar.
 	*/
-	KDEUI_EXPORT KToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Switch to/from full screen mode
 	* @since 3.2
 	*/
-	KDEUI_EXPORT KToggleFullScreenAction *fullScreen(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KToggleFullScreenAction *fullScreen(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, TQWidget* window, const char *name = 0 );
 
 	/**
 	* Display the save options dialog.
 	*/
-	KDEUI_EXPORT KAction *saveOptions(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *saveOptions(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
@@ -534,19 +534,19 @@ namespace KStdAction
 	*  Note that you might be able to use the pre-built KXMLGUIFactory's fuction:
 	*  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
         */
-	KDEUI_EXPORT KAction *keyBindings(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *keyBindings(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the preferences/options dialog.
 	*/
-	KDEUI_EXPORT KAction *preferences(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *preferences(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* The Customize Toolbar dialog.
 	*/
-	KDEUI_EXPORT KAction *configureToolbars(const TQObject *recvr,
+	TDEUI_EXPORT KAction *configureToolbars(const TQObject *recvr,
 					const char *slot,
 					KActionCollection* parent,
 					const char *name = 0 );
@@ -555,7 +555,7 @@ namespace KStdAction
 	* The Configure Notifications dialog.
 	* @since 3.1
 	*/
-	KDEUI_EXPORT KAction *configureNotifications(const TQObject *recvr,
+	TDEUI_EXPORT KAction *configureNotifications(const TQObject *recvr,
 					const char *slot,
 					KActionCollection *parent,
 					const char *name = 0);
@@ -563,51 +563,51 @@ namespace KStdAction
 	/**
 	* Display the help.
 	*/
-	KDEUI_EXPORT KAction *help(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *help(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the help contents.
 	*/
-	KDEUI_EXPORT KAction *helpContents(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *helpContents(const TQObject *recvr, const char *slot,
 					KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Trigger the What's This cursor.
 	*/
-	KDEUI_EXPORT KAction *whatsThis(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *whatsThis(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display "Tip of the Day"
 	* @since 3.1
 	*/
-	KDEUI_EXPORT KAction *tipOfDay(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *tipOfDay(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Open up the Report Bug dialog.
 	*/
-	KDEUI_EXPORT KAction *reportBug(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *reportBug(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the application's About box.
 	*/
-	KDEUI_EXPORT KAction *aboutApp(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *aboutApp(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the About KDE dialog.
 	*/
-	KDEUI_EXPORT KAction *aboutKDE(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *aboutKDE(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display "Switch application language" dialog.
 	* @since 3.5.8
 	*/
-	KDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
+	TDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
 				KActionCollection* parent, const char *name = 0 );
 }
 
diff --git a/tdeui/kstdguiitem.h b/tdeui/kstdguiitem.h
index 438f419fe..3014737ab 100644
--- a/tdeui/kstdguiitem.h
+++ b/tdeui/kstdguiitem.h
@@ -34,7 +34,7 @@
  *
  * @author Holger Freyther <freyther@kde.org>
  */
-class KDEUI_EXPORT KStdGuiItem
+class TDEUI_EXPORT KStdGuiItem
 {
 public:
     /**
diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h
index 37627abee..55905ab79 100644
--- a/tdeui/kstringvalidator.h
+++ b/tdeui/kstringvalidator.h
@@ -57,7 +57,7 @@
  *
  * @author Marc Mutz <mutz@kde.org>
  **/
-class KDEUI_EXPORT KStringListValidator : public TQValidator {
+class TDEUI_EXPORT KStringListValidator : public TQValidator {
   Q_OBJECT
   Q_PROPERTY( TQStringList stringList READ stringList WRITE setStringList )
   Q_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting )
@@ -116,7 +116,7 @@ private:
  *
  * @author Marc Mutz <mutz@kde.org>
  **/
-class KDEUI_EXPORT KMimeTypeValidator : public TQValidator
+class TDEUI_EXPORT KMimeTypeValidator : public TQValidator
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kswitchlanguagedialog.h b/tdeui/kswitchlanguagedialog.h
index 185941b57..9e0a3ff87 100644
--- a/tdeui/kswitchlanguagedialog.h
+++ b/tdeui/kswitchlanguagedialog.h
@@ -35,7 +35,7 @@ class KSwitchLanguageDialogPrivate;
  * @author Krzysztof Lichota (lichota@mimuw.edu.pl)
  */
 
-class KDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase
+class TDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase
 {
   Q_OBJECT
 
diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h
index 9f6e80158..e5cf5a69c 100644
--- a/tdeui/ksyntaxhighlighter.h
+++ b/tdeui/ksyntaxhighlighter.h
@@ -39,7 +39,7 @@ class KSpellConfig;
 /**
  * \brief Syntax sensitive text highlighter
  */
-class KDEUI_EXPORT KSyntaxHighlighter : public TQSyntaxHighlighter
+class TDEUI_EXPORT KSyntaxHighlighter : public TQSyntaxHighlighter
 {
 public:
     enum SyntaxMode {
@@ -62,7 +62,7 @@ private:
     KSyntaxHighlighterPrivate *d;
 };
 
-class KDEUI_EXPORT KSpellingHighlighter : public KSyntaxHighlighter
+class TDEUI_EXPORT KSpellingHighlighter : public KSyntaxHighlighter
 {
 public:
     KSpellingHighlighter( TQTextEdit *textEdit,
@@ -91,7 +91,7 @@ private:
 /**
  * \brief Dictionary sensitive text highlighter
  */
-class KDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter
+class TDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter
 {
 Q_OBJECT
 
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 26e1b948a..79d73d3e3 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -60,7 +60,7 @@ class KSystemTrayPrivate;
  *
  * @author Matthias Ettrich <ettrich@kde.org>
  **/
-class KDEUI_EXPORT KSystemTray : public TQLabel
+class TDEUI_EXPORT KSystemTray : public TQLabel
 {
     Q_OBJECT
 public:
diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h
index 4ec9822ef..b7d93c32d 100644
--- a/tdeui/ktabbar.h
+++ b/tdeui/ktabbar.h
@@ -32,7 +32,7 @@ class KTabBarPrivate;
 /**
  * @since 3.2
  */
-class KDEUI_EXPORT KTabBar: public TQTabBar
+class TDEUI_EXPORT KTabBar: public TQTabBar
 {
     Q_OBJECT
 
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index 1151eb22e..ba353c1f5 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -45,7 +45,7 @@
  * @author Alexander Sanda (alex@darkstar.ping.at)
  * @version $Id$
 */
-class KDEUI_EXPORT KTabCtl : public TQWidget
+class TDEUI_EXPORT KTabCtl : public TQWidget
 {
     Q_OBJECT
 
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index 9629eb9e8..9b2151916 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -33,7 +33,7 @@ class KTabWidgetPrivate;
  *
  * @since 3.2
  */
-class KDEUI_EXPORT KTabWidget : public TQTabWidget
+class TDEUI_EXPORT KTabWidget : public TQTabWidget
 {
     Q_OBJECT
     Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 9c9fd929d..7401d5263 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -39,7 +39,7 @@
  * @author Espen Sand (espensa@online.no)
  */
 
-class KDEUI_EXPORT KTextBrowser : public TQTextBrowser
+class TDEUI_EXPORT KTextBrowser : public TQTextBrowser
 {
   Q_OBJECT
   Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h
index a93d36fe1..5150dfb69 100644
--- a/tdeui/ktextedit.h
+++ b/tdeui/ktextedit.h
@@ -40,7 +40,7 @@ class KSpell;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @since 3.1
  */
-class KDEUI_EXPORT KTextEdit : public TQTextEdit
+class TDEUI_EXPORT KTextEdit : public TQTextEdit
 {
     Q_OBJECT
 
diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h
index 0d6f18873..24d762a7f 100644
--- a/tdeui/ktimewidget.h
+++ b/tdeui/ktimewidget.h
@@ -34,7 +34,7 @@
  * @author Hans Petter Bieker <bieker@kde.org>
  * @since 3.2
  */
-class KDEUI_EXPORT KTimeWidget : public TQWidget
+class TDEUI_EXPORT KTimeWidget : public TQWidget
 {
   Q_OBJECT
   Q_PROPERTY( TQTime time READ time WRITE setTime )
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index a09b1dd56..03764d246 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -56,7 +56,7 @@ class KTimezoneWidgetPrivate;
  * @author S.R.Haque <srhaque@iee.org>
  * @since 3.5
  */
-class KDEUI_EXPORT KTimezoneWidget :
+class TDEUI_EXPORT KTimezoneWidget :
     public KListView
 {
     Q_OBJECT
diff --git a/tdeui/ktip.h b/tdeui/ktip.h
index 861f1c82e..d18efd27e 100644
--- a/tdeui/ktip.h
+++ b/tdeui/ktip.h
@@ -52,7 +52,7 @@ class KTextBrowser;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
  *
  */
-class KDEUI_EXPORT KTipDatabase
+class TDEUI_EXPORT KTipDatabase
 {
 public:
     /**
@@ -105,7 +105,7 @@ private:
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@caldera.de>
  */
-class KDEUI_EXPORT KTipDialog : public KDialog
+class TDEUI_EXPORT KTipDialog : public KDialog
 {
     Q_OBJECT
 public:
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index aff0331e6..918ce00a4 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -55,7 +55,7 @@ class KXMLGUIClient;
 
 class KToolBarPrivate;
 
-class KDEUI_EXPORT KToolBarSeparator : public TQFrame
+class TDEUI_EXPORT KToolBarSeparator : public TQFrame
 {
     Q_OBJECT
     TQ_OBJECT
@@ -101,7 +101,7 @@ private:
   * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>.
   */
 
-class KDEUI_EXPORT KToolBar : public TQToolBar
+class TDEUI_EXPORT KToolBar : public TQToolBar
 {
     Q_OBJECT
     TQ_OBJECT
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index 7c642aedb..5af5c1b1c 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -41,7 +41,7 @@ class TQPainter;
  * KToolBar methods instead.
  * @internal
  */
-class KDEUI_EXPORT KToolBarButton : public TQToolButton
+class TDEUI_EXPORT KToolBarButton : public TQToolButton
 {
   Q_OBJECT
   TQ_OBJECT
@@ -321,7 +321,7 @@ private:
 * @internal
 * @version $Id$
 */
-class KDEUI_EXPORT KToolBarButtonList : public TQIntDict<KToolBarButton>
+class TDEUI_EXPORT KToolBarButtonList : public TQIntDict<KToolBarButton>
 {
 public:
    KToolBarButtonList();
diff --git a/tdeui/ktoolbarlabelaction.h b/tdeui/ktoolbarlabelaction.h
index 2cbc27875..2cf7c99be 100644
--- a/tdeui/ktoolbarlabelaction.h
+++ b/tdeui/ktoolbarlabelaction.h
@@ -46,7 +46,7 @@ class TQLabel;
  *
  * @author Felix Berger <felixberger@beldesign.de>
  */
-class KDEUI_EXPORT KToolBarLabelAction : public KWidgetAction
+class TDEUI_EXPORT KToolBarLabelAction : public KWidgetAction
 {
 public:
   /**
diff --git a/tdeui/ktoolbarradiogroup.h b/tdeui/ktoolbarradiogroup.h
index f0e793bf2..7a4ae8be5 100644
--- a/tdeui/ktoolbarradiogroup.h
+++ b/tdeui/ktoolbarradiogroup.h
@@ -46,7 +46,7 @@ class KToolBarRadioGroupPrivate;
   *
   * @author Sven Radej <radej@kde.org>
   */
-class KDEUI_EXPORT KToolBarRadioGroup : public TQObject
+class TDEUI_EXPORT KToolBarRadioGroup : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h
index 5563f77ba..cff7bee84 100644
--- a/tdeui/kurllabel.h
+++ b/tdeui/kurllabel.h
@@ -68,7 +68,7 @@ class TQPixmap;
  * @version $Id$
  *
  */
-class KDEUI_EXPORT KURLLabel : public TQLabel
+class TDEUI_EXPORT KURLLabel : public TQLabel
 {
   Q_OBJECT
   Q_PROPERTY (TQString url READ url WRITE setURL)
diff --git a/tdeui/kwhatsthismanager_p.h b/tdeui/kwhatsthismanager_p.h
index 919ffd197..cce1c8ea5 100644
--- a/tdeui/kwhatsthismanager_p.h
+++ b/tdeui/kwhatsthismanager_p.h
@@ -43,7 +43,7 @@ class TQTextEdit;
  * @see QWhatsThis
  * @author Peter Rockai (mornfall) <mornfall@danill.sk>
  **/
-class KDEUI_EXPORT KWhatsThisManager : public TQObject
+class TDEUI_EXPORT KWhatsThisManager : public TQObject
 {
     Q_OBJECT
     public:
diff --git a/tdeui/kwindowinfo.h b/tdeui/kwindowinfo.h
index 167d3e0a9..780578d75 100644
--- a/tdeui/kwindowinfo.h
+++ b/tdeui/kwindowinfo.h
@@ -38,7 +38,7 @@
  * @author Richard Moore, rich@kde.org
  * @since 3.1
 */
-class KDEUI_EXPORT KWindowInfo : public TQObject
+class TDEUI_EXPORT KWindowInfo : public TQObject
 {
     Q_OBJECT
 
diff --git a/tdeui/kwindowlistmenu.h b/tdeui/kwindowlistmenu.h
index 3e05cf63f..7d796b632 100644
--- a/tdeui/kwindowlistmenu.h
+++ b/tdeui/kwindowlistmenu.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class KWinModule;
 class KWindowListMenuPrivate;
 
-class KDEUI_EXPORT KWindowListMenu : public KPopupMenu
+class TDEUI_EXPORT KWindowListMenu : public KPopupMenu
 {
     Q_OBJECT
 
diff --git a/tdeui/kwizard.h b/tdeui/kwizard.h
index 977ea5d86..44df05959 100644
--- a/tdeui/kwizard.h
+++ b/tdeui/kwizard.h
@@ -43,7 +43,7 @@
 * @author Harri Porten <porten@kde.org>
 * @version 0.3 
 */
-class KDEUI_EXPORT KWizard : public TQWizard
+class TDEUI_EXPORT KWizard : public TQWizard
 {
   Q_OBJECT
 public:
diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h
index 5971525da..2681bfa28 100644
--- a/tdeui/kwordwrap.h
+++ b/tdeui/kwordwrap.h
@@ -45,7 +45,7 @@
  *
  * @author David Faure <faure@kde.org>
  */
-class KDEUI_EXPORT KWordWrap
+class TDEUI_EXPORT KWordWrap
 {
 public:
     /**
diff --git a/tdeui/kxmlguibuilder.h b/tdeui/kxmlguibuilder.h
index 4eb6bd46e..2cd77ef4e 100644
--- a/tdeui/kxmlguibuilder.h
+++ b/tdeui/kxmlguibuilder.h
@@ -36,7 +36,7 @@ class KXMLGUIClient;
  * the toplevel widget is a KMainWindow. Other implementations may appear
  * in the future (dialogs for instance)
  */
-class KDEUI_EXPORT KXMLGUIBuilder
+class TDEUI_EXPORT KXMLGUIBuilder
 {
  public:
 
diff --git a/tdeui/kxmlguiclient.h b/tdeui/kxmlguiclient.h
index f3f7393f4..194491d38 100644
--- a/tdeui/kxmlguiclient.h
+++ b/tdeui/kxmlguiclient.h
@@ -40,7 +40,7 @@ class KXMLGUIBuilder;
  * GUI from actions and an XML document, and can be dynamically merged
  * with other KXMLGUIClients.
  */
-class KDEUI_EXPORT KXMLGUIClient
+class TDEUI_EXPORT KXMLGUIClient
 {
     friend class KEditToolbarWidget; // for setXMLFile(3 args)
 public:
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index 59b75c14b..02c759f1b 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -59,7 +59,7 @@ class BuildHelper;
  * according to the XML and the merging rules of previously inserted clients. Container widgets
  * are built via a KXMLGUIBuilder , which has to be provided with the KXMLGUIFactory constructor.
  */
-class KDEUI_EXPORT KXMLGUIFactory : public TQObject
+class TDEUI_EXPORT KXMLGUIFactory : public TQObject
 {
   friend class KXMLGUI::BuildHelper;
   Q_OBJECT
diff --git a/tdeui/kxmlguifactory_p.h b/tdeui/kxmlguifactory_p.h
index 1877a295f..dc263b677 100644
--- a/tdeui/kxmlguifactory_p.h
+++ b/tdeui/kxmlguifactory_p.h
@@ -36,7 +36,7 @@ namespace KXMLGUI
 
 struct BuildState;
 
-class KDEUI_EXPORT ActionList : public TQPtrList<KAction>
+class TDEUI_EXPORT ActionList : public TQPtrList<KAction>
 {
 public:
     ActionList() {}
@@ -107,7 +107,7 @@ typedef TQValueList<MergingIndex> MergingIndexList;
  * position.
  * (used when no merging index is used for a certain action, custom element or sub-container)
  */
-struct KDEUI_EXPORT ContainerNode
+struct TDEUI_EXPORT ContainerNode
 {
     ContainerNode( TQWidget *_container, const TQString &_tagName, const TQString &_name,
                    ContainerNode *_parent = 0L, KXMLGUIClient *_client = 0L,
@@ -178,7 +178,7 @@ struct KDEUI_EXPORT ContainerNode
 typedef TQPtrList<ContainerNode> ContainerNodeList;
 typedef TQPtrListIterator<ContainerNode> ContainerNodeListIt;
 
-class KDEUI_EXPORT BuildHelper
+class TDEUI_EXPORT BuildHelper
 {
 public:
     BuildHelper( BuildState &state, 
@@ -220,7 +220,7 @@ private:
     ContainerNode *parentNode;
 };
 
-struct KDEUI_EXPORT BuildState
+struct TDEUI_EXPORT BuildState
 {
     BuildState() : guiClient( 0 ), builder( 0 ), clientBuilder( 0 ) {}
 
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index c9dcac05d..626f89602 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -59,7 +59,7 @@ class QXEmbedData;
  *
  * @short The QXEmbed widget is a graphical socket that can embed an external X-Window.
 */
-class KDEUI_EXPORT QXEmbed : public TQWidget
+class TDEUI_EXPORT QXEmbed : public TQWidget
 {
     Q_OBJECT
     TQ_OBJECT
diff --git a/tdeui/tests/kmainwindowrestoretest.h b/tdeui/tests/kmainwindowrestoretest.h
index 7bd535f74..f29ae2fca 100644
--- a/tdeui/tests/kmainwindowrestoretest.h
+++ b/tdeui/tests/kmainwindowrestoretest.h
@@ -1,5 +1,5 @@
-#ifndef _KDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
-#define _KDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#ifndef _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#define _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
 
 #include <kmainwindow.h>
 
@@ -45,4 +45,4 @@ public:
   virtual ~MainWin6() {}
 };
 
-#endif // _KDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#endif // _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
diff --git a/win/config.h b/win/config.h
index 9d6f25e4b..465498141 100644
--- a/win/config.h
+++ b/win/config.h
@@ -44,8 +44,8 @@
 extern "C" {
 #endif
 
-KDECORE_EXPORT int mkstemps (char* _template, int suffix_len);
-KDECORE_EXPORT char* mkdtemp (char* _template);
+TDECORE_EXPORT int mkstemps (char* _template, int suffix_len);
+TDECORE_EXPORT char* mkdtemp (char* _template);
 
 #ifdef __cplusplus
 }
diff --git a/win/kdelibs_export_win.h b/win/kdelibs_export_win.h
index 064cc6484..17663a5fa 100644
--- a/win/kdelibs_export_win.h
+++ b/win/kdelibs_export_win.h
@@ -25,11 +25,11 @@
 
 #define KDE_IMPORT __declspec(dllimport)
 
-#ifdef MAKE_KDECORE_LIB
-# define KDECORE_EXPORT KDE_EXPORT
+#ifdef MAKE_TDECORE_LIB
+# define TDECORE_EXPORT KDE_EXPORT
 #else
-# ifndef KDECORE_EXPORT
-#  define KDECORE_EXPORT KDE_IMPORT //for apps and other libs
+# ifndef TDECORE_EXPORT
+#  define TDECORE_EXPORT KDE_IMPORT //for apps and other libs
 # endif
 #endif
 
@@ -40,27 +40,27 @@
 #endif
 
 /* some classes, i.e. KDock* already use EXPORT_* macro: define it too */
-#ifdef MAKE_KDEUI_LIB
-# define KDEUI_EXPORT KDE_EXPORT
+#ifdef MAKE_TDEUI_LIB
+# define TDEUI_EXPORT KDE_EXPORT
 # define EXPORT_DOCKCLASS KDE_EXPORT
 #elif KDE_MAKE_LIB
-# define KDEUI_EXPORT KDE_IMPORT
+# define TDEUI_EXPORT KDE_IMPORT
 # define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */
 #else
-# define KDEUI_EXPORT
+# define TDEUI_EXPORT
 # define EXPORT_DOCKCLASS
 #endif
 
-#ifdef MAKE_KDEFX_LIB
-# define KDEFX_EXPORT  KDE_EXPORT
+#ifdef MAKE_TDEFX_LIB
+# define TDEFX_EXPORT  KDE_EXPORT
 #else
-# define KDEFX_EXPORT KDE_IMPORT
+# define TDEFX_EXPORT KDE_IMPORT
 #endif
 
-#ifdef MAKE_KDEPRINT_LIB
-# define KDEPRINT_EXPORT  KDE_EXPORT
+#ifdef MAKE_TDEPRINT_LIB
+# define TDEPRINT_EXPORT  KDE_EXPORT
 #else
-# define KDEPRINT_EXPORT KDE_IMPORT
+# define TDEPRINT_EXPORT KDE_IMPORT
 #endif
 
 #ifndef KIO_EXPORT
@@ -108,10 +108,10 @@
 # define KRESOURCES_EXPORT KDE_IMPORT
 #endif
 
-#ifdef MAKE_KDESU_LIB
-# define KDESU_EXPORT KDE_EXPORT
+#ifdef MAKE_TDESU_LIB
+# define TDESU_EXPORT KDE_EXPORT
 #else
-# define KDESU_EXPORT KDE_IMPORT
+# define TDESU_EXPORT KDE_IMPORT
 #endif
 
 // all KStyle libs
diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro
index cb732b012..ad343ec0e 100644
--- a/win/pro_files/dcop/client/client.pro
+++ b/win/pro_files/dcop/client/client.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 #DEFINES += MAKE_DCOP_LIB
 
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
 
 TARGET		= dcopclient
 
diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro
index 946a128c4..3d623054e 100644
--- a/win/pro_files/dcop/client/dcop/dcop.pro
+++ b/win/pro_files/dcop/client/dcop/dcop.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 #DEFINES += MAKE_DCOP_LIB
 
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
 
 TARGET		= dcop
 
diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
index 6c643bb14..d52b1550a 100644
--- a/win/pro_files/dcop/client/dcopfind/dcopfind.pro
+++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 #DEFINES += MAKE_DCOP_LIB
 
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
 
 TARGET		= dcopfind
 
diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro
index 65ba00a9d..65af67a81 100644
--- a/win/pro_files/dcop/client/dcopref/dcopref.pro
+++ b/win/pro_files/dcop/client/dcopref/dcopref.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 #DEFINES += MAKE_DCOP_LIB
 
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
 
 TARGET		= dcopref
 
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index 549e2344f..7a81aa820 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -7,7 +7,7 @@ unix {
 	INCLUDEPATH += moc
 	#force finding libraries in current dir (for installer, etc):
 	QMAKE_LFLAGS += -Wl,-rpath,.
-	DEFINES += KDEFX_EXPORT=
+	DEFINES += TDEFX_EXPORT=
 }
 
 
@@ -25,7 +25,7 @@ LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS
 CONFIG -= debug
 
 # needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB MAKE_KDEFX_LIB
+DEFINES += MAKE_KSTYLE_LIB MAKE_TDEFX_LIB
 
 TARGET		= thinkeramik
 
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index c4579a5cf..04bfcd3fd 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 include( $(KDELIBS)/win/zlib.pro )
 
 # needed to export library classes:
-DEFINES += MAKE_KDECORE_LIB
+DEFINES += MAKE_TDECORE_LIB
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
 	-lqassistantclient
diff --git a/win/pro_files/tdefx/tdefx.pro b/win/pro_files/tdefx/tdefx.pro
index eab9ea7d9..f37639f92 100644
--- a/win/pro_files/tdefx/tdefx.pro
+++ b/win/pro_files/tdefx/tdefx.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KDEFX_LIB
+DEFINES += MAKE_TDEFX_LIB
 
 TARGET		= tdefx$$KDEBUG
 
diff --git a/win/pro_files/tdefx/tdefx_rel.pro b/win/pro_files/tdefx/tdefx_rel.pro
index 66ae8f1a4..e882168c8 100644
--- a/win/pro_files/tdefx/tdefx_rel.pro
+++ b/win/pro_files/tdefx/tdefx_rel.pro
@@ -8,7 +8,7 @@ include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KDEFX_LIB
+DEFINES += MAKE_TDEFX_LIB
 
 system( moc kstyle.h -o moc/kstyle.moc )
 
diff --git a/win/pro_files/tdeprint/tdeprint.pro b/win/pro_files/tdeprint/tdeprint.pro
index eb1bfff69..b5269d0f2 100644
--- a/win/pro_files/tdeprint/tdeprint.pro
+++ b/win/pro_files/tdeprint/tdeprint.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KDEPRINT_LIB
+DEFINES += MAKE_TDEPRINT_LIB
 
 TARGET		= tdeprint$$KDEBUG
 
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index 20f8c26ee..be39628e7 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KDEUI_LIB
+DEFINES += MAKE_TDEUI_LIB
 
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX 
diff --git a/win/stdlib.h b/win/stdlib.h
index 1f5c01f89..967b76533 100644
--- a/win/stdlib.h
+++ b/win/stdlib.h
@@ -47,8 +47,8 @@ extern "C" {
 #define EXIT_SUCCESS 0
 
 /* from fakes.c */
-KDECORE_EXPORT int setenv(const char *__string, const char *__value, int __overwrite);
-KDECORE_EXPORT void unsetenv(const char *__string);
+TDECORE_EXPORT int setenv(const char *__string, const char *__value, int __overwrite);
+TDECORE_EXPORT void unsetenv(const char *__string);
 
 #ifdef __cplusplus
 }
diff --git a/win/string.h b/win/string.h
index 14127b6e8..4c4ae2b99 100644
--- a/win/string.h
+++ b/win/string.h
@@ -32,10 +32,10 @@ extern "C" {
 #endif
 
 /* implemented in fakes.c */
-KDECORE_EXPORT unsigned long strlcpy(char *dst, const char *src, unsigned long siz);
+TDECORE_EXPORT unsigned long strlcpy(char *dst, const char *src, unsigned long siz);
 
 /* implemented in fakes.c */
-KDECORE_EXPORT unsigned long strlcat(char *dst, const char *src, unsigned long siz);
+TDECORE_EXPORT unsigned long strlcat(char *dst, const char *src, unsigned long siz);
 
 KDEWIN32_EXPORT char* strndup(const char *src, size_t n);