From 4282b03a8c212b0e38af1876364be5f332673ce6 Mon Sep 17 00:00:00 2001
From: nsz <nsz@port70.net>
Date: Sun, 7 Oct 2012 20:30:57 +0200
Subject: [PATCH] fix math test gen script

---
 Makefile.inc             |  2 +-
 src/math/acos.c          |  2 +-
 src/math/acosf.c         |  2 +-
 src/math/acosh.c         |  2 +-
 src/math/acoshf.c        |  2 +-
 src/math/acoshl.c        |  6 +++---
 src/math/acosl.c         |  8 +++++---
 src/math/asin.c          |  2 +-
 src/math/asinf.c         |  2 +-
 src/math/asinh.c         |  2 +-
 src/math/asinhf.c        |  2 +-
 src/math/asinhl.c        |  6 +++---
 src/math/asinl.c         |  8 +++++---
 src/math/atan.c          |  2 +-
 src/math/atan2.c         |  2 +-
 src/math/atan2f.c        |  2 +-
 src/math/atan2l.c        |  7 ++++---
 src/math/atanf.c         |  2 +-
 src/math/atanh.c         |  2 +-
 src/math/atanhf.c        |  2 +-
 src/math/atanhl.c        |  6 +++---
 src/math/atanl.c         |  8 +++++---
 src/math/cbrt.c          |  2 +-
 src/math/cbrtf.c         |  2 +-
 src/math/cbrtl.c         |  6 +++---
 src/math/ceil.c          |  2 +-
 src/math/ceilf.c         |  2 +-
 src/math/ceill.c         |  7 ++++---
 src/math/copysign.c      |  2 +-
 src/math/copysignf.c     |  2 +-
 src/math/copysignl.c     |  6 +++---
 src/math/cos.c           |  2 +-
 src/math/cosf.c          |  2 +-
 src/math/cosh.c          |  2 +-
 src/math/coshf.c         |  2 +-
 src/math/coshl.c         |  8 +++++---
 src/math/cosl.c          |  8 +++++---
 src/math/erf.c           |  2 +-
 src/math/erfc.c          |  2 +-
 src/math/erfcf.c         |  2 +-
 src/math/erfcl.c         |  6 +++---
 src/math/erff.c          |  2 +-
 src/math/erfl.c          |  6 +++---
 src/math/exp.c           |  2 +-
 src/math/exp10.c         |  2 +-
 src/math/exp10f.c        |  2 +-
 src/math/exp10l.c        |  6 +++---
 src/math/exp2.c          |  2 +-
 src/math/exp2f.c         |  2 +-
 src/math/exp2l.c         |  6 +++---
 src/math/expf.c          |  2 +-
 src/math/expl.c          |  8 +++++---
 src/math/expm1.c         |  2 +-
 src/math/expm1f.c        |  2 +-
 src/math/expm1l.c        |  7 ++++---
 src/math/fabs.c          |  2 +-
 src/math/fabsf.c         |  2 +-
 src/math/fabsl.c         |  7 ++++---
 src/math/fdim.c          |  2 +-
 src/math/fdimf.c         |  2 +-
 src/math/fdiml.c         |  6 +++---
 src/math/floor.c         |  2 +-
 src/math/floorf.c        |  2 +-
 src/math/floorl.c        |  7 ++++---
 src/math/fmax.c          |  2 +-
 src/math/fmaxf.c         |  2 +-
 src/math/fmaxl.c         |  6 +++---
 src/math/fmin.c          |  2 +-
 src/math/fminf.c         |  2 +-
 src/math/fminl.c         |  6 +++---
 src/math/fmod.c          |  2 +-
 src/math/fmodf.c         |  2 +-
 src/math/fmodl.c         |  7 ++++---
 src/math/gen/gentests.sh | 10 +++++-----
 src/math/hypot.c         |  2 +-
 src/math/hypotf.c        |  2 +-
 src/math/hypotl.c        |  7 ++++---
 src/math/j0.c            |  2 +-
 src/math/j0f.c           |  2 +-
 src/math/j1.c            |  2 +-
 src/math/j1f.c           |  2 +-
 src/math/log.c           |  2 +-
 src/math/log10.c         |  2 +-
 src/math/log10f.c        |  2 +-
 src/math/log10l.c        |  8 +++++---
 src/math/log1p.c         |  2 +-
 src/math/log1pf.c        |  2 +-
 src/math/log1pl.c        |  7 ++++---
 src/math/log2.c          |  2 +-
 src/math/log2f.c         |  2 +-
 src/math/log2l.c         |  7 ++++---
 src/math/logb.c          |  2 +-
 src/math/logbf.c         |  2 +-
 src/math/logbl.c         |  6 +++---
 src/math/logf.c          |  2 +-
 src/math/logl.c          |  8 +++++---
 src/math/nearbyint.c     |  2 +-
 src/math/nearbyintf.c    |  2 +-
 src/math/nearbyintl.c    |  6 +++---
 src/math/nextafterl.c    |  2 +-
 src/math/nexttowardl.c   |  2 +-
 src/math/pow.c           |  2 +-
 src/math/pow10.c         |  2 +-
 src/math/pow10f.c        |  2 +-
 src/math/pow10l.c        |  6 +++---
 src/math/powf.c          |  2 +-
 src/math/powl.c          |  8 +++++---
 src/math/remainder.c     |  2 +-
 src/math/remainderf.c    |  2 +-
 src/math/remainderl.c    |  6 +++---
 src/math/rint.c          |  2 +-
 src/math/rintf.c         |  2 +-
 src/math/rintl.c         |  6 +++---
 src/math/round.c         |  2 +-
 src/math/roundf.c        |  2 +-
 src/math/roundl.c        |  6 +++---
 src/math/sin.c           |  2 +-
 src/math/sinf.c          |  2 +-
 src/math/sinh.c          |  2 +-
 src/math/sinhf.c         |  2 +-
 src/math/sinhl.c         |  8 +++++---
 src/math/sinl.c          |  8 +++++---
 src/math/sqrt.c          |  2 +-
 src/math/sqrtf.c         |  2 +-
 src/math/sqrtl.c         |  7 ++++---
 src/math/tan.c           |  2 +-
 src/math/tanf.c          |  2 +-
 src/math/tanh.c          |  2 +-
 src/math/tanhf.c         |  2 +-
 src/math/tanhl.c         |  7 ++++---
 src/math/tanl.c          |  8 +++++---
 src/math/tgamma.c        |  2 +-
 src/math/tgammaf.c       |  2 +-
 src/math/tgammal.c       |  6 +++---
 src/math/trunc.c         |  2 +-
 src/math/truncf.c        |  2 +-
 src/math/truncl.c        |  6 +++---
 src/math/y0.c            |  2 +-
 src/math/y0f.c           |  2 +-
 src/math/y1.c            |  2 +-
 src/math/y1f.c           |  2 +-
 141 files changed, 266 insertions(+), 231 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index f124dac..f23381b 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -4,6 +4,7 @@ LDFLAGS+=-g
 SRC=$(sort $(wildcard *.c))
 OBJ=$(SRC:.c=.o)
 DSOOBJ=$(filter %_dso.o,$(OBJ))
