make complexity checker happy again
update run-time dependencies
cleanup Makefile again