1 files changed, 51 insertions, 12 deletions

diff --git a/net/ns3/pkg-plist b/net/ns3/pkg-plist
index e54dffdc712e..853165801a86 100644
--- a/net/ns3/pkg-plist
+++ b/net/ns3/pkg-plist
@@ -24,6 +24,7 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-ping%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-raw-ip-socket%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-star%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-dhcp-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-double-probe-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-dsdv-manet%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-dsr%%DEBUG_SUFX%%
@@ -48,10 +49,10 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-gnuplot-helper-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-grid-animation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-hash-example%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-he-wifi-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-hello-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ht-wifi-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-icmpv6-redirect%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-ideal-wifi-manager-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-jakes-propagation-model-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-cqi-threshold%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-deactivate-bearer%%DEBUG_SUFX%%
@@ -93,10 +94,9 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-manet-routing-compare%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-matrix-topology%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-mesh%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-minstrel-ht-wifi-manager-example%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-mixed-bg-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-mixed-global-routing%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-mixed-wireless%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-mixed-network%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-mixed-wired-wireless%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-mobility-trace-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-multirate%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-nix-simple%%DEBUG_SUFX%%
@@ -104,6 +104,7 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-nms-p2p-nix%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ns2-mobility-trace%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-object-names%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-ofdm-he-validation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ofdm-ht-validation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ofdm-validation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ofdm-vht-validation%%DEBUG_SUFX%%
@@ -122,10 +123,13 @@ bin/ns%%VERSION%%-print-introspected-doxygen%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-realtime-udp-echo%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-red-tests%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-red-vs-ared%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-red-vs-fengadaptive%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-red-vs-nlred%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-resources-counters%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-rip-simple-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ripng-simple-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-rv-battery-model-test%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-sample-log-time-format%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable-stream%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-sample-simulator%%DEBUG_SUFX%%
@@ -157,7 +161,7 @@ bin/ns%%VERSION%%-print-introspected-doxygen%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-tcp-variants-comparison%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-test-interference-helper%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-test-ipv6%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-test-string-value-formatting
+%%EXAMPLES%%bin/ns%%VERSION%%-test-string-value-formatting%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-third-distributed%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-third%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-time-probe-example%%DEBUG_SUFX%%
@@ -179,20 +183,22 @@ bin/ns%%VERSION%%-print-introspected-doxygen%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-adhoc%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-aggregation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-ap%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-backward-compatibility%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-blockack%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-clear-channel-cmu%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-example-sim%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-hidden-terminal%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-wifi-phy-configuration
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-manager-example%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-multi-tos%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-phy-test%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc-grid%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-infra%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-interference%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-sleep%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-wifi-spectrum-per-example
-%%EXAMPLES%%bin/ns%%VERSION%%-wifi-spectrum-per-interference
-%%EXAMPLES%%bin/ns%%VERSION%%-wifi-spectrum-saturation-example
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-spectrum-per-example%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-spectrum-per-interference%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-spectrum-saturation-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-tcp%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-timing-attributes%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-wired-bridging%%DEBUG_SUFX%%
@@ -297,6 +303,7 @@ include/ns%%VERSION%%/ns3/callback.h
 include/ns%%VERSION%%/ns3/candidate-queue.h
 include/ns%%VERSION%%/ns3/capability-information.h
 include/ns%%VERSION%%/ns3/cara-wifi-manager.h
+include/ns%%VERSION%%/ns3/cc-helper.h
 include/ns%%VERSION%%/ns3/channel-coordinator.h
 include/ns%%VERSION%%/ns3/channel-list.h
 include/ns%%VERSION%%/ns3/channel-manager.h
@@ -307,6 +314,9 @@ include/ns%%VERSION%%/ns3/cid-factory.h
 include/ns%%VERSION%%/ns3/cid.h
 include/ns%%VERSION%%/ns3/codel-queue-disc.h
 include/ns%%VERSION%%/ns3/command-line.h
+include/ns%%VERSION%%/ns3/component-carrier-enb.h
+include/ns%%VERSION%%/ns3/component-carrier-ue.h
+include/ns%%VERSION%%/ns3/component-carrier.h
 include/ns%%VERSION%%/ns3/config-store-config.h
 include/ns%%VERSION%%/ns3/config-store-module.h
 include/ns%%VERSION%%/ns3/config-store.h
@@ -340,7 +350,7 @@ include/ns%%VERSION%%/ns3/data-output-interface.h
 include/ns%%VERSION%%/ns3/data-rate.h
 include/ns%%VERSION%%/ns3/dca-txop.h
 include/ns%%VERSION%%/ns3/dcf-manager.h