+# TODO: fix this hack
 BINOBJ=$(filter-out $(NONBIN),$(filter-out %_dso.o,$(OBJ)))
 DSO=$(DSOOBJ:.o=.so)
 BIN=$(BINOBJ:.o=)
@@ -12,7 +13,6 @@ ROOT=../..
 include $(ROOT)/config.mak
 
 all: $(BIN) $(DSO)
-	echo $(BIN)
 run: all
 	@N=0; for i in $(BIN);do ./$$i || N=$$((N+1)); done; [ "$$N" = 0 ] && echo PASS || echo FAILS: $$N
 clean:
diff --git a/src/math/acos.c b/src/math/acos.c
index 16782ee..e8e7743 100644
--- a/src/math/acos.c
+++ b/src/math/acos.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/acos.h"
 #include "ucb/acos.h"
 #include "sanity/acos.h"
+
 };
 
 int main(void)
diff --git a/src/math/acosf.c b/src/math/acosf.c
index d9f6843..db12e88 100644
--- a/src/math/acosf.c
+++ b/src/math/acosf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/acosf.h"
 #include "sanity/acosf.h"
+
 };
 
 int main(void)
diff --git a/src/math/acosh.c b/src/math/acosh.c
index 29a8522..ca5dd8d 100644
--- a/src/math/acosh.c
+++ b/src/math/acosh.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/acosh.h"
+
 };
 
 int main(void)
diff --git a/src/math/acoshf.c b/src/math/acoshf.c
index ebb3458..0036809 100644
--- a/src/math/acoshf.c
+++ b/src/math/acoshf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/acoshf.h"
+
 };
 
 int main(void)
diff --git a/src/math/acoshl.c b/src/math/acoshl.c
index a767f96..3fd17c1 100644
--- a/src/math/acoshl.c
+++ b/src/math/acoshl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/acoshl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/acosh.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/acoshl.h"
+
 #endif
 };
 
diff --git a/src/math/acosl.c b/src/math/acosl.c
index 73d106b..3d3c3fd 100644
--- a/src/math/acosl.c
+++ b/src/math/acosl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/acosl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/acos.h"
+#include "ucb/acos.h"
+#include "sanity/acos.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/acosl.h"
+
 #endif
 };
 
diff --git a/src/math/asin.c b/src/math/asin.c
index 009bff3..3e338d4 100644
--- a/src/math/asin.c
+++ b/src/math/asin.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/asin.h"
 #include "ucb/asin.h"
 #include "sanity/asin.h"
+
 };
 
 int main(void)
diff --git a/src/math/asinf.c b/src/math/asinf.c
index b397037..a8dc6da 100644
--- a/src/math/asinf.c
+++ b/src/math/asinf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/asinf.h"
 #include "sanity/asinf.h"
+
 };
 
 int main(void)
diff --git a/src/math/asinh.c b/src/math/asinh.c
index 36b4350..2a4ebff 100644
--- a/src/math/asinh.c
+++ b/src/math/asinh.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/asinh.h"
+
 };
 
 int main(void)
diff --git a/src/math/asinhf.c b/src/math/asinhf.c
index d62c96b..84c31ac 100644
--- a/src/math/asinhf.c
+++ b/src/math/asinhf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/asinhf.h"
+
 };
 
 int main(void)
diff --git a/src/math/asinhl.c b/src/math/asinhl.c
index ead85e3..5548268 100644
--- a/src/math/asinhl.c
+++ b/src/math/asinhl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/asinhl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/asinh.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/asinhl.h"
+
 #endif
 };
 
diff --git a/src/math/asinl.c b/src/math/asinl.c
index 1743012..76b20ec 100644
--- a/src/math/asinl.c
+++ b/src/math/asinl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/asinl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/asin.h"
+#include "ucb/asin.h"
+#include "sanity/asin.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/asinl.h"
+
 #endif
 };
 
diff --git a/src/math/atan.c b/src/math/atan.c
index 476a82c..2a18f5f 100644
--- a/src/math/atan.c
+++ b/src/math/atan.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/atan.h"
 #include "ucb/atan.h"
 #include "sanity/atan.h"
+
 };
 
 int main(void)
diff --git a/src/math/atan2.c b/src/math/atan2.c
index 57d9821..ea09cc2 100644
--- a/src/math/atan2.c
+++ b/src/math/atan2.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "ucb/atan2.h"
 #include "sanity/atan2.h"
+
 };
 
 int main(void)
diff --git a/src/math/atan2f.c b/src/math/atan2f.c
index 9a58212..5a83528 100644
--- a/src/math/atan2f.c
+++ b/src/math/atan2f.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "ucb/atan2f.h"
 #include "sanity/atan2f.h"
