Fix problem: include tokens without categories