diff --git a/src/checkmemoryleak.cpp b/src/checkmemoryleak.cpp
index c7b69d8c0..b45c0157c 100644
--- a/src/checkmemoryleak.cpp
+++ b/src/checkmemoryleak.cpp
@@ -474,7 +474,7 @@ static int countParameters(const Token *tok)
 
 const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<const Token *> callstack, unsigned int varid, AllocType &alloctype, AllocType &dealloctype, bool &all, unsigned int sz)
 {
-    if (bsearch(tok->str().c_str(), call_func_white_list,
+    if (bsearch(tok->strAt(0), call_func_white_list,
                 sizeof(call_func_white_list) / sizeof(call_func_white_list[0]),
                 sizeof(call_func_white_list[0]), call_func_white_list_compare))
         return 0;
diff --git a/src/checkmemoryleak.h b/src/checkmemoryleak.h
index f856a250a..efcb4140d 100644
--- a/src/checkmemoryleak.h
+++ b/src/checkmemoryleak.h
@@ -37,7 +37,6 @@
 
 #include "check.h"
 
-#include <set>
 #include <list>
 #include <string>
 #include <vector>