diff --git a/samples/main-callback.cc b/samples/main-callback.cc
index 5bfdc7eba..b1131d6f9 100644
--- a/samples/main-callback.cc
+++ b/samples/main-callback.cc
@@ -1,5 +1,5 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <cassert>
 #include <iostream>
 
diff --git a/samples/main-event.cc b/samples/main-event.cc
index a29067544..3b26167d1 100644
--- a/samples/main-event.cc
+++ b/samples/main-event.cc
@@ -1,6 +1,6 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/event.h"
-#include "yans/event.tcc"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
 #include <iostream>
 
 using namespace yans;
diff --git a/samples/main-packet.cc b/samples/main-packet.cc
index 8408d9751..d279e9c8a 100644
--- a/samples/main-packet.cc
+++ b/samples/main-packet.cc
@@ -1,6 +1,6 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/packet.h"
-#include "yans/chunk.h"
+#include "ns3/packet.h"
+#include "ns3/chunk.h"
 #include <iostream>
 
 using namespace yans;
diff --git a/samples/main-simulator.cc b/samples/main-simulator.cc
index 99779822f..a529307cd 100644
--- a/samples/main-simulator.cc
+++ b/samples/main-simulator.cc
@@ -1,7 +1,7 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/event.h"
-#include "yans/event.tcc"
-#include "yans/simulator.h"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
+#include "ns3/simulator.h"
 #include <iostream>
 
 using namespace yans;
diff --git a/samples/main-trace.cc b/samples/main-trace.cc
index 7e2a17103..0a5d73e58 100644
--- a/samples/main-trace.cc
+++ b/samples/main-trace.cc
@@ -1,9 +1,9 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
-#include "yans/trace-container.h"
-#include "yans/ui-traced-variable.tcc"
-#include "yans/packet-logger.h"
-#include "yans/trace-stream.h"
-#include "yans/pcap-writer.h"
+#include "ns3/trace-container.h"
+#include "ns3/ui-traced-variable.tcc"
+#include "ns3/packet-logger.h"
+#include "ns3/trace-stream.h"
+#include "ns3/pcap-writer.h"
 #include <iostream>
 
 using namespace yans;
diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index b787fa5f1..5be1b81be 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -377,7 +377,7 @@ Buffer::peek_data (void) const
 
 #ifdef RUN_SELF_TESTS
 
