spot check on g120 with g++. Added missing classes to Makefile.am