7 files changed, 19 insertions, 23 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 */