diff --git a/cfg/avr.cfg b/cfg/avr.cfg
index 1eed5f6d3..0efb2d5c7 100644
--- a/cfg/avr.cfg
+++ b/cfg/avr.cfg
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Based on http://www.nongnu.org/avr-libc/user-manual/group__avr__stdint.html -->
-<def format="1">
+<def format="2">
   <!-- stdint.h -->
   <define name="__USING_MINT8" value="0"/>
   <define name="__CONCATenate(left, right)" value="left ## right"/>
diff --git a/cfg/cppcheck-cfg.rng b/cfg/cppcheck-cfg.rng
index f43957d28..89c44bffb 100644
--- a/cfg/cppcheck-cfg.rng
+++ b/cfg/cppcheck-cfg.rng
@@ -4,7 +4,7 @@
 <element name="def">
   <optional>
     <attribute name="format">
-      <value>1</value>
+      <value>2</value>
     </attribute>
   </optional>
   <zeroOrMore>
@@ -17,14 +17,24 @@
       <element name="memory">
         <zeroOrMore>
           <choice>
-            <element name="dealloc"><ref name="DATA-NAME"/></element>
+            <element name="dealloc">
+              <optional>
+                <attribute name="arg">
+                  <ref name="ARGNO"/>
+                </attribute>
+              </optional>
+              <ref name="DATA-EXTNAME"/>
+            </element>
             <element name="alloc">
               <optional>
                 <attribute name="init"><ref name="DATA-BOOL"/></attribute>
               </optional>
+              <optional>
+                <attribute name="arg"><ref name="ARGNO"/></attribute>
+              </optional>
               <ref name="DATA-NAME"/>
             </element>
-            <element name="use"><ref name="DATA-NAME"/></element>
+            <element name="use"><ref name="DATA-EXTNAME"/></element>
           </choice>
         </zeroOrMore>
       </element>
@@ -32,29 +42,55 @@
       <element name="resource">
         <zeroOrMore>
           <choice>
-            <element name="dealloc"><ref name="DATA-NAME"/></element>
+            <element name="dealloc">
+              <optional>
+                <attribute name="arg">
+                  <ref name="ARGNO"/>
+                </attribute>
+              </optional>
+              <ref name="DATA-EXTNAME"/>
+            </element>
             <element name="alloc">
               <optional>
                 <attribute name="init"><ref name="DATA-BOOL"/></attribute>
               </optional>
+              <optional>
+                <attribute name="arg"><ref name="ARGNO"/></attribute>
+              </optional>
               <ref name="DATA-NAME"/>
             </element>
-            <element name="use"><ref name="DATA-NAME"/></element>
+            <element name="use"><ref name="DATA-EXTNAME"/></element>
           </choice>
         </zeroOrMore>
       </element>
 
       <element name="function">
         <attribute name="name">
-          <ref name="DATA-NAME"/>
+          <ref name="DATA-EXTNAME"/>
         </attribute>
 
         <zeroOrMore>
           <choice>
             <element name="noreturn"><ref name="DATA-BOOL"/></element>
             <element name="pure"><empty/></element>
+            <element name="const"><empty/></element>
             <element name="ignorefunction"><ref name="DATA-BOOL"/></element>
             <element name="leak-ignore"><empty/></element>
+            <element name="returnValue">
+              <optional>
+                <attribute name="type">
+                  <data type="string">
+                    <param name="pattern">([a-zA-Z_][a-zA-Z_0-9]*[ ])*([a-zA-Z_][a-zA-Z_0-9]*::)*[a-zA-Z_][a-zA-Z_0-9]*([ ]?[*])*</param>
+                  </data>
+                </attribute>
+              </optional>
+              <optional>
+                <attribute name="container">
+                  <data type="positiveInteger"/>
+                </attribute>
+              </optional>
+              <text/>
+            </element>
             <element name="use-retval"><empty/></element>
             <element name="formatstr">
               <optional>
@@ -65,13 +101,50 @@
               </optional>
               <empty/>
             </element>
