// The rule is that a module releases its internal locks before it
// upcalls, but can keep its locks when calling down.
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "types.h"
-#include "handle.h"
#include "rsm.h"
+#include "handle.h"
#include "rsm_client.h"
+#include <unistd.h>
rsm::rsm(const string & _first, const string & _me) :
stf(0), primary(_first), insync (false), inviewchange (true), vid_commit(0),