diff --git a/cfg/std.cfg b/cfg/std.cfg
index 2b9b67c98..5664f7281 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <def>
-  <function name="exit"><noreturn>true</noreturn></function>
   <function name="abort"><noreturn>true</noreturn></function>
   <function name="abs"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="acos"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="asctime"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
-  <function name="asin"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function> 
+  <function name="asin"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="atan"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="atan2"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg><arg nr="2"><not-uninit/></arg></function>
   <function name="atof"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
@@ -17,6 +16,104 @@
   <function name="cos"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="cosh"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="ctime"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
+  <function name="difftime"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="div"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="exit"><noreturn>true</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
+  <function name="exp"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
+  <function name="fabs"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function> 
+  <function name="fclose"><noreturn>false</noreturn><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="feof"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="ferror"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="fflush"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
+  <function name="fgetc"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="fgetpos"> <noreturn>false</noreturn><leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="fgets">
+        <noreturn>false</noreturn>
+        <leak-ignore/>
+        <arg nr="1"><not-null/></arg>
+        <arg nr="2"><not-uninit/><not-bool/><valid>0-</valid></arg>
+        <arg nr="3"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="floor"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="fmod"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="fopen"><noreturn>false</noreturn><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="fprintf"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><formatstr/><arg nr="2"><formatstr/></arg></function> 
+  <function name="fputc">
+       <noreturn>false</noreturn>
+       <leak-ignore/>
+       <arg nr="1"><not-null/><not-uninit/><not-bool/><valid>0-</valid></arg>
+       <arg nr="2"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="fputs">
+       <noreturn>false</noreturn>
+       <leak-ignore/>
+       <arg nr="1"><not-null/><not-uninit/></arg>
+       <arg nr="2"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="fread">
+        <noreturn>false</noreturn>
+        <leak-ignore/>
+        <arg nr="1"><not-null/></arg>
+        <arg nr="2"><not-null/><not-uninit/></arg>
+        <arg nr="3"><not-null/><not-uninit/></arg>
+        <arg nr="4"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="free"><noreturn>false</noreturn><arg nr="1"><not-uninit/></arg></function>
+  <function name="freopen">
+        <noreturn>false</noreturn>
+        <arg nr="1"><not-uninit/></arg>
+        <arg nr="2"><not-null/><not-uninit/></arg>
+        <arg nr="3"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="frexp">
+       <noreturn>false</noreturn>
+       <leak-ignore/>
+       <arg nr="1"><not-null/><not-uninit/></arg>
+       <arg nr="2"><not-null/></arg>
+  </function>
+  <function name="fscanf">
+	  <noreturn>false</noreturn>
+      <leak-ignore/>
+	  <arg nr="1"><not-uninit/></arg>
+	  <formatstr scan="true"/><arg nr="2"><formatstr/></arg>
+  </function> 
+  <function name="fseek">
+        <noreturn>false</noreturn>
+        <leak-ignore/>
+        <arg nr="1"><not-null/><not-uninit/></arg>
+        <arg nr="2"><not-uninit/></arg>
+        <arg nr="3"><not-uninit/></arg>
+  </function>
+  <function name="fsetpos">
+        <noreturn>false</noreturn>
+        <leak-ignore/>
+        <arg nr="1"><not-null/><not-uninit/></arg>
+        <arg nr="2"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="fgets">
+        <noreturn>false</noreturn>
+        <leak-ignore/>
+        <arg nr="1"><not-null/></arg>
+        <arg nr="2"><not-uninit/><not-bool/><valid>0-</valid></arg>
+        <arg nr="3"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="ftell">
+       <noreturn>false</noreturn>
+       <leak-ignore/>
+       <arg nr="1"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="fwrite">
+        <noreturn>false</noreturn>
+        <leak-ignore/>
+        <arg nr="1"><not-null/><not-uninit/></arg>
+        <arg nr="2"><not-null/><not-uninit/></arg>
+        <arg nr="3"><not-null/><not-uninit/></arg>
+        <arg nr="4"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="getc"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function> 
+  <function name="getenv"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="gets"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/></arg></function> 
+  
   <memory>
     <dealloc>free</dealloc>
 
@@ -30,43 +127,8 @@
   <resource>
     <dealloc>fclose</dealloc>
     <alloc init="true">fopen</alloc>
+    <alloc init="true">freopen</alloc>
   </resource>
-
-  <function name="fopen">   <noreturn>false</noreturn> <arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
-  <function name="fclose">  <noreturn>false</noreturn> <arg nr="1"><not-null/><not-uninit/></arg></function>
-  <function name="fflush">  <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-uninit/></arg></function>
-  <function name="fgetc">   <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg></function>
-  <function name="fgetpos"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
-  <function name="fgets">
-        <noreturn>false</noreturn>
-        <leak-ignore/>
-        <arg nr="1"><not-null/></arg>
-        <arg nr="2"><not-uninit/><not-bool/><valid>0-</valid></arg>
-        <arg nr="3"><not-null/><not-uninit/></arg>
-  </function>
-  <function name="fsetpos">
-        <noreturn>false</noreturn>
-        <leak-ignore/>
-        <arg nr="1"><not-null/><not-uninit/></arg>
-        <arg nr="2"><not-null/><not-uninit/></arg>
-  </function>
-  <function name="fputc">
-       <noreturn>false</noreturn>
-       <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/><not-bool/><valid>0-</valid></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
-  </function>
-  <function name="fputs">
-       <noreturn>false</noreturn>
-       <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
-  </function>
-  <function name="ftell">
-       <noreturn>false</noreturn>
-       <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
-  </function>
   <function name="puts">
        <noreturn>false</noreturn>
        <leak-ignore/>
@@ -122,13 +184,9 @@
   <function name="wcstoul">  <leak-ignore/> <arg nr="3"><valid>0,2-36</valid></arg> </function>
   <function name="wcstoull"> <leak-ignore/> <arg nr="3"><valid>0,2-36</valid></arg> </function>
 
-
-  <function name="feof">     <noreturn>false</noreturn> <arg nr="1"><not-null/><not-uninit/></arg></function>
-  <function name="ferror">   <noreturn>false</noreturn> <arg nr="1"><not-null/><not-uninit/></arg></function>
   <function name="printf">   <noreturn>false</noreturn> <formatstr/>  <arg nr="1"><formatstr/></arg> <arg nr="any"><not-uninit/></arg> </function>
   <function name="wprintf">  <noreturn>false</noreturn> <formatstr/>  <arg nr="1"><formatstr/></arg> </function>
   <function name="sprintf">  <noreturn>false</noreturn> <formatstr/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="fprintf">  <noreturn>false</noreturn> <formatstr/>  <arg nr="2"><formatstr/></arg> </function>
   <function name="fwprintf"> <noreturn>false</noreturn> <formatstr/>  <arg nr="2"><formatstr/></arg> </function>
   <function name="snprintf"> <noreturn>false</noreturn> <formatstr/>  <arg nr="3"><formatstr/></arg> </function>
   <function name="fnprintf"> <noreturn>false</noreturn> <formatstr/>  <arg nr="3"><formatstr/></arg> </function>
@@ -136,7 +194,7 @@
   <function name="scanf">    <noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="1"><formatstr/></arg> </function>
   <function name="wscanf">   <noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="1"><formatstr/></arg> </function>
   <function name="sscanf">   <noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="fscanf">   <noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>
+
   <function name="fwscanf">  <noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>
   <function name="swscanf">  <noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>
 </def>