diff --git a/cpp/autosar/src/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.ql b/cpp/autosar/src/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.ql
index 75c65e6bcd..a8e1e59839 100644
--- a/cpp/autosar/src/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.ql
+++ b/cpp/autosar/src/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.ql
@@ -80,11 +80,11 @@ class AcceptableWrapper extends PreprocessorBranch {
 
 from PreprocessorDirective directive, string message
 where
-  (
-    not directive instanceof PermittedDirectiveType and
-    not directive instanceof AcceptableWrapper and
-    message = "Preprocessor directive used for conditional compilation."
-  ) and
+  //special exception case - pragmas already reported by A16-7-1
+  not directive instanceof PreprocessorPragma and
+  not directive instanceof PermittedDirectiveType and
+  not directive instanceof AcceptableWrapper and
+  message = "Preprocessor directive used for conditional compilation." and
   not isExcluded(directive,
     MacrosPackage::preProcessorShallOnlyBeUsedForCertainDirectivesPatternsQuery())
 select directive, message
diff --git a/cpp/autosar/test/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.expected b/cpp/autosar/test/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.expected
index b8a83801b4..5f6114bea8 100644
--- a/cpp/autosar/test/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.expected
+++ b/cpp/autosar/test/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.expected
@@ -1,4 +1,3 @@
-| test.cpp:3:1:3:25 | #pragma gcc testingpragma | Preprocessor directive used for conditional compilation. |
 | test.cpp:5:1:5:18 | #ifndef TESTHEADER | Preprocessor directive used for conditional compilation. |
 | test.cpp:9:1:9:26 | #define OBJECTLIKE_MACRO 1 | Preprocessor directive used for conditional compilation. |
 | test.cpp:10:1:10:35 | #define FUNCTIONLIKE_MACRO(X) X + 1 | Preprocessor directive used for conditional compilation. |
diff --git a/cpp/autosar/test/rules/A16-0-1/test.cpp b/cpp/autosar/test/rules/A16-0-1/test.cpp
index a855cca169..b1ee540032 100644
--- a/cpp/autosar/test/rules/A16-0-1/test.cpp
+++ b/cpp/autosar/test/rules/A16-0-1/test.cpp
@@ -1,6 +1,6 @@
 #include <string> //COMPLIANT
 
-#pragma gcc testingpragma // NON_COMPLIANT
+#pragma gcc testingpragma // COMPLIANT - exception - already reported by A16-7-1
 
 #ifndef TESTHEADER // NON_COMPLIANT
 int g;
diff --git a/cpp/cert/src/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.ql b/cpp/cert/src/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.ql
index 4b37f3ec96..4e676e4d70 100644
--- a/cpp/cert/src/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.ql
+++ b/cpp/cert/src/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.ql
@@ -33,6 +33,8 @@ predicate isGeneratedByUserMacro(Declaration d) {
 from Locatable l, string s
 where
   not isExcluded(l, NamingPackage::useOfDoubleUnderscoreReservedPrefixQuery()) and
+  //exclude uses of __func__, which are modelled as LocalVariable declarations
+  not(l.(LocalVariable).getName() = "__func__") and
   (
     exists(Macro m | l = m and isReservedMacroPrefix(m) and s = m.getName())
     or
@@ -47,4 +49,4 @@ where
       )
     )
   )
