Moved some defines from listener.cpp to listener.h