diff --git a/cppcheck/tfm-suppress-list.txt b/cppcheck/tfm-suppress-list.txt
index 5cb7571..44bc631 100644
--- a/cppcheck/tfm-suppress-list.txt
+++ b/cppcheck/tfm-suppress-list.txt
@@ -30,16 +30,6 @@
 //This rule conflicts the our coding style document.
 variableScope
 
-//CppCheck fails to understand macro definitions in compile_commands.json, which
-//have \ characters escaping the opening and closing ". As a result we get the
-//following false alarms.
-
-//CppCheck ignores macros defined on the command line when using a project file
-//(e.g. compile_commands.json). As a result we ca not set compiler specific
-//macros and need to suppress the following error.
-preprocessorErrorDirective:*/tfm_spm_log.h:34
-preprocessorErrorDirective:*/cmsis_compiler.h:320
-
 //While cppcheck states to work fine with missing standard library files, it
 //still reports a lot of errors regarding those.
 //So, ignore these.
@@ -59,6 +49,8 @@
 *:*/tools/*
 *:*/bl2/ext/*
 *:*/platform/ext/*
+*:*/mcuboot/*
+*:*/mbedtls/*
 
 //cppcheck shouldn't complain about unused function.
 unusedFunction
@@ -67,7 +59,3 @@
 //modified. This is good practice and complies with TF-M guidelines. It should not
 //trigger an error.
 redundantInitialization:*/security_cnt.c
-
-//Unread variables in the following files in TF-M should not be complained.
-unreadVariable:*/tfm_crypto_func_api.c
-unreadVariable:*/tfm_crypto_secure_api.c