libceph -> libcephfs

Signed-off-by: Sage Weil <sage@newdream.net>

22 files changed, 72 insertions, 72 deletions

diff --git a/ceph.spec.in b/ceph.spec.in
index 40d8f201ed9..4cce04ef7c0 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -178,7 +178,7 @@ fi
 %{_bindir}/ceph-coverage
 %{_bindir}/obsync
 %{_initrddir}/ceph
-%{_libdir}/libceph.so.*
+%{_libdir}/libcephfs.so.*
 %{_libdir}/librados.so.*
 %{_libdir}/librbd.so.*
 %{_libdir}/rados-classes/libcls_rbd.so.*
@@ -234,7 +234,7 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING
-%{_includedir}/ceph/libceph.h
+%{_includedir}/cephfs/libcephfs.h
 %{_includedir}/crush/crush.h
 %{_includedir}/crush/hash.h
 %{_includedir}/crush/mapper.h
diff --git a/debian/.gitignore b/debian/.gitignore
index 2860422a96f..1409714d502 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -10,9 +10,9 @@
 /*.debhelper
 /ceph
 /files
-/libceph1-dbg
-/libceph-dev
-/libceph1
+/libcephfs1-dbg
+/libcephfs-dev
+/libcephfs1
 /librados2-dbg
 /librados-dev
 /librados2
diff --git a/debian/control b/debian/control
index eb583e77a5d..184f93c8f8e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.9.1
 Package: ceph
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hdparm, binutils
-Recommends: ceph-client-tools, ceph-fuse, libceph1, librados2, librbd1, btrfs-tools, gceph
+Recommends: ceph-client-tools, ceph-fuse, libcephfs1, librados2, librbd1, btrfs-tools, gceph
 Description: distributed storage and file system
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.
@@ -186,9 +186,9 @@ Description: RADOS block device client library (development files)
  This package contains development files needed for building applications that
  link against librbd1.
 
-Package: libceph1
-Conflicts: libceph
-Replaces: libceph
+Package: libcephfs1
+Conflicts: libcephfs
+Replaces: libcephfs
 Architecture: linux-any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -198,25 +198,25 @@ Description: Ceph distributed file system client library
  shared library allowing applications to access a Ceph distributed
  file system via a POSIX-like interface.
 
-Package: libceph1-dbg
+Package: libcephfs1-dbg
 Architecture: linux-any
 Section: debug
 Priority: extra
-Depends: libceph1 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for libceph1
+Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for libcephfs1
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a
  shared library allowing applications to access a Ceph distributed
  file system via a POSIX-like interface.
  .
- This package contains debugging symbols for libceph1.
+ This package contains debugging symbols for libcephfs1.
 
-Package: libceph-dev
+Package: libcephfs-dev
 Architecture: linux-any
 Section: libdevel
-Depends: ${misc:Depends}, libceph1 (= ${binary:Version})
-Conflicts: libceph1-dev
-Replaces: libceph1-dev
+Depends: ${misc:Depends}, libcephfs1 (= ${binary:Version})
+Conflicts: libcephfs1-dev
+Replaces: libcephfs1-dev
 Description: Ceph distributed file system client library (development files)
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a
@@ -224,7 +224,7 @@ Description: Ceph distributed file system client library (development files)
  file system via a POSIX-like interface.
  .
  This package contains development files needed for building applications that
- link against libceph.
+ link against libcephfs.
 
 Package: librgw1
 Conflicts: librgw, librgw1
diff --git a/debian/libceph-dev.install b/debian/libceph-dev.install
index 9951a2b343c..902fb950cc1 100644
--- a/debian/libceph-dev.install
+++ b/debian/libceph-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libceph.so
-usr/lib/libceph.a
-usr/lib/libceph.la
-usr/include/ceph/libceph.h
+usr/lib/libcephfs.so
+usr/lib/libcephfs.a
+usr/lib/libcephfs.la
+usr/include/cephfs/libcephfs.h
diff --git a/debian/libceph1.install b/debian/libceph1.install
index 7008bb64222..a5266dfbca3 100644
--- a/debian/libceph1.install
+++ b/debian/libceph1.install
@@ -1,2 +1,2 @@
-usr/lib/libceph.so.*
+usr/lib/libcephfs.so.*
 
diff --git a/debian/rules b/debian/rules
index ad1782b3d1f..e604c2e0930 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ binary-arch: build install
 	dh_strip -pceph-client-tools --dbg-package=ceph-client-tools-dbg
 	dh_strip -plibrados2 --dbg-package=librados2-dbg
 	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
-	dh_strip -plibceph1 --dbg-package=libceph1-dbg
+	dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
 	dh_strip -pradosgw --dbg-package=radosgw-dbg
 	dh_strip -pgceph --dbg-package=gceph-dbg
 	dh_strip -plibrgw1 --dbg-package=librgw1-dbg
diff --git a/doc/architecture.rst b/doc/architecture.rst
index e8f8b6d874d..2bd5c55cc71 100644
--- a/doc/architecture.rst
+++ b/doc/architecture.rst
@@ -173,7 +173,7 @@ better than a single server could.
 Client
 ======
 
-.. todo:: cephfs, ceph-fuse, librados, libceph, librbd
+.. todo:: cephfs, ceph-fuse, librados, libcephfs, librbd
 
 
 .. todo:: Summarize how much Ceph trusts the client, for what parts (security vs reliability).
diff --git a/doc/dev/libs.rst b/doc/dev/libs.rst
index bdebdb3b000..203dd38b06d 100644
--- a/doc/dev/libs.rst
+++ b/doc/dev/libs.rst
@@ -8,7 +8,7 @@ make executables and other libraries.
 - libcommon: a collection of utilities which are available to nearly every ceph
   library and executable. In general, libcommon should not contain global
   variables, because it is intended to be linked into libraries such as
-  libceph.so.
+  libcephfs.so.
 
 - libglobal: a collection of utilities focused on the needs of Ceph daemon
   programs. In here you will find pidfile management functions, signal
diff --git a/doc/ops/install/mkcephfs.rst b/doc/ops/install/mkcephfs.rst
index 3645383b2f9..58a6da3c900 100644
--- a/doc/ops/install/mkcephfs.rst
+++ b/doc/ops/install/mkcephfs.rst
@@ -55,9 +55,9 @@ Run these commands on all nodes::
 .. todo:: For older distributions, you may need to make sure your apt-get may read .bz2 compressed files. This works for Debian Lenny 5.0.3: ``apt-get install bzip2``
 
 .. todo:: Ponder packages; ceph.deb currently pulls in gceph (ceph.deb
-   Recommends: ceph-client-tools ceph-fuse libceph1 librados2 librbd1
+   Recommends: ceph-client-tools ceph-fuse libcephfs1 librados2 librbd1
    btrfs-tools gceph) (other interesting: ceph-client-tools ceph-fuse
-   libceph-dev librados-dev librbd-dev obsync python-ceph radosgw)
+   libcephfs-dev librados-dev librbd-dev obsync python-ceph radosgw)
 
 
 Red Hat / CentOS / Fedora
diff --git a/src/Makefile.am b/src/Makefile.am
index ef5e17a66f8..2eaf84e3076 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -199,16 +199,16 @@ test_librgw_build_LDADD = -lexpat -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 test_librgw_build_CXXFLAGS = $(AM_CXXFLAGS)
 bin_DEBUGPROGRAMS += test_librgw_build
 
-test_libceph_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \
-			    $(libceph_la_SOURCES) $(libosdc_la_SOURCES)
-test_libceph_build_LDADD = -lexpat -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
-test_libceph_build_CXXFLAGS = $(AM_CXXFLAGS)
-bin_DEBUGPROGRAMS += test_libceph_build
+test_libcephfs_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \
+			    $(libcephfs_la_SOURCES) $(libosdc_la_SOURCES)
+test_libcephfs_build_LDADD = -lexpat -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+test_libcephfs_build_CXXFLAGS = $(AM_CXXFLAGS)
+bin_DEBUGPROGRAMS += test_libcephfs_build
 endif
 
 if WITH_HADOOPCLIENT
 test_libhadoopcephfs_build_SOURCES = test/test_libcommon_build.cc \
-         $(libhadoopcephfs_la_SOURCES) $(libceph_la_SOURCES) \
+         $(libhadoopcephfs_la_SOURCES) $(libcephfs_la_SOURCES) \
 	 $(libosdc_la_SOURCES) $(libcommon_files)
 test_libhadoopcephfs_build_LDADD = -lexpat -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 test_libhadoopcephfs_build_CXXFLAGS = $(AM_CXXFLAGS)
@@ -221,21 +221,21 @@ lib_LTLIBRARIES =
 noinst_LTLIBRARIES = 
 noinst_LIBRARIES =
 
-# libceph
-libceph_la_SOURCES = \
-	libceph.cc \
+# libcephfs
+libcephfs_la_SOURCES = \
+	libcephfs.cc \
 	client/Client.cc \
 	client/Inode.cc \
 	client/MetaRequest.cc
-libceph_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
-libceph_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
-libceph_la_LIBADD = libosdc.la
-libceph_la_LDFLAGS =  -lpthread $(CRYPTO_LIBS) $(EXTRALIBS) \
+libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
+libcephfs_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+libcephfs_la_LIBADD = libosdc.la
+libcephfs_la_LDFLAGS =  -lpthread $(CRYPTO_LIBS) $(EXTRALIBS) \
             ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
-lib_LTLIBRARIES += libceph.la
+lib_LTLIBRARIES += libcephfs.la
 
 testceph_SOURCES = client/testceph.cc
-testceph_LDADD = libceph.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+testceph_LDADD = libcephfs.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_DEBUGPROGRAMS += testceph
 
 testtimers_SOURCES = test/TestTimers.cc
@@ -371,7 +371,7 @@ radoslib_LTLIBRARIES = libcls_rbd.la
 if WITH_HADOOPCLIENT
 JAVA_BASE = /usr/lib/jvm/java-6-sun
 libhadoopcephfs_la_SOURCES = client/hadoop/CephFSInterface.cc
-libhadoopcephfs_la_LIBADD = libceph.la
+libhadoopcephfs_la_LIBADD = libcephfs.la
 libhadoopcephfs_la_CFLAGS = ${AM_CFLAGS}
 libhadoopcephfs_la_CXXFLAGS = ${AM_CXXFLAGS}
 libhadoopcephfs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex 'hadoopcephfs_.*'
@@ -435,7 +435,7 @@ UNITTEST_STATIC_LDADD = \
 	-lpthread
 
 unittest_encoding_SOURCES = test/encoding.cc
-unittest_encoding_LDADD = libceph.la -lpthread -lm \
+unittest_encoding_LDADD = libcephfs.la -lpthread -lm \
 			  ${UNITTEST_LDADD}
 unittest_encoding_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} \
 		     -fno-strict-aliasing
@@ -443,7 +443,7 @@ check_PROGRAMS += unittest_encoding
 
 unittest_base64_SOURCES = test/base64.cc
 unittest_base64_LDFLAGS = -pthread ${AM_LDFLAGS}
-unittest_base64_LDADD = libceph.la -lm ${UNITTEST_LDADD}
+unittest_base64_LDADD = libcephfs.la -lm ${UNITTEST_LDADD}
 unittest_base64_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_base64
 
@@ -459,7 +459,7 @@ unittest_gather_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_gather
 
 unittest_run_cmd_SOURCES = test/run_cmd.cc
-unittest_run_cmd_LDADD = libceph.la ${UNITTEST_LDADD}
+unittest_run_cmd_LDADD = libcephfs.la ${UNITTEST_LDADD}
 unittest_run_cmd_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_run_cmd
 
@@ -469,7 +469,7 @@ unittest_signals_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_signals
 
 unittest_simple_spin_SOURCES = test/simple_spin.cc
-unittest_simple_spin_LDADD = libceph.la ${UNITTEST_LDADD}
+unittest_simple_spin_LDADD = libcephfs.la ${UNITTEST_LDADD}
 unittest_simple_spin_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_simple_spin
 
@@ -550,11 +550,11 @@ unittest_formatter_LDADD = ${UNITTEST_LDADD} $(LIBGLOBAL_LDA)
 unittest_formatter_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_formatter
 
-unittest_libceph_config_SOURCES = test/libceph_config.cc
-unittest_libceph_config_LDFLAGS = -pthread ${AM_LDFLAGS}
-unittest_libceph_config_LDADD =  libceph.la ${UNITTEST_LDADD}
-unittest_libceph_config_CXXFLAGS = ${CRYPTO_CFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
-check_PROGRAMS += unittest_libceph_config
+unittest_libcephfs_config_SOURCES = test/libcephfs_config.cc
+unittest_libcephfs_config_LDFLAGS = -pthread ${AM_LDFLAGS}
+unittest_libcephfs_config_LDADD =  libcephfs.la ${UNITTEST_LDADD}
+unittest_libcephfs_config_CXXFLAGS = ${CRYPTO_CFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
+check_PROGRAMS += unittest_libcephfs_config
 
 unittest_librados_config_SOURCES = test/librados_config.cc
 unittest_librados_config_LDFLAGS = -pthread ${AM_LDFLAGS}
@@ -725,8 +725,8 @@ bash_completion_DATA = $(srcdir)/bash_completion/ceph \
                $(srcdir)/bash_completion/rbd \
                $(srcdir)/bash_completion/radosgw_admin
 
-libceph_includedir = $(includedir)/ceph
-libceph_include_DATA = $(srcdir)/include/ceph/libceph.h
+libcephfs_includedir = $(includedir)/cephfs
+libcephfs_include_DATA = $(srcdir)/include/cephfs/libcephfs.h
 
 librbd_includedir = $(includedir)/rbd
 librbd_include_DATA = \
@@ -1086,7 +1086,7 @@ noinst_HEADERS = \
         include/blobhash.h\
         include/buffer.h\
         include/byteorder.h\
-	include/ceph/libceph.h\
+	include/cephfs/libcephfs.h\
 	include/ceph_frag.h\
         include/ceph_fs.h\
         include/ceph_hash.h\
diff --git a/src/client/hadoop/CephFSInterface.cc b/src/client/hadoop/CephFSInterface.cc
index af7f718d1bb..1a8beafde65 100644
--- a/src/client/hadoop/CephFSInterface.cc
+++ b/src/client/hadoop/CephFSInterface.cc
@@ -1,6 +1,6 @@
 // -*- mode:c++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 #include "CephFSInterface.h"
-#include "include/ceph/libceph.h"
+#include "include/cephfs/libcephfs.h"
 #include "common/ceph_argparse.h"
 #include "common/config.h"
 #include "msg/SimpleMessenger.h"
diff --git a/src/client/hadoop/HADOOP-ceph.patch b/src/client/hadoop/HADOOP-ceph.patch
index 1f3c7a3a919..388916a7faa 100644
--- a/src/client/hadoop/HADOOP-ceph.patch
+++ b/src/client/hadoop/HADOOP-ceph.patch
@@ -87,7 +87,7 @@ Index: src/java/org/apache/hadoop/fs/ceph/CephTalker.java
 +	public CephTalker(Configuration conf, Log log) {
 +		super(conf, log);
 +		System.load(conf.get("fs.ceph.libDir")+"/libhadoopcephfs.so");
-+		System.load(conf.get("fs.ceph.libDir")+"/libceph.so");
++		System.load(conf.get("fs.ceph.libDir")+"/libcephfs.so");
 +	}
 +	protected native boolean ceph_initializeClient(String arguments, int block_size);
 +	protected native String ceph_getcwd();
@@ -173,9 +173,9 @@ Index: src/java/org/apache/hadoop/fs/ceph/CephFileSystem.java
 + * Configuration of the CephFileSystem is handled via a few Hadoop
 + * Configuration properties: <br>
 + * fs.ceph.monAddr -- the ip address/port of the monitor to connect to. <br>
-+ * fs.ceph.libDir -- the directory that libceph and libhadoopceph are
++ * fs.ceph.libDir -- the directory that libcephfs and libhadoopceph are
 + * located in. This assumes Hadoop is being run on a linux-style machine
-+ * with names like libceph.so.
++ * with names like libcephfs.so.
 + * fs.ceph.commandLine -- if you prefer you can fill in this property
 + * just as you would when starting Ceph up from the command line. Specific
 + * properties override any configuration specified here.
@@ -2236,7 +2236,7 @@ Index: src/java/org/apache/hadoop/fs/ceph/package.html
 +&lt;property&gt;
 +  &lt;name&gt;fs.ceph.libDir&lt;/name&gt;
 +  &lt;value&gt;/usr/local/lib&lt;/value&gt;
-+  &lt;description&gt;The folder holding libceph and libhadoopceph&lt;/description&gt;
++  &lt;description&gt;The folder holding libcephfs and libhadoopceph&lt;/description&gt;
 +  &lt;/property&gt;
 +</pre>
 +  <li>There are also a number of optional Ceph configuration options.
diff --git a/src/client/hadoop/ceph/CephFileSystem.java b/src/client/hadoop/ceph/CephFileSystem.java
index d081558d1d1..e57442e889a 100644
--- a/src/client/hadoop/ceph/CephFileSystem.java
+++ b/src/client/hadoop/ceph/CephFileSystem.java
@@ -52,9 +52,9 @@ import org.apache.hadoop.fs.CreateFlag;
  * Configuration of the CephFileSystem is handled via a few Hadoop
  * Configuration properties: <br>
  * fs.ceph.monAddr -- the ip address/port of the monitor to connect to. <br>
- * fs.ceph.libDir -- the directory that libceph and libhadoopceph are
+ * fs.ceph.libDir -- the directory that libcephfs and libhadoopceph are
  * located in. This assumes Hadoop is being run on a linux-style machine
- * with names like libceph.so.
+ * with names like libcephfs.so.
  * fs.ceph.commandLine -- if you prefer you can fill in this property
  * just as you would when starting Ceph up from the command line. Specific
  * properties override any configuration specified here.
diff --git a/src/client/hadoop/ceph/CephTalker.java b/src/client/hadoop/ceph/CephTalker.java
index 4bda160d19f..8b52441b60e 100644
--- a/src/client/hadoop/ceph/CephTalker.java
+++ b/src/client/hadoop/ceph/CephTalker.java
@@ -34,7 +34,7 @@ class CephTalker extends CephFS {
   public CephTalker(Configuration conf, Log log) {
     super(conf, log);
     System.load(conf.get("fs.ceph.libDir") + "/libhadoopcephfs.so");
-    System.load(conf.get("fs.ceph.libDir") + "/libceph.so");
+    System.load(conf.get("fs.ceph.libDir") + "/libcephfs.so");
     cluster = 0;
   }
 
diff --git a/src/client/hadoop/ceph/package.html b/src/client/hadoop/ceph/package.html
index 058a3ec83f6..8167b1dde92 100644
--- a/src/client/hadoop/ceph/package.html
+++ b/src/client/hadoop/ceph/package.html
@@ -50,7 +50,7 @@ documentation.
 &lt;property&gt;
   &lt;name&gt;fs.ceph.libDir&lt;/name&gt;
   &lt;value&gt;/usr/local/lib&lt;/value&gt;
-  &lt;description&gt;The folder holding libceph and libhadoopceph&lt;/description&gt;
+  &lt;description&gt;The folder holding libcephfs and libhadoopceph&lt;/description&gt;
   &lt;/property&gt;
 </pre>
   <li>There are also a number of optional Ceph configuration options.
@@ -98,4 +98,4 @@ By default, Ceph performs writes across the network rather than locally. To forc
       up an hdfs instance. Just start whatever systems you need and they will
       automatically make use of the Ceph filesystem once configured as above.</li>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/client/hypertable/CephBroker.cc b/src/client/hypertable/CephBroker.cc
index 9d610dfb3e3..96fd4830ec2 100644
--- a/src/client/hypertable/CephBroker.cc
+++ b/src/client/hypertable/CephBroker.cc
@@ -29,7 +29,7 @@
 #include "Common/Filesystem.h"
 #include "Common/System.h"
 
-#include <ceph/libceph.h>
+#include <cephfs/libcephfs.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/client/testceph.cc b/src/client/testceph.cc
index 7601b7cef6f..5e95e902727 100644
--- a/src/client/testceph.cc
+++ b/src/client/testceph.cc
@@ -13,7 +13,7 @@
  */
 
 #include "common/errno.h"
