Looks like we also need an explicit dep on messenger.h