+            <element name="warn">
+              <attribute name="severity">
+                <choice>
+                  <value>error</value>
+                  <value>warning</value>
+                  <value>style</value>
+                  <value>performance</value>
+                  <value>portability</value>
+                  <value>information</value>
+                </choice>
+              </attribute>
+              <optional>
+                <attribute name="reason">
+                  <choice>
+                    <value>Obsolescent</value>
+                    <value>Obsolete</value>
+                  </choice>
+                </attribute>
+              </optional>
+              <optional>
+                <attribute name="alternatives">
+                  <ref name="DATA-EXTNAME"/>
+                </attribute>
+              </optional>
+              <optional>
+                <attribute name="cstd">
+                  <value>c99</value>
+                </attribute>
+              </optional>
+              <text/>
+            </element>
             <element name="arg">
               <attribute name="nr">
                 <choice>
                   <ref name="ARGNO"/>
                   <value>any</value>
+                  <value>variadic</value>
                 </choice>
               </attribute>
+              <optional>
+                <attribute name="default">
+                  <text/>
+                </attribute>
+              </optional>
               <zeroOrMore>
                 <choice>
                   <element name="formatstr"><empty/></element>
@@ -81,7 +154,7 @@
                   <element name="not-uninit"><empty/></element>
                   <element name="valid">
                     <data type="string">
-                      <param name="pattern">([-]?[0-9]+[,])*([-]?[0-9]+)?:([-]?[0-9]+)?</param>
+                      <param name="pattern">(-?[0-9]*:-?[0-9]*,)*([-]?[0-9]+[,])*([-]?[0-9]+)?:([-]?[0-9]+)?</param>
                     </data>
                   </element>
                   <element name="minsize">
@@ -102,6 +175,18 @@
                       </attribute>
                     </optional>
                   </element>
+                  <element name="iterator">
+                    <attribute name="container">
+                      <data type="positiveInteger"/>
+                    </attribute>
+                    <attribute name="type">
+                      <choice>
+                        <value>first</value>
+                        <value>middle</value>
+                        <value>last</value>
+                      </choice>
+                    </attribute>
+                  </element>
                 </choice>
               </zeroOrMore>
             </element>
@@ -190,6 +275,12 @@
         <optional>
           <attribute name="inherits"><text/></attribute>
         </optional>
+        <optional>
+          <attribute name="opLessAllowed"><ref name="DATA-BOOL"/></attribute>
+        </optional>
+        <optional>
+          <attribute name="itEndPattern"><text/></attribute>
+        </optional>
         <zeroOrMore>
           <choice>
             <element name="type">
@@ -210,25 +301,10 @@
                   <attribute name="name"><ref name="DATA-NAME"/></attribute>
                   <choice>
                     <attribute name="action">
-                      <choice>
-                        <value>resize</value>
-                        <value>clear</value>
-                        <value>push</value>
-                        <value>pop</value>
-                        <value>find</value>
-                      </choice>
+                      <ref name="CONTAINER-ACTION"/>
                     </attribute>
                     <attribute name="yields">
-                      <choice>
-                        <value>at_index</value>
-                        <value>item</value>
-                        <value>buffer</value>
-                        <value>buffer-nt</value>
-                        <value>start-iterator</value>
-                        <value>end-iterator</value>
-                        <value>size</value>
-                        <value>empty</value>
-                      </choice>
+                      <ref name="CONTAINER-YIELDS"/>
                     </attribute>
                   </choice>
                   <empty/>
@@ -243,11 +319,19 @@
               </optional>
               <zeroOrMore>
                 <element name="function">
-                  <attribute name="name"><ref name="DATA-NAME"/></attribute>
-                  <choice>
-                    <attribute name="action"><text/></attribute>
-                    <attribute name="yields"><text/></attribute>
-                  </choice>
+                  <attribute name="name">
+                    <ref name="DATA-EXTNAME"/>
+                  </attribute>
+                  <optional>
+                    <attribute name="action">
+                      <ref name="CONTAINER-ACTION"/>
+                    </attribute>
+                  </optional>
+                  <optional>
+                    <attribute name="yields">
+                      <ref name="CONTAINER-YIELDS"/>
+                    </attribute>
+                  </optional>
                   <empty/>
                 </element>
               </zeroOrMore>
@@ -257,7 +341,7 @@
       </element>
 
       <element name="podtype">
-        <attribute name="name"><ref name="DATA-NAME"/></attribute>
+        <attribute name="name"><ref name="DATA-EXTNAME"/></attribute>
         <optional>
           <attribute name="size">
             <choice>
