Rename a few build variables for overall consistency

54 files changed, 128 insertions, 128 deletions

diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index ca9b67388..d9a1f2a7a 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -524,7 +524,7 @@ disable this use a #define KDE_NO_COMPAT.
 The tdefile-library, as used by the KFileDialog provides classes for directory browsing widgets.
 Those classes gained some new features, some parts were merged with other existing classes
 and in some cases the API was cleaned up/fixed. The library is now built as part of libtdeio
-library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -ltdefile).
+library (there's no need to modify Makefiles which use $LIB_TDEFILE instead of hardcoding -ltdefile).
 <p>
 Even if the list of changes is long, the affected code base should be relatively small, as most
 parts are rarely used outside of tdefile.
diff --git a/configure.in.in b/configure.in.in
index e6969bb1f..651d6f2eb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -253,7 +253,7 @@ AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.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)/tdeio/libtdeio.la')
-AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_TDEFILE, '$(top_builddir)/tdeio/libtdeio.la')
 AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
 AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index de48e4712..6eae52cf7 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEAUDIOPREVIEW_H
-#define KFILEAUDIOPREVIEW_H
+#ifndef TDEFILEAUDIOPREVIEW_H
+#define TDEFILEAUDIOPREVIEW_H
 
 #include <tqdict.h>
 
@@ -61,4 +61,4 @@ private:
     KFileAudioPreviewPrivate *d;
 };
 
-#endif // KFILEAUDIOPREVIEW_H
+#endif // TDEFILEAUDIOPREVIEW_H
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index fce0ec563..b535b39cc 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -23,7 +23,7 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
 
 
 libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
 
 tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am
index 52cd161e4..4b61d2828 100644
--- a/kabc/plugins/dir/Makefile.am
+++ b/kabc/plugins/dir/Makefile.am
@@ -6,7 +6,7 @@ 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)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
 libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_dir.la
diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am
index 832ec2283..b1530d97d 100644
--- a/kabc/plugins/file/Makefile.am
+++ b/kabc/plugins/file/Makefile.am
@@ -6,7 +6,7 @@ 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)/tderesources/libtderesources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
+libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
 libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
 
 
diff --git a/kate/data/progress.xml b/kate/data/progress.xml
index 985a92091..fd887bece 100644
--- a/kate/data/progress.xml
+++ b/kate/data/progress.xml
@@ -429,7 +429,7 @@
   <item> TEMP-TABLE </item>
   <item> VARIABLE </item>
   <item> WORK-TABLE </item>
-  <item> WORKFILE </item>
+  <item> WORTDEFILE </item>
   <item> DELETE </item>
   <item> ALIAS </item>
   <item> OBJECT </item>
diff --git a/kate/data/rsiidl.xml b/kate/data/rsiidl.xml
index 574e19143..093fdd68d 100644
--- a/kate/data/rsiidl.xml
+++ b/kate/data/rsiidl.xml
@@ -164,7 +164,7 @@
         <item>DEVICE </item>
         <item>DFPMIN </item>
         <item>DIALOG_MESSAGE </item>
