1 files changed, 3 insertions, 10 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 3f546fd52a8..bd18dbf7b8a 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -10,6 +10,7 @@
 #ifndef ICE_BASIC_STREAM_H
 #define ICE_BASIC_STREAM_H
 
+#include <IceUtil/StringConverter.h>
 #include <Ice/InstanceF.h>
 #include <Ice/Object.h>
 #include <Ice/ProxyF.h>
@@ -27,14 +28,6 @@ namespace Ice
 
 class UserException;
 
-template<typename charT> class BasicStringConverter;
-
-typedef BasicStringConverter<char> StringConverter;
-typedef IceUtil::Handle<StringConverter> StringConverterPtr;
-
-typedef BasicStringConverter<wchar_t> WstringConverter;
-typedef IceUtil::Handle<WstringConverter> WstringConverterPtr;
-
 }
 
 namespace IceInternal
@@ -1244,8 +1237,8 @@ private:
     const Container::size_type _messageSizeMax;
     bool _unlimited;
 
-    const Ice::StringConverterPtr& _stringConverter;
-    const Ice::WstringConverterPtr& _wstringConverter;
+    const IceUtil::StringConverterPtr _stringConverter;
+    const IceUtil::WstringConverterPtr _wstringConverter;
 
     int _startSeq;
     int _minSeqSize;