Moving some defines over to setup