From aedd34ca8fb37348b8da554f71c2508ef43e4b91 Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Tue, 12 Sep 2023 16:55:35 +0100 Subject: [PATCH] Fix local #include headers by removing the "ns3/" prefix --- src/antenna/model/antenna-model.h | 3 ++- src/antenna/model/cosine-antenna-model.h | 3 ++- src/antenna/model/isotropic-antenna-model.h | 3 ++- src/antenna/model/parabolic-antenna-model.h | 3 ++- src/antenna/model/phased-array-model.cc | 3 ++- src/antenna/model/phased-array-model.h | 5 +++-- src/antenna/model/three-gpp-antenna-model.h | 3 ++- src/antenna/model/uniform-planar-array.h | 3 ++- src/applications/model/application-packet-probe.cc | 2 +- src/applications/model/bulk-send-application.h | 3 ++- src/applications/model/onoff-application.h | 3 ++- src/applications/model/packet-sink.h | 3 ++- src/applications/model/seq-ts-size-header.h | 2 +- src/applications/model/three-gpp-http-client.cc | 3 ++- src/applications/model/three-gpp-http-client.h | 3 ++- src/applications/model/three-gpp-http-server.cc | 3 ++- src/applications/model/three-gpp-http-server.h | 3 ++- src/bridge/model/bridge-net-device.h | 3 ++- src/buildings/helper/building-allocator.h | 3 ++- src/buildings/helper/building-position-allocator.cc | 3 ++- .../model/buildings-channel-condition-model.cc | 7 ++++--- .../model/buildings-propagation-loss-model.cc | 3 ++- .../model/buildings-propagation-loss-model.h | 5 +++-- .../model/hybrid-buildings-propagation-loss-model.cc | 5 +++-- .../model/hybrid-buildings-propagation-loss-model.h | 3 ++- .../model/itu-r-1238-propagation-loss-model.cc | 3 ++- src/buildings/model/mobility-building-info.cc | 6 ++++-- src/buildings/model/mobility-building-info.h | 3 ++- .../model/oh-buildings-propagation-loss-model.cc | 3 ++- .../model/oh-buildings-propagation-loss-model.h | 2 +- .../model/random-walk-2d-outdoor-mobility-model.cc | 5 +++-- .../model/random-walk-2d-outdoor-mobility-model.h | 3 ++- .../model/three-gpp-v2v-channel-condition-model.cc | 3 ++- src/click/model/ipv4-click-routing.cc | 3 ++- src/click/model/ipv4-l3-click-protocol.cc | 3 ++- src/core/model/ascii-test.h | 3 +-- src/core/model/attribute-container.h | 4 ++-- src/core/model/environment-variable.cc | 2 +- src/core/model/example-as-test.h | 2 +- src/core/model/length.cc | 4 ++-- src/core/model/pair.h | 4 ++-- src/core/model/tuple.h | 4 ++-- src/core/model/unused.h | 2 +- src/core/model/val-array.h | 4 ++-- src/core/model/version.h | 2 +- src/csma-layout/model/csma-star-helper.cc | 8 ++++---- src/csma/model/csma-net-device.h | 3 ++- src/dsr/helper/dsr-main-helper.cc | 3 ++- src/dsr/helper/dsr-main-helper.h | 3 ++- src/energy/helper/energy-harvester-helper.h | 5 +++-- src/energy/helper/generic-battery-model-helper.cc | 2 +- src/energy/helper/generic-battery-model-helper.h | 3 ++- src/energy/model/basic-energy-harvester.h | 7 +++---- src/energy/model/device-energy-model-container.h | 2 +- src/energy/model/energy-source.cc | 3 ++- src/energy/model/energy-source.h | 2 +- src/energy/model/generic-battery-model.cc | 3 ++- src/energy/model/generic-battery-model.h | 3 ++- src/energy/model/li-ion-energy-source.h | 3 ++- src/energy/model/simple-device-energy-model.cc | 3 ++- src/energy/model/simple-device-energy-model.h | 3 ++- src/fd-net-device/helper/dpdk-net-device-helper.h | 2 +- src/fd-net-device/helper/emu-fd-net-device-helper.h | 3 ++- src/fd-net-device/helper/netmap-net-device-helper.h | 3 ++- src/flow-monitor/model/flow-monitor.h | 5 +++-- src/flow-monitor/model/flow-probe.cc | 4 ++-- src/flow-monitor/model/flow-probe.h | 3 ++- src/flow-monitor/model/ipv4-flow-classifier.h | 3 ++- src/flow-monitor/model/ipv4-flow-probe.cc | 7 ++++--- src/flow-monitor/model/ipv4-flow-probe.h | 5 +++-- src/flow-monitor/model/ipv6-flow-classifier.h | 3 ++- src/flow-monitor/model/ipv6-flow-probe.cc | 7 ++++--- src/flow-monitor/model/ipv6-flow-probe.h | 5 +++-- src/internet/helper/internet-trace-helper.h | 5 +++-- src/internet/helper/ipv4-global-routing-helper.h | 3 ++- src/internet/helper/ipv4-list-routing-helper.h | 2 +- src/internet/helper/ipv4-static-routing-helper.h | 3 ++- src/internet/helper/ipv6-list-routing-helper.h | 2 +- src/internet/helper/ipv6-static-routing-helper.h | 3 ++- src/internet/helper/neighbor-cache-helper.h | 5 +++-- src/internet/helper/rip-helper.h | 3 ++- src/internet/helper/ripng-helper.h | 3 ++- src/internet/model/arp-l3-protocol.h | 3 ++- src/internet/model/global-router-interface.h | 5 +++-- src/internet/model/icmpv4.h | 3 ++- src/internet/model/ipv4-end-point.h | 5 +++-- src/internet/model/ipv4-global-routing.h | 7 ++++--- src/internet/model/ipv4-l3-protocol.h | 7 ++++--- src/internet/model/ipv4-list-routing.h | 3 ++- src/internet/model/ipv4-packet-probe.h | 3 ++- src/internet/model/ipv4-raw-socket-factory-impl.h | 2 +- src/internet/model/ipv4-raw-socket-impl.h | 7 ++++--- src/internet/model/ipv4-routing-protocol.h | 2 +- src/internet/model/ipv4-static-routing.h | 7 ++++--- src/internet/model/ipv6-end-point.h | 5 +++-- src/internet/model/ipv6-extension.h | 4 ++-- src/internet/model/ipv6-l3-protocol.h | 9 +++++---- src/internet/model/ipv6-list-routing.h | 2 +- src/internet/model/ipv6-option.h | 2 +- src/internet/model/ipv6-packet-probe.h | 3 ++- src/internet/model/ipv6-raw-socket-factory-impl.h | 2 +- src/internet/model/ipv6-raw-socket-impl.h | 3 ++- src/internet/model/ipv6-static-routing.h | 7 ++++--- src/internet/model/rip-header.h | 3 ++- src/internet/model/rip.h | 11 ++++++----- src/internet/model/ripng-header.h | 3 ++- src/internet/model/ripng.h | 11 ++++++----- src/internet/model/tcp-bbr.h | 5 +++-- src/internet/model/tcp-bic.h | 4 ++-- src/internet/model/tcp-cubic.h | 4 ++-- src/internet/model/tcp-dctcp.h | 5 +++-- src/internet/model/tcp-header.h | 5 +++-- src/internet/model/tcp-linux-reno.h | 4 ++-- src/internet/model/tcp-option-rfc793.h | 2 +- src/internet/model/tcp-option-sack-permitted.h | 2 +- src/internet/model/tcp-option-sack.h | 3 ++- src/internet/model/tcp-option-ts.h | 3 ++- src/internet/model/tcp-option-winscale.h | 2 +- src/internet/model/tcp-prr-recovery.h | 2 +- src/internet/model/tcp-rate-ops.h | 3 ++- src/internet/model/tcp-rx-buffer.h | 5 +++-- src/internet/model/tcp-socket-base.h | 9 +++++---- src/internet/model/tcp-socket-factory-impl.h | 3 ++- src/internet/model/tcp-tx-buffer.h | 5 +++-- src/internet/model/tcp-westwood-plus.h | 2 +- src/internet/model/tcp-yeah.h | 4 ++-- src/internet/model/udp-socket-factory-impl.h | 3 ++- src/internet/model/udp-socket-impl.h | 4 ++-- src/lr-wpan/model/lr-wpan-csmaca.h | 3 ++- src/lr-wpan/model/lr-wpan-mac.h | 5 +++-- src/lr-wpan/model/lr-wpan-net-device.h | 3 ++- src/mesh/helper/dot11s/dot11s-installer.cc | 2 +- src/mesh/helper/flame/flame-installer.cc | 2 +- src/mesh/helper/mesh-helper.h | 3 ++- src/mesh/helper/mesh-stack-installer.cc | 2 +- src/mesh/model/dot11s/hwmp-protocol-mac.h | 3 ++- src/mesh/model/dot11s/hwmp-rtable.h | 3 ++- src/mesh/model/dot11s/ie-dot11s-perr.h | 3 ++- src/mesh/model/dot11s/peer-link.cc | 2 +- src/mesh/model/dot11s/peer-link.h | 7 ++++--- src/mesh/model/dot11s/peer-management-protocol.cc | 2 +- src/mesh/model/mesh-l2-routing-protocol.cc | 5 +++-- src/mesh/model/mesh-point-device.cc | 5 +++-- src/mesh/model/mesh-point-device.h | 3 ++- src/mesh/model/mesh-wifi-beacon.cc | 2 +- src/mesh/model/mesh-wifi-beacon.h | 3 ++- src/mesh/model/mesh-wifi-interface-mac-plugin.h | 3 ++- src/mesh/model/mesh-wifi-interface-mac.cc | 5 +++-- src/mesh/model/mesh-wifi-interface-mac.h | 3 ++- src/mobility/helper/group-mobility-helper.cc | 2 +- src/mobility/helper/mobility-helper.cc | 2 +- src/mobility/model/constant-velocity-helper.cc | 5 +++-- src/mobility/model/constant-velocity-helper.h | 3 ++- src/mobility/model/gauss-markov-mobility-model.h | 2 +- .../model/random-direction-2d-mobility-model.h | 2 +- src/mobility/model/random-walk-2d-mobility-model.h | 2 +- src/mpi/model/null-message-mpi-interface.cc | 2 +- src/netanim/model/animation-interface.cc | 1 - src/network/helper/packet-socket-helper.h | 2 +- src/network/helper/simple-net-device-helper.cc | 3 ++- src/network/helper/simple-net-device-helper.h | 5 +++-- src/network/helper/trace-helper.h | 5 +++-- src/network/model/address.h | 3 ++- src/network/model/application.cc | 3 ++- src/network/model/application.h | 3 ++- src/network/model/nix-vector.h | 3 ++- src/network/model/node.cc | 2 +- src/network/model/node.h | 3 ++- src/network/model/socket.cc | 2 +- src/network/model/socket.h | 4 ++-- src/network/utils/drop-tail-queue.h | 2 +- src/network/utils/error-channel.cc | 3 ++- src/network/utils/error-channel.h | 7 ++++--- src/network/utils/ethernet-header.h | 3 ++- src/network/utils/ipv6-address.h | 2 +- src/network/utils/net-device-queue-interface.cc | 7 ++++--- src/network/utils/packet-data-calculators.cc | 3 ++- src/network/utils/packet-data-calculators.h | 3 ++- src/network/utils/packet-probe.cc | 2 +- src/network/utils/packet-socket-client.cc | 7 ++++--- src/network/utils/packet-socket-client.h | 3 ++- src/network/utils/packet-socket-server.cc | 7 ++++--- src/network/utils/packet-socket-server.h | 3 ++- src/network/utils/packetbb.cc | 5 +++-- src/network/utils/queue.h | 7 ++++--- src/network/utils/simple-net-device.cc | 4 ++-- src/network/utils/simple-net-device.h | 4 ++-- .../model/point-to-point-dumbbell.cc | 10 +++++----- .../model/point-to-point-grid.cc | 2 +- .../model/point-to-point-star.cc | 10 +++++----- .../model/cost231-propagation-loss-model.cc | 3 ++- .../model/cost231-propagation-loss-model.h | 3 ++- .../model/itu-r-1411-los-propagation-loss-model.h | 2 +- ...-r-1411-nlos-over-rooftop-propagation-loss-model.h | 4 ++-- src/propagation/model/jakes-propagation-loss-model.h | 6 +++--- .../model/kun-2600-mhz-propagation-loss-model.h | 2 +- .../model/okumura-hata-propagation-loss-model.h | 4 ++-- .../model/probabilistic-v2v-channel-condition-model.h | 2 +- .../model/three-gpp-propagation-loss-model.cc | 3 ++- .../model/three-gpp-propagation-loss-model.h | 4 ++-- .../model/constant-spectrum-propagation-loss.cc | 2 +- .../model/constant-spectrum-propagation-loss.h | 2 +- src/spectrum/model/friis-spectrum-propagation-loss.cc | 3 ++- src/spectrum/model/friis-spectrum-propagation-loss.h | 2 +- .../model/half-duplex-ideal-phy-signal-parameters.h | 2 +- src/spectrum/model/half-duplex-ideal-phy.h | 11 ++++++----- src/spectrum/model/ism-spectrum-value-helper.h | 2 +- .../model/microwave-oven-spectrum-value-helper.h | 2 +- src/spectrum/model/multi-model-spectrum-channel.cc | 9 +++++---- src/spectrum/model/multi-model-spectrum-channel.h | 9 +++++---- .../phased-array-spectrum-propagation-loss-model.cc | 3 ++- .../phased-array-spectrum-propagation-loss-model.h | 3 ++- src/spectrum/model/single-model-spectrum-channel.cc | 7 ++++--- src/spectrum/model/single-model-spectrum-channel.h | 5 +++-- src/spectrum/model/spectrum-analyzer.h | 7 ++++--- src/spectrum/model/spectrum-channel.h | 11 ++++++----- src/spectrum/model/spectrum-converter.cc | 3 ++- src/spectrum/model/spectrum-converter.h | 2 +- src/spectrum/model/spectrum-error-model.h | 3 ++- src/spectrum/model/spectrum-interference.h | 3 ++- .../model/spectrum-model-300kHz-300GHz-log.cc | 2 +- src/spectrum/model/spectrum-model-300kHz-300GHz-log.h | 2 +- .../model/spectrum-model-ism2400MHz-res1MHz.cc | 2 +- .../model/spectrum-model-ism2400MHz-res1MHz.h | 2 +- src/spectrum/model/spectrum-model.cc | 3 ++- src/spectrum/model/spectrum-phy.cc | 5 +++-- src/spectrum/model/spectrum-propagation-loss-model.h | 3 ++- src/spectrum/model/spectrum-signal-parameters.cc | 8 +++++--- src/spectrum/model/spectrum-value.cc | 3 ++- src/spectrum/model/spectrum-value.h | 3 ++- src/spectrum/model/three-gpp-channel-model.h | 3 ++- .../model/three-gpp-spectrum-propagation-loss-model.h | 5 +++-- src/spectrum/model/trace-fading-loss-model.cc | 5 +++-- src/spectrum/model/trace-fading-loss-model.h | 3 ++- src/spectrum/model/tv-spectrum-transmitter.h | 9 +++++---- .../model/two-ray-spectrum-propagation-loss-model.h | 5 +++-- src/spectrum/model/waveform-generator.h | 7 ++++--- src/spectrum/model/wifi-spectrum-value-helper.h | 2 +- src/stats/model/average.h | 3 ++- src/stats/model/boolean-probe.cc | 2 +- src/stats/model/boolean-probe.h | 3 ++- src/stats/model/data-output-interface.h | 3 ++- src/stats/model/double-probe.cc | 2 +- src/stats/model/double-probe.h | 3 ++- src/stats/model/file-aggregator.h | 2 +- src/stats/model/gnuplot-aggregator.h | 4 ++-- src/stats/model/probe.cc | 2 +- src/stats/model/probe.h | 3 ++- src/stats/model/time-probe.cc | 2 +- src/stats/model/time-probe.h | 3 ++- src/stats/model/time-series-adaptor.cc | 2 +- src/stats/model/time-series-adaptor.h | 3 ++- src/stats/model/uinteger-16-probe.cc | 2 +- src/stats/model/uinteger-16-probe.h | 3 ++- src/stats/model/uinteger-32-probe.cc | 2 +- src/stats/model/uinteger-32-probe.h | 3 ++- src/stats/model/uinteger-8-probe.cc | 2 +- src/stats/model/uinteger-8-probe.h | 3 ++- src/topology-read/helper/topology-reader-helper.cc | 2 +- src/traffic-control/helper/traffic-control-helper.h | 3 ++- src/traffic-control/model/cobalt-queue-disc.h | 3 ++- src/traffic-control/model/codel-queue-disc.h | 3 ++- src/traffic-control/model/fifo-queue-disc.h | 2 +- src/traffic-control/model/fq-cobalt-queue-disc.h | 3 ++- src/traffic-control/model/fq-codel-queue-disc.h | 3 ++- src/traffic-control/model/fq-pie-queue-disc.h | 3 ++- src/traffic-control/model/mq-queue-disc.h | 2 +- src/traffic-control/model/pfifo-fast-queue-disc.h | 2 +- src/traffic-control/model/pie-queue-disc.h | 3 ++- src/traffic-control/model/prio-queue-disc.h | 2 +- src/traffic-control/model/red-queue-disc.h | 3 ++- src/traffic-control/model/tbf-queue-disc.h | 3 ++- src/traffic-control/model/traffic-control-layer.cc | 3 ++- src/uan/model/acoustic-modem-energy-model.cc | 5 +++-- src/uan/model/uan-channel.h | 5 +++-- src/uan/model/uan-mac-cw.cc | 3 ++- src/uan/model/uan-mac-cw.h | 7 ++++--- src/uan/model/uan-noise-model-default.h | 3 ++- src/uan/model/uan-phy-dual.h | 2 +- src/uan/model/uan-phy-gen.cc | 4 ++-- src/uan/model/uan-phy.h | 9 +++++---- src/uan/model/uan-transducer-hd.cc | 2 +- src/uan/model/uan-transducer.h | 2 +- src/wifi/model/eht/eht-frame-exchange-manager.cc | 2 +- src/wifi/model/frame-exchange-manager.h | 6 +++--- src/wifi/model/interference-helper.cc | 2 +- src/wifi/model/spectrum-wifi-phy.cc | 2 +- src/wifi/model/wifi-mgt-header.h | 2 +- src/wifi/model/wifi-ppdu.cc | 2 +- src/wifi/model/yans-wifi-channel.cc | 2 +- src/wimax/model/bs-net-device.h | 2 +- src/wimax/model/simple-ofdm-wimax-phy.h | 2 +- src/wimax/model/snr-to-block-error-rate-manager.cc | 4 ++-- src/wimax/model/snr-to-block-error-rate-manager.h | 3 ++- src/wimax/model/snr-to-block-error-rate-record.cc | 2 +- src/wimax/model/ss-net-device.h | 2 +- 296 files changed, 624 insertions(+), 442 deletions(-) diff --git a/src/antenna/model/antenna-model.h b/src/antenna/model/antenna-model.h index 788bbf39d..5dd0871dd 100644 --- a/src/antenna/model/antenna-model.h +++ b/src/antenna/model/antenna-model.h @@ -20,7 +20,8 @@ #ifndef ANTENNA_MODEL_H #define ANTENNA_MODEL_H -#include +#include "angles.h" + #include namespace ns3 diff --git a/src/antenna/model/cosine-antenna-model.h b/src/antenna/model/cosine-antenna-model.h index 825b2fce6..a2b653059 100644 --- a/src/antenna/model/cosine-antenna-model.h +++ b/src/antenna/model/cosine-antenna-model.h @@ -20,7 +20,8 @@ #ifndef COSINE_ANTENNA_MODEL_H #define COSINE_ANTENNA_MODEL_H -#include +#include "antenna-model.h" + #include namespace ns3 diff --git a/src/antenna/model/isotropic-antenna-model.h b/src/antenna/model/isotropic-antenna-model.h index f8e976eb8..7d15bacf8 100644 --- a/src/antenna/model/isotropic-antenna-model.h +++ b/src/antenna/model/isotropic-antenna-model.h @@ -20,7 +20,8 @@ #ifndef ISOTROPIC_ANTENNA_MODEL_H #define ISOTROPIC_ANTENNA_MODEL_H -#include +#include "antenna-model.h" + #include namespace ns3 diff --git a/src/antenna/model/parabolic-antenna-model.h b/src/antenna/model/parabolic-antenna-model.h index 720b51673..05afd9fdb 100644 --- a/src/antenna/model/parabolic-antenna-model.h +++ b/src/antenna/model/parabolic-antenna-model.h @@ -20,7 +20,8 @@ #ifndef PARABOLIC_ANTENNA_MODEL_H #define PARABOLIC_ANTENNA_MODEL_H -#include +#include "antenna-model.h" + #include namespace ns3 diff --git a/src/antenna/model/phased-array-model.cc b/src/antenna/model/phased-array-model.cc index f2af5b859..81477811d 100644 --- a/src/antenna/model/phased-array-model.cc +++ b/src/antenna/model/phased-array-model.cc @@ -17,9 +17,10 @@ #include "phased-array-model.h" +#include "isotropic-antenna-model.h" + #include #include -#include #include #include #include diff --git a/src/antenna/model/phased-array-model.h b/src/antenna/model/phased-array-model.h index 9f6472536..e1129a80a 100644 --- a/src/antenna/model/phased-array-model.h +++ b/src/antenna/model/phased-array-model.h @@ -18,8 +18,9 @@ #ifndef PHASED_ARRAY_MODEL_H #define PHASED_ARRAY_MODEL_H -#include -#include +#include "angles.h" +#include "antenna-model.h" + #include #include diff --git a/src/antenna/model/three-gpp-antenna-model.h b/src/antenna/model/three-gpp-antenna-model.h index 78fd144be..453e719e2 100644 --- a/src/antenna/model/three-gpp-antenna-model.h +++ b/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 +#include "antenna-model.h" + #include namespace ns3 diff --git a/src/antenna/model/uniform-planar-array.h b/src/antenna/model/uniform-planar-array.h index 70ee3ee0d..82d23c513 100644 --- a/src/antenna/model/uniform-planar-array.h +++ b/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 -#include namespace ns3 { diff --git a/src/applications/model/application-packet-probe.cc b/src/applications/model/application-packet-probe.cc index 00ffa7b42..909caf7f0 100644 --- a/src/applications/model/application-packet-probe.cc +++ b/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" diff --git a/src/applications/model/bulk-send-application.h b/src/applications/model/bulk-send-application.h index bb809fe1b..1e8a835d9 100644 --- a/src/applications/model/bulk-send-application.h +++ b/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 diff --git a/src/applications/model/onoff-application.h b/src/applications/model/onoff-application.h index e1cb143a7..eb69943c8 100644 --- a/src/applications/model/onoff-application.h +++ b/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 diff --git a/src/applications/model/packet-sink.h b/src/applications/model/packet-sink.h index 170dee422..bd66f6e56 100644 --- a/src/applications/model/packet-sink.h +++ b/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 diff --git a/src/applications/model/seq-ts-size-header.h b/src/applications/model/seq-ts-size-header.h index 1bc0e4528..c2c71a7b0 100644 --- a/src/applications/model/seq-ts-size-header.h +++ b/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 +#include "seq-ts-header.h" namespace ns3 { diff --git a/src/applications/model/three-gpp-http-client.cc b/src/applications/model/three-gpp-http-client.cc index ecf837d49..2fde0d5df 100644 --- a/src/applications/model/three-gpp-http-client.cc +++ b/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 #include #include @@ -30,7 +32,6 @@ #include #include #include -#include #include NS_LOG_COMPONENT_DEFINE("ThreeGppHttpClient"); diff --git a/src/applications/model/three-gpp-http-client.h b/src/applications/model/three-gpp-http-client.h index d0ad86ce7..344f9ec71 100644 --- a/src/applications/model/three-gpp-http-client.h +++ b/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 #include -#include #include namespace ns3 diff --git a/src/applications/model/three-gpp-http-server.cc b/src/applications/model/three-gpp-http-server.cc index f458a49bb..5fdff8df4 100644 --- a/src/applications/model/three-gpp-http-server.cc +++ b/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 #include #include @@ -31,7 +33,6 @@ #include #include #include -#include #include NS_LOG_COMPONENT_DEFINE("ThreeGppHttpServer"); diff --git a/src/applications/model/three-gpp-http-server.h b/src/applications/model/three-gpp-http-server.h index 4b7b1c6ff..e2781ad9d 100644 --- a/src/applications/model/three-gpp-http-server.h +++ b/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 #include #include #include #include #include -#include #include #include diff --git a/src/bridge/model/bridge-net-device.h b/src/bridge/model/bridge-net-device.h index 5d29f726f..d5d6f0958 100644 --- a/src/bridge/model/bridge-net-device.h +++ b/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" diff --git a/src/buildings/helper/building-allocator.h b/src/buildings/helper/building-allocator.h index e81df23a0..33957708e 100644 --- a/src/buildings/helper/building-allocator.h +++ b/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" diff --git a/src/buildings/helper/building-position-allocator.cc b/src/buildings/helper/building-position-allocator.cc index 1a6bfbd21..1895ecd32 100644 --- a/src/buildings/helper/building-position-allocator.cc +++ b/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" diff --git a/src/buildings/model/buildings-channel-condition-model.cc b/src/buildings/model/buildings-channel-condition-model.cc index 8b1dfbcb1..3f45f354e 100644 --- a/src/buildings/model/buildings-channel-condition-model.cc +++ b/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 diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc index 34544ee05..02847236c 100644 --- a/src/buildings/model/buildings-propagation-loss-model.cc +++ b/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 #include diff --git a/src/buildings/model/buildings-propagation-loss-model.h b/src/buildings/model/buildings-propagation-loss-model.h index fe6e7a85c..6ba3d9a74 100644 --- a/src/buildings/model/buildings-propagation-loss-model.h +++ b/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 -#include namespace ns3 { diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc index 9b07995fa..9919d3933 100644 --- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc +++ b/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 #include diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.h b/src/buildings/model/hybrid-buildings-propagation-loss-model.h index 5a9c6ca41..edaf6e69a 100644 --- a/src/buildings/model/hybrid-buildings-propagation-loss-model.h +++ b/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 +#include "buildings-propagation-loss-model.h" + #include namespace ns3 diff --git a/src/buildings/model/itu-r-1238-propagation-loss-model.cc b/src/buildings/model/itu-r-1238-propagation-loss-model.cc index 853cbf95d..0c4dc1c95 100644 --- a/src/buildings/model/itu-r-1238-propagation-loss-model.cc +++ b/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 #include diff --git a/src/buildings/model/mobility-building-info.cc b/src/buildings/model/mobility-building-info.cc index f7c58b359..ab1e38a7f 100644 --- a/src/buildings/model/mobility-building-info.cc +++ b/src/buildings/model/mobility-building-info.cc @@ -18,10 +18,12 @@ * */ +#include "mobility-building-info.h" + +#include "building-list.h" + #include -#include #include -#include #include #include #include diff --git a/src/buildings/model/mobility-building-info.h b/src/buildings/model/mobility-building-info.h index ba71f33e9..ab9489b8b 100644 --- a/src/buildings/model/mobility-building-info.h +++ b/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 -#include #include #include #include diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc index 132831a6d..0ed56b0c3 100644 --- a/src/buildings/model/oh-buildings-propagation-loss-model.cc +++ b/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 #include diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.h b/src/buildings/model/oh-buildings-propagation-loss-model.h index 7e7aa10be..a7dd895bc 100644 --- a/src/buildings/model/oh-buildings-propagation-loss-model.h +++ b/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 +#include "buildings-propagation-loss-model.h" namespace ns3 { diff --git a/src/buildings/model/random-walk-2d-outdoor-mobility-model.cc b/src/buildings/model/random-walk-2d-outdoor-mobility-model.cc index cbafda152..9896e3c7e 100644 --- a/src/buildings/model/random-walk-2d-outdoor-mobility-model.cc +++ b/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" diff --git a/src/buildings/model/random-walk-2d-outdoor-mobility-model.h b/src/buildings/model/random-walk-2d-outdoor-mobility-model.h index c5b29f17e..1da68f8e6 100644 --- a/src/buildings/model/random-walk-2d-outdoor-mobility-model.h +++ b/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" diff --git a/src/buildings/model/three-gpp-v2v-channel-condition-model.cc b/src/buildings/model/three-gpp-v2v-channel-condition-model.cc index 21e02bed2..94256e60a 100644 --- a/src/buildings/model/three-gpp-v2v-channel-condition-model.cc +++ b/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 namespace ns3 { diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc index 3ab70c0e3..cf75df828 100644 --- a/src/click/model/ipv4-click-routing.cc +++ b/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" diff --git a/src/click/model/ipv4-l3-click-protocol.cc b/src/click/model/ipv4-l3-click-protocol.cc index d4759f165..94c084446 100644 --- a/src/click/model/ipv4-l3-click-protocol.cc +++ b/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" diff --git a/src/core/model/ascii-test.h b/src/core/model/ascii-test.h index 6e313f387..0b1947a31 100644 --- a/src/core/model/ascii-test.h +++ b/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 diff --git a/src/core/model/attribute-container.h b/src/core/model/attribute-container.h index 974abfd6c..547d6fa28 100644 --- a/src/core/model/attribute-container.h +++ b/src/core/model/attribute-container.h @@ -20,8 +20,8 @@ #ifndef ATTRIBUTE_CONTAINER_H #define ATTRIBUTE_CONTAINER_H -#include -#include +#include "attribute-helper.h" +#include "string.h" #include #include diff --git a/src/core/model/environment-variable.cc b/src/core/model/environment-variable.cc index fa71a3a6d..d6ddd02b2 100644 --- a/src/core/model/environment-variable.cc +++ b/src/core/model/environment-variable.cc @@ -19,7 +19,7 @@ #include "environment-variable.h" -#include "ns3/string.h" +#include "string.h" #include // std::getenv #include // strlen diff --git a/src/core/model/example-as-test.h b/src/core/model/example-as-test.h index 4301817eb..a13c482c1 100644 --- a/src/core/model/example-as-test.h +++ b/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 diff --git a/src/core/model/length.cc b/src/core/model/length.cc index 9a65fd354..718c01e27 100644 --- a/src/core/model/length.cc +++ b/src/core/model/length.cc @@ -17,9 +17,9 @@ * Author: Mathew Bielejeski */ -#include "ns3/length.h" +#include "length.h" -#include "ns3/log.h" +#include "log.h" #include #include diff --git a/src/core/model/pair.h b/src/core/model/pair.h index 60d2c6694..460706a58 100644 --- a/src/core/model/pair.h +++ b/src/core/model/pair.h @@ -20,8 +20,8 @@ #ifndef PAIR_H #define PAIR_H -#include -#include +#include "attribute-helper.h" +#include "string.h" #include #include diff --git a/src/core/model/tuple.h b/src/core/model/tuple.h index dc044287d..f107480d0 100644 --- a/src/core/model/tuple.h +++ b/src/core/model/tuple.h @@ -20,8 +20,8 @@ #ifndef TUPLE_H #define TUPLE_H -#include -#include +#include "attribute-helper.h" +#include "string.h" #include #include diff --git a/src/core/model/unused.h b/src/core/model/unused.h index 5faa4d514..9973f16aa 100644 --- a/src/core/model/unused.h +++ b/src/core/model/unused.h @@ -20,7 +20,7 @@ #ifndef UNUSED_H #define UNUSED_H -#include "ns3/deprecated.h" +#include "deprecated.h" /** * \file diff --git a/src/core/model/val-array.h b/src/core/model/val-array.h index 609400c7a..c96b24c6a 100644 --- a/src/core/model/val-array.h +++ b/src/core/model/val-array.h @@ -19,8 +19,8 @@ #ifndef VAL_ARRAY_H #define VAL_ARRAY_H -#include -#include +#include "assert.h" +#include "simple-ref-count.h" #include #include diff --git a/src/core/model/version.h b/src/core/model/version.h index a91c97226..1d8ea3269 100644 --- a/src/core/model/version.h +++ b/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 diff --git a/src/csma-layout/model/csma-star-helper.cc b/src/csma-layout/model/csma-star-helper.cc index ad9462099..d05282c3b 100644 --- a/src/csma-layout/model/csma-star-helper.cc +++ b/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 -#include +#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 +#include + namespace ns3 { diff --git a/src/csma/model/csma-net-device.h b/src/csma/model/csma-net-device.h index 237daf37e..ff72aad2a 100644 --- a/src/csma/model/csma-net-device.h +++ b/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" diff --git a/src/dsr/helper/dsr-main-helper.cc b/src/dsr/helper/dsr-main-helper.cc index a55be2976..447c0379e 100644 --- a/src/dsr/helper/dsr-main-helper.cc +++ b/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" diff --git a/src/dsr/helper/dsr-main-helper.h b/src/dsr/helper/dsr-main-helper.h index 465810243..12afe59db 100644 --- a/src/dsr/helper/dsr-main-helper.h +++ b/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" diff --git a/src/energy/helper/energy-harvester-helper.h b/src/energy/helper/energy-harvester-helper.h index 5a8966906..3f2c57698 100644 --- a/src/energy/helper/energy-harvester-helper.h +++ b/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" diff --git a/src/energy/helper/generic-battery-model-helper.cc b/src/energy/helper/generic-battery-model-helper.cc index 419c68609..93dc63321 100644 --- a/src/energy/helper/generic-battery-model-helper.cc +++ b/src/energy/helper/generic-battery-model-helper.cc @@ -17,7 +17,7 @@ * Authors: Alberto Gallegos Ramonet */ -#include +#include "generic-battery-model-helper.h" namespace ns3 { diff --git a/src/energy/helper/generic-battery-model-helper.h b/src/energy/helper/generic-battery-model-helper.h index dd519e089..fe6440d3c 100644 --- a/src/energy/helper/generic-battery-model-helper.h +++ b/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 +#include "energy-model-helper.h" + #include #include diff --git a/src/energy/model/basic-energy-harvester.h b/src/energy/model/basic-energy-harvester.h index 341e04c03..02267c058 100644 --- a/src/energy/model/basic-energy-harvester.h +++ b/src/energy/model/basic-energy-harvester.h @@ -21,17 +21,16 @@ #ifndef BASIC_ENERGY_HARVESTER #define BASIC_ENERGY_HARVESTER -#include - -// 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 + namespace ns3 { diff --git a/src/energy/model/device-energy-model-container.h b/src/energy/model/device-energy-model-container.h index 40409e5d2..3804b4fe1 100644 --- a/src/energy/model/device-energy-model-container.h +++ b/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 #include diff --git a/src/energy/model/energy-source.cc b/src/energy/model/energy-source.cc index 84d426539..3f483f715 100644 --- a/src/energy/model/energy-source.cc +++ b/src/energy/model/energy-source.cc @@ -22,7 +22,8 @@ * Modifications made by: Cristiano Tapparello */ -#include +#include "energy-source.h" + #include namespace ns3 diff --git a/src/energy/model/energy-source.h b/src/energy/model/energy-source.h index a86dab7fe..3f0c2ea9c 100644 --- a/src/energy/model/energy-source.h +++ b/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" diff --git a/src/energy/model/generic-battery-model.cc b/src/energy/model/generic-battery-model.cc index fadf2caa5..35e1b5b74 100644 --- a/src/energy/model/generic-battery-model.cc +++ b/src/energy/model/generic-battery-model.cc @@ -20,9 +20,10 @@ * Alberto Gallegos Ramonet */ +#include "generic-battery-model.h" + #include #include -#include #include #include #include diff --git a/src/energy/model/generic-battery-model.h b/src/energy/model/generic-battery-model.h index 9aac7cbdf..61731f52c 100644 --- a/src/energy/model/generic-battery-model.h +++ b/src/energy/model/generic-battery-model.h @@ -23,7 +23,8 @@ #ifndef GENERIC_BATTERY_MODEL_H #define GENERIC_BATTERY_MODEL_H -#include +#include "energy-source.h" + #include #include #include diff --git a/src/energy/model/li-ion-energy-source.h b/src/energy/model/li-ion-energy-source.h index 016abf665..224e3de82 100644 --- a/src/energy/model/li-ion-energy-source.h +++ b/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" diff --git a/src/energy/model/simple-device-energy-model.cc b/src/energy/model/simple-device-energy-model.cc index 05982dfab..3e7834536 100644 --- a/src/energy/model/simple-device-energy-model.cc +++ b/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" diff --git a/src/energy/model/simple-device-energy-model.h b/src/energy/model/simple-device-energy-model.h index a3fdd287a..d3baa03ec 100644 --- a/src/energy/model/simple-device-energy-model.h +++ b/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" diff --git a/src/fd-net-device/helper/dpdk-net-device-helper.h b/src/fd-net-device/helper/dpdk-net-device-helper.h index 848f2a226..d0cb0bdb5 100644 --- a/src/fd-net-device/helper/dpdk-net-device-helper.h +++ b/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 { diff --git a/src/fd-net-device/helper/emu-fd-net-device-helper.h b/src/fd-net-device/helper/emu-fd-net-device-helper.h index d6618fb2b..3a1453967 100644 --- a/src/fd-net-device/helper/emu-fd-net-device-helper.h +++ b/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" diff --git a/src/fd-net-device/helper/netmap-net-device-helper.h b/src/fd-net-device/helper/netmap-net-device-helper.h index 8d312c060..30a9ef89f 100644 --- a/src/fd-net-device/helper/netmap-net-device-helper.h +++ b/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" diff --git a/src/flow-monitor/model/flow-monitor.h b/src/flow-monitor/model/flow-monitor.h index a0be703e9..37b81b3e5 100644 --- a/src/flow-monitor/model/flow-monitor.h +++ b/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" diff --git a/src/flow-monitor/model/flow-probe.cc b/src/flow-monitor/model/flow-probe.cc index 3e1a09f10..4c5f4f48b 100644 --- a/src/flow-monitor/model/flow-probe.cc +++ b/src/flow-monitor/model/flow-probe.cc @@ -17,9 +17,9 @@ // Author: Gustavo J. A. M. Carneiro // -#include "ns3/flow-probe.h" +#include "flow-probe.h" -#include "ns3/flow-monitor.h" +#include "flow-monitor.h" namespace ns3 { diff --git a/src/flow-monitor/model/flow-probe.h b/src/flow-monitor/model/flow-probe.h index fb5d15ff8..ae3365e75 100644 --- a/src/flow-monitor/model/flow-probe.h +++ b/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" diff --git a/src/flow-monitor/model/ipv4-flow-classifier.h b/src/flow-monitor/model/ipv4-flow-classifier.h index b3c7a7732..1d70124fa 100644 --- a/src/flow-monitor/model/ipv4-flow-classifier.h +++ b/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 diff --git a/src/flow-monitor/model/ipv4-flow-probe.cc b/src/flow-monitor/model/ipv4-flow-probe.cc index 94aacd7f6..c0502f19e 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.cc +++ b/src/flow-monitor/model/ipv4-flow-probe.cc @@ -17,12 +17,13 @@ // Author: Gustavo J. A. M. Carneiro // -#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" diff --git a/src/flow-monitor/model/ipv4-flow-probe.h b/src/flow-monitor/model/ipv4-flow-probe.h index bfc137a6a..ab208174d 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.h +++ b/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" diff --git a/src/flow-monitor/model/ipv6-flow-classifier.h b/src/flow-monitor/model/ipv6-flow-classifier.h index e74de7c8a..8af139229 100644 --- a/src/flow-monitor/model/ipv6-flow-classifier.h +++ b/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 diff --git a/src/flow-monitor/model/ipv6-flow-probe.cc b/src/flow-monitor/model/ipv6-flow-probe.cc index 80f3e63d1..f06938937 100644 --- a/src/flow-monitor/model/ipv6-flow-probe.cc +++ b/src/flow-monitor/model/ipv6-flow-probe.cc @@ -18,12 +18,13 @@ // Modifications: Tommaso Pecorella // -#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" diff --git a/src/flow-monitor/model/ipv6-flow-probe.h b/src/flow-monitor/model/ipv6-flow-probe.h index 334bae5e2..576adc0c4 100644 --- a/src/flow-monitor/model/ipv6-flow-probe.h +++ b/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" diff --git a/src/internet/helper/internet-trace-helper.h b/src/internet/helper/internet-trace-helper.h index 28c591e0c..dfd8a5105 100644 --- a/src/internet/helper/internet-trace-helper.h +++ b/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" diff --git a/src/internet/helper/ipv4-global-routing-helper.h b/src/internet/helper/ipv4-global-routing-helper.h index 9007a015c..b3eac3ab9 100644 --- a/src/internet/helper/ipv4-global-routing-helper.h +++ b/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 diff --git a/src/internet/helper/ipv4-list-routing-helper.h b/src/internet/helper/ipv4-list-routing-helper.h index 3e151149a..b6b1d2250 100644 --- a/src/internet/helper/ipv4-list-routing-helper.h +++ b/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 #include diff --git a/src/internet/helper/ipv4-static-routing-helper.h b/src/internet/helper/ipv4-static-routing-helper.h index 2663a2cef..ee685540c 100644 --- a/src/internet/helper/ipv4-static-routing-helper.h +++ b/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" diff --git a/src/internet/helper/ipv6-list-routing-helper.h b/src/internet/helper/ipv6-list-routing-helper.h index 58b84b869..e62c5a728 100644 --- a/src/internet/helper/ipv6-list-routing-helper.h +++ b/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 #include diff --git a/src/internet/helper/ipv6-static-routing-helper.h b/src/internet/helper/ipv6-static-routing-helper.h index 0da049a14..b76a70013 100644 --- a/src/internet/helper/ipv6-static-routing-helper.h +++ b/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" diff --git a/src/internet/helper/neighbor-cache-helper.h b/src/internet/helper/neighbor-cache-helper.h index a99000c10..c52418ec2 100644 --- a/src/internet/helper/neighbor-cache-helper.h +++ b/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" diff --git a/src/internet/helper/rip-helper.h b/src/internet/helper/rip-helper.h index 92d575d23..dc7064347 100644 --- a/src/internet/helper/rip-helper.h +++ b/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" diff --git a/src/internet/helper/ripng-helper.h b/src/internet/helper/ripng-helper.h index e1761ec2d..caf33c07b 100644 --- a/src/internet/helper/ripng-helper.h +++ b/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" diff --git a/src/internet/model/arp-l3-protocol.h b/src/internet/model/arp-l3-protocol.h index a3833a8d6..f35a6ea15 100644 --- a/src/internet/model/arp-l3-protocol.h +++ b/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" diff --git a/src/internet/model/global-router-interface.h b/src/internet/model/global-router-interface.h index c412c9e32..5b0af67a9 100644 --- a/src/internet/model/global-router-interface.h +++ b/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" diff --git a/src/internet/model/icmpv4.h b/src/internet/model/icmpv4.h index 39292d4b5..b3c110aed 100644 --- a/src/internet/model/icmpv4.h +++ b/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 diff --git a/src/internet/model/ipv4-end-point.h b/src/internet/model/ipv4-end-point.h index ef87228cf..ba96bbfb2 100644 --- a/src/internet/model/ipv4-end-point.h +++ b/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 diff --git a/src/internet/model/ipv4-global-routing.h b/src/internet/model/ipv4-global-routing.h index 001854633..a5233f969 100644 --- a/src/internet/model/ipv4-global-routing.h +++ b/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" diff --git a/src/internet/model/ipv4-l3-protocol.h b/src/internet/model/ipv4-l3-protocol.h index 94327765d..b59e7292f 100644 --- a/src/internet/model/ipv4-l3-protocol.h +++ b/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" diff --git a/src/internet/model/ipv4-list-routing.h b/src/internet/model/ipv4-list-routing.h index 08d2e881e..2eefd6afe 100644 --- a/src/internet/model/ipv4-list-routing.h +++ b/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" diff --git a/src/internet/model/ipv4-packet-probe.h b/src/internet/model/ipv4-packet-probe.h index 0d56a7a3f..400e30033 100644 --- a/src/internet/model/ipv4-packet-probe.h +++ b/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" diff --git a/src/internet/model/ipv4-raw-socket-factory-impl.h b/src/internet/model/ipv4-raw-socket-factory-impl.h index 887b01cc0..552c272e3 100644 --- a/src/internet/model/ipv4-raw-socket-factory-impl.h +++ b/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 { diff --git a/src/internet/model/ipv4-raw-socket-impl.h b/src/internet/model/ipv4-raw-socket-impl.h index 2bd93e0a7..a718e0481 100644 --- a/src/internet/model/ipv4-raw-socket-impl.h +++ b/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 diff --git a/src/internet/model/ipv4-routing-protocol.h b/src/internet/model/ipv4-routing-protocol.h index ffee409e7..ba5f7b976 100644 --- a/src/internet/model/ipv4-routing-protocol.h +++ b/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" diff --git a/src/internet/model/ipv4-static-routing.h b/src/internet/model/ipv4-static-routing.h index c96007f00..8efde3a82 100644 --- a/src/internet/model/ipv4-static-routing.h +++ b/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" diff --git a/src/internet/model/ipv6-end-point.h b/src/internet/model/ipv6-end-point.h index 3dc0fe200..e7d3dfd4a 100644 --- a/src/internet/model/ipv6-end-point.h +++ b/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 diff --git a/src/internet/model/ipv6-extension.h b/src/internet/model/ipv6-extension.h index 5c6af5b64..627978633 100644 --- a/src/internet/model/ipv6-extension.h +++ b/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" diff --git a/src/internet/model/ipv6-l3-protocol.h b/src/internet/model/ipv6-l3-protocol.h index 12db07b77..cfbc4942d 100644 --- a/src/internet/model/ipv6-l3-protocol.h +++ b/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" diff --git a/src/internet/model/ipv6-list-routing.h b/src/internet/model/ipv6-list-routing.h index 24abc7552..7d54820bf 100644 --- a/src/internet/model/ipv6-list-routing.h +++ b/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 diff --git a/src/internet/model/ipv6-option.h b/src/internet/model/ipv6-option.h index 3d09a0c9f..5b4bb17cf 100644 --- a/src/internet/model/ipv6-option.h +++ b/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" diff --git a/src/internet/model/ipv6-packet-probe.h b/src/internet/model/ipv6-packet-probe.h index 769db10ed..7016ce6c0 100644 --- a/src/internet/model/ipv6-packet-probe.h +++ b/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" diff --git a/src/internet/model/ipv6-raw-socket-factory-impl.h b/src/internet/model/ipv6-raw-socket-factory-impl.h index 073a5d843..050cf1904 100644 --- a/src/internet/model/ipv6-raw-socket-factory-impl.h +++ b/src/internet/model/ipv6-raw-socket-factory-impl.h @@ -20,7 +20,7 @@ #ifndef IPV6_RAW_SOCKET_FACTORY_IMPL_H #define IPV6_RAW_SOCKET_FACTORY_IMPL_H -#include "ns3/ipv6-raw-socket-factory.h" +#include "ipv6-raw-socket-factory.h" namespace ns3 { diff --git a/src/internet/model/ipv6-raw-socket-impl.h b/src/internet/model/ipv6-raw-socket-impl.h index 2b23819ab..8d8d31d71 100644 --- a/src/internet/model/ipv6-raw-socket-impl.h +++ b/src/internet/model/ipv6-raw-socket-impl.h @@ -20,8 +20,9 @@ #ifndef IPV6_RAW_SOCKET_IMPL_H #define IPV6_RAW_SOCKET_IMPL_H +#include "ipv6-header.h" + #include "ns3/ipv6-address.h" -#include "ns3/ipv6-header.h" #include "ns3/socket.h" #include diff --git a/src/internet/model/ipv6-static-routing.h b/src/internet/model/ipv6-static-routing.h index f1a3273a2..bac08249e 100644 --- a/src/internet/model/ipv6-static-routing.h +++ b/src/internet/model/ipv6-static-routing.h @@ -20,10 +20,11 @@ #ifndef IPV6_STATIC_ROUTING_H #define IPV6_STATIC_ROUTING_H +#include "ipv6-header.h" +#include "ipv6-routing-protocol.h" +#include "ipv6.h" + #include "ns3/ipv6-address.h" -#include "ns3/ipv6-header.h" -#include "ns3/ipv6-routing-protocol.h" -#include "ns3/ipv6.h" #include "ns3/ptr.h" #include diff --git a/src/internet/model/rip-header.h b/src/internet/model/rip-header.h index d876bac96..7a6f75959 100644 --- a/src/internet/model/rip-header.h +++ b/src/internet/model/rip-header.h @@ -20,9 +20,10 @@ #ifndef RIP_HEADER_H #define RIP_HEADER_H +#include "ipv4-header.h" + #include "ns3/header.h" #include "ns3/ipv4-address.h" -#include "ns3/ipv4-header.h" #include "ns3/packet.h" #include diff --git a/src/internet/model/rip.h b/src/internet/model/rip.h index 850c3d8c9..ba3908944 100644 --- a/src/internet/model/rip.h +++ b/src/internet/model/rip.h @@ -20,13 +20,14 @@ #ifndef RIP_H #define RIP_H +#include "ipv4-interface.h" +#include "ipv4-l3-protocol.h" +#include "ipv4-routing-protocol.h" +#include "ipv4-routing-table-entry.h" +#include "rip-header.h" + #include "ns3/inet-socket-address.h" -#include "ns3/ipv4-interface.h" -#include "ns3/ipv4-l3-protocol.h" -#include "ns3/ipv4-routing-protocol.h" -#include "ns3/ipv4-routing-table-entry.h" #include "ns3/random-variable-stream.h" -#include "ns3/rip-header.h" #include diff --git a/src/internet/model/ripng-header.h b/src/internet/model/ripng-header.h index b342db968..1351f6b2b 100644 --- a/src/internet/model/ripng-header.h +++ b/src/internet/model/ripng-header.h @@ -20,9 +20,10 @@ #ifndef RIPNG_HEADER_H #define RIPNG_HEADER_H +#include "ipv6-header.h" + #include "ns3/header.h" #include "ns3/ipv6-address.h" -#include "ns3/ipv6-header.h" #include "ns3/packet.h" #include diff --git a/src/internet/model/ripng.h b/src/internet/model/ripng.h index 08802a23b..da1365709 100644 --- a/src/internet/model/ripng.h +++ b/src/internet/model/ripng.h @@ -20,13 +20,14 @@ #ifndef RIPNG_H #define RIPNG_H +#include "ipv6-interface.h" +#include "ipv6-l3-protocol.h" +#include "ipv6-routing-protocol.h" +#include "ipv6-routing-table-entry.h" +#include "ripng-header.h" + #include "ns3/inet6-socket-address.h" -#include "ns3/ipv6-interface.h" -#include "ns3/ipv6-l3-protocol.h" -#include "ns3/ipv6-routing-protocol.h" -#include "ns3/ipv6-routing-table-entry.h" #include "ns3/random-variable-stream.h" -#include "ns3/ripng-header.h" #include diff --git a/src/internet/model/tcp-bbr.h b/src/internet/model/tcp-bbr.h index 3143287b0..0955bd8fd 100644 --- a/src/internet/model/tcp-bbr.h +++ b/src/internet/model/tcp-bbr.h @@ -22,11 +22,12 @@ #ifndef TCPBBR_H #define TCPBBR_H +#include "tcp-congestion-ops.h" +#include "windowed-filter.h" + #include "ns3/data-rate.h" #include "ns3/random-variable-stream.h" -#include "ns3/tcp-congestion-ops.h" #include "ns3/traced-value.h" -#include "ns3/windowed-filter.h" class TcpBbrCheckGainValuesTest; diff --git a/src/internet/model/tcp-bic.h b/src/internet/model/tcp-bic.h index 05ba90d15..87c8b0aa0 100644 --- a/src/internet/model/tcp-bic.h +++ b/src/internet/model/tcp-bic.h @@ -19,8 +19,8 @@ #ifndef TCPBIC_H #define TCPBIC_H -#include "ns3/tcp-congestion-ops.h" -#include "ns3/tcp-recovery-ops.h" +#include "tcp-congestion-ops.h" +#include "tcp-recovery-ops.h" class TcpBicIncrementTest; class TcpBicDecrementTest; diff --git a/src/internet/model/tcp-cubic.h b/src/internet/model/tcp-cubic.h index 8802df62e..c395b3888 100644 --- a/src/internet/model/tcp-cubic.h +++ b/src/internet/model/tcp-cubic.h @@ -19,8 +19,8 @@ #ifndef TCPCUBIC_H #define TCPCUBIC_H -#include "ns3/tcp-congestion-ops.h" -#include "ns3/tcp-socket-base.h" +#include "tcp-congestion-ops.h" +#include "tcp-socket-base.h" namespace ns3 { diff --git a/src/internet/model/tcp-dctcp.h b/src/internet/model/tcp-dctcp.h index dc25ea6a1..37ea0f870 100644 --- a/src/internet/model/tcp-dctcp.h +++ b/src/internet/model/tcp-dctcp.h @@ -21,8 +21,9 @@ #ifndef TCP_DCTCP_H #define TCP_DCTCP_H -#include "ns3/tcp-congestion-ops.h" -#include "ns3/tcp-linux-reno.h" +#include "tcp-congestion-ops.h" +#include "tcp-linux-reno.h" + #include "ns3/traced-callback.h" namespace ns3 diff --git a/src/internet/model/tcp-header.h b/src/internet/model/tcp-header.h index 1d7a94804..fa2500c52 100644 --- a/src/internet/model/tcp-header.h +++ b/src/internet/model/tcp-header.h @@ -20,13 +20,14 @@ #ifndef TCP_HEADER_H #define TCP_HEADER_H +#include "tcp-option.h" +#include "tcp-socket-factory.h" + #include "ns3/buffer.h" #include "ns3/header.h" #include "ns3/ipv4-address.h" #include "ns3/ipv6-address.h" #include "ns3/sequence-number.h" -#include "ns3/tcp-option.h" -#include "ns3/tcp-socket-factory.h" #include diff --git a/src/internet/model/tcp-linux-reno.h b/src/internet/model/tcp-linux-reno.h index 3bf489d6e..792aea7d2 100644 --- a/src/internet/model/tcp-linux-reno.h +++ b/src/internet/model/tcp-linux-reno.h @@ -22,8 +22,8 @@ #ifndef TCPLINUXRENO_H #define TCPLINUXRENO_H -#include "ns3/tcp-congestion-ops.h" -#include "ns3/tcp-socket-state.h" +#include "tcp-congestion-ops.h" +#include "tcp-socket-state.h" namespace ns3 { diff --git a/src/internet/model/tcp-option-rfc793.h b/src/internet/model/tcp-option-rfc793.h index 1f746412c..67c990bd6 100644 --- a/src/internet/model/tcp-option-rfc793.h +++ b/src/internet/model/tcp-option-rfc793.h @@ -19,7 +19,7 @@ #ifndef TCPOPTIONRFC793_H #define TCPOPTIONRFC793_H -#include "ns3/tcp-option.h" +#include "tcp-option.h" namespace ns3 { diff --git a/src/internet/model/tcp-option-sack-permitted.h b/src/internet/model/tcp-option-sack-permitted.h index 6c359526c..28edd1217 100644 --- a/src/internet/model/tcp-option-sack-permitted.h +++ b/src/internet/model/tcp-option-sack-permitted.h @@ -25,7 +25,7 @@ #ifndef TCP_OPTION_SACK_PERMITTED_H #define TCP_OPTION_SACK_PERMITTED_H -#include "ns3/tcp-option.h" +#include "tcp-option.h" namespace ns3 { diff --git a/src/internet/model/tcp-option-sack.h b/src/internet/model/tcp-option-sack.h index 6ebdea747..93b6f7769 100644 --- a/src/internet/model/tcp-option-sack.h +++ b/src/internet/model/tcp-option-sack.h @@ -25,8 +25,9 @@ #ifndef TCP_OPTION_SACK_H #define TCP_OPTION_SACK_H +#include "tcp-option.h" + #include "ns3/sequence-number.h" -#include "ns3/tcp-option.h" namespace ns3 { diff --git a/src/internet/model/tcp-option-ts.h b/src/internet/model/tcp-option-ts.h index 68c224950..59c4ebdaf 100644 --- a/src/internet/model/tcp-option-ts.h +++ b/src/internet/model/tcp-option-ts.h @@ -20,7 +20,8 @@ #ifndef TCP_OPTION_TS_H #define TCP_OPTION_TS_H -#include "ns3/tcp-option.h" +#include "tcp-option.h" + #include "ns3/timer.h" namespace ns3 diff --git a/src/internet/model/tcp-option-winscale.h b/src/internet/model/tcp-option-winscale.h index 675974394..b8231beea 100644 --- a/src/internet/model/tcp-option-winscale.h +++ b/src/internet/model/tcp-option-winscale.h @@ -21,7 +21,7 @@ #ifndef TCP_OPTION_WINSCALE_H #define TCP_OPTION_WINSCALE_H -#include "ns3/tcp-option.h" +#include "tcp-option.h" namespace ns3 { diff --git a/src/internet/model/tcp-prr-recovery.h b/src/internet/model/tcp-prr-recovery.h index 86ed144f0..ba3a6a200 100644 --- a/src/internet/model/tcp-prr-recovery.h +++ b/src/internet/model/tcp-prr-recovery.h @@ -22,7 +22,7 @@ #ifndef TCP_PRR_RECOVERY_H #define TCP_PRR_RECOVERY_H -#include "ns3/tcp-recovery-ops.h" +#include "tcp-recovery-ops.h" namespace ns3 { diff --git a/src/internet/model/tcp-rate-ops.h b/src/internet/model/tcp-rate-ops.h index 69cb5407d..102dc520b 100644 --- a/src/internet/model/tcp-rate-ops.h +++ b/src/internet/model/tcp-rate-ops.h @@ -18,9 +18,10 @@ #ifndef TCP_RATE_OPS_H #define TCP_RATE_OPS_H +#include "tcp-tx-item.h" + #include "ns3/data-rate.h" #include "ns3/object.h" -#include "ns3/tcp-tx-item.h" #include "ns3/traced-callback.h" #include "ns3/traced-value.h" diff --git a/src/internet/model/tcp-rx-buffer.h b/src/internet/model/tcp-rx-buffer.h index c8aee7e09..7dc32b03c 100644 --- a/src/internet/model/tcp-rx-buffer.h +++ b/src/internet/model/tcp-rx-buffer.h @@ -20,10 +20,11 @@ #ifndef TCP_RX_BUFFER_H #define TCP_RX_BUFFER_H +#include "tcp-header.h" +#include "tcp-option-sack.h" + #include "ns3/ptr.h" #include "ns3/sequence-number.h" -#include "ns3/tcp-header.h" -#include "ns3/tcp-option-sack.h" #include "ns3/trace-source-accessor.h" #include "ns3/traced-value.h" diff --git a/src/internet/model/tcp-socket-base.h b/src/internet/model/tcp-socket-base.h index a0efecb19..1f0a3afc0 100644 --- a/src/internet/model/tcp-socket-base.h +++ b/src/internet/model/tcp-socket-base.h @@ -20,13 +20,14 @@ #ifndef TCP_SOCKET_BASE_H #define TCP_SOCKET_BASE_H +#include "ipv4-header.h" +#include "ipv6-header.h" +#include "tcp-socket-state.h" +#include "tcp-socket.h" + #include "ns3/data-rate.h" -#include "ns3/ipv4-header.h" -#include "ns3/ipv6-header.h" #include "ns3/node.h" #include "ns3/sequence-number.h" -#include "ns3/tcp-socket-state.h" -#include "ns3/tcp-socket.h" #include "ns3/timer.h" #include "ns3/traced-value.h" diff --git a/src/internet/model/tcp-socket-factory-impl.h b/src/internet/model/tcp-socket-factory-impl.h index fd55659e2..766cecf04 100644 --- a/src/internet/model/tcp-socket-factory-impl.h +++ b/src/internet/model/tcp-socket-factory-impl.h @@ -19,8 +19,9 @@ #ifndef TCP_SOCKET_FACTORY_IMPL_H #define TCP_SOCKET_FACTORY_IMPL_H +#include "tcp-socket-factory.h" + #include "ns3/ptr.h" -#include "ns3/tcp-socket-factory.h" namespace ns3 { diff --git a/src/internet/model/tcp-tx-buffer.h b/src/internet/model/tcp-tx-buffer.h index e1962d3fe..f37d1adf4 100644 --- a/src/internet/model/tcp-tx-buffer.h +++ b/src/internet/model/tcp-tx-buffer.h @@ -21,10 +21,11 @@ #ifndef TCP_TX_BUFFER_H #define TCP_TX_BUFFER_H +#include "tcp-option-sack.h" +#include "tcp-tx-item.h" + #include "ns3/object.h" #include "ns3/sequence-number.h" -#include "ns3/tcp-option-sack.h" -#include "ns3/tcp-tx-item.h" #include "ns3/traced-value.h" namespace ns3 diff --git a/src/internet/model/tcp-westwood-plus.h b/src/internet/model/tcp-westwood-plus.h index 0518d196b..0de9d993e 100644 --- a/src/internet/model/tcp-westwood-plus.h +++ b/src/internet/model/tcp-westwood-plus.h @@ -33,10 +33,10 @@ #define TCP_WESTWOOD_H #include "tcp-congestion-ops.h" +#include "tcp-recovery-ops.h" #include "ns3/data-rate.h" #include "ns3/event-id.h" -#include "ns3/tcp-recovery-ops.h" #include "ns3/traced-value.h" namespace ns3 diff --git a/src/internet/model/tcp-yeah.h b/src/internet/model/tcp-yeah.h index 0b67100ed..0857c4763 100644 --- a/src/internet/model/tcp-yeah.h +++ b/src/internet/model/tcp-yeah.h @@ -26,8 +26,8 @@ #ifndef TCPYEAH_H #define TCPYEAH_H -#include "ns3/tcp-recovery-ops.h" -#include "ns3/tcp-scalable.h" +#include "tcp-recovery-ops.h" +#include "tcp-scalable.h" namespace ns3 { diff --git a/src/internet/model/udp-socket-factory-impl.h b/src/internet/model/udp-socket-factory-impl.h index f31bccbd8..5c7023456 100644 --- a/src/internet/model/udp-socket-factory-impl.h +++ b/src/internet/model/udp-socket-factory-impl.h @@ -19,8 +19,9 @@ #ifndef UDP_SOCKET_FACTORY_IMPL_H #define UDP_SOCKET_FACTORY_IMPL_H +#include "udp-socket-factory.h" + #include "ns3/ptr.h" -#include "ns3/udp-socket-factory.h" namespace ns3 { diff --git a/src/internet/model/udp-socket-impl.h b/src/internet/model/udp-socket-impl.h index d50d9cce3..6daf8e46b 100644 --- a/src/internet/model/udp-socket-impl.h +++ b/src/internet/model/udp-socket-impl.h @@ -20,14 +20,14 @@ #define UDP_SOCKET_IMPL_H #include "icmpv4.h" +#include "ipv4-interface.h" +#include "udp-socket.h" #include "ns3/callback.h" #include "ns3/ipv4-address.h" -#include "ns3/ipv4-interface.h" #include "ns3/ptr.h" #include "ns3/socket.h" #include "ns3/traced-callback.h" -#include "ns3/udp-socket.h" #include #include diff --git a/src/lr-wpan/model/lr-wpan-csmaca.h b/src/lr-wpan/model/lr-wpan-csmaca.h index 13c7ab4a3..ec8352a96 100644 --- a/src/lr-wpan/model/lr-wpan-csmaca.h +++ b/src/lr-wpan/model/lr-wpan-csmaca.h @@ -23,8 +23,9 @@ #ifndef LR_WPAN_CSMACA_H #define LR_WPAN_CSMACA_H +#include "lr-wpan-mac.h" + #include -#include #include namespace ns3 diff --git a/src/lr-wpan/model/lr-wpan-mac.h b/src/lr-wpan/model/lr-wpan-mac.h index 827350f53..a90cfac34 100644 --- a/src/lr-wpan/model/lr-wpan-mac.h +++ b/src/lr-wpan/model/lr-wpan-mac.h @@ -25,9 +25,10 @@ #ifndef LR_WPAN_MAC_H #define LR_WPAN_MAC_H +#include "lr-wpan-fields.h" +#include "lr-wpan-phy.h" + #include -#include -#include #include #include #include diff --git a/src/lr-wpan/model/lr-wpan-net-device.h b/src/lr-wpan/model/lr-wpan-net-device.h index 5d7ff5891..a607008f8 100644 --- a/src/lr-wpan/model/lr-wpan-net-device.h +++ b/src/lr-wpan/model/lr-wpan-net-device.h @@ -22,7 +22,8 @@ #ifndef LR_WPAN_NET_DEVICE_H #define LR_WPAN_NET_DEVICE_H -#include +#include "lr-wpan-mac.h" + #include #include diff --git a/src/mesh/helper/dot11s/dot11s-installer.cc b/src/mesh/helper/dot11s/dot11s-installer.cc index 1b4c370e6..b3e32e5da 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.cc +++ b/src/mesh/helper/dot11s/dot11s-installer.cc @@ -16,7 +16,7 @@ * * Authors: Kirill Andreev */ -#include "ns3/dot11s-installer.h" +#include "dot11s-installer.h" #include "ns3/hwmp-protocol.h" #include "ns3/mesh-wifi-interface-mac.h" diff --git a/src/mesh/helper/flame/flame-installer.cc b/src/mesh/helper/flame/flame-installer.cc index 4728d188c..bcc8a126c 100644 --- a/src/mesh/helper/flame/flame-installer.cc +++ b/src/mesh/helper/flame/flame-installer.cc @@ -17,7 +17,7 @@ * Authors: Kirill Andreev */ -#include "ns3/flame-installer.h" +#include "flame-installer.h" #include "ns3/flame-protocol.h" #include "ns3/mesh-wifi-interface-mac.h" diff --git a/src/mesh/helper/mesh-helper.h b/src/mesh/helper/mesh-helper.h index 9bdffa44f..de8955e66 100644 --- a/src/mesh/helper/mesh-helper.h +++ b/src/mesh/helper/mesh-helper.h @@ -21,7 +21,8 @@ #ifndef MESH_HELPER_H #define MESH_HELPER_H -#include "ns3/mesh-stack-installer.h" +#include "mesh-stack-installer.h" + #include "ns3/object-factory.h" #include "ns3/qos-utils.h" #include "ns3/wifi-standards.h" diff --git a/src/mesh/helper/mesh-stack-installer.cc b/src/mesh/helper/mesh-stack-installer.cc index 28b7a2829..4f9d0bed4 100644 --- a/src/mesh/helper/mesh-stack-installer.cc +++ b/src/mesh/helper/mesh-stack-installer.cc @@ -17,7 +17,7 @@ * Author: Peter D. Barnes, Jr. */ -#include "ns3/mesh-stack-installer.h" +#include "mesh-stack-installer.h" namespace ns3 { diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.h b/src/mesh/model/dot11s/hwmp-protocol-mac.h index 7f8c23477..e9ed3d6cd 100644 --- a/src/mesh/model/dot11s/hwmp-protocol-mac.h +++ b/src/mesh/model/dot11s/hwmp-protocol-mac.h @@ -20,7 +20,8 @@ #ifndef HWMP_STATE_H #define HWMP_STATE_H -#include "ns3/hwmp-protocol.h" +#include "hwmp-protocol.h" + #include "ns3/mesh-wifi-interface-mac-plugin.h" namespace ns3 diff --git a/src/mesh/model/dot11s/hwmp-rtable.h b/src/mesh/model/dot11s/hwmp-rtable.h index 97c1296f8..dde479c19 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.h +++ b/src/mesh/model/dot11s/hwmp-rtable.h @@ -20,7 +20,8 @@ #ifndef HWMP_RTABLE_H #define HWMP_RTABLE_H -#include "ns3/hwmp-protocol.h" +#include "hwmp-protocol.h" + #include "ns3/mac48-address.h" #include "ns3/nstime.h" diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.h b/src/mesh/model/dot11s/ie-dot11s-perr.h index 72bc3633d..f5e9316d7 100644 --- a/src/mesh/model/dot11s/ie-dot11s-perr.h +++ b/src/mesh/model/dot11s/ie-dot11s-perr.h @@ -20,7 +20,8 @@ #ifndef PERR_INFORMATION_ELEMENT_H #define PERR_INFORMATION_ELEMENT_H -#include "ns3/hwmp-protocol.h" +#include "hwmp-protocol.h" + #include "ns3/mac48-address.h" #include "ns3/mesh-information-element-vector.h" diff --git a/src/mesh/model/dot11s/peer-link.cc b/src/mesh/model/dot11s/peer-link.cc index 0fd4b7412..14bbf5de5 100644 --- a/src/mesh/model/dot11s/peer-link.cc +++ b/src/mesh/model/dot11s/peer-link.cc @@ -19,7 +19,7 @@ * Pavel Boyko */ -#include "ns3/peer-link.h" +#include "peer-link.h" #include "peer-management-protocol-mac.h" diff --git a/src/mesh/model/dot11s/peer-link.h b/src/mesh/model/dot11s/peer-link.h index 321b354ba..89d9d12aa 100644 --- a/src/mesh/model/dot11s/peer-link.h +++ b/src/mesh/model/dot11s/peer-link.h @@ -21,11 +21,12 @@ #ifndef PEER_LINK_H #define PEER_LINK_H +#include "ie-dot11s-beacon-timing.h" +#include "ie-dot11s-configuration.h" +#include "ie-dot11s-peer-management.h" + #include "ns3/callback.h" #include "ns3/event-id.h" -#include "ns3/ie-dot11s-beacon-timing.h" -#include "ns3/ie-dot11s-configuration.h" -#include "ns3/ie-dot11s-peer-management.h" #include "ns3/mac48-address.h" #include "ns3/nstime.h" #include "ns3/object.h" diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc index 5f2cb630a..f945505f8 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.cc +++ b/src/mesh/model/dot11s/peer-management-protocol.cc @@ -18,7 +18,7 @@ * Aleksey Kovalenko */ -#include "ns3/peer-management-protocol.h" +#include "peer-management-protocol.h" #include "ie-dot11s-configuration.h" #include "ie-dot11s-id.h" diff --git a/src/mesh/model/mesh-l2-routing-protocol.cc b/src/mesh/model/mesh-l2-routing-protocol.cc index 67788dff7..c7a8bf603 100644 --- a/src/mesh/model/mesh-l2-routing-protocol.cc +++ b/src/mesh/model/mesh-l2-routing-protocol.cc @@ -18,10 +18,11 @@ * Pavel Boyko */ -#include "ns3/mesh-l2-routing-protocol.h" +#include "mesh-l2-routing-protocol.h" + +#include "mesh-point-device.h" #include "ns3/log.h" -#include "ns3/mesh-point-device.h" namespace ns3 { diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc index 68fe8f8ab..2c568f1fa 100644 --- a/src/mesh/model/mesh-point-device.cc +++ b/src/mesh/model/mesh-point-device.cc @@ -18,10 +18,11 @@ * Pavel Boyko */ -#include "ns3/mesh-point-device.h" +#include "mesh-point-device.h" + +#include "mesh-wifi-interface-mac.h" #include "ns3/log.h" -#include "ns3/mesh-wifi-interface-mac.h" #include "ns3/packet.h" #include "ns3/pointer.h" #include "ns3/simulator.h" diff --git a/src/mesh/model/mesh-point-device.h b/src/mesh/model/mesh-point-device.h index cd72444f1..fc0bbfd21 100644 --- a/src/mesh/model/mesh-point-device.h +++ b/src/mesh/model/mesh-point-device.h @@ -21,9 +21,10 @@ #ifndef L2ROUTING_NET_DEVICE_H #define L2ROUTING_NET_DEVICE_H +#include "mesh-l2-routing-protocol.h" + #include "ns3/bridge-channel.h" #include "ns3/mac48-address.h" -#include "ns3/mesh-l2-routing-protocol.h" #include "ns3/net-device.h" #include "ns3/node.h" #include "ns3/random-variable-stream.h" diff --git a/src/mesh/model/mesh-wifi-beacon.cc b/src/mesh/model/mesh-wifi-beacon.cc index dcbf83124..3ba309823 100644 --- a/src/mesh/model/mesh-wifi-beacon.cc +++ b/src/mesh/model/mesh-wifi-beacon.cc @@ -17,7 +17,7 @@ * Author: Pavel Boyko */ -#include "ns3/mesh-wifi-beacon.h" +#include "mesh-wifi-beacon.h" #include "ns3/nstime.h" #include "ns3/wifi-mac-header.h" diff --git a/src/mesh/model/mesh-wifi-beacon.h b/src/mesh/model/mesh-wifi-beacon.h index d3cb1ce38..60cf0ac99 100644 --- a/src/mesh/model/mesh-wifi-beacon.h +++ b/src/mesh/model/mesh-wifi-beacon.h @@ -20,7 +20,8 @@ #ifndef MESH_WIFI_BEACON_H #define MESH_WIFI_BEACON_H -#include "ns3/mesh-information-element-vector.h" +#include "mesh-information-element-vector.h" + #include "ns3/mgt-headers.h" #include "ns3/object.h" #include "ns3/packet.h" diff --git a/src/mesh/model/mesh-wifi-interface-mac-plugin.h b/src/mesh/model/mesh-wifi-interface-mac-plugin.h index 74dd3366d..2385f3502 100644 --- a/src/mesh/model/mesh-wifi-interface-mac-plugin.h +++ b/src/mesh/model/mesh-wifi-interface-mac-plugin.h @@ -20,8 +20,9 @@ #ifndef MESH_WIFI_INTERFACE_MAC_PLUGIN_H #define MESH_WIFI_INTERFACE_MAC_PLUGIN_H +#include "mesh-wifi-beacon.h" + #include "ns3/mac48-address.h" -#include "ns3/mesh-wifi-beacon.h" #include "ns3/packet.h" #include "ns3/simple-ref-count.h" diff --git a/src/mesh/model/mesh-wifi-interface-mac.cc b/src/mesh/model/mesh-wifi-interface-mac.cc index 540aebc92..baf6fe1de 100644 --- a/src/mesh/model/mesh-wifi-interface-mac.cc +++ b/src/mesh/model/mesh-wifi-interface-mac.cc @@ -18,14 +18,15 @@ * Pavel Boyko */ -#include "ns3/mesh-wifi-interface-mac.h" +#include "mesh-wifi-interface-mac.h" + +#include "mesh-wifi-beacon.h" #include "ns3/boolean.h" #include "ns3/channel-access-manager.h" #include "ns3/double.h" #include "ns3/log.h" #include "ns3/mac-tx-middle.h" -#include "ns3/mesh-wifi-beacon.h" #include "ns3/pointer.h" #include "ns3/qos-txop.h" #include "ns3/random-variable-stream.h" diff --git a/src/mesh/model/mesh-wifi-interface-mac.h b/src/mesh/model/mesh-wifi-interface-mac.h index e6ceaa16e..42871e08f 100644 --- a/src/mesh/model/mesh-wifi-interface-mac.h +++ b/src/mesh/model/mesh-wifi-interface-mac.h @@ -21,10 +21,11 @@ #ifndef MESH_WIFI_INTERFACE_MAC_H #define MESH_WIFI_INTERFACE_MAC_H +#include "mesh-wifi-interface-mac-plugin.h" + #include "ns3/callback.h" #include "ns3/event-id.h" #include "ns3/mac48-address.h" -#include "ns3/mesh-wifi-interface-mac-plugin.h" #include "ns3/mgt-headers.h" #include "ns3/nstime.h" #include "ns3/packet.h" diff --git a/src/mobility/helper/group-mobility-helper.cc b/src/mobility/helper/group-mobility-helper.cc index 36f062cba..1544f4f9c 100644 --- a/src/mobility/helper/group-mobility-helper.cc +++ b/src/mobility/helper/group-mobility-helper.cc @@ -19,7 +19,7 @@ * Adapted from 'mobility-helper.cc' for group mobility by Tom Henderson */ -#include "ns3/group-mobility-helper.h" +#include "group-mobility-helper.h" #include "ns3/config.h" #include "ns3/hierarchical-mobility-model.h" diff --git a/src/mobility/helper/mobility-helper.cc b/src/mobility/helper/mobility-helper.cc index 0374ae75b..9bd7bc9b3 100644 --- a/src/mobility/helper/mobility-helper.cc +++ b/src/mobility/helper/mobility-helper.cc @@ -16,7 +16,7 @@ * * Author: Mathieu Lacage */ -#include "ns3/mobility-helper.h" +#include "mobility-helper.h" #include "ns3/config.h" #include "ns3/hierarchical-mobility-model.h" diff --git a/src/mobility/model/constant-velocity-helper.cc b/src/mobility/model/constant-velocity-helper.cc index c7efee912..18f669229 100644 --- a/src/mobility/model/constant-velocity-helper.cc +++ b/src/mobility/model/constant-velocity-helper.cc @@ -18,9 +18,10 @@ */ #include "constant-velocity-helper.h" -#include "ns3/box.h" +#include "box.h" +#include "rectangle.h" + #include "ns3/log.h" -#include "ns3/rectangle.h" #include "ns3/simulator.h" namespace ns3 diff --git a/src/mobility/model/constant-velocity-helper.h b/src/mobility/model/constant-velocity-helper.h index 53abe6cb0..dcf9b5891 100644 --- a/src/mobility/model/constant-velocity-helper.h +++ b/src/mobility/model/constant-velocity-helper.h @@ -19,7 +19,8 @@ #ifndef CONSTANT_VELOCITY_HELPER_H #define CONSTANT_VELOCITY_HELPER_H -#include "ns3/box.h" +#include "box.h" + #include "ns3/nstime.h" #include "ns3/vector.h" diff --git a/src/mobility/model/gauss-markov-mobility-model.h b/src/mobility/model/gauss-markov-mobility-model.h index 4d092c8c3..809fdcf00 100644 --- a/src/mobility/model/gauss-markov-mobility-model.h +++ b/src/mobility/model/gauss-markov-mobility-model.h @@ -21,11 +21,11 @@ #ifndef GAUSS_MARKOV_MOBILITY_MODEL_H #define GAUSS_MARKOV_MOBILITY_MODEL_H +#include "box.h" #include "constant-velocity-helper.h" #include "mobility-model.h" #include "position-allocator.h" -#include "ns3/box.h" #include "ns3/event-id.h" #include "ns3/nstime.h" #include "ns3/object.h" diff --git a/src/mobility/model/random-direction-2d-mobility-model.h b/src/mobility/model/random-direction-2d-mobility-model.h index 3a0a1ca05..aa1b039a0 100644 --- a/src/mobility/model/random-direction-2d-mobility-model.h +++ b/src/mobility/model/random-direction-2d-mobility-model.h @@ -21,13 +21,13 @@ #include "constant-velocity-helper.h" #include "mobility-model.h" +#include "rectangle.h" #include "ns3/event-id.h" #include "ns3/nstime.h" #include "ns3/object.h" #include "ns3/ptr.h" #include "ns3/random-variable-stream.h" -#include "ns3/rectangle.h" namespace ns3 { diff --git a/src/mobility/model/random-walk-2d-mobility-model.h b/src/mobility/model/random-walk-2d-mobility-model.h index 8671b3f5e..61cb286ae 100644 --- a/src/mobility/model/random-walk-2d-mobility-model.h +++ b/src/mobility/model/random-walk-2d-mobility-model.h @@ -21,12 +21,12 @@ #include "constant-velocity-helper.h" #include "mobility-model.h" +#include "rectangle.h" #include "ns3/event-id.h" #include "ns3/nstime.h" #include "ns3/object.h" #include "ns3/random-variable-stream.h" -#include "ns3/rectangle.h" namespace ns3 { diff --git a/src/mpi/model/null-message-mpi-interface.cc b/src/mpi/model/null-message-mpi-interface.cc index 2c12e7473..cdab32df6 100644 --- a/src/mpi/model/null-message-mpi-interface.cc +++ b/src/mpi/model/null-message-mpi-interface.cc @@ -26,12 +26,12 @@ #include "null-message-mpi-interface.h" +#include "mpi-receiver.h" #include "null-message-simulator-impl.h" #include "remote-channel-bundle-manager.h" #include "remote-channel-bundle.h" #include "ns3/log.h" -#include "ns3/mpi-receiver.h" #include "ns3/net-device.h" #include "ns3/node-list.h" #include "ns3/node.h" diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index f4669782e..ff62e334a 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -38,7 +38,6 @@ #endif #include "animation-interface.h" -#include "ns3/animation-interface.h" #include "ns3/channel.h" #include "ns3/config.h" #include "ns3/constant-position-mobility-model.h" diff --git a/src/network/helper/packet-socket-helper.h b/src/network/helper/packet-socket-helper.h index fbef6cf00..9da511aea 100644 --- a/src/network/helper/packet-socket-helper.h +++ b/src/network/helper/packet-socket-helper.h @@ -20,7 +20,7 @@ #ifndef PACKET_SOCKET_HELPER_H #define PACKET_SOCKET_HELPER_H -#include "ns3/node-container.h" +#include "node-container.h" namespace ns3 { diff --git a/src/network/helper/simple-net-device-helper.cc b/src/network/helper/simple-net-device-helper.cc index df17b023b..90deaf158 100644 --- a/src/network/helper/simple-net-device-helper.cc +++ b/src/network/helper/simple-net-device-helper.cc @@ -19,6 +19,8 @@ #include "simple-net-device-helper.h" +#include "trace-helper.h" + #include "ns3/abort.h" #include "ns3/boolean.h" #include "ns3/config.h" @@ -30,7 +32,6 @@ #include "ns3/simple-channel.h" #include "ns3/simple-net-device.h" #include "ns3/simulator.h" -#include "ns3/trace-helper.h" #include diff --git a/src/network/helper/simple-net-device-helper.h b/src/network/helper/simple-net-device-helper.h index 0154dd0da..68e5b238d 100644 --- a/src/network/helper/simple-net-device-helper.h +++ b/src/network/helper/simple-net-device-helper.h @@ -19,9 +19,10 @@ #ifndef SIMPLE_NETDEVICE_HELPER_H #define SIMPLE_NETDEVICE_HELPER_H +#include "net-device-container.h" +#include "node-container.h" + #include "ns3/attribute.h" -#include "ns3/net-device-container.h" -#include "ns3/node-container.h" #include "ns3/object-factory.h" #include "ns3/queue.h" #include "ns3/simple-channel.h" diff --git a/src/network/helper/trace-helper.h b/src/network/helper/trace-helper.h index 6941af33c..3fc4e15f9 100644 --- a/src/network/helper/trace-helper.h +++ b/src/network/helper/trace-helper.h @@ -18,9 +18,10 @@ #ifndef TRACE_HELPER_H #define TRACE_HELPER_H +#include "net-device-container.h" +#include "node-container.h" + #include "ns3/assert.h" -#include "ns3/net-device-container.h" -#include "ns3/node-container.h" #include "ns3/output-stream-wrapper.h" #include "ns3/pcap-file-wrapper.h" #include "ns3/simulator.h" diff --git a/src/network/model/address.h b/src/network/model/address.h index f85be32b1..080023521 100644 --- a/src/network/model/address.h +++ b/src/network/model/address.h @@ -20,9 +20,10 @@ #ifndef ADDRESS_H #define ADDRESS_H +#include "tag-buffer.h" + #include "ns3/attribute-helper.h" #include "ns3/attribute.h" -#include "ns3/tag-buffer.h" #include #include diff --git a/src/network/model/application.cc b/src/network/model/application.cc index 25778f89e..b28a98f31 100644 --- a/src/network/model/application.cc +++ b/src/network/model/application.cc @@ -22,8 +22,9 @@ #include "application.h" +#include "node.h" + #include "ns3/log.h" -#include "ns3/node.h" #include "ns3/nstime.h" #include "ns3/simulator.h" diff --git a/src/network/model/application.h b/src/network/model/application.h index 84fa8c660..bec5b5809 100644 --- a/src/network/model/application.h +++ b/src/network/model/application.h @@ -20,8 +20,9 @@ #ifndef APPLICATION_H #define APPLICATION_H +#include "node.h" + #include "ns3/event-id.h" -#include "ns3/node.h" #include "ns3/nstime.h" #include "ns3/object.h" #include "ns3/ptr.h" diff --git a/src/network/model/nix-vector.h b/src/network/model/nix-vector.h index b3913b64c..dd1eae66a 100644 --- a/src/network/model/nix-vector.h +++ b/src/network/model/nix-vector.h @@ -20,7 +20,8 @@ #ifndef NIX_VECTOR_H #define NIX_VECTOR_H -#include "ns3/buffer.h" +#include "buffer.h" + #include "ns3/ptr.h" #include "ns3/simple-ref-count.h" diff --git a/src/network/model/node.cc b/src/network/model/node.cc index 46fa23237..2b465d8f2 100644 --- a/src/network/model/node.cc +++ b/src/network/model/node.cc @@ -23,13 +23,13 @@ #include "application.h" #include "net-device.h" #include "node-list.h" +#include "packet.h" #include "ns3/assert.h" #include "ns3/boolean.h" #include "ns3/global-value.h" #include "ns3/log.h" #include "ns3/object-vector.h" -#include "ns3/packet.h" #include "ns3/simulator.h" #include "ns3/uinteger.h" diff --git a/src/network/model/node.h b/src/network/model/node.h index 471e30abe..3c0609378 100644 --- a/src/network/model/node.h +++ b/src/network/model/node.h @@ -20,8 +20,9 @@ #ifndef NODE_H #define NODE_H +#include "net-device.h" + #include "ns3/callback.h" -#include "ns3/net-device.h" #include "ns3/object.h" #include "ns3/ptr.h" diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc index ba6424018..064f0ff94 100644 --- a/src/network/model/socket.cc +++ b/src/network/model/socket.cc @@ -22,10 +22,10 @@ #include "socket.h" #include "node.h" +#include "packet.h" #include "socket-factory.h" #include "ns3/log.h" -#include "ns3/packet.h" #include diff --git a/src/network/model/socket.h b/src/network/model/socket.h index 2620d5f8d..70633588e 100644 --- a/src/network/model/socket.h +++ b/src/network/model/socket.h @@ -23,14 +23,14 @@ #define NS3_SOCKET_H #include "address.h" +#include "net-device.h" +#include "tag.h" #include "ns3/callback.h" #include "ns3/inet-socket-address.h" #include "ns3/inet6-socket-address.h" -#include "ns3/net-device.h" #include "ns3/object.h" #include "ns3/ptr.h" -#include "ns3/tag.h" #include diff --git a/src/network/utils/drop-tail-queue.h b/src/network/utils/drop-tail-queue.h index 0e89ee8e6..00066480b 100644 --- a/src/network/utils/drop-tail-queue.h +++ b/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 { diff --git a/src/network/utils/error-channel.cc b/src/network/utils/error-channel.cc index 19aa2adaa..2a6145178 100644 --- a/src/network/utils/error-channel.cc +++ b/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 diff --git a/src/network/utils/error-channel.h b/src/network/utils/error-channel.h index adacfb9d8..4a3cd821d 100644 --- a/src/network/utils/error-channel.h +++ b/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 diff --git a/src/network/utils/ethernet-header.h b/src/network/utils/ethernet-header.h index f0d57e369..d0dea1696 100644 --- a/src/network/utils/ethernet-header.h +++ b/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 diff --git a/src/network/utils/ipv6-address.h b/src/network/utils/ipv6-address.h index 1e1906348..98fa39400 100644 --- a/src/network/utils/ipv6-address.h +++ b/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 #include diff --git a/src/network/utils/net-device-queue-interface.cc b/src/network/utils/net-device-queue-interface.cc index 32b40644e..1bc361039 100644 --- a/src/network/utils/net-device-queue-interface.cc +++ b/src/network/utils/net-device-queue-interface.cc @@ -17,11 +17,12 @@ * Author: Stefano Avallone */ -#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 diff --git a/src/network/utils/packet-data-calculators.cc b/src/network/utils/packet-data-calculators.cc index 18ea532b9..16f511ca5 100644 --- a/src/network/utils/packet-data-calculators.cc +++ b/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; diff --git a/src/network/utils/packet-data-calculators.h b/src/network/utils/packet-data-calculators.h index d77e2ec26..73b99d16f 100644 --- a/src/network/utils/packet-data-calculators.h +++ b/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 diff --git a/src/network/utils/packet-probe.cc b/src/network/utils/packet-probe.cc index 42423e701..eebeeb8ec 100644 --- a/src/network/utils/packet-probe.cc +++ b/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" diff --git a/src/network/utils/packet-socket-client.cc b/src/network/utils/packet-socket-client.cc index dcdcbab08..61eb94f5d 100644 --- a/src/network/utils/packet-socket-client.cc +++ b/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" diff --git a/src/network/utils/packet-socket-client.h b/src/network/utils/packet-socket-client.h index 1da59f926..f20d479ea 100644 --- a/src/network/utils/packet-socket-client.h +++ b/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" diff --git a/src/network/utils/packet-socket-server.cc b/src/network/utils/packet-socket-server.cc index 932a9ee10..45d384eb0 100644 --- a/src/network/utils/packet-socket-server.cc +++ b/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" diff --git a/src/network/utils/packet-socket-server.h b/src/network/utils/packet-socket-server.h index 1960f446a..a3cfcc2ec 100644 --- a/src/network/utils/packet-socket-server.h +++ b/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" diff --git a/src/network/utils/packetbb.cc b/src/network/utils/packetbb.cc index 751da7fcd..2a2f14945 100644 --- a/src/network/utils/packetbb.cc +++ b/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; diff --git a/src/network/utils/queue.h b/src/network/utils/queue.h index a42a57ea9..f346649cf 100644 --- a/src/network/utils/queue.h +++ b/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" diff --git a/src/network/utils/simple-net-device.cc b/src/network/utils/simple-net-device.cc index e58f8a54b..62279614c 100644 --- a/src/network/utils/simple-net-device.cc +++ b/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" diff --git a/src/network/utils/simple-net-device.h b/src/network/utils/simple-net-device.h index 0f3dde9b3..86781d669 100644 --- a/src/network/utils/simple-net-device.h +++ b/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 diff --git a/src/point-to-point-layout/model/point-to-point-dumbbell.cc b/src/point-to-point-layout/model/point-to-point-dumbbell.cc index f16f4803f..52432c3f2 100644 --- a/src/point-to-point-layout/model/point-to-point-dumbbell.cc +++ b/src/point-to-point-layout/model/point-to-point-dumbbell.cc @@ -17,19 +17,19 @@ // Implement an object to create a dumbbell topology. -#include -#include -#include +#include "point-to-point-dumbbell.h" -// ns3 includes #include "ns3/constant-position-mobility-model.h" #include "ns3/ipv6-address-generator.h" #include "ns3/log.h" #include "ns3/node-list.h" -#include "ns3/point-to-point-dumbbell.h" #include "ns3/point-to-point-net-device.h" #include "ns3/vector.h" +#include +#include +#include + namespace ns3 { diff --git a/src/point-to-point-layout/model/point-to-point-grid.cc b/src/point-to-point-layout/model/point-to-point-grid.cc index 14ddad53d..831ad8013 100644 --- a/src/point-to-point-layout/model/point-to-point-grid.cc +++ b/src/point-to-point-layout/model/point-to-point-grid.cc @@ -17,7 +17,7 @@ // Implement an object to create a grid topology. -#include "ns3/point-to-point-grid.h" +#include "point-to-point-grid.h" #include "ns3/constant-position-mobility-model.h" #include "ns3/internet-stack-helper.h" diff --git a/src/point-to-point-layout/model/point-to-point-star.cc b/src/point-to-point-layout/model/point-to-point-star.cc index 7ba982cd5..2b416f4b8 100644 --- a/src/point-to-point-layout/model/point-to-point-star.cc +++ b/src/point-to-point-layout/model/point-to-point-star.cc @@ -15,19 +15,19 @@ // Implement an object to create a star topology. -#include -#include -#include +#include "point-to-point-star.h" -// ns3 includes #include "ns3/constant-position-mobility-model.h" #include "ns3/ipv6-address-generator.h" #include "ns3/log.h" #include "ns3/node-list.h" #include "ns3/point-to-point-net-device.h" -#include "ns3/point-to-point-star.h" #include "ns3/vector.h" +#include +#include +#include + namespace ns3 { diff --git a/src/propagation/model/cost231-propagation-loss-model.cc b/src/propagation/model/cost231-propagation-loss-model.cc index a58f092c6..654638abf 100644 --- a/src/propagation/model/cost231-propagation-loss-model.cc +++ b/src/propagation/model/cost231-propagation-loss-model.cc @@ -20,11 +20,12 @@ #include "cost231-propagation-loss-model.h" +#include "propagation-loss-model.h" + #include "ns3/double.h" #include "ns3/log.h" #include "ns3/mobility-model.h" #include "ns3/pointer.h" -#include "ns3/propagation-loss-model.h" #include diff --git a/src/propagation/model/cost231-propagation-loss-model.h b/src/propagation/model/cost231-propagation-loss-model.h index 5f6c3c62d..01f871b53 100644 --- a/src/propagation/model/cost231-propagation-loss-model.h +++ b/src/propagation/model/cost231-propagation-loss-model.h @@ -21,8 +21,9 @@ #ifndef COST231_PROPAGATION_LOSS_MODEL_H #define COST231_PROPAGATION_LOSS_MODEL_H +#include "propagation-loss-model.h" + #include "ns3/nstime.h" -#include "ns3/propagation-loss-model.h" namespace ns3 { diff --git a/src/propagation/model/itu-r-1411-los-propagation-loss-model.h b/src/propagation/model/itu-r-1411-los-propagation-loss-model.h index c0d83184b..15c9d72c4 100644 --- a/src/propagation/model/itu-r-1411-los-propagation-loss-model.h +++ b/src/propagation/model/itu-r-1411-los-propagation-loss-model.h @@ -22,7 +22,7 @@ #ifndef ITU_R_1411_LOS_PROPAGATION_LOSS_MODEL_H #define ITU_R_1411_LOS_PROPAGATION_LOSS_MODEL_H -#include "ns3/propagation-loss-model.h" +#include "propagation-loss-model.h" namespace ns3 { diff --git a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h index 5b5dbe735..40b94522c 100644 --- a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h +++ b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h @@ -22,8 +22,8 @@ #ifndef ITU_R_1411_NLOS_OVER_ROOFTOP_PROPAGATION_LOSS_MODEL_H #define ITU_R_1411_NLOS_OVER_ROOFTOP_PROPAGATION_LOSS_MODEL_H -#include -#include +#include "propagation-environment.h" +#include "propagation-loss-model.h" namespace ns3 { diff --git a/src/propagation/model/jakes-propagation-loss-model.h b/src/propagation/model/jakes-propagation-loss-model.h index d67310a2c..e61867b04 100644 --- a/src/propagation/model/jakes-propagation-loss-model.h +++ b/src/propagation/model/jakes-propagation-loss-model.h @@ -19,9 +19,9 @@ #ifndef JAKES_STATIONARY_LOSS_MODEL_H #define JAKES_STATIONARY_LOSS_MODEL_H -#include "ns3/jakes-process.h" -#include "ns3/propagation-cache.h" -#include "ns3/propagation-loss-model.h" +#include "jakes-process.h" +#include "propagation-cache.h" +#include "propagation-loss-model.h" namespace ns3 { diff --git a/src/propagation/model/kun-2600-mhz-propagation-loss-model.h b/src/propagation/model/kun-2600-mhz-propagation-loss-model.h index 18fd6084f..f36a6e1da 100644 --- a/src/propagation/model/kun-2600-mhz-propagation-loss-model.h +++ b/src/propagation/model/kun-2600-mhz-propagation-loss-model.h @@ -22,7 +22,7 @@ #ifndef KUN_2600MHZ_PROPAGATION_LOSS_MODEL_H #define KUN_2600MHZ_PROPAGATION_LOSS_MODEL_H -#include +#include "propagation-loss-model.h" namespace ns3 { diff --git a/src/propagation/model/okumura-hata-propagation-loss-model.h b/src/propagation/model/okumura-hata-propagation-loss-model.h index 54c8c8cb6..c20553525 100644 --- a/src/propagation/model/okumura-hata-propagation-loss-model.h +++ b/src/propagation/model/okumura-hata-propagation-loss-model.h @@ -22,8 +22,8 @@ #ifndef OKUMURA_HATA_PROPAGATION_LOSS_MODEL_H #define OKUMURA_HATA_PROPAGATION_LOSS_MODEL_H -#include -#include +#include "propagation-environment.h" +#include "propagation-loss-model.h" namespace ns3 { diff --git a/src/propagation/model/probabilistic-v2v-channel-condition-model.h b/src/propagation/model/probabilistic-v2v-channel-condition-model.h index d70a7b890..d75151392 100644 --- a/src/propagation/model/probabilistic-v2v-channel-condition-model.h +++ b/src/propagation/model/probabilistic-v2v-channel-condition-model.h @@ -19,7 +19,7 @@ #ifndef PROBABILISTIC_V2V_CHANNEL_CONDITION_MODEL_H #define PROBABILISTIC_V2V_CHANNEL_CONDITION_MODEL_H -#include "ns3/channel-condition-model.h" +#include "channel-condition-model.h" namespace ns3 { diff --git a/src/propagation/model/three-gpp-propagation-loss-model.cc b/src/propagation/model/three-gpp-propagation-loss-model.cc index 7f2855a7e..6e25f2b2e 100644 --- a/src/propagation/model/three-gpp-propagation-loss-model.cc +++ b/src/propagation/model/three-gpp-propagation-loss-model.cc @@ -18,8 +18,9 @@ #include "three-gpp-propagation-loss-model.h" +#include "channel-condition-model.h" + #include "ns3/boolean.h" -#include "ns3/channel-condition-model.h" #include "ns3/double.h" #include "ns3/log.h" #include "ns3/mobility-model.h" diff --git a/src/propagation/model/three-gpp-propagation-loss-model.h b/src/propagation/model/three-gpp-propagation-loss-model.h index c664fafcc..646b77dd2 100644 --- a/src/propagation/model/three-gpp-propagation-loss-model.h +++ b/src/propagation/model/three-gpp-propagation-loss-model.h @@ -19,8 +19,8 @@ #ifndef THREE_GPP_PROPAGATION_LOSS_MODEL_H #define THREE_GPP_PROPAGATION_LOSS_MODEL_H -#include "ns3/channel-condition-model.h" -#include "ns3/propagation-loss-model.h" +#include "channel-condition-model.h" +#include "propagation-loss-model.h" namespace ns3 { diff --git a/src/spectrum/model/constant-spectrum-propagation-loss.cc b/src/spectrum/model/constant-spectrum-propagation-loss.cc index 12152f946..06928622a 100644 --- a/src/spectrum/model/constant-spectrum-propagation-loss.cc +++ b/src/spectrum/model/constant-spectrum-propagation-loss.cc @@ -17,7 +17,7 @@ * Author: Manuel Requena */ -#include "ns3/constant-spectrum-propagation-loss.h" +#include "constant-spectrum-propagation-loss.h" #include "spectrum-signal-parameters.h" diff --git a/src/spectrum/model/constant-spectrum-propagation-loss.h b/src/spectrum/model/constant-spectrum-propagation-loss.h index 1669eeed0..dbb315c10 100644 --- a/src/spectrum/model/constant-spectrum-propagation-loss.h +++ b/src/spectrum/model/constant-spectrum-propagation-loss.h @@ -20,7 +20,7 @@ #ifndef CONSTANT_SPECTRUM_PROPAGATION_LOSS_H #define CONSTANT_SPECTRUM_PROPAGATION_LOSS_H -#include "ns3/spectrum-propagation-loss-model.h" +#include "spectrum-propagation-loss-model.h" namespace ns3 { diff --git a/src/spectrum/model/friis-spectrum-propagation-loss.cc b/src/spectrum/model/friis-spectrum-propagation-loss.cc index c6d2594eb..92fd489c8 100644 --- a/src/spectrum/model/friis-spectrum-propagation-loss.cc +++ b/src/spectrum/model/friis-spectrum-propagation-loss.cc @@ -17,9 +17,10 @@ * Author: Nicola Baldo */ +#include "friis-spectrum-propagation-loss.h" + #include "spectrum-signal-parameters.h" -#include #include #include // for M_PI diff --git a/src/spectrum/model/friis-spectrum-propagation-loss.h b/src/spectrum/model/friis-spectrum-propagation-loss.h index 1749d08f8..0810ba236 100644 --- a/src/spectrum/model/friis-spectrum-propagation-loss.h +++ b/src/spectrum/model/friis-spectrum-propagation-loss.h @@ -20,7 +20,7 @@ #ifndef FRIIS_SPECTRUM_PROPAGATION_LOSS_H #define FRIIS_SPECTRUM_PROPAGATION_LOSS_H -#include +#include "spectrum-propagation-loss-model.h" namespace ns3 { diff --git a/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h b/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h index 614ef4949..d34484679 100644 --- a/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h +++ b/src/spectrum/model/half-duplex-ideal-phy-signal-parameters.h @@ -20,7 +20,7 @@ #ifndef HALF_DUPLEX_IDEAL_PHY_SPECTRUM_PARAMETERS_H #define HALF_DUPLEX_IDEAL_PHY_SPECTRUM_PARAMETERS_H -#include +#include "spectrum-signal-parameters.h" namespace ns3 { diff --git a/src/spectrum/model/half-duplex-ideal-phy.h b/src/spectrum/model/half-duplex-ideal-phy.h index f77e6be5c..7a3b09f4a 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.h +++ b/src/spectrum/model/half-duplex-ideal-phy.h @@ -20,6 +20,12 @@ #ifndef HALF_DUPLEX_IDEAL_PHY_H #define HALF_DUPLEX_IDEAL_PHY_H +#include "spectrum-channel.h" +#include "spectrum-interference.h" +#include "spectrum-phy.h" +#include "spectrum-signal-parameters.h" +#include "spectrum-value.h" + #include #include #include @@ -27,11 +33,6 @@ #include #include #include -#include -#include -#include -#include -#include namespace ns3 { diff --git a/src/spectrum/model/ism-spectrum-value-helper.h b/src/spectrum/model/ism-spectrum-value-helper.h index 9937ea650..bcbe2ca00 100644 --- a/src/spectrum/model/ism-spectrum-value-helper.h +++ b/src/spectrum/model/ism-spectrum-value-helper.h @@ -22,7 +22,7 @@ #ifndef ISM_SPECTRUM_VALUE_HELPER_H #define ISM_SPECTRUM_VALUE_HELPER_H -#include +#include "spectrum-value.h" namespace ns3 { diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.h b/src/spectrum/model/microwave-oven-spectrum-value-helper.h index 6bd0200cf..030086ab7 100644 --- a/src/spectrum/model/microwave-oven-spectrum-value-helper.h +++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.h @@ -20,7 +20,7 @@ #ifndef MICROWAVE_OVEN_SPECTRUM_VALUE_HELPER_H #define MICROWAVE_OVEN_SPECTRUM_VALUE_HELPER_H -#include +#include "spectrum-value.h" namespace ns3 { diff --git a/src/spectrum/model/multi-model-spectrum-channel.cc b/src/spectrum/model/multi-model-spectrum-channel.cc index b782a8b5f..00df775da 100644 --- a/src/spectrum/model/multi-model-spectrum-channel.cc +++ b/src/spectrum/model/multi-model-spectrum-channel.cc @@ -19,6 +19,11 @@ #include "multi-model-spectrum-channel.h" +#include "spectrum-converter.h" +#include "spectrum-phy.h" +#include "spectrum-propagation-loss-model.h" +#include "spectrum-transmit-filter.h" + #include #include #include @@ -32,10 +37,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/spectrum/model/multi-model-spectrum-channel.h b/src/spectrum/model/multi-model-spectrum-channel.h index 6ace8abf5..deeb88b1e 100644 --- a/src/spectrum/model/multi-model-spectrum-channel.h +++ b/src/spectrum/model/multi-model-spectrum-channel.h @@ -20,11 +20,12 @@ #ifndef MULTI_MODEL_SPECTRUM_CHANNEL_H #define MULTI_MODEL_SPECTRUM_CHANNEL_H +#include "spectrum-channel.h" +#include "spectrum-converter.h" +#include "spectrum-propagation-loss-model.h" +#include "spectrum-value.h" + #include -#include -#include -#include -#include #include #include diff --git a/src/spectrum/model/phased-array-spectrum-propagation-loss-model.cc b/src/spectrum/model/phased-array-spectrum-propagation-loss-model.cc index 328b0ab1e..cfb287487 100644 --- a/src/spectrum/model/phased-array-spectrum-propagation-loss-model.cc +++ b/src/spectrum/model/phased-array-spectrum-propagation-loss-model.cc @@ -18,7 +18,8 @@ #include "phased-array-spectrum-propagation-loss-model.h" -#include "ns3/spectrum-signal-parameters.h" +#include "spectrum-signal-parameters.h" + #include #include diff --git a/src/spectrum/model/phased-array-spectrum-propagation-loss-model.h b/src/spectrum/model/phased-array-spectrum-propagation-loss-model.h index 453bef2aa..a2a2c8af3 100644 --- a/src/spectrum/model/phased-array-spectrum-propagation-loss-model.h +++ b/src/spectrum/model/phased-array-spectrum-propagation-loss-model.h @@ -19,10 +19,11 @@ #ifndef PHASED_ARRAY_SPECTRUM_PROPAGATION_LOSS_MODEL_H #define PHASED_ARRAY_SPECTRUM_PROPAGATION_LOSS_MODEL_H +#include "spectrum-value.h" + #include #include #include -#include namespace ns3 { diff --git a/src/spectrum/model/single-model-spectrum-channel.cc b/src/spectrum/model/single-model-spectrum-channel.cc index 392855439..5ecab6398 100644 --- a/src/spectrum/model/single-model-spectrum-channel.cc +++ b/src/spectrum/model/single-model-spectrum-channel.cc @@ -19,6 +19,10 @@ #include "single-model-spectrum-channel.h" +#include "spectrum-phy.h" +#include "spectrum-propagation-loss-model.h" +#include "spectrum-transmit-filter.h" + #include #include #include @@ -32,9 +36,6 @@ #include #include #include -#include -#include -#include #include diff --git a/src/spectrum/model/single-model-spectrum-channel.h b/src/spectrum/model/single-model-spectrum-channel.h index a3542a4c0..a772e9d62 100644 --- a/src/spectrum/model/single-model-spectrum-channel.h +++ b/src/spectrum/model/single-model-spectrum-channel.h @@ -20,8 +20,9 @@ #ifndef SINGLE_MODEL_SPECTRUM_CHANNEL_H #define SINGLE_MODEL_SPECTRUM_CHANNEL_H -#include -#include +#include "spectrum-channel.h" +#include "spectrum-model.h" + #include namespace ns3 diff --git a/src/spectrum/model/spectrum-analyzer.h b/src/spectrum/model/spectrum-analyzer.h index 3284c485d..3d889cb13 100644 --- a/src/spectrum/model/spectrum-analyzer.h +++ b/src/spectrum/model/spectrum-analyzer.h @@ -20,13 +20,14 @@ #ifndef SPECTRUM_ANALYZER_H #define SPECTRUM_ANALYZER_H +#include "spectrum-channel.h" +#include "spectrum-phy.h" +#include "spectrum-value.h" + #include #include #include #include -#include -#include -#include #include #include diff --git a/src/spectrum/model/spectrum-channel.h b/src/spectrum/model/spectrum-channel.h index f4708fbd3..311ef1cb5 100644 --- a/src/spectrum/model/spectrum-channel.h +++ b/src/spectrum/model/spectrum-channel.h @@ -20,17 +20,18 @@ #ifndef SPECTRUM_CHANNEL_H #define SPECTRUM_CHANNEL_H +#include "phased-array-spectrum-propagation-loss-model.h" +#include "spectrum-phy.h" +#include "spectrum-propagation-loss-model.h" +#include "spectrum-signal-parameters.h" +#include "spectrum-transmit-filter.h" + #include #include #include #include -#include #include #include -#include -#include -#include -#include #include namespace ns3 diff --git a/src/spectrum/model/spectrum-converter.cc b/src/spectrum/model/spectrum-converter.cc index 357e1a39e..7b8f9f9c9 100644 --- a/src/spectrum/model/spectrum-converter.cc +++ b/src/spectrum/model/spectrum-converter.cc @@ -17,9 +17,10 @@ * Author: Nicola Baldo */ +#include "spectrum-converter.h" + #include #include -#include #include diff --git a/src/spectrum/model/spectrum-converter.h b/src/spectrum/model/spectrum-converter.h index d271fe718..5c2aea006 100644 --- a/src/spectrum/model/spectrum-converter.h +++ b/src/spectrum/model/spectrum-converter.h @@ -20,7 +20,7 @@ #ifndef SPECTRUM_CONVERTER_H #define SPECTRUM_CONVERTER_H -#include +#include "spectrum-value.h" namespace ns3 { diff --git a/src/spectrum/model/spectrum-error-model.h b/src/spectrum/model/spectrum-error-model.h index 958315f41..9c41f92cb 100644 --- a/src/spectrum/model/spectrum-error-model.h +++ b/src/spectrum/model/spectrum-error-model.h @@ -20,11 +20,12 @@ #ifndef SPECTRUM_ERROR_MODEL_H #define SPECTRUM_ERROR_MODEL_H +#include "spectrum-value.h" + #include #include #include #include -#include namespace ns3 { diff --git a/src/spectrum/model/spectrum-interference.h b/src/spectrum/model/spectrum-interference.h index f2b5043e3..b0add667d 100644 --- a/src/spectrum/model/spectrum-interference.h +++ b/src/spectrum/model/spectrum-interference.h @@ -20,10 +20,11 @@ #ifndef SPECTRUM_INTERFERENCE_H #define SPECTRUM_INTERFERENCE_H +#include "spectrum-value.h" + #include #include #include -#include namespace ns3 { diff --git a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc index 0be3e661b..d2e3cd5e5 100644 --- a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc +++ b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc @@ -17,7 +17,7 @@ * Author: Nicola Baldo */ -#include +#include "spectrum-model-300kHz-300GHz-log.h" namespace ns3 { diff --git a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h index 5810253ef..0a8cba46a 100644 --- a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h +++ b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h @@ -20,7 +20,7 @@ #ifndef FREQS_300KHZ_300GHZ_LOG_H #define FREQS_300KHZ_300GHZ_LOG_H -#include +#include "spectrum-value.h" namespace ns3 { diff --git a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc index fb374e66f..b72188903 100644 --- a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc +++ b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc @@ -17,7 +17,7 @@ * Author: Nicola Baldo */ -#include +#include "spectrum-model-ism2400MHz-res1MHz.h" namespace ns3 { diff --git a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h index 6cd9371a2..cfbc60c4d 100644 --- a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h +++ b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h @@ -20,7 +20,7 @@ #ifndef FREQS_ISM2400MHZ_RES1MHZ_H #define FREQS_ISM2400MHZ_RES1MHZ_H -#include +#include "spectrum-value.h" namespace ns3 { diff --git a/src/spectrum/model/spectrum-model.cc b/src/spectrum/model/spectrum-model.cc index 3fecc1c0d..548f33847 100644 --- a/src/spectrum/model/spectrum-model.cc +++ b/src/spectrum/model/spectrum-model.cc @@ -18,9 +18,10 @@ * Author: Nicola Baldo */ +#include "spectrum-model.h" + #include #include -#include #include #include diff --git a/src/spectrum/model/spectrum-phy.cc b/src/spectrum/model/spectrum-phy.cc index da50632b2..36f4e1f7a 100644 --- a/src/spectrum/model/spectrum-phy.cc +++ b/src/spectrum/model/spectrum-phy.cc @@ -19,11 +19,12 @@ #include "spectrum-phy.h" +#include "spectrum-channel.h" +#include "spectrum-value.h" + #include #include #include -#include -#include namespace ns3 { diff --git a/src/spectrum/model/spectrum-propagation-loss-model.h b/src/spectrum/model/spectrum-propagation-loss-model.h index fd8c7c81b..47f7594b3 100644 --- a/src/spectrum/model/spectrum-propagation-loss-model.h +++ b/src/spectrum/model/spectrum-propagation-loss-model.h @@ -20,9 +20,10 @@ #ifndef SPECTRUM_PROPAGATION_LOSS_MODEL_H #define SPECTRUM_PROPAGATION_LOSS_MODEL_H +#include "spectrum-value.h" + #include #include -#include namespace ns3 { diff --git a/src/spectrum/model/spectrum-signal-parameters.cc b/src/spectrum/model/spectrum-signal-parameters.cc index db053e141..460b3e07a 100644 --- a/src/spectrum/model/spectrum-signal-parameters.cc +++ b/src/spectrum/model/spectrum-signal-parameters.cc @@ -17,11 +17,13 @@ * Author: Nicola Baldo */ +#include "spectrum-signal-parameters.h" + +#include "spectrum-phy.h" +#include "spectrum-value.h" + #include #include -#include -#include -#include namespace ns3 { diff --git a/src/spectrum/model/spectrum-value.cc b/src/spectrum/model/spectrum-value.cc index d53d333b3..922e6c487 100644 --- a/src/spectrum/model/spectrum-value.cc +++ b/src/spectrum/model/spectrum-value.cc @@ -18,9 +18,10 @@ * Author: Nicola Baldo */ +#include "spectrum-value.h" + #include #include -#include namespace ns3 { diff --git a/src/spectrum/model/spectrum-value.h b/src/spectrum/model/spectrum-value.h index c814d383a..9dc741ab2 100644 --- a/src/spectrum/model/spectrum-value.h +++ b/src/spectrum/model/spectrum-value.h @@ -20,9 +20,10 @@ #ifndef SPECTRUM_VALUE_H #define SPECTRUM_VALUE_H +#include "spectrum-model.h" + #include #include -#include #include #include diff --git a/src/spectrum/model/three-gpp-channel-model.h b/src/spectrum/model/three-gpp-channel-model.h index 49ddc3bad..fec908e59 100644 --- a/src/spectrum/model/three-gpp-channel-model.h +++ b/src/spectrum/model/three-gpp-channel-model.h @@ -21,10 +21,11 @@ #ifndef THREE_GPP_CHANNEL_H #define THREE_GPP_CHANNEL_H +#include "matrix-based-channel-model.h" + #include "ns3/angles.h" #include #include -#include #include #include diff --git a/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.h b/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.h index 6dd259a76..2fb056680 100644 --- a/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.h +++ b/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.h @@ -21,8 +21,9 @@ #ifndef THREE_GPP_SPECTRUM_PROPAGATION_LOSS_H #define THREE_GPP_SPECTRUM_PROPAGATION_LOSS_H -#include "ns3/matrix-based-channel-model.h" -#include "ns3/phased-array-spectrum-propagation-loss-model.h" +#include "matrix-based-channel-model.h" +#include "phased-array-spectrum-propagation-loss-model.h" + #include "ns3/random-variable-stream.h" #include diff --git a/src/spectrum/model/trace-fading-loss-model.cc b/src/spectrum/model/trace-fading-loss-model.cc index d15d751e9..20cafc194 100644 --- a/src/spectrum/model/trace-fading-loss-model.cc +++ b/src/spectrum/model/trace-fading-loss-model.cc @@ -18,16 +18,17 @@ * Marco Miozzo */ +#include "trace-fading-loss-model.h" + #include "spectrum-signal-parameters.h" +#include "spectrum-value.h" #include "ns3/uinteger.h" #include #include #include #include -#include #include -#include #include diff --git a/src/spectrum/model/trace-fading-loss-model.h b/src/spectrum/model/trace-fading-loss-model.h index a53b40394..f8d647e2e 100644 --- a/src/spectrum/model/trace-fading-loss-model.h +++ b/src/spectrum/model/trace-fading-loss-model.h @@ -21,10 +21,11 @@ #ifndef TRACE_FADING_LOSS_MODEL_H #define TRACE_FADING_LOSS_MODEL_H +#include "spectrum-propagation-loss-model.h" + #include "ns3/random-variable-stream.h" #include #include -#include #include diff --git a/src/spectrum/model/tv-spectrum-transmitter.h b/src/spectrum/model/tv-spectrum-transmitter.h index af00c6220..353795724 100644 --- a/src/spectrum/model/tv-spectrum-transmitter.h +++ b/src/spectrum/model/tv-spectrum-transmitter.h @@ -20,13 +20,14 @@ #ifndef TV_SPECTRUM_TRANSMITTER_H #define TV_SPECTRUM_TRANSMITTER_H +#include "spectrum-channel.h" +#include "spectrum-phy.h" +#include "spectrum-signal-parameters.h" +#include "spectrum-value.h" + #include #include #include -#include -#include -#include -#include namespace ns3 { diff --git a/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h b/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h index 38dd8baa6..b5ffeac81 100644 --- a/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h +++ b/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h @@ -19,9 +19,10 @@ #ifndef TWO_RAY_SPECTRUM_PROPAGATION_LOSS_H #define TWO_RAY_SPECTRUM_PROPAGATION_LOSS_H +#include "phased-array-spectrum-propagation-loss-model.h" +#include "spectrum-signal-parameters.h" + #include "ns3/channel-condition-model.h" -#include "ns3/phased-array-spectrum-propagation-loss-model.h" -#include "ns3/spectrum-signal-parameters.h" #include diff --git a/src/spectrum/model/waveform-generator.h b/src/spectrum/model/waveform-generator.h index 4eef4a7a0..4dbda66e5 100644 --- a/src/spectrum/model/waveform-generator.h +++ b/src/spectrum/model/waveform-generator.h @@ -20,14 +20,15 @@ #ifndef WAVEFORM_GENERATOR_H #define WAVEFORM_GENERATOR_H +#include "spectrum-channel.h" +#include "spectrum-phy.h" +#include "spectrum-value.h" + #include #include #include #include #include -#include -#include -#include #include namespace ns3 diff --git a/src/spectrum/model/wifi-spectrum-value-helper.h b/src/spectrum/model/wifi-spectrum-value-helper.h index 341ebe890..c991af1e3 100644 --- a/src/spectrum/model/wifi-spectrum-value-helper.h +++ b/src/spectrum/model/wifi-spectrum-value-helper.h @@ -22,7 +22,7 @@ #ifndef WIFI_SPECTRUM_VALUE_HELPER_H #define WIFI_SPECTRUM_VALUE_HELPER_H -#include +#include "spectrum-value.h" namespace ns3 { diff --git a/src/stats/model/average.h b/src/stats/model/average.h index f145adf91..e62d80cf7 100644 --- a/src/stats/model/average.h +++ b/src/stats/model/average.h @@ -20,7 +20,8 @@ #ifndef AVERAGE_H #define AVERAGE_H -#include "ns3/basic-data-calculators.h" + +#include "basic-data-calculators.h" #include #include diff --git a/src/stats/model/boolean-probe.cc b/src/stats/model/boolean-probe.cc index 4cd51f898..023ccdab7 100644 --- a/src/stats/model/boolean-probe.cc +++ b/src/stats/model/boolean-probe.cc @@ -20,7 +20,7 @@ * Modified by: Mitch Watrous (watrous@u.washington.edu) */ -#include "ns3/boolean-probe.h" +#include "boolean-probe.h" #include "ns3/config.h" #include "ns3/log.h" diff --git a/src/stats/model/boolean-probe.h b/src/stats/model/boolean-probe.h index e7e379779..792e8b51b 100644 --- a/src/stats/model/boolean-probe.h +++ b/src/stats/model/boolean-probe.h @@ -23,10 +23,11 @@ #ifndef BOOL_PROBE_H #define BOOL_PROBE_H +#include "probe.h" + #include "ns3/boolean.h" #include "ns3/callback.h" #include "ns3/object.h" -#include "ns3/probe.h" #include "ns3/simulator.h" #include "ns3/traced-value.h" diff --git a/src/stats/model/data-output-interface.h b/src/stats/model/data-output-interface.h index d363b7d80..1903275f7 100644 --- a/src/stats/model/data-output-interface.h +++ b/src/stats/model/data-output-interface.h @@ -20,7 +20,8 @@ #ifndef DATA_OUTPUT_INTERFACE_H #define DATA_OUTPUT_INTERFACE_H -#include "ns3/data-calculator.h" +#include "data-calculator.h" + #include "ns3/nstime.h" #include "ns3/object.h" diff --git a/src/stats/model/double-probe.cc b/src/stats/model/double-probe.cc index a364bddc4..2f3adaf80 100644 --- a/src/stats/model/double-probe.cc +++ b/src/stats/model/double-probe.cc @@ -20,7 +20,7 @@ * Modified by: Mitch Watrous (watrous@u.washington.edu) */ -#include "ns3/double-probe.h" +#include "double-probe.h" #include "ns3/config.h" #include "ns3/log.h" diff --git a/src/stats/model/double-probe.h b/src/stats/model/double-probe.h index bb52650ac..4f70de39e 100644 --- a/src/stats/model/double-probe.h +++ b/src/stats/model/double-probe.h @@ -23,10 +23,11 @@ #ifndef DOUBLE_PROBE_H #define DOUBLE_PROBE_H +#include "probe.h" + #include "ns3/boolean.h" #include "ns3/callback.h" #include "ns3/object.h" -#include "ns3/probe.h" #include "ns3/simulator.h" #include "ns3/traced-value.h" diff --git a/src/stats/model/file-aggregator.h b/src/stats/model/file-aggregator.h index 470353fe1..7fccc009a 100644 --- a/src/stats/model/file-aggregator.h +++ b/src/stats/model/file-aggregator.h @@ -23,7 +23,7 @@ #ifndef FILE_AGGREGATOR_H #define FILE_AGGREGATOR_H -#include "ns3/data-collection-object.h" +#include "data-collection-object.h" #include #include diff --git a/src/stats/model/gnuplot-aggregator.h b/src/stats/model/gnuplot-aggregator.h index 6e9addca9..b98cd70ce 100644 --- a/src/stats/model/gnuplot-aggregator.h +++ b/src/stats/model/gnuplot-aggregator.h @@ -23,8 +23,8 @@ #ifndef GNUPLOT_AGGREGATOR_H #define GNUPLOT_AGGREGATOR_H -#include "ns3/data-collection-object.h" -#include "ns3/gnuplot.h" +#include "data-collection-object.h" +#include "gnuplot.h" #include #include diff --git a/src/stats/model/probe.cc b/src/stats/model/probe.cc index 36ea10a0f..17b1d87cc 100644 --- a/src/stats/model/probe.cc +++ b/src/stats/model/probe.cc @@ -18,7 +18,7 @@ * Tiago G. Rodrigues (tgr002@bucknell.edu) */ -#include "ns3/probe.h" +#include "probe.h" #include "ns3/log.h" #include "ns3/object.h" diff --git a/src/stats/model/probe.h b/src/stats/model/probe.h index 38a64cefc..35575144a 100644 --- a/src/stats/model/probe.h +++ b/src/stats/model/probe.h @@ -21,7 +21,8 @@ #ifndef PROBE_H #define PROBE_H -#include "ns3/data-collection-object.h" +#include "data-collection-object.h" + #include "ns3/nstime.h" namespace ns3 diff --git a/src/stats/model/time-probe.cc b/src/stats/model/time-probe.cc index 3a8a184b9..db7b482bf 100644 --- a/src/stats/model/time-probe.cc +++ b/src/stats/model/time-probe.cc @@ -21,7 +21,7 @@ * */ -#include "ns3/time-probe.h" +#include "time-probe.h" #include "ns3/config.h" #include "ns3/log.h" diff --git a/src/stats/model/time-probe.h b/src/stats/model/time-probe.h index 7a429f8df..3e477eba4 100644 --- a/src/stats/model/time-probe.h +++ b/src/stats/model/time-probe.h @@ -23,11 +23,12 @@ #ifndef TIME_PROBE_H #define TIME_PROBE_H +#include "probe.h" + #include "ns3/boolean.h" #include "ns3/callback.h" #include "ns3/nstime.h" #include "ns3/object.h" -#include "ns3/probe.h" #include "ns3/simulator.h" #include "ns3/traced-value.h" diff --git a/src/stats/model/time-series-adaptor.cc b/src/stats/model/time-series-adaptor.cc index 01e24dd17..bd92ac694 100644 --- a/src/stats/model/time-series-adaptor.cc +++ b/src/stats/model/time-series-adaptor.cc @@ -17,7 +17,7 @@ * Author: Mitch Watrous (watrous@u.washington.edu) */ -#include "ns3/time-series-adaptor.h" +#include "time-series-adaptor.h" #include "ns3/log.h" #include "ns3/object.h" diff --git a/src/stats/model/time-series-adaptor.h b/src/stats/model/time-series-adaptor.h index 106cceb2f..070859c33 100644 --- a/src/stats/model/time-series-adaptor.h +++ b/src/stats/model/time-series-adaptor.h @@ -20,7 +20,8 @@ #ifndef TIME_SERIES_ADAPTOR_H #define TIME_SERIES_ADAPTOR_H -#include "ns3/data-collection-object.h" +#include "data-collection-object.h" + #include "ns3/object.h" #include "ns3/traced-value.h" #include "ns3/type-id.h" diff --git a/src/stats/model/uinteger-16-probe.cc b/src/stats/model/uinteger-16-probe.cc index e5c563f68..48d5553ef 100644 --- a/src/stats/model/uinteger-16-probe.cc +++ b/src/stats/model/uinteger-16-probe.cc @@ -20,7 +20,7 @@ * Modified by: Mitch Watrous (watrous@u.washington.edu) */ -#include "ns3/uinteger-16-probe.h" +#include "uinteger-16-probe.h" #include "ns3/config.h" #include "ns3/log.h" diff --git a/src/stats/model/uinteger-16-probe.h b/src/stats/model/uinteger-16-probe.h index f912060e1..62f783fef 100644 --- a/src/stats/model/uinteger-16-probe.h +++ b/src/stats/model/uinteger-16-probe.h @@ -23,8 +23,9 @@ #ifndef UINTEGER_16_PROBE_H #define UINTEGER_16_PROBE_H +#include "probe.h" + #include "ns3/callback.h" -#include "ns3/probe.h" #include "ns3/traced-value.h" namespace ns3 diff --git a/src/stats/model/uinteger-32-probe.cc b/src/stats/model/uinteger-32-probe.cc index cdb9fbde1..e157a2deb 100644 --- a/src/stats/model/uinteger-32-probe.cc +++ b/src/stats/model/uinteger-32-probe.cc @@ -20,7 +20,7 @@ * Modified by: Mitch Watrous (watrous@u.washington.edu) */ -#include "ns3/uinteger-32-probe.h" +#include "uinteger-32-probe.h" #include "ns3/config.h" #include "ns3/log.h" diff --git a/src/stats/model/uinteger-32-probe.h b/src/stats/model/uinteger-32-probe.h index 366f47a7d..f4384e95c 100644 --- a/src/stats/model/uinteger-32-probe.h +++ b/src/stats/model/uinteger-32-probe.h @@ -23,8 +23,9 @@ #ifndef UINTEGER_32_PROBE_H #define UINTEGER_32_PROBE_H +#include "probe.h" + #include "ns3/callback.h" -#include "ns3/probe.h" #include "ns3/traced-value.h" namespace ns3 diff --git a/src/stats/model/uinteger-8-probe.cc b/src/stats/model/uinteger-8-probe.cc index f58f88533..548708830 100644 --- a/src/stats/model/uinteger-8-probe.cc +++ b/src/stats/model/uinteger-8-probe.cc @@ -20,7 +20,7 @@ * Modified by: Mitch Watrous (watrous@u.washington.edu) */ -#include "ns3/uinteger-8-probe.h" +#include "uinteger-8-probe.h" #include "ns3/config.h" #include "ns3/log.h" diff --git a/src/stats/model/uinteger-8-probe.h b/src/stats/model/uinteger-8-probe.h index c085fa531..9c67485ae 100644 --- a/src/stats/model/uinteger-8-probe.h +++ b/src/stats/model/uinteger-8-probe.h @@ -23,8 +23,9 @@ #ifndef UINTEGER_8_PROBE_H #define UINTEGER_8_PROBE_H +#include "probe.h" + #include "ns3/callback.h" -#include "ns3/probe.h" #include "ns3/traced-value.h" namespace ns3 diff --git a/src/topology-read/helper/topology-reader-helper.cc b/src/topology-read/helper/topology-reader-helper.cc index 2417747a6..74e8deafc 100644 --- a/src/topology-read/helper/topology-reader-helper.cc +++ b/src/topology-read/helper/topology-reader-helper.cc @@ -18,7 +18,7 @@ * Author: Valerio Sartini (valesar@gmail.com) */ -#include "ns3/topology-reader-helper.h" +#include "topology-reader-helper.h" #include "ns3/inet-topology-reader.h" #include "ns3/log.h" diff --git a/src/traffic-control/helper/traffic-control-helper.h b/src/traffic-control/helper/traffic-control-helper.h index a5d1b5594..2b90802bc 100644 --- a/src/traffic-control/helper/traffic-control-helper.h +++ b/src/traffic-control/helper/traffic-control-helper.h @@ -19,9 +19,10 @@ #ifndef TRAFFIC_CONTROL_HELPER_H #define TRAFFIC_CONTROL_HELPER_H +#include "queue-disc-container.h" + #include "ns3/net-device-container.h" #include "ns3/object-factory.h" -#include "ns3/queue-disc-container.h" #include "ns3/queue.h" #include diff --git a/src/traffic-control/model/cobalt-queue-disc.h b/src/traffic-control/model/cobalt-queue-disc.h index e3eb3c138..5a4b639db 100644 --- a/src/traffic-control/model/cobalt-queue-disc.h +++ b/src/traffic-control/model/cobalt-queue-disc.h @@ -28,10 +28,11 @@ #ifndef COBALT_H #define COBALT_H +#include "queue-disc.h" + #include "ns3/boolean.h" #include "ns3/data-rate.h" #include "ns3/nstime.h" -#include "ns3/queue-disc.h" #include "ns3/random-variable-stream.h" #include "ns3/simulator.h" #include "ns3/string.h" diff --git a/src/traffic-control/model/codel-queue-disc.h b/src/traffic-control/model/codel-queue-disc.h index 378327cdf..c6535cb3b 100644 --- a/src/traffic-control/model/codel-queue-disc.h +++ b/src/traffic-control/model/codel-queue-disc.h @@ -27,8 +27,9 @@ #ifndef CODEL_H #define CODEL_H +#include "queue-disc.h" + #include "ns3/nstime.h" -#include "ns3/queue-disc.h" #include "ns3/simulator.h" #include "ns3/string.h" #include "ns3/trace-source-accessor.h" diff --git a/src/traffic-control/model/fifo-queue-disc.h b/src/traffic-control/model/fifo-queue-disc.h index 43e5ee5e7..9934963cd 100644 --- a/src/traffic-control/model/fifo-queue-disc.h +++ b/src/traffic-control/model/fifo-queue-disc.h @@ -20,7 +20,7 @@ #ifndef FIFO_QUEUE_DISC_H #define FIFO_QUEUE_DISC_H -#include "ns3/queue-disc.h" +#include "queue-disc.h" namespace ns3 { diff --git a/src/traffic-control/model/fq-cobalt-queue-disc.h b/src/traffic-control/model/fq-cobalt-queue-disc.h index 41dde9a60..248c7f3cd 100644 --- a/src/traffic-control/model/fq-cobalt-queue-disc.h +++ b/src/traffic-control/model/fq-cobalt-queue-disc.h @@ -27,8 +27,9 @@ #ifndef FQ_COBALT_QUEUE_DISC #define FQ_COBALT_QUEUE_DISC +#include "queue-disc.h" + #include "ns3/object-factory.h" -#include "ns3/queue-disc.h" #include #include diff --git a/src/traffic-control/model/fq-codel-queue-disc.h b/src/traffic-control/model/fq-codel-queue-disc.h index 2e18336ee..922edb404 100644 --- a/src/traffic-control/model/fq-codel-queue-disc.h +++ b/src/traffic-control/model/fq-codel-queue-disc.h @@ -21,8 +21,9 @@ #ifndef FQ_CODEL_QUEUE_DISC #define FQ_CODEL_QUEUE_DISC +#include "queue-disc.h" + #include "ns3/object-factory.h" -#include "ns3/queue-disc.h" #include #include diff --git a/src/traffic-control/model/fq-pie-queue-disc.h b/src/traffic-control/model/fq-pie-queue-disc.h index bfb2ba334..4e0df3768 100644 --- a/src/traffic-control/model/fq-pie-queue-disc.h +++ b/src/traffic-control/model/fq-pie-queue-disc.h @@ -26,8 +26,9 @@ #ifndef FQ_PIE_QUEUE_DISC #define FQ_PIE_QUEUE_DISC +#include "queue-disc.h" + #include "ns3/object-factory.h" -#include "ns3/queue-disc.h" #include #include diff --git a/src/traffic-control/model/mq-queue-disc.h b/src/traffic-control/model/mq-queue-disc.h index d7af1190b..77a67b22d 100644 --- a/src/traffic-control/model/mq-queue-disc.h +++ b/src/traffic-control/model/mq-queue-disc.h @@ -21,7 +21,7 @@ #ifndef MQ_QUEUE_DISC_H #define MQ_QUEUE_DISC_H -#include "ns3/queue-disc.h" +#include "queue-disc.h" namespace ns3 { diff --git a/src/traffic-control/model/pfifo-fast-queue-disc.h b/src/traffic-control/model/pfifo-fast-queue-disc.h index f64fa5c9b..0e8b2b43a 100644 --- a/src/traffic-control/model/pfifo-fast-queue-disc.h +++ b/src/traffic-control/model/pfifo-fast-queue-disc.h @@ -22,7 +22,7 @@ #ifndef PFIFO_FAST_H #define PFIFO_FAST_H -#include "ns3/queue-disc.h" +#include "queue-disc.h" namespace ns3 { diff --git a/src/traffic-control/model/pie-queue-disc.h b/src/traffic-control/model/pie-queue-disc.h index 378af479b..e7aac0c9d 100644 --- a/src/traffic-control/model/pie-queue-disc.h +++ b/src/traffic-control/model/pie-queue-disc.h @@ -27,11 +27,12 @@ #ifndef PIE_QUEUE_DISC_H #define PIE_QUEUE_DISC_H +#include "queue-disc.h" + #include "ns3/boolean.h" #include "ns3/data-rate.h" #include "ns3/event-id.h" #include "ns3/nstime.h" -#include "ns3/queue-disc.h" #include "ns3/random-variable-stream.h" #include "ns3/timer.h" diff --git a/src/traffic-control/model/prio-queue-disc.h b/src/traffic-control/model/prio-queue-disc.h index 58abb1da1..89fe99cbd 100644 --- a/src/traffic-control/model/prio-queue-disc.h +++ b/src/traffic-control/model/prio-queue-disc.h @@ -20,7 +20,7 @@ #ifndef PRIO_QUEUE_DISC_H #define PRIO_QUEUE_DISC_H -#include "ns3/queue-disc.h" +#include "queue-disc.h" #include diff --git a/src/traffic-control/model/red-queue-disc.h b/src/traffic-control/model/red-queue-disc.h index 9374b124f..1918f895b 100644 --- a/src/traffic-control/model/red-queue-disc.h +++ b/src/traffic-control/model/red-queue-disc.h @@ -60,10 +60,11 @@ #ifndef RED_QUEUE_DISC_H #define RED_QUEUE_DISC_H +#include "queue-disc.h" + #include "ns3/boolean.h" #include "ns3/data-rate.h" #include "ns3/nstime.h" -#include "ns3/queue-disc.h" #include "ns3/random-variable-stream.h" namespace ns3 diff --git a/src/traffic-control/model/tbf-queue-disc.h b/src/traffic-control/model/tbf-queue-disc.h index 950fd2967..454eb2ed0 100644 --- a/src/traffic-control/model/tbf-queue-disc.h +++ b/src/traffic-control/model/tbf-queue-disc.h @@ -28,11 +28,12 @@ #ifndef TBF_QUEUE_DISC_H #define TBF_QUEUE_DISC_H +#include "queue-disc.h" + #include "ns3/boolean.h" #include "ns3/data-rate.h" #include "ns3/event-id.h" #include "ns3/nstime.h" -#include "ns3/queue-disc.h" #include "ns3/random-variable-stream.h" #include "ns3/trace-source-accessor.h" #include "ns3/traced-value.h" diff --git a/src/traffic-control/model/traffic-control-layer.cc b/src/traffic-control/model/traffic-control-layer.cc index 0b5007b3a..3bfb0010a 100644 --- a/src/traffic-control/model/traffic-control-layer.cc +++ b/src/traffic-control/model/traffic-control-layer.cc @@ -18,11 +18,12 @@ #include "traffic-control-layer.h" +#include "queue-disc.h" + #include "ns3/log.h" #include "ns3/net-device-queue-interface.h" #include "ns3/object-map.h" #include "ns3/packet.h" -#include "ns3/queue-disc.h" #include "ns3/socket.h" #include diff --git a/src/uan/model/acoustic-modem-energy-model.cc b/src/uan/model/acoustic-modem-energy-model.cc index 79abcccf2..4d129b090 100644 --- a/src/uan/model/acoustic-modem-energy-model.cc +++ b/src/uan/model/acoustic-modem-energy-model.cc @@ -19,13 +19,14 @@ #include "acoustic-modem-energy-model.h" +#include "uan-net-device.h" +#include "uan-phy.h" + #include "ns3/double.h" #include "ns3/energy-source.h" #include "ns3/log.h" #include "ns3/simulator.h" #include "ns3/trace-source-accessor.h" -#include "ns3/uan-net-device.h" -#include "ns3/uan-phy.h" namespace ns3 { diff --git a/src/uan/model/uan-channel.h b/src/uan/model/uan-channel.h index 8921eed93..0a0e8768e 100644 --- a/src/uan/model/uan-channel.h +++ b/src/uan/model/uan-channel.h @@ -20,11 +20,12 @@ #ifndef UAN_CHANNEL_H #define UAN_CHANNEL_H +#include "uan-noise-model.h" +#include "uan-prop-model.h" + #include "ns3/channel.h" #include "ns3/net-device.h" #include "ns3/packet.h" -#include "ns3/uan-noise-model.h" -#include "ns3/uan-prop-model.h" #include #include diff --git a/src/uan/model/uan-mac-cw.cc b/src/uan/model/uan-mac-cw.cc index 9a50e7d9e..8cc84ec3b 100644 --- a/src/uan/model/uan-mac-cw.cc +++ b/src/uan/model/uan-mac-cw.cc @@ -19,12 +19,13 @@ #include "uan-mac-cw.h" +#include "uan-header-common.h" + #include "ns3/attribute.h" #include "ns3/double.h" #include "ns3/log.h" #include "ns3/nstime.h" #include "ns3/trace-source-accessor.h" -#include "ns3/uan-header-common.h" #include "ns3/uinteger.h" namespace ns3 diff --git a/src/uan/model/uan-mac-cw.h b/src/uan/model/uan-mac-cw.h index 71124a0f2..d89d28f85 100644 --- a/src/uan/model/uan-mac-cw.h +++ b/src/uan/model/uan-mac-cw.h @@ -20,13 +20,14 @@ #ifndef UAN_MAC_CW_H #define UAN_MAC_CW_H +#include "uan-mac.h" +#include "uan-phy.h" +#include "uan-tx-mode.h" + #include "ns3/mac8-address.h" #include "ns3/nstime.h" #include "ns3/random-variable-stream.h" #include "ns3/simulator.h" -#include "ns3/uan-mac.h" -#include "ns3/uan-phy.h" -#include "ns3/uan-tx-mode.h" namespace ns3 { diff --git a/src/uan/model/uan-noise-model-default.h b/src/uan/model/uan-noise-model-default.h index 8646645da..960e4504e 100644 --- a/src/uan/model/uan-noise-model-default.h +++ b/src/uan/model/uan-noise-model-default.h @@ -20,9 +20,10 @@ #ifndef UAN_NOISE_MODEL_DEFAULT_H #define UAN_NOISE_MODEL_DEFAULT_H +#include "uan-noise-model.h" + #include "ns3/attribute.h" #include "ns3/object.h" -#include "ns3/uan-noise-model.h" namespace ns3 { diff --git a/src/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h index 5d17a676d..847989610 100644 --- a/src/uan/model/uan-phy-dual.h +++ b/src/uan/model/uan-phy-dual.h @@ -21,7 +21,7 @@ #ifndef UAN_PHY_DUAL_H #define UAN_PHY_DUAL_H -#include "ns3/uan-phy.h" +#include "uan-phy.h" namespace ns3 { diff --git a/src/uan/model/uan-phy-gen.cc b/src/uan/model/uan-phy-gen.cc index ee238448a..506d27853 100644 --- a/src/uan/model/uan-phy-gen.cc +++ b/src/uan/model/uan-phy-gen.cc @@ -20,11 +20,12 @@ #include "uan-phy-gen.h" +#include "acoustic-modem-energy-model.h" #include "uan-channel.h" #include "uan-net-device.h" #include "uan-transducer.h" +#include "uan-tx-mode.h" -#include "ns3/acoustic-modem-energy-model.h" #include "ns3/double.h" #include "ns3/energy-source-container.h" #include "ns3/log.h" @@ -34,7 +35,6 @@ #include "ns3/string.h" #include "ns3/trace-source-accessor.h" #include "ns3/traced-callback.h" -#include "ns3/uan-tx-mode.h" #include "ns3/uinteger.h" namespace ns3 diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index 9bfeba43a..70c49f18d 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -21,12 +21,13 @@ #ifndef UAN_PHY_H #define UAN_PHY_H +#include "uan-mac.h" +#include "uan-prop-model.h" +#include "uan-transducer.h" +#include "uan-tx-mode.h" + #include "ns3/device-energy-model.h" #include "ns3/object.h" -#include "ns3/uan-mac.h" -#include "ns3/uan-prop-model.h" -#include "ns3/uan-transducer.h" -#include "ns3/uan-tx-mode.h" namespace ns3 { diff --git a/src/uan/model/uan-transducer-hd.cc b/src/uan/model/uan-transducer-hd.cc index f82701580..90dbf1469 100644 --- a/src/uan/model/uan-transducer-hd.cc +++ b/src/uan/model/uan-transducer-hd.cc @@ -21,12 +21,12 @@ #include "uan-channel.h" #include "uan-phy.h" +#include "uan-prop-model.h" #include "ns3/double.h" #include "ns3/log.h" #include "ns3/pointer.h" #include "ns3/simulator.h" -#include "ns3/uan-prop-model.h" namespace ns3 { diff --git a/src/uan/model/uan-transducer.h b/src/uan/model/uan-transducer.h index 9f50204b0..24297b9fd 100644 --- a/src/uan/model/uan-transducer.h +++ b/src/uan/model/uan-transducer.h @@ -20,11 +20,11 @@ #ifndef UAN_TRANSDUCER_H #define UAN_TRANSDUCER_H +#include "uan-prop-model.h" #include "uan-tx-mode.h" #include "ns3/object.h" #include "ns3/packet.h" -#include "ns3/uan-prop-model.h" #include diff --git a/src/wifi/model/eht/eht-frame-exchange-manager.cc b/src/wifi/model/eht/eht-frame-exchange-manager.cc index d793f6bbf..d7d53ddaa 100644 --- a/src/wifi/model/eht/eht-frame-exchange-manager.cc +++ b/src/wifi/model/eht/eht-frame-exchange-manager.cc @@ -20,10 +20,10 @@ #include "eht-frame-exchange-manager.h" #include "eht-phy.h" +#include "emlsr-manager.h" #include "ns3/abort.h" #include "ns3/ap-wifi-mac.h" -#include "ns3/emlsr-manager.h" #include "ns3/log.h" #include "ns3/sta-wifi-mac.h" #include "ns3/wifi-mac-queue.h" diff --git a/src/wifi/model/frame-exchange-manager.h b/src/wifi/model/frame-exchange-manager.h index 58774946a..69bc995e3 100644 --- a/src/wifi/model/frame-exchange-manager.h +++ b/src/wifi/model/frame-exchange-manager.h @@ -30,12 +30,12 @@ #include "wifi-tx-timer.h" #include "wifi-tx-vector.h" -#include "ns3/object.h" // Needed to compile wave bindings #include "channel-access-manager.h" +#include "wifi-ack-manager.h" +#include "wifi-protection-manager.h" -#include "ns3/wifi-ack-manager.h" -#include "ns3/wifi-protection-manager.h" +#include "ns3/object.h" namespace ns3 { diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc index 6cf7b4a03..953980fc0 100644 --- a/src/wifi/model/interference-helper.cc +++ b/src/wifi/model/interference-helper.cc @@ -21,6 +21,7 @@ #include "interference-helper.h" #include "error-rate-model.h" +#include "wifi-phy-operating-channel.h" #include "wifi-phy.h" #include "wifi-psdu.h" #include "wifi-utils.h" @@ -29,7 +30,6 @@ #include "ns3/log.h" #include "ns3/packet.h" #include "ns3/simulator.h" -#include "ns3/wifi-phy-operating-channel.h" #include #include diff --git a/src/wifi/model/spectrum-wifi-phy.cc b/src/wifi/model/spectrum-wifi-phy.cc index 1f2439777..2945f713e 100644 --- a/src/wifi/model/spectrum-wifi-phy.cc +++ b/src/wifi/model/spectrum-wifi-phy.cc @@ -25,6 +25,7 @@ #include "spectrum-wifi-phy.h" #include "interference-helper.h" +#include "wifi-net-device.h" #include "wifi-psdu.h" #include "wifi-spectrum-phy-interface.h" #include "wifi-spectrum-signal-parameters.h" @@ -37,7 +38,6 @@ #include "ns3/node.h" #include "ns3/simulator.h" #include "ns3/spectrum-channel.h" -#include "ns3/wifi-net-device.h" #include diff --git a/src/wifi/model/wifi-mgt-header.h b/src/wifi/model/wifi-mgt-header.h index 397966e1c..c666e6b1d 100644 --- a/src/wifi/model/wifi-mgt-header.h +++ b/src/wifi/model/wifi-mgt-header.h @@ -21,11 +21,11 @@ #define WIFI_MGT_HEADER_H #include "non-inheritance.h" +#include "supported-rates.h" #include "ns3/eht-capabilities.h" #include "ns3/header.h" #include "ns3/multi-link-element.h" -#include "ns3/supported-rates.h" #include #include diff --git a/src/wifi/model/wifi-ppdu.cc b/src/wifi/model/wifi-ppdu.cc index f29d1a3a2..2b122edcb 100644 --- a/src/wifi/model/wifi-ppdu.cc +++ b/src/wifi/model/wifi-ppdu.cc @@ -19,10 +19,10 @@ #include "wifi-ppdu.h" +#include "wifi-phy-operating-channel.h" #include "wifi-psdu.h" #include "ns3/log.h" -#include "ns3/wifi-phy-operating-channel.h" namespace ns3 { diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc index 419b48e13..7c341fb2b 100644 --- a/src/wifi/model/yans-wifi-channel.cc +++ b/src/wifi/model/yans-wifi-channel.cc @@ -19,6 +19,7 @@ #include "yans-wifi-channel.h" +#include "wifi-net-device.h" #include "wifi-ppdu.h" #include "wifi-psdu.h" #include "wifi-utils.h" @@ -31,7 +32,6 @@ #include "ns3/propagation-delay-model.h" #include "ns3/propagation-loss-model.h" #include "ns3/simulator.h" -#include "ns3/wifi-net-device.h" namespace ns3 { diff --git a/src/wimax/model/bs-net-device.h b/src/wimax/model/bs-net-device.h index fb88c2f82..be968a09c 100644 --- a/src/wimax/model/bs-net-device.h +++ b/src/wimax/model/bs-net-device.h @@ -21,12 +21,12 @@ #ifndef WIMAX_BS_NET_DEVICE_H #define WIMAX_BS_NET_DEVICE_H +#include "bs-service-flow-manager.h" #include "dl-mac-messages.h" #include "ipcs-classifier.h" #include "wimax-connection.h" #include "wimax-net-device.h" -#include "ns3/bs-service-flow-manager.h" #include "ns3/event-id.h" #include "ns3/ipv4-address.h" #include "ns3/mac48-address.h" diff --git a/src/wimax/model/simple-ofdm-wimax-phy.h b/src/wimax/model/simple-ofdm-wimax-phy.h index 8265de9ad..616f47283 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.h +++ b/src/wimax/model/simple-ofdm-wimax-phy.h @@ -22,6 +22,7 @@ #define SIMPLE_OFDM_WIMAX_PHY_H #include "bvec.h" +#include "snr-to-block-error-rate-manager.h" #include "wimax-connection.h" #include "wimax-phy.h" @@ -29,7 +30,6 @@ #include "ns3/event-id.h" #include "ns3/nstime.h" #include "ns3/random-variable-stream.h" -#include "ns3/snr-to-block-error-rate-manager.h" #include #include diff --git a/src/wimax/model/snr-to-block-error-rate-manager.cc b/src/wimax/model/snr-to-block-error-rate-manager.cc index 070748536..faa07477c 100644 --- a/src/wimax/model/snr-to-block-error-rate-manager.cc +++ b/src/wimax/model/snr-to-block-error-rate-manager.cc @@ -18,13 +18,13 @@ * */ -#include "ns3/snr-to-block-error-rate-manager.h" +#include "snr-to-block-error-rate-manager.h" #include "default-traces.h" +#include "snr-to-block-error-rate-record.h" #include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/snr-to-block-error-rate-record.h" #include #include diff --git a/src/wimax/model/snr-to-block-error-rate-manager.h b/src/wimax/model/snr-to-block-error-rate-manager.h index afca9ac3a..09bf50edf 100644 --- a/src/wimax/model/snr-to-block-error-rate-manager.h +++ b/src/wimax/model/snr-to-block-error-rate-manager.h @@ -21,8 +21,9 @@ #ifndef SNR_TO_BLOCK_ERROR_RATE_MANAGER_H #define SNR_TO_BLOCK_ERROR_RATE_MANAGER_H +#include "snr-to-block-error-rate-record.h" + #include "ns3/ptr.h" -#include "ns3/snr-to-block-error-rate-record.h" #include diff --git a/src/wimax/model/snr-to-block-error-rate-record.cc b/src/wimax/model/snr-to-block-error-rate-record.cc index dc0fd384c..77e70569c 100644 --- a/src/wimax/model/snr-to-block-error-rate-record.cc +++ b/src/wimax/model/snr-to-block-error-rate-record.cc @@ -18,7 +18,7 @@ * */ -#include "ns3/snr-to-block-error-rate-record.h" +#include "snr-to-block-error-rate-record.h" #include "ns3/assert.h" #include "ns3/simulator.h" diff --git a/src/wimax/model/ss-net-device.h b/src/wimax/model/ss-net-device.h index 6f0feb390..454682cc1 100644 --- a/src/wimax/model/ss-net-device.h +++ b/src/wimax/model/ss-net-device.h @@ -23,12 +23,12 @@ #define WIMAX_SS_NET_DEVICE_H #include "ipcs-classifier.h" +#include "ss-service-flow-manager.h" #include "wimax-mac-header.h" #include "wimax-net-device.h" #include "ns3/event-id.h" #include "ns3/nstime.h" -#include "ns3/ss-service-flow-manager.h" #include "ns3/uinteger.h" namespace ns3