cleaning up crud
inlcude references and Makefile fixes