+
 };
 
 int main(void)
diff --git a/src/math/atan2l.c b/src/math/atan2l.c
index 4976186..ad6ee9f 100644
--- a/src/math/atan2l.c
+++ b/src/math/atan2l.c
@@ -4,11 +4,12 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/atan2l.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/atan2.h"
+#include "sanity/atan2.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/atan2l.h"
+
 #endif
 };
 
diff --git a/src/math/atanf.c b/src/math/atanf.c
index 4069e0d..7609bb7 100644
--- a/src/math/atanf.c
+++ b/src/math/atanf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/atanf.h"
 #include "sanity/atanf.h"
+
 };
 
 int main(void)
diff --git a/src/math/atanh.c b/src/math/atanh.c
index 896cce8..4ddc552 100644
--- a/src/math/atanh.c
+++ b/src/math/atanh.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/atanh.h"
+
 };
 
 int main(void)
diff --git a/src/math/atanhf.c b/src/math/atanhf.c
index 9c3b688..66e1ce0 100644
--- a/src/math/atanhf.c
+++ b/src/math/atanhf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/atanhf.h"
+
 };
 
 int main(void)
diff --git a/src/math/atanhl.c b/src/math/atanhl.c
index b0c654c..ac744c4 100644
--- a/src/math/atanhl.c
+++ b/src/math/atanhl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/atanhl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/atanh.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/atanhl.h"
+
 #endif
 };
 
diff --git a/src/math/atanl.c b/src/math/atanl.c
index 2b3d580..5bf3ee7 100644
--- a/src/math/atanl.c
+++ b/src/math/atanl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/atanl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/atan.h"
+#include "ucb/atan.h"
+#include "sanity/atan.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/atanl.h"
+
 #endif
 };
 
diff --git a/src/math/cbrt.c b/src/math/cbrt.c
index 1f84e1c..242ac4e 100644
--- a/src/math/cbrt.c
+++ b/src/math/cbrt.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/cbrt.h"
+
 };
 
 int main(void)
diff --git a/src/math/cbrtf.c b/src/math/cbrtf.c
index 1e178a8..51abd53 100644
--- a/src/math/cbrtf.c
+++ b/src/math/cbrtf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/cbrtf.h"
+
 };
 
 int main(void)
diff --git a/src/math/cbrtl.c b/src/math/cbrtl.c
index 5a6e0a4..2b6b095 100644
--- a/src/math/cbrtl.c
+++ b/src/math/cbrtl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/cbrtl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/cbrt.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/cbrtl.h"
+
 #endif
 };
 
diff --git a/src/math/ceil.c b/src/math/ceil.c
index e39d039..e9c4061 100644
--- a/src/math/ceil.c
+++ b/src/math/ceil.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "ucb/ceil.h"
 #include "sanity/ceil.h"
+
 };
 
 int main(void)
diff --git a/src/math/ceilf.c b/src/math/ceilf.c
index d447833..afbf1ce 100644
--- a/src/math/ceilf.c
+++ b/src/math/ceilf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/ceilf.h"
 #include "sanity/ceilf.h"
+
 };
 
 int main(void)
diff --git a/src/math/ceill.c b/src/math/ceill.c
index 56fd82f..5e8857e 100644
--- a/src/math/ceill.c
+++ b/src/math/ceill.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/ceill.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/ceil.h"
+#include "sanity/ceil.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/ceill.h"
+
 #endif
 };
 
diff --git a/src/math/copysign.c b/src/math/copysign.c
index 1be4d2f..51ce3ac 100644
--- a/src/math/copysign.c
+++ b/src/math/copysign.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "sanity/copysign.h"
+
 };
 
 int main(void)
diff --git a/src/math/copysignf.c b/src/math/copysignf.c
index 6359a71..98e1de5 100644
--- a/src/math/copysignf.c
+++ b/src/math/copysignf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "sanity/copysignf.h"
+
 };
 
 int main(void)
diff --git a/src/math/copysignl.c b/src/math/copysignl.c
index 086f3f8..a9a702f 100644
--- a/src/math/copysignl.c
+++ b/src/math/copysignl.c
@@ -4,11 +4,11 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/copysignl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/copysign.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/copysignl.h"
+
 #endif
 };
 
diff --git a/src/math/cos.c b/src/math/cos.c
index 8f9df66..dcb026d 100644
--- a/src/math/cos.c
+++ b/src/math/cos.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/cos.h"
 #include "ucb/cos.h"
 #include "sanity/cos.h"
+
 };
 
 int main(void)
diff --git a/src/math/cosf.c b/src/math/cosf.c
index b88cbba..2103981 100644
--- a/src/math/cosf.c
+++ b/src/math/cosf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/cosf.h"
 #include "sanity/cosf.h"
+
 };
 
 int main(void)
diff --git a/src/math/cosh.c b/src/math/cosh.c
index 44f9f1b..3fa9466 100644
--- a/src/math/cosh.c
+++ b/src/math/cosh.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/cosh.h"
 #include "ucb/cosh.h"
 #include "sanity/cosh.h"
+
 };
 
 int main(void)
diff --git a/src/math/coshf.c b/src/math/coshf.c
index 079e81b..10a1dd9 100644
--- a/src/math/coshf.c
+++ b/src/math/coshf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/coshf.h"
 #include "sanity/coshf.h"
+
 };
 
 int main(void)
diff --git a/src/math/coshl.c b/src/math/coshl.c
index 3f43adb..ae2dcc3 100644
--- a/src/math/coshl.c
+++ b/src/math/coshl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/coshl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/cosh.h"
+#include "ucb/cosh.h"
+#include "sanity/cosh.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/coshl.h"
+
 #endif
 };
 
diff --git a/src/math/cosl.c b/src/math/cosl.c
index 190d84e..d59b519 100644
--- a/src/math/cosl.c
+++ b/src/math/cosl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/cosl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/cos.h"
+#include "ucb/cos.h"
+#include "sanity/cos.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/cosl.h"
+
 #endif
 };
 
