diff --git a/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFS.h b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFS.h
new file mode 100644
index 00000000000..0c07fd56e37
--- /dev/null
+++ b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFS.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_hadoop_fs_ceph_CephFS */
+
+#ifndef _Included_org_apache_hadoop_fs_ceph_CephFS
+#define _Included_org_apache_hadoop_fs_ceph_CephFS
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem.h b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem.h
index bc1b6abb1df..6f2bc93926c 100644
--- a/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem.h
+++ b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem.h
@@ -11,190 +11,20 @@ extern "C" {
 #define org_apache_hadoop_fs_ceph_CephFileSystem_EEXIST 17L
 #undef org_apache_hadoop_fs_ceph_CephFileSystem_ENOENT
 #define org_apache_hadoop_fs_ceph_CephFileSystem_ENOENT 2L
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_initializeClient
- * Signature: (Ljava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1initializeClient
-  (JNIEnv *, jobject, jstring, jint);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_getcwd
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1getcwd
-  (JNIEnv *, jobject);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_setcwd
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1setcwd
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_rmdir
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1rmdir
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_unlink
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1unlink
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_rename
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1rename
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_exists
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1exists
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_getblocksize
- * Signature: (Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1getblocksize
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_isdirectory
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1isdirectory
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_isfile
- * Signature: (Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1isfile
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_getdir
- * Signature: (Ljava/lang/String;)[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1getdir
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_mkdirs
- * Signature: (Ljava/lang/String;I)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1mkdirs
-  (JNIEnv *, jobject, jstring, jint);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_open_for_append
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1open_1for_1append
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_open_for_read
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1open_1for_1read
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_open_for_overwrite
- * Signature: (Ljava/lang/String;I)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1open_1for_1overwrite
-  (JNIEnv *, jobject, jstring, jint);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_close
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1close
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_setPermission
- * Signature: (Ljava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1setPermission
-  (JNIEnv *, jobject, jstring, jint);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_kill_client
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1kill_1client
-  (JNIEnv *, jobject);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_stat
- * Signature: (Ljava/lang/String;Lorg/apache/hadoop/fs/ceph/CephFileSystem/Stat;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1stat
-  (JNIEnv *, jobject, jstring, jobject);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_statfs
- * Signature: (Ljava/lang/String;Lorg/apache/hadoop/fs/ceph/CephFileSystem/CephStat;)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1statfs
-  (JNIEnv *, jobject, jstring, jobject);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_replication
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1replication
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_hosts
- * Signature: (IJ)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1hosts
-  (JNIEnv *, jobject, jint, jlong);
-
-/*
- * Class:     org_apache_hadoop_fs_ceph_CephFileSystem
- * Method:    ceph_setTimes
- * Signature: (Ljava/lang/String;JJ)I
- */
-JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephFileSystem_ceph_1setTimes
-  (JNIEnv *, jobject, jstring, jlong, jlong);
-
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_FATAL
+#define org_apache_hadoop_fs_ceph_CephFileSystem_FATAL 0L
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_ERROR
+#define org_apache_hadoop_fs_ceph_CephFileSystem_ERROR 1L
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_WARN
+#define org_apache_hadoop_fs_ceph_CephFileSystem_WARN 2L
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_INFO
+#define org_apache_hadoop_fs_ceph_CephFileSystem_INFO 3L
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_DEBUG
+#define org_apache_hadoop_fs_ceph_CephFileSystem_DEBUG 4L
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_TRACE
+#define org_apache_hadoop_fs_ceph_CephFileSystem_TRACE 5L
+#undef org_apache_hadoop_fs_ceph_CephFileSystem_NOLOG
+#define org_apache_hadoop_fs_ceph_CephFileSystem_NOLOG 6L
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem_CephStat.h b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem_CephStat.h
new file mode 100644
index 00000000000..5ab70f7dc66
--- /dev/null
+++ b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem_CephStat.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_hadoop_fs_ceph_CephFileSystem_CephStat */
+
+#ifndef _Included_org_apache_hadoop_fs_ceph_CephFileSystem_CephStat
+#define _Included_org_apache_hadoop_fs_ceph_CephFileSystem_CephStat
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem_Stat.h b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem_Stat.h
new file mode 100644
index 00000000000..e9ade0e4504
--- /dev/null
+++ b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephFileSystem_Stat.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_hadoop_fs_ceph_CephFileSystem_Stat */
+
+#ifndef _Included_org_apache_hadoop_fs_ceph_CephFileSystem_Stat
+#define _Included_org_apache_hadoop_fs_ceph_CephFileSystem_Stat
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/client/hadoop/org_apache_hadoop_fs_ceph_CephTalker.h b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephTalker.h
new file mode 100644
index 00000000000..55854549b8c
--- /dev/null
+++ b/src/client/hadoop/org_apache_hadoop_fs_ceph_CephTalker.h
@@ -0,0 +1,197 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_apache_hadoop_fs_ceph_CephTalker */
+
+#ifndef _Included_org_apache_hadoop_fs_ceph_CephTalker
+#define _Included_org_apache_hadoop_fs_ceph_CephTalker
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_initializeClient
+ * Signature: (Ljava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1initializeClient
+  (JNIEnv *, jobject, jstring, jint);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_getcwd
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1getcwd
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_setcwd
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1setcwd
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_rmdir
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1rmdir
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_unlink
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1unlink
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_rename
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1rename
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_exists
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1exists
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_getblocksize
+ * Signature: (Ljava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1getblocksize
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_isdirectory
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1isdirectory
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_isfile
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1isfile
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_getdir
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1getdir
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_mkdirs
+ * Signature: (Ljava/lang/String;I)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1mkdirs
+  (JNIEnv *, jobject, jstring, jint);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_open_for_append
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1open_1for_1append
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_open_for_read
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1open_1for_1read
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_open_for_overwrite
+ * Signature: (Ljava/lang/String;I)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1open_1for_1overwrite
+  (JNIEnv *, jobject, jstring, jint);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_close
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1close
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_setPermission
+ * Signature: (Ljava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1setPermission
+  (JNIEnv *, jobject, jstring, jint);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_kill_client
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1kill_1client
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_stat
+ * Signature: (Ljava/lang/String;Lorg/apache/hadoop/fs/ceph/CephFileSystem/Stat;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1stat
+  (JNIEnv *, jobject, jstring, jobject);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_statfs
+ * Signature: (Ljava/lang/String;Lorg/apache/hadoop/fs/ceph/CephFileSystem/CephStat;)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1statfs
+  (JNIEnv *, jobject, jstring, jobject);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_replication
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1replication
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_hosts
+ * Signature: (IJ)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1hosts
+  (JNIEnv *, jobject, jint, jlong);
+
+/*
+ * Class:     org_apache_hadoop_fs_ceph_CephTalker
+ * Method:    ceph_setTimes
+ * Signature: (Ljava/lang/String;JJ)I
+ */
+JNIEXPORT jint JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1setTimes
+  (JNIEnv *, jobject, jstring, jlong, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif