Added Makefile, moved defines to .h