diff --git a/cfg/std.cfg b/cfg/std.cfg
index 07a962515..bdce83702 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -62,25 +62,67 @@
     </arg>
   </function>
   <!-- double acos(double x); -->
-  <!-- float acosf(float x); -->
-  <!-- long double acosl(long double x); -->
-  <function name="acos,std::acos,acosf,acosl">
+  <function name="acos,std::acos">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float acosf(float x); -->
+  <function name="acosf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double acosl(long double x); -->
+  <function name="acosl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
   <!-- double acosh(double x); -->
-  <!-- float acoshf(float x); -->
-  <!-- long double acoshl(long double x); -->
-  <function name="acosh,std::acosh,acoshf,std::acoshf,acoshl,std::acoshl">
+  <function name="acosh,std::acosh">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float acoshf(float x); -->
+  <function name="acoshf,std::acoshf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double acoshl(long double x); -->
+  <function name="acoshl,std::acoshl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -105,13 +147,34 @@
     </arg>
   </function>
   <!-- double sqrt(double x); -->
-  <!-- float sqrtf(float x); -->
-  <!-- long double sqrtl(long double x); -->
-  <function name="sqrt,std::sqrt,sqrtf,sqrtl">
+  <function name="sqrt,std::sqrt">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float sqrtf(float x); -->
+  <function name="sqrtf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double sqrtl(long double x); -->
+  <function name="sqrtl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -129,25 +192,67 @@
     </arg>
   </function>
   <!-- double sinh(double x); -->
-  <!-- float sinhf(float x); -->
-  <!-- long double sinhl(long double x); -->
-  <function name="sinh,std::sinh,sinhf,sinhl">
+  <function name="sinh,std::sinh">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float sinhf(float x); -->
+  <function name="sinhf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double sinhl(long double x); -->
+  <function name="sinhl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <returnValue type="long double"/>
+    <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
   <!-- double sin(double x); -->
-  <!-- float sinf(float f); -->
-  <!-- long double sinl(long double x); -->
-  <function name="sin,std::sin,sinf,sinl">
+  <function name="sin,std::sin">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- float sinf(float f); -->
+  <function name="sinf">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double sinl(long double x); -->
+  <function name="sinl">
+    <use-retval/>
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>