Re-add Makefile, including new source files.