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, 4 insertions, 13 deletions

diff --git a/src/os/DBObjectMap.cc b/src/os/DBObjectMap.cc
index 3e7539c2414..41542b1316a 100644
--- a/src/os/DBObjectMap.cc
+++ b/src/os/DBObjectMap.cc
@@ -2,22 +2,13 @@
 
 #include <iostream>
 #include <inttypes.h>
-#include "include/buffer.h"
-#include <set>
-#include <map>
-#include <string>
-#include <tr1/memory>
-
-#include <vector>
-
-#include "ObjectMap.h"
-#include "KeyValueDB.h"
-#include "DBObjectMap.h"
 #include <errno.h>
 
-#include "global/debug.h"
-#include "common/config.h"
 #include "include/assert.h"
+#include "common/config.h"
+#include "global/debug.h"
+
+#include "DBObjectMap.h"
 
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix