1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index af747a1007f..b3c47c225f1 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -10,20 +10,19 @@
 #ifndef ICE_LOCAL_OBJECT_H
 #define ICE_LOCAL_OBJECT_H
 
+#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC)
+//
+// Part of the C++98 mapping, and "internal" definitions when building Ice
+// with the C++11 mapping
+//
+
 #include <IceUtil/Shared.h>
 #include <Ice/LocalObjectF.h>
 
-namespace IceInternal
-{
-
-class BasicStream;
-
-}
-
 namespace Ice
 {
 
-class ICE_API LocalObject : virtual public ::IceUtil::Shared
+class ICE_API LocalObject : public virtual ::IceUtil::Shared
 {
 public:
 
@@ -34,3 +33,4 @@ public:
 }
 
 #endif
+#endif