19 files changed, 57 insertions, 54 deletions
diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc
index 1405d87a1f2..cba23629cc5 100644
--- a/src/cls/lock/cls_lock.cc
+++ b/src/cls/lock/cls_lock.cc
@@ -8,6 +8,8 @@
  *
  */
 
+#include "include/types.h"
+
 #include <algorithm>
 #include <cstring>
 #include <cstdlib>
@@ -17,21 +19,16 @@
 #include <sstream>
 #include <vector>
 
-#include "include/types.h"
 #include "include/utime.h"
-#include "objclass/objclass.h"
-
 #include "common/Clock.h"
-
-#include "cls/lock/cls_lock_types.h"
-#include "cls/lock/cls_lock_ops.h"
-
+#include "objclass/objclass.h"
 #include "global/global_context.h"
 
+#include "cls_lock_types.h"
+#include "cls_lock_ops.h"
 
 using namespace rados::cls::lock;
 
-
 CLS_VER(1,0)
 CLS_NAME(lock)
 
diff --git a/src/cls/lock/cls_lock_client.cc b/src/cls/lock/cls_lock_client.cc
index 54af41cd049..a5f82b32ecb 100644
--- a/src/cls/lock/cls_lock_client.cc
+++ b/src/cls/lock/cls_lock_client.cc
@@ -14,19 +14,17 @@
 
 #include "include/types.h"
 #include "msg/msg_types.h"
-#include "include/rados/librados.hpp"
-
-using namespace librados;
 
 #include <iostream>
-
 #include <errno.h>
 #include <stdlib.h>
 #include <time.h>
 
