more header cleanup and conformance fixes - string.h