diff --git a/src/math/erf.c b/src/math/erf.c
index 92e6e0f..f6e837a 100644
--- a/src/math/erf.c
+++ b/src/math/erf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/erf.h"
+
 };
 
 int main(void)
diff --git a/src/math/erfc.c b/src/math/erfc.c
index 2e83605..f67d30f 100644
--- a/src/math/erfc.c
+++ b/src/math/erfc.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/erfc.h"
+
 };
 
 int main(void)
diff --git a/src/math/erfcf.c b/src/math/erfcf.c
index 1cf5dca..9c3e2a4 100644
--- a/src/math/erfcf.c
+++ b/src/math/erfcf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/erfcf.h"
+
 };
 
 int main(void)
diff --git a/src/math/erfcl.c b/src/math/erfcl.c
index fab75dc..6a7b34c 100644
--- a/src/math/erfcl.c
+++ b/src/math/erfcl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/erfcl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/erfc.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/erfcl.h"
+
 #endif
 };
 
diff --git a/src/math/erff.c b/src/math/erff.c
index 5981f00..17430b7 100644
--- a/src/math/erff.c
+++ b/src/math/erff.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/erff.h"
+
 };
 
 int main(void)
diff --git a/src/math/erfl.c b/src/math/erfl.c
index 013bf6f..dba10e1 100644
--- a/src/math/erfl.c
+++ b/src/math/erfl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/erfl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/erf.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/erfl.h"
+
 #endif
 };
 
diff --git a/src/math/exp.c b/src/math/exp.c
index 555a56a..4d5202d 100644
--- a/src/math/exp.c
+++ b/src/math/exp.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/exp.h"
 #include "ucb/exp.h"
 #include "sanity/exp.h"
+
 };
 
 int main(void)
diff --git a/src/math/exp10.c b/src/math/exp10.c
index 4b3ecda..57367c3 100644
--- a/src/math/exp10.c
+++ b/src/math/exp10.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/exp10.h"
+
 };
 
 int main(void)
diff --git a/src/math/exp10f.c b/src/math/exp10f.c
index bf2df05..a38b821 100644
--- a/src/math/exp10f.c
+++ b/src/math/exp10f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/exp10f.h"
+
 };
 
 int main(void)
diff --git a/src/math/exp10l.c b/src/math/exp10l.c
index 073fd45..e02da03 100644
--- a/src/math/exp10l.c
+++ b/src/math/exp10l.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/exp10l.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/exp10.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/exp10l.h"
+
 #endif
 };
 
diff --git a/src/math/exp2.c b/src/math/exp2.c
index 317afb8..7892156 100644
--- a/src/math/exp2.c
+++ b/src/math/exp2.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/exp2.h"
+
 };
 
 int main(void)
diff --git a/src/math/exp2f.c b/src/math/exp2f.c
index c146593..405cef3 100644
--- a/src/math/exp2f.c
+++ b/src/math/exp2f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/exp2f.h"
+
 };
 
 int main(void)
diff --git a/src/math/exp2l.c b/src/math/exp2l.c
index 1dbc3aa..9870378 100644
--- a/src/math/exp2l.c
+++ b/src/math/exp2l.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/exp2l.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/exp2.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/exp2l.h"
+
 #endif
 };
 
diff --git a/src/math/expf.c b/src/math/expf.c
index 6c8c7b1..1476faa 100644
--- a/src/math/expf.c
+++ b/src/math/expf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/expf.h"
 #include "sanity/expf.h"
+
 };
 
 int main(void)
diff --git a/src/math/expl.c b/src/math/expl.c
index 0e5c418..68ad645 100644
--- a/src/math/expl.c
+++ b/src/math/expl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/expl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/exp.h"
+#include "ucb/exp.h"
+#include "sanity/exp.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/expl.h"
+
 #endif
 };
 
diff --git a/src/math/expm1.c b/src/math/expm1.c
index 0b4e739..b8537fd 100644
--- a/src/math/expm1.c
+++ b/src/math/expm1.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/expm1.h"
 #include "sanity/expm1.h"
+
 };
 
 int main(void)
diff --git a/src/math/expm1f.c b/src/math/expm1f.c
index 29f7de9..ff5afe0 100644
--- a/src/math/expm1f.c
+++ b/src/math/expm1f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/expm1f.h"
+
 };
 
 int main(void)
diff --git a/src/math/expm1l.c b/src/math/expm1l.c
index 3bb90aa..8ce0bec 100644
--- a/src/math/expm1l.c
+++ b/src/math/expm1l.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/expm1l.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/expm1.h"
+#include "sanity/expm1.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/expm1l.h"
+
 #endif
 };
 
diff --git a/src/math/fabs.c b/src/math/fabs.c
index 48f3dce..cc4cf9a 100644
--- a/src/math/fabs.c
+++ b/src/math/fabs.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "ucb/fabs.h"
 #include "sanity/fabs.h"
+
 };
 
 int main(void)
diff --git a/src/math/fabsf.c b/src/math/fabsf.c
index 74ec690..4b54a42 100644
--- a/src/math/fabsf.c
+++ b/src/math/fabsf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/fabsf.h"
 #include "sanity/fabsf.h"
+
 };
 
 int main(void)
diff --git a/src/math/fabsl.c b/src/math/fabsl.c
index cd1b014..0670fe8 100644
--- a/src/math/fabsl.c
+++ b/src/math/fabsl.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/fabsl.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/fabs.h"
+#include "sanity/fabs.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/fabsl.h"
+
 #endif
 };
 
diff --git a/src/math/fdim.c b/src/math/fdim.c
index c5b0e39..7ef0ab6 100644
--- a/src/math/fdim.c
+++ b/src/math/fdim.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "sanity/fdim.h"
+
 };
 
 int main(void)
diff --git a/src/math/fdimf.c b/src/math/fdimf.c
index 3b6067b..8e1d6d1 100644
--- a/src/math/fdimf.c
+++ b/src/math/fdimf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "sanity/fdimf.h"
+
 };
 
 int main(void)
