-/* common */
-#include "filepos.h"
-#include "strbuf.h"
-
/* ca65 */
#include "token.h"
/* Scanner variables */
-extern token_t Tok; /* Current token */
-extern int WS; /* Flag: Whitespace before token */
-extern long IVal; /* Integer token attribute */
-extern StrBuf SVal; /* String token attribute */
-
-extern FilePos CurPos; /* Name and position in file */
-extern int ForcedEnd; /* Force end of assembly */
+extern Token CurTok; /* Current input token incl. attributes */
+extern int ForcedEnd; /* Force end of assembly */