Fix some sign operations in the amalgamation, and the test build

There were some #includes being used to include chunks of data in the middle
of files that I missed. The Makefile now uses awk instead of a grep hack
to preprocess that sort of include.