tweaks for parser
move tokens into separate define statements, add .depend construct to Makefile
more include fixes related to Makefile updates