Use new header format for Makefile