Replaced inclusions of deprecated hash_set/map with C++0x stuff