clean up wimax module test program includes and wscript

src/wimax/test/mac-messages-test.cc

@@ -18,26 +18,9 @@
  *         Mohamed Amine Ismail <amine.ismail@sophia.inria.fr>
  *
  */
-#include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
-#include "ns3/simulator.h"
-#include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
-#include "ns3/ipcs-classifier-record.h"
 #include "ns3/service-flow.h"
-#include <iostream>
+#include "ns3/mac-messages.h"
 
 using namespace ns3;
 /*

src/wimax/test/phy-test.cc

@@ -19,23 +19,12 @@
  *                              <amine.ismail@udcast.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
 #include "ns3/simulator.h"
+#include "ns3/node-container.h"
+#include "ns3/net-device-container.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
 #include "ns3/snr-to-block-error-rate-manager.h"
-#include <iostream>
 
 using namespace ns3;
 

src/wimax/test/qos-test.cc

@@ -19,22 +19,17 @@
  *                              <amine.ismail@udcast.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
+#include "ns3/simulator.h"
+#include "ns3/node-container.h"
+#include "ns3/wimax-helper.h"
+#include "ns3/net-device-container.h"
 #include "ns3/internet-stack-helper.h"
 #include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/simulator.h"
-#include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include <iostream>
-#include "ns3/global-route-manager.h"
+#include "ns3/ipv4-interface-container.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/service-flow.h"
+#include "ns3/ipcs-classifier-record.h"
 
 using namespace ns3;
 

src/wimax/test/ss-mac-test.cc

@@ -19,24 +19,11 @@
  *                              <amine.ismail@udcast.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
 #include "ns3/simulator.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include <iostream>
-#include "ns3/global-route-manager.h"
+#include "ns3/net-device-container.h"
+#include "ns3/node-container.h"
 
 using namespace ns3;
 

src/wimax/test/wimax-fragmentation-test.cc

@@ -19,26 +19,14 @@
  *                       <peppe.piro@gmail.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
+#include "ns3/ptr.h"
+#include "ns3/packet.h"
 #include "ns3/simulator.h"
-#include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
-#include "ns3/ipcs-classifier-record.h"
-#include "ns3/service-flow.h"
+#include "ns3/wimax-mac-header.h"
+#include "ns3/mac-messages.h"
+#include "ns3/cid.h"
 #include "ns3/wimax-connection.h"
-#include <iostream>
 
 using namespace ns3;
 

src/wimax/test/wimax-service-flow-test.cc

@@ -19,26 +19,16 @@
  *                              <amine.ismail@udcast.com>
  *
  */
-#include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
 #include "ns3/internet-stack-helper.h"
 #include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
+#include "ns3/ipv4-interface-container.h"
+#include "ns3/ipv4-address.h"
 #include "ns3/simulator.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
+#include "ns3/cs-parameters.h"
 #include "ns3/ipcs-classifier-record.h"
 #include "ns3/service-flow.h"
-#include <iostream>
 
 using namespace ns3;
 

src/wimax/test/wimax-tlv-test.cc

@@ -20,25 +20,14 @@
  *
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
-#include "ns3/simulator.h"
-#include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
 #include "ns3/ipcs-classifier-record.h"
+#include "ns3/ptr.h"
+#include "ns3/packet.h"
+#include "ns3/wimax-helper.h"
+#include "ns3/wimax-tlv.h"
 #include "ns3/service-flow.h"
-#include <iostream>
+#include "ns3/cs-parameters.h"
 
 using namespace ns3;
 

src/wimax/wscript

@@ -1,6 +1,6 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 def build(bld):
-    obj = bld.create_ns3_module('wimax', ['network', 'point-to-point', 'internet', 'propagation', 'mobility'])
+    obj = bld.create_ns3_module('wimax', ['network', 'internet', 'propagation', 'mobility'])
     obj.source = [
             'model/cid.cc',
             'model/cid-factory.cc',