diff --git a/addons/cert.py b/addons/cert.py
index 748cb8389..21c172114 100755
--- a/addons/cert.py
+++ b/addons/cert.py
@@ -25,11 +25,8 @@ def reportError(token, severity, msg, id):
         cppcheckdata.reportError(token, severity, msg, 'cert', id)
 
 def simpleMatch(token, pattern):
-    for p in pattern.split(' '):
-        if not token or token.str != p:
-            return False
-        token = token.next
-    return True
+    return cppcheckdata.simpleMatch(token, pattern)
+
 
 def isUnpackedStruct(token):
     if token.valueType is None:
diff --git a/addons/misc.py b/addons/misc.py
index 2c8c63c28..15a742c28 100644
--- a/addons/misc.py
+++ b/addons/misc.py
@@ -24,11 +24,7 @@ def reportError(token, severity, msg, id):
         cppcheckdata.reportError(token, severity, msg, 'misc', id)
 
 def simpleMatch(token, pattern):
-    for p in pattern.split(' '):
-        if not token or token.str != p:
-            return False
-        token = token.next
-    return True
+    return cppcheckdata.simpleMatch(token, pattern)
 
 # Get function arguments
 def getArgumentsRecursive(tok, arguments):
diff --git a/addons/misra.py b/addons/misra.py
index 7c7d90348..9aa96db42 100755
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -59,11 +59,7 @@ def isUnsignedType(ty):
 
 
 def simpleMatch(token, pattern):
-    for p in pattern.split(' '):
-        if not token or token.str != p:
-            return False
-        token = token.next
-    return True
+    return cppcheckdata.simpleMatch(token, pattern)
 
 
 def rawlink(rawtoken):