-select l, "Name $@ uses the reserved prefix '__'.", l, s
+select l, "Name $@ uses the reserved prefix '__'.", l, s
\ No newline at end of file
diff --git a/cpp/cert/test/rules/DCL51-CPP/EnumeratorReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/EnumeratorReusesReservedName.expected
index 63563899ba..fa45f86fec 100644
--- a/cpp/cert/test/rules/DCL51-CPP/EnumeratorReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/EnumeratorReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:9:3:9:9 | INT_MAX | The enumerator $@ reuses a reserved standard library name. | test.cpp:9:3:9:9 | INT_MAX | INT_MAX |
+| test.cpp:10:3:10:9 | INT_MAX | The enumerator $@ reuses a reserved standard library name. | test.cpp:10:3:10:9 | INT_MAX | INT_MAX |
diff --git a/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected
index 7f6fbb1bce..e945f93c57 100644
--- a/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:19:6:19:8 | min | The function $@ reuses a reserved standard library name. | test.cpp:19:6:19:8 | min | min |
+| test.cpp:20:6:20:8 | min | The function $@ reuses a reserved standard library name. | test.cpp:20:6:20:8 | min | min |
diff --git a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
index 7fbb18a955..698b0c6067 100644
--- a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:17:5:17:10 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:17:5:17:10 | tzname | tzname |
+| test.cpp:18:5:18:10 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:5:18:10 | tzname | tzname |
diff --git a/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected b/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected
index 90285a4af7..f5b15966ba 100644
--- a/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected
@@ -1,3 +1,3 @@
-| test.cpp:5:1:5:14 | #undef INT_MAX | Redefinition of INT_MAX declared in a standard library header. |
-| test.cpp:6:1:6:20 | #define SIZE_MAX 256 | Redefinition of SIZE_MAX declared in a standard library header. |
-| test.cpp:36:1:37:9 | #define FD_SET(X) int _ ## X | Redefinition of FD_SET declared in a standard library header. |
+| test.cpp:6:1:6:14 | #undef INT_MAX | Redefinition of INT_MAX declared in a standard library header. |
+| test.cpp:7:1:7:20 | #define SIZE_MAX 256 | Redefinition of SIZE_MAX declared in a standard library header. |
+| test.cpp:37:1:38:9 | #define FD_SET(X) int _ ## X | Redefinition of FD_SET declared in a standard library header. |
diff --git a/cpp/cert/test/rules/DCL51-CPP/ReuseOfReservedIdentifier.expected b/cpp/cert/test/rules/DCL51-CPP/ReuseOfReservedIdentifier.expected
index 9a119e037d..2d60df03b4 100644
--- a/cpp/cert/test/rules/DCL51-CPP/ReuseOfReservedIdentifier.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/ReuseOfReservedIdentifier.expected
@@ -1,2 +1,2 @@
-| test.cpp:12:1:12:15 | #undef noreturn | Redefinition of $@ lexically identical to reserved attribute token. | test.cpp:12:1:12:15 | #undef noreturn | noreturn |
-| test.cpp:13:1:13:17 | #define private 1 | Redefinition of $@ lexically identical to keyword. | test.cpp:13:1:13:17 | #define private 1 | private |
+| test.cpp:13:1:13:15 | #undef noreturn | Redefinition of $@ lexically identical to reserved attribute token. | test.cpp:13:1:13:15 | #undef noreturn | noreturn |
+| test.cpp:14:1:14:17 | #define private 1 | Redefinition of $@ lexically identical to keyword. | test.cpp:14:1:14:17 | #define private 1 | private |
diff --git a/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected b/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected
index 44beebe0d6..3b0a94429a 100644
--- a/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected
@@ -1,2 +1,2 @@
-| test.cpp:24:5:24:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:24:5:24:7 | __x | __x |
-| test.cpp:29:5:29:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:29:5:29:7 | __x | __x |
+| test.cpp:25:5:25:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:25:5:25:7 | __x | __x |
+| test.cpp:30:5:30:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:30:5:30:7 | __x | __x |
diff --git a/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected b/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected
index 72fc44988d..f8863eab59 100644
--- a/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected
@@ -1 +1 @@
-| test.cpp:21:6:21:17 | operator ""x | Literal suffix identifier $@ does not start with an underscore. | test.cpp:21:6:21:17 | operator ""x | operator ""x |
+| test.cpp:22:6:22:17 | operator ""x | Literal suffix identifier $@ does not start with an underscore. | test.cpp:22:6:22:17 | operator ""x | operator ""x |
diff --git a/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected b/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected
index 8701a91f08..679ad58deb 100644
--- a/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected
@@ -1,5 +1,5 @@
-| test.cpp:25:5:25:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:25:5:25:6 | _X | _X |
-| test.cpp:26:5:26:6 | _x | Name $@ uses the reserved prefix '_'. | test.cpp:26:5:26:6 | _x | _x |
-| test.cpp:30:5:30:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:30:5:30:6 | _X | _X |
-| test.cpp:34:1:34:3 | _i | Name $@ uses the reserved prefix '_'. | test.cpp:34:1:34:3 | _i | _i |
+| test.cpp:26:5:26:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:26:5:26:6 | _X | _X |
+| test.cpp:27:5:27:6 | _x | Name $@ uses the reserved prefix '_'. | test.cpp:27:5:27:6 | _x | _x |
+| test.cpp:31:5:31:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:31:5:31:6 | _X | _X |
+| test.cpp:35:1:35:3 | _i | Name $@ uses the reserved prefix '_'. | test.cpp:35:1:35:3 | _i | _i |
 | test.h:2:1:2:15 | #define _TEST_H | Name $@ uses the reserved prefix '_'. | test.h:2:1:2:15 | #define _TEST_H | _TEST_H |
diff --git a/cpp/cert/test/rules/DCL51-CPP/test.cpp b/cpp/cert/test/rules/DCL51-CPP/test.cpp
index 2bfe811593..028867b88f 100644
--- a/cpp/cert/test/rules/DCL51-CPP/test.cpp
+++ b/cpp/cert/test/rules/DCL51-CPP/test.cpp
@@ -1,4 +1,5 @@
 #include <cstdint>
+#include <string>
 
 #include "test.h"
 
@@ -35,4 +36,8 @@ F(i); // NON_COMPLIANT - user macro
 
 #define FD_SET(X)                                                              \
   int _##X // NON_COMPLIANT - redefinition of standard library macro
-FD_SET(j); // COMPLIANT - standard library macro
\ No newline at end of file
+FD_SET(j); // COMPLIANT - standard library macro
+
+void f() {
+  std::string x = __func__; // COMPLIANT
+}
\ No newline at end of file