Cleanup: Ensure Makefile works stand-alone