diff --git a/cfg/std.cfg b/cfg/std.cfg
index f6387689e..0b68ab62b 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1550,13 +1550,46 @@
     </arg>
   </function>
   <!-- double fma(double x, double y, double z); -->
-  <!-- float fmaf(float x, float y, float z); -->
-  <!-- long double fmal(long double x, long double y, long double z); -->
-  <function name="fma,std::fma,fmaf,std::fmaf,fmal,std::fmal">
+  <function name="fma,std::fma">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float fmaf(float x, float y, float z); -->
+  <function name="fmaf,std::fmaf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double fmal(long double x, long double y, long double z); -->
+  <function name="fmal,std::fmal">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1568,13 +1601,40 @@
     </arg>
   </function>
   <!-- double fmax(double x, double y); -->
-  <!-- float fmaxf(float x, float y); -->
-  <!-- long double fmaxl(long double x, long double y); -->
-  <function name="fmax,std::fmax,fmaxf,std::fmaxf,fmaxl,std::fmaxl">
+  <function name="fmax,std::fmax">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float fmaxf(float x, float y); -->
+  <function name="fmaxf,std::fmaxf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double fmaxl(long double x, long double y); -->
+  <function name="fmaxl,std::fmaxl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1583,13 +1643,40 @@
     </arg>
   </function>
   <!-- double fmin(double x, double y); -->
-  <!-- float fminf(float x, float y); -->
-  <!-- long double fminl(long double x, long double y); -->
-  <function name="fmin,std::fmin,fminf,std::fminf,fminl,std::fminl">
+  <function name="fmin,std::fmin">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float fminf(float x, float y); -->
+  <function name="fminf,std::fminf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double fminl(long double x, long double y); -->
+  <function name="fminl,std::fminl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1598,13 +1685,40 @@
     </arg>
   </function>
   <!-- double fmod(double x, double y); -->
-  <!-- float fmodf(float x, float y); -->
-  <!-- long double fmodl(long double x, long double y); -->
-  <function name="fmod,std::fmod,fmodf,fmodl">
+  <function name="fmod,std::fmod">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float fmodf(float x, float y); -->
+  <function name="fmodf,std::fmodf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double fmodl(long double x, long double y); -->
+  <function name="fmodl,std::fmodl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1616,6 +1730,7 @@
   <function name="fopen,std::fopen">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="FILE *"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -1779,6 +1894,7 @@
   <function name="freopen,std::freopen">
     <noreturn>false</noreturn>
     <use-retval/>
+    <returnValue type="FILE *"/>
     <arg nr="1">
       <not-uninit/>
       <strz/>
@@ -1813,11 +1929,34 @@
     </arg>
   </function>
   <!-- double frexp(double x, int *exp); -->
-  <!-- float frexpf(float x, int *exp); -->
-  <!-- long double frexpl(long double x, int *exp); -->
-  <function name="frexp,std::frexp,frexpf,frexpl">
+  <function name="frexp,std::frexp">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- float frexpf(float x, int *exp); -->
+  <function name="frexpf,std::frexpf">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- long double frexpl(long double x, int *exp); -->
+  <function name="frexpl,std::frexpl">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>