the master (now) also contains utils/math.h.
These two should probably be merged together