--- a/src/common/propagation-loss-model-test-suite.cc	Mon Nov 08 13:54:12 2010 -0800
+++ a/src/common/propagation-loss-model-test-suite.cc	Tue Nov 09 20:07:21 2010 -0800
@@ -374,11 +374,11 @@ 
 bool
 MatrixPropagationLossModelTestCase::DoRun (void)
 {
-  Ptr<Node> n[3];
+  Ptr<Object> n[3];
   Ptr<MobilityModel> m[3];
   for (int i = 0; i < 3; ++i)
     {
-      n[i] = CreateObject<Node> ();
+      n[i] = CreateObject<Object> ();
       m[i] = CreateObject<ConstantPositionMobilityModel> ();
       n[i]->AggregateObject (m[i]);
     }
--- a/src/common/propagation-loss-model.cc	Mon Nov 08 13:54:12 2010 -0800
+++ a/src/common/propagation-loss-model.cc	Tue Nov 09 20:07:21 2010 -0800
@@ -747,7 +747,7 @@ 
 }
 
 void
-MatrixPropagationLossModel::SetLoss (Ptr<Node> a, Ptr<Node> b, double loss, bool symmetric)
+MatrixPropagationLossModel::SetLoss (Ptr<Object> a, Ptr<Object> b, double loss, bool symmetric)
 {
   Ptr<MobilityModel> ma = a->GetObject<MobilityModel> ();
   Ptr<MobilityModel> mb = b->GetObject<MobilityModel> ();
--- a/src/common/propagation-loss-model.h	Mon Nov 08 13:54:12 2010 -0800
+++ a/src/common/propagation-loss-model.h	Tue Nov 09 20:07:21 2010 -0800
@@ -27,7 +27,6 @@ 
 
 #include "ns3/object.h"
 #include "ns3/random-variable.h"
-#include "ns3/node.h"
 #include <map>
 
 namespace ns3 {
@@ -495,14 +494,14 @@ 
   virtual ~MatrixPropagationLossModel ();
   
   /**
-   * \brief Set loss (in dB, positive) between pair of nodes.
+   * \brief Set loss (in dB, positive) between pair of ns-3 objects (typically, nodes)
    * 
-   * \param a           Source node
-   * \param b           Destination node
+   * \param a           Source object
+   * \param b           Destination object
    * \param loss        a -> b path loss, positive in dB
    * \param symmetric   If true (default), both a->b and b->a paths will be affected
    */ 
-  void SetLoss (Ptr<Node> a, Ptr<Node> b, double loss, bool symmetric = true);
+  void SetLoss (Ptr<Object> a, Ptr<Object> b, double loss, bool symmetric = true);
   /// Set default loss (in dB, positive) to be used, infinity if not set
   void SetDefaultLoss (double);