1.1 --- a/samples/main-callback.cc	Tue Aug 29 17:48:43 2006 +0200
     1.2 +++ b/samples/main-callback.cc	Tue Aug 29 17:51:04 2006 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
     1.5 -#include "yans/callback.h"
     1.6 +#include "ns3/callback.h"
     1.7  #include <cassert>
     1.8  #include <iostream>
     1.9  

     2.1 --- a/samples/main-event.cc	Tue Aug 29 17:48:43 2006 +0200
     2.2 +++ b/samples/main-event.cc	Tue Aug 29 17:51:04 2006 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
     2.5 -#include "yans/event.h"
     2.6 -#include "yans/event.tcc"
     2.7 +#include "ns3/event.h"
     2.8 +#include "ns3/event.tcc"
     2.9  #include <iostream>
    2.10  
    2.11  using namespace yans;

     3.1 --- a/samples/main-packet.cc	Tue Aug 29 17:48:43 2006 +0200
     3.2 +++ b/samples/main-packet.cc	Tue Aug 29 17:51:04 2006 +0200
     3.3 @@ -1,6 +1,6 @@
     3.4  /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
     3.5 -#include "yans/packet.h"
     3.6 -#include "yans/chunk.h"
     3.7 +#include "ns3/packet.h"
     3.8 +#include "ns3/chunk.h"
     3.9  #include <iostream>
    3.10  
    3.11  using namespace yans;

     4.1 --- a/samples/main-simulator.cc	Tue Aug 29 17:48:43 2006 +0200
     4.2 +++ b/samples/main-simulator.cc	Tue Aug 29 17:51:04 2006 +0200
     4.3 @@ -1,7 +1,7 @@
     4.4  /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
     4.5 -#include "yans/event.h"
     4.6 -#include "yans/event.tcc"
     4.7 -#include "yans/simulator.h"
     4.8 +#include "ns3/event.h"
     4.9 +#include "ns3/event.tcc"
    4.10 +#include "ns3/simulator.h"
    4.11  #include <iostream>
    4.12  
    4.13  using namespace yans;

     5.1 --- a/samples/main-trace.cc	Tue Aug 29 17:48:43 2006 +0200
     5.2 +++ b/samples/main-trace.cc	Tue Aug 29 17:51:04 2006 +0200
     5.3 @@ -1,9 +1,9 @@
     5.4  /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
     5.5 -#include "yans/trace-container.h"
     5.6 -#include "yans/ui-traced-variable.tcc"
     5.7 -#include "yans/packet-logger.h"
     5.8 -#include "yans/trace-stream.h"
     5.9 -#include "yans/pcap-writer.h"
    5.10 +#include "ns3/trace-container.h"
    5.11 +#include "ns3/ui-traced-variable.tcc"
    5.12 +#include "ns3/packet-logger.h"
    5.13 +#include "ns3/trace-stream.h"
    5.14 +#include "ns3/pcap-writer.h"
    5.15  #include <iostream>
    5.16  
    5.17  using namespace yans;

     6.1 --- a/src/common/buffer.cc	Tue Aug 29 17:48:43 2006 +0200
     6.2 +++ b/src/common/buffer.cc	Tue Aug 29 17:51:04 2006 +0200
     6.3 @@ -377,7 +377,7 @@
     6.4  
     6.5  #ifdef RUN_SELF_TESTS
     6.6  
     6.7 -#include "yans/test.h"
     6.8 +#include "ns3/test.h"
     6.9  #include <iomanip>
    6.10  
    6.11  namespace yans {

     7.1 --- a/src/common/callback-logger.h	Tue Aug 29 17:48:43 2006 +0200
     7.2 +++ b/src/common/callback-logger.h	Tue Aug 29 17:51:04 2006 +0200
     7.3 @@ -22,7 +22,7 @@
     7.4  #ifndef CALLBACK_LOGGER_H
     7.5  #define CALLBACK_LOGGER_H
     7.6  
     7.7 -#include "yans/callback.h"
     7.8 +#include "ns3/callback.h"
     7.9  
    7.10  namespace yans {
    7.11  

     8.1 --- a/src/common/f-traced-variable.tcc	Tue Aug 29 17:48:43 2006 +0200
     8.2 +++ b/src/common/f-traced-variable.tcc	Tue Aug 29 17:51:04 2006 +0200
     8.3 @@ -22,7 +22,7 @@
     8.4  #ifndef F_TRACED_VARIABLE_TCC
     8.5  #define F_TRACED_VARIABLE_TCC
     8.6  
     8.7 -#include "yans/callback.h"
     8.8 +#include "ns3/callback.h"
     8.9  #include <stdint.h>
    8.10  
    8.11  namespace yans {

     9.1 --- a/src/common/ipv4-network-interface.h	Tue Aug 29 17:48:43 2006 +0200
     9.2 +++ b/src/common/ipv4-network-interface.h	Tue Aug 29 17:51:04 2006 +0200
     9.3 @@ -22,7 +22,7 @@
     9.4  #define IPV4_NETWORK_INTERFACE
     9.5  
     9.6  #include "ipv4-address.h"
     9.7 -#include "yans/callback.h"
     9.8 +#include "ns3/callback.h"
     9.9  #include "packet.h"
    9.10  
    9.11  namespace yans {

    10.1 --- a/src/common/llc-snap-encapsulation.h	Tue Aug 29 17:48:43 2006 +0200
    10.2 +++ b/src/common/llc-snap-encapsulation.h	Tue Aug 29 17:51:04 2006 +0200
    10.3 @@ -22,7 +22,7 @@
    10.4  #define LLC_SNAP_ENCAPSULATION
    10.5  
    10.6  #include <stdint.h>
    10.7 -#include "yans/callback.h"
    10.8 +#include "ns3/callback.h"
    10.9  #include "mac-address.h"
   10.10  #include "packet.h"
   10.11  

    11.1 --- a/src/common/mac-network-interface.h	Tue Aug 29 17:48:43 2006 +0200
    11.2 +++ b/src/common/mac-network-interface.h	Tue Aug 29 17:51:04 2006 +0200
    11.3 @@ -22,7 +22,7 @@
    11.4  #define MAC_NETWORK_INTERFACE_H
    11.5  
    11.6  #include <stdint.h>
    11.7 -#include "yans/callback.h"
    11.8 +#include "ns3/callback.h"
    11.9  #include "mac-address.h"
   11.10  #include "packet.h"
   11.11  

    12.1 --- a/src/common/packet-logger.h	Tue Aug 29 17:48:43 2006 +0200
    12.2 +++ b/src/common/packet-logger.h	Tue Aug 29 17:51:04 2006 +0200
    12.3 @@ -22,7 +22,7 @@
    12.4  #ifndef PACKET_LOGGER_H
    12.5  #define PACKET_LOGGER_H
    12.6  
    12.7 -#include "yans/callback.h"
    12.8 +#include "ns3/callback.h"
    12.9  #include "packet.h"
   12.10  
   12.11  namespace yans {

    13.1 --- a/src/common/packet.h	Tue Aug 29 17:48:43 2006 +0200
    13.2 +++ b/src/common/packet.h	Tue Aug 29 17:51:04 2006 +0200
    13.3 @@ -25,7 +25,7 @@
    13.4  #include "buffer.h"
    13.5  #include "chunk.h"
    13.6  #include "tags.h"
    13.7 -#include "yans/callback.h"
    13.8 +#include "ns3/callback.h"
    13.9  
   13.10  namespace yans {
   13.11  

    14.1 --- a/src/common/pcap-writer.cc	Tue Aug 29 17:48:43 2006 +0200
    14.2 +++ b/src/common/pcap-writer.cc	Tue Aug 29 17:51:04 2006 +0200
    14.3 @@ -24,8 +24,8 @@
    14.4   * http://wiki.ethereal.com/Development/LibpcapFileFormat
    14.5   */
    14.6  
    14.7 -#include "yans/simulator.h"
    14.8 -#include "yans/system-file.h"
    14.9 +#include "ns3/simulator.h"
   14.10 +#include "ns3/system-file.h"
   14.11  #include "pcap-writer.h"
   14.12  #include "packet.h"
   14.13  

    15.1 --- a/src/common/pcap-writer.h	Tue Aug 29 17:48:43 2006 +0200
    15.2 +++ b/src/common/pcap-writer.h	Tue Aug 29 17:51:04 2006 +0200
    15.3 @@ -22,7 +22,7 @@
    15.4  #ifndef PCAP_WRITER_H
    15.5  #define PCAP_WRITER_H
    15.6  
    15.7 -#include "yans/callback.h"
    15.8 +#include "ns3/callback.h"
    15.9  #include <stdint.h>
   15.10  #include "packet.h"
   15.11  

    16.1 --- a/src/common/si-traced-variable.tcc	Tue Aug 29 17:48:43 2006 +0200
    16.2 +++ b/src/common/si-traced-variable.tcc	Tue Aug 29 17:51:04 2006 +0200
    16.3 @@ -22,7 +22,7 @@
    16.4  #ifndef SI_TRACED_VARIABLE_TCC
    16.5  #define SI_TRACED_VARIABLE_TCC
    16.6  
    16.7 -#include "yans/callback.h"
    16.8 +#include "ns3/callback.h"
    16.9  #include <stdint.h>
   16.10  
   16.11  namespace yans {
   16.12 @@ -69,7 +69,7 @@
   16.13   * yans::UiTracedVariable<int32_t> :
   16.14   \code
   16.15   #include <stdint.h>
   16.16 - #include "yans/si-traced-variable.tcc"
   16.17 + #include "ns3/si-traced-variable.tcc"
   16.18  
   16.19   yans::SiTracedVariable<uint16_t> var;
   16.20   \endcode

    17.1 --- a/src/common/static-speed-position.cc	Tue Aug 29 17:48:43 2006 +0200
    17.2 +++ b/src/common/static-speed-position.cc	Tue Aug 29 17:51:04 2006 +0200
    17.3 @@ -19,7 +19,7 @@
    17.4   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    17.5   */
    17.6  #include "static-speed-position.h"
    17.7 -#include "yans/simulator.h"
    17.8 +#include "ns3/simulator.h"
    17.9  
   17.10  namespace yans {
   17.11  

    18.1 --- a/src/common/tags.cc	Tue Aug 29 17:48:43 2006 +0200
    18.2 +++ b/src/common/tags.cc	Tue Aug 29 17:51:04 2006 +0200
    18.3 @@ -178,7 +178,7 @@
    18.4  
    18.5  #ifdef RUN_SELF_TESTS
    18.6  
    18.7 -#include "yans/test.h"
    18.8 +#include "ns3/test.h"
    18.9  #include <iomanip>
   18.10  #include <iostream>
   18.11  

    19.1 --- a/src/common/trace-container.h	Tue Aug 29 17:48:43 2006 +0200
    19.2 +++ b/src/common/trace-container.h	Tue Aug 29 17:51:04 2006 +0200
    19.3 @@ -26,7 +26,7 @@
    19.4  #include "si-traced-variable.tcc"
    19.5  #include "f-traced-variable.tcc"
    19.6  #include "callback-logger.h"
    19.7 -#include "yans/callback.h"
    19.8 +#include "ns3/callback.h"
    19.9  #include "packet.h"
   19.10  #include <list>
   19.11  #include <string>

    20.1 --- a/src/common/trace-stream-test.cc	Tue Aug 29 17:48:43 2006 +0200
    20.2 +++ b/src/common/trace-stream-test.cc	Tue Aug 29 17:51:04 2006 +0200
    20.3 @@ -19,7 +19,7 @@
    20.4   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    20.5   */
    20.6  #include "trace-stream.h"
    20.7 -#include "yans/test.h"
    20.8 +#include "ns3/test.h"
    20.9  #include <iostream>
   20.10  
   20.11  #ifdef RUN_SELF_TESTS

    21.1 --- a/src/common/traced-variable-test.cc	Tue Aug 29 17:48:43 2006 +0200
    21.2 +++ b/src/common/traced-variable-test.cc	Tue Aug 29 17:51:04 2006 +0200
    21.3 @@ -21,8 +21,8 @@
    21.4  
    21.5  #include "ui-traced-variable.tcc"
    21.6  #include "si-traced-variable.tcc"
    21.7 -#include "yans/test.h"
    21.8 -#include "yans/callback.h"
    21.9 +#include "ns3/test.h"
   21.10 +#include "ns3/callback.h"
   21.11  
   21.12  
   21.13  namespace yans {

    22.1 --- a/src/common/ui-traced-variable.tcc	Tue Aug 29 17:48:43 2006 +0200
    22.2 +++ b/src/common/ui-traced-variable.tcc	Tue Aug 29 17:51:04 2006 +0200
    22.3 @@ -22,7 +22,7 @@
    22.4  #ifndef UI_TRACED_VARIABLE_TCC
    22.5  #define UI_TRACED_VARIABLE_TCC
    22.6  
    22.7 -#include "yans/callback.h"
    22.8 +#include "ns3/callback.h"
    22.9  #include <stdint.h>
   22.10  
   22.11  namespace yans {
   22.12 @@ -72,7 +72,7 @@
   22.13   * yans::UiTracedVariable<uint32_t> :
   22.14   \code
   22.15   #include <stdint.h>
   22.16 - #include "yans/ui-traced-variable.tcc"
   22.17 + #include "ns3/ui-traced-variable.tcc"
   22.18  
   22.19   yans::UiTracedVariable<uint32_t> var;
   22.20   \endcode

    23.1 --- a/src/common/utils.cc	Tue Aug 29 17:48:43 2006 +0200
    23.2 +++ b/src/common/utils.cc	Tue Aug 29 17:51:04 2006 +0200
    23.3 @@ -160,7 +160,7 @@
    23.4  
    23.5  
    23.6  #ifdef RUN_SELF_TESTS
    23.7 -#include "yans/test.h"
    23.8 +#include "ns3/test.h"
    23.9  namespace yans {
   23.10  
   23.11  class UtilsTest : public Test {

    24.1 --- a/src/simulator/event-tcc-test.cc	Tue Aug 29 17:48:43 2006 +0200
    24.2 +++ b/src/simulator/event-tcc-test.cc	Tue Aug 29 17:51:04 2006 +0200
    24.3 @@ -19,7 +19,7 @@
    24.4   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    24.5   */
    24.6  #include "event.tcc"
    24.7 -#include "yans/test.h"
    24.8 +#include "ns3/test.h"
    24.9  
   24.10  #ifdef RUN_SELF_TESTS
   24.11  

    25.1 --- a/src/simulator/simulator.cc	Tue Aug 29 17:48:43 2006 +0200
    25.2 +++ b/src/simulator/simulator.cc	Tue Aug 29 17:51:04 2006 +0200
    25.3 @@ -23,7 +23,7 @@
    25.4  #include "scheduler.h"
    25.5  #include "event.h"
    25.6  #include "event.tcc"
    25.7 -#include "yans/system-semaphore.h"
    25.8 +#include "ns3/system-semaphore.h"
    25.9  
   25.10  #include <math.h>
   25.11  #include <cassert>

    26.1 --- a/utils/bench-packets.cc	Tue Aug 29 17:48:43 2006 +0200
    26.2 +++ b/utils/bench-packets.cc	Tue Aug 29 17:51:04 2006 +0200
    26.3 @@ -18,11 +18,11 @@
    26.4   *
    26.5   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    26.6   */
    26.7 -#include "yans/wall-clock-ms.h"
    26.8 -#include "yans/packet.h"
    26.9 -#include "yans/chunk-constant-data.h"
   26.10 -#include "yans/chunk-udp.h"
   26.11 -#include "yans/chunk-ipv4.h"
   26.12 +#include "ns3/wall-clock-ms.h"
   26.13 +#include "ns3/packet.h"
   26.14 +#include "ns3/chunk-constant-data.h"
   26.15 +#include "ns3/chunk-udp.h"
   26.16 +#include "ns3/chunk-ipv4.h"
   26.17  #include <iostream>
   26.18  
   26.19  using namespace yans;

    27.1 --- a/utils/bench-simulator.cc	Tue Aug 29 17:48:43 2006 +0200
    27.2 +++ b/utils/bench-simulator.cc	Tue Aug 29 17:51:04 2006 +0200
    27.3 @@ -19,10 +19,10 @@
    27.4   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    27.5   */
    27.6  
    27.7 -#include "yans/simulator.h"
    27.8 -#include "yans/event.h"
    27.9 -#include "yans/event.tcc"
   27.10 -#include "yans/wall-clock-ms.h"
   27.11 +#include "ns3/simulator.h"
   27.12 +#include "ns3/event.h"
   27.13 +#include "ns3/event.tcc"
   27.14 +#include "ns3/wall-clock-ms.h"
   27.15  #include <iostream>
   27.16  #include <fstream>
   27.17  #include <vector>

    28.1 --- a/utils/replay-simulation.cc	Tue Aug 29 17:48:43 2006 +0200
    28.2 +++ b/utils/replay-simulation.cc	Tue Aug 29 17:51:04 2006 +0200
    28.3 @@ -19,10 +19,10 @@
    28.4   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    28.5   */
    28.6  
    28.7 -#include "yans/simulator.h"
    28.8 -#include "yans/event.h"
    28.9 -#include "yans/event.tcc"
   28.10 -#include "yans/wall-clock-ms.h"
   28.11 +#include "ns3/simulator.h"
   28.12 +#include "ns3/event.h"
   28.13 +#include "ns3/event.tcc"
   28.14 +#include "ns3/wall-clock-ms.h"
   28.15  #include <vector>
   28.16  #include <deque>
   28.17  #include <fstream>

    29.1 --- a/utils/run-tests.cc	Tue Aug 29 17:48:43 2006 +0200
    29.2 +++ b/utils/run-tests.cc	Tue Aug 29 17:51:04 2006 +0200
    29.3 @@ -19,7 +19,7 @@
    29.4   * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
    29.5   */
    29.6  
    29.7 -#include "yans/test.h"
    29.8 +#include "ns3/test.h"
    29.9  
   29.10  int main (int argc, char *argv[])
   29.11  {