13 files changed, 51 insertions, 50 deletions
diff --git a/src/msg/Accepter.cc b/src/msg/Accepter.cc
index ac180e21441..3ad0e8af2be 100644
--- a/src/msg/Accepter.cc
+++ b/src/msg/Accepter.cc
@@ -18,17 +18,16 @@
 #include <limits.h>
 #include <poll.h>
 
-#include "Accepter.h"
-#include "SimpleMessenger.h"
+#include "common/debug.h"
+#include "common/errno.h"
 
+#include "SimpleMessenger.h"
 #include "Message.h"
 #include "Pipe.h"
 
-#include "common/debug.h"
-#include "common/errno.h"
+#include "Accepter.h"
 
 #define dout_subsys ceph_subsys_ms
-
 #undef dout_prefix
 #define dout_prefix *_dout << "accepter."
 
diff --git a/src/msg/Accepter.h b/src/msg/Accepter.h
index 07d766b32cd..97ce600ac04 100644
--- a/src/msg/Accepter.h
+++ b/src/msg/Accepter.h
@@ -15,7 +15,8 @@
 #ifndef CEPH_MSG_ACCEPTER_H
 #define CEPH_MSG_ACCEPTER_H
 
-#include "msg/msg_types.h"
+#include "msg_types.h"
+
 #include "common/Thread.h"
 
 class SimpleMessenger;
diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc
index 04e405581a7..6c350c007c9 100644
--- a/src/msg/DispatchQueue.cc
+++ b/src/msg/DispatchQueue.cc
@@ -12,19 +12,19 @@
  * 
  */
 
-#include "msg/Message.h"
-#include "DispatchQueue.h"
-#include "SimpleMessenger.h"
 #include "common/ceph_context.h"
-
-#define dout_subsys ceph_subsys_ms
 #include "common/debug.h"
 
+#include "Message.h"
+#include "SimpleMessenger.h"
+
+#include "DispatchQueue.h"
 
 /*******************
  * DispatchQueue
  */
 
+#define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "-- " << msgr->get_myaddr() << " "
 
diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h
index ea44c165d56..068d0924e1d 100644
--- a/src/msg/DispatchQueue.h
+++ b/src/msg/DispatchQueue.h
@@ -17,6 +17,7 @@
 
 #include <map>
 #include <boost/intrusive_ptr.hpp>
+
 #include "include/assert.h"
 #include "include/xlist.h"
 #include "include/atomic.h"
diff --git a/src/msg/Dispatcher.h b/src/msg/Dispatcher.h
index 9f837cd6fdb..207c58a36b5 100644
--- a/src/msg/Dispatcher.h
+++ b/src/msg/Dispatcher.h
@@ -16,10 +16,11 @@
 #ifndef CEPH_DISPATCHER_H
 #define CEPH_DISPATCHER_H
 
-#include "Message.h"
 #include "common/config.h"
 #include "auth/Auth.h"
 
