diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2bbb22..2329374 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,6 @@ set( fc_sources
      src/crypto/sha512.cpp
      src/crypto/dh.cpp
      src/crypto/blowfish.cpp
-     src/crypto/elliptic_common.cpp
      src/crypto/elliptic_${ECC_IMPL}.cpp
      src/crypto/rand.cpp
      src/crypto/salsa20.cpp
diff --git a/src/crypto/elliptic_common.cpp b/src/crypto/_elliptic_common.cpp
similarity index 100%
rename from src/crypto/elliptic_common.cpp
rename to src/crypto/_elliptic_common.cpp
diff --git a/src/crypto/elliptic_openssl.cpp b/src/crypto/elliptic_openssl.cpp
index 244372d..eef3d9e 100644
--- a/src/crypto/elliptic_openssl.cpp
+++ b/src/crypto/elliptic_openssl.cpp
@@ -562,3 +562,5 @@ namespace fc { namespace ecc {
    }
 }
 }
+
+#include "_elliptic_common.cpp"
diff --git a/src/crypto/elliptic_secp256k1.cpp b/src/crypto/elliptic_secp256k1.cpp
index 1a5d8c5..73ecf24 100644
--- a/src/crypto/elliptic_secp256k1.cpp
+++ b/src/crypto/elliptic_secp256k1.cpp
@@ -22,8 +22,6 @@ namespace fc { namespace ecc {
           }
       }
 
-      static public_key_data empty_key;
-
       class public_key_impl
       {
         public:
@@ -457,3 +455,5 @@ namespace fc { namespace ecc {
    }
 }
 }
+
+#include "_elliptic_common.cpp"