diff --git a/src/wifi/model/rate-control/aarf-wifi-manager.h b/src/wifi/model/rate-control/aarf-wifi-manager.h
index dfd816697..785fdb426 100644
--- a/src/wifi/model/rate-control/aarf-wifi-manager.h
+++ b/src/wifi/model/rate-control/aarf-wifi-manager.h
@@ -53,20 +53,20 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   uint32_t m_minTimerThreshold;   ///< minimum timer threshold
   uint32_t m_minSuccessThreshold; ///< minimum success threshold
diff --git a/src/wifi/model/rate-control/aarfcd-wifi-manager.h b/src/wifi/model/rate-control/aarfcd-wifi-manager.h
index 6ecfd4119..8f4a4c114 100644
--- a/src/wifi/model/rate-control/aarfcd-wifi-manager.h
+++ b/src/wifi/model/rate-control/aarfcd-wifi-manager.h
@@ -55,12 +55,12 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
+                     double rxSnr, WifiMode txMode) override;
 
-  void DoReportRtsFailed (WifiRemoteStation *station);
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
   /**
    * It is important to realize that "recovery" mode starts after failure of
    * the first transmission after a rate increase and ends at the first successful
@@ -72,17 +72,17 @@ private:
    *
    * \param station the station that we failed to send Data
    */
