Adding correct headers. Updated makefile