Removed more locals.  Added forgotten makefile change.