Reinstate optional installs and add headers