6 files changed, 14 insertions, 15 deletions
diff --git a/src/math/gfpmath/freestore.h b/src/cert/cvc/freestore.h
index f83d1e867..cbee1b29a 100644
--- a/src/math/gfpmath/freestore.h
+++ b/src/cert/cvc/freestore.h
@@ -6,14 +6,6 @@
 #ifndef BOTAN_FREESTORE_H__
 #define BOTAN_FREESTORE_H__
 
-#if defined(BOTAN_USE_TR1_SHARED_PTR)
-  #include <tr1/memory>
-#elif defined(BOTAN_USE_BOOST_TR1_SHARED_PTR)
-  #include <boost/tr1/memory.hpp>
-#else
-  #error "Please choose a shared_ptr implementation"
-#endif
-
 namespace Botan {
 
 template<typename T>
diff --git a/src/cert/cvc/info.txt b/src/cert/cvc/info.txt
index 50483dc91..9a7565424 100644
--- a/src/cert/cvc/info.txt
+++ b/src/cert/cvc/info.txt
@@ -28,4 +28,5 @@ eac_asn_obj.h
 eac_obj.h
 signed_obj.cpp
 signed_obj.h
+freestore.h
 </add>
diff --git a/src/math/gfpmath/curve_gfp.cpp b/src/math/gfpmath/curve_gfp.cpp
index 442fe070f..8b1ccbf94 100644
--- a/src/math/gfpmath/curve_gfp.cpp
+++ b/src/math/gfpmath/curve_gfp.cpp
@@ -13,15 +13,15 @@
 
 namespace Botan {
 
-void CurveGFp::set_shrd_mod(SharedPtrConverter<GFpModulus> const mod)
+void CurveGFp::set_shrd_mod(const std::tr1::shared_ptr<GFpModulus> mod)
    {
-   mp_mod = mod.get_shared();
+   mp_mod = mod;
    mA.turn_off_sp_red_mul();// m.m. is not needed, must be trf. back
    mB.turn_off_sp_red_mul();// m.m. is not needed, must be trf. back
    //ok, above we destroy any evantually computated montg. mult. values,
    // but that won't influence performance in usual applications
-   mA.set_shrd_mod(mod.get_shared());
-   mB.set_shrd_mod(mod.get_shared());
+   mA.set_shrd_mod(mod);
+   mB.set_shrd_mod(mod);
    }
 
 CurveGFp::CurveGFp(const GFpElement& a, const GFpElement& b,
diff --git a/src/math/gfpmath/curve_gfp.h b/src/math/gfpmath/curve_gfp.h
index a0530aa01..b996aa3b1 100644
--- a/src/math/gfpmath/curve_gfp.h
+++ b/src/math/gfpmath/curve_gfp.h
@@ -55,7 +55,7 @@ class BOTAN_DLL CurveGFp
       * @param mod a shared pointer to a GFpModulus object suitable for
       * *this.
       */
-      void set_shrd_mod(SharedPtrConverter<GFpModulus> const mod);
+      void set_shrd_mod(const std::tr1::shared_ptr<GFpModulus> mod);
 
       // getters
 
diff --git a/src/math/gfpmath/gfp_element.h b/src/math/gfpmath/gfp_element.h
index 39e728cfa..b168d424a 100644
--- a/src/math/gfpmath/gfp_element.h
+++ b/src/math/gfpmath/gfp_element.h
@@ -14,9 +14,16 @@
 
 #include <botan/bigint.h>
 #include <botan/gfp_modulus.h>
-#include <botan/freestore.h>
 #include <iostream>
 
+#if defined(BOTAN_USE_TR1_SHARED_PTR)
+  #include <tr1/memory>
+#elif defined(BOTAN_USE_BOOST_TR1_SHARED_PTR)
+  #include <boost/tr1/memory.hpp>
+#else
+  #error "Please choose a shared_ptr implementation"
+#endif
+
 namespace Botan {
 
 struct Illegal_Transformation : public Exception
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index bae2fee60..ab4e440df 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -17,5 +17,4 @@ gfp_element.h
 gfp_modulus.h
 point_gfp.cpp
 point_gfp.h
-freestore.h
 </add>