Fix local #include headers by removing the "ns3/" prefix

src/network/utils/drop-tail-queue.h

@@ -18,7 +18,7 @@
 #ifndef DROPTAIL_H
 #define DROPTAIL_H
 
-#include "ns3/queue.h"
+#include "queue.h"
 
 namespace ns3
 {

src/network/utils/error-channel.cc

@@ -19,10 +19,11 @@
 
 #include "error-channel.h"
 
+#include "simple-net-device.h"
+
 #include "ns3/log.h"
 #include "ns3/node.h"
 #include "ns3/packet.h"
-#include "ns3/simple-net-device.h"
 #include "ns3/simulator.h"
 
 namespace ns3

src/network/utils/error-channel.h

@@ -19,11 +19,12 @@
 #ifndef ERROR_CHANNEL_H
 #define ERROR_CHANNEL_H
 
+#include "error-model.h"
+#include "mac48-address.h"
+#include "simple-channel.h"
+
 #include "ns3/channel.h"
-#include "ns3/error-model.h"
-#include "ns3/mac48-address.h"
 #include "ns3/nstime.h"
-#include "ns3/simple-channel.h"
 
 #include <vector>
 

src/network/utils/ethernet-header.h

@@ -20,8 +20,9 @@
 #ifndef ETHERNET_HEADER_H
 #define ETHERNET_HEADER_H
 
+#include "mac48-address.h"
+
 #include "ns3/header.h"
-#include "ns3/mac48-address.h"
 
 #include <string>
 

src/network/utils/ipv6-address.h

@@ -20,11 +20,11 @@
 #ifndef IPV6_ADDRESS_H
 #define IPV6_ADDRESS_H
 
+#include "ipv4-address.h"
 #include "mac8-address.h"
 
 #include "ns3/address.h"
 #include "ns3/attribute-helper.h"
-#include "ns3/ipv4-address.h"
 
 #include <cstring>
 #include <ostream>

src/network/utils/net-device-queue-interface.cc

@@ -17,11 +17,12 @@
  * Author: Stefano Avallone <stefano.avallone@.unina.it>
  */
 
-#include "ns3/net-device-queue-interface.h"
+#include "net-device-queue-interface.h"
+
+#include "queue-item.h"
+#include "queue-limits.h"
 
 #include "ns3/abort.h"
-#include "ns3/queue-item.h"
-#include "ns3/queue-limits.h"
 #include "ns3/uinteger.h"
 
 namespace ns3

src/network/utils/packet-data-calculators.cc

@@ -19,9 +19,10 @@
 
 #include "packet-data-calculators.h"
 
+#include "mac48-address.h"
+
 #include "ns3/basic-data-calculators.h"
 #include "ns3/log.h"
-#include "ns3/mac48-address.h"
 #include "ns3/packet.h"
 
 using namespace ns3;

src/network/utils/packet-data-calculators.h

@@ -20,9 +20,10 @@
 #ifndef PACKET_DATA_CALCULATORS_H
 #define PACKET_DATA_CALCULATORS_H
 
+#include "mac48-address.h"
+
 #include "ns3/basic-data-calculators.h"
 #include "ns3/data-calculator.h"
-#include "ns3/mac48-address.h"
 #include "ns3/packet.h"
 
 namespace ns3

src/network/utils/packet-probe.cc

@@ -20,7 +20,7 @@
  * Modified by: Mitch Watrous (watrous@u.washington.edu)
  */
 
-#include "ns3/packet-probe.h"
+#include "packet-probe.h"
 
 #include "ns3/config.h"
 #include "ns3/log.h"

src/network/utils/packet-socket-client.cc

@@ -19,12 +19,13 @@
 
 #include "packet-socket-client.h"
 
+#include "packet-socket-address.h"
+#include "packet-socket-factory.h"
+#include "packet-socket.h"
+
 #include "ns3/abort.h"
 #include "ns3/log.h"
 #include "ns3/nstime.h"
-#include "ns3/packet-socket-address.h"
-#include "ns3/packet-socket-factory.h"
-#include "ns3/packet-socket.h"
 #include "ns3/packet.h"
 #include "ns3/simulator.h"
 #include "ns3/socket-factory.h"

src/network/utils/packet-socket-client.h

@@ -20,9 +20,10 @@
 #ifndef PACKET_SOCKET_CLIENT_H
 #define PACKET_SOCKET_CLIENT_H
 
+#include "packet-socket-address.h"
+
 #include "ns3/application.h"
 #include "ns3/event-id.h"
-#include "ns3/packet-socket-address.h"
 #include "ns3/ptr.h"
 #include "ns3/traced-callback.h"
 

src/network/utils/packet-socket-server.cc

@@ -19,12 +19,13 @@
 
 #include "packet-socket-server.h"
 
+#include "packet-socket-address.h"
+#include "packet-socket-factory.h"
+#include "packet-socket.h"
+
 #include "ns3/abort.h"
 #include "ns3/log.h"
 #include "ns3/nstime.h"
-#include "ns3/packet-socket-address.h"
-#include "ns3/packet-socket-factory.h"
-#include "ns3/packet-socket.h"
 #include "ns3/packet.h"
 #include "ns3/simulator.h"
 #include "ns3/socket-factory.h"

src/network/utils/packet-socket-server.h

@@ -20,9 +20,10 @@
 #ifndef PACKET_SOCKET_SERVER_H
 #define PACKET_SOCKET_SERVER_H
 
+#include "packet-socket-address.h"
+
 #include "ns3/application.h"
 #include "ns3/event-id.h"
-#include "ns3/packet-socket-address.h"
 #include "ns3/ptr.h"
 #include "ns3/traced-callback.h"
 

src/network/utils/packetbb.cc

@@ -23,9 +23,10 @@
 
 #include "packetbb.h"
 
+#include "ipv4-address.h"
+#include "ipv6-address.h"
+
 #include "ns3/assert.h"
-#include "ns3/ipv4-address.h"
-#include "ns3/ipv6-address.h"
 #include "ns3/log.h"
 
 static const uint8_t VERSION = 0;

src/network/utils/queue.h

@@ -22,12 +22,13 @@
 #ifndef QUEUE_H
 #define QUEUE_H
 
+#include "queue-fwd.h"
+#include "queue-item.h"
+#include "queue-size.h"
+
 #include "ns3/log.h"
 #include "ns3/object.h"
 #include "ns3/packet.h"
-#include "ns3/queue-fwd.h"
-#include "ns3/queue-item.h"
-#include "ns3/queue-size.h"
 #include "ns3/traced-callback.h"
 #include "ns3/traced-value.h"
 

src/network/utils/simple-net-device.cc

@@ -18,15 +18,15 @@
  */
 #include "simple-net-device.h"
 
+#include "error-model.h"
+#include "queue.h"
 #include "simple-channel.h"
 
 #include "ns3/boolean.h"
-#include "ns3/error-model.h"
 #include "ns3/log.h"
 #include "ns3/node.h"
 #include "ns3/packet.h"
 #include "ns3/pointer.h"
-#include "ns3/queue.h"
 #include "ns3/simulator.h"
 #include "ns3/string.h"
 #include "ns3/tag.h"

src/network/utils/simple-net-device.h

@@ -19,12 +19,12 @@
 #ifndef SIMPLE_NET_DEVICE_H
 #define SIMPLE_NET_DEVICE_H
 
+#include "data-rate.h"
 #include "mac48-address.h"
+#include "queue-fwd.h"
 
-#include "ns3/data-rate.h"
 #include "ns3/event-id.h"
 #include "ns3/net-device.h"
-#include "ns3/queue-fwd.h"
 #include "ns3/traced-callback.h"
 
 #include <stdint.h>