diff --git a/change_notes/2023-12-07-fix-deviations.md b/change_notes/2023-12-07-fix-deviations.md
new file mode 100644
index 0000000000..a0f1b1fcfb
--- /dev/null
+++ b/change_notes/2023-12-07-fix-deviations.md
@@ -0,0 +1,2 @@
+ - The following queries have been updated to address issues with applying deviations:
+   - `A18-5-11`, `A23-0-1`, `A9-3-1`, `M0-1-2`, `M3-1-2`, `M3-2-1`, `M3-2-3`, `M3-9-1`, `M4-5-3`, `M5-0-2`, `M5-2-10`, `A23-0-2`, `CTR51-CPP`, `STR52-CPP`
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
index 485837073a..5d4cd71c79 100644
--- a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
+++ b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
@@ -19,7 +19,8 @@ import codingstandards.cpp.autosar
 
 from MemberFunction operator_new, Class c
 where
-  not isExcluded(operator_new) and
+  not isExcluded(operator_new,
+    DeclarationsPackage::operatorNewAndOperatorDeleteNotDefinedLocallyQuery()) and
   not isExcluded(c, DeclarationsPackage::operatorNewAndOperatorDeleteNotDefinedLocallyQuery()) and
   operator_new.hasName("operator new") and
   operator_new.getDeclaringType() = c and
diff --git a/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql b/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
index 5a45cbc9d6..d67058868c 100644
--- a/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
+++ b/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
@@ -40,8 +40,8 @@ import codingstandards.cpp.Iterators
 
 from ConstIteratorVariable v, STLContainer c, Expr e
 where
-  not isExcluded(v) and
-  not isExcluded(e) and
+  not isExcluded(v, IteratorsPackage::iteratorImplicitlyConvertedToConstIteratorQuery()) and
+  not isExcluded(e, IteratorsPackage::iteratorImplicitlyConvertedToConstIteratorQuery()) and
   e = v.getAnAssignedValue() and
   e.getAChild*() = /* see note at top of query */ c.getANonConstIteratorFunctionCall()
 select e, "Non-const version of container call immediately converted to a `const_iterator`."