-        <item>DIALOG_PICKFILE </item>
+        <item>DIALOG_PICTDEFILE </item>
         <item>DIALOG_PRINTERSETUP </item>
         <item>DIALOG_PRINTJOB </item>
         <item>DILATE </item>
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index a0e0edbc3..71b201485 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_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TDEFILE) $(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 1cce05391..4a89ef3af 100644
--- a/kate/plugins/insertfile/Makefile.am
+++ b/kate/plugins/insertfile/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = tdetexteditor_insertfile.la
 
 tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
 tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
 insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am
index 2d4417d97..a0317d979 100644
--- a/kate/plugins/kdatatool/Makefile.am
+++ b/kate/plugins/kdatatool/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = tdetexteditor_kdatatool.la
 
 tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
-tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
 tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index a6f605f4a..2af31ccd2 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = libtdecertpart.la
 libtdecertpart_la_SOURCES	= tdecertpart.cc
 
 libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libtdecertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
+libtdecertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
 libtdecertpart_la_DEPENDENCIES = $(LIB_KPARTS)
 
 libtdecertpart_la_METASOURCES = AUTO
diff --git a/tdecmshell/Makefile.am b/tdecmshell/Makefile.am
index a6e1d2d74..b5e18e1f3 100644
--- a/tdecmshell/Makefile.am
+++ b/tdecmshell/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS =
 tdeinit_LTLIBRARIES = tdecmshell.la
 
 tdecmshell_la_SOURCES = main.cpp main.skel
-tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
+tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
 tdecmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 noinst_HEADERS = main.h
diff --git a/tdecore/klockfile.h b/tdecore/klockfile.h
index 61968bf0f..698706554 100644
--- a/tdecore/klockfile.h
+++ b/tdecore/klockfile.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KLOCKFILE_H_
-#define _KLOCKFILE_H_
+#ifndef _KLOCTDEFILE_H_
+#define _KLOCTDEFILE_H_
 
 #include <tqstring.h>
 #include <tqdatetime.h>
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 9ba0a994b..46b36f1d8 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -44,7 +44,7 @@
 #define KABC_EXPORT KDE_EXPORT
 #define TDESU_EXPORT KDE_EXPORT
 #define KVCARD_EXPORT KDE_EXPORT
-#define KRESOURCES_EXPORT KDE_EXPORT
+#define TDERESOURCES_EXPORT KDE_EXPORT
 #define KSTYLE_EXPORT KDE_EXPORT
 #define TDEHTML_EXPORT KDE_EXPORT
 #define KMDI_EXPORT KDE_EXPORT
@@ -52,7 +52,7 @@
 #define KATEPARTINTERFACES_EXPORT KDE_EXPORT
 #define KATEPART_EXPORT KDE_EXPORT
 #define KMID_EXPORT KDE_EXPORT
-#define KRANDR_EXPORT KDE_EXPORT
+#define TDERANDR_EXPORT KDE_EXPORT
 #define KIMPROXY_EXPORT KDE_EXPORT
 #define KDE_ARTS_EXPORT KDE_EXPORT
 #define KUNITTEST_EXPORT KDE_EXPORT
diff --git a/tdefile-plugins/elf/tdefile_elf.h b/tdefile-plugins/elf/tdefile_elf.h
index f53d36e0a..cd72afc87 100644
--- a/tdefile-plugins/elf/tdefile_elf.h
+++ b/tdefile-plugins/elf/tdefile_elf.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_BMP_H__
-#define __KFILE_BMP_H__
+#ifndef __TDEFILE_BMP_H__
+#define __TDEFILE_BMP_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 924b3db27..2143fd90a 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -57,7 +57,7 @@ libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
 	$(LIBTHAI) \
 	$(top_builddir)/tdeprint/libtdeprint.la  \
 	$(top_builddir)/tdeutils/libtdeutils.la \
-	$(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
+	$(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
 
 # init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part
 dummy.cpp: $(srcdir)/Makefile.am
diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am
index 00eeca230..2ae3cec13 100644
--- a/tdehtml/java/Makefile.am
+++ b/tdehtml/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_TDEUI) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
 
 kde_services_DATA= kjavaappletviewer.desktop
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
index f2e119c3f..ae33efd01 100644
--- a/tdehtml/tdemultipart/Makefile.am
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcd
 kde_module_LTLIBRARIES = libtdemultipart.la
 
 libtdemultipart_la_SOURCES = tdemultipart.cpp
-libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
+libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
 libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
 libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index bb209fbc0..21f50cbcd 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -30,7 +30,7 @@
 
 #include "fileprops.h"
 
-#define KFILEVERSION "0.2"
+#define TDEFILEVERSION "0.2"
 #define INDENT "\t"
 
 using namespace std;
@@ -407,7 +407,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
 int main( int argc, char **argv )
 {
     TDEAboutData about(
-	  "tdefile", I18N_NOOP( "tdefile" ), KFILEVERSION,
+	  "tdefile", I18N_NOOP( "tdefile" ), TDEFILEVERSION,
 	  I18N_NOOP("A commandline tool to read and modify metadata of files." ),
 	  TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
 	  0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
diff --git a/tdeio/misc/tdefile/fileprops.h b/tdeio/misc/tdefile/fileprops.h
index 45a79239d..1be11782a 100644
--- a/tdeio/misc/tdefile/fileprops.h
+++ b/tdeio/misc/tdefile/fileprops.h
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEPROPS_H
-#define KFILEPROPS_H
+#ifndef TDEFILEPROPS_H
+#define TDEFILEPROPS_H
 
 #include <tqstring.h>
 
@@ -71,4 +71,4 @@ private:
 
 };
 
-#endif // KFILEPROPS_H
+#endif // TDEFILEPROPS_H
diff --git a/tdeio/tdefile/config-tdefile.h b/tdeio/tdefile/config-tdefile.h
index 26a9ddb55..8ef42eb64 100644
--- a/tdeio/tdefile/config-tdefile.h
+++ b/tdeio/tdefile/config-tdefile.h
@@ -1,5 +1,5 @@
-#ifndef CONFIG_KFILE_H
-#define CONFIG_KFILE_H
+#ifndef CONFIG_TDEFILE_H
+#define CONFIG_TDEFILE_H
 
 const int tdefile_area = 250;
 
diff --git a/tdeio/tdefile/tdefile.h b/tdeio/tdefile/tdefile.h
index d4616b642..daa630af0 100644
--- a/tdeio/tdefile/tdefile.h
+++ b/tdeio/tdefile/tdefile.h
@@ -15,8 +15,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KFILE_H
-#define KFILE_H
+#ifndef TDEFILE_H
+#define TDEFILE_H
 
 #include <tqdir.h>
 
@@ -126,4 +126,4 @@ public:
 
 };
 
-#endif // KFILE_H
+#endif // TDEFILE_H
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index 9b615c87e..6535bf961 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEBOOKMARKHANDLER_H
-#define KFILEBOOKMARKHANDLER_H
+#ifndef TDEFILEBOOKMARKHANDLER_H
+#define TDEFILEBOOKMARKHANDLER_H
 
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
@@ -60,4 +60,4 @@ private:
 };
 
 
-#endif // KFILEBOOKMARKHANDLER_H
+#endif // TDEFILEBOOKMARKHANDLER_H
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 114b10dec..0f17b3ca9 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEDETAILVIEW_H
-#define KFILEDETAILVIEW_H
+#ifndef TDEFILEDETAILVIEW_H
+#define TDEFILEDETAILVIEW_H
 
 class KFileItem;
 class TQWidget;
@@ -216,4 +216,4 @@ private:
     KFileDetailViewPrivate *d;
 };
 
