Oops -- forgot to include .h files in sources