diff --git a/src/math/fdiml.c b/src/math/fdiml.c
index 1de0744..a8c37e1 100644
--- a/src/math/fdiml.c
+++ b/src/math/fdiml.c
@@ -4,11 +4,11 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/fdiml.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/fdim.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/fdiml.h"
+
 #endif
 };
 
diff --git a/src/math/floor.c b/src/math/floor.c
index da82042..6e16c0b 100644
--- a/src/math/floor.c
+++ b/src/math/floor.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "ucb/floor.h"
 #include "sanity/floor.h"
+
 };
 
 int main(void)
diff --git a/src/math/floorf.c b/src/math/floorf.c
index 2e304a3..7013fd8 100644
--- a/src/math/floorf.c
+++ b/src/math/floorf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/floorf.h"
 #include "sanity/floorf.h"
+
 };
 
 int main(void)
diff --git a/src/math/floorl.c b/src/math/floorl.c
index 76c815e..bb1b756 100644
--- a/src/math/floorl.c
+++ b/src/math/floorl.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/floorl.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/floor.h"
+#include "sanity/floor.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/floorl.h"
+
 #endif
 };
 
diff --git a/src/math/fmax.c b/src/math/fmax.c
index bba4da1..80d4770 100644
--- a/src/math/fmax.c
+++ b/src/math/fmax.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "sanity/fmax.h"
+
 };
 
 int main(void)
diff --git a/src/math/fmaxf.c b/src/math/fmaxf.c
index 4be0a15..d0b7d53 100644
--- a/src/math/fmaxf.c
+++ b/src/math/fmaxf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "sanity/fmaxf.h"
+
 };
 
 int main(void)
diff --git a/src/math/fmaxl.c b/src/math/fmaxl.c
index 3490623..9dc815e 100644
--- a/src/math/fmaxl.c
+++ b/src/math/fmaxl.c
@@ -4,11 +4,11 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/fmaxl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/fmax.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/fmaxl.h"
+
 #endif
 };
 
diff --git a/src/math/fmin.c b/src/math/fmin.c
index 6ee9be2..81e1c5c 100644
--- a/src/math/fmin.c
+++ b/src/math/fmin.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "sanity/fmin.h"
+
 };
 
 int main(void)
diff --git a/src/math/fminf.c b/src/math/fminf.c
index 1aee1dd..0655668 100644
--- a/src/math/fminf.c
+++ b/src/math/fminf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "sanity/fminf.h"
+
 };
 
 int main(void)
diff --git a/src/math/fminl.c b/src/math/fminl.c
index 3a7046d..2f71065 100644
--- a/src/math/fminl.c
+++ b/src/math/fminl.c
@@ -4,11 +4,11 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/fminl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/fmin.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/fminl.h"
+
 #endif
 };
 
diff --git a/src/math/fmod.c b/src/math/fmod.c
index fbc4cea..5df9d95 100644
--- a/src/math/fmod.c
+++ b/src/math/fmod.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "ucb/fmod.h"
 #include "sanity/fmod.h"
+
 };
 
 int main(void)
diff --git a/src/math/fmodf.c b/src/math/fmodf.c
index eccb2c4..2b83ab1 100644
--- a/src/math/fmodf.c
+++ b/src/math/fmodf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "ucb/fmodf.h"
 #include "sanity/fmodf.h"
+
 };
 
 int main(void)
diff --git a/src/math/fmodl.c b/src/math/fmodl.c
index e09ddfb..fa699ab 100644
--- a/src/math/fmodl.c
+++ b/src/math/fmodl.c
@@ -4,11 +4,12 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/fmodl.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/fmod.h"
+#include "sanity/fmod.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/fmodl.h"
+
 #endif
 };
 
diff --git a/src/math/gen/gentests.sh b/src/math/gen/gentests.sh
index a998e6a..86ec03c 100755
--- a/src/math/gen/gentests.sh
+++ b/src/math/gen/gentests.sh
@@ -3,21 +3,21 @@
 D=..
 sed 's/^T(//;s/,//;s/)//' functions.h | while read N T
 do
-	[ -e $D/$N.c ] || {
+#	[ -e $D/$N.c ] || {
 		cp template/$T.c $D/$N.c || continue
 		ND=`echo $N |sed 's/l$//'`
 
 		H=''
 		for i in crlibm/$N.h ucb/$N.h sanity/$N.h
 		do
-			[ -e $D/$i ] && H="$H\\n#include \"$i\""
+			[ -e $D/$i ] && H="$H#include \"$i\"\\n"
 		done
 		DH=''
 		for i in crlibm/$ND.h ucb/$ND.h sanity/$ND.h
 		do
-			[ -e $D/$i ] && DH="$DH\\n#include \"$i\""
+			[ -e $D/$i ] && DH="$DH#include \"$i\"\\n"
 		done
 
-		sed -i "s/___/$N/g;s,HEADERS,$H,;s,DHEADERS,$DH," $D/$N.c
-	}
+		sed -i "s/___/$N/g;s,DHEADERS,$DH,;s,HEADERS,$H," $D/$N.c
+#	}
 done
diff --git a/src/math/hypot.c b/src/math/hypot.c
index 57463d0..5a3add5 100644
--- a/src/math/hypot.c
+++ b/src/math/hypot.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "ucb/hypot.h"
 #include "sanity/hypot.h"
+
 };
 
 int main(void)
diff --git a/src/math/hypotf.c b/src/math/hypotf.c
index af3d6e0..01ce636 100644
--- a/src/math/hypotf.c
+++ b/src/math/hypotf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "ucb/hypotf.h"
 #include "sanity/hypotf.h"
+
 };
 
 int main(void)
diff --git a/src/math/hypotl.c b/src/math/hypotl.c
index 25b9e86..6a69746 100644
--- a/src/math/hypotl.c
+++ b/src/math/hypotl.c
@@ -4,11 +4,12 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/hypotl.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/hypot.h"
+#include "sanity/hypot.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/hypotl.h"
+
 #endif
 };
 
