Include makefile updates for recent changes