--- a/src/config-store/model/attribute-default-iterator.cc	Thu Aug 11 08:43:45 2011 -0400
+++ b/src/config-store/model/attribute-default-iterator.cc	Thu Aug 11 08:45:29 2011 -0400
@@ -19,10 +19,10 @@
  
 #include "attribute-default-iterator.h"
 #include "ns3/attribute.h"
-#include "ns3/object-vector.h"
 #include "ns3/pointer.h"
 #include "ns3/global-value.h"
 #include "ns3/string.h"
+#include "ns3/object-ptr-container.h"
 
 namespace ns3
 {
@@ -70,7 +70,7 @@
               //No value, check next attribute
               continue;
             }
-          Ptr<const ObjectVectorValue> vector = DynamicCast<const ObjectVectorValue> (info.initialValue);
+          Ptr<const ObjectPtrContainerValue> vector = DynamicCast<const ObjectPtrContainerValue> (info.initialValue);
           if (vector != 0)
             {
               //a vector value, won't take it

--- a/src/config-store/model/model-node-creator.h	Thu Aug 11 08:43:45 2011 -0400
+++ b/src/config-store/model/model-node-creator.h	Thu Aug 11 08:45:29 2011 -0400
@@ -18,7 +18,6 @@
  */
 
 #include "attribute-iterator.h"
-#include "ns3/object-vector.h"
 #include <gtk/gtk.h>
 
 namespace ns3