Add missing header, remove generated header