-#endif // KFILEDETAILVIEW_H
+#endif // TDEFILEDETAILVIEW_H
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index 28b04aff6..ae591b21a 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -22,8 +22,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KFILEDIALOG_H__
-#define __KFILEDIALOG_H__
+#ifndef __TDEFILEDIALOG_H__
+#define __TDEFILEDIALOG_H__
 
 #include <tqstring.h>
 
diff --git a/tdeio/tdefile/tdefilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h
index 589376d0c..f448003bb 100644
--- a/tdeio/tdefile/tdefilefiltercombo.h
+++ b/tdeio/tdefile/tdefilefiltercombo.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEFILTERCOMBO_H
-#define KFILEFILTERCOMBO_H
+#ifndef TDEFILEFILTERCOMBO_H
+#define TDEFILEFILTERCOMBO_H
 
 #include <tqstringlist.h>
 #include <tqptrdict.h>
diff --git a/tdeio/tdefile/tdefileiconview.h b/tdeio/tdefile/tdefileiconview.h
index 0b7c7877e..9ec5d7b1d 100644
--- a/tdeio/tdefile/tdefileiconview.h
+++ b/tdeio/tdefile/tdefileiconview.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEICONVIEW_H
-#define KFILEICONVIEW_H
+#ifndef TDEFILEICONVIEW_H
+#define TDEFILEICONVIEW_H
 
 #include <tqt.h>
 
