diff --git a/cfg/std.cfg b/cfg/std.cfg
index cf64b268d..c62e49d2a 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1114,6 +1114,7 @@
     </arg>
   </function>
   <!-- double hypot(double x, double y); -->
+  <!-- double hypot(double x, double y, double z); -->
   <!-- float hypotf(float x, float y); -->
   <!-- long double hypotl(long double x, long double y); -->
   <function name="hypot,std::hypot,hypotf,std::hypotf,hypotl,std::hypotl">
@@ -1127,6 +1128,9 @@
     <arg nr="2">
       <not-uninit/>
     </arg>
+    <arg nr="3" default="0">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- int fscanf(FILE *stream, const char *format, ...); -->
   <function name="fscanf,std::fscanf">
@@ -4038,33 +4042,39 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::clear,std::list::clear,std::map::clear,std::queue::clear,std::set::clear,std::stack::clear,std::string::clear,std::wstring::clear,std::vector::clear">
+  <function name="std::deque::clear,std::list::clear,std::forward_list::clear,std::map::clear,std::unordered_map::clear,std::queue::clear,std::set::clear,std::unordered_set::clear,std::stack::clear,std::string::clear,std::wstring::clear,std::vector::clear">
     <noreturn>false</noreturn>
   </function>
-  <function name="std::deque::empty,std::list::empty,std::map::empty,std::queue::empty,std::set::empty,std::stack::empty,std::string::empty,std::wstring::empty,std::vector::empty">
+  <function name="std::deque::empty,std::list::empty,std::forward_list::empty,std::map::empty,std::unordered_map::empty,std::queue::empty,std::set::empty,std::unordered_set::clear,std::stack::empty,std::string::empty,std::wstring::empty,std::vector::empty,std::queue::empty">
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
   </function>
-  <function name="std::deque::push_back,std::deque::push_front,std::list::push_back,std::list::push_front,std::queue::push,std::stack::push,std::vector::push_back,std::vector::push_front">
+  <function name="std::deque::push_back,std::deque::push_front,std::list::push_back,std::list::push_front,std::forward_list::push_front,std::queue::push,std::stack::push,std::vector::push_back,std::vector::push_front">
     <noreturn>false</noreturn>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::size,std::list::size,std::map::size,std::queue::size,std::set::size,std::stack::size,std::string::size,std::wstring::size,std::vector::size">
+  <function name="std::deque::emplace_back,std::deque::emplace_front,std::list::emplace_back,std::list::emplace_front,std::forward_list::emplace_front,std::queue::emplace,std::stack::emplace,std::vector::emplace_back,std::vector::emplace_front">
+    <noreturn>false</noreturn>
+    <arg nr="variadic">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="std::deque::size,std::list::size,std::map::size,std::unordered_map::size,std::queue::size,std::set::size,std::unordered_set::clear,std::stack::size,std::string::size,std::wstring::size,std::vector::size">
     <noreturn>false</noreturn>
     <returnValue type="std::size_t"/>
     <use-retval/>
   </function>
-  <function name="std::list::back,std::list::front">
+  <function name="std::list::back,std::list::front,std::forward_list::front,std::queue::back,std::queue::front,std::vector::back,std::vector::front">
     <noreturn>false</noreturn>
     <use-retval/>
   </function>
-  <function name="std::list::pop_back,std::list::pop_front">
+  <function name="std::list::pop_back,std::list::pop_front,std::forward_list::pop_front,std::vector::pop_back">
     <noreturn>false</noreturn>
   </function>
-  <function name="std::stack::pop">
+  <function name="std::stack::pop,std::queue::pop">
     <noreturn>false</noreturn>
   </function>
   <function name="std::stack::top">
@@ -4085,7 +4095,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char"/>
     <use-retval/>
   </function>
-  <function name="std::string::c_str">
+  <function name="std::string::c_str,std::string::data">
     <noreturn>false</noreturn>
     <returnValue type="const char *"/>
     <use-retval/>
@@ -4095,18 +4105,11 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char"/>
     <use-retval/>
   </function>
-  <function name="std::vector::back,std::vector::front">
-    <noreturn>false</noreturn>
-    <use-retval/>
-  </function>
-  <function name="std::vector::pop_back">
-    <noreturn>false</noreturn>
-  </function>
   <!-- size_t find (const string& str, size_t pos = 0) const; -->
   <!-- size_t find (const char* s, size_t pos, size_t n) const; -->
   <!-- size_t find (char c, size_t pos = 0) const;-->
   <!-- size_t find (const char* s, size_t pos = 0) const; -->
-  <function name="std::string::find,std::wstring::find">
+  <function name="std::string::find,std::wstring::find,std::basic_string::find">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -4122,11 +4125,27 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
-  <function name="std::string::length">
+  <function name="std::string::length,std::wstring::length,std::string::size,std::wstring::size,std::basic_string::size,std::basic_string::size">
     <noreturn>false</noreturn>
     <returnValue type="std::size_t"/>
     <use-retval/>
   </function>
+  <function name="std::string::empty,std::wstring::empty,std::basic_string::empty">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <use-retval/>
+  </function>
+  <function name="std::string::substr,std::wstring::substr,std::basic_string::substr">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1" default="0">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- istream& read (char* s, streamsize n); 
        ifstream& read (char* s, streamsize n); -->
   <function name="std::istream::read,std::ifstream::read">