Move visitors to a new header file