-  void DoReportDataFailed (WifiRemoteStation *station);
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
   bool DoNeedRts (WifiRemoteStation *station,
-                  uint32_t size, bool normally);
+                  uint32_t size, bool normally) override;
 
   /**
    * Check if the use of RTS for the given station can be turned off.
diff --git a/src/wifi/model/rate-control/amrr-wifi-manager.h b/src/wifi/model/rate-control/amrr-wifi-manager.h
index 90ddd0389..4b1f006c0 100644
--- a/src/wifi/model/rate-control/amrr-wifi-manager.h
+++ b/src/wifi/model/rate-control/amrr-wifi-manager.h
@@ -56,20 +56,20 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   /**
    * Update the mode used to send to the given station.
diff --git a/src/wifi/model/rate-control/aparf-wifi-manager.h b/src/wifi/model/rate-control/aparf-wifi-manager.h
index 5596dc030..4f4329a5d 100644
--- a/src/wifi/model/rate-control/aparf-wifi-manager.h
+++ b/src/wifi/model/rate-control/aparf-wifi-manager.h
@@ -54,7 +54,7 @@ public:
   virtual ~AparfWifiManager ();
 
   // Inherited from WifiRemoteStationManager
-  void SetupPhy (const Ptr<WifiPhy> phy);
+  void SetupPhy (const Ptr<WifiPhy> phy) override;
 
   /**
    * Enumeration of the possible states of the channel.
@@ -69,20 +69,20 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   /** Check for initializations.
    *
diff --git a/src/wifi/model/rate-control/arf-wifi-manager.h b/src/wifi/model/rate-control/arf-wifi-manager.h
index 7f5fc6298..c9ec08ee8 100644
--- a/src/wifi/model/rate-control/arf-wifi-manager.h
+++ b/src/wifi/model/rate-control/arf-wifi-manager.h
@@ -59,20 +59,20 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   uint32_t m_timerThreshold;   ///< timer threshold
   uint32_t m_successThreshold; ///< success threshold
diff --git a/src/wifi/model/rate-control/cara-wifi-manager.h b/src/wifi/model/rate-control/cara-wifi-manager.h
index 6c57369b6..6c2ba89aa 100644
--- a/src/wifi/model/rate-control/cara-wifi-manager.h
+++ b/src/wifi/model/rate-control/cara-wifi-manager.h
@@ -55,22 +55,22 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
   bool DoNeedRts (WifiRemoteStation *station,
-                  uint32_t size, bool normally);
+                  uint32_t size, bool normally) override;
 
   uint32_t m_timerTimeout;     ///< timer threshold
   uint32_t m_successThreshold; ///< success threshold
diff --git a/src/wifi/model/rate-control/constant-rate-wifi-manager.h b/src/wifi/model/rate-control/constant-rate-wifi-manager.h
index acac00843..dfbf0182a 100644
--- a/src/wifi/model/rate-control/constant-rate-wifi-manager.h
+++ b/src/wifi/model/rate-control/constant-rate-wifi-manager.h
@@ -46,19 +46,19 @@ public:
 
 private:
   //overridden from base class
-  WifiRemoteStation* DoCreateStation (void) const;
+  WifiRemoteStation* DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   WifiMode m_dataMode; //!< Wifi mode for unicast Data frames
   WifiMode m_ctlMode;  //!< Wifi mode for RTS frames
diff --git a/src/wifi/model/rate-control/ideal-wifi-manager.h b/src/wifi/model/rate-control/ideal-wifi-manager.h
index 87c12cba5..8926110b4 100644
--- a/src/wifi/model/rate-control/ideal-wifi-manager.h
+++ b/src/wifi/model/rate-control/ideal-wifi-manager.h
@@ -54,27 +54,27 @@ public:
   IdealWifiManager ();
   virtual ~IdealWifiManager ();
 
-  void SetupPhy (const Ptr<WifiPhy> phy);
+  void SetupPhy (const Ptr<WifiPhy> phy) override;
 
 
 private:
   //overridden from base class
-  void DoInitialize (void);
-  WifiRemoteStation* DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation* DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
   void DoReportAmpduTxStatus (WifiRemoteStation *station, uint16_t nSuccessfulMpdus, uint16_t nFailedMpdus,
-                              double rxSnr, double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                              double rxSnr, double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   /**
    * Reset the station, invoked if the maximum amount of retries has failed.
diff --git a/src/wifi/model/rate-control/minstrel-ht-wifi-manager.h b/src/wifi/model/rate-control/minstrel-ht-wifi-manager.h
index 7085a4ef6..7f17d085d 100644
--- a/src/wifi/model/rate-control/minstrel-ht-wifi-manager.h
+++ b/src/wifi/model/rate-control/minstrel-ht-wifi-manager.h
@@ -212,23 +212,23 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
   void DoReportAmpduTxStatus (WifiRemoteStation *station, uint16_t nSuccessfulMpdus, uint16_t nFailedMpdus,
-                              double rxSnr, double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  bool DoNeedRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally);
+                              double rxSnr, double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  bool DoNeedRetransmission (WifiRemoteStation *st, Ptr<const Packet> packet, bool normally) override;
 
   /**
    * Check the validity of a combination of number of streams, chWidth and mode.
diff --git a/src/wifi/model/rate-control/minstrel-wifi-manager.h b/src/wifi/model/rate-control/minstrel-wifi-manager.h
index 0550c6e94..0821ce1f4 100644
--- a/src/wifi/model/rate-control/minstrel-wifi-manager.h
+++ b/src/wifi/model/rate-control/minstrel-wifi-manager.h
@@ -246,23 +246,23 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   bool DoNeedRetransmission (WifiRemoteStation *st,
-                                 Ptr<const Packet> packet, bool normally);
+                                 Ptr<const Packet> packet, bool normally) override;
 
 
   /**
diff --git a/src/wifi/model/rate-control/onoe-wifi-manager.h b/src/wifi/model/rate-control/onoe-wifi-manager.h
index 2fa57a692..1f3677210 100644
--- a/src/wifi/model/rate-control/onoe-wifi-manager.h
+++ b/src/wifi/model/rate-control/onoe-wifi-manager.h
@@ -57,20 +57,20 @@ public:
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   /**
    * Update the number of retry (both short and long).
diff --git a/src/wifi/model/rate-control/parf-wifi-manager.h b/src/wifi/model/rate-control/parf-wifi-manager.h
index b40e2e416..99239be51 100644
--- a/src/wifi/model/rate-control/parf-wifi-manager.h
+++ b/src/wifi/model/rate-control/parf-wifi-manager.h
@@ -52,25 +52,25 @@ public:
   virtual ~ParfWifiManager ();
 
   // Inherited from WifiRemoteStationManager
-  void SetupPhy (const Ptr<WifiPhy> phy);
+  void SetupPhy (const Ptr<WifiPhy> phy) override;
 
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
 
   /** Check for initializations.
    *
diff --git a/src/wifi/model/rate-control/rraa-wifi-manager.h b/src/wifi/model/rate-control/rraa-wifi-manager.h
index 6e87feb5c..53d2944a0 100644
--- a/src/wifi/model/rate-control/rraa-wifi-manager.h
+++ b/src/wifi/model/rate-control/rraa-wifi-manager.h
@@ -68,28 +68,28 @@ public:
   virtual ~RraaWifiManager ();
 
   // Inherited from WifiRemoteStationManager
-  virtual void SetupPhy (const Ptr<WifiPhy> phy);
-  virtual void SetupMac (const Ptr<WifiMac> mac);
+  void SetupPhy (const Ptr<WifiPhy> phy) override;
+  void SetupMac (const Ptr<WifiMac> mac) override;
 
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  WifiRemoteStation * DoCreateStation (void) const;
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
   void DoReportRxOk (WifiRemoteStation *station,
-                     double rxSnr, WifiMode txMode);
-  void DoReportRtsFailed (WifiRemoteStation *station);
-  void DoReportDataFailed (WifiRemoteStation *station);
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
   void DoReportRtsOk (WifiRemoteStation *station,
-                      double ctsSnr, WifiMode ctsMode, double rtsSnr);
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
   void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  void DoReportFinalDataFailed (WifiRemoteStation *station);
-  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
   bool DoNeedRts (WifiRemoteStation *st,
-                  uint32_t size, bool normally);
+                  uint32_t size, bool normally) override;
 
   /**
    * Check for initializations.
diff --git a/src/wifi/model/rate-control/rrpaa-wifi-manager.h b/src/wifi/model/rate-control/rrpaa-wifi-manager.h
index e4dc494af..21394ad97 100644
--- a/src/wifi/model/rate-control/rrpaa-wifi-manager.h
+++ b/src/wifi/model/rate-control/rrpaa-wifi-manager.h
@@ -83,8 +83,8 @@ public:
   virtual ~RrpaaWifiManager ();
 
   // Inherited from WifiRemoteStationManager
-  virtual void SetupPhy (const Ptr<WifiPhy> phy);
-  virtual void SetupMac (const Ptr<WifiMac> mac);
+  void SetupPhy (const Ptr<WifiPhy> phy) override;
+  void SetupMac (const Ptr<WifiMac> mac) override;
 
   /**
    * Assign a fixed random variable stream number to the random variables
@@ -95,26 +95,26 @@ public:
    *
    * \return the number of stream indices assigned by this model
    */
-  int64_t AssignStreams (int64_t stream);
+  int64_t AssignStreams (int64_t stream) override;
 
 private:
   // Overridden from base class.
-  void DoInitialize (void);
-  virtual WifiRemoteStation * DoCreateStation (void) const;
-  virtual void DoReportRxOk (WifiRemoteStation *station,
-                             double rxSnr, WifiMode txMode);
-  virtual void DoReportRtsFailed (WifiRemoteStation *station);
-  virtual void DoReportDataFailed (WifiRemoteStation *station);
-  virtual void DoReportRtsOk (WifiRemoteStation *station,
-                              double ctsSnr, WifiMode ctsMode, double rtsSnr);
-  virtual void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
-                               double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss);
-  virtual void DoReportFinalRtsFailed (WifiRemoteStation *station);
-  virtual void DoReportFinalDataFailed (WifiRemoteStation *station);
-  virtual WifiTxVector DoGetDataTxVector (WifiRemoteStation *station);
-  virtual WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station);
-  virtual bool DoNeedRts (WifiRemoteStation *st,
-                          uint32_t size, bool normally);
+  void DoInitialize (void) override;
+  WifiRemoteStation * DoCreateStation (void) const override;
+  void DoReportRxOk (WifiRemoteStation *station,
+                     double rxSnr, WifiMode txMode) override;
+  void DoReportRtsFailed (WifiRemoteStation *station) override;
+  void DoReportDataFailed (WifiRemoteStation *station) override;
+  void DoReportRtsOk (WifiRemoteStation *station,
+                      double ctsSnr, WifiMode ctsMode, double rtsSnr) override;
+  void DoReportDataOk (WifiRemoteStation *station, double ackSnr, WifiMode ackMode,
+                       double dataSnr, uint16_t dataChannelWidth, uint8_t dataNss) override;
+  void DoReportFinalRtsFailed (WifiRemoteStation *station) override;
+  void DoReportFinalDataFailed (WifiRemoteStation *station) override;
+  WifiTxVector DoGetDataTxVector (WifiRemoteStation *station) override;
+  WifiTxVector DoGetRtsTxVector (WifiRemoteStation *station) override;
+  bool DoNeedRts (WifiRemoteStation *st,
+                  uint32_t size, bool normally) override;
 
   /**
    * Check for initializations.