#include <string>
#include "lock_protocol.h"
#include "lock_client.h"
-#include "rpc.h"
-#include <pthread.h>
+#include "rpc/rpc.h"
#include <list>
#include <map>
-#include "mutex.h"
-using namespace std;
+using std::map;
typedef map<lock_protocol::lockid_t, mutex> lock_map;