diff --git a/src/internet/model/tcp-congestion-ops.h b/src/internet/model/tcp-congestion-ops.h
index 10e251a59..4e74d8c2b 100644
--- a/src/internet/model/tcp-congestion-ops.h
+++ b/src/internet/model/tcp-congestion-ops.h
@@ -20,7 +20,6 @@
 #define TCPCONGESTIONOPS_H
 
 #include "ns3/tcp-socket-base.h"
-#include "ns3/tcp-recovery-ops.h"
 
 namespace ns3 {
 
diff --git a/src/internet/model/tcp-option-sack-permitted.cc b/src/internet/model/tcp-option-sack-permitted.cc
index 65e9d65f6..02b867179 100644
--- a/src/internet/model/tcp-option-sack-permitted.cc
+++ b/src/internet/model/tcp-option-sack-permitted.cc
@@ -24,6 +24,7 @@
 
 #include "tcp-option-sack-permitted.h"
 #include "ns3/log.h"
+#include "ns3/tcp-header.h"
 
 namespace ns3 {
 
diff --git a/src/internet/model/tcp-recovery-ops.h b/src/internet/model/tcp-recovery-ops.h
index 17ec648e1..ce23da0b3 100644
--- a/src/internet/model/tcp-recovery-ops.h
+++ b/src/internet/model/tcp-recovery-ops.h
@@ -25,7 +25,9 @@
 #include "ns3/object.h"
 
 namespace ns3 {
+
 class TcpSocketState;
+
 /**
  * \ingroup tcp
  * \defgroup recoveryOps Recovery Algorithms.
diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
index 7817f360e..ae8132bd6 100644
--- a/src/internet/model/tcp-socket-base.cc
+++ b/src/internet/model/tcp-socket-base.cc
@@ -48,6 +48,9 @@
 #include "ipv4-end-point.h"
 #include "ipv6-end-point.h"
 #include "ipv6-l3-protocol.h"
+#include "tcp-tx-buffer.h"
+#include "tcp-rx-buffer.h"
+#include "rtt-estimator.h"
 #include "tcp-header.h"
 #include "tcp-option-winscale.h"
 #include "tcp-option-ts.h"
diff --git a/src/internet/model/tcp-socket-base.h b/src/internet/model/tcp-socket-base.h
index 6ac18e80f..f9674977b 100644
--- a/src/internet/model/tcp-socket-base.h
+++ b/src/internet/model/tcp-socket-base.h
@@ -31,10 +31,6 @@
 #include "ns3/sequence-number.h"
 #include "ns3/data-rate.h"
 #include "ns3/node.h"
-#include "tcp-rx-buffer.h"
-#include "tcp-tx-buffer.h"
-#include "rtt-estimator.h"
-#include "tcp-l4-protocol.h"
 
 namespace ns3 {
 
@@ -1225,16 +1221,16 @@ protected:
   // Connections to other layers of TCP/IP
   Ipv4EndPoint*       m_endPoint  {nullptr}; //!< the IPv4 endpoint
   Ipv6EndPoint*       m_endPoint6 {nullptr}; //!< the IPv6 endpoint
-  Ptr<Node>           m_node      {nullptr}; //!< the associated node
-  Ptr<TcpL4Protocol>  m_tcp       {nullptr}; //!< the associated TCP L4 protocol
+  Ptr<Node>           m_node;                //!< the associated node
+  Ptr<TcpL4Protocol>  m_tcp;                 //!< the associated TCP L4 protocol
   Callback<void, Ipv4Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback;  //!< ICMP callback
   Callback<void, Ipv6Address,uint8_t,uint8_t,uint8_t,uint32_t> m_icmpCallback6; //!< ICMPv6 callback
 
-  Ptr<RttEstimator> m_rtt {nullptr}; //!< Round trip time estimator
+  Ptr<RttEstimator> m_rtt; //!< Round trip time estimator
 
   // Rx and Tx buffer management
-  Ptr<TcpRxBuffer> m_rxBuffer {nullptr}; //!< Rx buffer (reordering buffer)
-  Ptr<TcpTxBuffer> m_txBuffer {nullptr}; //!< Tx buffer
+  Ptr<TcpRxBuffer> m_rxBuffer; //!< Rx buffer (reordering buffer)
+  Ptr<TcpTxBuffer> m_txBuffer; //!< Tx buffer
 
   // State-related attributes
   TracedValue<TcpStates_t> m_state {CLOSED};         //!< TCP state
@@ -1271,9 +1267,9 @@ protected:
   bool                   m_limitedTx  {true}; //!< perform limited transmit
 
   // Transmission Control Block
-  Ptr<TcpSocketState>    m_tcb {nullptr};               //!< Congestion control informations
-  Ptr<TcpCongestionOps>  m_congestionControl {nullptr}; //!< Congestion control
-  Ptr<TcpRecoveryOps>    m_recoveryOps {nullptr};       //!< Recovery Algorithm
+  Ptr<TcpSocketState>    m_tcb;               //!< Congestion control informations
+  Ptr<TcpCongestionOps>  m_congestionControl; //!< Congestion control
+  Ptr<TcpRecoveryOps>    m_recoveryOps;       //!< Recovery Algorithm
 
   // Guesses over the other connection end
   bool m_isFirstPartialAck {true}; //!< First partial ACK during RECOVERY
diff --git a/src/internet/test/tcp-advertised-window-test.cc b/src/internet/test/tcp-advertised-window-test.cc
index 2f74c60b9..338e0fafa 100644
--- a/src/internet/test/tcp-advertised-window-test.cc
+++ b/src/internet/test/tcp-advertised-window-test.cc
@@ -22,6 +22,7 @@
 #include "ns3/log.h"
 #include "tcp-error-model.h"
 #include "ns3/random-variable-stream.h"
+#include "ns3/tcp-rx-buffer.h"
 
 using namespace ns3;
 
diff --git a/src/internet/test/tcp-datasentcb-test.cc b/src/internet/test/tcp-datasentcb-test.cc
index 74843cb88..075832c26 100644
--- a/src/internet/test/tcp-datasentcb-test.cc
+++ b/src/internet/test/tcp-datasentcb-test.cc
@@ -20,6 +20,7 @@
 #include "tcp-general-test.h"
 #include "ns3/node.h"
 #include "ns3/log.h"
+#include "ns3/tcp-header.h"
 
 using namespace ns3;
 
diff --git a/src/internet/test/tcp-general-test.cc b/src/internet/test/tcp-general-test.cc
index bbaa6ea06..03b18a67b 100644
--- a/src/internet/test/tcp-general-test.cc
+++ b/src/internet/test/tcp-general-test.cc
@@ -28,6 +28,11 @@
 #include "ns3/tcp-l4-protocol.h"
 #include "../model/ipv4-end-point.h"
 #include "../model/ipv6-end-point.h"
+#include "ns3/tcp-header.h"
+#include "ns3/tcp-tx-buffer.h"
+#include "ns3/tcp-rx-buffer.h"
+#include "ns3/rtt-estimator.h"
+
 #include "tcp-general-test.h"
 
 using namespace ns3;
diff --git a/src/internet/test/tcp-pkts-acked-test.cc b/src/internet/test/tcp-pkts-acked-test.cc
index 1e491405c..2b11b7cba 100644
--- a/src/internet/test/tcp-pkts-acked-test.cc
+++ b/src/internet/test/tcp-pkts-acked-test.cc
@@ -20,6 +20,7 @@
 #include "tcp-general-test.h"
 #include "ns3/node.h"
 #include "ns3/log.h"
+#include "ns3/tcp-header.h"
 
 using namespace ns3;
 
diff --git a/src/internet/test/tcp-rto-test.cc b/src/internet/test/tcp-rto-test.cc
index 0bff63e6f..42ed10990 100644
--- a/src/internet/test/tcp-rto-test.cc
+++ b/src/internet/test/tcp-rto-test.cc
@@ -21,6 +21,7 @@
 #include "ns3/log.h"
 #include "ns3/tcp-westwood.h"
 #include "ns3/simple-channel.h"
+#include "ns3/rtt-estimator.h"
 #include "tcp-general-test.h"
 #include "tcp-error-model.h"
 
diff --git a/src/internet/test/tcp-rtt-estimation.cc b/src/internet/test/tcp-rtt-estimation.cc
index 1bceef732..639196235 100644
--- a/src/internet/test/tcp-rtt-estimation.cc
+++ b/src/internet/test/tcp-rtt-estimation.cc
@@ -20,6 +20,7 @@
 #include "tcp-general-test.h"
 #include "ns3/node.h"
 #include "ns3/log.h"
+#include "ns3/rtt-estimator.h"
 #include "tcp-error-model.h"
 
 using namespace ns3;
diff --git a/src/internet/test/tcp-sack-permitted-test.cc b/src/internet/test/tcp-sack-permitted-test.cc
index c276ab755..e575f3f84 100644
--- a/src/internet/test/tcp-sack-permitted-test.cc
+++ b/src/internet/test/tcp-sack-permitted-test.cc
@@ -21,6 +21,7 @@
 #include "ns3/node.h"
 #include "ns3/log.h"
 #include "ns3/tcp-option-sack-permitted.h"
+#include "ns3/tcp-header.h"
 
 using namespace ns3;
 
diff --git a/src/internet/test/tcp-slow-start-test.cc b/src/internet/test/tcp-slow-start-test.cc
index 51fbf06c3..235e61b6d 100644
--- a/src/internet/test/tcp-slow-start-test.cc
+++ b/src/internet/test/tcp-slow-start-test.cc
@@ -22,6 +22,7 @@
 #include "ns3/node.h"
 #include "ns3/config.h"
 #include "ns3/tcp-westwood.h"
+#include "ns3/tcp-header.h"
 #include "tcp-general-test.h"
 
 using namespace ns3;
diff --git a/src/internet/test/tcp-timestamp-test.cc b/src/internet/test/tcp-timestamp-test.cc
index dcbac9144..0a226154d 100644
--- a/src/internet/test/tcp-timestamp-test.cc
+++ b/src/internet/test/tcp-timestamp-test.cc
@@ -21,6 +21,7 @@
 #include "ns3/node.h"
 #include "ns3/log.h"
 #include "ns3/tcp-option-ts.h"
+#include "ns3/tcp-header.h"
 
 using namespace ns3;
 
diff --git a/src/internet/test/tcp-wscaling-test.cc b/src/internet/test/tcp-wscaling-test.cc
index 0ff20bf02..3c2adc12d 100644
--- a/src/internet/test/tcp-wscaling-test.cc
+++ b/src/internet/test/tcp-wscaling-test.cc
@@ -21,6 +21,9 @@
 #include "tcp-general-test.h"
 #include "ns3/node.h"
 #include "ns3/log.h"
+#include "ns3/tcp-header.h"
+#include "ns3/tcp-tx-buffer.h"
+#include "ns3/tcp-rx-buffer.h"
 
 using namespace ns3;
 
diff --git a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc
index 93f0a609c..6334d8c93 100644
--- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc
+++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc
@@ -39,6 +39,7 @@
 #include "ns3/pointer.h"
 #include "ns3tcp-socket-writer.h"
 #include "ns3/tcp-westwood.h"
+#include "ns3/tcp-header.h"
 
 using namespace ns3;