diff --git a/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql b/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql
index dfa402bd1e..f40faad3dd 100644
--- a/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql
+++ b/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql
@@ -57,7 +57,8 @@ class AccessAwareMemberFunction extends MemberFunction {
 
 from Class c, AccessAwareMemberFunction mf, FieldAccess a, ReturnStmt rs
 where
-  not isExcluded(c) and
+  not isExcluded(c,
+    ClassesPackage::returnsNonConstRawPointersOrReferencesToPrivateOrProtectedDataQuery()) and
   not isExcluded(mf,
     ClassesPackage::returnsNonConstRawPointersOrReferencesToPrivateOrProtectedDataQuery()) and
   // Find all of the methods within this class
diff --git a/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql b/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
index d8a5c07d95..645e05c920 100644
--- a/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
+++ b/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
@@ -158,6 +158,6 @@ predicate hasInfeasiblePath(
 
 from ConditionalControlFlowNode cond, boolean infeasiblePath, string explanation
 where
-  not isExcluded(cond) and
+  not isExcluded(cond, DeadCodePackage::infeasiblePathQuery()) and
   hasInfeasiblePath(cond, infeasiblePath, explanation)
 select cond, "The " + infeasiblePath + " path is infeasible because " + explanation + "."
diff --git a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
index 5cfc679596..87d9af147b 100644
--- a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
+++ b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
@@ -20,7 +20,7 @@ import codingstandards.cpp.autosar
 
 from DeclStmt decl, Function f
 where
-  not isExcluded(decl) and
+  not isExcluded(decl, DeclarationsPackage::functionsDeclaredAtBlockScopeQuery()) and
   not isExcluded(f, DeclarationsPackage::functionsDeclaredAtBlockScopeQuery()) and
   decl.getADeclaration() = f
 select f, "Function " + f.getName() + " is declared at block scope."
diff --git a/cpp/autosar/src/rules/M3-2-1/DeclarationsOfAFunctionShallHaveCompatibleTypes.ql b/cpp/autosar/src/rules/M3-2-1/DeclarationsOfAFunctionShallHaveCompatibleTypes.ql
index 2aa8535a35..68e948e0ce 100644
--- a/cpp/autosar/src/rules/M3-2-1/DeclarationsOfAFunctionShallHaveCompatibleTypes.ql
+++ b/cpp/autosar/src/rules/M3-2-1/DeclarationsOfAFunctionShallHaveCompatibleTypes.ql
@@ -22,7 +22,7 @@ import codingstandards.cpp.Typehelpers
 
 from FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
 where
-  not isExcluded(f1) and
+  not isExcluded(f1, DeclarationsPackage::declarationsOfAFunctionShallHaveCompatibleTypesQuery()) and
   not isExcluded(f2, DeclarationsPackage::declarationsOfAFunctionShallHaveCompatibleTypesQuery()) and
   not f1 = f2 and
   f1.getDeclaration() = f2.getDeclaration() and
diff --git a/cpp/autosar/src/rules/M3-2-3/MultipleDeclarationViolation.ql b/cpp/autosar/src/rules/M3-2-3/MultipleDeclarationViolation.ql
index 3af15858ca..30d94facb1 100644
--- a/cpp/autosar/src/rules/M3-2-3/MultipleDeclarationViolation.ql
+++ b/cpp/autosar/src/rules/M3-2-3/MultipleDeclarationViolation.ql
@@ -20,7 +20,7 @@ import codingstandards.cpp.Scope
 
 from DeclarationEntry de, DeclarationEntry otherDeclaration, string kind
 where
-  not isExcluded(de) and
+  not isExcluded(de, ScopePackage::multipleDeclarationViolationQuery()) and
   exists(Declaration d |
     de.getDeclaration() = d and
     otherDeclaration.getDeclaration() = d and
diff --git a/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInObjectDeclarations.ql b/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInObjectDeclarations.ql
index 7fa5f6078d..7e27160690 100644
--- a/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInObjectDeclarations.ql
+++ b/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInObjectDeclarations.ql
@@ -18,7 +18,7 @@ import codingstandards.cpp.autosar
 
 from VariableDeclarationEntry decl1, VariableDeclarationEntry decl2
 where
-  not isExcluded(decl1) and
+  not isExcluded(decl1, DeclarationsPackage::typesNotIdenticalInObjectDeclarationsQuery()) and
   not isExcluded(decl2, DeclarationsPackage::typesNotIdenticalInObjectDeclarationsQuery()) and
   decl1.getDeclaration() = decl2.getDeclaration() and
   not decl1.getType() = decl2.getType()
diff --git a/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInReturnDeclarations.ql b/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInReturnDeclarations.ql
index 2792850dba..7f11f777b4 100644
--- a/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInReturnDeclarations.ql
+++ b/cpp/autosar/src/rules/M3-9-1/TypesNotIdenticalInReturnDeclarations.ql
@@ -18,7 +18,7 @@ import codingstandards.cpp.autosar
 
 from FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
 where
-  not isExcluded(f1) and
+  not isExcluded(f1, DeclarationsPackage::typesNotIdenticalInReturnDeclarationsQuery()) and
   not isExcluded(f2, DeclarationsPackage::typesNotIdenticalInReturnDeclarationsQuery()) and
   f1.getDeclaration() = f2.getDeclaration() and
   not f1.getType() = f2.getType()
diff --git a/cpp/autosar/src/rules/M4-5-3/CharUsedAsOperandsToDisallowedBuiltInOperators.ql b/cpp/autosar/src/rules/M4-5-3/CharUsedAsOperandsToDisallowedBuiltInOperators.ql
index 7df022ba37..100d9f5d76 100644
--- a/cpp/autosar/src/rules/M4-5-3/CharUsedAsOperandsToDisallowedBuiltInOperators.ql
+++ b/cpp/autosar/src/rules/M4-5-3/CharUsedAsOperandsToDisallowedBuiltInOperators.ql
@@ -22,7 +22,7 @@ import codingstandards.cpp.autosar
 
 from Operation o
 where
-  not isExcluded(o) and
+  not isExcluded(o, ExpressionsPackage::charUsedAsOperandsToDisallowedBuiltInOperatorsQuery()) and
   not (
     o instanceof EqualityOperation or
     o instanceof BitwiseAndExpr or
diff --git a/cpp/autosar/src/rules/M5-0-2/GratuitousUseOfParentheses.ql b/cpp/autosar/src/rules/M5-0-2/GratuitousUseOfParentheses.ql
index 1cb823fc5b..41d3eb6944 100644
--- a/cpp/autosar/src/rules/M5-0-2/GratuitousUseOfParentheses.ql
+++ b/cpp/autosar/src/rules/M5-0-2/GratuitousUseOfParentheses.ql
@@ -84,7 +84,7 @@ predicate isGratuitousUseOfParentheses(ParenthesisExpr pe) {
 
 from ParenthesisExpr p
 where
-  not isExcluded(p) and
+  not isExcluded(p, OrderOfEvaluationPackage::gratuitousUseOfParenthesesQuery()) and
   isGratuitousUseOfParentheses(p) and
   not p.isInMacroExpansion()
 select p, "Gratuitous use of parentheses around $@.", p.getExpr(), p.getExpr().toString()
diff --git a/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql b/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
index 9c48cf1d1d..ef9940ff5a 100644
--- a/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
+++ b/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
@@ -20,7 +20,8 @@ import codingstandards.cpp.Expr
 
 from CrementOperation cop, ArithmeticOperation op, string name
 where
-  not isExcluded(cop) and
+  not isExcluded(cop,
+    OrderOfEvaluationPackage::incrementAndDecrementOperatorsMixedWithOtherOperatorsInExpressionQuery()) and
   not isExcluded(op,
     OrderOfEvaluationPackage::incrementAndDecrementOperatorsMixedWithOtherOperatorsInExpressionQuery()) and
   op.getAnOperand() = cop and
diff --git a/cpp/common/src/codingstandards/cpp/Exclusions.qll b/cpp/common/src/codingstandards/cpp/Exclusions.qll
index bdc11eeb43..b718f6535d 100644
--- a/cpp/common/src/codingstandards/cpp/Exclusions.qll
+++ b/cpp/common/src/codingstandards/cpp/Exclusions.qll
@@ -14,16 +14,6 @@ private class ExcludeOutsideSourceLocation extends ExcludedFile {
   ExcludeOutsideSourceLocation() { not exists(getRelativePath()) }
 }
 
-/** Holds if the element should be excluded. */
-predicate isExcluded(Element e) {
-  e instanceof ExcludedElement
-  or
-  e.getFile() instanceof ExcludedFile
-  or
-  // Compiler generated
-  not exists(e.getFile())
-}
-
 bindingset[e, query]
 predicate isExcluded(Element e, Query query) { isExcluded(e, query, _) }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/validcontainerelementaccess/ValidContainerElementAccess.qll b/cpp/common/src/codingstandards/cpp/rules/validcontainerelementaccess/ValidContainerElementAccess.qll
index 74c6b4f707..93e121d44c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/validcontainerelementaccess/ValidContainerElementAccess.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/validcontainerelementaccess/ValidContainerElementAccess.qll
@@ -36,7 +36,7 @@ query predicate problems(
   ContainerInvalidationOperation cio, string actionType
 ) {
   not isExcluded(cio, getQuery()) and
-  not isExcluded(ca) and
+  not isExcluded(ca, getQuery()) and
   // The definition of an invalidation is slightly different
   // for references vs iterators -- this check ensures that the conditions
   // under which a call should be an invalidator are considered correctly.