7 files changed, 20 insertions, 45 deletions
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index d73d62bacd8..4d48e97a0ba 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -17,7 +17,6 @@
 #include <Ice/Properties.h>
 #include <Ice/Logger.h>
 #include <Ice/ServantFactory.h>
-#include <Ice/Pickler.h>
 #include <Ice/Initialize.h>
 
 #endif
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 455d67255f2..c05a7997061 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -13,7 +13,7 @@
 
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/InstanceF.h>
-#include <Ice/Stream.h>
+#include <Ice/IntStream.h>
 
 namespace IceInternal
 {
@@ -25,17 +25,17 @@ public:
     Incoming(const InstancePtr&, const ::Ice::ObjectAdapterPtr&);
     ~Incoming();
 
-    void invoke(Stream&);
+    void invoke(IntStream&);
 
-    Stream* is();
-    Stream* os();
+    IntStream* is();
+    IntStream* os();
 
 private:
 
     ::Ice::ObjectAdapterPtr _adapter;
 
-    Stream _is;
-    Stream _os;
+    IntStream _is;
+    IntStream _os;
 };
 
 }
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/IntStream.h
index 851cfe9f9a3..82e7cdcb46a 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/IntStream.h
@@ -19,16 +19,16 @@
 namespace IceInternal
 {
 
-class ICE_API Stream : public Buffer
+class ICE_API IntStream : public Buffer
 {
 public:
 
-    Stream(const InstancePtr&);
-    ~Stream();
+    IntStream(const InstancePtr&);
+    ~IntStream();
 
     InstancePtr instance() const;
 
-    void swap(Stream&);
+    void swap(IntStream&);
 
     void resize(int);
     void reserve(int);
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 81b0c73ca1b..1e3debe46f3 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -18,7 +18,7 @@
 namespace IceInternal
 {
 
-class Stream;
+class IntStream;
 
 }
 
diff --git a/cpp/include/Ice/Native.h b/cpp/include/Ice/Native.h
deleted file mode 100644
index d878baf40be..00000000000
--- a/cpp/include/Ice/Native.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef ICE_NATIVE_H
-#define ICE_NATIVE_H
-
-#include <Ice/Config.h>
-
-namespace IceNative
-{
-
-typedef std::istream& InputStream;
-typedef std::ostream& OutputStream;
-
-}
-
-#endif
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 4b702e837ed..9c2d4e1fd32 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -19,7 +19,7 @@ namespace IceInternal
 {
 
 class Incoming;
-class Stream;
+class IntStream;
 
 enum DispatchStatus
 {
@@ -85,8 +85,8 @@ public:
     virtual ::IceInternal::DispatchStatus __dispatch(::IceInternal::Incoming&, const std::string&);
     virtual bool __isMutating(const std::string&);
 
-    virtual void __write(::IceInternal::Stream*) = 0;
-    virtual void __read(::IceInternal::Stream*) = 0;
+    virtual void __write(::IceInternal::IntStream*) = 0;
+    virtual void __read(::IceInternal::IntStream*) = 0;
 };
 
 }
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 03c5c719ef4..e5759c239d4 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -13,7 +13,7 @@
 
 #include <Ice/EmitterF.h>
 #include <Ice/ReferenceF.h>
-#include <Ice/Stream.h>
+#include <Ice/IntStream.h>
 
 namespace IceUtil
 {
@@ -60,11 +60,11 @@ public:
     ~Outgoing();
 
     bool invoke();
-    void finished(Stream&);
+    void finished(IntStream&);
     void finished(const ::Ice::LocalException&);
 
-    Stream* is();
-    Stream* os();
+    IntStream* is();
+    IntStream* os();
 
 private:
 
@@ -82,8 +82,8 @@ private:
 	StateLocalException,
     } _state;
 
-    Stream _is;
-    Stream _os;
+    IntStream _is;
+    IntStream _os;
 };
 
 }