-include/ns%%VERSION%%/ns3/dcf.h
+include/ns%%VERSION%%/ns3/dcf-state.h
 include/ns%%VERSION%%/ns3/default-channel-scheduler.h
 include/ns%%VERSION%%/ns3/default-deleter.h
 include/ns%%VERSION%%/ns3/default-simulator-impl.h
@@ -349,6 +359,10 @@ include/ns%%VERSION%%/ns3/deprecated.h
 include/ns%%VERSION%%/ns3/des-metrics.h
 include/ns%%VERSION%%/ns3/device-energy-model-container.h
 include/ns%%VERSION%%/ns3/device-energy-model.h
+include/ns%%VERSION%%/ns3/dhcp-client.h
+include/ns%%VERSION%%/ns3/dhcp-header.h
+include/ns%%VERSION%%/ns3/dhcp-helper.h
+include/ns%%VERSION%%/ns3/dhcp-server.h
 include/ns%%VERSION%%/ns3/dl-mac-messages.h
 include/ns%%VERSION%%/ns3/dot11s-installer.h
 include/ns%%VERSION%%/ns3/dot11s-mac-header.h
@@ -407,6 +421,7 @@ include/ns%%VERSION%%/ns3/epc-x2.h
 include/ns%%VERSION%%/ns3/eps-bearer-tag.h
 include/ns%%VERSION%%/ns3/eps-bearer.h
 include/ns%%VERSION%%/ns3/erp-information.h
+include/ns%%VERSION%%/ns3/error-channel.h
 include/ns%%VERSION%%/ns3/error-model.h
 include/ns%%VERSION%%/ns3/error-rate-model.h
 include/ns%%VERSION%%/ns3/ethernet-header.h
@@ -438,6 +453,7 @@ include/ns%%VERSION%%/ns3/flow-monitor-module.h
 include/ns%%VERSION%%/ns3/flow-monitor.h
 include/ns%%VERSION%%/ns3/flow-probe.h
 include/ns%%VERSION%%/ns3/fq-codel-queue-disc.h
+include/ns%%VERSION%%/ns3/frame-capture-model.h
 include/ns%%VERSION%%/ns3/friis-spectrum-propagation-loss.h
 include/ns%%VERSION%%/ns3/gauss-markov-mobility-model.h
 include/ns%%VERSION%%/ns3/generic-phy.h
@@ -457,13 +473,14 @@ include/ns%%VERSION%%/ns3/hash-fnv.h
 include/ns%%VERSION%%/ns3/hash-function.h
 include/ns%%VERSION%%/ns3/hash-murmur3.h
 include/ns%%VERSION%%/ns3/hash.h
+include/ns%%VERSION%%/ns3/he-capabilities.h
 include/ns%%VERSION%%/ns3/header.h
 include/ns%%VERSION%%/ns3/heap-scheduler.h
 include/ns%%VERSION%%/ns3/hierarchical-mobility-model.h
 include/ns%%VERSION%%/ns3/higher-tx-tag.h
 include/ns%%VERSION%%/ns3/histogram.h
 include/ns%%VERSION%%/ns3/ht-capabilities.h
-include/ns%%VERSION%%/ns3/ht-operations.h
+include/ns%%VERSION%%/ns3/ht-operation.h
 include/ns%%VERSION%%/ns3/ht-wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/hwmp-protocol.h
 include/ns%%VERSION%%/ns3/hwmp-rtable.h
@@ -544,6 +561,7 @@ include/ns%%VERSION%%/ns3/ipv6-l3-protocol.h
 include/ns%%VERSION%%/ns3/ipv6-list-routing-helper.h
 include/ns%%VERSION%%/ns3/ipv6-list-routing.h
 include/ns%%VERSION%%/ns3/ipv6-option-header.h
+include/ns%%VERSION%%/ns3/ipv6-option.h
 include/ns%%VERSION%%/ns3/ipv6-packet-filter.h
 include/ns%%VERSION%%/ns3/ipv6-packet-info-tag.h
 include/ns%%VERSION%%/ns3/ipv6-packet-probe.h
@@ -590,10 +608,13 @@ include/ns%%VERSION%%/ns3/lte-anr-sap.h
 include/ns%%VERSION%%/ns3/lte-anr.h
 include/ns%%VERSION%%/ns3/lte-as-sap.h
 include/ns%%VERSION%%/ns3/lte-asn1-header.h
