Changed hyphens to underscores to work with tokenizer
Fixed makefile to include header file