@@ -280,7 +364,7 @@
       </element>
 
       <element name="platformtype">
-        <attribute name="name"><ref name="DATA-NAME"/></attribute>
+        <attribute name="name"><ref name="DATA-EXTNAME"/></attribute>
         <attribute name="value"><ref name="DATA-NAME"/></attribute>
         <oneOrMore>
           <choice>
@@ -321,4 +405,39 @@
       <param name="pattern">[a-zA-Z_][a-zA-Z_0-9]*</param>
     </data>
   </define>
+
+  <define name="DATA-EXTNAME">
+    <data type="string">
+      <param name="pattern">[a-zA-Z_][a-zA-Z_0-9:,]*</param>
+    </data>
+  </define>
+
+  <define name="CONTAINER-ACTION">
+    <choice>
+      <value>resize</value>
+      <value>clear</value>
+      <value>push</value>
+      <value>pop</value>
+      <value>find</value>
+      <value>insert</value>
+      <value>erase</value>
+      <value>change-content</value>
+      <value>change-internal</value>
+      <value>change</value>
+    </choice>
+  </define>
+
+  <define name="CONTAINER-YIELDS">
+    <choice>
+      <value>at_index</value>
+      <value>item</value>
+      <value>buffer</value>
+      <value>buffer-nt</value>
+      <value>start-iterator</value>
+      <value>end-iterator</value>
+      <value>iterator</value>
+      <value>size</value>
+      <value>empty</value>
+    </choice>
+  </define>
 </grammar>
diff --git a/cfg/gnu.cfg b/cfg/gnu.cfg
index 041b614d8..91ec34597 100644
--- a/cfg/gnu.cfg
+++ b/cfg/gnu.cfg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<def format="1">
+<def format="2">
   <memory>
     <dealloc>free</dealloc>
     <alloc init="true">get_current_dir_name</alloc>
diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg
index cc08c3cf5..6724f716f 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- THIS FILE IS GENERATED AUTOMATICALLY. See https://github.com/scriptum/cppcheck-libs -->
-<def format="1">
+<def format="2">
   <define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0)"/>
   <define name="g_return_val_if_fail(expr, val)" value="do{if(!(expr)){return val;}}while(0)"/>
   <define name="g_return_if_reached()" value="do{return;}while(0)"/>
diff --git a/cfg/microsoft_sal.cfg b/cfg/microsoft_sal.cfg
index 7da0474fe..dbd30f0e9 100644
--- a/cfg/microsoft_sal.cfg
+++ b/cfg/microsoft_sal.cfg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<def format="1">
+<def format="2">
   <!-- Microsoft SAL Annotations (see http://msdn.microsoft.com/en-us/library/ms182032(v=vs.110).aspx -->
   <!-- Input Parameters -->
   <define name="_In_" value=""/>
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 84bcbb5d9..e1902d762 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<def format="1">
+<def format="2">
   <markup ext=".qml" reporterrors="false" aftercode="true">
     <!-- keywords in QML code to ignore -->
     <keywords>
diff --git a/cfg/sdl.cfg b/cfg/sdl.cfg
index db14760cd..aa1d0d55d 100644
--- a/cfg/sdl.cfg
+++ b/cfg/sdl.cfg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<def format="1">
+<def format="2">
   <function name="SDL_mutexP">
     <noreturn>false</noreturn>
     <arg nr="1">
diff --git a/cfg/sfml.cfg b/cfg/sfml.cfg
index 3b06660b4..4b9be7bbd 100644
--- a/cfg/sfml.cfg
+++ b/cfg/sfml.cfg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<def format="1">
+<def format="2">
   <function name="sf::err">
     <noreturn>false</noreturn>
     <leak-ignore/>
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 2159a046e..34497b9b4 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<def format="1">
+<def format="2">
   <platformtype name="__int8" value="char">
     <platform type="win32A"/>
     <platform type="win32W"/>
@@ -2053,7 +2053,7 @@ HFONT CreateFont(
   </function>
   <!-- int _vsprintf_l(char *buffer, const char *format, locale_t locale, va_list argptr); 
       int __vswprintf_l(wchar_t *buffer, const wchar_t *format, locale_t locale, va_list argptr);-->
-  <function name="_vsprintf_l, __vswprintf_l">
+  <function name="_vsprintf_l,__vswprintf_l">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">