From 4c318dde52be8b554f8f53395622b0cb9d59fba3 Mon Sep 17 00:00:00 2001
From: Eduardo Almeida <enmsa@outlook.pt>
Date: Sun, 11 Sep 2022 23:24:38 +0100
Subject: [PATCH] Fix missing includes

---
 src/buildings/test/buildings-shadowing-test.cc           | 1 +
 src/buildings/test/buildings-shadowing-test.h            | 6 +++++-
 src/internet-apps/model/dhcp-header.h                    | 3 +++
 src/internet/model/global-route-manager.h                | 2 ++
 src/internet/model/ipv6-autoconfigured-prefix.h          | 1 +
 src/lte/model/component-carrier-enb.h                    | 1 -
 src/lte/model/epc-mme-application.h                      | 3 ++-
 src/lte/model/epc-ue-nas.h                               | 3 +++
 src/lte/test/lte-test-carrier-aggregation.h              | 1 +
 src/lte/test/lte-test-cqi-generation.h                   | 1 +
 src/lte/test/lte-test-frequency-reuse.h                  | 6 ++++++
 src/lte/test/lte-test-interference.h                     | 1 +
 src/lte/test/lte-test-link-adaptation.h                  | 1 +
 src/lte/test/lte-test-mimo.h                             | 4 ++++
 src/lte/test/lte-test-pathloss-model.h                   | 1 +
 src/lte/test/lte-test-rlc-am-e2e.h                       | 5 +++++
 src/lte/test/lte-test-rlc-am-transmitter.h               | 3 +++
 src/lte/test/lte-test-rlc-um-e2e.h                       | 6 +++++-
 src/lte/test/lte-test-rlc-um-transmitter.h               | 3 +++
 src/lte/test/lte-test-uplink-power-control.h             | 9 +++++++++
 src/network/utils/bit-deserializer.h                     | 1 +
 src/network/utils/bit-serializer.h                       | 1 +
 src/network/utils/generic-phy.h                          | 1 +
 src/network/utils/packet-socket-client.h                 | 1 +
 src/network/utils/packet-socket-server.h                 | 1 +
 src/olsr/test/bug780-test.h                              | 4 ++++
 src/wave/model/channel-scheduler.h                       | 2 ++
 src/wifi/model/block-ack-manager.h                       | 1 +
 src/wifi/model/block-ack-window.h                        | 1 +
 src/wifi/model/frame-capture-model.h                     | 1 +
 src/wifi/model/interference-helper.h                     | 1 +
 src/wifi/model/non-ht/dsss-error-rate-model.h            | 2 ++
 .../model/rate-control/thompson-sampling-wifi-manager.h  | 2 +-
 src/wifi/model/txop.h                                    | 2 ++
 src/wimax/model/service-flow.h                           | 4 +++-
 35 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/src/buildings/test/buildings-shadowing-test.cc b/src/buildings/test/buildings-shadowing-test.cc
index 192cd8cf1..c8eefbe26 100644
--- a/src/buildings/test/buildings-shadowing-test.cc
+++ b/src/buildings/test/buildings-shadowing-test.cc
@@ -30,6 +30,7 @@
 #include <ns3/mobility-model.h>
 #include <ns3/mobility-building-info.h>
 #include <ns3/constant-position-mobility-model.h>
+#include <ns3/ptr.h>
 
 #include "buildings-shadowing-test.h"
 
diff --git a/src/buildings/test/buildings-shadowing-test.h b/src/buildings/test/buildings-shadowing-test.h
index 03fd33219..926549c20 100644
--- a/src/buildings/test/buildings-shadowing-test.h
+++ b/src/buildings/test/buildings-shadowing-test.h
@@ -21,9 +21,13 @@
 #ifndef BUILDINGS_SHADOWING_TEST_H
 #define BUILDINGS_SHADOWING_TEST_H
 
+#include "ns3/ptr.h"
 #include "ns3/test.h"
 
-
+namespace ns3
+{
+class MobilityModel;
+}
 
 using namespace ns3;
 
diff --git a/src/internet-apps/model/dhcp-header.h b/src/internet-apps/model/dhcp-header.h
index 251127b51..a3bfe1ed1 100644
--- a/src/internet-apps/model/dhcp-header.h
+++ b/src/internet-apps/model/dhcp-header.h
@@ -25,7 +25,10 @@
 #ifndef DHCP_HEADER_H
 #define DHCP_HEADER_H
 
+#include "ns3/address.h"
+#include "ns3/buffer.h"
 #include "ns3/header.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 
