misc assert #include cleanup, hackery

Signed-off-by: Sage Weil <sage@inktank.com>

src/ceph_osd.cc

@@ -24,12 +24,12 @@ using namespace std;
 
 #include "osd/OSD.h"
 #include "os/FileStore.h"
+#include "mon/MonClient.h"
 #include "include/ceph_features.h"
 
 #include "common/config.h"
 
 #include "mon/MonMap.h"
-#include "mon/MonClient.h"
 
 
 #include "msg/Messenger.h"

src/crush/CrushWrapper.h

@@ -4,7 +4,13 @@
 #ifndef CEPH_CRUSH_WRAPPER_H
 #define CEPH_CRUSH_WRAPPER_H
 
-#define BUG_ON(x) assert(!(x))
+#include <stdlib.h>
+#include <map>
+#include <set>
+#include <string>
+
+#include <iostream> //for testing, remove
+
 #include "include/types.h"
 
 extern "C" {
@@ -17,12 +23,8 @@ extern "C" {
 #include "include/err.h"
 #include "include/encoding.h"
 
-#include <stdlib.h>
-#include <map>
-#include <set>
-#include <string>
-
-#include <iostream> //for testing, remove
+#include "include/assert.h"
+#define BUG_ON(x) assert(!(x))
 
 namespace ceph {
   class Formatter;

src/include/types.h

@@ -66,12 +66,13 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-#include "assert.h"
 #include "object.h"
 #include "intarith.h"
 
 #include "acconfig.h"
 
+#include "assert.h"
+
 // DARWIN compatibility
 #ifdef DARWIN
 typedef long long loff_t;

src/msg/Message.cc

@@ -12,10 +12,10 @@ using namespace std;
 #include "include/types.h"
 
 #include "Message.h"
+#include "messages/MPGStats.h"
 
 #include "messages/MGenericMessage.h"
 
-#include "messages/MPGStats.h"
 #include "messages/MPGStatsAck.h"
 
 #include "messages/MStatfs.h"
@@ -24,6 +24,7 @@ using namespace std;
 #include "messages/MGetPoolStats.h"
 #include "messages/MGetPoolStatsReply.h"
 
+
 #include "messages/MPoolOp.h"
 #include "messages/MPoolOpReply.h"
 

src/msg/Message.h

@@ -15,8 +15,17 @@
 #ifndef CEPH_MESSAGE_H
 #define CEPH_MESSAGE_H
  
-/* public message types */
+#include <stdlib.h>
+#include <ostream>
+
 #include "include/types.h"
+#include "include/buffer.h"
+#include "common/Throttle.h"
+#include "msg_types.h"
+
+#include "common/RefCountedObj.h"
+
+#include "common/debug.h"
 #include "common/config.h"
 
 // monitor internal
@@ -128,24 +137,6 @@
 
 
 
-#include <stdlib.h>
-
-#include <iostream>
-#include <list>
-using std::list;
-
-#include <ext/hash_map>
-
-
-#include "include/types.h"
-#include "include/buffer.h"
-#include "common/Throttle.h"
-#include "msg_types.h"
-
-#include "common/RefCountedObj.h"
-
-#include "common/debug.h"
-
 
 
 // ======================================================

src/os/FileStore.h

@@ -16,6 +16,19 @@
 #ifndef CEPH_FILESTORE_H
 #define CEPH_FILESTORE_H
 
+#include "include/types.h"
+
+#include <map>
+#include <deque>
+#include <boost/scoped_ptr.hpp>
+#include <fstream>
+using namespace std;
+
+#include <ext/hash_map>
+using namespace __gnu_cxx;
+
+#include "include/assert.h"
+
 #include "ObjectStore.h"
 #include "JournalingObjectStore.h"
 
@@ -30,14 +43,6 @@
 
 #include "include/uuid.h"
 
-#include <map>
-#include <deque>
-#include <boost/scoped_ptr.hpp>
-#include <fstream>
-using namespace std;
-
-#include <ext/hash_map>
-using namespace __gnu_cxx;
 
 // from include/linux/falloc.h:
 #ifndef FALLOC_FL_PUNCH_HOLE

src/osd/osd_types.h

@@ -17,7 +17,6 @@
 
 #include <sstream>
 #include <stdio.h>
-#include <stdexcept>
 #include <memory>
 
 #include "msg/msg_types.h"