-#include "yans/test.h"
+#include "ns3/test.h"
 #include <iomanip>
 
 namespace yans {
diff --git a/src/common/callback-logger.h b/src/common/callback-logger.h
index 18f968aab..9c8b6090c 100644
--- a/src/common/callback-logger.h
+++ b/src/common/callback-logger.h
@@ -22,7 +22,7 @@
 #ifndef CALLBACK_LOGGER_H
 #define CALLBACK_LOGGER_H
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 
 namespace yans {
 
diff --git a/src/common/f-traced-variable.tcc b/src/common/f-traced-variable.tcc
index 0bc202432..033fc564a 100644
--- a/src/common/f-traced-variable.tcc
+++ b/src/common/f-traced-variable.tcc
@@ -22,7 +22,7 @@
 #ifndef F_TRACED_VARIABLE_TCC
 #define F_TRACED_VARIABLE_TCC
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 
 namespace yans {
diff --git a/src/common/ipv4-network-interface.h b/src/common/ipv4-network-interface.h
index 1b7b98564..72a461636 100644
--- a/src/common/ipv4-network-interface.h
+++ b/src/common/ipv4-network-interface.h
@@ -22,7 +22,7 @@
 #define IPV4_NETWORK_INTERFACE
 
 #include "ipv4-address.h"
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "packet.h"
 
 namespace yans {
diff --git a/src/common/llc-snap-encapsulation.h b/src/common/llc-snap-encapsulation.h
index 1bfee9d28..c03b38f8f 100644
--- a/src/common/llc-snap-encapsulation.h
+++ b/src/common/llc-snap-encapsulation.h
@@ -22,7 +22,7 @@
 #define LLC_SNAP_ENCAPSULATION
 
 #include <stdint.h>
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "mac-address.h"
 #include "packet.h"
 
diff --git a/src/common/mac-network-interface.h b/src/common/mac-network-interface.h
index 4218e955f..8ec3f6297 100644
--- a/src/common/mac-network-interface.h
+++ b/src/common/mac-network-interface.h
@@ -22,7 +22,7 @@
 #define MAC_NETWORK_INTERFACE_H
 
 #include <stdint.h>
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "mac-address.h"
 #include "packet.h"
 
diff --git a/src/common/packet-logger.h b/src/common/packet-logger.h
index d414acf1e..70827b734 100644
--- a/src/common/packet-logger.h
+++ b/src/common/packet-logger.h
@@ -22,7 +22,7 @@
 #ifndef PACKET_LOGGER_H
 #define PACKET_LOGGER_H
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "packet.h"
 
 namespace yans {
diff --git a/src/common/packet.h b/src/common/packet.h
index 04f4288c3..0dc720d6a 100644
--- a/src/common/packet.h
+++ b/src/common/packet.h
@@ -25,7 +25,7 @@
 #include "buffer.h"
 #include "chunk.h"
 #include "tags.h"
-#include "yans/callback.h"
+#include "ns3/callback.h"
 
 namespace yans {
 
diff --git a/src/common/pcap-writer.cc b/src/common/pcap-writer.cc
index e9c980ef5..cb308c974 100644
--- a/src/common/pcap-writer.cc
+++ b/src/common/pcap-writer.cc
@@ -24,8 +24,8 @@
  * http://wiki.ethereal.com/Development/LibpcapFileFormat
  */
 
-#include "yans/simulator.h"
-#include "yans/system-file.h"
+#include "ns3/simulator.h"
+#include "ns3/system-file.h"
 #include "pcap-writer.h"
 #include "packet.h"
 
diff --git a/src/common/pcap-writer.h b/src/common/pcap-writer.h
index 1eca0da0c..9332bde05 100644
--- a/src/common/pcap-writer.h
+++ b/src/common/pcap-writer.h
@@ -22,7 +22,7 @@
 #ifndef PCAP_WRITER_H
 #define PCAP_WRITER_H
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 #include "packet.h"
 
diff --git a/src/common/si-traced-variable.tcc b/src/common/si-traced-variable.tcc
index ba7f4aea8..642713441 100644
--- a/src/common/si-traced-variable.tcc
+++ b/src/common/si-traced-variable.tcc
@@ -22,7 +22,7 @@
 #ifndef SI_TRACED_VARIABLE_TCC
 #define SI_TRACED_VARIABLE_TCC
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 
 namespace yans {
@@ -69,7 +69,7 @@ class UiTracedVariable;
  * yans::UiTracedVariable<int32_t> :
  \code
  #include <stdint.h>
- #include "yans/si-traced-variable.tcc"
+ #include "ns3/si-traced-variable.tcc"
 
  yans::SiTracedVariable<uint16_t> var;
  \endcode
diff --git a/src/common/static-speed-position.cc b/src/common/static-speed-position.cc
index 0953d8b43..d2fc01776 100644
--- a/src/common/static-speed-position.cc
+++ b/src/common/static-speed-position.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "static-speed-position.h"
-#include "yans/simulator.h"
+#include "ns3/simulator.h"
 
 namespace yans {
 
diff --git a/src/common/tags.cc b/src/common/tags.cc
index 297968599..4a02b0952 100644
--- a/src/common/tags.cc
+++ b/src/common/tags.cc
@@ -178,7 +178,7 @@ Tags::pretty_print (std::ostream &os)
 
 #ifdef RUN_SELF_TESTS
 
-#include "yans/test.h"
+#include "ns3/test.h"
 #include <iomanip>
 #include <iostream>
 
diff --git a/src/common/trace-container.h b/src/common/trace-container.h
index 0af737ac4..e062e3db9 100644
--- a/src/common/trace-container.h
+++ b/src/common/trace-container.h
@@ -26,7 +26,7 @@
 #include "si-traced-variable.tcc"
 #include "f-traced-variable.tcc"
 #include "callback-logger.h"
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include "packet.h"
 #include <list>
 #include <string>
diff --git a/src/common/trace-stream-test.cc b/src/common/trace-stream-test.cc
index 4196e7555..e152b0658 100644
--- a/src/common/trace-stream-test.cc
+++ b/src/common/trace-stream-test.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "trace-stream.h"
-#include "yans/test.h"
+#include "ns3/test.h"
 #include <iostream>
 
 #ifdef RUN_SELF_TESTS
diff --git a/src/common/traced-variable-test.cc b/src/common/traced-variable-test.cc
index a195a62ee..97adee57e 100644
--- a/src/common/traced-variable-test.cc
+++ b/src/common/traced-variable-test.cc
@@ -21,8 +21,8 @@
 
 #include "ui-traced-variable.tcc"
 #include "si-traced-variable.tcc"
-#include "yans/test.h"
-#include "yans/callback.h"
+#include "ns3/test.h"
+#include "ns3/callback.h"
 
 
 namespace yans {
diff --git a/src/common/ui-traced-variable.tcc b/src/common/ui-traced-variable.tcc
index 4ab31b62f..c330902b8 100644
--- a/src/common/ui-traced-variable.tcc
+++ b/src/common/ui-traced-variable.tcc
@@ -22,7 +22,7 @@
 #ifndef UI_TRACED_VARIABLE_TCC
 #define UI_TRACED_VARIABLE_TCC
 
-#include "yans/callback.h"
+#include "ns3/callback.h"
 #include <stdint.h>
 
 namespace yans {
@@ -72,7 +72,7 @@ class SiTracedVariable;
  * yans::UiTracedVariable<uint32_t> :
  \code
  #include <stdint.h>
- #include "yans/ui-traced-variable.tcc"
+ #include "ns3/ui-traced-variable.tcc"
 
  yans::UiTracedVariable<uint32_t> var;
  \endcode
diff --git a/src/common/utils.cc b/src/common/utils.cc
index c7d03e85f..bf821681d 100644
--- a/src/common/utils.cc
+++ b/src/common/utils.cc
@@ -160,7 +160,7 @@ utils_checksum_complete (uint16_t checksum)
 
 
 #ifdef RUN_SELF_TESTS
-#include "yans/test.h"
+#include "ns3/test.h"
 namespace yans {
 
 class UtilsTest : public Test {
diff --git a/src/simulator/event-tcc-test.cc b/src/simulator/event-tcc-test.cc
index c0dd648b8..1cb996767 100644
--- a/src/simulator/event-tcc-test.cc
+++ b/src/simulator/event-tcc-test.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "event.tcc"
-#include "yans/test.h"
+#include "ns3/test.h"
 
 #ifdef RUN_SELF_TESTS
 
diff --git a/src/simulator/simulator.cc b/src/simulator/simulator.cc
index 73a774ec6..73ec19078 100644
--- a/src/simulator/simulator.cc
+++ b/src/simulator/simulator.cc
@@ -23,7 +23,7 @@
 #include "scheduler.h"
 #include "event.h"
 #include "event.tcc"
-#include "yans/system-semaphore.h"
+#include "ns3/system-semaphore.h"
 
 #include <math.h>
 #include <cassert>
diff --git a/utils/bench-packets.cc b/utils/bench-packets.cc
index 076705a37..e01223201 100644
--- a/utils/bench-packets.cc
+++ b/utils/bench-packets.cc
@@ -18,11 +18,11 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#include "yans/wall-clock-ms.h"
-#include "yans/packet.h"
-#include "yans/chunk-constant-data.h"
-#include "yans/chunk-udp.h"
-#include "yans/chunk-ipv4.h"
+#include "ns3/wall-clock-ms.h"
+#include "ns3/packet.h"
+#include "ns3/chunk-constant-data.h"
+#include "ns3/chunk-udp.h"
+#include "ns3/chunk-ipv4.h"
 #include <iostream>
 
 using namespace yans;
diff --git a/utils/bench-simulator.cc b/utils/bench-simulator.cc
index c624386cb..3fcd4ea7c 100644
--- a/utils/bench-simulator.cc
+++ b/utils/bench-simulator.cc
@@ -19,10 +19,10 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "yans/simulator.h"
-#include "yans/event.h"
-#include "yans/event.tcc"
-#include "yans/wall-clock-ms.h"
+#include "ns3/simulator.h"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
+#include "ns3/wall-clock-ms.h"
 #include <iostream>
 #include <fstream>
 #include <vector>
diff --git a/utils/replay-simulation.cc b/utils/replay-simulation.cc
index e3ff91dae..936b547b5 100644
--- a/utils/replay-simulation.cc
+++ b/utils/replay-simulation.cc
@@ -19,10 +19,10 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "yans/simulator.h"
-#include "yans/event.h"
-#include "yans/event.tcc"
-#include "yans/wall-clock-ms.h"
+#include "ns3/simulator.h"
+#include "ns3/event.h"
+#include "ns3/event.tcc"
+#include "ns3/wall-clock-ms.h"
 #include <vector>
 #include <deque>
 #include <fstream>
diff --git a/utils/run-tests.cc b/utils/run-tests.cc
index 322f68157..b16b622c5 100644
--- a/utils/run-tests.cc
+++ b/utils/run-tests.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "yans/test.h"
+#include "ns3/test.h"
 
 int main (int argc, char *argv[])
 {