Compiler warning fixes, moved some InternalFoo to private header,