Fix issues with string.h includes