diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h
index 1409cdaa2..7b1a97f42 100644
--- a/src/wifi/model/interference-helper.h
+++ b/src/wifi/model/interference-helper.h
@@ -21,7 +21,6 @@
 #ifndef INTERFERENCE_HELPER_H
 #define INTERFERENCE_HELPER_H
 
-#include "ns3/wifi-spectrum-value-helper.h"
 #include "phy-entity.h"
 
 namespace ns3 {
@@ -30,11 +29,6 @@ class WifiPpdu;
 class WifiPsdu;
 class ErrorRateModel;
 
-/**
- * A map of the received power (Watts) for each band
- */
-typedef std::map <WifiSpectrumBand, double> RxPowerWattPerChannelBand;
-
 /**
  * \ingroup wifi
  * \brief handles interference calculations
diff --git a/src/wifi/model/phy-entity.h b/src/wifi/model/phy-entity.h
index 3954a3a06..4fb22d750 100644
--- a/src/wifi/model/phy-entity.h
+++ b/src/wifi/model/phy-entity.h
@@ -27,20 +27,52 @@
 #include "wifi-tx-vector.h"
 #include "wifi-phy-band.h"
 #include "wifi-ppdu.h"
+#include "wifi-spectrum-signal-parameters.h"
+#include "wifi-mpdu-type.h"
 #include "ns3/event-id.h"
 #include "ns3/simple-ref-count.h"
 #include "ns3/nstime.h"
+#include "ns3/wifi-spectrum-value-helper.h"
 #include <list>
 #include <map>
 
 /**
  * \file
  * \ingroup wifi
- * Declaration of ns3::PhyEntity class.
+ * Declaration of:
+ * - ns3::PhyEntity class
+ * - ns3::SignalNoiseDbm, ns3::MpduInfo, and ns3::RxSignalInfo structs
+ * - ns3::RxPowerWattPerChannelBand typedef
  */
 
 namespace ns3 {
 
+/// SignalNoiseDbm structure
+struct SignalNoiseDbm
+{
+  double signal; ///< signal strength in dBm
+  double noise;  ///< noise power in dBm
+};
+
+/// MpduInfo structure
+struct MpduInfo
+{
+  MpduType type;          ///< type of MPDU
+  uint32_t mpduRefNumber; ///< MPDU ref number
+};
+
+/// RxSignalInfo structure containing info on the received signal
+struct RxSignalInfo
+{
+  double snr;  ///< SNR in linear scale
+  double rssi; ///< RSSI in dBm
+};
+
+/**
+ * A map of the received power (Watts) for each band
+ */
+typedef std::map <WifiSpectrumBand, double> RxPowerWattPerChannelBand;
+
 class WifiPsdu;
 class WifiPhy;
 class InterferenceHelper;
diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h
index b85c2e6a8..0bc3be832 100644
--- a/src/wifi/model/wifi-phy.h
+++ b/src/wifi/model/wifi-phy.h
@@ -27,7 +27,6 @@
 #include "interference-helper.h"
 #include "wifi-phy-state-helper.h"
 #include "wifi-ppdu.h"
-#include "wifi-spectrum-signal-parameters.h"
 #include "phy-entity.h"
 
 namespace ns3 {
@@ -41,21 +40,6 @@ class PreambleDetectionModel;
 class WifiRadioEnergyModel;
 class UniformRandomVariable;
 
-
-/// SignalNoiseDbm structure
-struct SignalNoiseDbm
-{
-  double signal; ///< in dBm
-  double noise; ///< in dBm
-};
-
-/// MpduInfo structure
-struct MpduInfo
-{
-  MpduType type; ///< type
-  uint32_t mpduRefNumber; ///< MPDU ref number
-};
-
 /// Parameters for received HE-SIG-A for OBSS_PD based SR
 struct HeSigAParameters
 {
@@ -63,13 +47,6 @@ struct HeSigAParameters
   uint8_t bssColor; ///< BSS color
 };
 
-/// RxSignalInfo structure containing info on the received signal
-struct RxSignalInfo
-{
-  double snr;  ///< SNR in linear scale
-  double rssi; ///< RSSI in dBm
-};
-
 /**
  * \brief 802.11 PHY layer model
  * \ingroup wifi