From 8b9d106fcc61fc84712c97d4db060d8302cc63fd Mon Sep 17 00:00:00 2001
From: Peter Iannucci <iannucci@mit.edu>
Date: Fri, 11 Oct 2013 14:05:18 -0400
Subject: [PATCH] Includes cleanups

---
 lock_server.cc    |    1 -
 lock_tester.cc    |    1 -
 rpc/connection.cc |    1 -
 rpc/connection.h  |    1 -
 rpc/pollmgr.cc    |    4 +---
 rpc/rpc.cc        |    2 --
 rpc/rpctest.cc    |    1 -
 rsm.cc            |    7 ++-----
 rsm_client.cc     |    1 -
 types.h           |    2 ++
 10 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/lock_server.cc b/lock_server.cc
index d7367bd..40098d7 100644
--- a/lock_server.cc
+++ b/lock_server.cc
@@ -1,6 +1,5 @@
 // the caching lock server implementation
 
-#include "types.h"
 #include "lock_server.h"
 #include <unistd.h>
 #include <arpa/inet.h>
diff --git a/lock_tester.cc b/lock_tester.cc
index 84ac5cc..b2df781 100644
--- a/lock_tester.cc
+++ b/lock_tester.cc
@@ -4,7 +4,6 @@
 
 #include "lock_client.h"
 #include <arpa/inet.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 char log_thread_prefix = 'c';
diff --git a/rpc/connection.cc b/rpc/connection.cc
index cc9f03c..6994f53 100644
--- a/rpc/connection.cc
+++ b/rpc/connection.cc
@@ -2,7 +2,6 @@
 #include "rpc_protocol.h"
 #include <cerrno>
 #include <csignal>
-#include <sys/types.h>
 #include <netinet/tcp.h>
 #include <unistd.h>
 #include "marshall.h"
diff --git a/rpc/connection.h b/rpc/connection.h
index 7032b8c..b1df8a1 100644
--- a/rpc/connection.h
+++ b/rpc/connection.h
@@ -2,7 +2,6 @@
 #define connection_h
 
 #include "types.h"
-#include <sys/types.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include "pollmgr.h"
diff --git a/rpc/pollmgr.cc b/rpc/pollmgr.cc
index 4acff93..aeaf7b3 100644
--- a/rpc/pollmgr.cc
+++ b/rpc/pollmgr.cc
@@ -1,4 +1,4 @@
-#include "types.h"
+#include "pollmgr.h"
 #include <errno.h>
 #include <sys/select.h>
 #include "file.h"
@@ -7,8 +7,6 @@
 #include <sys/epoll.h>
 #endif
 
-#include "pollmgr.h"
-
 static PollMgr instance;
 
 PollMgr & PollMgr::Instance() { return instance; }
diff --git a/rpc/rpc.cc b/rpc/rpc.cc
index 471a5da..a08e287 100644
--- a/rpc/rpc.cc
+++ b/rpc/rpc.cc
@@ -52,10 +52,8 @@
  x exited worker threads).
  */
 
-#include "types.h"
 #include "rpc.h"
 
-#include <sys/types.h>
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
diff --git a/rpc/rpctest.cc b/rpc/rpctest.cc
index b5b975a..354b528 100644
--- a/rpc/rpctest.cc
+++ b/rpc/rpctest.cc
@@ -5,7 +5,6 @@
 #include "rpc.h"
 #include <arpa/inet.h>
 #include <getopt.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #define NUM_CL 2
diff --git a/rsm.cc b/rsm.cc
index a44c24b..4e73f9f 100644
--- a/rsm.cc
+++ b/rsm.cc
@@ -78,13 +78,10 @@
 // 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),
diff --git a/rsm_client.cc b/rsm_client.cc
index ae88169..fa04e26 100644
--- a/rsm_client.cc
+++ b/rsm_client.cc
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "rsm_client.h"
 #include <arpa/inet.h>
 #include <handle.h>
diff --git a/types.h b/types.h
index b326ef7..d2d5411 100644
--- a/types.h
+++ b/types.h
@@ -1,6 +1,8 @@
 #ifndef types_h
 #define types_h
 
+#include <sys/types.h>
+
 #include <algorithm>
 using std::copy;
 using std::move;
-- 
1.7.9.5