diff --git a/Makefile b/Makefile
index f9c987836..85d7b31f8 100644
--- a/Makefile
+++ b/Makefile
@@ -375,7 +375,7 @@ $(SRCDIR)/checktype.o: lib/checktype.cpp lib/cxx11emu.h lib/checktype.h lib/conf
 $(SRCDIR)/checkuninitvar.o: lib/checkuninitvar.cpp lib/cxx11emu.h lib/checkuninitvar.h lib/config.h lib/check.h lib/token.h lib/valueflow.h lib/mathlib.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/library.h lib/standards.h lib/platform.h lib/importproject.h lib/timer.h lib/astutils.h lib/checknullpointer.h lib/symboldatabase.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(SRCDIR)/checkuninitvar.o $(SRCDIR)/checkuninitvar.cpp
 
-$(SRCDIR)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/cxx11emu.h lib/checkunusedfunctions.h lib/config.h lib/check.h lib/token.h lib/valueflow.h lib/mathlib.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/library.h lib/standards.h lib/platform.h lib/importproject.h lib/timer.h lib/symboldatabase.h
+$(SRCDIR)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/cxx11emu.h lib/checkunusedfunctions.h lib/config.h lib/check.h lib/token.h lib/valueflow.h lib/mathlib.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/library.h lib/standards.h lib/platform.h lib/importproject.h lib/timer.h lib/symboldatabase.h lib/analyzerinfo.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(SRCDIR)/checkunusedfunctions.o $(SRCDIR)/checkunusedfunctions.cpp
 
 $(SRCDIR)/checkunusedvar.o: lib/checkunusedvar.cpp lib/cxx11emu.h lib/checkunusedvar.h lib/config.h lib/check.h lib/token.h lib/valueflow.h lib/mathlib.h lib/tokenize.h lib/errorlogger.h lib/suppressions.h lib/tokenlist.h lib/settings.h lib/library.h lib/standards.h lib/platform.h lib/importproject.h lib/timer.h lib/symboldatabase.h
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index 9ae22694c..3baafb900 100644
--- a/lib/checkunusedfunctions.cpp
+++ b/lib/checkunusedfunctions.cpp
@@ -307,7 +307,7 @@ std::string CheckUnusedFunctions::analyzerInfo() const
 namespace {
     struct Location {
         Location() : fileName(""), lineNumber(0) {}
-        Location(std::string f, int l) : fileName(f), lineNumber(l) {}
+        Location(const std::string &f, int l) : fileName(f), lineNumber(l) {}
         std::string fileName;
         int lineNumber;
     };
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index b0a813626..75a9cf9a8 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -733,8 +733,8 @@ void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::map<s
 {
     if (buildDir.empty())
         return;
-    if (_settings.isEnabled("unusedFunctions"))
-        CheckUnusedFunctions::instance.analyseWholeProgram(this, buildDir, files);
+//    if (_settings.isEnabled("unusedFunction"))
+//        CheckUnusedFunctions::instance.analyseWholeProgram(this, buildDir, files);
 }
 
 bool CppCheck::isUnusedFunctionCheckEnabled() const