@@ -264,4 +264,4 @@ private:
     KFileIconViewPrivate *d;
 };
 
-#endif // KFILESIMPLEVIEW_H
+#endif // TDEFILESIMPLEVIEW_H
diff --git a/tdeio/tdefile/tdefilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h
index 8f1d2b5b7..5ba4d6eef 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.h
+++ b/tdeio/tdefile/tdefilemetainfowidget.h
@@ -17,8 +17,8 @@
 
  */
 
-#ifndef __KFILEMETAINFOWIDGET_H__
-#define __KFILEMETAINFOWIDGET_H__
+#ifndef __TDEFILEMETAINFOWIDGET_H__
+#define __TDEFILEMETAINFOWIDGET_H__
 
 #include <tqwidget.h>
 #include <tqvariant.h>
diff --git a/tdeio/tdefile/tdefilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h
index f26cd29b5..443324da3 100644
--- a/tdeio/tdefile/tdefilemetapreview.h
+++ b/tdeio/tdefile/tdefilemetapreview.h
@@ -6,8 +6,8 @@
  * License. See the file "COPYING" for the exact licensing terms.
  */
 
-#ifndef KFILEMETAPREVIEW_H
-#define KFILEMETAPREVIEW_H
+#ifndef TDEFILEMETAPREVIEW_H
+#define TDEFILEMETAPREVIEW_H
 
 #include <tqdict.h>
 #include <tqwidgetstack.h>
@@ -53,4 +53,4 @@ private:
     KFileMetaPreviewPrivate *d;
 };
 
-#endif // KFILEMETAPREVIEW_H
+#endif // TDEFILEMETAPREVIEW_H
diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h
index 38db862ac..5bc59dba5 100644
--- a/tdeio/tdefile/tdefilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KFILEPREVIEW_H
-#define _KFILEPREVIEW_H
+#ifndef _TDEFILEPREVIEW_H
+#define _TDEFILEPREVIEW_H
 
 #include <tqsplitter.h>
 #include <tqwidget.h>
diff --git a/tdeio/tdefile/tdefilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h
index d1c2a689e..62415dadc 100644
--- a/tdeio/tdefile/tdefilespeedbar.h
+++ b/tdeio/tdefile/tdefilespeedbar.h
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILESPEEDBAR_H
-#define KFILESPEEDBAR_H
+#ifndef TDEFILESPEEDBAR_H
+#define TDEFILESPEEDBAR_H
 
 #include <kurlbar.h>
 
@@ -38,4 +38,4 @@ private:
 
 };
 
-#endif // KFILESPEEDBAR_H
+#endif // TDEFILESPEEDBAR_H
diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h
index 8f4918030..79aa1b478 100644
--- a/tdeio/tdefile/tdefileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEVIEW_H
-#define KFILEVIEW_H
+#ifndef TDEFILEVIEW_H
+#define TDEFILEVIEW_H
 
 class TQPoint;
 class KActionCollection;
@@ -441,4 +441,4 @@ private:
     KFileViewPrivate *d;
 };
 
-#endif // KFILEINFOLISTWIDGET_H
+#endif // TDEFILEINFOLISTWIDGET_H
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 4ae791ce5..05f41fcfb 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILETREEVIEWTEST
-#define KFILETREEVIEWTEST
+#ifndef TDEFILETREEVIEWTEST
+#define TDEFILETREEVIEWTEST
 
 class testFrame: public KMainWindow
 {
diff --git a/tdeio/tdeio/tdefilefilter.h b/tdeio/tdeio/tdefilefilter.h
index 2891e800e..c6b396785 100644
--- a/tdeio/tdeio/tdefilefilter.h
+++ b/tdeio/tdeio/tdefilefilter.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEFILTER_H
-#define KFILEFILTER_H
+#ifndef TDEFILEFILTER_H
+#define TDEFILEFILTER_H
 
 #include <tqptrlist.h>
 #include <tqstringlist.h>
@@ -167,4 +167,4 @@ private:
     class KSimpleFileFilterPrivate* d;
 };
 
