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

src/antenna/model/antenna-model.h

@@ -20,7 +20,8 @@
 #ifndef ANTENNA_MODEL_H
 #define ANTENNA_MODEL_H
 
-#include <ns3/angles.h>
+#include "angles.h"
+
 #include <ns3/object.h>
 
 namespace ns3

src/antenna/model/cosine-antenna-model.h

@@ -20,7 +20,8 @@
 #ifndef COSINE_ANTENNA_MODEL_H
 #define COSINE_ANTENNA_MODEL_H
 
-#include <ns3/antenna-model.h>
+#include "antenna-model.h"
+
 #include <ns3/object.h>
 
 namespace ns3

src/antenna/model/isotropic-antenna-model.h

@@ -20,7 +20,8 @@
 #ifndef ISOTROPIC_ANTENNA_MODEL_H
 #define ISOTROPIC_ANTENNA_MODEL_H
 
-#include <ns3/antenna-model.h>
+#include "antenna-model.h"
+
 #include <ns3/object.h>
 
 namespace ns3

src/antenna/model/parabolic-antenna-model.h

@@ -20,7 +20,8 @@
 #ifndef PARABOLIC_ANTENNA_MODEL_H
 #define PARABOLIC_ANTENNA_MODEL_H
 
-#include <ns3/antenna-model.h>
+#include "antenna-model.h"
+
 #include <ns3/object.h>
 
 namespace ns3

src/antenna/model/phased-array-model.cc

@@ -17,9 +17,10 @@
 
 #include "phased-array-model.h"
 
+#include "isotropic-antenna-model.h"
+
 #include <ns3/boolean.h>
 #include <ns3/double.h>
-#include <ns3/isotropic-antenna-model.h>
 #include <ns3/log.h>
 #include <ns3/pointer.h>
 #include <ns3/uinteger.h>

src/antenna/model/phased-array-model.h

@@ -18,8 +18,9 @@
 #ifndef PHASED_ARRAY_MODEL_H
 #define PHASED_ARRAY_MODEL_H
 
-#include <ns3/angles.h>
-#include <ns3/antenna-model.h>
+#include "angles.h"
+#include "antenna-model.h"
+
 #include <ns3/matrix-array.h>
 #include <ns3/object.h>
 

src/antenna/model/three-gpp-antenna-model.h

@@ -18,7 +18,8 @@
 #ifndef THREE_GPP_ANTENNA_MODEL_H
 #define THREE_GPP_ANTENNA_MODEL_H
 
-#include <ns3/antenna-model.h>
+#include "antenna-model.h"
+
 #include <ns3/object.h>
 
 namespace ns3

src/antenna/model/uniform-planar-array.h

@@ -18,8 +18,9 @@
 #ifndef UNIFORM_PLANAR_ARRAY_H
 #define UNIFORM_PLANAR_ARRAY_H
 
+#include "phased-array-model.h"
+
 #include <ns3/object.h>