-#include "cls/lock/cls_lock_types.h"
-#include "cls/lock/cls_lock_ops.h"
-#include "cls/lock/cls_lock_client.h"
+#include "cls_lock_ops.h"
+
+#include "cls_lock_client.h"
+
+using namespace librados;
 
 namespace rados {
   namespace cls {
diff --git a/src/cls/lock/cls_lock_client.h b/src/cls/lock/cls_lock_client.h
index 4e2144c79b4..04260cda8ab 100644
--- a/src/cls/lock/cls_lock_client.h
+++ b/src/cls/lock/cls_lock_client.h
@@ -4,12 +4,10 @@
 #ifndef CEPH_CLS_LOCK_CLIENT_H
 #define CEPH_CLS_LOCK_CLIENT_H
 
-
 #include "include/types.h"
 #include "include/rados/librados.hpp"
 
-#include "cls/lock/cls_lock_types.h"
-
+#include "cls_lock_types.h"
 
 namespace rados {
   namespace cls {
diff --git a/src/cls/lock/cls_lock_ops.cc b/src/cls/lock/cls_lock_ops.cc
index 2775e78aec6..3080e743fbb 100644
--- a/src/cls/lock/cls_lock_ops.cc
+++ b/src/cls/lock/cls_lock_ops.cc
@@ -14,10 +14,10 @@
 
 #include "include/types.h"
 #include "msg/msg_types.h"
+
 #include "common/Formatter.h"
 
-#include "cls/lock/cls_lock_types.h"
-#include "cls/lock/cls_lock_ops.h"
+#include "cls_lock_ops.h"
 
 using namespace rados::cls::lock;
 
diff --git a/src/cls/lock/cls_lock_ops.h b/src/cls/lock/cls_lock_ops.h
index 95f745e5c4b..2a9ba94a280 100644
--- a/src/cls/lock/cls_lock_ops.h
+++ b/src/cls/lock/cls_lock_ops.h
@@ -3,7 +3,8 @@
 
 #include "include/types.h"
 #include "include/utime.h"
-#include "cls/lock/cls_lock_types.h"
+
+#include "cls_lock_types.h"
 
 struct cls_lock_lock_op
 {
diff --git a/src/cls/lock/cls_lock_types.cc b/src/cls/lock/cls_lock_types.cc
index d60ee51d9fb..758c77bd098 100644
--- a/src/cls/lock/cls_lock_types.cc
+++ b/src/cls/lock/cls_lock_types.cc
@@ -14,9 +14,10 @@
 
 #include "include/types.h"
 #include "msg/msg_types.h"
+
 #include "common/Formatter.h"
 
-#include "cls/lock/cls_lock_types.h"
+#include "cls_lock_types.h"
 
 using namespace rados::cls::lock;
 
diff --git a/src/cls/lock/cls_lock_types.h b/src/cls/lock/cls_lock_types.h
index aa60ed142c7..08ca3b412ea 100644
--- a/src/cls/lock/cls_lock_types.h
+++ b/src/cls/lock/cls_lock_types.h
@@ -1,10 +1,11 @@
 #ifndef CEPH_CLS_LOCK_TYPES_H
 #define CEPH_CLS_LOCK_TYPES_H
 
+#include "msg/msg_types.h"
+
 #include "include/encoding.h"
 #include "include/types.h"
 #include "include/utime.h"
-#include "msg/msg_types.h"
 
 /* lock flags */
 #define LOCK_FLAG_RENEW 0x1        /* idempotent lock acquire */
diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index 7664744f364..b5de365aac0 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -26,6 +26,8 @@
  * in each one that they take an input and an output bufferlist.
  */
 
+#include "include/types.h"
+
 #include <algorithm>
 #include <cstring>
 #include <cstdlib>
@@ -35,11 +37,10 @@
 #include <sstream>
 #include <vector>
 
-#include "include/types.h"
-#include "objclass/objclass.h"
 #include "include/rbd_types.h"
+#include "objclass/objclass.h"
 
-#include "cls/rbd/cls_rbd.h"
+#include "cls_rbd.h"
 
 
 /*
diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc
index 060f8a855db..fe9c7ace05f 100644
--- a/src/cls/rbd/cls_rbd_client.cc
+++ b/src/cls/rbd/cls_rbd_client.cc
@@ -1,14 +1,16 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include "cls/lock/cls_lock_client.h"
+#include "include/rbd_types.h"
+
+#include <errno.h>
+
 #include "include/buffer.h"
 #include "include/encoding.h"
-#include "include/rbd_types.h"
 
-#include "cls_rbd_client.h"
+#include "../lock/cls_lock_client.h"
 
-#include <errno.h>
+#include "cls_rbd_client.h"
 
 namespace librbd {
   namespace cls_client {
diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h
index c1d421a43a8..f32d9d90b83 100644
--- a/src/cls/rbd/cls_rbd_client.h
+++ b/src/cls/rbd/cls_rbd_client.h
@@ -4,15 +4,16 @@
 #ifndef CEPH_LIBRBD_CLS_RBD_CLIENT_H
 #define CEPH_LIBRBD_CLS_RBD_CLIENT_H
 
-#include "cls/lock/cls_lock_types.h"
-#include "common/snap_types.h"
+#include <string>
+#include <vector>
+
 #include "include/rados.h"
 #include "include/rados/librados.hpp"
 #include "include/types.h"
 #include "librbd/parent_types.h"
+#include "common/snap_types.h"
 
-#include <string>
-#include <vector>
+#include "../lock/cls_lock_types.h"
 
 namespace librbd {
   namespace cls_client {
diff --git a/src/cls/refcount/cls_refcount_client.cc b/src/cls/refcount/cls_refcount_client.cc
index f88ff5edd4b..c009a5ccabd 100644
--- a/src/cls/refcount/cls_refcount_client.cc
+++ b/src/cls/refcount/cls_refcount_client.cc
@@ -1,11 +1,12 @@
+#include "include/types.h"
+
 #include <errno.h>
 
-#include "include/types.h"
-#include "cls/refcount/cls_refcount_ops.h"
 #include "include/rados/librados.hpp"
 
-using namespace librados;
+#include "cls_refcount_ops.h"
 
+using namespace librados;
 
 void cls_refcount_get(librados::ObjectWriteOperation& op, const string& tag, bool implicit_ref)
 {
diff --git a/src/cls/refcount/cls_refcount_ops.h b/src/cls/refcount/cls_refcount_ops.h
index 6126b8db466..7819bca2b8a 100644
--- a/src/cls/refcount/cls_refcount_ops.h
+++ b/src/cls/refcount/cls_refcount_ops.h
@@ -4,10 +4,10 @@
 #ifndef CEPH_CLS_REFCOUNT_OPS_H
 #define CEPH_CLS_REFCOUNT_OPS_H
 
-#include <map>
-
 #include "include/types.h"
 
+#include <map>
+
 struct cls_refcount_get_op {
   string tag;
   bool implicit_ref;
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 577d6637b31..afd38ef2f09 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -1,20 +1,20 @@
 // -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <iostream>
+#include "include/types.h"
 
+#include <iostream>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include "include/types.h"
 #include "include/utime.h"
-#include "objclass/objclass.h"
-#include "cls/rgw/cls_rgw_ops.h"
 #include "common/Clock.h"
-
+#include "objclass/objclass.h"
 #include "global/global_context.h"
 
+#include "cls_rgw_ops.h"
+
 CLS_VER(1,0)
 CLS_NAME(rgw)
 
diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index aa140bd49b8..2bb1e45c6db 100644
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -1,9 +1,11 @@
+#include "include/types.h"
+
 #include <errno.h>
 
-#include "include/types.h"
-#include "cls/rgw/cls_rgw_ops.h"
 #include "include/rados/librados.hpp"
 
+#include "cls_rgw_ops.h"
+
 using namespace librados;
 
 void cls_rgw_bucket_init(ObjectWriteOperation& o)
diff --git a/src/cls/rgw/cls_rgw_client.h b/src/cls/rgw/cls_rgw_client.h
index 4ab8e902d4f..5dbeaff4bd4 100644
--- a/src/cls/rgw/cls_rgw_client.h
+++ b/src/cls/rgw/cls_rgw_client.h
@@ -3,6 +3,7 @@
 
 #include "include/types.h"
 #include "include/rados/librados.hpp"
+
 #include "cls_rgw_types.h"
 
 /* bucket index */
diff --git a/src/cls/rgw/cls_rgw_ops.cc b/src/cls/rgw/cls_rgw_ops.cc
index e6041592cd3..6d2ce577aee 100644
--- a/src/cls/rgw/cls_rgw_ops.cc
+++ b/src/cls/rgw/cls_rgw_ops.cc
@@ -1,8 +1,6 @@
-
-#include "cls/rgw/cls_rgw_ops.h"
-
 #include "common/Formatter.h"
 
+#include "cls_rgw_ops.h"
 
 void rgw_cls_obj_prepare_op::generate_test_instances(list<rgw_cls_obj_prepare_op*>& o)
 {
diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
index 2ba72299fac..4b88c34553d 100644
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -1,10 +1,11 @@
 #ifndef CEPH_CLS_RGW_OPS_H
 #define CEPH_CLS_RGW_OPS_H
 
+#include "include/types.h"
+
 #include <map>
 
-#include "include/types.h"
-#include "cls/rgw/cls_rgw_types.h"
+#include "cls_rgw_types.h"
 
 struct rgw_cls_tag_timeout_op
 {
diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc
index 1c40e02922e..ab6dc17eb82 100644
--- a/src/cls/rgw/cls_rgw_types.cc
+++ b/src/cls/rgw/cls_rgw_types.cc
@@ -1,7 +1,6 @@
-
-#include "cls/rgw/cls_rgw_types.h"
 #include "common/Formatter.h"
 
+#include "cls_rgw_types.h"
 
 void rgw_bucket_pending_info::generate_test_instances(list<rgw_bucket_pending_info*>& o)
 {
diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h
index 42fcef89e50..36906f454e7 100644
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/src/cls/rgw/cls_rgw_types.h
@@ -1,9 +1,10 @@
 #ifndef CEPH_CLS_RGW_TYPES_H
 #define CEPH_CLS_RGW_TYPES_H
 
+#include "include/types.h"
+
 #include <map>
 
-#include "include/types.h"
 #include "include/utime.h"
 
 #define CEPH_RGW_REMOVE 'r'