+include/ns%%VERSION%%/ns3/lte-ccm-mac-sap.h
+include/ns%%VERSION%%/ns3/lte-ccm-rrc-sap.h
 include/ns%%VERSION%%/ns3/lte-chunk-processor.h
 include/ns%%VERSION%%/ns3/lte-common.h
 include/ns%%VERSION%%/ns3/lte-control-messages.h
 include/ns%%VERSION%%/ns3/lte-enb-cmac-sap.h
+include/ns%%VERSION%%/ns3/lte-enb-component-carrier-manager.h
 include/ns%%VERSION%%/ns3/lte-enb-cphy-sap.h
 include/ns%%VERSION%%/ns3/lte-enb-mac.h
 include/ns%%VERSION%%/ns3/lte-enb-net-device.h
@@ -647,6 +668,8 @@ include/ns%%VERSION%%/ns3/lte-spectrum-phy.h
 include/ns%%VERSION%%/ns3/lte-spectrum-signal-parameters.h
 include/ns%%VERSION%%/ns3/lte-spectrum-value-helper.h
 include/ns%%VERSION%%/ns3/lte-stats-calculator.h
+include/ns%%VERSION%%/ns3/lte-ue-ccm-rrc-sap.h
+include/ns%%VERSION%%/ns3/lte-ue-component-carrier-manager.h
 include/ns%%VERSION%%/ns3/lte-ue-cmac-sap.h
 include/ns%%VERSION%%/ns3/lte-ue-cphy-sap.h
 include/ns%%VERSION%%/ns3/lte-ue-mac.h
@@ -689,18 +712,21 @@ include/ns%%VERSION%%/ns3/mpdu-standard-aggregator.h
 include/ns%%VERSION%%/ns3/mpi-interface.h
 include/ns%%VERSION%%/ns3/mpi-module.h
 include/ns%%VERSION%%/ns3/mpi-receiver.h
+include/ns%%VERSION%%/ns3/mq-queue-disc.h
 include/ns%%VERSION%%/ns3/msdu-aggregator.h
 include/ns%%VERSION%%/ns3/msdu-standard-aggregator.h
 include/ns%%VERSION%%/ns3/multi-model-spectrum-channel.h
 include/ns%%VERSION%%/ns3/names.h
 include/ns%%VERSION%%/ns3/ndisc-cache.h
 include/ns%%VERSION%%/ns3/net-device-container.h
+include/ns%%VERSION%%/ns3/net-device-queue-interface.h
 include/ns%%VERSION%%/ns3/net-device.h
 include/ns%%VERSION%%/ns3/netanim-module.h
 include/ns%%VERSION%%/ns3/network-module.h
 include/ns%%VERSION%%/ns3/nist-error-rate-model.h
 include/ns%%VERSION%%/ns3/nix-vector-routing-module.h
 include/ns%%VERSION%%/ns3/nix-vector.h
+include/ns%%VERSION%%/ns3/no-op-component-carrier-manager.h
 include/ns%%VERSION%%/ns3/no-op-handover-algorithm.h
 include/ns%%VERSION%%/ns3/node-container.h
 include/ns%%VERSION%%/ns3/node-list.h
@@ -788,10 +814,12 @@ include/ns%%VERSION%%/ns3/propagation-loss-model.h
 include/ns%%VERSION%%/ns3/propagation-module.h
 include/ns%%VERSION%%/ns3/pss-ff-mac-scheduler.h
 include/ns%%VERSION%%/ns3/ptr.h
+include/ns%%VERSION%%/ns3/qos-blocked-destinations.h
 include/ns%%VERSION%%/ns3/qos-utils.h
 include/ns%%VERSION%%/ns3/qos-wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/queue-disc-container.h
 include/ns%%VERSION%%/ns3/queue-disc.h
+include/ns%%VERSION%%/ns3/queue-item.h
 include/ns%%VERSION%%/ns3/queue-limits.h
 include/ns%%VERSION%%/ns3/queue.h
 include/ns%%VERSION%%/ns3/radio-bearer-stats-calculator.h
@@ -824,6 +852,7 @@ include/ns%%VERSION%%/ns3/rng-stream.h
 include/ns%%VERSION%%/ns3/rocketfuel-topology-reader.h
 include/ns%%VERSION%%/ns3/rr-ff-mac-scheduler.h
 include/ns%%VERSION%%/ns3/rraa-wifi-manager.h
+include/ns%%VERSION%%/ns3/rrpaa-wifi-manager.h
 include/ns%%VERSION%%/ns3/rtt-estimator.h
 include/ns%%VERSION%%/ns3/rv-battery-model-helper.h
 include/ns%%VERSION%%/ns3/rv-battery-model.h
