Consolidate Makefile after history import