testlib: clean up benchmarking code, default to 10 iterations
build: clean up headers and Makefile