diff --git a/Makefile.common b/Makefile.common
index 0e022c6..9ea3ebf 100755
--- a/Makefile.common
+++ b/Makefile.common
@@ -68,7 +68,7 @@ Linux-i386_SNAPPY_FLAGS:=
 Linux-amd64_CXX       := $(CROSS_PREFIX)g++ 
 Linux-amd64_STRIP     := $(CROSS_PREFIX)strip
 Linux-amd64_CXXFLAGS  := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64
-Linux-amd64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-amd64_LINKFLAGS := -shared -static-libgcc # -static-libstdc++
 Linux-amd64_LIBNAME   := libsnappyjava.so
 Linux-amd64_SNAPPY_FLAGS  := 
 
diff --git a/src/main/java/org/xerial/snappy/SnappyNative.h b/src/main/java/org/xerial/snappy/SnappyNative.h
index 477d30a..37452d9 100755
--- a/src/main/java/org/xerial/snappy/SnappyNative.h
+++ b/src/main/java/org/xerial/snappy/SnappyNative.h
@@ -15,22 +15,6 @@ extern "C" {
 JNIEXPORT jstring JNICALL Java_org_xerial_snappy_SnappyNative_nativeLibraryVersion
   (JNIEnv *, jobject);
 
-/*
- * Class:     org_xerial_snappy_SnappyNative
- * Method:    rawCompress
- * Signature: (JJJ)J
- */
-JNIEXPORT jlong JNICALL Java_org_xerial_snappy_SnappyNative_rawCompress__JJJ
-  (JNIEnv *, jobject, jlong, jlong, jlong);
-
-/*
- * Class:     org_xerial_snappy_SnappyNative
- * Method:    rawUncompress
- * Signature: (JJJ)J
- */
-JNIEXPORT jlong JNICALL Java_org_xerial_snappy_SnappyNative_rawUncompress__JJJ
-  (JNIEnv *, jobject, jlong, jlong, jlong);
-
 /*
  * Class:     org_xerial_snappy_SnappyNative
  * Method:    rawCompress
@@ -87,14 +71,6 @@ JNIEXPORT jint JNICALL Java_org_xerial_snappy_SnappyNative_uncompressedLength__L
 JNIEXPORT jint JNICALL Java_org_xerial_snappy_SnappyNative_uncompressedLength__Ljava_lang_Object_2II
   (JNIEnv *, jobject, jobject, jint, jint);
 
-/*
- * Class:     org_xerial_snappy_SnappyNative
- * Method:    uncompressedLength
- * Signature: (JJ)J
- */
-JNIEXPORT jlong JNICALL Java_org_xerial_snappy_SnappyNative_uncompressedLength__JJ
-  (JNIEnv *, jobject, jlong, jlong);
-
 /*
  * Class:     org_xerial_snappy_SnappyNative
  * Method:    isValidCompressedBuffer
diff --git a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
index 8a7cb95..83f5e4f 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so differ