Fixed issues with includes

Included header instead of implementation file, corrected makefile to build properly