Add missing headers
Stop using DictEntryPtr
Add std::string interface for Dict