diff --git a/src/runtime.h b/src/runtime.h
index 4a5063c..e9d373d 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -3,7 +3,6 @@
 #ifndef ART_SRC_RUNTIME_H_
 #define ART_SRC_RUNTIME_H_
 
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ -13,6 +12,7 @@
 #include "macros.h"
 #include "scoped_ptr.h"
 #include "stringpiece.h"
+#include "unordered_set.h"
 
 namespace art {
 
@@ -41,7 +41,7 @@
     jint (*hook_vfprintf_)(FILE* stream, const char* format, va_list ap);
     void (*hook_exit_)(jint status);
     void (*hook_abort_)();
-    std::set<std::string> verbose_;
+    std::tr1::unordered_set<std::string> verbose_;
     std::vector<std::string> properties_;
 
    private:
diff --git a/src/unordered_map.h b/src/unordered_map.h
index 66613c6..44e5417 100644
--- a/src/unordered_map.h
+++ b/src/unordered_map.h
@@ -11,6 +11,7 @@
 #include <tr1/unordered_map>
 #endif
 
+//TODO: move out to stringpiece.h?
 namespace std {
 #ifndef __ANDROID__
 namespace tr1 {
diff --git a/src/unordered_set.h b/src/unordered_set.h
new file mode 100644
index 0000000..18ebaac
--- /dev/null
+++ b/src/unordered_set.h
@@ -0,0 +1,12 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+
+#ifndef ART_SRC_CLASS_UNORDERED_SET_H_
+#define ART_SRC_CLASS_UNORDERED_SET_H_
+
+#ifdef __ANDROID__
+#include <unordered_set>
+#else
+#include <tr1/unordered_set>
+#endif
+
+#endif  // ART_SRC_CLASS_UNORDERED_SET_H_