--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,9 +8,6 @@
 
 TOPDIR = ..
 
-srcdir = @srcdir@
-VPATH = @srcdir@
-
 include $(TOPDIR)/Makeconf
 
 srcdir = @srcdir@
@@ -74,7 +71,7 @@
 	gripes.h help.h idx-vector.h input.h lex.h mappers.h \
 	missing-math.h octave.h octave-hist.h pager.h parse.h \
 	pr-output.h procstream.h sighandlers.h statdefs.h symtab.h \
-	sysdep.h t-builtins.h tree-base.h tree-const.h tree.h \
+	sysdep.h t-builtins.h token.h tree-base.h tree-const.h tree.h \
 	unwind-prot.h user-prefs.h utils.h variables.h version.h \
 	xdiv.h xpow.h SLStack.h Stack.h
 
@@ -88,9 +85,9 @@
 	lex.l mappers.cc octave.cc octave-hist.cc pager.cc parse.y \
 	pr-output.cc procstream.cc sighandlers.cc symtab.cc \
 	sysdep.cc t-builtins.cc tc-assign.cc tc-extras.cc \
-	tc-index.cc tc-inlines.cc tree.cc tree-const.cc tree-plot.cc \
-	unwind-prot.cc user-prefs.cc utils.cc variables.cc xdiv.cc \
-	xpow.cc
+	tc-index.cc tc-inlines.cc token.cc tree.cc tree-const.cc \
+	tree-plot.cc unwind-prot.cc user-prefs.cc utils.cc \
+	variables.cc xdiv.cc xpow.cc
 
 DEP_SOURCES_2 = $(patsubst %.l, %.cc, $(SOURCES))
 DEP_SOURCES_1 = $(patsubst %.y, %.cc, $(DEP_SOURCES_2))
@@ -107,9 +104,9 @@
 	getopt.o getopt1.o gripes.o help.o idx-vector.o input.o \
 	lex.o mappers.o octave.o octave-hist.o pager.o parse.o \
 	pr-output.o procstream.o sighandlers.o symtab.o sysdep.o \
-	t-builtins.o tc-assign.o tc-extras.o tc-index.o tree.o \
-	tree-const.o tree-plot.o unwind-prot.o user-prefs.o utils.o \
-	variables.o xdiv.o xpow.o \
+	t-builtins.o tc-assign.o tc-extras.o tc-index.o token.o \
+	tree.o tree-const.o tree-plot.o unwind-prot.o user-prefs.o \
+	utils.o variables.o xdiv.o xpow.o \
 	@DYNAMIC_LD_OBJ@
 
 OCTAVE_LIBS = ../liboctave.a ../libcruft.a ../libreadline.a @LIBDLD@