3 files changed, 6 insertions, 17 deletions
diff --git a/cpp/src/Ice/PicklerI.cpp b/cpp/src/Ice/PicklerI.cpp
index fc2317e60c0..10fc6221063 100644
--- a/cpp/src/Ice/PicklerI.cpp
+++ b/cpp/src/Ice/PicklerI.cpp
@@ -35,8 +35,8 @@ ObjectPtr
 Ice::PicklerI::unpickle(std::istream& in)
 {
     Stream s(_instance);
-    s.b.resize(encapsHeaderSize);
-    in.read(s.b.begin(), encapsHeaderSize);
+    s.b.resize(4); // Encapsulation length == Ice::Int
+    in.read(s.b.begin(), 4);
     if (in.eof())
     {
 	throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
@@ -47,15 +47,13 @@ Ice::PicklerI::unpickle(std::istream& in)
     }
 
     s.i = s.b.begin();	    
-    Byte encVer;
-    s.read(encVer);
     Int sz;
     s.read(sz);
 
     // Don't use s.b.resize() here, otherwise no size sanity checks
     // will be done
-    s.resize(encapsHeaderSize + sz);
-    in.read(s.b.begin() + encapsHeaderSize, sz);
+    s.resize(4 + sz);
+    in.read(s.b.begin() + 4, sz);
     if (in.eof())
     {
 	throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
diff --git a/cpp/src/Ice/Protocol.h b/cpp/src/Ice/Protocol.h
index a0f5216a207..516d0f5aaa8 100644
--- a/cpp/src/Ice/Protocol.h
+++ b/cpp/src/Ice/Protocol.h
@@ -27,15 +27,6 @@ namespace IceInternal
 const ::Ice::Int headerSize = 7;
 
 //
-// Size of the Ice encapsulation header
-//
-// Encoding version (Byte)
-// Encapsulation length (Int)
-//
-const ::Ice::Int encapsHeaderSize = 5;
-
-
-//
 // The current Ice protocol and encoding version
 //
 const ::Ice::Byte protocolVersion = 0;
diff --git a/cpp/src/IcePack/Activator.h b/cpp/src/IcePack/Activator.h
index d433783fc2f..4d578bbca8c 100644
--- a/cpp/src/IcePack/Activator.h
+++ b/cpp/src/IcePack/Activator.h
@@ -11,11 +11,11 @@
 #ifndef ICE_PACK_ACTIVATOR_H
 #define ICE_PACK_ACTIVATOR_H
 
-#include <IcePack/AdminF.h>
-
 namespace IcePack
 {
 
+struct ServerDescription;
+
 class Activator : public JTCThread, public JTCMutex
 {
 public: