wifi: Remove unnecessary includes

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 <fstream>
-#include <vector>
-#include <cmath>
 
 using namespace ns3;
 

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.

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.

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 <fstream>
-#include <string>
 #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"

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 <iostream>
-#include <fstream>
 
 using namespace ns3;
 

examples/wireless/ofdm-ht-validation.cc

@@ -26,10 +26,6 @@
 #include "ns3/nist-error-rate-model.h"
 #include "ns3/gnuplot.h"
 
-#include <fstream>
-#include <vector>
-#include <cmath>
-
 using namespace ns3;
 
 int main (int argc, char *argv[])

examples/wireless/ofdm-validation.cc

@@ -28,10 +28,6 @@
 #include "ns3/nist-error-rate-model.h"
 #include "ns3/gnuplot.h"
 
-#include <fstream>
-#include <vector>
-#include <cmath>
-
 using namespace ns3;
 
 int main (int argc, char *argv[])

examples/wireless/ofdm-vht-validation.cc

@@ -27,10 +27,6 @@
 #include "ns3/nist-error-rate-model.h"
 #include "ns3/gnuplot.h"
 
-#include <fstream>
-#include <vector>
-#include <cmath>
-
 using namespace ns3;
 
 int main (int argc, char *argv[])

examples/wireless/power-adaptation-distance.cc

@@ -85,18 +85,12 @@
  * \endcode
  */
 
-#include <sstream>
-#include <fstream>
-#include <math.h>
-
 #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;

examples/wireless/power-adaptation-interference.cc

@@ -55,11 +55,7 @@
  * \endcode
  */
 
-#include <sstream>
-#include <fstream>
-
 #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"

examples/wireless/rate-adaptation-distance.cc

@@ -50,18 +50,12 @@
  * export NS_LOG=RateAdaptationDistance=level_info
  */
 
-#include <sstream>
-#include <fstream>
-#include <math.h>
-
 #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;

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.

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.

examples/wireless/wifi-adhoc.cc

@@ -25,8 +25,6 @@
 #include "ns3/stats-module.h"
 #include "ns3/wifi-module.h"
 
-#include <iostream>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("Main");

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.

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 <iostream>
 
 using namespace ns3;
 

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"

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 <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("Main");

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"

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 <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
 
 using namespace ns3;
 

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 <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhoc");

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 <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("WifiSimpleInfra");

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 <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference");

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 <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-#include <sstream>
-
 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),

examples/wireless/wifi-spectrum-per-example.cc

@@ -22,11 +22,9 @@
  *
  * Adapted from ht-wifi-network.cc example
  */
-#include <sstream>
-#include <iomanip>
 
+#include <iomanip>
 #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"

examples/wireless/wifi-spectrum-per-interference.cc

@@ -22,12 +22,9 @@
  *
  * Adapted from ht-wifi-network.cc example
  */
-#include <sstream>
-#include <iomanip>
 
+#include <iomanip>
 #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"

examples/wireless/wifi-spectrum-saturation-example.cc

@@ -22,12 +22,9 @@
  *
  * Adapted from ht-wifi-network.cc example
  */
-#include <sstream>
-#include <iomanip>
 
+#include <iomanip>
 #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"

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");

examples/wireless/wifi-timing-attributes.cc

@@ -17,12 +17,11 @@
  *
  * Authors: Sebastien Deronne <sebastien.deronne@gmail.com>
  */
