--- a/src/mobility/random-topology.h	Thu Jan 03 11:37:23 2008 +0100
+++ b/src/mobility/random-topology.h	Thu Jan 03 11:39:45 2008 +0100
@@ -23,7 +23,6 @@
 
 #include "ns3/ptr.h"
 #include "ns3/object.h"
-#include "ns3/component-manager.h"
 
 namespace ns3 {
 
@@ -55,15 +54,15 @@
    * specified position and mobility models.
    */
   RandomTopology (Ptr<RandomPosition> positionModel,
-                  ClassId mobilityModel);
+                  InterfaceId mobilityModel);
 
   ~RandomTopology ();
 
   /**
-   * \param classId the type of mobility model attached to each
+   * \param interfaceId the type of mobility model attached to each
    *        input object if it does not have one already.
    */
-  void SetMobilityModel (ClassId classId);
+  void SetMobilityModel (InterfaceId interfaceId);
   /**
    * \param positionModel the position model used to initialize
    *        the position of each object.
@@ -91,7 +90,7 @@
   void Layout (const T &begin, const T &end);
  private:
   Ptr<RandomPosition> m_positionModel;
-  ClassId m_mobilityModel;
+  InterfaceId m_mobilityModel;
 };
 
 } // namespace ns3