Add Makefile and missing headers

Please use v2.6.