Tidy Makefile, remove extraneous headers