diff -Naur beecrypt-4.1.2-orig/c++/Makefile.in beecrypt-4.1.2/c++/Makefile.in
--- beecrypt-4.1.2-orig/c++/Makefile.in	2004-12-21 03:38:25.000000000 -0800
+++ beecrypt-4.1.2/c++/Makefile.in	2008-02-29 22:46:19.000000000 -0800
@@ -266,7 +266,7 @@
 bstream.cxx \
 resource.cxx
 
-libbeecrypt_cxx_la_LIBADD = ../libbeecrypt.la beeyond/libcxxbeeyond.la crypto/libcxxcrypto.la io/libcxxio.la lang/libcxxlang.la util/libcxxutil.la security/libcxxsecurity.la -licuuc -licuio
+libbeecrypt_cxx_la_LIBADD = ../libbeecrypt.la beeyond/libcxxbeeyond.la crypto/libcxxcrypto.la io/libcxxio.la lang/libcxxlang.la util/libcxxutil.la security/libcxxsecurity.la -licucore
 libbeecrypt_cxx_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_CXX_LT_CURRENT):$(LIBBEECRYPT_CXX_LT_REVISION):$(LIBBEECRYPT_CXX_LT_AGE)
 cxx_HEADERS = \
 array.h \
diff -Naur beecrypt-4.1.2-orig/c++/beeyond/BeeCertificate.h beecrypt-4.1.2/c++/beeyond/BeeCertificate.h
--- beecrypt-4.1.2-orig/c++/beeyond/BeeCertificate.h	2004-11-03 01:37:27.000000000 -0800
+++ beecrypt-4.1.2/c++/beeyond/BeeCertificate.h	2008-02-29 21:58:25.000000000 -0800
@@ -137,6 +137,8 @@
 			typedef vector<Field*>::iterator fields_iterator;
 			typedef vector<Field*>::const_iterator fields_const_iterator;
 
+			BeeCertificate(InputStream& in) throw (IOException);
+
 		protected:
 			String        issuer;
 			String        subject;
@@ -150,8 +152,6 @@
 			mutable String* str;
 
 			BeeCertificate();
-			BeeCertificate(InputStream& in) throw (IOException);
-
 			bytearray* encodeTBS() const;
 
 		public:
diff -Naur beecrypt-4.1.2-orig/c++/beeyond/Makefile.in beecrypt-4.1.2/c++/beeyond/Makefile.in
--- beecrypt-4.1.2-orig/c++/beeyond/Makefile.in	2004-12-21 03:38:25.000000000 -0800
+++ beecrypt-4.1.2/c++/beeyond/Makefile.in	2008-02-29 22:47:36.000000000 -0800
@@ -140,7 +140,7 @@
 LDFLAGS = @LDFLAGS@
 LIBALT = @LIBALT@
 LIBOBJS = @LIBOBJS@
-LIBS = -licuuc -licuio
+LIBS = -licucore
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
diff -Naur beecrypt-4.1.2-orig/c++/io/Makefile.in beecrypt-4.1.2/c++/io/Makefile.in
--- beecrypt-4.1.2-orig/c++/io/Makefile.in	2004-12-21 03:38:26.000000000 -0800
+++ beecrypt-4.1.2/c++/io/Makefile.in	2008-02-29 22:48:34.000000000 -0800
@@ -255,7 +255,7 @@
 PrintStream.cxx \
 PushbackInputStream.cxx
 
-libcxxio_la_LIBADD = -licuuc
+libcxxio_la_LIBADD = -licucore
 cxxio_HEADERS = \
 ByteArrayInputStream.h \
 ByteArrayOutputStream.h \
@@ -276,7 +276,7 @@
 
 TESTS = test
 test_SOURCES = test.cxx
-test_LDADD = libcxxio.la ../lang/libcxxlang.la $(top_builddir)/libbeecrypt.la -licuuc -licuio
+test_LDADD = libcxxio.la ../lang/libcxxlang.la $(top_builddir)/libbeecrypt.la -licucore
 all: all-am
 
 .SUFFIXES:
diff -Naur beecrypt-4.1.2-orig/c++/provider/Makefile.in beecrypt-4.1.2/c++/provider/Makefile.in
--- beecrypt-4.1.2-orig/c++/provider/Makefile.in	2004-12-21 03:38:27.000000000 -0800
+++ beecrypt-4.1.2/c++/provider/Makefile.in	2008-02-29 22:49:32.000000000 -0800
@@ -160,7 +160,7 @@
 LDFLAGS = @LDFLAGS@
 LIBALT = @LIBALT@
 LIBOBJS = @LIBOBJS@
-LIBS = -licuuc -licuio
+LIBS = -licucore
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
diff -Naur beecrypt-4.1.2-orig/c++/security/Security.h beecrypt-4.1.2/c++/security/Security.h
--- beecrypt-4.1.2-orig/c++/security/Security.h	2004-11-01 23:06:58.000000000 -0800
+++ beecrypt-4.1.2/c++/security/Security.h	2008-02-29 21:58:25.000000000 -0800
@@ -76,7 +76,6 @@
 			typedef vector<const Provider*> provider_vector;
 			typedef provider_vector::iterator provider_vector_iterator;
 
-		private:
 			struct spi
 			{
 				Object* cspi;
@@ -89,6 +88,7 @@
 			static spi* getSpi(const String& name, const String& type) throw (NoSuchAlgorithmException);
 			static spi* getSpi(const String& algo, const String& type, const String& provider) throw (NoSuchAlgorithmException, NoSuchProviderException);
 			static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException);
+		private:
 			static spi* getFirstSpi(const String& type);
 
 			static const String& getKeyStoreDefault();