diff --git a/src/math/j0.c b/src/math/j0.c
index 52c4ad5..ddf4064 100644
--- a/src/math/j0.c
+++ b/src/math/j0.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/j0.h"
+
 };
 
 int main(void)
diff --git a/src/math/j0f.c b/src/math/j0f.c
index 8ba059f..63dea2d 100644
--- a/src/math/j0f.c
+++ b/src/math/j0f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/j0f.h"
+
 };
 
 int main(void)
diff --git a/src/math/j1.c b/src/math/j1.c
index 1f735df..895f7d5 100644
--- a/src/math/j1.c
+++ b/src/math/j1.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/j1.h"
+
 };
 
 int main(void)
diff --git a/src/math/j1f.c b/src/math/j1f.c
index cfcf80e..7083216 100644
--- a/src/math/j1f.c
+++ b/src/math/j1f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/j1f.h"
+
 };
 
 int main(void)
diff --git a/src/math/log.c b/src/math/log.c
index abca524..17a2a55 100644
--- a/src/math/log.c
+++ b/src/math/log.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/log.h"
 #include "ucb/log.h"
 #include "sanity/log.h"
+
 };
 
 int main(void)
diff --git a/src/math/log10.c b/src/math/log10.c
index ab71507..4bd80cc 100644
--- a/src/math/log10.c
+++ b/src/math/log10.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/log10.h"
 #include "ucb/log10.h"
 #include "sanity/log10.h"
+
 };
 
 int main(void)
diff --git a/src/math/log10f.c b/src/math/log10f.c
index f0f3f1b..d3ecdfa 100644
--- a/src/math/log10f.c
+++ b/src/math/log10f.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/log10f.h"
 #include "sanity/log10f.h"
+
 };
 
 int main(void)
diff --git a/src/math/log10l.c b/src/math/log10l.c
index b05b4fa..e0f9eee 100644
--- a/src/math/log10l.c
+++ b/src/math/log10l.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/log10l.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/log10.h"
+#include "ucb/log10.h"
+#include "sanity/log10.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/log10l.h"
+
 #endif
 };
 
diff --git a/src/math/log1p.c b/src/math/log1p.c
index e6653e1..8bd027a 100644
--- a/src/math/log1p.c
+++ b/src/math/log1p.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/log1p.h"
 #include "sanity/log1p.h"
+
 };
 
 int main(void)
diff --git a/src/math/log1pf.c b/src/math/log1pf.c
index b9978f9..3e7bbfb 100644
--- a/src/math/log1pf.c
+++ b/src/math/log1pf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/log1pf.h"
+
 };
 
 int main(void)
diff --git a/src/math/log1pl.c b/src/math/log1pl.c
index 05b353c..625628c 100644
--- a/src/math/log1pl.c
+++ b/src/math/log1pl.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/log1pl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/log1p.h"
+#include "sanity/log1p.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/log1pl.h"
+
 #endif
 };
 
diff --git a/src/math/log2.c b/src/math/log2.c
index 8d75fd1..e1751ba 100644
--- a/src/math/log2.c
+++ b/src/math/log2.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/log2.h"
 #include "sanity/log2.h"
+
 };
 
 int main(void)
diff --git a/src/math/log2f.c b/src/math/log2f.c
index 135db4e..3c97dbb 100644
--- a/src/math/log2f.c
+++ b/src/math/log2f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/log2f.h"
+
 };
 
 int main(void)
diff --git a/src/math/log2l.c b/src/math/log2l.c
index e45f46e..234a4fb 100644
--- a/src/math/log2l.c
+++ b/src/math/log2l.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/log2l.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/log2.h"
+#include "sanity/log2.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/log2l.h"
+
 #endif
 };
 
diff --git a/src/math/logb.c b/src/math/logb.c
index a66000d..3c9666a 100644
--- a/src/math/logb.c
+++ b/src/math/logb.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/logb.h"
+
 };
 
 int main(void)
diff --git a/src/math/logbf.c b/src/math/logbf.c
index ce66758..38d6608 100644
--- a/src/math/logbf.c
+++ b/src/math/logbf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/logbf.h"
+
 };
 
 int main(void)
diff --git a/src/math/logbl.c b/src/math/logbl.c
index 4531574..149d19f 100644
--- a/src/math/logbl.c
+++ b/src/math/logbl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/logbl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/logb.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/logbl.h"
+
 #endif
 };
 
diff --git a/src/math/logf.c b/src/math/logf.c
index 6bae867..03bda8f 100644
--- a/src/math/logf.c
+++ b/src/math/logf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/logf.h"
 #include "sanity/logf.h"
+
 };
 
 int main(void)
diff --git a/src/math/logl.c b/src/math/logl.c
index 110f26d..0141042 100644
--- a/src/math/logl.c
+++ b/src/math/logl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/logl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/log.h"
+#include "ucb/log.h"
+#include "sanity/log.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/logl.h"
+
 #endif
 };
 
diff --git a/src/math/nearbyint.c b/src/math/nearbyint.c
index 2579d76..d3c4850 100644
--- a/src/math/nearbyint.c
+++ b/src/math/nearbyint.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/nearbyint.h"
+
 };
 
 int main(void)
diff --git a/src/math/nearbyintf.c b/src/math/nearbyintf.c
index 5e4447d..7ebfd36 100644
--- a/src/math/nearbyintf.c
+++ b/src/math/nearbyintf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/nearbyintf.h"
+
 };
 
 int main(void)
diff --git a/src/math/nearbyintl.c b/src/math/nearbyintl.c
index 265f27d..82bb73c 100644
--- a/src/math/nearbyintl.c
+++ b/src/math/nearbyintl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/nearbyintl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/nearbyint.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/nearbyintl.h"
+
 #endif
 };
 
