clean up unneccesary cpp guards; remove redundant makefile include