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;