--- a/src/core/model/calendar-scheduler.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/calendar-scheduler.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -23,8 +23,8 @@
 #include <utility>
 #include <string>
 #include <list>
-#include "ns3/assert.h"
-#include "ns3/log.h"
+#include "assert.h"
+#include "log.h"
 
 namespace ns3 {
 

--- a/src/core/model/command-line.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/command-line.h	Tue Aug 02 01:59:36 2011 -0700
@@ -24,7 +24,7 @@
 #include <sstream>
 #include <list>
 
-#include "ns3/callback.h"
+#include "callback.h"
 
 namespace ns3 {
 

--- a/src/core/model/default-simulator-impl.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/default-simulator-impl.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -23,10 +23,10 @@
 #include "scheduler.h"
 #include "event-impl.h"
 
-#include "ns3/ptr.h"
-#include "ns3/pointer.h"
-#include "ns3/assert.h"
-#include "ns3/log.h"
+#include "ptr.h"
+#include "pointer.h"
+#include "assert.h"
+#include "log.h"
 
 #include <math.h>
 

--- a/src/core/model/default-simulator-impl.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/default-simulator-impl.h	Tue Aug 02 01:59:36 2011 -0700
@@ -25,7 +25,7 @@
 #include "scheduler.h"
 #include "event-impl.h"
 
-#include "ns3/ptr.h"
+#include "ptr.h"
 
 #include <list>
 

--- a/src/core/model/event-id.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/event-id.h	Tue Aug 02 01:59:36 2011 -0700
@@ -21,7 +21,7 @@
 #define EVENT_ID_H
 
 #include <stdint.h>
-#include "ns3/ptr.h"
+#include "ptr.h"
 #include "event-impl.h"
 
 namespace ns3 {

--- a/src/core/model/event-impl.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/event-impl.h	Tue Aug 02 01:59:36 2011 -0700
@@ -21,7 +21,7 @@
 #define EVENT_IMPL_H
 
 #include <stdint.h>
-#include "ns3/simple-ref-count.h"
+#include "simple-ref-count.h"
 
 namespace ns3 {
 

--- a/src/core/model/heap-scheduler.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/heap-scheduler.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -22,8 +22,8 @@
 
 #include "heap-scheduler.h"
 #include "event-impl.h"
-#include "ns3/assert.h"
-#include "ns3/log.h"
+#include "assert.h"
+#include "log.h"
 
 NS_LOG_COMPONENT_DEFINE ("HeapScheduler");
 

--- a/src/core/model/int64x64-128.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/int64x64-128.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -1,6 +1,6 @@
 #include "int64x64-128.h"
-#include "ns3/abort.h"
-#include "ns3/assert.h"
+#include "abort.h"
+#include "assert.h"
 
 namespace ns3 {
 

--- a/src/core/model/int64x64-cairo.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/int64x64-cairo.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -18,9 +18,9 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "int64x64-cairo.h"
-#include "ns3/test.h"
-#include "ns3/abort.h"
-#include "ns3/assert.h"
+#include "test.h"
+#include "abort.h"
+#include "assert.h"
 #include <math.h>
 #include <iostream>
 

--- a/src/core/model/int64x64.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/int64x64.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <iostream>
 #include <sstream>
-#include "ns3/assert.h"
+#include "assert.h"
 
 namespace ns3 {
 

--- a/src/core/model/list-scheduler.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/list-scheduler.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -22,7 +22,7 @@
 #include "event-impl.h"
 #include <utility>
 #include <string>
-#include "ns3/assert.h"
+#include "assert.h"
 
 namespace ns3 {
 

--- a/src/core/model/make-event.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/make-event.h	Tue Aug 02 01:59:36 2011 -0700
@@ -57,7 +57,7 @@
  ********************************************************************/
 
 #include "event-impl.h"
-#include "ns3/type-traits.h"
+#include "type-traits.h"
 
 namespace ns3 {
 

--- a/src/core/model/map-scheduler.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/map-scheduler.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -21,8 +21,8 @@
 
 #include "map-scheduler.h"
 #include "event-impl.h"
-#include "ns3/assert.h"
-#include "ns3/log.h"
+#include "assert.h"
+#include "log.h"
 #include <string>
 
 NS_LOG_COMPONENT_DEFINE ("MapScheduler");

--- a/src/core/model/names.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/names.h	Tue Aug 02 01:59:36 2011 -0700
@@ -19,8 +19,8 @@
 #ifndef OBJECT_NAMES_H
 #define OBJECT_NAMES_H
 
-#include "ns3/ptr.h"
-#include "ns3/object.h"
+#include "ptr.h"
+#include "object.h"
 
 namespace ns3 {
 

--- a/src/core/model/ns2-calendar-scheduler.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/ns2-calendar-scheduler.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -20,8 +20,8 @@
 
 #include "ns2-calendar-scheduler.h"
 #include "event-impl.h"
-#include "ns3/assert.h"
-#include "ns3/log.h"
+#include "assert.h"
+#include "log.h"
 #include <cassert>
 #include <math.h>
 #include <string.h>

--- a/src/core/model/nstime.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/nstime.h	Tue Aug 02 01:59:36 2011 -0700
@@ -20,10 +20,10 @@
 #ifndef TIME_H
 #define TIME_H
 
-#include "ns3/assert.h"
-#include "ns3/attribute.h"
-#include "ns3/attribute-helper.h"
-#include "ns3/int64x64.h"
+#include "assert.h"
+#include "attribute.h"
+#include "attribute-helper.h"
+#include "int64x64.h"
 #include <stdint.h>
 #include <math.h>
 #include <ostream>

--- a/src/core/model/realtime-simulator-impl.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/realtime-simulator-impl.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -23,14 +23,14 @@
 #include "event-impl.h"
 #include "synchronizer.h"
 
-#include "ns3/ptr.h"
-#include "ns3/pointer.h"
-#include "ns3/assert.h"
-#include "ns3/fatal-error.h"
-#include "ns3/log.h"
-#include "ns3/system-mutex.h"
-#include "ns3/boolean.h"
-#include "ns3/enum.h"
+#include "ptr.h"
+#include "pointer.h"
+#include "assert.h"
+#include "fatal-error.h"
+#include "log.h"
+#include "system-mutex.h"
+#include "boolean.h"
+#include "enum.h"
 
 
 #include <math.h>

--- a/src/core/model/realtime-simulator-impl.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/realtime-simulator-impl.h	Tue Aug 02 01:59:36 2011 -0700
@@ -25,10 +25,10 @@
 #include "synchronizer.h"
 #include "event-impl.h"
 
-#include "ns3/ptr.h"
-#include "ns3/assert.h"
-#include "ns3/log.h"
-#include "ns3/system-mutex.h"
+#include "ptr.h"
+#include "assert.h"
+#include "log.h"
+#include "system-mutex.h"
 
 #include <list>
 

--- a/src/core/model/scheduler.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/scheduler.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -19,7 +19,7 @@
  */
 
 #include "scheduler.h"
-#include "ns3/assert.h"
+#include "assert.h"
 
 namespace ns3 {
 

--- a/src/core/model/scheduler.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/scheduler.h	Tue Aug 02 01:59:36 2011 -0700
@@ -22,7 +22,7 @@
 #define SCHEDULER_H
 
 #include <stdint.h>
-#include "ns3/object.h"
+#include "object.h"
 
 namespace ns3 {
 

--- a/src/core/model/simulator-impl.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/simulator-impl.h	Tue Aug 02 01:59:36 2011 -0700
@@ -24,9 +24,9 @@
 #include "event-impl.h"
 #include "event-id.h"
 #include "nstime.h"
-#include "ns3/object.h"
-#include "ns3/object-factory.h"
-#include "ns3/ptr.h"
+#include "object.h"
+#include "object-factory.h"
+#include "ptr.h"
 
 namespace ns3 {
 

--- a/src/core/model/simulator.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/simulator.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -24,12 +24,12 @@
 #include "map-scheduler.h"
 #include "event-impl.h"
 
-#include "ns3/ptr.h"
-#include "ns3/string.h"
-#include "ns3/object-factory.h"
-#include "ns3/global-value.h"
-#include "ns3/assert.h"
-#include "ns3/log.h"
+#include "ptr.h"
+#include "string.h"
+#include "object-factory.h"
+#include "global-value.h"
+#include "assert.h"
+#include "log.h"
 
 #include <math.h>
 #include <fstream>

--- a/src/core/model/simulator.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/simulator.h	Tue Aug 02 01:59:36 2011 -0700
@@ -26,8 +26,8 @@
 #include "make-event.h"
 #include "nstime.h"
 
-#include "ns3/deprecated.h"
-#include "ns3/object-factory.h"
+#include "deprecated.h"
+#include "object-factory.h"
 
 #include <stdint.h>
 #include <string>

--- a/src/core/model/synchronizer.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/synchronizer.h	Tue Aug 02 01:59:36 2011 -0700
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include "nstime.h"
-#include "ns3/object.h"
+#include "object.h"
 
 namespace ns3 {
 

--- a/src/core/model/time.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/time.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -20,12 +20,12 @@
  * TimeStep support by Emmanuelle Laprise <emmanuelle.laprise@bluekazoo.ca>
  */
 #include "nstime.h"
-#include "ns3/abort.h"
-#include "ns3/global-value.h"
-#include "ns3/enum.h"
-#include "ns3/string.h"
-#include "ns3/object.h"
-#include "ns3/config.h"
+#include "abort.h"
+#include "global-value.h"
+#include "enum.h"
+#include "string.h"
+#include "object.h"
+#include "config.h"
 #include <math.h>
 #include <sstream>
 

--- a/src/core/model/timer-impl.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/timer-impl.h	Tue Aug 02 01:59:36 2011 -0700
@@ -21,9 +21,9 @@
 #define TIMER_IMPL_H
 
 #include "simulator.h"
-#include "ns3/type-traits.h"
-#include "ns3/fatal-error.h"
-#include "ns3/int-to-type.h"
+#include "type-traits.h"
+#include "fatal-error.h"
+#include "int-to-type.h"
 
 namespace ns3 {
 

--- a/src/core/model/timer.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/timer.h	Tue Aug 02 01:59:36 2011 -0700
@@ -20,10 +20,10 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-#include "ns3/fatal-error.h"
+#include "fatal-error.h"
 #include "nstime.h"
 #include "event-id.h"
-#include "ns3/int-to-type.h"
+#include "int-to-type.h"
 
 namespace ns3 {
 

--- a/src/core/model/unix-fd-reader.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/unix-fd-reader.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -24,11 +24,11 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "ns3/log.h"
-#include "ns3/fatal-error.h"
-#include "ns3/simple-ref-count.h"
-#include "ns3/system-thread.h"
-#include "ns3/simulator.h"
+#include "log.h"
+#include "fatal-error.h"
+#include "simple-ref-count.h"
+#include "system-thread.h"
+#include "simulator.h"
 
 #include "unix-fd-reader.h"
 

--- a/src/core/model/unix-fd-reader.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/unix-fd-reader.h	Tue Aug 02 01:59:36 2011 -0700
@@ -23,9 +23,9 @@
 
 #include <stdint.h>
 
-#include "ns3/callback.h"
-#include "ns3/system-thread.h"
-#include "ns3/event-id.h"
+#include "callback.h"
+#include "system-thread.h"
+#include "event-id.h"
 
 namespace ns3 {
 

--- a/src/core/model/vector.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/vector.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -18,7 +18,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "vector.h"
-#include "ns3/fatal-error.h"
+#include "fatal-error.h"
 #include <cmath>
 #include <sstream>
 

--- a/src/core/model/vector.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/vector.h	Tue Aug 02 01:59:36 2011 -0700
@@ -20,8 +20,8 @@
 #ifndef NS3_VECTOR_H
 #define NS3_VECTOR_H
 
-#include "ns3/attribute.h"
-#include "ns3/attribute-helper.h"
+#include "attribute.h"
+#include "attribute-helper.h"
 
 namespace ns3 {
 

--- a/src/core/model/wall-clock-synchronizer.cc	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/wall-clock-synchronizer.cc	Tue Aug 02 01:59:36 2011 -0700
@@ -19,8 +19,8 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include "ns3/log.h"
-#include "ns3/system-condition.h"
+#include "log.h"
+#include "system-condition.h"
 
 #include "wall-clock-synchronizer.h"
 

--- a/src/core/model/wall-clock-synchronizer.h	Thu Jul 28 17:41:49 2011 -0700
+++ b/src/core/model/wall-clock-synchronizer.h	Tue Aug 02 01:59:36 2011 -0700
@@ -19,7 +19,7 @@
 #ifndef WALL_CLOCK_CLOCK_SYNCHRONIZER_H
 #define WALL_CLOCK_CLOCK_SYNCHRONIZER_H
 
-#include "ns3/system-condition.h"
+#include "system-condition.h"
 #include "synchronizer.h"
 
 namespace ns3 {