diff --git a/src/math/nextafterl.c b/src/math/nextafterl.c
index 41804d4..283e2ab 100644
--- a/src/math/nextafterl.c
+++ b/src/math/nextafterl.c
@@ -4,7 +4,7 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
+
 #elif LDBL_MANT_DIG == 64
 
 #endif
diff --git a/src/math/nexttowardl.c b/src/math/nexttowardl.c
index d09e2f8..ba372d5 100644
--- a/src/math/nexttowardl.c
+++ b/src/math/nexttowardl.c
@@ -4,7 +4,7 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
+
 #elif LDBL_MANT_DIG == 64
 
 #endif
diff --git a/src/math/pow.c b/src/math/pow.c
index 57ca123..a3bf732 100644
--- a/src/math/pow.c
+++ b/src/math/pow.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "crlibm/pow.h"
 #include "ucb/pow.h"
 #include "sanity/pow.h"
+
 };
 
 int main(void)
diff --git a/src/math/pow10.c b/src/math/pow10.c
index defc110..3034e21 100644
--- a/src/math/pow10.c
+++ b/src/math/pow10.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/pow10.h"
+
 };
 
 int main(void)
diff --git a/src/math/pow10f.c b/src/math/pow10f.c
index 5b4eada..145948d 100644
--- a/src/math/pow10f.c
+++ b/src/math/pow10f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/pow10f.h"
+
 };
 
 int main(void)
diff --git a/src/math/pow10l.c b/src/math/pow10l.c
index afc8723..af3bc12 100644
--- a/src/math/pow10l.c
+++ b/src/math/pow10l.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/pow10l.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/pow10.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/pow10l.h"
+
 #endif
 };
 
diff --git a/src/math/powf.c b/src/math/powf.c
index 0bad585..23200d3 100644
--- a/src/math/powf.c
+++ b/src/math/powf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "ucb/powf.h"
 #include "sanity/powf.h"
+
 };
 
 int main(void)
diff --git a/src/math/powl.c b/src/math/powl.c
index 3d82b65..c5d5fee 100644
--- a/src/math/powl.c
+++ b/src/math/powl.c
@@ -4,11 +4,13 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/powl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/pow.h"
+#include "ucb/pow.h"
+#include "sanity/pow.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/powl.h"
+
 #endif
 };
 
diff --git a/src/math/remainder.c b/src/math/remainder.c
index 218639d..3870fcf 100644
--- a/src/math/remainder.c
+++ b/src/math/remainder.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct dd_d t[] = {
-
 #include "sanity/remainder.h"
+
 };
 
 int main(void)
diff --git a/src/math/remainderf.c b/src/math/remainderf.c
index e966222..5279c58 100644
--- a/src/math/remainderf.c
+++ b/src/math/remainderf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct ff_f t[] = {
-
 #include "sanity/remainderf.h"
+
 };
 
 int main(void)
diff --git a/src/math/remainderl.c b/src/math/remainderl.c
index fef5dff..727a261 100644
--- a/src/math/remainderl.c
+++ b/src/math/remainderl.c
@@ -4,11 +4,11 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/remainderl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/remainder.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/remainderl.h"
+
 #endif
 };
 
diff --git a/src/math/rint.c b/src/math/rint.c
index 796bdf7..8ed9af7 100644
--- a/src/math/rint.c
+++ b/src/math/rint.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/rint.h"
+
 };
 
 int main(void)
diff --git a/src/math/rintf.c b/src/math/rintf.c
index 5158074..78a0ffc 100644
--- a/src/math/rintf.c
+++ b/src/math/rintf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/rintf.h"
+
 };
 
 int main(void)
diff --git a/src/math/rintl.c b/src/math/rintl.c
index 87b2432..f232f74 100644
--- a/src/math/rintl.c
+++ b/src/math/rintl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/rintl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/rint.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/rintl.h"
+
 #endif
 };
 
diff --git a/src/math/round.c b/src/math/round.c
index 29aad2b..0535fd2 100644
--- a/src/math/round.c
+++ b/src/math/round.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/round.h"
+
 };
 
 int main(void)
diff --git a/src/math/roundf.c b/src/math/roundf.c
index 6118495..c9a18ce 100644
--- a/src/math/roundf.c
+++ b/src/math/roundf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/roundf.h"
+
 };
 
 int main(void)
diff --git a/src/math/roundl.c b/src/math/roundl.c
index b0fdc99..ad64c9a 100644
--- a/src/math/roundl.c
+++ b/src/math/roundl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/roundl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/round.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/roundl.h"
+
 #endif
 };
 
diff --git a/src/math/sin.c b/src/math/sin.c
index f40d208..d130d3f 100644
--- a/src/math/sin.c
+++ b/src/math/sin.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/sin.h"
 #include "ucb/sin.h"
 #include "sanity/sin.h"
+
 };
 
 int main(void)
diff --git a/src/math/sinf.c b/src/math/sinf.c
index aabf6f5..1983701 100644
--- a/src/math/sinf.c
+++ b/src/math/sinf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/sinf.h"
 #include "sanity/sinf.h"
+
 };
 
 int main(void)
diff --git a/src/math/sinh.c b/src/math/sinh.c
index 5e108df..78632e7 100644
--- a/src/math/sinh.c
+++ b/src/math/sinh.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/sinh.h"
 #include "ucb/sinh.h"
 #include "sanity/sinh.h"
+
 };
 
 int main(void)
diff --git a/src/math/sinhf.c b/src/math/sinhf.c
index 9c1e061..4188796 100644
--- a/src/math/sinhf.c
+++ b/src/math/sinhf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/sinhf.h"
 #include "sanity/sinhf.h"
+
 };
 
 int main(void)
diff --git a/src/math/sinhl.c b/src/math/sinhl.c
index d52adb3..99f6215 100644
--- a/src/math/sinhl.c
+++ b/src/math/sinhl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/sinhl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/sinh.h"
+#include "ucb/sinh.h"
+#include "sanity/sinh.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/sinhl.h"
+
 #endif
 };
 
