0624

fix some unresolved inclusion problems
but still fail to include <string>