1 files changed, 7 insertions, 13 deletions
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 63780ae93b3..349e9ef5d78 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -16,13 +16,10 @@
 #include <Ice/Handle.h>
 #include <Ice/ObjectF.h>
 #include <Ice/ValueF.h>
-#include <Ice/StreamF.h>
 
 namespace IceInternal
 {
 
-class BasicStream;
-
 namespace Ex
 {
 
@@ -37,6 +34,9 @@ ICE_API void throwMarshalException(const char*, int, const std::string&);
 namespace Ice
 {
 
+class OutputStream;
+class InputStream;
+
 typedef IceUtil::Exception Exception;
 
 class ICE_API LocalException : public IceUtil::Exception
@@ -69,21 +69,15 @@ public:
 #endif
     virtual void ice_throw() const = 0;
 
-    virtual void __write(::IceInternal::BasicStream*) const;
-    virtual void __read(::IceInternal::BasicStream*);
-
-    virtual void __write(const OutputStreamPtr&) const;
-    virtual void __read(const InputStreamPtr&);
+    virtual void __write(::Ice::OutputStream*) const;
+    virtual void __read(::Ice::InputStream*);
 
     virtual bool __usesClasses() const;
 
 protected:
 
-    virtual void __writeImpl(::IceInternal::BasicStream*) const = 0;
-    virtual void __readImpl(::IceInternal::BasicStream*) = 0;
-
-    virtual void __writeImpl(const OutputStreamPtr&) const;
-    virtual void __readImpl(const InputStreamPtr&);
+    virtual void __writeImpl(::Ice::OutputStream*) const = 0;
+    virtual void __readImpl(::Ice::InputStream*) = 0;
 };
 
 typedef ::IceInternal::Handle<UserException> UserExceptionPtr;