-#include "include/ceph/libceph.h"
+#include "include/cephfs/libcephfs.h"
 #include <stdlib.h>
 
 #include <errno.h>
diff --git a/src/common/config.h b/src/common/config.h
index 08a6c6b31f5..f0f6c3feb99 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -45,7 +45,7 @@ extern const char *CEPH_CONF_FILE_DEFAULT;
 /** This class represents the current Ceph configuration.
  *
  * For Ceph daemons, this is the daemon configuration.  Log levels, caching
- * settings, btrfs settings, and so forth can all be found here.  For libceph
+ * settings, btrfs settings, and so forth can all be found here.  For libcephfs
  * and librados users, this is the configuration associated with their context.
  *
  * For information about how this class is loaded from a configuration file,
diff --git a/src/include/ceph/libceph.h b/src/include/cephfs/libcephfs.h
index f8dbe7986fb..f8dbe7986fb 100644
--- a/src/include/ceph/libceph.h
+++ b/src/include/cephfs/libcephfs.h
diff --git a/src/libceph.cc b/src/libcephfs.cc
index 54f07ed6a1a..153348cfb51 100644
--- a/src/libceph.cc
+++ b/src/libcephfs.cc
@@ -13,7 +13,7 @@
  */
 
 #include "client/Client.h"
-#include "include/ceph/libceph.h"
+#include "include/cephfs/libcephfs.h"
 #include "common/Mutex.h"
 #include "common/ceph_argparse.h"
 #include "common/common_init.h"
diff --git a/src/test/daemon_config.cc b/src/test/daemon_config.cc
index 0eae90af3e0..6a09e094391 100644
--- a/src/test/daemon_config.cc
+++ b/src/test/daemon_config.cc
@@ -14,7 +14,7 @@
 
 #include "common/ceph_argparse.h"
 #include "common/config.h"
-#include "include/ceph/libceph.h"
+#include "include/cephfs/libcephfs.h"
 #include "include/rados/librados.h"
 #include "test/unit.h"
 
diff --git a/src/test/libceph_config.cc b/src/test/libceph_config.cc
index aac7dabeff6..c5e184f59c4 100644
--- a/src/test/libceph_config.cc
+++ b/src/test/libceph_config.cc
@@ -13,7 +13,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/ceph/libceph.h"
+#include "include/cephfs/libcephfs.h"
 
 #include <sstream>
 #include <string>