diff --git a/Common/Makefile b/Common/Makefile
deleted file mode 100644
index 657e89d..0000000
--- a/Common/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CC = g++
-CPPFLAGS += -g -Wall -I../
-
-
-all : Exception.o Lock.o
-
-Exception.o : Exception.cpp Exception.h
-
-Lock.o : Lock.cpp Lock.h
\ No newline at end of file
diff --git a/Common/unordered_map.h b/Common/unordered_map.h
new file mode 100644
index 0000000..19ff5f5
--- /dev/null
+++ b/Common/unordered_map.h
@@ -0,0 +1,14 @@
+#ifndef __COMMON_UNORDERED_MAP_H__
+#define __COMMON_UNORDERED_MAP_H__
+
+#ifdef CPP0X
+//c++0x
+#include <unordered_map>
+#define UNORDERED_MAP(...) std::unordered_map(__VA_ARGS__)
+#else
+// tr1
+#include <tr1/unordered_map>
+#define UNORDERED_MAP(...) std::tr1::unordered_map(__VA_ARGS__)
+#endif
+
+#endif