diff --git a/examples/wireless/80211n-mimo.cc b/examples/wireless/80211n-mimo.cc index 9ecaf4336..1a2310b4c 100644 --- a/examples/wireless/80211n-mimo.cc +++ b/examples/wireless/80211n-mimo.cc @@ -32,16 +32,11 @@ // some 802.11n parameters (frequency, channel width and guard interval). #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" #include "ns3/gnuplot.h" -#include -#include -#include using namespace ns3; diff --git a/examples/wireless/ht-wifi-network.cc b/examples/wireless/ht-wifi-network.cc index 86001e750..a6df79c38 100644 --- a/examples/wireless/ht-wifi-network.cc +++ b/examples/wireless/ht-wifi-network.cc @@ -20,11 +20,9 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" // This is a simple example in order to show how to configure an IEEE 802.11n Wi-Fi network. diff --git a/examples/wireless/mixed-bg-network.cc b/examples/wireless/mixed-bg-network.cc index 60a41f32b..8b927769b 100644 --- a/examples/wireless/mixed-bg-network.cc +++ b/examples/wireless/mixed-bg-network.cc @@ -19,11 +19,9 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" // This example shows how the presence of an 802.11b station in an 802.11g network does affect the performance. diff --git a/examples/wireless/mixed-wireless.cc b/examples/wireless/mixed-wireless.cc index 468a13b14..5ea4b6df1 100644 --- a/examples/wireless/mixed-wireless.cc +++ b/examples/wireless/mixed-wireless.cc @@ -58,13 +58,9 @@ // Note that certain mobility patterns may cause packet forwarding // to fail (if nodes become disconnected) -#include -#include #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" #include "ns3/csma-module.h" #include "ns3/olsr-helper.h" diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc index 86c79eff7..da8051cc4 100644 --- a/examples/wireless/multirate.cc +++ b/examples/wireless/multirate.cc @@ -49,20 +49,13 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/stats-module.h" -#include "ns3/random-variable-stream.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" #include "ns3/flow-monitor-helper.h" #include "ns3/olsr-helper.h" -#include "ns3/ipv4-static-routing-helper.h" -#include "ns3/ipv4-list-routing-helper.h" - -#include -#include using namespace ns3; diff --git a/examples/wireless/ofdm-ht-validation.cc b/examples/wireless/ofdm-ht-validation.cc index d4b834972..daff44bad 100644 --- a/examples/wireless/ofdm-ht-validation.cc +++ b/examples/wireless/ofdm-ht-validation.cc @@ -26,10 +26,6 @@ #include "ns3/nist-error-rate-model.h" #include "ns3/gnuplot.h" -#include -#include -#include - using namespace ns3; int main (int argc, char *argv[]) diff --git a/examples/wireless/ofdm-validation.cc b/examples/wireless/ofdm-validation.cc index 710e6faf5..1dc34ff66 100644 --- a/examples/wireless/ofdm-validation.cc +++ b/examples/wireless/ofdm-validation.cc @@ -28,10 +28,6 @@ #include "ns3/nist-error-rate-model.h" #include "ns3/gnuplot.h" -#include -#include -#include - using namespace ns3; int main (int argc, char *argv[]) diff --git a/examples/wireless/ofdm-vht-validation.cc b/examples/wireless/ofdm-vht-validation.cc index e1e4c7924..71fa37a3c 100644 --- a/examples/wireless/ofdm-vht-validation.cc +++ b/examples/wireless/ofdm-vht-validation.cc @@ -27,10 +27,6 @@ #include "ns3/nist-error-rate-model.h" #include "ns3/gnuplot.h" -#include -#include -#include - using namespace ns3; int main (int argc, char *argv[]) diff --git a/examples/wireless/power-adaptation-distance.cc b/examples/wireless/power-adaptation-distance.cc index 89df53911..d0489afd8 100644 --- a/examples/wireless/power-adaptation-distance.cc +++ b/examples/wireless/power-adaptation-distance.cc @@ -85,18 +85,12 @@ * \endcode */ -#include -#include -#include - #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" #include "ns3/applications-module.h" #include "ns3/stats-module.h" -#include "ns3/flow-monitor-module.h" using namespace ns3; using namespace std; diff --git a/examples/wireless/power-adaptation-interference.cc b/examples/wireless/power-adaptation-interference.cc index 2bd8b5c9a..ccd9a87e0 100644 --- a/examples/wireless/power-adaptation-interference.cc +++ b/examples/wireless/power-adaptation-interference.cc @@ -55,11 +55,7 @@ * \endcode */ -#include -#include - #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/rate-adaptation-distance.cc b/examples/wireless/rate-adaptation-distance.cc index 75ff87524..645350597 100644 --- a/examples/wireless/rate-adaptation-distance.cc +++ b/examples/wireless/rate-adaptation-distance.cc @@ -50,18 +50,12 @@ * export NS_LOG=RateAdaptationDistance=level_info */ -#include -#include -#include - #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/internet-module.h" #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" #include "ns3/applications-module.h" #include "ns3/stats-module.h" -#include "ns3/flow-monitor-module.h" using namespace ns3; using namespace std; diff --git a/examples/wireless/simple-ht-hidden-stations.cc b/examples/wireless/simple-ht-hidden-stations.cc index 74bf37bbf..eec2fd617 100644 --- a/examples/wireless/simple-ht-hidden-stations.cc +++ b/examples/wireless/simple-ht-hidden-stations.cc @@ -19,11 +19,9 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" // This example considers two hidden stations in an 802.11n network which supports MPDU aggregation. diff --git a/examples/wireless/vht-wifi-network.cc b/examples/wireless/vht-wifi-network.cc index c88defef5..fcae415aa 100644 --- a/examples/wireless/vht-wifi-network.cc +++ b/examples/wireless/vht-wifi-network.cc @@ -19,11 +19,9 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" // This is a simple example in order to show how to configure an IEEE 802.11ac Wi-Fi network. diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index 81c8bf7f5..1ff4a8c45 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/examples/wireless/wifi-adhoc.cc @@ -25,8 +25,6 @@ #include "ns3/stats-module.h" #include "ns3/wifi-module.h" -#include - using namespace ns3; NS_LOG_COMPONENT_DEFINE ("Main"); diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc index 5e22fe5ce..9de73f8fe 100644 --- a/examples/wireless/wifi-aggregation.cc +++ b/examples/wireless/wifi-aggregation.cc @@ -19,11 +19,9 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" // This is an example that illustrates how 802.11n aggregation is configured. diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc index e825c0968..d6fd33095 100644 --- a/examples/wireless/wifi-ap.cc +++ b/examples/wireless/wifi-ap.cc @@ -23,11 +23,7 @@ #include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" -#include "ns3/athstats-helper.h" - -#include using namespace ns3; diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index 96ce5ed21..c9309c428 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/examples/wireless/wifi-blockack.cc @@ -39,6 +39,7 @@ * - the originator receives a block ack frame. * - the recipient receives a block ack request or a MPDU with ack policy Block Ack. */ + #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/network-module.h" diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index e54751380..e24309b95 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/examples/wireless/wifi-clear-channel-cmu.cc @@ -19,17 +19,11 @@ */ #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/mobility-module.h" #include "ns3/stats-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" -#include -#include -#include -#include - using namespace ns3; NS_LOG_COMPONENT_DEFINE ("Main"); diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc index 69956e096..ef2d7dfce 100644 --- a/examples/wireless/wifi-hidden-terminal.cc +++ b/examples/wireless/wifi-hidden-terminal.cc @@ -29,9 +29,9 @@ * - Use of OnOffApplication to generate CBR stream * - IP flow monitor */ + #include "ns3/core-module.h" #include "ns3/propagation-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/mobility-module.h" #include "ns3/internet-module.h" diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index 742ecce89..15ad6db1a 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -70,19 +70,10 @@ // #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" #include "ns3/olsr-helper.h" -#include "ns3/ipv4-static-routing-helper.h" -#include "ns3/ipv4-list-routing-helper.h" - -#include -#include -#include -#include using namespace ns3; diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc index 26c9b1bbc..a87939256 100644 --- a/examples/wireless/wifi-simple-adhoc.cc +++ b/examples/wireless/wifi-simple-adhoc.cc @@ -52,17 +52,10 @@ // #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" -#include -#include -#include -#include - using namespace ns3; NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhoc"); diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc index 96be6b0f0..abb66c404 100644 --- a/examples/wireless/wifi-simple-infra.cc +++ b/examples/wireless/wifi-simple-infra.cc @@ -53,17 +53,10 @@ // #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" -#include -#include -#include -#include - using namespace ns3; NS_LOG_COMPONENT_DEFINE ("WifiSimpleInfra"); diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index a907ed5f9..932a3b0c1 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -81,17 +81,10 @@ // ./waf --run "wifi-simple-interference --delta=30000" #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" -#include -#include -#include -#include - using namespace ns3; NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference"); diff --git a/examples/wireless/wifi-sleep.cc b/examples/wireless/wifi-sleep.cc index 897a6dd94..3bafb6e72 100644 --- a/examples/wireless/wifi-sleep.cc +++ b/examples/wireless/wifi-sleep.cc @@ -48,20 +48,12 @@ // #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/mobility-module.h" -#include "ns3/config-store-module.h" #include "ns3/wifi-module.h" #include "ns3/internet-module.h" #include "ns3/applications-module.h" #include "ns3/energy-module.h" -#include -#include -#include -#include -#include - using namespace ns3; NS_LOG_COMPONENT_DEFINE ("WifiSleep"); @@ -202,7 +194,7 @@ int main (int argc, char *argv[]) // compute the efficiency of the power amplifier (eta) assuming that the provided value for tx current // corresponds to the minimum tx power level - double eta = WifiTxCurrentModel::DbmToW (txPowerStart) / ((txCurrent - idleCurrent) * voltage); + double eta = DbmToW (txPowerStart) / ((txCurrent - idleCurrent) * voltage); radioEnergyHelper.SetTxCurrentModel ("ns3::LinearWifiTxCurrentModel", "Voltage", DoubleValue (voltage), diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc index aead9ca11..5be847107 100644 --- a/examples/wireless/wifi-spectrum-per-example.cc +++ b/examples/wireless/wifi-spectrum-per-example.cc @@ -22,11 +22,9 @@ * * Adapted from ht-wifi-network.cc example */ -#include -#include +#include #include "ns3/core-module.h" -#include "ns3/config-store-module.h" #include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc index c0d744d7c..13d997a1e 100644 --- a/examples/wireless/wifi-spectrum-per-interference.cc +++ b/examples/wireless/wifi-spectrum-per-interference.cc @@ -22,12 +22,9 @@ * * Adapted from ht-wifi-network.cc example */ -#include -#include +#include #include "ns3/core-module.h" -#include "ns3/config-store-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/wireless/wifi-spectrum-saturation-example.cc b/examples/wireless/wifi-spectrum-saturation-example.cc index 984767fee..0463b2521 100644 --- a/examples/wireless/wifi-spectrum-saturation-example.cc +++ b/examples/wireless/wifi-spectrum-saturation-example.cc @@ -22,12 +22,9 @@ * * Adapted from ht-wifi-network.cc example */ -#include -#include +#include #include "ns3/core-module.h" -#include "ns3/config-store-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" diff --git a/examples/wireless/wifi-tcp.cc b/examples/wireless/wifi-tcp.cc index 0db944829..1c1f20750 100644 --- a/examples/wireless/wifi-tcp.cc +++ b/examples/wireless/wifi-tcp.cc @@ -36,8 +36,6 @@ #include "ns3/core-module.h" #include "ns3/internet-module.h" #include "ns3/mobility-module.h" -#include "ns3/network-module.h" -#include "ns3/point-to-point-module.h" #include "ns3/wifi-module.h" NS_LOG_COMPONENT_DEFINE ("wifi-tcp"); diff --git a/examples/wireless/wifi-timing-attributes.cc b/examples/wireless/wifi-timing-attributes.cc index 964e8c028..98cf68c35 100644 --- a/examples/wireless/wifi-timing-attributes.cc +++ b/examples/wireless/wifi-timing-attributes.cc @@ -17,12 +17,11 @@ * * Authors: Sebastien Deronne */ + #include "ns3/core-module.h" -#include "ns3/network-module.h" #include "ns3/applications-module.h" #include "ns3/wifi-module.h" #include "ns3/mobility-module.h" -#include "ns3/ipv4-global-routing-helper.h" #include "ns3/internet-module.h" // This example shows how to set Wi-Fi timing parameters through WifiMac attributes. diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index 98b2b2ee7..954bec680 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -51,10 +51,6 @@ #include "ns3/csma-module.h" #include "ns3/internet-module.h" #include "ns3/bridge-helper.h" -#include -#include -#include -#include using namespace ns3; diff --git a/src/mesh/model/dot11s/airtime-metric.cc b/src/mesh/model/dot11s/airtime-metric.cc index 0e6ff8472..9f58b4a0a 100644 --- a/src/mesh/model/dot11s/airtime-metric.cc +++ b/src/mesh/model/dot11s/airtime-metric.cc @@ -19,9 +19,7 @@ */ #include "airtime-metric.h" -#include "ns3/wifi-remote-station-manager.h" -#include "ns3/wifi-mode.h" -#include "ns3/wifi-tx-vector.h" +#include "ns3/wifi-phy.h" namespace ns3 { namespace dot11s { diff --git a/src/wave/model/default-channel-scheduler.cc b/src/wave/model/default-channel-scheduler.cc index 1169c9101..832a6b6fe 100644 --- a/src/wave/model/default-channel-scheduler.cc +++ b/src/wave/model/default-channel-scheduler.cc @@ -18,6 +18,7 @@ #include "default-channel-scheduler.h" #include "ns3/log.h" #include "ns3/simulator.h" +#include "ns3/wifi-phy.h" namespace ns3 { diff --git a/src/wave/model/vsa-manager.cc b/src/wave/model/vsa-manager.cc index 5e9a3c0cc..33ee9443b 100644 --- a/src/wave/model/vsa-manager.cc +++ b/src/wave/model/vsa-manager.cc @@ -16,9 +16,9 @@ * Author: Junling Bu */ #include "ns3/log.h" -#include "ns3/assert.h" #include "ns3/simulator.h" #include "ns3/socket.h" +#include "ns3/wifi-phy.h" #include "vsa-manager.h" #include "higher-tx-tag.h" #include "wave-net-device.h" diff --git a/src/wave/model/wave-net-device.cc b/src/wave/model/wave-net-device.cc index a30fee297..5ffc2499b 100644 --- a/src/wave/model/wave-net-device.cc +++ b/src/wave/model/wave-net-device.cc @@ -18,11 +18,8 @@ * Junling Bu */ #include -#include "ns3/wifi-channel.h" +#include "ns3/wifi-phy.h" #include "ns3/llc-snap-header.h" -#include "ns3/uinteger.h" -#include "ns3/node.h" -#include "ns3/trace-source-accessor.h" #include "ns3/log.h" #include "ns3/socket.h" #include "ns3/object-map.h" diff --git a/src/wifi/examples/ideal-wifi-manager-example.cc b/src/wifi/examples/ideal-wifi-manager-example.cc index 5d61d1b21..0bcf45018 100644 --- a/src/wifi/examples/ideal-wifi-manager-example.cc +++ b/src/wifi/examples/ideal-wifi-manager-example.cc @@ -30,9 +30,6 @@ // --broadcast instead of unicast (default is unicast) // --rtsThreshold (by default, value of 99999 disables it) -#include -#include - #include "ns3/core-module.h" #include "ns3/network-module.h" #include "ns3/wifi-module.h" diff --git a/src/wifi/examples/test-interference-helper.cc b/src/wifi/examples/test-interference-helper.cc index 84d87428f..04929488e 100644 --- a/src/wifi/examples/test-interference-helper.cc +++ b/src/wifi/examples/test-interference-helper.cc @@ -50,22 +50,11 @@ // #include "ns3/core-module.h" -#include "ns3/wifi-net-device.h" #include "ns3/yans-wifi-channel.h" -#include "ns3/yans-wifi-phy.h" #include "ns3/propagation-loss-model.h" #include "ns3/propagation-delay-model.h" -#include "ns3/error-rate-model.h" #include "ns3/yans-error-rate-model.h" -#include "ns3/ptr.h" -#include "ns3/mobility-model.h" #include "ns3/constant-position-mobility-model.h" -#include "ns3/vector.h" -#include "ns3/packet.h" -#include "ns3/simulator.h" -#include "ns3/nstime.h" -#include "ns3/command-line.h" -#include "ns3/wifi-tx-vector.h" using namespace ns3; diff --git a/src/wifi/examples/wifi-phy-configuration.cc b/src/wifi/examples/wifi-phy-configuration.cc index 186a9f573..ebf7df25f 100644 --- a/src/wifi/examples/wifi-phy-configuration.cc +++ b/src/wifi/examples/wifi-phy-configuration.cc @@ -18,10 +18,8 @@ * Author: Tom Henderson */ -#include #include "ns3/core-module.h" #include "ns3/config-store-module.h" -#include "ns3/network-module.h" #include "ns3/wifi-module.h" // This example shows (and tests) some possible configurations for diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc index ea21e87f5..c99330b10 100644 --- a/src/wifi/examples/wifi-phy-test.cc +++ b/src/wifi/examples/wifi-phy-test.cc @@ -18,23 +18,14 @@ * Author: Mathieu Lacage */ -#include "ns3/wifi-net-device.h" #include "ns3/yans-wifi-channel.h" -#include "ns3/yans-wifi-phy.h" #include "ns3/propagation-loss-model.h" #include "ns3/propagation-delay-model.h" -#include "ns3/error-rate-model.h" #include "ns3/yans-error-rate-model.h" -#include "ns3/ptr.h" -#include "ns3/mobility-model.h" #include "ns3/constant-position-mobility-model.h" -#include "ns3/vector.h" -#include "ns3/packet.h" #include "ns3/simulator.h" -#include "ns3/nstime.h" #include "ns3/command-line.h" #include "ns3/flow-id-tag.h" -#include "ns3/wifi-tx-vector.h" using namespace ns3; diff --git a/src/wifi/helper/athstats-helper.cc b/src/wifi/helper/athstats-helper.cc index 00aa20355..a664e6868 100644 --- a/src/wifi/helper/athstats-helper.cc +++ b/src/wifi/helper/athstats-helper.cc @@ -19,14 +19,10 @@ */ #include "ns3/log.h" -#include "ns3/assert.h" -#include "ns3/abort.h" #include "ns3/simulator.h" -#include "ns3/nstime.h" #include "ns3/config.h" #include "athstats-helper.h" #include -#include #include namespace ns3 { diff --git a/src/wifi/helper/athstats-helper.h b/src/wifi/helper/athstats-helper.h index abaedc5ab..370917c27 100644 --- a/src/wifi/helper/athstats-helper.h +++ b/src/wifi/helper/athstats-helper.h @@ -21,16 +21,9 @@ #ifndef ATHSTATS_HELPER_H #define ATHSTATS_HELPER_H -#include -#include "ns3/object.h" -#include "ns3/attribute.h" -#include "ns3/object-factory.h" #include "ns3/node-container.h" #include "ns3/net-device-container.h" -#include "ns3/nstime.h" #include "ns3/wifi-phy.h" -#include "ns3/double.h" -#include "ns3/mac48-address.h" namespace ns3 { diff --git a/src/wifi/helper/spectrum-wifi-helper.cc b/src/wifi/helper/spectrum-wifi-helper.cc index c9079fbd9..7ad5e94cb 100644 --- a/src/wifi/helper/spectrum-wifi-helper.cc +++ b/src/wifi/helper/spectrum-wifi-helper.cc @@ -19,12 +19,8 @@ * Sébastien Deronne */ -#include "ns3/trace-helper.h" #include "spectrum-wifi-helper.h" -#include "ns3/error-rate-model.h" -#include "ns3/spectrum-channel.h" #include "ns3/spectrum-wifi-phy.h" -#include "ns3/wifi-net-device.h" #include "ns3/names.h" #include "ns3/log.h" diff --git a/src/wifi/helper/spectrum-wifi-helper.h b/src/wifi/helper/spectrum-wifi-helper.h index 4756941d8..15532c693 100644 --- a/src/wifi/helper/spectrum-wifi-helper.h +++ b/src/wifi/helper/spectrum-wifi-helper.h @@ -22,7 +22,6 @@ #define SPECTRUM_WIFI_HELPER_H #include "wifi-helper.h" -#include "ns3/trace-helper.h" namespace ns3 { diff --git a/src/wifi/helper/wifi-helper.cc b/src/wifi/helper/wifi-helper.cc index f830ed898..77e56941f 100644 --- a/src/wifi/helper/wifi-helper.cc +++ b/src/wifi/helper/wifi-helper.cc @@ -22,27 +22,13 @@ #include "wifi-helper.h" #include "ns3/wifi-net-device.h" -#include "ns3/wifi-mac.h" -#include "ns3/regular-wifi-mac.h" -#include "ns3/dca-txop.h" -#include "ns3/edca-txop-n.h" #include "ns3/minstrel-wifi-manager.h" #include "ns3/ap-wifi-mac.h" -#include "ns3/wifi-phy.h" #include "ns3/ampdu-subframe-header.h" -#include "ns3/wifi-remote-station-manager.h" -#include "ns3/wifi-channel.h" -#include "ns3/yans-wifi-channel.h" -#include "ns3/propagation-delay-model.h" -#include "ns3/propagation-loss-model.h" -#include "ns3/mobility-model.h" #include "ns3/log.h" #include "ns3/pointer.h" #include "ns3/radiotap-header.h" -#include "ns3/pcap-file-wrapper.h" -#include "ns3/abort.h" #include "ns3/config.h" -#include "ns3/simulator.h" #include "ns3/names.h" namespace ns3 { diff --git a/src/wifi/helper/wifi-helper.h b/src/wifi/helper/wifi-helper.h index 86781499a..5610e4c73 100644 --- a/src/wifi/helper/wifi-helper.h +++ b/src/wifi/helper/wifi-helper.h @@ -23,12 +23,6 @@ #ifndef WIFI_HELPER_H #define WIFI_HELPER_H -#include -#include "ns3/attribute.h" -#include "ns3/object-factory.h" -#include "ns3/node-container.h" -#include "ns3/net-device-container.h" -#include "ns3/wifi-phy-standard.h" #include "ns3/trace-helper.h" #include "ns3/wifi-mac-helper.h" #include "ns3/wifi-phy.h" diff --git a/src/wifi/helper/wifi-mac-helper.cc b/src/wifi/helper/wifi-mac-helper.cc index aef70e1ad..6fef7a1e2 100644 --- a/src/wifi/helper/wifi-mac-helper.cc +++ b/src/wifi/helper/wifi-mac-helper.cc @@ -20,9 +20,7 @@ #include "wifi-mac-helper.h" #include "ns3/wifi-mac.h" -#include "ns3/pointer.h" #include "ns3/boolean.h" -#include "ns3/dca-txop.h" namespace ns3 { diff --git a/src/wifi/helper/wifi-mac-helper.h b/src/wifi/helper/wifi-mac-helper.h index afe318649..7998d5a0c 100644 --- a/src/wifi/helper/wifi-mac-helper.h +++ b/src/wifi/helper/wifi-mac-helper.h @@ -21,8 +21,6 @@ #ifndef WIFI_MAC_HELPER_H #define WIFI_MAC_HELPER_H -#include -#include "ns3/attribute.h" #include "ns3/object-factory.h" namespace ns3 { diff --git a/src/wifi/helper/wifi-radio-energy-model-helper.cc b/src/wifi/helper/wifi-radio-energy-model-helper.cc index edbf63fe9..ee98ac931 100644 --- a/src/wifi/helper/wifi-radio-energy-model-helper.cc +++ b/src/wifi/helper/wifi-radio-energy-model-helper.cc @@ -19,11 +19,7 @@ */ #include "wifi-radio-energy-model-helper.h" -#include "ns3/basic-energy-source-helper.h" -#include "ns3/wifi-phy.h" #include "ns3/wifi-net-device.h" -#include "ns3/config.h" -#include "ns3/names.h" #include "ns3/wifi-tx-current-model.h" namespace ns3 { diff --git a/src/wifi/helper/yans-wifi-helper.cc b/src/wifi/helper/yans-wifi-helper.cc index 9c7f7649f..e212e0b5f 100644 --- a/src/wifi/helper/yans-wifi-helper.cc +++ b/src/wifi/helper/yans-wifi-helper.cc @@ -19,14 +19,10 @@ * Sébastien Deronne */ -#include "ns3/trace-helper.h" #include "yans-wifi-helper.h" -#include "ns3/error-rate-model.h" #include "ns3/propagation-loss-model.h" #include "ns3/propagation-delay-model.h" -#include "ns3/yans-wifi-channel.h" #include "ns3/yans-wifi-phy.h" -#include "ns3/wifi-net-device.h" #include "ns3/names.h" #include "ns3/log.h" diff --git a/src/wifi/helper/yans-wifi-helper.h b/src/wifi/helper/yans-wifi-helper.h index df5380cf1..3ffa973b6 100644 --- a/src/wifi/helper/yans-wifi-helper.h +++ b/src/wifi/helper/yans-wifi-helper.h @@ -22,7 +22,6 @@ #define YANS_WIFI_HELPER_H #include "wifi-helper.h" -#include "ns3/trace-helper.h" #include "ns3/yans-wifi-channel.h" namespace ns3 { diff --git a/src/wifi/model/aarfcd-wifi-manager.cc b/src/wifi/model/aarfcd-wifi-manager.cc index 11dbe6d61..1132e8a25 100644 --- a/src/wifi/model/aarfcd-wifi-manager.cc +++ b/src/wifi/model/aarfcd-wifi-manager.cc @@ -19,13 +19,10 @@ */ #include "aarfcd-wifi-manager.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/simulator.h" #include "ns3/boolean.h" #include "ns3/double.h" #include "ns3/uinteger.h" -#include #define Min(a,b) ((a < b) ? a : b) #define Max(a,b) ((a > b) ? a : b) diff --git a/src/wifi/model/adhoc-wifi-mac.cc b/src/wifi/model/adhoc-wifi-mac.cc index b70f46a5f..469e3c387 100644 --- a/src/wifi/model/adhoc-wifi-mac.cc +++ b/src/wifi/model/adhoc-wifi-mac.cc @@ -21,18 +21,8 @@ */ #include "adhoc-wifi-mac.h" -#include "ns3/pointer.h" #include "ns3/log.h" -#include "ns3/string.h" -#include "ns3/boolean.h" -#include "ns3/trace-source-accessor.h" #include "mac-low.h" -#include "dcf-manager.h" -#include "mac-rx-middle.h" -#include "mac-tx-middle.h" -#include "msdu-aggregator.h" -#include "amsdu-subframe-header.h" -#include "mgt-headers.h" namespace ns3 { diff --git a/src/wifi/model/adhoc-wifi-mac.h b/src/wifi/model/adhoc-wifi-mac.h index 8f09f1a29..9d33ad4eb 100644 --- a/src/wifi/model/adhoc-wifi-mac.h +++ b/src/wifi/model/adhoc-wifi-mac.h @@ -19,11 +19,11 @@ * Authors: Mathieu Lacage * Mirko Banchi */ + #ifndef ADHOC_WIFI_MAC_H #define ADHOC_WIFI_MAC_H #include "regular-wifi-mac.h" -#include "amsdu-subframe-header.h" namespace ns3 { diff --git a/src/wifi/model/ampdu-subframe-header.cc b/src/wifi/model/ampdu-subframe-header.cc index aeed55b38..762a1d19b 100644 --- a/src/wifi/model/ampdu-subframe-header.cc +++ b/src/wifi/model/ampdu-subframe-header.cc @@ -19,7 +19,6 @@ */ #include "ampdu-subframe-header.h" -#include "ns3/address-utils.h" #include namespace ns3 { diff --git a/src/wifi/model/ampdu-subframe-header.h b/src/wifi/model/ampdu-subframe-header.h index fe0529422..508c7abce 100644 --- a/src/wifi/model/ampdu-subframe-header.h +++ b/src/wifi/model/ampdu-subframe-header.h @@ -22,7 +22,6 @@ #define AMPDU_SUBFRAME_HEADER_H #include "ns3/header.h" -#include "ns3/mac48-address.h" namespace ns3 { diff --git a/src/wifi/model/ampdu-tag.cc b/src/wifi/model/ampdu-tag.cc index 52b193256..1620183e8 100644 --- a/src/wifi/model/ampdu-tag.cc +++ b/src/wifi/model/ampdu-tag.cc @@ -20,7 +20,6 @@ */ #include "ampdu-tag.h" -#include "ns3/tag.h" #include "ns3/uinteger.h" namespace ns3 { diff --git a/src/wifi/model/ampdu-tag.h b/src/wifi/model/ampdu-tag.h index 7e4ddc903..61acbaba3 100644 --- a/src/wifi/model/ampdu-tag.h +++ b/src/wifi/model/ampdu-tag.h @@ -22,13 +22,11 @@ #ifndef AMPDU_TAG_H #define AMPDU_TAG_H -#include "ns3/packet.h" #include "ns3/nstime.h" +#include "ns3/tag.h" namespace ns3 { -class Tag; - /** * \ingroup wifi * diff --git a/src/wifi/model/amrr-wifi-manager.h b/src/wifi/model/amrr-wifi-manager.h index 53539c82a..a127ed915 100644 --- a/src/wifi/model/amrr-wifi-manager.h +++ b/src/wifi/model/amrr-wifi-manager.h @@ -22,7 +22,6 @@ #define AMRR_WIFI_MANAGER_H #include "wifi-remote-station-manager.h" -#include "ns3/nstime.h" namespace ns3 { diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 1fb41f109..49a38da6c 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -21,20 +21,11 @@ */ #include "ap-wifi-mac.h" -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/simulator.h" #include "ns3/string.h" #include "ns3/pointer.h" -#include "ns3/boolean.h" -#include "wifi-phy.h" -#include "dcf-manager.h" -#include "mac-rx-middle.h" -#include "mac-tx-middle.h" -#include "mgt-headers.h" #include "mac-low.h" -#include "amsdu-subframe-header.h" -#include "msdu-aggregator.h" namespace ns3 { diff --git a/src/wifi/model/ap-wifi-mac.h b/src/wifi/model/ap-wifi-mac.h index 63293a482..1bb44be0d 100644 --- a/src/wifi/model/ap-wifi-mac.h +++ b/src/wifi/model/ap-wifi-mac.h @@ -25,10 +25,7 @@ #include "regular-wifi-mac.h" #include "capability-information.h" -#include "ht-capabilities.h" #include "ht-operations.h" -#include "vht-capabilities.h" -#include "amsdu-subframe-header.h" #include "supported-rates.h" #include "dsss-parameter-set.h" #include "erp-information.h" diff --git a/src/wifi/model/aparf-wifi-manager.cc b/src/wifi/model/aparf-wifi-manager.cc index 6b86fe2e6..68340b84a 100644 --- a/src/wifi/model/aparf-wifi-manager.cc +++ b/src/wifi/model/aparf-wifi-manager.cc @@ -20,10 +20,8 @@ #include "aparf-wifi-manager.h" #include "wifi-phy.h" -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/uinteger.h" -#include "ns3/trace-source-accessor.h" #define Min(a,b) ((a < b) ? a : b) diff --git a/src/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc index 67f19218b..9be421c2e 100644 --- a/src/wifi/model/arf-wifi-manager.cc +++ b/src/wifi/model/arf-wifi-manager.cc @@ -19,7 +19,6 @@ */ #include "arf-wifi-manager.h" -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/uinteger.h" diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc index 888ed37ad..e993c25db 100644 --- a/src/wifi/model/block-ack-manager.cc +++ b/src/wifi/model/block-ack-manager.cc @@ -19,18 +19,11 @@ */ #include "ns3/log.h" -#include "ns3/assert.h" #include "ns3/simulator.h" -#include "ns3/fatal-error.h" #include "block-ack-manager.h" #include "mgt-headers.h" -#include "ctrl-headers.h" -#include "wifi-mac-header.h" -#include "edca-txop-n.h" -#include "mac-low.h" #include "wifi-mac-queue.h" #include "mac-tx-middle.h" -#include "qos-utils.h" namespace ns3 { diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h index ed17a31bf..9274ac7f7 100644 --- a/src/wifi/model/block-ack-manager.h +++ b/src/wifi/model/block-ack-manager.h @@ -21,16 +21,12 @@ #ifndef BLOCK_ACK_MANAGER_H #define BLOCK_ACK_MANAGER_H -#include -#include -#include -#include "ns3/packet.h" #include "wifi-mac-header.h" #include "originator-block-ack-agreement.h" #include "ctrl-headers.h" #include "qos-utils.h" -#include "wifi-mode.h" #include "wifi-remote-station-manager.h" +#include namespace ns3 { diff --git a/src/wifi/model/capability-information.h b/src/wifi/model/capability-information.h index 37f2e7489..1b230c422 100644 --- a/src/wifi/model/capability-information.h +++ b/src/wifi/model/capability-information.h @@ -21,7 +21,6 @@ #ifndef CAPABILITY_INFORMATION_H #define CAPABILITY_INFORMATION_H -#include #include "ns3/buffer.h" namespace ns3 { diff --git a/src/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc index c0ae89298..acaa55f82 100644 --- a/src/wifi/model/cara-wifi-manager.cc +++ b/src/wifi/model/cara-wifi-manager.cc @@ -19,11 +19,8 @@ */ #include "cara-wifi-manager.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/double.h" #include "ns3/uinteger.h" -#include "ns3/simulator.h" #define Min(a,b) ((a < b) ? a : b) diff --git a/src/wifi/model/constant-rate-wifi-manager.cc b/src/wifi/model/constant-rate-wifi-manager.cc index 66cd2b745..6525da9f7 100644 --- a/src/wifi/model/constant-rate-wifi-manager.cc +++ b/src/wifi/model/constant-rate-wifi-manager.cc @@ -20,7 +20,6 @@ #include "constant-rate-wifi-manager.h" #include "ns3/string.h" -#include "ns3/assert.h" #include "ns3/log.h" #define Min(a,b) ((a < b) ? a : b) diff --git a/src/wifi/model/constant-rate-wifi-manager.h b/src/wifi/model/constant-rate-wifi-manager.h index 07defff76..27dc8eca5 100644 --- a/src/wifi/model/constant-rate-wifi-manager.h +++ b/src/wifi/model/constant-rate-wifi-manager.h @@ -21,7 +21,6 @@ #ifndef CONSTANT_RATE_WIFI_MANAGER_H #define CONSTANT_RATE_WIFI_MANAGER_H -#include #include "wifi-remote-station-manager.h" namespace ns3 { diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc index 350763605..cbc40422e 100644 --- a/src/wifi/model/ctrl-headers.cc +++ b/src/wifi/model/ctrl-headers.cc @@ -18,7 +18,6 @@ * Author: Mirko Banchi */ -#include "ns3/fatal-error.h" #include "ns3/log.h" #include "ctrl-headers.h" diff --git a/src/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc index f072419f1..e8913767a 100644 --- a/src/wifi/model/dca-txop.cc +++ b/src/wifi/model/dca-txop.cc @@ -18,12 +18,7 @@ * Author: Mathieu Lacage */ -#include "ns3/assert.h" -#include "ns3/packet.h" #include "ns3/log.h" -#include "ns3/simulator.h" -#include "ns3/node.h" -#include "ns3/uinteger.h" #include "ns3/pointer.h" #include "dca-txop.h" #include "dcf-manager.h" @@ -31,7 +26,6 @@ #include "wifi-mac-queue.h" #include "mac-tx-middle.h" #include "wifi-mac-trailer.h" -#include "wifi-mac.h" #include "random-stream.h" #undef NS_LOG_APPEND_CONTEXT diff --git a/src/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h index 1b10d6fec..5b6c16ed4 100644 --- a/src/wifi/model/dca-txop.h +++ b/src/wifi/model/dca-txop.h @@ -21,13 +21,7 @@ #ifndef DCA_TXOP_H #define DCA_TXOP_H -#include -#include "ns3/callback.h" -#include "ns3/packet.h" -#include "ns3/nstime.h" -#include "ns3/object.h" #include "ns3/wifi-mac-header.h" -#include "ns3/wifi-mode.h" #include "ns3/wifi-remote-station-manager.h" #include "ns3/dcf.h" diff --git a/src/wifi/model/dcf-manager.cc b/src/wifi/model/dcf-manager.cc index f1ace9335..46e5a21c7 100644 --- a/src/wifi/model/dcf-manager.cc +++ b/src/wifi/model/dcf-manager.cc @@ -18,13 +18,9 @@ * Author: Mathieu Lacage */ -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/simulator.h" -#include #include "dcf-manager.h" -#include "wifi-phy.h" -#include "wifi-mac.h" #include "mac-low.h" #define MY_DEBUG(x) \ diff --git a/src/wifi/model/dcf-manager.h b/src/wifi/model/dcf-manager.h index 0d392efcb..3f0814e11 100644 --- a/src/wifi/model/dcf-manager.h +++ b/src/wifi/model/dcf-manager.h @@ -21,9 +21,7 @@ #ifndef DCF_MANAGER_H #define DCF_MANAGER_H -#include "ns3/nstime.h" #include "ns3/event-id.h" -#include namespace ns3 { diff --git a/src/wifi/model/dsss-error-rate-model.h b/src/wifi/model/dsss-error-rate-model.h index 8deac5dd1..29cdecff4 100644 --- a/src/wifi/model/dsss-error-rate-model.h +++ b/src/wifi/model/dsss-error-rate-model.h @@ -21,7 +21,6 @@ #ifndef DSS_ERROR_RATE_MODEL_H #define DSS_ERROR_RATE_MODEL_H -#include #ifdef HAVE_GSL #include #include diff --git a/src/wifi/model/dsss-parameter-set.cc b/src/wifi/model/dsss-parameter-set.cc index 3359e6a85..3089c9d9d 100644 --- a/src/wifi/model/dsss-parameter-set.cc +++ b/src/wifi/model/dsss-parameter-set.cc @@ -19,9 +19,7 @@ */ #include "dsss-parameter-set.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include namespace ns3 { diff --git a/src/wifi/model/dsss-parameter-set.h b/src/wifi/model/dsss-parameter-set.h index 190d3eedc..9f7b3a50c 100644 --- a/src/wifi/model/dsss-parameter-set.h +++ b/src/wifi/model/dsss-parameter-set.h @@ -21,9 +21,6 @@ #ifndef DSSS_PARAMETER_SET_H #define DSSS_PARAMETER_SET_H -#include -#include -#include "ns3/buffer.h" #include "ns3/wifi-information-element.h" namespace ns3 { diff --git a/src/wifi/model/edca-parameter-set.cc b/src/wifi/model/edca-parameter-set.cc index 6866680db..1debb3d6c 100644 --- a/src/wifi/model/edca-parameter-set.cc +++ b/src/wifi/model/edca-parameter-set.cc @@ -19,7 +19,6 @@ */ #include "edca-parameter-set.h" -#include "ns3/assert.h" #include "ns3/log.h" #include diff --git a/src/wifi/model/edca-parameter-set.h b/src/wifi/model/edca-parameter-set.h index d46a84bbb..4886dc61c 100644 --- a/src/wifi/model/edca-parameter-set.h +++ b/src/wifi/model/edca-parameter-set.h @@ -21,9 +21,6 @@ #ifndef EDCA_PARAMETER_SET_H #define EDCA_PARAMETER_SET_H -#include -#include -#include "ns3/buffer.h" #include "ns3/wifi-information-element.h" namespace ns3 { diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 69b853d36..fd1c74822 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -21,19 +21,14 @@ */ #include "ns3/log.h" -#include "ns3/assert.h" #include "ns3/pointer.h" #include "edca-txop-n.h" #include "mac-low.h" #include "dcf-manager.h" #include "mac-tx-middle.h" #include "wifi-mac-trailer.h" -#include "wifi-mac.h" #include "random-stream.h" #include "wifi-mac-queue.h" -#include "msdu-aggregator.h" -#include "mpdu-aggregator.h" -#include "mgt-headers.h" #include "qos-blocked-destinations.h" #include "ns3/simulator.h" diff --git a/src/wifi/model/edca-txop-n.h b/src/wifi/model/edca-txop-n.h index 2786260a2..ff93e7ba7 100644 --- a/src/wifi/model/edca-txop-n.h +++ b/src/wifi/model/edca-txop-n.h @@ -22,19 +22,9 @@ #ifndef EDCA_TXOP_N_H #define EDCA_TXOP_N_H -#include "ns3/object.h" -#include "ns3/mac48-address.h" -#include "ns3/packet.h" #include "ns3/traced-value.h" -#include "wifi-mode.h" -#include "wifi-mac-header.h" -#include "wifi-remote-station-manager.h" -#include "qos-utils.h" #include "dcf.h" -#include "ctrl-headers.h" #include "block-ack-manager.h" -#include -#include class AmpduAggregationTest; @@ -52,7 +42,6 @@ class QosBlockedDestinations; class MsduAggregator; class MpduAggregator; class MgtAddBaResponseHeader; -class BlockAckManager; class MgtDelBaHeader; /** diff --git a/src/wifi/model/erp-information.cc b/src/wifi/model/erp-information.cc index f6d04f150..74d7f52b8 100644 --- a/src/wifi/model/erp-information.cc +++ b/src/wifi/model/erp-information.cc @@ -19,7 +19,6 @@ */ #include "erp-information.h" -#include "ns3/assert.h" #include "ns3/log.h" namespace ns3 { diff --git a/src/wifi/model/erp-information.h b/src/wifi/model/erp-information.h index 2e3a7dd86..98b57a778 100644 --- a/src/wifi/model/erp-information.h +++ b/src/wifi/model/erp-information.h @@ -21,9 +21,6 @@ #ifndef ERP_INFORMATION_H #define ERP_INFORMATION_H -#include -#include -#include "ns3/buffer.h" #include "ns3/wifi-information-element.h" namespace ns3 { diff --git a/src/wifi/model/error-rate-model.h b/src/wifi/model/error-rate-model.h index 88d0f5449..a167cb163 100644 --- a/src/wifi/model/error-rate-model.h +++ b/src/wifi/model/error-rate-model.h @@ -21,8 +21,6 @@ #ifndef ERROR_RATE_MODEL_H #define ERROR_RATE_MODEL_H -#include -#include "wifi-mode.h" #include "wifi-tx-vector.h" #include "ns3/object.h" diff --git a/src/wifi/model/ht-capabilities.cc b/src/wifi/model/ht-capabilities.cc index 2068f271d..3e753f790 100644 --- a/src/wifi/model/ht-capabilities.cc +++ b/src/wifi/model/ht-capabilities.cc @@ -20,7 +20,6 @@ */ #include "ht-capabilities.h" -#include "ns3/assert.h" #include "ns3/log.h" namespace ns3 { diff --git a/src/wifi/model/ht-capabilities.h b/src/wifi/model/ht-capabilities.h index c4f0b5abd..2cab4ce16 100644 --- a/src/wifi/model/ht-capabilities.h +++ b/src/wifi/model/ht-capabilities.h @@ -22,9 +22,6 @@ #ifndef HT_CAPABILITIES_H #define HT_CAPABILITIES_H -#include -#include "ns3/buffer.h" -#include "ns3/attribute-helper.h" #include "ns3/wifi-information-element.h" /** diff --git a/src/wifi/model/ht-operations.cc b/src/wifi/model/ht-operations.cc index 68c1be5f3..0d3ddd6be 100644 --- a/src/wifi/model/ht-operations.cc +++ b/src/wifi/model/ht-operations.cc @@ -19,7 +19,6 @@ */ #include "ht-operations.h" -#include "ns3/assert.h" #include "ns3/log.h" namespace ns3 { diff --git a/src/wifi/model/ht-operations.h b/src/wifi/model/ht-operations.h index b4f2cfa13..823f3a4e0 100644 --- a/src/wifi/model/ht-operations.h +++ b/src/wifi/model/ht-operations.h @@ -21,9 +21,6 @@ #ifndef HT_OPERATIONS_H #define HT_OPERATIONS_H -#include -#include "ns3/buffer.h" -#include "ns3/attribute-helper.h" #include "ns3/wifi-information-element.h" /** diff --git a/src/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc index 8338a213a..403ef7d2b 100644 --- a/src/wifi/model/ideal-wifi-manager.cc +++ b/src/wifi/model/ideal-wifi-manager.cc @@ -20,10 +20,7 @@ #include "ideal-wifi-manager.h" #include "wifi-phy.h" -#include "ns3/assert.h" -#include "ns3/double.h" #include "ns3/log.h" -#include namespace ns3 { diff --git a/src/wifi/model/ideal-wifi-manager.h b/src/wifi/model/ideal-wifi-manager.h index f3fff694e..bad266106 100644 --- a/src/wifi/model/ideal-wifi-manager.h +++ b/src/wifi/model/ideal-wifi-manager.h @@ -21,10 +21,7 @@ #ifndef IDEAL_WIFI_MANAGER_H #define IDEAL_WIFI_MANAGER_H -#include -#include #include "ns3/traced-value.h" -#include "wifi-mode.h" #include "wifi-remote-station-manager.h" namespace ns3 { diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc index 702844af1..feae109c0 100644 --- a/src/wifi/model/interference-helper.cc +++ b/src/wifi/model/interference-helper.cc @@ -21,7 +21,6 @@ #include "interference-helper.h" #include "wifi-phy.h" -#include "error-rate-model.h" #include "ns3/simulator.h" #include "ns3/log.h" #include diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h index 58deec870..f0ab79db5 100644 --- a/src/wifi/model/interference-helper.h +++ b/src/wifi/model/interference-helper.h @@ -21,13 +21,7 @@ #ifndef INTERFERENCE_HELPER_H #define INTERFERENCE_HELPER_H -#include -#include -#include -#include "wifi-mode.h" -#include "wifi-phy-standard.h" #include "ns3/nstime.h" -#include "ns3/simple-ref-count.h" #include "ns3/wifi-tx-vector.h" #include "error-rate-model.h" diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index 3a5a6c359..6ce47269b 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -20,21 +20,12 @@ * Mirko Banchi */ -#include "ns3/assert.h" -#include "ns3/packet.h" #include "ns3/simulator.h" -#include "ns3/tag.h" #include "ns3/log.h" -#include "ns3/node.h" #include "ns3/socket.h" -#include "ns3/double.h" #include "mac-low.h" -#include "wifi-phy.h" #include "wifi-mac-trailer.h" -#include "qos-utils.h" -#include "edca-txop-n.h" #include "snr-tag.h" -#include "yans-wifi-phy.h" #include "ampdu-tag.h" #include "wifi-mac-queue.h" diff --git a/src/wifi/model/mac-low.h b/src/wifi/model/mac-low.h index 57259d9fa..81397ba0c 100644 --- a/src/wifi/model/mac-low.h +++ b/src/wifi/model/mac-low.h @@ -16,28 +16,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Mathieu Lacage - * Author: Mirko Banchi + * Authors: Mathieu Lacage + * Mirko Banchi */ + #ifndef MAC_LOW_H #define MAC_LOW_H -#include -#include -#include -#include - -#include "wifi-mode.h" #include "wifi-phy.h" #include "wifi-remote-station-manager.h" #include "block-ack-agreement.h" -#include "ns3/mac48-address.h" -#include "ns3/callback.h" -#include "ns3/event-id.h" -#include "ns3/nstime.h" #include "qos-utils.h" #include "block-ack-cache.h" -#include "wifi-tx-vector.h" #include "mpdu-aggregator.h" #include "msdu-aggregator.h" diff --git a/src/wifi/model/mac-rx-middle.cc b/src/wifi/model/mac-rx-middle.cc index 7b280a6ba..0605a0131 100644 --- a/src/wifi/model/mac-rx-middle.cc +++ b/src/wifi/model/mac-rx-middle.cc @@ -20,12 +20,8 @@ #include "mac-rx-middle.h" #include "wifi-mac-header.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/packet.h" -#include "ns3/simulator.h" #include "ns3/sequence-number.h" -#include namespace ns3 { diff --git a/src/wifi/model/mac-rx-middle.h b/src/wifi/model/mac-rx-middle.h index 400738029..ecc83f466 100644 --- a/src/wifi/model/mac-rx-middle.h +++ b/src/wifi/model/mac-rx-middle.h @@ -22,9 +22,6 @@ #define MAC_RX_MIDDLE_H #include -#include -#include "ns3/callback.h" -#include "ns3/mac48-address.h" #include "ns3/packet.h" namespace ns3 { diff --git a/src/wifi/model/mac-tx-middle.cc b/src/wifi/model/mac-tx-middle.cc index 0dca85dab..a860d29f9 100644 --- a/src/wifi/model/mac-tx-middle.cc +++ b/src/wifi/model/mac-tx-middle.cc @@ -21,7 +21,6 @@ * Ghada Badawy */ -#include "ns3/assert.h" #include "mac-tx-middle.h" #include "wifi-mac-header.h" diff --git a/src/wifi/model/mac-tx-middle.h b/src/wifi/model/mac-tx-middle.h index 2403aa321..431248473 100644 --- a/src/wifi/model/mac-tx-middle.h +++ b/src/wifi/model/mac-tx-middle.h @@ -16,14 +16,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Mathieu Lacage - * Mirko Banchi + * Authors: Mathieu Lacage + * Mirko Banchi */ #ifndef MAC_TX_MIDDLE_H #define MAC_TX_MIDDLE_H -#include #include #include "ns3/mac48-address.h" diff --git a/src/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc index d46e3b5b1..583923f7b 100644 --- a/src/wifi/model/mgt-headers.cc +++ b/src/wifi/model/mgt-headers.cc @@ -20,10 +20,8 @@ * Mirko Banchi */ -#include #include "mgt-headers.h" #include "ns3/simulator.h" -#include "ns3/assert.h" namespace ns3 { diff --git a/src/wifi/model/mgt-headers.h b/src/wifi/model/mgt-headers.h index 4f5fb9c09..79ff66f50 100644 --- a/src/wifi/model/mgt-headers.h +++ b/src/wifi/model/mgt-headers.h @@ -23,9 +23,6 @@ #ifndef MGT_HEADERS_H #define MGT_HEADERS_H -#include - -#include "ns3/header.h" #include "status-code.h" #include "capability-information.h" #include "supported-rates.h" diff --git a/src/wifi/model/minstrel-ht-wifi-manager.cc b/src/wifi/model/minstrel-ht-wifi-manager.cc index 4d62e72e2..39fffc5fb 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.cc +++ b/src/wifi/model/minstrel-ht-wifi-manager.cc @@ -16,9 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Duy Nguyen - * Ghada Badawy - * Matias Richart + * Authors: Duy Nguyen + * Ghada Badawy + * Matias Richart * * Some Comments: * @@ -35,19 +35,13 @@ */ #include "minstrel-ht-wifi-manager.h" -#include "wifi-phy.h" -#include "ns3/random-variable-stream.h" #include "ns3/simulator.h" #include "ns3/log.h" -#include "ns3/uinteger.h" #include "ns3/double.h" -#include "ns3/wifi-mac.h" -#include "ns3/assert.h" #include "ns3/boolean.h" -#include "ns3/string.h" -#include +#include "wifi-mac.h" +#include "wifi-phy.h" #include -#include #define Min(a,b) ((a < b) ? a : b) #define Max(a,b) ((a > b) ? a : b) diff --git a/src/wifi/model/minstrel-ht-wifi-manager.h b/src/wifi/model/minstrel-ht-wifi-manager.h index 1f5f93db3..1fb5c6ab0 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.h +++ b/src/wifi/model/minstrel-ht-wifi-manager.h @@ -16,9 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - *Author: Duy Nguyen - * Ghada Badawy - * Matias Richart + *Authors: Duy Nguyen + * Ghada Badawy + * Matias Richart * * MinstrelHt is a rate adaptation algorithm for high-throughput (HT) 802.11 */ @@ -28,12 +28,6 @@ #include "wifi-remote-station-manager.h" #include "minstrel-wifi-manager.h" -#include "wifi-mode.h" -#include "ns3/nstime.h" -#include "ns3/random-variable-stream.h" -#include -#include -#include namespace ns3 { diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index ecc9453b0..527841872 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Duy Nguyen - * Matías Richart + * Authors: Duy Nguyen + * Matías Richart * * Some Comments: * @@ -30,15 +30,12 @@ */ #include "minstrel-wifi-manager.h" -#include "wifi-phy.h" #include "ns3/simulator.h" #include "ns3/log.h" -#include "ns3/uinteger.h" #include "ns3/double.h" #include "ns3/boolean.h" -#include "ns3/wifi-mac.h" -#include "ns3/assert.h" -#include +#include "wifi-mac.h" +#include "wifi-phy.h" #include #define Min(a,b) ((a < b) ? a : b) diff --git a/src/wifi/model/minstrel-wifi-manager.h b/src/wifi/model/minstrel-wifi-manager.h index 96f267cb7..3f769f806 100644 --- a/src/wifi/model/minstrel-wifi-manager.h +++ b/src/wifi/model/minstrel-wifi-manager.h @@ -15,16 +15,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Duy Nguyen - * Matías Richart + * Authors: Duy Nguyen + * Matías Richart */ #ifndef MINSTREL_WIFI_MANAGER_H #define MINSTREL_WIFI_MANAGER_H #include "wifi-remote-station-manager.h" -#include "wifi-mode.h" -#include "ns3/nstime.h" #include "ns3/random-variable-stream.h" #include diff --git a/src/wifi/model/mpdu-aggregator.cc b/src/wifi/model/mpdu-aggregator.cc index 902c7bc43..f2c7e3cb8 100644 --- a/src/wifi/model/mpdu-aggregator.cc +++ b/src/wifi/model/mpdu-aggregator.cc @@ -20,7 +20,6 @@ #include "ns3/log.h" #include "mpdu-aggregator.h" -#include "wifi-mac-header.h" NS_LOG_COMPONENT_DEFINE ("MpduAggregator"); diff --git a/src/wifi/model/mpdu-aggregator.h b/src/wifi/model/mpdu-aggregator.h index 25844a4e9..163d16b18 100644 --- a/src/wifi/model/mpdu-aggregator.h +++ b/src/wifi/model/mpdu-aggregator.h @@ -21,11 +21,9 @@ #ifndef MPDU_AGGREGATOR_H #define MPDU_AGGREGATOR_H -#include "ns3/ptr.h" #include "ns3/packet.h" #include "ns3/object.h" #include "ampdu-subframe-header.h" -#include namespace ns3 { diff --git a/src/wifi/model/mpdu-standard-aggregator.cc b/src/wifi/model/mpdu-standard-aggregator.cc index a4400945b..c69a73d81 100644 --- a/src/wifi/model/mpdu-standard-aggregator.cc +++ b/src/wifi/model/mpdu-standard-aggregator.cc @@ -20,7 +20,6 @@ #include "ns3/log.h" #include "ns3/uinteger.h" -#include "ampdu-subframe-header.h" #include "mpdu-standard-aggregator.h" NS_LOG_COMPONENT_DEFINE ("MpduStandardAggregator"); diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc index a044904d5..b6375f7ce 100644 --- a/src/wifi/model/msdu-aggregator.cc +++ b/src/wifi/model/msdu-aggregator.cc @@ -19,9 +19,7 @@ */ #include "ns3/log.h" - #include "msdu-aggregator.h" -#include "wifi-mac-header.h" namespace ns3 { diff --git a/src/wifi/model/msdu-aggregator.h b/src/wifi/model/msdu-aggregator.h index 524b6336c..7bcb05c55 100644 --- a/src/wifi/model/msdu-aggregator.h +++ b/src/wifi/model/msdu-aggregator.h @@ -21,11 +21,9 @@ #ifndef MSDU_AGGREGATOR_H #define MSDU_AGGREGATOR_H -#include "ns3/ptr.h" #include "ns3/packet.h" #include "ns3/object.h" #include "amsdu-subframe-header.h" -#include namespace ns3 { diff --git a/src/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc index 630681513..748fe6ffd 100644 --- a/src/wifi/model/msdu-standard-aggregator.cc +++ b/src/wifi/model/msdu-standard-aggregator.cc @@ -20,7 +20,6 @@ #include "ns3/log.h" #include "ns3/uinteger.h" -#include "amsdu-subframe-header.h" #include "msdu-standard-aggregator.h" namespace ns3 { diff --git a/src/wifi/model/nist-error-rate-model.cc b/src/wifi/model/nist-error-rate-model.cc index b16c663f2..707bc5fb1 100644 --- a/src/wifi/model/nist-error-rate-model.cc +++ b/src/wifi/model/nist-error-rate-model.cc @@ -19,7 +19,6 @@ * Sébastien Deronne */ -#include #include "nist-error-rate-model.h" #include "wifi-phy.h" #include "ns3/log.h" diff --git a/src/wifi/model/nist-error-rate-model.h b/src/wifi/model/nist-error-rate-model.h index c4d505417..964e9bbfd 100644 --- a/src/wifi/model/nist-error-rate-model.h +++ b/src/wifi/model/nist-error-rate-model.h @@ -21,8 +21,6 @@ #ifndef NIST_ERROR_RATE_MODEL_H #define NIST_ERROR_RATE_MODEL_H -#include -#include "wifi-mode.h" #include "error-rate-model.h" #include "dsss-error-rate-model.h" diff --git a/src/wifi/model/onoe-wifi-manager.h b/src/wifi/model/onoe-wifi-manager.h index b7cfba07c..71bd79bd4 100644 --- a/src/wifi/model/onoe-wifi-manager.h +++ b/src/wifi/model/onoe-wifi-manager.h @@ -22,7 +22,6 @@ #define ONOE_WIFI_MANAGER_H #include "wifi-remote-station-manager.h" -#include "ns3/nstime.h" namespace ns3 { diff --git a/src/wifi/model/parf-wifi-manager.cc b/src/wifi/model/parf-wifi-manager.cc index b052c92c9..20698a17c 100644 --- a/src/wifi/model/parf-wifi-manager.cc +++ b/src/wifi/model/parf-wifi-manager.cc @@ -20,10 +20,8 @@ #include "parf-wifi-manager.h" #include "wifi-phy.h" -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/uinteger.h" -#include "ns3/trace-source-accessor.h" #define Min(a,b) ((a < b) ? a : b) diff --git a/src/wifi/model/qos-utils.h b/src/wifi/model/qos-utils.h index 4a9d7d610..e520578cd 100644 --- a/src/wifi/model/qos-utils.h +++ b/src/wifi/model/qos-utils.h @@ -22,7 +22,6 @@ #define QOS_UTILS_H #include "ns3/uinteger.h" -#include "ns3/ptr.h" #include "ns3/packet.h" #include "wifi-mac-header.h" #include "ctrl-headers.h" diff --git a/src/wifi/model/random-stream.cc b/src/wifi/model/random-stream.cc index 3fe8619fa..54e23f77c 100644 --- a/src/wifi/model/random-stream.cc +++ b/src/wifi/model/random-stream.cc @@ -19,8 +19,6 @@ */ #include "random-stream.h" -#include "ns3/assert.h" -#include namespace ns3 { @@ -28,7 +26,6 @@ RandomStream::~RandomStream () { } - RealRandomStream::RealRandomStream () { m_stream = CreateObject (); diff --git a/src/wifi/model/random-stream.h b/src/wifi/model/random-stream.h index 6998d89b1..71736978d 100644 --- a/src/wifi/model/random-stream.h +++ b/src/wifi/model/random-stream.h @@ -21,8 +21,6 @@ #ifndef RANDOM_STREAM_H #define RANDOM_STREAM_H -#include -#include #include "ns3/random-variable-stream.h" namespace ns3 { diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc index dd596ee67..28dccc3a6 100644 --- a/src/wifi/model/regular-wifi-mac.cc +++ b/src/wifi/model/regular-wifi-mac.cc @@ -20,16 +20,11 @@ #include "regular-wifi-mac.h" #include "ns3/log.h" -#include "ns3/boolean.h" #include "ns3/pointer.h" -#include "ns3/uinteger.h" -#include "ns3/trace-source-accessor.h" #include "mac-rx-middle.h" #include "mac-tx-middle.h" #include "mac-low.h" -#include "dcf.h" #include "dcf-manager.h" -#include "wifi-phy.h" #include "msdu-standard-aggregator.h" #include "mpdu-standard-aggregator.h" diff --git a/src/wifi/model/regular-wifi-mac.h b/src/wifi/model/regular-wifi-mac.h index 90b40f738..235e3a73f 100644 --- a/src/wifi/model/regular-wifi-mac.h +++ b/src/wifi/model/regular-wifi-mac.h @@ -21,13 +21,9 @@ #ifndef REGULAR_WIFI_MAC_H #define REGULAR_WIFI_MAC_H -#include "ns3/wifi-mac.h" +#include "wifi-mac.h" #include "dca-txop.h" #include "edca-txop-n.h" -#include "wifi-remote-station-manager.h" -#include "ssid.h" -#include "qos-utils.h" -#include namespace ns3 { diff --git a/src/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc index 2a24b03ca..7cb273c64 100644 --- a/src/wifi/model/rraa-wifi-manager.cc +++ b/src/wifi/model/rraa-wifi-manager.cc @@ -19,7 +19,6 @@ */ #include "rraa-wifi-manager.h" -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/boolean.h" #include "ns3/double.h" diff --git a/src/wifi/model/rraa-wifi-manager.h b/src/wifi/model/rraa-wifi-manager.h index 7466028da..d195a51b5 100644 --- a/src/wifi/model/rraa-wifi-manager.h +++ b/src/wifi/model/rraa-wifi-manager.h @@ -21,7 +21,6 @@ #ifndef RRAA_WIFI_MANAGER_H #define RRAA_WIFI_MANAGER_H -#include "ns3/nstime.h" #include "wifi-remote-station-manager.h" namespace ns3 { diff --git a/src/wifi/model/snr-tag.cc b/src/wifi/model/snr-tag.cc index c7217e96a..59274100e 100644 --- a/src/wifi/model/snr-tag.cc +++ b/src/wifi/model/snr-tag.cc @@ -23,7 +23,6 @@ */ #include "snr-tag.h" -#include "ns3/tag.h" #include "ns3/double.h" namespace ns3 { diff --git a/src/wifi/model/snr-tag.h b/src/wifi/model/snr-tag.h index 4389a3522..66eb9b784 100644 --- a/src/wifi/model/snr-tag.h +++ b/src/wifi/model/snr-tag.h @@ -25,7 +25,7 @@ #ifndef SNR_TAG_H #define SNR_TAG_H -#include "ns3/packet.h" +#include "ns3/tag.h" namespace ns3 { diff --git a/src/wifi/model/spectrum-wifi-phy.cc b/src/wifi/model/spectrum-wifi-phy.cc index f77b7be37..23f874410 100644 --- a/src/wifi/model/spectrum-wifi-phy.cc +++ b/src/wifi/model/spectrum-wifi-phy.cc @@ -24,17 +24,10 @@ */ #include "spectrum-wifi-phy.h" -#include "ns3/spectrum-channel.h" -#include "ns3/spectrum-value.h" #include "ns3/wifi-spectrum-value-helper.h" -#include "wifi-phy-state-helper.h" -#include "ns3/simulator.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/double.h" #include "ns3/boolean.h" #include "wifi-spectrum-signal-parameters.h" -#include "ns3/antenna-model.h" #include "wifi-utils.h" namespace ns3 { diff --git a/src/wifi/model/ssid.cc b/src/wifi/model/ssid.cc index f0f58a4c9..0738936be 100644 --- a/src/wifi/model/ssid.cc +++ b/src/wifi/model/ssid.cc @@ -19,7 +19,6 @@ */ #include "ssid.h" -#include "ns3/assert.h" namespace ns3 { diff --git a/src/wifi/model/ssid.h b/src/wifi/model/ssid.h index 9ee47d537..30fef30d8 100644 --- a/src/wifi/model/ssid.h +++ b/src/wifi/model/ssid.h @@ -21,9 +21,6 @@ #ifndef SSID_H #define SSID_H -#include -#include "ns3/buffer.h" -#include "ns3/attribute-helper.h" #include "ns3/wifi-information-element.h" namespace ns3 { diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index 63f32c474..26ef2cc8f 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -23,21 +23,7 @@ #include "sta-wifi-mac.h" #include "ns3/log.h" #include "ns3/simulator.h" -#include "ns3/string.h" -#include "ns3/pointer.h" -#include "ns3/boolean.h" -#include "ns3/trace-source-accessor.h" #include "mac-low.h" -#include "dcf-manager.h" -#include "mac-rx-middle.h" -#include "mac-tx-middle.h" -#include "wifi-mac-header.h" -#include "msdu-aggregator.h" -#include "amsdu-subframe-header.h" -#include "mgt-headers.h" -#include "ht-capabilities.h" -#include "ht-operations.h" -#include "vht-capabilities.h" /* * The state machine for this STA is: diff --git a/src/wifi/model/sta-wifi-mac.h b/src/wifi/model/sta-wifi-mac.h index 48da0b1c7..eb264e94f 100644 --- a/src/wifi/model/sta-wifi-mac.h +++ b/src/wifi/model/sta-wifi-mac.h @@ -19,15 +19,12 @@ * Authors: Mathieu Lacage * Mirko Banchi */ + #ifndef STA_WIFI_MAC_H #define STA_WIFI_MAC_H #include "regular-wifi-mac.h" -#include "ns3/event-id.h" -#include "ns3/packet.h" -#include "ns3/traced-callback.h" #include "supported-rates.h" -#include "amsdu-subframe-header.h" #include "capability-information.h" namespace ns3 { diff --git a/src/wifi/model/status-code.cc b/src/wifi/model/status-code.cc index 2e90fde0f..15d6f5d5f 100644 --- a/src/wifi/model/status-code.cc +++ b/src/wifi/model/status-code.cc @@ -19,8 +19,6 @@ */ #include "status-code.h" -#include -#include namespace ns3 { diff --git a/src/wifi/model/status-code.h b/src/wifi/model/status-code.h index a55986930..28bf6f517 100644 --- a/src/wifi/model/status-code.h +++ b/src/wifi/model/status-code.h @@ -21,8 +21,6 @@ #ifndef STATUS_CODE_H #define STATUS_CODE_H -#include -#include #include "ns3/buffer.h" namespace ns3 { diff --git a/src/wifi/model/supported-rates.cc b/src/wifi/model/supported-rates.cc index 11feac3ba..dcc8184ba 100644 --- a/src/wifi/model/supported-rates.cc +++ b/src/wifi/model/supported-rates.cc @@ -19,7 +19,6 @@ */ #include "supported-rates.h" -#include "ns3/assert.h" #include "ns3/log.h" namespace ns3 { diff --git a/src/wifi/model/supported-rates.h b/src/wifi/model/supported-rates.h index 12f7e4287..04d1e24ba 100644 --- a/src/wifi/model/supported-rates.h +++ b/src/wifi/model/supported-rates.h @@ -21,8 +21,6 @@ #ifndef SUPPORTED_RATES_H #define SUPPORTED_RATES_H -#include -#include #include "ns3/buffer.h" #include "ns3/wifi-information-element.h" diff --git a/src/wifi/model/vht-capabilities.cc b/src/wifi/model/vht-capabilities.cc index 4ff1b7731..052425844 100644 --- a/src/wifi/model/vht-capabilities.cc +++ b/src/wifi/model/vht-capabilities.cc @@ -20,7 +20,6 @@ */ #include "vht-capabilities.h" -#include "ns3/assert.h" #include "ns3/log.h" NS_LOG_COMPONENT_DEFINE ("VhtCapabilities"); diff --git a/src/wifi/model/vht-capabilities.h b/src/wifi/model/vht-capabilities.h index d50a2e726..3eabafab5 100644 --- a/src/wifi/model/vht-capabilities.h +++ b/src/wifi/model/vht-capabilities.h @@ -22,9 +22,7 @@ #ifndef VHT_CAPABILITIES_H #define VHT_CAPABILITIES_H -#include #include "ns3/buffer.h" -#include "ns3/attribute-helper.h" #include "ns3/wifi-information-element.h" namespace ns3 { diff --git a/src/wifi/model/wifi-channel.cc b/src/wifi/model/wifi-channel.cc index d3c959fa7..32794815e 100644 --- a/src/wifi/model/wifi-channel.cc +++ b/src/wifi/model/wifi-channel.cc @@ -18,19 +18,8 @@ * Author: Mathieu Lacage, */ -#include "ns3/packet.h" -#include "ns3/simulator.h" -#include "ns3/mobility-model.h" -#include "ns3/net-device.h" -#include "ns3/node.h" #include "ns3/log.h" -#include "ns3/pointer.h" -#include "ns3/object-factory.h" #include "wifi-channel.h" -#include "wifi-net-device.h" -#include "yans-wifi-phy.h" -#include "ns3/propagation-loss-model.h" -#include "ns3/propagation-delay-model.h" namespace ns3 { diff --git a/src/wifi/model/wifi-information-element-vector.cc b/src/wifi/model/wifi-information-element-vector.cc index 15318afa5..e46aef050 100644 --- a/src/wifi/model/wifi-information-element-vector.cc +++ b/src/wifi/model/wifi-information-element-vector.cc @@ -19,8 +19,6 @@ */ #include "wifi-information-element-vector.h" -#include "ns3/packet.h" -#include namespace ns3 { diff --git a/src/wifi/model/wifi-information-element-vector.h b/src/wifi/model/wifi-information-element-vector.h index 38b3c754f..244db651d 100644 --- a/src/wifi/model/wifi-information-element-vector.h +++ b/src/wifi/model/wifi-information-element-vector.h @@ -22,8 +22,6 @@ #ifndef WIFI_INFORMATION_ELEMENT_VECTOR_H #define WIFI_INFORMATION_ELEMENT_VECTOR_H -#include "ns3/header.h" -#include "ns3/simple-ref-count.h" #include "ns3/wifi-information-element.h" namespace ns3 { diff --git a/src/wifi/model/wifi-information-element.h b/src/wifi/model/wifi-information-element.h index 74c121d8c..0f31b450a 100644 --- a/src/wifi/model/wifi-information-element.h +++ b/src/wifi/model/wifi-information-element.h @@ -22,7 +22,6 @@ #define WIFI_INFORMATION_ELEMENT_H #include "ns3/header.h" -#include "ns3/simple-ref-count.h" namespace ns3 { diff --git a/src/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc index 7175078ec..f259adf2a 100644 --- a/src/wifi/model/wifi-mac-header.cc +++ b/src/wifi/model/wifi-mac-header.cc @@ -16,11 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Mathieu Lacage - * Author: Mirko Banchi + * Authors: Mathieu Lacage + * Mirko Banchi */ -#include "ns3/assert.h" #include "ns3/address-utils.h" #include "wifi-mac-header.h" diff --git a/src/wifi/model/wifi-mac-header.h b/src/wifi/model/wifi-mac-header.h index 9a3a57bee..376018306 100644 --- a/src/wifi/model/wifi-mac-header.h +++ b/src/wifi/model/wifi-mac-header.h @@ -26,7 +26,6 @@ #include "ns3/header.h" #include "ns3/mac48-address.h" #include "ns3/nstime.h" -#include namespace ns3 { diff --git a/src/wifi/model/wifi-mac-queue.cc b/src/wifi/model/wifi-mac-queue.cc index 2634dd8d9..1a441ce43 100644 --- a/src/wifi/model/wifi-mac-queue.cc +++ b/src/wifi/model/wifi-mac-queue.cc @@ -21,7 +21,6 @@ */ #include "ns3/simulator.h" -#include "ns3/packet.h" #include "ns3/uinteger.h" #include "ns3/enum.h" #include "wifi-mac-queue.h" diff --git a/src/wifi/model/wifi-mac-queue.h b/src/wifi/model/wifi-mac-queue.h index 2c9b53436..df20b4998 100644 --- a/src/wifi/model/wifi-mac-queue.h +++ b/src/wifi/model/wifi-mac-queue.h @@ -23,11 +23,7 @@ #ifndef WIFI_MAC_QUEUE_H #define WIFI_MAC_QUEUE_H -#include -#include #include "ns3/packet.h" -#include "ns3/nstime.h" -#include "ns3/object.h" #include "wifi-mac-header.h" namespace ns3 { diff --git a/src/wifi/model/wifi-mac-trailer.cc b/src/wifi/model/wifi-mac-trailer.cc index 491e8cd2f..7d9054bfa 100644 --- a/src/wifi/model/wifi-mac-trailer.cc +++ b/src/wifi/model/wifi-mac-trailer.cc @@ -19,7 +19,6 @@ */ #include "wifi-mac-trailer.h" -#include "ns3/assert.h" namespace ns3 { diff --git a/src/wifi/model/wifi-mac-trailer.h b/src/wifi/model/wifi-mac-trailer.h index b0b460f90..c92486077 100644 --- a/src/wifi/model/wifi-mac-trailer.h +++ b/src/wifi/model/wifi-mac-trailer.h @@ -22,7 +22,6 @@ #define WIFI_MAC_TRAILER_H #include "ns3/trailer.h" -#include namespace ns3 { diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 3b500dbc6..9d4dad111 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -20,9 +20,6 @@ #include "wifi-mac.h" #include "dcf.h" -#include "ns3/uinteger.h" -#include "ns3/boolean.h" -#include "ns3/trace-source-accessor.h" namespace ns3 { diff --git a/src/wifi/model/wifi-mac.h b/src/wifi/model/wifi-mac.h index 28ad49b23..2e286429c 100644 --- a/src/wifi/model/wifi-mac.h +++ b/src/wifi/model/wifi-mac.h @@ -21,9 +21,7 @@ #ifndef WIFI_MAC_H #define WIFI_MAC_H -#include "ns3/packet.h" -#include "ns3/mac48-address.h" -#include "wifi-phy.h" +#include "wifi-phy-standard.h" #include "wifi-remote-station-manager.h" #include "ssid.h" #include "qos-utils.h" diff --git a/src/wifi/model/wifi-mode.cc b/src/wifi/model/wifi-mode.cc index fc4dabc82..7372c69af 100644 --- a/src/wifi/model/wifi-mode.cc +++ b/src/wifi/model/wifi-mode.cc @@ -21,8 +21,6 @@ #include "wifi-mode.h" #include "wifi-tx-vector.h" -#include "ns3/simulator.h" -#include "ns3/assert.h" #include "ns3/log.h" #include diff --git a/src/wifi/model/wifi-mode.h b/src/wifi/model/wifi-mode.h index 923f89ec0..fb358b307 100644 --- a/src/wifi/model/wifi-mode.h +++ b/src/wifi/model/wifi-mode.h @@ -22,12 +22,8 @@ #ifndef WIFI_MODE_H #define WIFI_MODE_H -#include -#include #include -#include #include "ns3/attribute-helper.h" -#include "ns3/wifi-phy-standard.h" namespace ns3 { diff --git a/src/wifi/model/wifi-net-device.cc b/src/wifi/model/wifi-net-device.cc index b437b6d8d..3f59379f9 100644 --- a/src/wifi/model/wifi-net-device.cc +++ b/src/wifi/model/wifi-net-device.cc @@ -19,18 +19,11 @@ */ #include "wifi-net-device.h" -#include "regular-wifi-mac.h" #include "wifi-phy.h" -#include "wifi-remote-station-manager.h" -#include "wifi-channel.h" -#include "qos-utils.h" +#include "regular-wifi-mac.h" #include "ns3/llc-snap-header.h" -#include "ns3/packet.h" #include "ns3/socket.h" -#include "ns3/uinteger.h" #include "ns3/pointer.h" -#include "ns3/node.h" -#include "ns3/trace-source-accessor.h" #include "ns3/log.h" namespace ns3 { diff --git a/src/wifi/model/wifi-net-device.h b/src/wifi/model/wifi-net-device.h index 508355ff5..a7e04e977 100644 --- a/src/wifi/model/wifi-net-device.h +++ b/src/wifi/model/wifi-net-device.h @@ -22,10 +22,7 @@ #define WIFI_NET_DEVICE_H #include "ns3/net-device.h" -#include "ns3/packet.h" #include "ns3/traced-callback.h" -#include "ns3/mac48-address.h" -#include namespace ns3 { diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc index 111b219a2..54086c965 100644 --- a/src/wifi/model/wifi-phy-state-helper.cc +++ b/src/wifi/model/wifi-phy-state-helper.cc @@ -21,7 +21,6 @@ #include "wifi-phy-state-helper.h" #include "ns3/log.h" #include "ns3/simulator.h" -#include "ns3/trace-source-accessor.h" #include namespace ns3 { diff --git a/src/wifi/model/wifi-phy-state-helper.h b/src/wifi/model/wifi-phy-state-helper.h index 27e0f6303..b3382ce1a 100644 --- a/src/wifi/model/wifi-phy-state-helper.h +++ b/src/wifi/model/wifi-phy-state-helper.h @@ -22,9 +22,7 @@ #define WIFI_PHY_STATE_HELPER_H #include "wifi-phy.h" -#include "ns3/traced-callback.h" #include "ns3/object.h" -#include namespace ns3 { diff --git a/src/wifi/model/wifi-phy-tag.cc b/src/wifi/model/wifi-phy-tag.cc index 6c3d4f12d..70def7024 100644 --- a/src/wifi/model/wifi-phy-tag.cc +++ b/src/wifi/model/wifi-phy-tag.cc @@ -17,7 +17,8 @@ * * Author: Nicola Baldo */ -#include + +#include "wifi-phy-tag.h" namespace ns3 { diff --git a/src/wifi/model/wifi-phy-tag.h b/src/wifi/model/wifi-phy-tag.h index 0d991a95a..f731c4f2f 100644 --- a/src/wifi/model/wifi-phy-tag.h +++ b/src/wifi/model/wifi-phy-tag.h @@ -17,12 +17,12 @@ * * Author: Nicola Baldo */ + #ifndef WIFI_PHY_TAG_H #define WIFI_PHY_TAG_H #include -#include -#include +#include "wifi-phy.h" namespace ns3 { diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 6576e9b59..6674b67cb 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -20,20 +20,13 @@ */ #include "wifi-phy.h" -#include "wifi-mode.h" -#include "wifi-channel.h" -#include "wifi-preamble.h" #include "wifi-phy-state-helper.h" #include "ns3/simulator.h" -#include "ns3/assert.h" #include "ns3/log.h" #include "ns3/boolean.h" #include "ns3/double.h" #include "ns3/uinteger.h" -#include "ns3/enum.h" #include "ns3/pointer.h" -#include "ns3/trace-source-accessor.h" -#include "ns3/fatal-error.h" #include "wifi-phy-tag.h" #include "ampdu-tag.h" #include "wifi-utils.h" diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index 5c6b80dd5..dfdfcdca7 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -22,24 +22,14 @@ #ifndef WIFI_PHY_H #define WIFI_PHY_H -#include #include #include "ns3/callback.h" #include "ns3/event-id.h" #include "ns3/packet.h" -#include "ns3/object.h" -#include "ns3/nstime.h" -#include "ns3/ptr.h" #include "ns3/mobility-model.h" #include "ns3/random-variable-stream.h" -#include "wifi-mode.h" -#include "wifi-preamble.h" -#include "wifi-phy-standard.h" -#include "ns3/traced-callback.h" -#include "wifi-tx-vector.h" #include "wifi-phy-standard.h" #include "interference-helper.h" -#include "ns3/net-device.h" #include "ns3/node.h" #include "wifi-channel.h" diff --git a/src/wifi/model/wifi-radio-energy-model.cc b/src/wifi/model/wifi-radio-energy-model.cc index 1298291ca..07800c8fb 100644 --- a/src/wifi/model/wifi-radio-energy-model.cc +++ b/src/wifi/model/wifi-radio-energy-model.cc @@ -19,9 +19,7 @@ */ #include "ns3/log.h" -#include "ns3/double.h" #include "ns3/simulator.h" -#include "ns3/trace-source-accessor.h" #include "ns3/pointer.h" #include "ns3/energy-source.h" #include "wifi-radio-energy-model.h" diff --git a/src/wifi/model/wifi-radio-energy-model.h b/src/wifi/model/wifi-radio-energy-model.h index e983da0d2..df807a252 100644 --- a/src/wifi/model/wifi-radio-energy-model.h +++ b/src/wifi/model/wifi-radio-energy-model.h @@ -15,15 +15,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Sidharth Nabar , He Wu + * Authors: Sidharth Nabar + * He Wu */ #ifndef WIFI_RADIO_ENERGY_MODEL_H #define WIFI_RADIO_ENERGY_MODEL_H #include "ns3/device-energy-model.h" -#include "ns3/nstime.h" -#include "ns3/event-id.h" #include "ns3/traced-value.h" #include "ns3/wifi-phy.h" diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index cd2055e8b..4d190bdca 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -18,19 +18,13 @@ * Author: Mathieu Lacage */ -#include #include "wifi-remote-station-manager.h" #include "ns3/simulator.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/tag.h" #include "ns3/boolean.h" -#include "ns3/double.h" -#include "ns3/uinteger.h" #include "ns3/enum.h" -#include "ns3/wifi-phy.h" -#include "ns3/wifi-mac.h" -#include "ns3/trace-source-accessor.h" +#include "wifi-mac.h" +#include "wifi-phy.h" #include "wifi-mac-header.h" #include "wifi-mac-trailer.h" diff --git a/src/wifi/model/wifi-remote-station-manager.h b/src/wifi/model/wifi-remote-station-manager.h index 94de085fd..51d222637 100644 --- a/src/wifi/model/wifi-remote-station-manager.h +++ b/src/wifi/model/wifi-remote-station-manager.h @@ -21,14 +21,10 @@ #ifndef WIFI_REMOTE_STATION_MANAGER_H #define WIFI_REMOTE_STATION_MANAGER_H -#include -#include -#include "ns3/mac48-address.h" #include "ns3/traced-callback.h" #include "ns3/packet.h" #include "ns3/object.h" #include "ns3/nstime.h" -#include "wifi-mode.h" #include "wifi-tx-vector.h" #include "ht-capabilities.h" #include "vht-capabilities.h" diff --git a/src/wifi/model/wifi-spectrum-phy-interface.cc b/src/wifi/model/wifi-spectrum-phy-interface.cc index 9a1b3bb7d..3e9a42f6d 100644 --- a/src/wifi/model/wifi-spectrum-phy-interface.cc +++ b/src/wifi/model/wifi-spectrum-phy-interface.cc @@ -18,17 +18,8 @@ * Author: Nicola Baldo */ -#include -#include -#include -#include -#include -#include -#include #include #include -#include - #include "wifi-spectrum-phy-interface.h" #include "spectrum-wifi-phy.h" diff --git a/src/wifi/model/wifi-spectrum-phy-interface.h b/src/wifi/model/wifi-spectrum-phy-interface.h index 3ad5c7b29..56eddcbca 100644 --- a/src/wifi/model/wifi-spectrum-phy-interface.h +++ b/src/wifi/model/wifi-spectrum-phy-interface.h @@ -17,11 +17,10 @@ * * Author: Nicola Baldo */ + #ifndef WIFI_SPECTRUM_PHY_INTERFACE_H #define WIFI_SPECTRUM_PHY_INTERFACE_H -#include -#include #include namespace ns3 { diff --git a/src/wifi/model/wifi-spectrum-signal-parameters.cc b/src/wifi/model/wifi-spectrum-signal-parameters.cc index b948881f4..012a981dc 100644 --- a/src/wifi/model/wifi-spectrum-signal-parameters.cc +++ b/src/wifi/model/wifi-spectrum-signal-parameters.cc @@ -21,7 +21,6 @@ #include #include -#include #include "wifi-spectrum-signal-parameters.h" namespace ns3 { diff --git a/src/wifi/model/wifi-tx-current-model.cc b/src/wifi/model/wifi-tx-current-model.cc index 2cbe52998..953346075 100644 --- a/src/wifi/model/wifi-tx-current-model.cc +++ b/src/wifi/model/wifi-tx-current-model.cc @@ -20,11 +20,8 @@ #include "wifi-tx-current-model.h" #include "ns3/log.h" -#include "ns3/boolean.h" #include "ns3/double.h" -#include "ns3/string.h" -#include "ns3/pointer.h" -#include +#include "wifi-utils.h" namespace ns3 { @@ -52,13 +49,6 @@ WifiTxCurrentModel::~WifiTxCurrentModel() { } -double -WifiTxCurrentModel::DbmToW (double dbm) -{ - double mW = std::pow (10.0, dbm / 10.0); - return mW / 1000.0; -} - // ------------------------------------------------------------------------- // NS_OBJECT_ENSURE_REGISTERED (LinearWifiTxCurrentModel); diff --git a/src/wifi/model/wifi-tx-current-model.h b/src/wifi/model/wifi-tx-current-model.h index a70943e22..c75731903 100644 --- a/src/wifi/model/wifi-tx-current-model.h +++ b/src/wifi/model/wifi-tx-current-model.h @@ -44,14 +44,6 @@ public: * \returns the transmit current (in Ampere) */ virtual double CalcTxCurrent (double txPowerDbm) const = 0; - - /** - * Convert from dBm to Watts. - * - * \param dbm the power in dBm - * \return the equivalent Watts for the given dBm - */ - static double DbmToW (double dbm); }; /** diff --git a/src/wifi/model/wifi-tx-vector.cc b/src/wifi/model/wifi-tx-vector.cc index bb909e84c..65fed799f 100644 --- a/src/wifi/model/wifi-tx-vector.cc +++ b/src/wifi/model/wifi-tx-vector.cc @@ -20,7 +20,6 @@ */ #include "ns3/wifi-tx-vector.h" -#include "ns3/fatal-error.h" namespace ns3 { diff --git a/src/wifi/model/wifi-tx-vector.h b/src/wifi/model/wifi-tx-vector.h index a0c7cbf26..caf84f087 100644 --- a/src/wifi/model/wifi-tx-vector.h +++ b/src/wifi/model/wifi-tx-vector.h @@ -24,7 +24,6 @@ #include #include -#include namespace ns3 { diff --git a/src/wifi/model/yans-error-rate-model.cc b/src/wifi/model/yans-error-rate-model.cc index dcf705e94..bfbc8e883 100644 --- a/src/wifi/model/yans-error-rate-model.cc +++ b/src/wifi/model/yans-error-rate-model.cc @@ -19,7 +19,6 @@ * Sébastien Deronne */ -#include #include "yans-error-rate-model.h" #include "wifi-phy.h" #include "ns3/log.h" diff --git a/src/wifi/model/yans-error-rate-model.h b/src/wifi/model/yans-error-rate-model.h index 0522940ab..07063ae60 100644 --- a/src/wifi/model/yans-error-rate-model.h +++ b/src/wifi/model/yans-error-rate-model.h @@ -21,8 +21,6 @@ #ifndef YANS_ERROR_RATE_MODEL_H #define YANS_ERROR_RATE_MODEL_H -#include -#include "wifi-mode.h" #include "error-rate-model.h" #include "dsss-error-rate-model.h" diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc index 5cf541112..addf3429b 100644 --- a/src/wifi/model/yans-wifi-channel.cc +++ b/src/wifi/model/yans-wifi-channel.cc @@ -18,14 +18,9 @@ * Author: Mathieu Lacage, */ -#include "ns3/packet.h" #include "ns3/simulator.h" -#include "ns3/mobility-model.h" -#include "ns3/net-device.h" -#include "ns3/node.h" #include "ns3/log.h" #include "ns3/pointer.h" -#include "ns3/object-factory.h" #include "yans-wifi-channel.h" #include "ns3/propagation-loss-model.h" #include "ns3/propagation-delay-model.h" diff --git a/src/wifi/model/yans-wifi-channel.h b/src/wifi/model/yans-wifi-channel.h index ddd339491..d3a495125 100644 --- a/src/wifi/model/yans-wifi-channel.h +++ b/src/wifi/model/yans-wifi-channel.h @@ -21,15 +21,8 @@ #ifndef YANS_WIFI_CHANNEL_H #define YANS_WIFI_CHANNEL_H -#include -#include -#include "ns3/packet.h" #include "wifi-channel.h" -#include "wifi-mode.h" -#include "wifi-preamble.h" -#include "wifi-tx-vector.h" #include "yans-wifi-phy.h" -#include "ns3/nstime.h" namespace ns3 { diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index 2ac109109..415d19654 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -22,12 +22,7 @@ #include "yans-wifi-phy.h" #include "yans-wifi-channel.h" -#include "wifi-phy-state-helper.h" -#include "ns3/simulator.h" -#include "ns3/packet.h" -#include "ns3/assert.h" #include "ns3/log.h" -#include "ns3/double.h" #include "wifi-utils.h" namespace ns3 { diff --git a/src/wifi/test/block-ack-test-suite.cc b/src/wifi/test/block-ack-test-suite.cc index 185f1089f..b098c6e46 100644 --- a/src/wifi/test/block-ack-test-suite.cc +++ b/src/wifi/test/block-ack-test-suite.cc @@ -22,7 +22,6 @@ #include "ns3/log.h" #include "ns3/qos-utils.h" #include "ns3/ctrl-headers.h" -#include using namespace ns3; diff --git a/src/wifi/test/power-rate-adaptation-test.cc b/src/wifi/test/power-rate-adaptation-test.cc index 19fe7c6e0..57eeb1b95 100644 --- a/src/wifi/test/power-rate-adaptation-test.cc +++ b/src/wifi/test/power-rate-adaptation-test.cc @@ -21,24 +21,9 @@ #include "ns3/wifi-net-device.h" #include "ns3/yans-wifi-channel.h" #include "ns3/adhoc-wifi-mac.h" -#include "ns3/yans-wifi-phy.h" -#include "ns3/parf-wifi-manager.h" -#include "ns3/propagation-delay-model.h" -#include "ns3/propagation-loss-model.h" -#include "ns3/error-rate-model.h" -#include "ns3/yans-error-rate-model.h" #include "ns3/constant-position-mobility-model.h" -#include "ns3/node.h" #include "ns3/simulator.h" #include "ns3/test.h" -#include "ns3/object-factory.h" -#include "ns3/dca-txop.h" -#include "ns3/mac-rx-middle.h" -#include "ns3/pointer.h" -#include "ns3/rng-seed-manager.h" -#include "ns3/edca-txop-n.h" -#include "ns3/config.h" -#include "ns3/boolean.h" using namespace ns3; diff --git a/src/wifi/test/spectrum-wifi-phy-test.cc b/src/wifi/test/spectrum-wifi-phy-test.cc index 0abe45abb..c9ae2fdc3 100644 --- a/src/wifi/test/spectrum-wifi-phy-test.cc +++ b/src/wifi/test/spectrum-wifi-phy-test.cc @@ -17,18 +17,13 @@ */ #include "ns3/test.h" -#include "ns3/packet.h" -#include "ns3/tag.h" -#include "ns3/packet-burst.h" #include "ns3/spectrum-wifi-helper.h" #include "ns3/wifi-spectrum-value-helper.h" #include "ns3/spectrum-wifi-phy.h" -#include "ns3/interference-helper.h" #include "ns3/nist-error-rate-model.h" #include "ns3/wifi-mac-header.h" #include "ns3/wifi-mac-trailer.h" #include "ns3/wifi-phy-tag.h" -#include "ns3/wifi-phy-standard.h" #include "ns3/wifi-spectrum-signal-parameters.h" using namespace ns3; diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc index b3ef9ddc2..393ccd05b 100644 --- a/src/wifi/test/tx-duration-test.cc +++ b/src/wifi/test/tx-duration-test.cc @@ -19,11 +19,8 @@ * Sébastien Deronne */ -#include #include #include -#include -#include "ns3/interference-helper.h" #include "ns3/yans-wifi-phy.h" using namespace ns3; diff --git a/src/wifi/test/wifi-aggregation-test.cc b/src/wifi/test/wifi-aggregation-test.cc index 33583c0d4..cf3bc7d5e 100644 --- a/src/wifi/test/wifi-aggregation-test.cc +++ b/src/wifi/test/wifi-aggregation-test.cc @@ -20,7 +20,6 @@ #include "ns3/string.h" #include "ns3/test.h" -#include "ns3/object-factory.h" #include "ns3/simulator.h" #include "ns3/wifi-mac-queue.h" #include "ns3/mac-low.h" @@ -28,11 +27,8 @@ #include "ns3/yans-wifi-phy.h" #include "ns3/mac-tx-middle.h" #include "ns3/dcf-manager.h" -#include "ns3/ampdu-tag.h" -#include "ns3/wifi-mac-trailer.h" #include "ns3/msdu-standard-aggregator.h" #include "ns3/mpdu-standard-aggregator.h" -#include "ns3/log.h" using namespace ns3; diff --git a/src/wifi/test/wifi-error-rate-models-test.cc b/src/wifi/test/wifi-error-rate-models-test.cc index 85c5cb346..3e8044c67 100644 --- a/src/wifi/test/wifi-error-rate-models-test.cc +++ b/src/wifi/test/wifi-error-rate-models-test.cc @@ -20,8 +20,6 @@ #include #include "ns3/test.h" -#include "ns3/dsss-error-rate-model.h" -#include "ns3/yans-error-rate-model.h" #include "ns3/nist-error-rate-model.h" using namespace ns3; diff --git a/src/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc index c494afff4..5aeb2753c 100644 --- a/src/wifi/test/wifi-test.cc +++ b/src/wifi/test/wifi-test.cc @@ -33,9 +33,7 @@ #include "ns3/pointer.h" #include "ns3/rng-seed-manager.h" #include "ns3/config.h" -#include "ns3/boolean.h" #include "ns3/string.h" -#include "ns3/packet-socket-address.h" #include "ns3/packet-socket-server.h" #include "ns3/packet-socket-client.h" #include "ns3/packet-socket-helper.h"