-#endif // KFILEFILTER_H
+#endif // TDEFILEFILTER_H
diff --git a/tdeio/tdeio/tdefileitem.h b/tdeio/tdeio/tdefileitem.h
index 7097d7bc5..45970f814 100644
--- a/tdeio/tdeio/tdefileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -30,7 +30,7 @@
 #include <kmimetype.h>
 #include <tdefilemetainfo.h>
 
-#define KFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
+#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
 
 /**
  * A KFileItem is a generic class to handle a file, local or remote.
diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am
index 7ea8df12a..e3461ed84 100644
--- a/tdeprint/Makefile.am
+++ b/tdeprint/Makefile.am
@@ -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_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
+libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
 libtdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
 libtdeprint_la_METASOURCES = AUTO
 
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index f9f5c0ce4..0de381d9d 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -26,7 +26,7 @@ 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_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 libtdeprint_management_la_METASOURCES = AUTO
 
 libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp
diff --git a/tdeprint/tdefilelist.h b/tdeprint/tdefilelist.h
index d5ef3ada1..9b376a15a 100644
--- a/tdeprint/tdefilelist.h
+++ b/tdeprint/tdefilelist.h
@@ -17,8 +17,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KFILELIST_H
-#define KFILELIST_H
+#ifndef TDEFILELIST_H
+#define TDEFILELIST_H
 
 #include <tqwidget.h>
 #include <tqptrlist.h>
diff --git a/tderandr/libtderandr.h b/tderandr/libtderandr.h
index d597999d8..0e07ad96e 100644
--- a/tderandr/libtderandr.h
+++ b/tderandr/libtderandr.h
@@ -21,8 +21,8 @@
     Send comments and bug fixes to Timothy Pearson <kb9vqf@pearsoncomputing.net>
 
 ***************************************************************************/
-#ifndef _LIBKRANDR_H
-#define _LIBKRANDR_H
+#ifndef _LIBTDERANDR_H
+#define _LIBTDERANDR_H
 
 #include "randr.h"
 #include "lowlevel_randr.h"
@@ -50,7 +50,7 @@
  * @version 0.9.5 27/04/2010
  * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
  */