diff --git a/src/internet/model/global-route-manager.h b/src/internet/model/global-route-manager.h
index b8a8cca6f..6d9808857 100644
--- a/src/internet/model/global-route-manager.h
+++ b/src/internet/model/global-route-manager.h
@@ -22,6 +22,8 @@
 #ifndef GLOBAL_ROUTE_MANAGER_H
 #define GLOBAL_ROUTE_MANAGER_H
 
+#include <cstdint>
+
 namespace ns3 {
 
 /**
diff --git a/src/internet/model/ipv6-autoconfigured-prefix.h b/src/internet/model/ipv6-autoconfigured-prefix.h
index 067c6f411..f605e8c75 100644
--- a/src/internet/model/ipv6-autoconfigured-prefix.h
+++ b/src/internet/model/ipv6-autoconfigured-prefix.h
@@ -32,6 +32,7 @@
 
 namespace ns3
 {
+class Node;
 
 /**
  * \ingroup ipv6
diff --git a/src/lte/model/component-carrier-enb.h b/src/lte/model/component-carrier-enb.h
index 4c29f3e17..6f45b68b3 100644
--- a/src/lte/model/component-carrier-enb.h
+++ b/src/lte/model/component-carrier-enb.h
@@ -29,7 +29,6 @@
 #include "ns3/lte-phy.h"
 #include <ns3/lte-enb-phy.h>
 #include <ns3/pointer.h>
-//#include <ns3/lte-enb-mac.h>
 
 
 namespace ns3 {
diff --git a/src/lte/model/epc-mme-application.h b/src/lte/model/epc-mme-application.h
index 77204de04..de2d03c92 100644
--- a/src/lte/model/epc-mme-application.h
+++ b/src/lte/model/epc-mme-application.h
@@ -23,7 +23,8 @@
 
 #include "ns3/application.h"
 #include "ns3/socket.h"
-#include "ns3/epc-s1ap-sap.h"
+#include "epc-s1ap-sap.h"
+#include "epc-gtpc-header.h"
 
 namespace ns3 {
 
diff --git a/src/lte/model/epc-ue-nas.h b/src/lte/model/epc-ue-nas.h
index 5e1ee698d..7e95d0ce3 100644
--- a/src/lte/model/epc-ue-nas.h
+++ b/src/lte/model/epc-ue-nas.h
@@ -22,14 +22,17 @@
 #define EPC_UE_NAS_H
 
 
+#include "eps-bearer.h"
 #include <ns3/object.h>
 #include <ns3/lte-as-sap.h>
 #include <ns3/epc-tft-classifier.h>
+#include <ns3/traced-callback.h>
 
 namespace ns3 {
 
 
 class EpcHelper;
+class NetDevice;
 
 class EpcUeNas : public Object
 {
diff --git a/src/lte/test/lte-test-carrier-aggregation.h b/src/lte/test/lte-test-carrier-aggregation.h
index e3d4094a6..682cb1e38 100644
--- a/src/lte/test/lte-test-carrier-aggregation.h
+++ b/src/lte/test/lte-test-carrier-aggregation.h
@@ -22,6 +22,7 @@
 #ifndef TEST_CARRIER_AGGREGATION_H
 #define TEST_CARRIER_AGGREGATION_H
 
+#include "ns3/lte-common.h"
 #include "ns3/simulator.h"
 #include "ns3/test.h"
 #include "fcntl.h"
diff --git a/src/lte/test/lte-test-cqi-generation.h b/src/lte/test/lte-test-cqi-generation.h
index ecb038c77..f7848d20b 100644
--- a/src/lte/test/lte-test-cqi-generation.h
+++ b/src/lte/test/lte-test-cqi-generation.h
@@ -22,6 +22,7 @@
 #ifndef LTE_TEST_CQI_GENERATION_H
 #define LTE_TEST_CQI_GENERATION_H
 
+#include "ns3/lte-common.h"
 #include "ns3/test.h"
 
 using namespace ns3;
diff --git a/src/lte/test/lte-test-frequency-reuse.h b/src/lte/test/lte-test-frequency-reuse.h
index 722f97f92..98c6296fb 100644
--- a/src/lte/test/lte-test-frequency-reuse.h
+++ b/src/lte/test/lte-test-frequency-reuse.h
@@ -28,6 +28,12 @@
 
 #include "ns3/spectrum-test.h"
 #include "ns3/lte-spectrum-value-helper.h"
+#include "ns3/node.h"
+
+namespace ns3
+{
+class MobilityModel;
+}
 
 using namespace ns3;
 
diff --git a/src/lte/test/lte-test-interference.h b/src/lte/test/lte-test-interference.h
index 9ed45e024..bf910e2fc 100644
--- a/src/lte/test/lte-test-interference.h
+++ b/src/lte/test/lte-test-interference.h
@@ -22,6 +22,7 @@
 #ifndef LTE_TEST_INTERFERENCE_H
 #define LTE_TEST_INTERFERENCE_H
 
+#include "ns3/lte-common.h"
 #include "ns3/test.h"
 
 
diff --git a/src/lte/test/lte-test-link-adaptation.h b/src/lte/test/lte-test-link-adaptation.h
index 04b7647f9..9f4d9bd9a 100644
--- a/src/lte/test/lte-test-link-adaptation.h
+++ b/src/lte/test/lte-test-link-adaptation.h
@@ -21,6 +21,7 @@
 #ifndef LTE_TEST_LINK_ADAPTATION_H
 #define LTE_TEST_LINK_ADAPTATION_H
 
+#include "ns3/lte-common.h"
 #include "ns3/test.h"
 
 
diff --git a/src/lte/test/lte-test-mimo.h b/src/lte/test/lte-test-mimo.h
index 339916295..0b944ebae 100644
--- a/src/lte/test/lte-test-mimo.h
+++ b/src/lte/test/lte-test-mimo.h
@@ -24,6 +24,10 @@
 #include "ns3/simulator.h"
 #include "ns3/test.h"
 
+namespace ns3
+{
+class RadioBearerStatsCalculator;
+}
 
 using namespace ns3;
 
diff --git a/src/lte/test/lte-test-pathloss-model.h b/src/lte/test/lte-test-pathloss-model.h
index c7e576ada..3e441afc5 100644
--- a/src/lte/test/lte-test-pathloss-model.h
+++ b/src/lte/test/lte-test-pathloss-model.h
@@ -21,6 +21,7 @@
 #ifndef LTE_TEST_PATHLOSS_MODEL_H
 #define LTE_TEST_PATHLOSS_MODEL_H
 
+#include "ns3/lte-common.h"
 #include "ns3/spectrum-value.h"
 
 #include "ns3/test.h"
diff --git a/src/lte/test/lte-test-rlc-am-e2e.h b/src/lte/test/lte-test-rlc-am-e2e.h
index c1c41cc63..17a4a0e56 100644
--- a/src/lte/test/lte-test-rlc-am-e2e.h
+++ b/src/lte/test/lte-test-rlc-am-e2e.h
@@ -22,8 +22,13 @@
 #ifndef LTE_TEST_RLC_AM_E2E_H
 #define LTE_TEST_RLC_AM_E2E_H
 
+#include "ns3/ptr.h"
 #include "ns3/test.h"
 
+namespace ns3
+{
+class Packet;
+}
 
 using namespace ns3;
 
diff --git a/src/lte/test/lte-test-rlc-am-transmitter.h b/src/lte/test/lte-test-rlc-am-transmitter.h
index 965524962..17e1cc88e 100644
--- a/src/lte/test/lte-test-rlc-am-transmitter.h
+++ b/src/lte/test/lte-test-rlc-am-transmitter.h
@@ -21,6 +21,8 @@
 #ifndef LTE_TEST_RLC_AM_TRANSMITTER_H
 #define LTE_TEST_RLC_AM_TRANSMITTER_H
 
+#include "ns3/nstime.h"
+#include "ns3/ptr.h"
 #include "ns3/test.h"
 
 
@@ -29,6 +31,7 @@ namespace ns3 {
 class LteTestRrc;
 class LteTestMac;
 class LteTestPdcp;
+class LteRlc;
 
 }
 
diff --git a/src/lte/test/lte-test-rlc-um-e2e.h b/src/lte/test/lte-test-rlc-um-e2e.h
index f96e90b86..96ed38fbf 100644
--- a/src/lte/test/lte-test-rlc-um-e2e.h
+++ b/src/lte/test/lte-test-rlc-um-e2e.h
@@ -21,12 +21,16 @@
 #ifndef LTE_TEST_RLC_UM_E2E_H
 #define LTE_TEST_RLC_UM_E2E_H
 
+#include "ns3/ptr.h"
 #include "ns3/test.h"
 
+namespace ns3
+{
+class Packet;
+}
 
 using namespace ns3;
 
-
 /**
  * \ingroup lte-test
  * \ingroup tests
diff --git a/src/lte/test/lte-test-rlc-um-transmitter.h b/src/lte/test/lte-test-rlc-um-transmitter.h
index 20cb26096..5084c17a2 100644
--- a/src/lte/test/lte-test-rlc-um-transmitter.h
+++ b/src/lte/test/lte-test-rlc-um-transmitter.h
@@ -21,6 +21,8 @@
 #ifndef LTE_TEST_RLC_UM_TRANSMITTER_H
 #define LTE_TEST_RLC_UM_TRANSMITTER_H
 
+#include "ns3/nstime.h"
+#include "ns3/ptr.h"
 #include "ns3/test.h"
 
 namespace ns3 {
@@ -28,6 +30,7 @@ namespace ns3 {
 class LteTestRrc;
 class LteTestMac;
 class LteTestPdcp;
+class LteRlc;
 
 }
 
diff --git a/src/lte/test/lte-test-uplink-power-control.h b/src/lte/test/lte-test-uplink-power-control.h
index e3a13d43e..3eb26ed87 100644
--- a/src/lte/test/lte-test-uplink-power-control.h
+++ b/src/lte/test/lte-test-uplink-power-control.h
@@ -22,12 +22,21 @@
 #ifndef LTE_TEST_UPLINK_POWER_CONTROL_H
 #define LTE_TEST_UPLINK_POWER_CONTROL_H
 
+#include "ns3/nstime.h"
+#include "ns3/ptr.h"
 #include "ns3/spectrum-value.h"
 #include "ns3/spectrum-test.h"
 #include "ns3/test.h"
 
 using namespace ns3;
 
+namespace ns3
+{
+class LteFfrSimple;
+class LteUePowerControl;
+class MobilityModel;
+} // namespace ns3
+
 /**
  * \ingroup lte-test
  * \ingroup tests
diff --git a/src/network/utils/bit-deserializer.h b/src/network/utils/bit-deserializer.h
index bed63994d..d6354871b 100644
--- a/src/network/utils/bit-deserializer.h
+++ b/src/network/utils/bit-deserializer.h
@@ -21,6 +21,7 @@
 #ifndef BITDESERIALIZER_H_
 #define BITDESERIALIZER_H_
 
+#include <cstdint>
 #include <vector>
 #include <deque>
 
diff --git a/src/network/utils/bit-serializer.h b/src/network/utils/bit-serializer.h
index acaf1feaf..c41fe1dea 100644
--- a/src/network/utils/bit-serializer.h
+++ b/src/network/utils/bit-serializer.h
@@ -21,6 +21,7 @@
 #ifndef BITSERIALIZER_H_
 #define BITSERIALIZER_H_
 
+#include <cstdint>
 #include <vector>
 
 namespace ns3 {
diff --git a/src/network/utils/generic-phy.h b/src/network/utils/generic-phy.h
index 146e3be70..ea3af6a19 100644
--- a/src/network/utils/generic-phy.h
+++ b/src/network/utils/generic-phy.h
@@ -25,6 +25,7 @@
 
 namespace ns3 {
 
+class Packet;
 
 /**
  * This method allows the MAC to instruct the PHY to start a
diff --git a/src/network/utils/packet-socket-client.h b/src/network/utils/packet-socket-client.h
index 370e765e8..752300390 100644
--- a/src/network/utils/packet-socket-client.h
+++ b/src/network/utils/packet-socket-client.h
@@ -25,6 +25,7 @@
 #include "ns3/event-id.h"
 #include "ns3/ptr.h"
 #include "ns3/packet-socket-address.h"
+#include "ns3/traced-callback.h"
 
 namespace ns3 {
 
diff --git a/src/network/utils/packet-socket-server.h b/src/network/utils/packet-socket-server.h
index 691d83fb8..304ff4a91 100644
--- a/src/network/utils/packet-socket-server.h
+++ b/src/network/utils/packet-socket-server.h
@@ -25,6 +25,7 @@
 #include "ns3/event-id.h"
 #include "ns3/ptr.h"
 #include "ns3/packet-socket-address.h"
+#include "ns3/traced-callback.h"
 
 namespace ns3 {
 
diff --git a/src/olsr/test/bug780-test.h b/src/olsr/test/bug780-test.h
index d379a9e67..9499d0230 100644
--- a/src/olsr/test/bug780-test.h
+++ b/src/olsr/test/bug780-test.h
@@ -19,11 +19,15 @@
 #ifndef BUG780_TEST_H
 #define BUG780_TEST_H
 
+#include "ns3/ptr.h"
 #include "ns3/test.h"
 #include "ns3/nstime.h"
 #include "ns3/node-container.h"
 
 namespace ns3 {
+
+class Socket;
+
 namespace olsr {
 
 /**
diff --git a/src/wave/model/channel-scheduler.h b/src/wave/model/channel-scheduler.h
index 1cdf32ffc..5536da5d5 100644
--- a/src/wave/model/channel-scheduler.h
+++ b/src/wave/model/channel-scheduler.h
@@ -20,6 +20,8 @@
 
 #include <map>
 #include "wave-net-device.h"
+#include "ns3/qos-utils.h"
+
 namespace ns3 {
 class WaveNetDevice;
 
diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h
index 482ff4ea0..9f60103ae 100644
--- a/src/wifi/model/block-ack-manager.h
+++ b/src/wifi/model/block-ack-manager.h
@@ -23,6 +23,7 @@
 
 #include <map>
 #include "ns3/nstime.h"
+#include "ns3/object.h"
 #include "ns3/traced-callback.h"
 #include "wifi-mac-header.h"
 #include "originator-block-ack-agreement.h"
diff --git a/src/wifi/model/block-ack-window.h b/src/wifi/model/block-ack-window.h
index 4ff0e2b5d..a45c8186f 100644
--- a/src/wifi/model/block-ack-window.h
+++ b/src/wifi/model/block-ack-window.h
@@ -21,6 +21,7 @@
 #ifndef BLOCK_ACK_WINDOW_H
 #define BLOCK_ACK_WINDOW_H
 
+#include <cstdint>
 #include <vector>
 
 namespace ns3 {
diff --git a/src/wifi/model/frame-capture-model.h b/src/wifi/model/frame-capture-model.h
index 10f15f75e..6ad929339 100644
--- a/src/wifi/model/frame-capture-model.h
+++ b/src/wifi/model/frame-capture-model.h
@@ -21,6 +21,7 @@
 #ifndef FRAME_CAPTURE_MODEL_H
 #define FRAME_CAPTURE_MODEL_H
 
+#include "ns3/nstime.h"
 #include "ns3/object.h"
 
 namespace ns3 {
diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h
index 5dca1e608..7130f6905 100644
--- a/src/wifi/model/interference-helper.h
+++ b/src/wifi/model/interference-helper.h
@@ -22,6 +22,7 @@
 #define INTERFERENCE_HELPER_H
 
 #include "phy-entity.h"
+#include "ns3/object.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/non-ht/dsss-error-rate-model.h b/src/wifi/model/non-ht/dsss-error-rate-model.h
index 1090885d5..344a6cc7f 100644
--- a/src/wifi/model/non-ht/dsss-error-rate-model.h
+++ b/src/wifi/model/non-ht/dsss-error-rate-model.h
@@ -28,6 +28,8 @@
 #include <gsl/gsl_sf_bessel.h>
 #endif
 
+#include <cstdint>
+
 namespace ns3 {
 
 #ifdef HAVE_GSL
diff --git a/src/wifi/model/rate-control/thompson-sampling-wifi-manager.h b/src/wifi/model/rate-control/thompson-sampling-wifi-manager.h
index b988358dc..8b85c9616 100644
--- a/src/wifi/model/rate-control/thompson-sampling-wifi-manager.h
+++ b/src/wifi/model/rate-control/thompson-sampling-wifi-manager.h
@@ -22,7 +22,7 @@
 #define THOMPSON_SAMPLING_WIFI_MANAGER_H
 
 #include "ns3/random-variable-stream.h"
-
+#include "ns3/traced-value.h"
 #include "ns3/wifi-remote-station-manager.h"
 
 namespace ns3 {
diff --git a/src/wifi/model/txop.h b/src/wifi/model/txop.h
index e51fbfebb..4d9541598 100644
--- a/src/wifi/model/txop.h
+++ b/src/wifi/model/txop.h
@@ -21,6 +21,8 @@
 #ifndef TXOP_H
 #define TXOP_H
 
+#include "ns3/nstime.h"
+#include "ns3/object.h"
 #include "ns3/traced-value.h"
 #include "wifi-mac-header.h"
 #include <memory>
diff --git a/src/wimax/model/service-flow.h b/src/wimax/model/service-flow.h
index 434c225f7..ecb636190 100644
--- a/src/wimax/model/service-flow.h
+++ b/src/wimax/model/service-flow.h
@@ -22,15 +22,17 @@
 #ifndef SERVICE_FLOW_H
 #define SERVICE_FLOW_H
 
-#include <stdint.h>
+#include <cstdint>
 #include "wimax-phy.h"
 #include "wimax-connection.h"
+#include "wimax-mac-header.h"
 #include "cs-parameters.h"
 
 namespace ns3 {
 
 class ServiceFlowRecord;
 class WimaxConnection;
+class WimaxMacQueue;
 
 /**
  * \ingroup wimax