diff --git a/src/math/sinl.c b/src/math/sinl.c
index 471d38f..5b29628 100644
--- a/src/math/sinl.c
+++ b/src/math/sinl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/sinl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/sin.h"
+#include "ucb/sin.h"
+#include "sanity/sin.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/sinl.h"
+
 #endif
 };
 
diff --git a/src/math/sqrt.c b/src/math/sqrt.c
index 069cd6e..797dba1 100644
--- a/src/math/sqrt.c
+++ b/src/math/sqrt.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "ucb/sqrt.h"
 #include "sanity/sqrt.h"
+
 };
 
 int main(void)
diff --git a/src/math/sqrtf.c b/src/math/sqrtf.c
index 64b80f2..7015ffb 100644
--- a/src/math/sqrtf.c
+++ b/src/math/sqrtf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/sqrtf.h"
 #include "sanity/sqrtf.h"
+
 };
 
 int main(void)
diff --git a/src/math/sqrtl.c b/src/math/sqrtl.c
index 93490ab..d07fb43 100644
--- a/src/math/sqrtl.c
+++ b/src/math/sqrtl.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/sqrtl.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/sqrt.h"
+#include "sanity/sqrt.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/sqrtl.h"
+
 #endif
 };
 
diff --git a/src/math/tan.c b/src/math/tan.c
index 0b457a6..5057e21 100644
--- a/src/math/tan.c
+++ b/src/math/tan.c
@@ -3,10 +3,10 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "crlibm/tan.h"
 #include "ucb/tan.h"
 #include "sanity/tan.h"
+
 };
 
 int main(void)
diff --git a/src/math/tanf.c b/src/math/tanf.c
index cc0424b..5dc5687 100644
--- a/src/math/tanf.c
+++ b/src/math/tanf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/tanf.h"
 #include "sanity/tanf.h"
+
 };
 
 int main(void)
diff --git a/src/math/tanh.c b/src/math/tanh.c
index 54a6e80..0c39c48 100644
--- a/src/math/tanh.c
+++ b/src/math/tanh.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "ucb/tanh.h"
 #include "sanity/tanh.h"
+
 };
 
 int main(void)
diff --git a/src/math/tanhf.c b/src/math/tanhf.c
index dcae073..26b6f40 100644
--- a/src/math/tanhf.c
+++ b/src/math/tanhf.c
@@ -3,9 +3,9 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "ucb/tanhf.h"
 #include "sanity/tanhf.h"
+
 };
 
 int main(void)
diff --git a/src/math/tanhl.c b/src/math/tanhl.c
index e2d7c6a..2d65073 100644
--- a/src/math/tanhl.c
+++ b/src/math/tanhl.c
@@ -4,11 +4,12 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/tanhl.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/tanh.h"
+#include "sanity/tanh.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/tanhl.h"
+
 #endif
 };
 
diff --git a/src/math/tanl.c b/src/math/tanl.c
index 4e58ac2..79ac851 100644
--- a/src/math/tanl.c
+++ b/src/math/tanl.c
@@ -4,11 +4,13 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/tanl.h"
-#elif LDBL_MANT_DIG == 64
+#include "crlibm/tan.h"
+#include "ucb/tan.h"
+#include "sanity/tan.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/tanl.h"
+
 #endif
 };
 
diff --git a/src/math/tgamma.c b/src/math/tgamma.c
index c94bb2a..3e4e2a5 100644
--- a/src/math/tgamma.c
+++ b/src/math/tgamma.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/tgamma.h"
+
 };
 
 int main(void)
diff --git a/src/math/tgammaf.c b/src/math/tgammaf.c
index ce46ee2..b72612d 100644
--- a/src/math/tgammaf.c
+++ b/src/math/tgammaf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/tgammaf.h"
+
 };
 
 int main(void)
diff --git a/src/math/tgammal.c b/src/math/tgammal.c
index a0e8db8..a004d6a 100644
--- a/src/math/tgammal.c
+++ b/src/math/tgammal.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/tgammal.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/tgamma.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/tgammal.h"
+
 #endif
 };
 
diff --git a/src/math/trunc.c b/src/math/trunc.c
index a756bfd..10b669e 100644
--- a/src/math/trunc.c
+++ b/src/math/trunc.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/trunc.h"
+
 };
 
 int main(void)
diff --git a/src/math/truncf.c b/src/math/truncf.c
index 3f4ff2f..4024273 100644
--- a/src/math/truncf.c
+++ b/src/math/truncf.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/truncf.h"
+
 };
 
 int main(void)
diff --git a/src/math/truncl.c b/src/math/truncl.c
index be59bd2..2b7596a 100644
--- a/src/math/truncl.c
+++ b/src/math/truncl.c
@@ -4,11 +4,11 @@
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/truncl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/trunc.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/truncl.h"
+
 #endif
 };
 
diff --git a/src/math/y0.c b/src/math/y0.c
index e2d1787..00df016 100644
--- a/src/math/y0.c
+++ b/src/math/y0.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/y0.h"
+
 };
 
 int main(void)
diff --git a/src/math/y0f.c b/src/math/y0f.c
index 272eaff..275691d 100644
--- a/src/math/y0f.c
+++ b/src/math/y0f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/y0f.h"
+
 };
 
 int main(void)
diff --git a/src/math/y1.c b/src/math/y1.c
index 93e42e1..5034b1a 100644
--- a/src/math/y1.c
+++ b/src/math/y1.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct d_d t[] = {
-
 #include "sanity/y1.h"
+
 };
 
 int main(void)
diff --git a/src/math/y1f.c b/src/math/y1f.c
index bc9148b..0cd9447 100644
--- a/src/math/y1f.c
+++ b/src/math/y1f.c
@@ -3,8 +3,8 @@
 #include "util.h"
 
 static struct f_f t[] = {
-
 #include "sanity/y1f.h"
+
 };
 
 int main(void)
-- 
2.20.1