9 files changed, 16 insertions, 16 deletions
diff --git a/kcontrol/background/Makefile.am b/kcontrol/background/Makefile.am
index e1d847ead..c64cdc5c1 100644
--- a/kcontrol/background/Makefile.am
+++ b/kcontrol/background/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_background.la
 
 kcm_background_la_SOURCES = main.cpp
 kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_KFILE) $(LIB_KNEWSTUFF)
+kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_TDEFILE) $(LIB_KNEWSTUFF)
 
 METASOURCES = AUTO
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
index 8a86b1ae2..474b0e7fb 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
@@ -1,5 +1,5 @@
-#ifndef __KFILE_FONT_ICON_VIEW_H__
-#define __KFILE_FONT_ICON_VIEW_H__
+#ifndef __TDEFILE_FONT_ICON_VIEW_H__
+#define __TDEFILE_FONT_ICON_VIEW_H__
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index 6496c13fd..7a6adb448 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -1,5 +1,5 @@
-#ifndef __KFILE_FONT_VIEW_H__
-#define __KFILE_FONT_VIEW_H__
+#ifndef __TDEFILE_FONT_VIEW_H__
+#define __TDEFILE_FONT_VIEW_H__
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/kcontrol/kfontinst/tdefile-plugin/KFileFont.h b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
index a383d9a8e..b479ba3b1 100644
--- a/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
+++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
@@ -1,5 +1,5 @@
-#ifndef __KFILE_FONT_H__
-#define __KFILE_FONT_H__
+#ifndef __TDEFILE_FONT_H__
+#define __TDEFILE_FONT_H__
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am
index d1f137140..7a5357c63 100644
--- a/kcontrol/randr/Makefile.am
+++ b/kcontrol/randr/Makefile.am
@@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray
 
 tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
 tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
-tderandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR)
+tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR)
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tderandr.pot
diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h
index 766b0056c..004da6294 100644
--- a/kcontrol/randr/tderandrapp.h
+++ b/kcontrol/randr/tderandrapp.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KRANDRAPP_H
-#define KRANDRAPP_H
+#ifndef TDERANDRAPP_H
+#define TDERANDRAPP_H
 
 #include <tqtimer.h>
 #include <kuniqueapplication.h>
diff --git a/kcontrol/randr/tderandrmodule.h b/kcontrol/randr/tderandrmodule.h
index 188b4ea1d..65131ee26 100644
--- a/kcontrol/randr/tderandrmodule.h
+++ b/kcontrol/randr/tderandrmodule.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KRANDRMODULE_H
-#define KRANDRMODULE_H
+#ifndef TDERANDRMODULE_H
+#define TDERANDRMODULE_H
 
 #include <libtderandr/libtderandr.h>
 
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 320f0cb1c..6c96203e4 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KRANDRTRAY_H
-#define KRANDRTRAY_H
+#ifndef TDERANDRTRAY_H
+#define TDERANDRTRAY_H
 
 #include <tqptrlist.h>
 
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 0189c9e56..14e3427f3 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -53,7 +53,7 @@
 
 extern KSimpleConfig *config;
 
-#define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock"
+#define TSAK_LOCTDEFILE "/tmp/tdesocket-global/tsak.lock"
 
 TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   : TQWidget(parent, name), sakwarning(0)
@@ -486,7 +486,7 @@ void TDMAppearanceWidget::save()
   }
   else {
     // Get PID
-    TQFile file(TSAK_LOCKFILE);
+    TQFile file(TSAK_LOCTDEFILE);
     if (file.open(IO_ReadOnly)) {
       TQTextStream stream(&file);
       unsigned long tsakpid = stream.readLine().toULong();