Token,Scanner: Move class declarations to separate (private) header file.