--- a/src/common/packet.h	Sun Mar 16 14:35:32 2008 +0000
+++ b/src/common/packet.h	Sun Mar 16 18:42:23 2008 +0100
@@ -74,7 +74,8 @@
  * The performance aspects of the Packet API are discussed in 
  * \ref packetperf
  */
-class Packet : public ObjectBase {
+class Packet 
+{
 public:
   void Ref (void) const;
   void Unref (void) const;

--- a/src/core/callback.h	Sun Mar 16 14:35:32 2008 +0000
+++ b/src/core/callback.h	Sun Mar 16 18:42:23 2008 +0100
@@ -71,7 +71,7 @@
   }
 };
 
-class CallbackImplBase : public ObjectBase 
+class CallbackImplBase
 {
 public:
   CallbackImplBase ()

--- a/src/core/ptr.cc	Sun Mar 16 14:35:32 2008 +0000
+++ b/src/core/ptr.cc	Sun Mar 16 18:42:23 2008 +0100
@@ -23,7 +23,6 @@
 #ifdef RUN_SELF_TESTS
 
 #include "test.h"
-#include "object-base.h"
 
 namespace ns3 {
 
@@ -46,7 +45,7 @@
 };
 
 
-class Base : public ObjectBase
+class Base
 {
 public:
   Base ();

--- a/src/devices/wifi/wifi-phy.cc	Sun Mar 16 14:35:32 2008 +0000
+++ b/src/devices/wifi/wifi-phy.cc	Sun Mar 16 18:42:23 2008 +0100
@@ -78,7 +78,7 @@
  *       Phy event class
  ****************************************************************/
 
-class RxEvent : public ObjectBase 
+class RxEvent
 {
 public:
   RxEvent (uint32_t size, WifiMode payloadMode, 

--- a/src/simulator/event-impl.h	Sun Mar 16 14:35:32 2008 +0000
+++ b/src/simulator/event-impl.h	Sun Mar 16 18:42:23 2008 +0100
@@ -25,7 +25,7 @@
 
 namespace ns3 {
 
-class EventImpl : public ObjectBase 
+class EventImpl
 {
 public:
   EventImpl ();

--- a/src/simulator/simulator.cc	Sun Mar 16 14:35:32 2008 +0000
+++ b/src/simulator/simulator.cc	Sun Mar 16 18:42:23 2008 +0100
@@ -595,7 +595,8 @@
 {}
   
 
-class SimulatorTests : public Test, public ObjectBase {
+class SimulatorTests : public Test
+{
 public:
   SimulatorTests ();
   // only here for testing of Ptr<>