include/messengerDispatch.h : Clean up