6 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9380a8ed8cf..7513ed85085 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,7 +162,7 @@ ceph_dencoder_LDADD = $(LIBGLOBAL_LDA) libcls_lock_client.a \
 			  libosd.a libmds.a libosdc.la $(LIBOS_LDA) libmon.a
 bin_PROGRAMS += ceph-dencoder
 
-mount_ceph_SOURCES = mount/mount.ceph.c common/armor.c common/safe_io.c common/secret.c include/addr_parsing.c
+mount_ceph_SOURCES = mount/mount.ceph.c common/armor.c common/safe_io.c common/secret.c common/addr_parsing.c
 mount_ceph_LDADD = -lkeyutils
 if LINUX
 sbin_PROGRAMS += mount.ceph
@@ -1613,10 +1613,10 @@ libcommon_files = \
 	common/Thread.cc \
 	common/Formatter.cc \
 	common/HeartbeatMap.cc \
-	include/ceph_fs.cc \
-	include/ceph_hash.cc \
-	include/ceph_strings.cc \
-	include/ceph_frag.cc \
+	common/ceph_fs.cc \
+	common/ceph_hash.cc \
+	common/ceph_strings.cc \
+	common/ceph_frag.cc \
 	common/config.cc \
 	common/utf8.c \
 	common/mime.c \
@@ -1631,7 +1631,7 @@ libcommon_files = \
 	common/ceph_json.cc \
 	common/ipaddr.cc \
 	common/pick_address.cc \
-	include/addr_parsing.c \
+	common/addr_parsing.c \
 	$(crush_files)
 
 if WITH_PROFILER
diff --git a/src/include/addr_parsing.c b/src/common/addr_parsing.c
index c01f817772c..c01f817772c 100644
--- a/src/include/addr_parsing.c
+++ b/src/common/addr_parsing.c
diff --git a/src/include/ceph_frag.cc b/src/common/ceph_frag.cc
index ab6cf35c409..444b910c24e 100644
--- a/src/include/ceph_frag.cc
+++ b/src/common/ceph_frag.cc
@@ -1,7 +1,7 @@
 /*
  * Ceph 'frag' type
  */
-#include "types.h"
+#include "include/types.h"
 
 int ceph_frag_compare(__u32 a, __u32 b)
 {
diff --git a/src/include/ceph_fs.cc b/src/common/ceph_fs.cc
index 6e3c143361e..3172c577162 100644
--- a/src/include/ceph_fs.cc
+++ b/src/common/ceph_fs.cc
@@ -9,7 +9,7 @@
 /*
  * Some non-inline ceph helpers
  */
-#include "types.h"
+#include "include/types.h"
 
 /*
  * return true if @layout appears to be valid
diff --git a/src/include/ceph_hash.cc b/src/common/ceph_hash.cc
index d6081dfa97d..c581806d83d 100644
--- a/src/include/ceph_hash.cc
+++ b/src/common/ceph_hash.cc
@@ -1,5 +1,5 @@
 
-#include "types.h"
+#include "include/types.h"
 
 /*
  * Robert Jenkin's hash function.
diff --git a/src/include/ceph_strings.cc b/src/common/ceph_strings.cc
index e86aae4fd50..cd08083967a 100644
--- a/src/include/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -1,7 +1,7 @@
 /*
  * Ceph string constants
  */
-#include "types.h"
+#include "include/types.h"
 
 const char *ceph_entity_type_name(int type)
 {