diff --git a/acinclude.m4 b/acinclude.m4
index 213de6dd..1893beab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2111,14 +2111,14 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-ltdeio")
-   AC_SUBST(LIB_KFILE, "-ltdeio")
+   AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-ltdefile")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2128,7 +2128,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/amarok/src/Makefile.am b/amarok/src/Makefile.am
index 47b2ba0a..938f6962 100644
--- a/amarok/src/Makefile.am
+++ b/amarok/src/Makefile.am
@@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
     $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
     $(top_builddir)/amarok/src/metadata/libmetadata.la \
     $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
-    $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \
+    $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \
     $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
     $(LIB_TUNEPIMP) \
     $(mysql_libs) \
diff --git a/amarok/src/engine/kdemm/Makefile.am b/amarok/src/engine/kdemm/Makefile.am
index 5c04cf0d..55763a36 100644
--- a/amarok/src/engine/kdemm/Makefile.am
+++ b/amarok/src/engine/kdemm/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
 libamarok_kdemmengine_plugin_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
+    $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
     $(LIBS_KDEMM) -lkdemm
 
 libamarok_kdemmengine_plugin_la_SOURCES = \
diff --git a/amarok/src/engine/mas/Makefile.am b/amarok/src/engine/mas/Makefile.am
index 693ea786..4bd253db 100644
--- a/amarok/src/engine/mas/Makefile.am
+++ b/amarok/src/engine/mas/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
 libamarok_masengine_plugin_la_LIBADD = \
     $(top_builddir)/amarok/src/engine/libengine.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
+    $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) \
     $(LIBS_MAS)
 
 libamarok_masengine_plugin_la_SOURCES = \
diff --git a/amarok/src/engine/nmm/Makefile.am b/amarok/src/engine/nmm/Makefile.am
index 66dc3679..6e6b239d 100644
--- a/amarok/src/engine/nmm/Makefile.am
+++ b/amarok/src/engine/nmm/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
 libamarok_nmmengine_plugin_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_TDECORE) $(LIB_KFILE) \
+    $(LIB_TDECORE) $(LIB_TDEFILE) \
     -lnmmbase -lnmmgraphmgr -lnmmiprogress -lnmmiaudiodevice -lnmmigeneral
 
 libamarok_nmmengine_plugin_la_SOURCES = \
diff --git a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h b/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h
index b9d4500a..cc107a8f 100644
--- a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h
+++ b/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h
@@ -19,8 +19,8 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#ifndef TAGLIB_WAVPACKFILETYPERESOLVER_H
-#define TAGLIB_WAVPACKFILETYPERESOLVER_H
+#ifndef TAGLIB_WAVPACTDEFILETYPERESOLVER_H
+#define TAGLIB_WAVPACTDEFILETYPERESOLVER_H
 
 #include <taglib/tfile.h>
 #include <taglib/fileref.h>
diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
index 5748a5f6..317fa5f3 100644
--- a/amarok/src/sqlite/sqlite3.c
+++ b/amarok/src/sqlite/sqlite3.c
@@ -17211,10 +17211,10 @@ static int winFileSize(OsFile *id, i64 *pSize){
 }
 
 /*
-** LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
+** LOCTDEFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
 */
-#ifndef LOCKFILE_FAIL_IMMEDIATELY
-# define LOCKFILE_FAIL_IMMEDIATELY 1
+#ifndef LOCTDEFILE_FAIL_IMMEDIATELY
+# define LOCTDEFILE_FAIL_IMMEDIATELY 1
 #endif
 
 /*
@@ -17229,7 +17229,7 @@ static int getReadLock(winFile *id){
     ovlp.Offset = SHARED_FIRST;
     ovlp.OffsetHigh = 0;
     ovlp.hEvent = 0;
-    res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
+    res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp);
   }else{
     int lk;
     sqlite3Randomness(sizeof(lk), &lk);