cleaning up #defines, updating dependencies in the Makefile