-#include <ns3/phased-array-model.h>
 
 namespace ns3
 {

src/applications/model/application-packet-probe.cc

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

src/applications/model/bulk-send-application.h

@@ -20,11 +20,12 @@
 #ifndef BULK_SEND_APPLICATION_H
 #define BULK_SEND_APPLICATION_H
 
+#include "seq-ts-size-header.h"
+
 #include "ns3/address.h"
 #include "ns3/application.h"
 #include "ns3/event-id.h"
 #include "ns3/ptr.h"
-#include "ns3/seq-ts-size-header.h"
 #include "ns3/traced-callback.h"
 
 namespace ns3

src/applications/model/onoff-application.h

@@ -24,12 +24,13 @@
 #ifndef ONOFF_APPLICATION_H
 #define ONOFF_APPLICATION_H
 
+#include "seq-ts-size-header.h"
+
 #include "ns3/address.h"
 #include "ns3/application.h"
 #include "ns3/data-rate.h"
 #include "ns3/event-id.h"
 #include "ns3/ptr.h"
-#include "ns3/seq-ts-size-header.h"
 #include "ns3/traced-callback.h"
 
 namespace ns3

src/applications/model/packet-sink.h

@@ -20,13 +20,14 @@
 #ifndef PACKET_SINK_H
 #define PACKET_SINK_H
 
+#include "seq-ts-size-header.h"
+
 #include "ns3/address.h"
 #include "ns3/application.h"
 #include "ns3/event-id.h"
 #include "ns3/inet-socket-address.h"
 #include "ns3/inet6-socket-address.h"
 #include "ns3/ptr.h"
-#include "ns3/seq-ts-size-header.h"
 #include "ns3/traced-callback.h"
 
 #include <unordered_map>

src/applications/model/seq-ts-size-header.h

@@ -20,7 +20,7 @@
 #ifndef SEQ_TS_SIZE_HEADER_H
 #define SEQ_TS_SIZE_HEADER_H
 
-#include <ns3/seq-ts-header.h>
+#include "seq-ts-header.h"
 
 namespace ns3
 {

src/applications/model/three-gpp-http-client.cc

@@ -20,6 +20,8 @@
 
 #include "three-gpp-http-client.h"
 
+#include "three-gpp-http-variables.h"
+
 #include <ns3/callback.h>
 #include <ns3/double.h>
 #include <ns3/inet-socket-address.h>
@@ -30,7 +32,6 @@
 #include <ns3/simulator.h>
 #include <ns3/socket.h>
 #include <ns3/tcp-socket-factory.h>
-#include <ns3/three-gpp-http-variables.h>
 #include <ns3/uinteger.h>
 
 NS_LOG_COMPONENT_DEFINE("ThreeGppHttpClient");

src/applications/model/three-gpp-http-client.h

@@ -21,9 +21,10 @@
 #ifndef THREE_GPP_HTTP_CLIENT_H
 #define THREE_GPP_HTTP_CLIENT_H
 
+#include "three-gpp-http-header.h"
+
 #include <ns3/address.h>
 #include <ns3/application.h>
-#include <ns3/three-gpp-http-header.h>
 #include <ns3/traced-callback.h>
 
 namespace ns3

src/applications/model/three-gpp-http-server.cc

@@ -20,6 +20,8 @@
 
 #include "three-gpp-http-server.h"
 
+#include "three-gpp-http-variables.h"
+
 #include <ns3/callback.h>
 #include <ns3/config.h>
 #include <ns3/inet-socket-address.h>
@@ -31,7 +33,6 @@
 #include <ns3/socket.h>
 #include <ns3/tcp-socket-factory.h>
 #include <ns3/tcp-socket.h>
-#include <ns3/three-gpp-http-variables.h>
 #include <ns3/uinteger.h>
 
 NS_LOG_COMPONENT_DEFINE("ThreeGppHttpServer");

src/applications/model/three-gpp-http-server.h

@@ -21,13 +21,14 @@
 #ifndef THREE_GPP_HTTP_SERVER_H
 #define THREE_GPP_HTTP_SERVER_H
 
+#include "three-gpp-http-header.h"
+
 #include <ns3/address.h>
 #include <ns3/application.h>
 #include <ns3/event-id.h>
 #include <ns3/nstime.h>
 #include <ns3/ptr.h>
 #include <ns3/simple-ref-count.h>
-#include <ns3/three-gpp-http-header.h>
 #include <ns3/traced-callback.h>
 
 #include <map>

src/bridge/model/bridge-net-device.h

@@ -17,7 +17,8 @@
 #ifndef BRIDGE_NET_DEVICE_H
 #define BRIDGE_NET_DEVICE_H
 
-#include "ns3/bridge-channel.h"
+#include "bridge-channel.h"
+
 #include "ns3/mac48-address.h"
 #include "ns3/net-device.h"
 #include "ns3/nstime.h"

src/buildings/helper/building-allocator.h

@@ -22,7 +22,8 @@
 #ifndef BUILDING_ALLOCATOR_H
 #define BUILDING_ALLOCATOR_H
 
-#include "ns3/building-container.h"
+#include "building-container.h"
+
 #include "ns3/object-factory.h"
 #include "ns3/object.h"
 #include "ns3/position-allocator.h"

src/buildings/helper/building-position-allocator.cc

@@ -19,11 +19,12 @@
  */
 #include "building-position-allocator.h"
 
+#include "buildings-helper.h"
+
 #include "ns3/boolean.h"
 #include "ns3/box.h"
 #include "ns3/building-list.h"
 #include "ns3/building.h"
-#include "ns3/buildings-helper.h"
 #include "ns3/double.h"
 #include "ns3/enum.h"
 #include "ns3/log.h"

src/buildings/model/buildings-channel-condition-model.cc

@@ -18,11 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ns3/buildings-channel-condition-model.h"
+#include "buildings-channel-condition-model.h"
+
+#include "building-list.h"
+#include "mobility-building-info.h"
 
-#include "ns3/building-list.h"
 #include "ns3/log.h"
-#include "ns3/mobility-building-info.h"
 #include "ns3/mobility-model.h"
 
 namespace ns3

src/buildings/model/buildings-propagation-loss-model.cc

@@ -21,13 +21,14 @@
 
 #include "buildings-propagation-loss-model.h"
 
+#include "mobility-building-info.h"
+
 #include "ns3/double.h"
 #include "ns3/enum.h"
 #include "ns3/log.h"
 #include "ns3/mobility-model.h"
 #include "ns3/pointer.h"
 #include "ns3/propagation-loss-model.h"
-#include <ns3/mobility-building-info.h>
 
 #include <cmath>
 

src/buildings/model/buildings-propagation-loss-model.h

@@ -22,11 +22,12 @@
 #ifndef BUILDINGS_PROPAGATION_LOSS_MODEL_H_
 #define BUILDINGS_PROPAGATION_LOSS_MODEL_H_
 
+#include "building.h"
+#include "mobility-building-info.h"
+
 #include "ns3/nstime.h"
 #include "ns3/propagation-loss-model.h"
 #include "ns3/random-variable-stream.h"
-#include <ns3/building.h>
-#include <ns3/mobility-building-info.h>
 
 namespace ns3
 {

src/buildings/model/hybrid-buildings-propagation-loss-model.cc

@@ -21,9 +21,11 @@
 
 #include "hybrid-buildings-propagation-loss-model.h"
 
+#include "itu-r-1238-propagation-loss-model.h"
+#include "mobility-building-info.h"
+
 #include "ns3/double.h"
 #include "ns3/enum.h"
-#include "ns3/itu-r-1238-propagation-loss-model.h"
 #include "ns3/itu-r-1411-los-propagation-loss-model.h"
 #include "ns3/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h"
 #include "ns3/kun-2600-mhz-propagation-loss-model.h"
@@ -31,7 +33,6 @@
 #include "ns3/mobility-model.h"
 #include "ns3/okumura-hata-propagation-loss-model.h"
 #include "ns3/pointer.h"
-#include <ns3/mobility-building-info.h>
 
 #include <cmath>
 

src/buildings/model/hybrid-buildings-propagation-loss-model.h

@@ -22,7 +22,8 @@
 #ifndef HYBRID_BUILDINGS_PROPAGATION_LOSS_MODEL_H_
 #define HYBRID_BUILDINGS_PROPAGATION_LOSS_MODEL_H_
 
-#include <ns3/buildings-propagation-loss-model.h>
+#include "buildings-propagation-loss-model.h"
+
 #include <ns3/propagation-environment.h>
 
 namespace ns3

src/buildings/model/itu-r-1238-propagation-loss-model.cc

@@ -20,11 +20,12 @@
  */
 #include "itu-r-1238-propagation-loss-model.h"
 
+#include "mobility-building-info.h"
+
 #include "ns3/double.h"
 #include "ns3/enum.h"
 #include "ns3/log.h"
 #include "ns3/mobility-model.h"
-#include <ns3/mobility-building-info.h>
 
 #include <cmath>
 

src/buildings/model/mobility-building-info.cc

@@ -18,10 +18,12 @@
  *
  */
 
+#include "mobility-building-info.h"
+
+#include "building-list.h"
+
 #include <ns3/assert.h>
-#include <ns3/building-list.h>
 #include <ns3/log.h>
-#include <ns3/mobility-building-info.h>
 #include <ns3/pointer.h>
 #include <ns3/position-allocator.h>
 #include <ns3/simulator.h>

src/buildings/model/mobility-building-info.h

@@ -20,8 +20,9 @@
 #ifndef MOBILITY_BUILDING_INFO_H
 #define MOBILITY_BUILDING_INFO_H
 
+#include "building.h"
+
 #include <ns3/box.h>
-#include <ns3/building.h>
 #include <ns3/constant-velocity-helper.h>
 #include <ns3/mobility-model.h>
 #include <ns3/object.h>

src/buildings/model/oh-buildings-propagation-loss-model.cc

@@ -20,6 +20,8 @@
 
 #include "oh-buildings-propagation-loss-model.h"
 
+#include "mobility-building-info.h"
+
 #include "ns3/double.h"
 #include "ns3/enum.h"
 #include "ns3/log.h"
@@ -27,7 +29,6 @@
 #include "ns3/okumura-hata-propagation-loss-model.h"
 #include "ns3/pointer.h"
 #include "ns3/propagation-loss-model.h"
-#include <ns3/mobility-building-info.h>
 
 #include <cmath>
 

src/buildings/model/oh-buildings-propagation-loss-model.h

@@ -21,7 +21,7 @@
 #ifndef OH_BUILDINGS_PROPAGATION_LOSS_MODEL_H_
 #define OH_BUILDINGS_PROPAGATION_LOSS_MODEL_H_
 
-#include <ns3/buildings-propagation-loss-model.h>
+#include "buildings-propagation-loss-model.h"
 
 namespace ns3
 {

src/buildings/model/random-walk-2d-outdoor-mobility-model.cc

@@ -20,8 +20,9 @@
  */
 #include "random-walk-2d-outdoor-mobility-model.h"
 
-#include "ns3/building-list.h"
-#include "ns3/building.h"
+#include "building-list.h"
+#include "building.h"
+
 #include "ns3/double.h"
 #include "ns3/enum.h"
 #include "ns3/log.h"

src/buildings/model/random-walk-2d-outdoor-mobility-model.h

@@ -22,7 +22,8 @@
 #ifndef RANDOM_WALK_2D_OUTDOOR_MOBILITY_MODEL_H
 #define RANDOM_WALK_2D_OUTDOOR_MOBILITY_MODEL_H
 
-#include "ns3/building.h"
+#include "building.h"
+
 #include "ns3/constant-velocity-helper.h"
 #include "ns3/event-id.h"
 #include "ns3/mobility-model.h"

src/buildings/model/three-gpp-v2v-channel-condition-model.cc

@@ -19,9 +19,10 @@
 
 #include "three-gpp-v2v-channel-condition-model.h"
 
+#include "building-list.h"
+
 #include "ns3/log.h"
 #include "ns3/mobility-model.h"
-#include <ns3/building-list.h>
 
 namespace ns3
 {

src/click/model/ipv4-click-routing.cc

@@ -19,8 +19,9 @@
 
 #include "ipv4-click-routing.h"
 
+#include "ipv4-l3-click-protocol.h"
+
 #include "ns3/ipv4-interface.h"
-#include "ns3/ipv4-l3-click-protocol.h"
 #include "ns3/log.h"
 #include "ns3/mac48-address.h"
 #include "ns3/node.h"

src/click/model/ipv4-l3-click-protocol.cc

@@ -20,11 +20,12 @@
 
 #include "ipv4-l3-click-protocol.h"
 
+#include "ipv4-click-routing.h"
+
 #include "ns3/arp-l3-protocol.h"
 #include "ns3/ethernet-header.h"
 #include "ns3/icmpv4-l4-protocol.h"
 #include "ns3/ip-l4-protocol.h"
-#include "ns3/ipv4-click-routing.h"
 #include "ns3/ipv4-raw-socket-impl.h"
 #include "ns3/llc-snap-header.h"
 #include "ns3/loopback-net-device.h"

src/core/model/ascii-test.h

@@ -23,8 +23,7 @@
 #define ASCII_TEST_H
 
 #include "ascii-file.h"
-
-#include "ns3/test.h"
+#include "test.h"
 
 #include <stdint.h>
 

src/core/model/attribute-container.h

@@ -20,8 +20,8 @@
 #ifndef ATTRIBUTE_CONTAINER_H
 #define ATTRIBUTE_CONTAINER_H
 
-#include <ns3/attribute-helper.h>
-#include <ns3/string.h>
+#include "attribute-helper.h"
+#include "string.h"
 
 #include <algorithm>
 #include <iterator>

src/core/model/environment-variable.cc

@@ -19,7 +19,7 @@
 
 #include "environment-variable.h"
 
-#include "ns3/string.h"
+#include "string.h"
 
 #include <cstdlib>  // std::getenv
 #include <cstring>  // strlen

src/core/model/example-as-test.h

@@ -20,7 +20,7 @@
 #ifndef NS3_EXAMPLE_AS_TEST_SUITE_H
 #define NS3_EXAMPLE_AS_TEST_SUITE_H
 
-#include "ns3/test.h"
+#include "test.h"
 
 #include <string>
 

src/core/model/length.cc

@@ -17,9 +17,9 @@
  * Author: Mathew Bielejeski <bielejeski1@llnl.gov>
  */
 
-#include "ns3/length.h"
+#include "length.h"
 
-#include "ns3/log.h"
+#include "log.h"
 
 #include <algorithm>
 #include <array>

src/core/model/pair.h

@@ -20,8 +20,8 @@
 #ifndef PAIR_H
 #define PAIR_H
 
-#include <ns3/attribute-helper.h>
-#include <ns3/string.h>
+#include "attribute-helper.h"
+#include "string.h"
 
 #include <sstream>
 #include <type_traits>

src/core/model/tuple.h

@@ -20,8 +20,8 @@
 #ifndef TUPLE_H
 #define TUPLE_H
 
-#include <ns3/attribute-helper.h>
-#include <ns3/string.h>
+#include "attribute-helper.h"
+#include "string.h"
 
 #include <algorithm>
 #include <sstream>

src/core/model/unused.h

@@ -20,7 +20,7 @@
 #ifndef UNUSED_H
 #define UNUSED_H
 
-#include "ns3/deprecated.h"
+#include "deprecated.h"
 
 /**
  * \file

src/core/model/val-array.h

@@ -19,8 +19,8 @@
 #ifndef VAL_ARRAY_H
 #define VAL_ARRAY_H
 
-#include <ns3/assert.h>
-#include <ns3/simple-ref-count.h>
+#include "assert.h"
+#include "simple-ref-count.h"
 
 #include <complex>
 #include <valarray>

src/core/model/version.h

@@ -20,7 +20,7 @@
 #ifndef BUILD_VERSION_H_
 #define BUILD_VERSION_H_
 
-#include "ns3/int64x64.h"
+#include "int64x64.h"
 
 #include <string>
 

src/csma-layout/model/csma-star-helper.cc

@@ -13,16 +13,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <iostream>
-#include <sstream>
+#include "csma-star-helper.h"
 
-// ns3 includes
-#include "ns3/csma-star-helper.h"
 #include "ns3/log.h"
 #include "ns3/node-list.h"
 #include "ns3/point-to-point-net-device.h"
 #include "ns3/vector.h"
 
+#include <iostream>
+#include <sstream>
+
 namespace ns3
 {
 

src/csma/model/csma-net-device.h

@@ -20,8 +20,9 @@
 #ifndef CSMA_NET_DEVICE_H
 #define CSMA_NET_DEVICE_H
 
+#include "backoff.h"
+
 #include "ns3/address.h"
-#include "ns3/backoff.h"
 #include "ns3/callback.h"
 #include "ns3/data-rate.h"
 #include "ns3/mac48-address.h"

src/dsr/helper/dsr-main-helper.cc

@@ -30,7 +30,8 @@
 
 #include "dsr-main-helper.h"
 
-#include "ns3/dsr-helper.h"
+#include "dsr-helper.h"
+
 #include "ns3/dsr-rcache.h"
 #include "ns3/dsr-routing.h"
 #include "ns3/dsr-rreq-table.h"

src/dsr/helper/dsr-main-helper.h

@@ -31,7 +31,8 @@
 #ifndef DSR_MAIN_HELPER_H
 #define DSR_MAIN_HELPER_H
 
-#include "ns3/dsr-helper.h"
+#include "dsr-helper.h"
+
 #include "ns3/dsr-routing.h"
 #include "ns3/node-container.h"
 #include "ns3/node.h"

src/energy/helper/energy-harvester-helper.h

@@ -21,10 +21,11 @@
 #ifndef ENERGY_HARVESTER_HELPER_H
 #define ENERGY_HARVESTER_HELPER_H
 
+#include "energy-harvester-container.h"
+#include "energy-source-container.h"
+
 #include "ns3/attribute.h"
-#include "ns3/energy-harvester-container.h"
 #include "ns3/energy-harvester.h"
-#include "ns3/energy-source-container.h"
 #include "ns3/energy-source.h"
 #include "ns3/node-container.h"
 #include "ns3/object-factory.h"

src/energy/helper/generic-battery-model-helper.cc

@@ -17,7 +17,7 @@
  * Authors: Alberto Gallegos Ramonet <alramonet@is.tokushima-u.ac.jp>
  */
 
-#include <ns3/generic-battery-model-helper.h>
+#include "generic-battery-model-helper.h"
 
 namespace ns3
 {

src/energy/helper/generic-battery-model-helper.h

@@ -20,7 +20,8 @@
 #ifndef GENERIC_BATTERY_MODEL_HELPER_H_
 #define GENERIC_BATTERY_MODEL_HELPER_H_
 
-#include <ns3/energy-model-helper.h>
+#include "energy-model-helper.h"
+
 #include <ns3/generic-battery-model.h>
 #include <ns3/node.h>
 

src/energy/model/basic-energy-harvester.h

@@ -21,17 +21,16 @@
 #ifndef BASIC_ENERGY_HARVESTER
 #define BASIC_ENERGY_HARVESTER
 
-#include <iostream>
-
-// include from ns-3
+#include "device-energy-model.h"
 #include "energy-harvester.h"
 
-#include "ns3/device-energy-model.h"
 #include "ns3/event-id.h"
 #include "ns3/nstime.h"
 #include "ns3/random-variable-stream.h"
 #include "ns3/traced-value.h"
 
+#include <iostream>
+
 namespace ns3
 {
 

src/energy/model/device-energy-model-container.h

@@ -22,7 +22,7 @@
 #ifndef DEVICE_ENERGY_MODEL_CONTAINER_H
 #define DEVICE_ENERGY_MODEL_CONTAINER_H
 
-#include "ns3/device-energy-model.h"
+#include "device-energy-model.h"
 
 #include <stdint.h>
 #include <vector>

src/energy/model/energy-source.cc

@@ -22,7 +22,8 @@
  * Modifications made by: Cristiano Tapparello <cristiano.tapparello@rochester.edu>
  */
 
-#include <ns3/energy-source.h>
+#include "energy-source.h"
+
 #include <ns3/log.h>
 
 namespace ns3

src/energy/model/energy-source.h

@@ -26,8 +26,8 @@
 #define ENERGY_SOURCE_H
 
 #include "device-energy-model-container.h" // #include "device-energy-model.h"
+#include "energy-harvester.h"
 
-#include "ns3/energy-harvester.h"
 #include "ns3/node.h"
 #include "ns3/object.h"
 #include "ns3/ptr.h"

src/energy/model/generic-battery-model.cc

@@ -20,9 +20,10 @@
  *         Alberto Gallegos Ramonet <alramonet@is.tokushima-u.ac.jp>
  */
 
+#include "generic-battery-model.h"
+
 #include <ns3/assert.h>
 #include <ns3/double.h>
-#include <ns3/generic-battery-model.h>
 #include <ns3/log.h>
 #include <ns3/simulator.h>
 #include <ns3/trace-source-accessor.h>

src/energy/model/generic-battery-model.h

@@ -23,7 +23,8 @@
 #ifndef GENERIC_BATTERY_MODEL_H
 #define GENERIC_BATTERY_MODEL_H
 
-#include <ns3/energy-source.h>
+#include "energy-source.h"
+
 #include <ns3/event-id.h>
 #include <ns3/nstime.h>
 #include <ns3/traced-value.h>

src/energy/model/li-ion-energy-source.h

@@ -20,7 +20,8 @@
 #ifndef LI_ION_ENERGY_SOURCE_H
 #define LI_ION_ENERGY_SOURCE_H
 
-#include "ns3/energy-source.h"
+#include "energy-source.h"
+
 #include "ns3/event-id.h"
 #include "ns3/nstime.h"
 #include "ns3/traced-value.h"

src/energy/model/simple-device-energy-model.cc

@@ -19,7 +19,8 @@
 
 #include "simple-device-energy-model.h"
 
-#include "ns3/energy-source.h"
+#include "energy-source.h"
+
 #include "ns3/log.h"
 #include "ns3/simulator.h"
 #include "ns3/trace-source-accessor.h"

src/energy/model/simple-device-energy-model.h

@@ -20,7 +20,8 @@
 #ifndef SIMPLE_DEVICE_ENERGY_MODEL_H
 #define SIMPLE_DEVICE_ENERGY_MODEL_H
 
-#include "ns3/device-energy-model.h"
+#include "device-energy-model.h"
+
 #include "ns3/nstime.h"
 #include "ns3/traced-value.h"
 

src/fd-net-device/helper/dpdk-net-device-helper.h

@@ -21,7 +21,7 @@
 #ifndef DPDK_NET_DEVICE_HELPER_H
 #define DPDK_NET_DEVICE_HELPER_H
 
-#include "ns3/emu-fd-net-device-helper.h"
+#include "emu-fd-net-device-helper.h"
 
 namespace ns3
 {

src/fd-net-device/helper/emu-fd-net-device-helper.h

@@ -19,8 +19,9 @@
 #ifndef EMU_FD_NET_DEVICE_HELPER_H
 #define EMU_FD_NET_DEVICE_HELPER_H
 
+#include "fd-net-device-helper.h"
+
 #include "ns3/attribute.h"
-#include "ns3/fd-net-device-helper.h"
 #include "ns3/fd-net-device.h"
 #include "ns3/net-device-container.h"
 #include "ns3/node-container.h"

src/fd-net-device/helper/netmap-net-device-helper.h

@@ -20,8 +20,9 @@
 #ifndef NETMAP_NET_DEVICE_HELPER_H
 #define NETMAP_NET_DEVICE_HELPER_H
 
+#include "fd-net-device-helper.h"
+
 #include "ns3/attribute.h"
-#include "ns3/fd-net-device-helper.h"
 #include "ns3/fd-net-device.h"
 #include "ns3/net-device-container.h"
 #include "ns3/netmap-net-device.h"

src/flow-monitor/model/flow-monitor.h

@@ -20,9 +20,10 @@
 #ifndef FLOW_MONITOR_H
 #define FLOW_MONITOR_H
 
+#include "flow-classifier.h"
+#include "flow-probe.h"
+
 #include "ns3/event-id.h"
-#include "ns3/flow-classifier.h"
-#include "ns3/flow-probe.h"
 #include "ns3/histogram.h"
 #include "ns3/nstime.h"
 #include "ns3/object.h"

src/flow-monitor/model/flow-probe.cc

@@ -17,9 +17,9 @@
 // Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>
 //
 
-#include "ns3/flow-probe.h"
+#include "flow-probe.h"
 
-#include "ns3/flow-monitor.h"
+#include "flow-monitor.h"
 
 namespace ns3
 {

src/flow-monitor/model/flow-probe.h

@@ -20,7 +20,8 @@
 #ifndef FLOW_PROBE_H
 #define FLOW_PROBE_H
 
-#include "ns3/flow-classifier.h"
+#include "flow-classifier.h"
+
 #include "ns3/nstime.h"
 #include "ns3/object.h"
 

src/flow-monitor/model/ipv4-flow-classifier.h

@@ -20,7 +20,8 @@
 #ifndef IPV4_FLOW_CLASSIFIER_H
 #define IPV4_FLOW_CLASSIFIER_H
 
-#include "ns3/flow-classifier.h"
+#include "flow-classifier.h"
+
 #include "ns3/ipv4-header.h"
 
 #include <map>

src/flow-monitor/model/ipv4-flow-probe.cc

@@ -17,12 +17,13 @@
 // Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>
 //
 
-#include "ns3/ipv4-flow-probe.h"
+#include "ipv4-flow-probe.h"
+
+#include "flow-monitor.h"
+#include "ipv4-flow-classifier.h"
 
 #include "ns3/config.h"
 #include "ns3/flow-id-tag.h"
-#include "ns3/flow-monitor.h"
-#include "ns3/ipv4-flow-classifier.h"
 #include "ns3/log.h"
 #include "ns3/node.h"
 #include "ns3/packet.h"

src/flow-monitor/model/ipv4-flow-probe.h

@@ -20,8 +20,9 @@
 #ifndef IPV4_FLOW_PROBE_H
 #define IPV4_FLOW_PROBE_H
 
-#include "ns3/flow-probe.h"
-#include "ns3/ipv4-flow-classifier.h"
+#include "flow-probe.h"
+#include "ipv4-flow-classifier.h"
+
 #include "ns3/ipv4-l3-protocol.h"
 #include "ns3/queue-item.h"
 

src/flow-monitor/model/ipv6-flow-classifier.h

@@ -21,7 +21,8 @@
 #ifndef IPV6_FLOW_CLASSIFIER_H
 #define IPV6_FLOW_CLASSIFIER_H
 
-#include "ns3/flow-classifier.h"
+#include "flow-classifier.h"
+
 #include "ns3/ipv6-header.h"
 
 #include <map>

src/flow-monitor/model/ipv6-flow-probe.cc

@@ -18,12 +18,13 @@
 // Modifications: Tommaso Pecorella <tommaso.pecorella@unifi.it>
 //
 
-#include "ns3/ipv6-flow-probe.h"
+#include "ipv6-flow-probe.h"
+
+#include "flow-monitor.h"
+#include "ipv6-flow-classifier.h"
 
 #include "ns3/config.h"
 #include "ns3/flow-id-tag.h"
-#include "ns3/flow-monitor.h"
-#include "ns3/ipv6-flow-classifier.h"
 #include "ns3/log.h"
 #include "ns3/node.h"
 #include "ns3/packet.h"

src/flow-monitor/model/ipv6-flow-probe.h

@@ -21,8 +21,9 @@
 #ifndef IPV6_FLOW_PROBE_H
 #define IPV6_FLOW_PROBE_H
 
-#include "ns3/flow-probe.h"
-#include "ns3/ipv6-flow-classifier.h"
+#include "flow-probe.h"
+#include "ipv6-flow-classifier.h"
+
 #include "ns3/ipv6-l3-protocol.h"
 #include "ns3/queue-item.h"
 

src/internet/helper/internet-trace-helper.h

@@ -18,10 +18,11 @@
 #ifndef INTERNET_TRACE_HELPER_H
 #define INTERNET_TRACE_HELPER_H
 
+#include "ipv4-interface-container.h"
+#include "ipv6-interface-container.h"
+
 #include "ns3/assert.h"
-#include "ns3/ipv4-interface-container.h"
 #include "ns3/ipv4.h"
-#include "ns3/ipv6-interface-container.h"
 #include "ns3/ipv6.h"
 #include "ns3/trace-helper.h"
 

src/internet/helper/ipv4-global-routing-helper.h

@@ -19,7 +19,8 @@
 #ifndef IPV4_GLOBAL_ROUTING_HELPER_H
 #define IPV4_GLOBAL_ROUTING_HELPER_H
 
-#include "ns3/ipv4-routing-helper.h"
+#include "ipv4-routing-helper.h"
+
 #include "ns3/node-container.h"
 
 namespace ns3

src/internet/helper/ipv4-list-routing-helper.h

@@ -19,7 +19,7 @@
 #ifndef IPV4_LIST_ROUTING_HELPER_H
 #define IPV4_LIST_ROUTING_HELPER_H
 
-#include "ns3/ipv4-routing-helper.h"
+#include "ipv4-routing-helper.h"
 
 #include <list>
 #include <stdint.h>

src/internet/helper/ipv4-static-routing-helper.h

@@ -18,8 +18,9 @@
 #ifndef IPV4_STATIC_ROUTING_HELPER_H
 #define IPV4_STATIC_ROUTING_HELPER_H
 
+#include "ipv4-routing-helper.h"
+
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-routing-helper.h"
 #include "ns3/ipv4-static-routing.h"
 #include "ns3/ipv4.h"
 #include "ns3/net-device-container.h"

src/internet/helper/ipv6-list-routing-helper.h

@@ -19,7 +19,7 @@
 #ifndef IPV6_LIST_ROUTING_HELPER_H
 #define IPV6_LIST_ROUTING_HELPER_H
 
-#include "ns3/ipv6-routing-helper.h"
+#include "ipv6-routing-helper.h"
 
 #include <list>
 #include <stdint.h>

src/internet/helper/ipv6-static-routing-helper.h

@@ -18,8 +18,9 @@
 #ifndef IPV6_STATIC_ROUTING_HELPER_H
 #define IPV6_STATIC_ROUTING_HELPER_H
 
+#include "ipv6-routing-helper.h"
+
 #include "ns3/ipv6-address.h"
-#include "ns3/ipv6-routing-helper.h"
 #include "ns3/ipv6-static-routing.h"
 #include "ns3/ipv6.h"
 #include "ns3/net-device-container.h"

src/internet/helper/neighbor-cache-helper.h

@@ -20,16 +20,17 @@
 #ifndef NEIGHBOR_CACHE_HELPER_H
 #define NEIGHBOR_CACHE_HELPER_H
 
+#include "ipv4-interface-container.h"
+#include "ipv6-interface-container.h"
+
 #include "ns3/arp-cache.h"
 #include "ns3/arp-header.h"
 #include "ns3/arp-l3-protocol.h"
 #include "ns3/channel.h"
 #include "ns3/icmpv6-l4-protocol.h"
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-interface-container.h"
 #include "ns3/ipv4-interface.h"
 #include "ns3/ipv4-l3-protocol.h"
-#include "ns3/ipv6-interface-container.h"
 #include "ns3/ipv6-interface.h"
 #include "ns3/ipv6-l3-protocol.h"
 #include "ns3/net-device-container.h"

src/internet/helper/rip-helper.h

@@ -20,7 +20,8 @@
 #ifndef RIP_HELPER_H
 #define RIP_HELPER_H
 
-#include "ns3/ipv4-routing-helper.h"
+#include "ipv4-routing-helper.h"
+
 #include "ns3/node-container.h"
 #include "ns3/node.h"
 #include "ns3/object-factory.h"

src/internet/helper/ripng-helper.h

@@ -20,7 +20,8 @@
 #ifndef RIPNG_HELPER_H
 #define RIPNG_HELPER_H
 
-#include "ns3/ipv6-routing-helper.h"
+#include "ipv6-routing-helper.h"
+
 #include "ns3/node-container.h"
 #include "ns3/node.h"
 #include "ns3/object-factory.h"

src/internet/model/arp-l3-protocol.h

@@ -19,8 +19,9 @@
 #ifndef ARP_L3_PROTOCOL_H
 #define ARP_L3_PROTOCOL_H
 
+#include "ipv4-header.h"
+
 #include "ns3/address.h"
-#include "ns3/ipv4-header.h"
 #include "ns3/net-device.h"
 #include "ns3/ptr.h"
 #include "ns3/random-variable-stream.h"

src/internet/model/global-router-interface.h

@@ -21,11 +21,12 @@
 #ifndef GLOBAL_ROUTER_INTERFACE_H
 #define GLOBAL_ROUTER_INTERFACE_H
 
+#include "global-route-manager.h"
+#include "ipv4-routing-table-entry.h"
+
 #include "ns3/bridge-net-device.h"
 #include "ns3/channel.h"
-#include "ns3/global-route-manager.h"
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-routing-table-entry.h"
 #include "ns3/net-device-container.h"
 #include "ns3/node.h"
 #include "ns3/object.h"

src/internet/model/icmpv4.h

@@ -20,8 +20,9 @@
 #ifndef ICMPV4_H
 #define ICMPV4_H
 
+#include "ipv4-header.h"
+
 #include "ns3/header.h"
-#include "ns3/ipv4-header.h"
 #include "ns3/ptr.h"
 
 #include <stdint.h>

src/internet/model/ipv4-end-point.h

@@ -20,10 +20,11 @@
 #ifndef IPV4_END_POINT_H
 #define IPV4_END_POINT_H
 
+#include "ipv4-header.h"
+#include "ipv4-interface.h"
+
 #include "ns3/callback.h"
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/ipv4-interface.h"
 #include "ns3/net-device.h"
 
 #include <stdint.h>

src/internet/model/ipv4-global-routing.h

@@ -19,10 +19,11 @@
 #ifndef IPV4_GLOBAL_ROUTING_H
 #define IPV4_GLOBAL_ROUTING_H
 
+#include "ipv4-header.h"
+#include "ipv4-routing-protocol.h"
+#include "ipv4.h"
+
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/ipv4-routing-protocol.h"
-#include "ns3/ipv4.h"
 #include "ns3/ptr.h"
 #include "ns3/random-variable-stream.h"
 

src/internet/model/ipv4-l3-protocol.h

@@ -20,10 +20,11 @@
 #ifndef IPV4_L3_PROTOCOL_H
 #define IPV4_L3_PROTOCOL_H
 
+#include "ipv4-header.h"
+#include "ipv4-routing-protocol.h"
+#include "ipv4.h"
+
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/ipv4-routing-protocol.h"
-#include "ns3/ipv4.h"
 #include "ns3/net-device.h"
 #include "ns3/nstime.h"
 #include "ns3/ptr.h"

src/internet/model/ipv4-list-routing.h

@@ -18,7 +18,8 @@
 #ifndef IPV4_LIST_ROUTING_H
 #define IPV4_LIST_ROUTING_H
 
-#include "ns3/ipv4-routing-protocol.h"
+#include "ipv4-routing-protocol.h"
+
 #include "ns3/nstime.h"
 #include "ns3/simulator.h"
 

src/internet/model/ipv4-packet-probe.h

@@ -23,9 +23,10 @@
 #ifndef IPV4_PACKET_PROBE_H
 #define IPV4_PACKET_PROBE_H
 
+#include "ipv4.h"
+
 #include "ns3/boolean.h"
 #include "ns3/callback.h"
-#include "ns3/ipv4.h"
 #include "ns3/nstime.h"
 #include "ns3/object.h"
 #include "ns3/packet.h"

src/internet/model/ipv4-raw-socket-factory-impl.h

@@ -20,7 +20,7 @@
 #ifndef IPV4_RAW_SOCKET_FACTORY_IMPL_H
 #define IPV4_RAW_SOCKET_FACTORY_IMPL_H
 
-#include "ns3/ipv4-raw-socket-factory.h"
+#include "ipv4-raw-socket-factory.h"
 
 namespace ns3
 {

src/internet/model/ipv4-raw-socket-impl.h

@@ -1,9 +1,10 @@
 #ifndef IPV4_RAW_SOCKET_IMPL_H
 #define IPV4_RAW_SOCKET_IMPL_H
 
-#include "ns3/ipv4-header.h"
-#include "ns3/ipv4-interface.h"
-#include "ns3/ipv4-route.h"
+#include "ipv4-header.h"
+#include "ipv4-interface.h"
+#include "ipv4-route.h"
+
 #include "ns3/socket.h"
 
 #include <list>

src/internet/model/ipv4-routing-protocol.h

@@ -18,10 +18,10 @@
 #define IPV4_ROUTING_PROTOCOL_H
 
 #include "ipv4-header.h"
+#include "ipv4-interface-address.h"
 #include "ipv4.h"
 
 #include "ns3/callback.h"
-#include "ns3/ipv4-interface-address.h"
 #include "ns3/nstime.h"
 #include "ns3/object.h"
 #include "ns3/output-stream-wrapper.h"

src/internet/model/ipv4-static-routing.h

@@ -21,10 +21,11 @@
 #ifndef IPV4_STATIC_ROUTING_H
 #define IPV4_STATIC_ROUTING_H
 
+#include "ipv4-header.h"
+#include "ipv4-routing-protocol.h"
+#include "ipv4.h"
+
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/ipv4-routing-protocol.h"
-#include "ns3/ipv4.h"
 #include "ns3/ptr.h"
 #include "ns3/socket.h"
 

src/internet/model/ipv6-end-point.h

@@ -20,10 +20,11 @@
 #ifndef IPV6_END_POINT_H
 #define IPV6_END_POINT_H
 
+#include "ipv6-header.h"
+#include "ipv6-interface.h"
+
 #include "ns3/callback.h"
 #include "ns3/ipv6-address.h"
-#include "ns3/ipv6-header.h"
-#include "ns3/ipv6-interface.h"
 #include "ns3/net-device.h"
 
 #include <stdint.h>

src/internet/model/ipv6-extension.h

@@ -21,12 +21,12 @@
 #define IPV6_EXTENSION_H
 
 #include "ipv6-extension-header.h"
+#include "ipv6-header.h"
 #include "ipv6-interface.h"
+#include "ipv6-l3-protocol.h"
 
 #include "ns3/buffer.h"
 #include "ns3/ipv6-address.h"
-#include "ns3/ipv6-header.h"
-#include "ns3/ipv6-l3-protocol.h"
 #include "ns3/node.h"
 #include "ns3/object.h"
 #include "ns3/packet.h"

src/internet/model/ipv6-l3-protocol.h

@@ -20,11 +20,12 @@
 #ifndef IPV6_L3_PROTOCOL_H
 #define IPV6_L3_PROTOCOL_H
 
+#include "ipv6-header.h"
+#include "ipv6-pmtu-cache.h"
+#include "ipv6-routing-protocol.h"
+#include "ipv6.h"
+
 #include "ns3/ipv6-address.h"
-#include "ns3/ipv6-header.h"
-#include "ns3/ipv6-pmtu-cache.h"
-#include "ns3/ipv6-routing-protocol.h"
-#include "ns3/ipv6.h"
 #include "ns3/net-device.h"
 #include "ns3/traced-callback.h"
 

src/internet/model/ipv6-list-routing.h

@@ -18,7 +18,7 @@
 #ifndef IPV6_LIST_ROUTING_H
 #define IPV6_LIST_ROUTING_H
 
-#include "ns3/ipv6-routing-protocol.h"
+#include "ipv6-routing-protocol.h"
 
 #include <list>
 

src/internet/model/ipv6-option.h

@@ -20,11 +20,11 @@
 #ifndef IPV6_OPTION_H
 #define IPV6_OPTION_H
 
+#include "ipv6-header.h"
 #include "ipv6-interface.h"
 
 #include "ns3/buffer.h"
 #include "ns3/ipv6-address.h"
-#include "ns3/ipv6-header.h"
 #include "ns3/node.h"
 #include "ns3/object.h"
 #include "ns3/packet.h"

src/internet/model/ipv6-packet-probe.h

@@ -24,9 +24,10 @@
 #ifndef IPV6_PACKET_PROBE_H
 #define IPV6_PACKET_PROBE_H
 
+#include "ipv6.h"
+
 #include "ns3/boolean.h"
 #include "ns3/callback.h"
-#include "ns3/ipv6.h"
 #include "ns3/nstime.h"
 #include "ns3/object.h"
 #include "ns3/packet.h"