Clean up included makefiles and ensure the non-panopoly 'simple' makefile includes key prerequisites