Add Makefile and missing headers