diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index 00868694933..d1fe2ea8c18 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -1356,12 +1356,12 @@ class CPPCHECKLIB SymbolDatabase {
     const Type* findType(const Token* startTok, const Scope* startScope, bool lookOutside = false) const;
     Type* findType(const Token* startTok, Scope* startScope, bool lookOutside = false)
     {
-        return const_cast<Type*>(this->findType(startTok, const_cast<const Scope*>(startScope), lookOutside));
+        return const_cast<Type*>(this->findType(startTok, static_cast<const Scope*>(startScope), lookOutside));
     }
 
     const Scope *findScope(const Token *tok, const Scope *startScope) const;
     Scope *findScope(const Token *tok, Scope *startScope) {
-        return const_cast<Scope *>(this->findScope(tok, const_cast<const Scope *>(startScope)));
+        return const_cast<Scope *>(this->findScope(tok, static_cast<const Scope *>(startScope)));
     }
 
     // cppcheck-suppress unusedFunction
diff --git a/lib/token.cpp b/lib/token.cpp
index 5af8884cdef..6a492e04275 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -900,7 +900,7 @@ const Token * Token::findClosingBracket() const
 Token * Token::findClosingBracket()
 {
     // return value of const function
-    return const_cast<Token*>(const_cast<const Token*>(this)->findClosingBracket());
+    return const_cast<Token*>(static_cast<const Token*>(this)->findClosingBracket());
 }
 
 const Token * Token::findOpeningBracket() const
@@ -932,7 +932,7 @@ const Token * Token::findOpeningBracket() const
 Token * Token::findOpeningBracket()
 {
     // return value of const function
-    return const_cast<Token*>(const_cast<const Token*>(this)->findOpeningBracket());
+    return const_cast<Token*>(static_cast<const Token*>(this)->findOpeningBracket());
 }
 
 //---------------------------------------------------------------------------