+#include "Message.h"
+
 class Messenger;
 
 class Dispatcher {
diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 8d4a2f7e4d6..1c024f97b9f 100644
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -1,20 +1,18 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
 // vim: ts=8 sw=2 smarttab
 
+#include "include/types.h"
+
 #ifdef ENCODE_DUMP
 # include <typeinfo>
 # include <cxxabi.h>
 #endif
 
 #include <iostream>
-using namespace std;
-
-#include "include/types.h"
 
+#include "common/config.h"
 #include "global/global_context.h"
 
-#include "Message.h"
-#include "Pipe.h"
 #include "messages/MPGStats.h"
 
 #include "messages/MGenericMessage.h"
@@ -146,7 +144,11 @@ using namespace std;
 
 #include "messages/MWatchNotify.h"
 
-#include "common/config.h"
+#include "Pipe.h"
+
+#include "Message.h"
+
+using namespace std;
 
 #define DEBUGLVL  10    // debug level of output
 
diff --git a/src/msg/Message.h b/src/msg/Message.h
index fc434ed9b85..840b75dcebb 100644
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -14,21 +14,18 @@
 
 #ifndef CEPH_MESSAGE_H
 #define CEPH_MESSAGE_H
+
+#include "msg_types.h"
+#include "include/types.h"
  
 #include <stdlib.h>
 #include <ostream>
-
 #include <boost/intrusive_ptr.hpp>
-// Because intusive_ptr clobbers our assert...
-#include "include/assert.h"
 
-#include "include/types.h"
+#include "include/assert.h" // intusive_ptr clobbers it
 #include "include/buffer.h"
 #include "common/Throttle.h"
-#include "msg_types.h"
-
 #include "common/RefCountedObj.h"
-
 #include "common/debug.h"
 #include "common/config.h"
 
diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 6ece6536ad7..096df8c4b65 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -12,30 +12,29 @@
  * 
  */
 
-
-
 #ifndef CEPH_MESSENGER_H
 #define CEPH_MESSENGER_H
 
+#include "include/types.h"
+
 #include <map>
-using namespace std;
+#include <errno.h>
+#include <sstream>
 
-#include "Message.h"
-#include "Dispatcher.h"
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "include/Context.h"
-#include "include/types.h"
 #include "include/ceph_features.h"
 #include "auth/Crypto.h"
 
-#include <errno.h>
-#include <sstream>
+#include "Message.h"
+#include "Dispatcher.h"
+
+using namespace std;
 
 class MDS;
 class Timer;
 
-
 class Messenger {
 private:
   list<Dispatcher*> dispatchers;
diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 1ebf2854473..d0f60847e83 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -18,19 +18,18 @@
 #include <limits.h>
 #include <poll.h>
 
-#include "Message.h"
-#include "Pipe.h"
-#include "SimpleMessenger.h"
-
 #include "common/debug.h"
 #include "common/errno.h"
-
 // Below included to get encode_encrypt(); That probably should be in Crypto.h, instead
-
 #include "auth/Crypto.h"
 #include "auth/cephx/CephxProtocol.h"
 #include "auth/AuthSessionHandler.h"
 
+#include "Message.h"
+#include "SimpleMessenger.h"
+
+#include "Pipe.h"
+
 // Constant to limit starting sequence number to 2^31.  Nothing special about it, just a big number.  PLR
 #define SEQ_MASK  0x7fffffff 
 #define dout_subsys ceph_subsys_ms
diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index 1bcc8263f4a..18a3d2a6046 100644
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -16,9 +16,10 @@
 #define CEPH_MSGR_PIPE_H
 
 #include "msg_types.h"
-#include "Messenger.h"
+
 #include "auth/AuthSessionHandler.h"
 
+#include "Messenger.h"
 
 class SimpleMessenger;
 class IncomingQueue;
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index d35fa039e48..a036c204dc6 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -16,29 +16,29 @@
 #define CEPH_SIMPLEMESSENGER_H
 
 #include "include/types.h"
-#include "include/xlist.h"
 
 #include <list>
 #include <map>
-using namespace std;
 #include <ext/hash_map>
 #include <ext/hash_set>
-using namespace __gnu_cxx;
 
-#include "common/Mutex.h"
 #include "include/atomic.h"
+#include "include/assert.h"
+#include "include/xlist.h"
+#include "common/Mutex.h"
 #include "common/Cond.h"
 #include "common/Thread.h"
 #include "common/Throttle.h"
 
 #include "Messenger.h"
 #include "Message.h"
-#include "include/assert.h"
 #include "DispatchQueue.h"
-
 #include "Pipe.h"
 #include "Accepter.h"
 
+using namespace std;
+using namespace __gnu_cxx;
+
 /*
  * This class handles transmission and reception of messages. Generally
  * speaking, there are several major components:
diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index ef87e02e30d..aaccef60b8d 100644
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -1,6 +1,4 @@
 
-#include "msg_types.h"
-
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,6 +6,8 @@
 
 #include "common/Formatter.h"
 
+#include "msg_types.h"
+
 void entity_name_t::dump(Formatter *f) const
 {
   f->dump_string("type", type_str());
diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 8f3d74bb00c..f6a6bc997f7 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -15,9 +15,10 @@
 #ifndef CEPH_MSG_TYPES_H
 #define CEPH_MSG_TYPES_H
 
+#include "include/types.h"
+
 #include <netinet/in.h>
 
-#include "include/types.h"
 #include "include/blobhash.h"
 #include "include/encoding.h"