Fix Makefile; Remove empty headers