-# Preprocessor operators "#" and "##" should not be used
-# Until after Augustin goes to rehab, we cannot remove them all
-sonar.issue.ignore.multicriteria.c7.ruleKey=c:PPStringifyAndPastingUsage
-sonar.issue.ignore.multicriteria.c7.resourceKey=**/*
+# Macros should not be used to define constants
+# *.h includes are meant to be usable in C
+sonar.issue.ignore.multicriteria.c7.ruleKey=cpp:S5028
+sonar.issue.ignore.multicriteria.c7.resourceKey=**/*.h
+
+# Deprecated code should be removed
+# We do have a process to remove deprecated code
+sonar.issue.ignore.multicriteria.c8.ruleKey=cpp:S1133
+sonar.issue.ignore.multicriteria.c8.resourceKey=**/*
+
+# Lambda return types should be implicit
+# I don't see the point in general, plus we mostly use them when forced, to disambiguate
+sonar.issue.ignore.multicriteria.c9.ruleKey=cpp:S3574
+sonar.issue.ignore.multicriteria.c9.resourceKey=**/*