cleanup: changed order of #includes, global_context.h, debug.hwip-dout

- lots of rewriting of #include ordering (see below)
- renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h
- included global/global_context.h and global/debug.h where used
- fixed lots of duplicate includes

The order of #includes is now;

1. types include (include/types.h, mds/mds_types.h, etc)
2. system includes (like stl, boost, etc)
3. ceph includes (include/..)
4. ceph common (common/..)
5. ceph other (auth/.., os/.., global/.., etc)
6. list of messages/.., if used
7. local includes (headers from same module)
8. own header (<basename>.h)

"using namespace" stuff is always directly below #include, not intermixed with them

(WIP notice: most files have this implemented, but some not yet)

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index a1cb21c0326..e37aaf8ee48 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -14,12 +14,8 @@
 #ifndef CEPH_OBJECTSTORE_H
 #define CEPH_OBJECTSTORE_H
 
-#include "include/Context.h"
-#include "include/buffer.h"
 #include "include/types.h"
 #include "osd/osd_types.h"
-#include "common/TrackedOp.h"
-#include "ObjectMap.h"
 
 #include <errno.h>
 #include <sys/stat.h>
@@ -31,6 +27,12 @@
 #include <sys/vfs.h>    /* or <sys/statfs.h> */
 #endif /* DARWIN */
 
+#include "include/Context.h"
+#include "include/buffer.h"
+#include "common/TrackedOp.h"
+
+#include "ObjectMap.h"
+
 using std::vector;
 using std::string;