diff --git a/src/builtins/arithm.c b/src/builtins/arithm.c index 6ef07681..57075709 100644 --- a/src/builtins/arithm.c +++ b/src/builtins/arithm.c @@ -1,7 +1,6 @@ #include "../core.h" #include "../utils/each.h" #include "../builtins.h" -#include "../nfns.h" #include "../ns.h" #include diff --git a/src/builtins/fold.c b/src/builtins/fold.c index 4fa751df..945adb23 100644 --- a/src/builtins/fold.c +++ b/src/builtins/fold.c @@ -13,7 +13,6 @@ #include "../core.h" #include "../builtins.h" -#include "../utils/calls.h" #include "../utils/mut.h" #if SINGELI_SIMD diff --git a/src/builtins/group.c b/src/builtins/group.c index 2eb06996..6415642f 100644 --- a/src/builtins/group.c +++ b/src/builtins/group.c @@ -21,7 +21,6 @@ #include "../core.h" #include "../utils/talloc.h" #include "../utils/calls.h" -#include "../builtins.h" #include "../utils/mut.h" extern B ud_c1(B, B); diff --git a/src/builtins/md1.c b/src/builtins/md1.c index 8b73ac2f..d5b92b35 100644 --- a/src/builtins/md1.c +++ b/src/builtins/md1.c @@ -1,8 +1,7 @@ #include "../core.h" +#include "../utils/mut.h" #include "../utils/each.h" -#include "../utils/file.h" #include "../utils/time.h" -#include "../utils/calls.h" #include "../builtins.h" diff --git a/src/builtins/md2.c b/src/builtins/md2.c index 27c88de1..60d279b0 100644 --- a/src/builtins/md2.c +++ b/src/builtins/md2.c @@ -1,10 +1,8 @@ #include "../core.h" #include "../utils/each.h" #include "../utils/talloc.h" -#include "../utils/mut.h" #include "../nfns.h" #include "../builtins.h" -#include B val_c1(Md2D* d, B x) { return c1(d->f, x); } B val_c2(Md2D* d, B w, B x) { return c2(d->g, w,x); } diff --git a/src/builtins/select.c b/src/builtins/select.c index 9e94ec5c..c7b2b62b 100644 --- a/src/builtins/select.c +++ b/src/builtins/select.c @@ -40,7 +40,6 @@ #include "../utils/talloc.h" #include "../utils/mut.h" #include "../utils/calls.h" -#include "../builtins.h" #if SINGELI_AVX2 #define SINGELI_FILE select diff --git a/src/builtins/selfsearch.c b/src/builtins/selfsearch.c index 198dda5e..0647bc2e 100644 --- a/src/builtins/selfsearch.c +++ b/src/builtins/selfsearch.c @@ -33,7 +33,6 @@ #include "../utils/hash.h" #include "../utils/talloc.h" #include "../utils/calls.h" -#include "../builtins.h" extern B shape_c1(B, B); extern B slash_c2(B, B, B); diff --git a/src/builtins/sfns.c b/src/builtins/sfns.c index 99a79a92..7998f8ab 100644 --- a/src/builtins/sfns.c +++ b/src/builtins/sfns.c @@ -1,5 +1,4 @@ #include "../core.h" -#include "../utils/each.h" #include "../utils/mut.h" #include "../utils/talloc.h" #include "../builtins.h" diff --git a/src/builtins/transpose.c b/src/builtins/transpose.c index 2d61590e..fe6a7e57 100644 --- a/src/builtins/transpose.c +++ b/src/builtins/transpose.c @@ -34,7 +34,7 @@ // COULD implement fast ⍉⍟n #include "../core.h" -#include "../utils/each.h" +#include "../utils/mut.h" #include "../utils/talloc.h" #include "../builtins.h" #include "../utils/calls.h" diff --git a/src/utils/each.c b/src/utils/each.c index c636a5e7..35793826 100644 --- a/src/utils/each.c +++ b/src/utils/each.c @@ -1,4 +1,5 @@ #include "../core.h" +#include "mut.h" #include "each.h" static inline B mv(B* p, usz n) { B r = p [n]; p [n] = m_f64(0); return r; } diff --git a/src/utils/each.h b/src/utils/each.h index 55264f2a..5b852bb7 100644 --- a/src/utils/each.h +++ b/src/utils/each.h @@ -1,5 +1,4 @@ #pragma once -#include "mut.h" B eachd_fn(B fo, B w, B x, FC2 f); // consumes w,x; assumes at least one is array B eachm_fn(B fo, B x, FC1 f); // consumes x; x must be array