Move includes to fixTokenizer.h