-class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
+class TDERANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
 {
   private:
 
@@ -326,27 +326,27 @@ class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
 extern "C" {
 
 #else
-#define KRANDR_EXPORT
+#define TDERANDR_EXPORT
 #endif
 
-// KRANDR_EXPORT ScreenInfo* read_screen_info(Display *);
-// KRANDR_EXPORT int         set_screen_size (ScreenInfo *screen_info);
-// KRANDR_EXPORT void        output_auto (ScreenInfo *screen_info, OutputInfo *output_info);
-// KRANDR_EXPORT void        output_off(ScreenInfo *screen_info, OutputInfo *output);
-// KRANDR_EXPORT CrtcInfo*   auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
-// KRANDR_EXPORT XRRModeInfo *find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
-// KRANDR_EXPORT int         mode_height (XRRModeInfo *mode_info, Rotation rotation);
-// KRANDR_EXPORT int         mode_width (XRRModeInfo *mode_info, Rotation rotation);
-// KRANDR_EXPORT int         get_width_by_output_id (ScreenInfo *screen_info, RROutput output_id);
-// KRANDR_EXPORT int         get_height_by_output_id (ScreenInfo *screen_info, RROutput output_id);
-// KRANDR_EXPORT char        *get_output_name (ScreenInfo *screen_info, RROutput id);
-// KRANDR_EXPORT Status      crtc_apply (CrtcInfo *crtc_info);
-// KRANDR_EXPORT Status      crtc_disable (CrtcInfo *crtc);
-// KRANDR_EXPORT int         main_low_apply (ScreenInfo *screen_info);
-// KRANDR_EXPORT bool        kRandrHasRandr();
-
-KRANDR_EXPORT const char  *kRandrVersion(void);
-KRANDR_EXPORT const char  *kRandrCopyright(void);
+// TDERANDR_EXPORT ScreenInfo* read_screen_info(Display *);
+// TDERANDR_EXPORT int         set_screen_size (ScreenInfo *screen_info);
+// TDERANDR_EXPORT void        output_auto (ScreenInfo *screen_info, OutputInfo *output_info);
+// TDERANDR_EXPORT void        output_off(ScreenInfo *screen_info, OutputInfo *output);
+// TDERANDR_EXPORT CrtcInfo*   auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
+// TDERANDR_EXPORT XRRModeInfo *find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
+// TDERANDR_EXPORT int         mode_height (XRRModeInfo *mode_info, Rotation rotation);
+// TDERANDR_EXPORT int         mode_width (XRRModeInfo *mode_info, Rotation rotation);
+// TDERANDR_EXPORT int         get_width_by_output_id (ScreenInfo *screen_info, RROutput output_id);
+// TDERANDR_EXPORT int         get_height_by_output_id (ScreenInfo *screen_info, RROutput output_id);
+// TDERANDR_EXPORT char        *get_output_name (ScreenInfo *screen_info, RROutput id);
+// TDERANDR_EXPORT Status      crtc_apply (CrtcInfo *crtc_info);
+// TDERANDR_EXPORT Status      crtc_disable (CrtcInfo *crtc);
+// TDERANDR_EXPORT int         main_low_apply (ScreenInfo *screen_info);
+// TDERANDR_EXPORT bool        kRandrHasRandr();
+
+TDERANDR_EXPORT const char  *kRandrVersion(void);
+TDERANDR_EXPORT const char  *kRandrCopyright(void);
 
 #ifdef __cplusplus
 
diff --git a/tderandr/randr.h b/tderandr/randr.h
index eb77b03aa..9683f6b9b 100644
--- a/tderandr/randr.h
+++ b/tderandr/randr.h
@@ -29,7 +29,7 @@
 class KTimerDialog;
 class RandRScreenPrivate;
 
-class KRANDR_EXPORT HotPlugRule {
+class TDERANDR_EXPORT HotPlugRule {
 	public:
 		enum states {
 			AnyState		= 0,
@@ -49,7 +49,7 @@ class KRANDR_EXPORT HotPlugRule {
 
 typedef TQValueList< HotPlugRule > HotPlugRulesList;
 
-class KRANDR_EXPORT SingleScreenData {
+class TDERANDR_EXPORT SingleScreenData {
 	public:
 		SingleScreenData();
 		virtual ~SingleScreenData();
diff --git a/tderesources/configdialog.h b/tderesources/configdialog.h
index c29d89273..94f5ab107 100644
--- a/tderesources/configdialog.h
+++ b/tderesources/configdialog.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_CONFIGDIALOG_H
-#define KRESOURCES_CONFIGDIALOG_H
+#ifndef TDERESOURCES_CONFIGDIALOG_H
+#define TDERESOURCES_CONFIGDIALOG_H
 
 #include <kdialogbase.h>
 
@@ -32,7 +32,7 @@ namespace KRES {
   class Resource;
   class ConfigWidget;
 
-class KRESOURCES_EXPORT ConfigDialog : public KDialogBase
+class TDERESOURCES_EXPORT ConfigDialog : public KDialogBase
 {
     Q_OBJECT
   public:
diff --git a/tderesources/configpage.h b/tderesources/configpage.h
index c7cc1156d..35776763c 100644
--- a/tderesources/configpage.h
+++ b/tderesources/configpage.h
@@ -20,8 +20,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KRESOURCES_CONFIGPAGE_H
-#define KRESOURCES_CONFIGPAGE_H
+#ifndef TDERESOURCES_CONFIGPAGE_H
+#define TDERESOURCES_CONFIGPAGE_H
 
 #include <ksharedptr.h>
 #include <tqstringlist.h>
@@ -37,7 +37,7 @@ class TQPushButton;
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ResourcePageInfo : public KShared
+class TDERESOURCES_EXPORT ResourcePageInfo : public KShared
 {
   public:
     ResourcePageInfo();
@@ -49,7 +49,7 @@ class KRESOURCES_EXPORT ResourcePageInfo : public KShared
 class Resource;
 class ConfigViewItem;
 
-class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource>
+class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource>
 {
   Q_OBJECT
 
diff --git a/tderesources/configwidget.h b/tderesources/configwidget.h
index a5b114344..a9d20aa8b 100644
--- a/tderesources/configwidget.h
+++ b/tderesources/configwidget.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_CONFIGWIDGET_H
-#define KRESOURCES_CONFIGWIDGET_H
+#ifndef TDERESOURCES_CONFIGWIDGET_H
+#define TDERESOURCES_CONFIGWIDGET_H
 
 #include "resource.h"
 
@@ -30,7 +30,7 @@
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ConfigWidget : public TQWidget
+class TDERESOURCES_EXPORT ConfigWidget : public TQWidget
 {
     Q_OBJECT
   public:
diff --git a/tderesources/factory.h b/tderesources/factory.h
index 6bb075a88..7b02d515e 100644
--- a/tderesources/factory.h
+++ b/tderesources/factory.h
@@ -21,8 +21,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_FACTORY_H
-#define KRESOURCES_FACTORY_H
+#ifndef TDERESOURCES_FACTORY_H
+#define TDERESOURCES_FACTORY_H
 
 #include <tqdict.h>
 #include <tqstring.h>
@@ -59,7 +59,7 @@ namespace KRES {
  *
  * \endcode
  */
-class KRESOURCES_EXPORT Factory
+class TDERESOURCES_EXPORT Factory
 {
   public:
 
diff --git a/tderesources/kcmtderesources.h b/tderesources/kcmtderesources.h
index 21176dff8..08bf7ca4d 100644
--- a/tderesources/kcmtderesources.h
+++ b/tderesources/kcmtderesources.h
@@ -19,12 +19,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_KCMKRESOURCES_H
-#define KRESOURCES_KCMKRESOURCES_H
+#ifndef TDERESOURCES_KCMTDERESOURCES_H
+#define TDERESOURCES_KCMTDERESOURCES_H
 
 #include <tdecmodule.h>
 
-class KRESOURCES_EXPORT KCMKResources : public TDECModule
+class TDERESOURCES_EXPORT KCMKResources : public TDECModule
 {
   Q_OBJECT
 
diff --git a/tderesources/manager.h b/tderesources/manager.h
index 8fd35632b..676f3bf4a 100644
--- a/tderesources/manager.h
+++ b/tderesources/manager.h
@@ -21,8 +21,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_MANAGER_H
-#define KRESOURCES_MANAGER_H
+#ifndef TDERESOURCES_MANAGER_H
+#define TDERESOURCES_MANAGER_H
 
 #include <tqdict.h>
 #include <tqstringlist.h>
diff --git a/tderesources/manageriface.h b/tderesources/manageriface.h
index 63cab83f9..1c788a605 100644
--- a/tderesources/manageriface.h
+++ b/tderesources/manageriface.h
@@ -26,7 +26,7 @@
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ManagerIface : virtual public DCOPObject
+class TDERESOURCES_EXPORT ManagerIface : virtual public DCOPObject
 {
   K_DCOP
 
diff --git a/tderesources/managerimpl.h b/tderesources/managerimpl.h
index 137fd9528..80b70d59d 100644
--- a/tderesources/managerimpl.h
+++ b/tderesources/managerimpl.h
@@ -20,8 +20,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KRESOURCES_MANAGERIMPL_H
-#define KRESOURCES_MANAGERIMPL_H
+#ifndef TDERESOURCES_MANAGERIMPL_H
+#define TDERESOURCES_MANAGERIMPL_H
 
 #include <tqstring.h>
 #include <tqptrlist.h>
@@ -43,7 +43,7 @@ class ManagerNotifier;
 
   Do not use this class directly. Use ResourceManager instead
 */
-class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
+class TDERESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
 {
   public:
     ManagerImpl( ManagerNotifier *, const TQString &family );
diff --git a/tderesources/resource.h b/tderesources/resource.h
index 506ef0eaf..b7e4eeedc 100644
--- a/tderesources/resource.h
+++ b/tderesources/resource.h
@@ -19,8 +19,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KRESOURCES_RESOURCE_H
-#define KRESOURCES_RESOURCE_H
+#ifndef TDERESOURCES_RESOURCE_H
+#define TDERESOURCES_RESOURCE_H
 
 #include <tqmutex.h>
 #include <tqvaluelist.h>
@@ -252,7 +252,7 @@ service_DATA = resourceexample.desktop
   data. Subclasses of ResourceCalendar would implement this API for local files,
   remote files, specific calendar servers etc.
 */
-class KRESOURCES_EXPORT Resource : public TQObject
+class TDERESOURCES_EXPORT Resource : public TQObject
 {
     friend class Factory;
     friend class ManagerImpl;
@@ -381,7 +381,7 @@ class KRESOURCES_EXPORT Resource : public TQObject
     ResourcePrivate *d;
 };
 
-class KRESOURCES_EXPORT PluginFactoryBase : public KLibFactory
+class TDERESOURCES_EXPORT PluginFactoryBase : public KLibFactory
 {
   public:
     virtual Resource *resource( const TDEConfig *config ) = 0;
diff --git a/tderesources/selectdialog.h b/tderesources/selectdialog.h
index 878c32431..e982b7282 100644
--- a/tderesources/selectdialog.h
+++ b/tderesources/selectdialog.h
@@ -21,8 +21,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_SELECTDIALOG_H
-#define KRESOURCES_SELECTDIALOG_H
+#ifndef TDERESOURCES_SELECTDIALOG_H
+#define TDERESOURCES_SELECTDIALOG_H
 
 #include <tqobject.h>
 #include <tqptrlist.h>
@@ -53,7 +53,7 @@ class Resource;
  * }
  * \endcode
  */
-class KRESOURCES_EXPORT SelectDialog : KDialog
+class TDERESOURCES_EXPORT SelectDialog : KDialog
 {
   public:
     /**
diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am
index 713270c9d..1a2596801 100644
--- a/tdespell2/ui/Makefile.am
+++ b/tdespell2/ui/Makefile.am
@@ -18,4 +18,4 @@ dialog.lo: tdespell2ui.h
 
 libtdespell2_la_SOURCES = dialog.cpp
 libtdespell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libtdespell2_la_LIBADD = libtdespell2_noinst.la ../libtdespell2base.la ../../tdeutils/libtdeutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE)
+libtdespell2_la_LIBADD = libtdespell2_noinst.la ../libtdespell2base.la ../../tdeutils/libtdeutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE)
diff --git a/win/pro_files/tderesources/tderesources.pro b/win/pro_files/tderesources/tderesources.pro
index b14c48102..6c64332c6 100644
--- a/win/pro_files/tderesources/tderesources.pro
+++ b/win/pro_files/tderesources/tderesources.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KRESOURCES_LIB
+DEFINES += MAKE_TDERESOURCES_LIB
 
 INCLUDEPATH	+= $(KDELIBS)/ab
 
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
index 9eee4ac73..c7ce9b410 100644
--- a/win/tdelibs_export_win.h
+++ b/win/tdelibs_export_win.h
@@ -102,10 +102,10 @@
 # define KVCARD_EXPORT KDE_IMPORT
 #endif
 
-#ifdef MAKE_KRESOURCES_LIB
-# define KRESOURCES_EXPORT KDE_EXPORT
+#ifdef MAKE_TDERESOURCES_LIB
+# define TDERESOURCES_EXPORT KDE_EXPORT
 #else
-# define KRESOURCES_EXPORT KDE_IMPORT
+# define TDERESOURCES_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDESU_LIB