@@ -837,12 +866,14 @@ include/ns%%VERSION%%/ns3/service-flow.h
 include/ns%%VERSION%%/ns3/sgi-hashmap.h
 include/ns%%VERSION%%/ns3/simple-channel.h
 include/ns%%VERSION%%/ns3/simple-device-energy-model.h
+include/ns%%VERSION%%/ns3/simple-frame-capture-model.h
 include/ns%%VERSION%%/ns3/simple-net-device-helper.h
 include/ns%%VERSION%%/ns3/simple-net-device.h
 include/ns%%VERSION%%/ns3/simple-ofdm-send-param.h
 include/ns%%VERSION%%/ns3/simple-ofdm-wimax-channel.h
 include/ns%%VERSION%%/ns3/simple-ofdm-wimax-phy.h
 include/ns%%VERSION%%/ns3/simple-ref-count.h
+include/ns%%VERSION%%/ns3/simple-ue-component-carrier-manager.h
 include/ns%%VERSION%%/ns3/simulation-singleton.h
 include/ns%%VERSION%%/ns3/simulator-impl.h
 include/ns%%VERSION%%/ns3/simulator.h
@@ -904,7 +935,13 @@ include/ns%%VERSION%%/ns3/tcp-htcp.h
 include/ns%%VERSION%%/ns3/tcp-hybla.h
 include/ns%%VERSION%%/ns3/tcp-illinois.h
 include/ns%%VERSION%%/ns3/tcp-l4-protocol.h
+include/ns%%VERSION%%/ns3/tcp-ledbat.h
 include/ns%%VERSION%%/ns3/tcp-option.h
+include/ns%%VERSION%%/ns3/tcp-option-rfc793.h
+include/ns%%VERSION%%/ns3/tcp-option-sack-permitted.h
+include/ns%%VERSION%%/ns3/tcp-option-sack.h
+include/ns%%VERSION%%/ns3/tcp-option-ts.h
+include/ns%%VERSION%%/ns3/tcp-option-winscale.h
 include/ns%%VERSION%%/ns3/tcp-rx-buffer.h
 include/ns%%VERSION%%/ns3/tcp-scalable.h
 include/ns%%VERSION%%/ns3/tcp-socket-base.h
@@ -990,6 +1027,7 @@ include/ns%%VERSION%%/ns3/valgrind.h
 include/ns%%VERSION%%/ns3/vector.h
 include/ns%%VERSION%%/ns3/vendor-specific-action.h
 include/ns%%VERSION%%/ns3/vht-capabilities.h
+include/ns%%VERSION%%/ns3/vht-operation.h
 include/ns%%VERSION%%/ns3/vht-wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/virtual-net-device-module.h
 include/ns%%VERSION%%/ns3/virtual-net-device.h
@@ -1008,7 +1046,6 @@ include/ns%%VERSION%%/ns3/waveform-generator.h
 include/ns%%VERSION%%/ns3/waypoint-mobility-model.h
 include/ns%%VERSION%%/ns3/waypoint.h
 include/ns%%VERSION%%/ns3/wifi-80211p-helper.h
-include/ns%%VERSION%%/ns3/wifi-channel.h
 include/ns%%VERSION%%/ns3/wifi-helper.h
 include/ns%%VERSION%%/ns3/wifi-information-element-vector.h
 include/ns%%VERSION%%/ns3/wifi-information-element.h
@@ -1033,6 +1070,7 @@ include/ns%%VERSION%%/ns3/wifi-spectrum-signal-parameters.h
 include/ns%%VERSION%%/ns3/wifi-spectrum-value-helper.h
 include/ns%%VERSION%%/ns3/wifi-tx-current-model.h
 include/ns%%VERSION%%/ns3/wifi-tx-vector.h
+include/ns%%VERSION%%/ns3/wifi-utils.h
 include/ns%%VERSION%%/ns3/wimax-channel.h
 include/ns%%VERSION%%/ns3/wimax-connection.h
 include/ns%%VERSION%%/ns3/wimax-helper.h
@@ -1070,6 +1108,7 @@ lib/libns%%VERSION%%-energy%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-flow-monitor-test%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-flow-monitor%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-internet-apps%%DEBUG_SUFX%%.so
+%%TEST%%lib/libns%%VERSION%%-internet-apps-test%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-internet-test%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-internet%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-lr-wpan-test%%DEBUG_SUFX%%.so