+
 #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.

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 <vector>
-#include <stdint.h>
-#include <sstream>
-#include <fstream>
 
 using namespace ns3;
 

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 {

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 {
 

src/wave/model/vsa-manager.cc

@@ -16,9 +16,9 @@
  * Author: Junling Bu <linlinjavaer@gmail.com>
  */
 #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"

src/wave/model/wave-net-device.cc

@@ -18,11 +18,8 @@
  *         Junling Bu <linlinjavaer@gmail.com>
  */
 #include <algorithm>
-#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"

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 <cmath>
-#include <sstream>
-
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
 #include "ns3/wifi-module.h"

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;
 

src/wifi/examples/wifi-phy-configuration.cc

@@ -18,10 +18,8 @@
  * Author: Tom Henderson <tomh@tomh.org>
  */
 
-#include <string>
 #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

src/wifi/examples/wifi-phy-test.cc

@@ -18,23 +18,14 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#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;
 

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 <iomanip>
-#include <iostream>
 #include <fstream>
 
 namespace ns3 {

src/wifi/helper/athstats-helper.h

@@ -21,16 +21,9 @@
 #ifndef ATHSTATS_HELPER_H
 #define ATHSTATS_HELPER_H
 
-#include <string>
-#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 {
 

src/wifi/helper/spectrum-wifi-helper.cc

@@ -19,12 +19,8 @@
  *          Sébastien Deronne <sebastien.deronne@gmail.com>
  */
 
-#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"
 

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 {
 

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 {

src/wifi/helper/wifi-helper.h

@@ -23,12 +23,6 @@
 #ifndef WIFI_HELPER_H
 #define WIFI_HELPER_H
 
-#include <string>
-#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"

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 {
 

src/wifi/helper/wifi-mac-helper.h

@@ -21,8 +21,6 @@
 #ifndef WIFI_MAC_HELPER_H
 #define WIFI_MAC_HELPER_H
 
-#include <string>
-#include "ns3/attribute.h"
 #include "ns3/object-factory.h"
 
 namespace ns3 {

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 {

src/wifi/helper/yans-wifi-helper.cc

@@ -19,14 +19,10 @@
  *          Sébastien Deronne <sebastien.deronne@gmail.com>
  */
 
-#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"
 

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 {

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 <algorithm>
 
 #define Min(a,b) ((a < b) ? a : b)
 #define Max(a,b) ((a > b) ? a : 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 {
 

src/wifi/model/adhoc-wifi-mac.h

@@ -19,11 +19,11 @@
  * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  *          Mirko Banchi <mk.banchi@gmail.com>
  */
+
 #ifndef ADHOC_WIFI_MAC_H
 #define ADHOC_WIFI_MAC_H
 
 #include "regular-wifi-mac.h"
-#include "amsdu-subframe-header.h"
 
 namespace ns3 {
 

src/wifi/model/ampdu-subframe-header.cc

@@ -19,7 +19,6 @@
  */
 
 #include "ampdu-subframe-header.h"
-#include "ns3/address-utils.h"
 #include <iomanip>
 
 namespace ns3 {

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 {
 

src/wifi/model/ampdu-tag.cc

@@ -20,7 +20,6 @@
  */
 
 #include "ampdu-tag.h"
-#include "ns3/tag.h"
 #include "ns3/uinteger.h"
 
 namespace ns3 {

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
  *

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 {
 

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 {
 

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"

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)
 

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"
 

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 {
 

src/wifi/model/block-ack-manager.h

@@ -21,16 +21,12 @@
 #ifndef BLOCK_ACK_MANAGER_H
 #define BLOCK_ACK_MANAGER_H
 
-#include <map>
-#include <list>
-#include <deque>
-#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 <map>
 
 namespace ns3 {
 

src/wifi/model/capability-information.h

@@ -21,7 +21,6 @@
 #ifndef CAPABILITY_INFORMATION_H
 #define CAPABILITY_INFORMATION_H
 
-#include <stdint.h>
 #include "ns3/buffer.h"
 
 namespace ns3 {

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)
 

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)

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 <stdint.h>
 #include "wifi-remote-station-manager.h"
 
 namespace ns3 {

src/wifi/model/ctrl-headers.cc

@@ -18,7 +18,6 @@
  * Author: Mirko Banchi <mk.banchi@gmail.com>
  */
 
-#include "ns3/fatal-error.h"
 #include "ns3/log.h"
 #include "ctrl-headers.h"
 

src/wifi/model/dca-txop.cc

@@ -18,12 +18,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#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

src/wifi/model/dca-txop.h

@@ -21,13 +21,7 @@
 #ifndef DCA_TXOP_H
 #define DCA_TXOP_H
 
-#include <stdint.h>
-#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"
 

src/wifi/model/dcf-manager.cc

@@ -18,13 +18,9 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "ns3/assert.h"
 #include "ns3/log.h"
 #include "ns3/simulator.h"
-#include <cmath>
 #include "dcf-manager.h"
-#include "wifi-phy.h"
-#include "wifi-mac.h"
 #include "mac-low.h"
 
 #define MY_DEBUG(x) \

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 <vector>
 
 namespace ns3 {
 

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 <stdint.h>
 #ifdef HAVE_GSL
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_integration.h>

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 <cmath>
 
 namespace ns3 {
 

src/wifi/model/dsss-parameter-set.h

@@ -21,9 +21,6 @@
 #ifndef DSSS_PARAMETER_SET_H
 #define DSSS_PARAMETER_SET_H
 
-#include <stdint.h>
-#include <ostream>
-#include "ns3/buffer.h"
 #include "ns3/wifi-information-element.h"
 
 namespace ns3 {

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 <cmath>
 

src/wifi/model/edca-parameter-set.h

@@ -21,9 +21,6 @@
 #ifndef EDCA_PARAMETER_SET_H
 #define EDCA_PARAMETER_SET_H
 
-#include <stdint.h>
-#include <ostream>
-#include "ns3/buffer.h"
 #include "ns3/wifi-information-element.h"
 
 namespace ns3 {

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"
 

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 <map>
-#include <list>
 
 class AmpduAggregationTest;
 
@@ -52,7 +42,6 @@ class QosBlockedDestinations;
 class MsduAggregator;
 class MpduAggregator;
 class MgtAddBaResponseHeader;
-class BlockAckManager;
 class MgtDelBaHeader;
 
 /**

src/wifi/model/erp-information.cc

@@ -19,7 +19,6 @@
  */
 
 #include "erp-information.h"
-#include "ns3/assert.h"
 #include "ns3/log.h"
 
 namespace ns3 {

src/wifi/model/erp-information.h

@@ -21,9 +21,6 @@
 #ifndef ERP_INFORMATION_H
 #define ERP_INFORMATION_H
 
-#include <stdint.h>
-#include <ostream>
-#include "ns3/buffer.h"
 #include "ns3/wifi-information-element.h"
 
 namespace ns3 {

src/wifi/model/error-rate-model.h

@@ -21,8 +21,6 @@
 #ifndef ERROR_RATE_MODEL_H
 #define ERROR_RATE_MODEL_H
 
-#include <stdint.h>
-#include "wifi-mode.h"
 #include "wifi-tx-vector.h"
 #include "ns3/object.h"
 

src/wifi/model/ht-capabilities.cc

@@ -20,7 +20,6 @@
  */
 
 #include "ht-capabilities.h"
-#include "ns3/assert.h"
 #include "ns3/log.h"
 
 namespace ns3 {

src/wifi/model/ht-capabilities.h

@@ -22,9 +22,6 @@
 #ifndef HT_CAPABILITIES_H
 #define HT_CAPABILITIES_H
 
-#include <stdint.h>
-#include "ns3/buffer.h"
-#include "ns3/attribute-helper.h"
 #include "ns3/wifi-information-element.h"
 
 /**

src/wifi/model/ht-operations.cc

@@ -19,7 +19,6 @@
  */
 
 #include "ht-operations.h"
-#include "ns3/assert.h"
 #include "ns3/log.h"
 
 namespace ns3 {

src/wifi/model/ht-operations.h

@@ -21,9 +21,6 @@
 #ifndef HT_OPERATIONS_H
 #define HT_OPERATIONS_H
 
-#include <stdint.h>
-#include "ns3/buffer.h"
-#include "ns3/attribute-helper.h"
 #include "ns3/wifi-information-element.h"
 
 /**

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 <cmath>
 
 namespace ns3 {
 

src/wifi/model/ideal-wifi-manager.h

@@ -21,10 +21,7 @@
 #ifndef IDEAL_WIFI_MANAGER_H
 #define IDEAL_WIFI_MANAGER_H
 
-#include <stdint.h>
-#include <vector>
 #include "ns3/traced-value.h"
-#include "wifi-mode.h"
 #include "wifi-remote-station-manager.h"
 
 namespace ns3 {

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 <algorithm>

src/wifi/model/interference-helper.h

@@ -21,13 +21,7 @@
 #ifndef INTERFERENCE_HELPER_H
 #define INTERFERENCE_HELPER_H
 
-#include <stdint.h>
-#include <vector>
-#include <list>
-#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"
 

src/wifi/model/mac-low.cc

@@ -20,21 +20,12 @@
  *          Mirko Banchi <mk.banchi@gmail.com>
  */
 
-#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"
 

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 <mathieu.lacage@sophia.inria.fr>
- * Author: Mirko Banchi <mk.banchi@gmail.com>
+ * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *          Mirko Banchi <mk.banchi@gmail.com>
  */
+
 #ifndef MAC_LOW_H
 #define MAC_LOW_H
 
-#include <vector>
-#include <stdint.h>
-#include <ostream>
-#include <map>
-
-#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"
 

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 <list>
 
 namespace ns3 {
 

src/wifi/model/mac-rx-middle.h

@@ -22,9 +22,6 @@
 #define MAC_RX_MIDDLE_H
 
 #include <map>
-#include <utility>
-#include "ns3/callback.h"
-#include "ns3/mac48-address.h"
 #include "ns3/packet.h"
 
 namespace ns3 {

src/wifi/model/mac-tx-middle.cc

@@ -21,7 +21,6 @@
  *          Ghada Badawy <gbadawy@gmail.com>
  */
 
-#include "ns3/assert.h"
 #include "mac-tx-middle.h"
 #include "wifi-mac-header.h"
 

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 <mathieu.lacage@sophia.inria.fr>
- *         Mirko Banchi <mk.banchi@gmail.com>
+ * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ *          Mirko Banchi <mk.banchi@gmail.com>
  */
 
 #ifndef MAC_TX_MIDDLE_H
 #define MAC_TX_MIDDLE_H
 
-#include <stdint.h>
 #include <map>
 #include "ns3/mac48-address.h"
 

src/wifi/model/mgt-headers.cc

@@ -20,10 +20,8 @@
  *          Mirko Banchi <mk.banchi@gmail.com>
  */
 
-#include <sstream>
 #include "mgt-headers.h"
 #include "ns3/simulator.h"
-#include "ns3/assert.h"
 
 namespace ns3 {
 

src/wifi/model/mgt-headers.h

@@ -23,9 +23,6 @@
 #ifndef MGT_HEADERS_H
 #define MGT_HEADERS_H
 
-#include <stdint.h>
-
-#include "ns3/header.h"
 #include "status-code.h"
 #include "capability-information.h"
 #include "supported-rates.h"

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 <duy@soe.ucsc.edu>
- *         Ghada Badawy <gbadawy@gmail.com>
- *         Matias Richart <mrichart@fing.edu.uy>
+ * Authors: Duy Nguyen <duy@soe.ucsc.edu>
+ *          Ghada Badawy <gbadawy@gmail.com>
+ *          Matias Richart <mrichart@fing.edu.uy>
  *
  * 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 <vector>
+#include "wifi-mac.h"
+#include "wifi-phy.h"
 #include <iomanip>
-#include <fstream>
 
 #define Min(a,b) ((a < b) ? a : b)
 #define Max(a,b) ((a > b) ? a : 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 <duy@soe.ucsc.edu>
- *        Ghada Badawy <gbadawy@gmail.com>
- *        Matias Richart <mrichart@fing.edu.uy>
+ *Authors: Duy Nguyen <duy@soe.ucsc.edu>
+ *         Ghada Badawy <gbadawy@gmail.com>
+ *         Matias Richart <mrichart@fing.edu.uy>
  *
  * 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 <vector>
-#include <map>
-#include <deque>
 
 namespace ns3 {