tcp: (merges !180) Use forward declaration wherever possible

src/internet/model/tcp-congestion-ops.h

@@ -19,8 +19,8 @@
 #ifndef TCPCONGESTIONOPS_H
 #define TCPCONGESTIONOPS_H
 
-#include "ns3/tcp-socket-state.h"
-#include "ns3/tcp-rate-ops.h"
+#include "tcp-rate-ops.h"
+#include "tcp-socket-state.h"
 
 namespace ns3 {
 

src/internet/model/tcp-highspeed.cc

@@ -18,6 +18,8 @@
  */
 
 #include "tcp-highspeed.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-highspeed.h

@@ -20,11 +20,12 @@
 #ifndef TCPHIGHSPEED_H
 #define TCPHIGHSPEED_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-htcp.h

@@ -27,11 +27,12 @@
 #ifndef TCP_HTCP_H
 #define TCP_HTCP_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-hybla.cc

@@ -18,8 +18,9 @@
  */
 
 #include "tcp-hybla.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
-#include "ns3/tcp-socket-base.h"
 
 namespace ns3 {
 

src/internet/model/tcp-hybla.h

@@ -19,12 +19,13 @@
 #ifndef TCPHYBLA_H
 #define TCPHYBLA_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 #include "ns3/traced-value.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-illinois.cc

@@ -27,6 +27,8 @@
 
 
 #include "tcp-illinois.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-illinois.h

@@ -28,11 +28,12 @@
 #ifndef TCPILLINOIS_H
 #define TCPILLINOIS_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-ledbat.cc

@@ -20,8 +20,10 @@
  */
 
 #include "tcp-ledbat.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
-#include "ns3/simulator.h"
+#include "ns3/simulator.h" // Now ()
 
 namespace ns3 {
 

src/internet/model/tcp-ledbat.h

@@ -22,12 +22,14 @@
 #ifndef TCP_LEDBAT_H
 #define TCP_LEDBAT_H
 
+#include "tcp-congestion-ops.h"
+
 #include <vector>
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-lp.cc

@@ -22,8 +22,9 @@
  */
 
 #include "tcp-lp.h"
-#include "ns3/tcp-socket-base.h"
+
 #include "ns3/log.h"
+#include "ns3/simulator.h"
 
 namespace ns3 {
 

src/internet/model/tcp-lp.h

@@ -24,12 +24,14 @@
 #ifndef TCPLP_H
 #define TCPLP_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
+
 #include "ns3/traced-value.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 class TcpLp : public TcpNewReno
 {
 public:

src/internet/model/tcp-prr-recovery.cc

@@ -22,7 +22,8 @@
  */
 
 #include "tcp-prr-recovery.h"
-#include "ns3/tcp-congestion-ops.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-recovery-ops.cc

@@ -22,6 +22,7 @@
  */
 #include "tcp-recovery-ops.h"
 #include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-scalable.cc

@@ -28,6 +28,8 @@
  */
 
 #include "tcp-scalable.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-scalable.h

@@ -30,11 +30,12 @@
 #ifndef TCPSCALABLE_H
 #define TCPSCALABLE_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-vegas.cc

@@ -25,6 +25,8 @@
  */
 
 #include "tcp-vegas.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-vegas.h

@@ -27,11 +27,12 @@
 #ifndef TCPVEGAS_H
 #define TCPVEGAS_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *

src/internet/model/tcp-veno.cc

@@ -25,6 +25,8 @@
  */
 
 #include "tcp-veno.h"
+#include "tcp-socket-state.h"
+
 #include "ns3/log.h"
 
 namespace ns3 {

src/internet/model/tcp-veno.h

@@ -27,11 +27,12 @@
 #ifndef TCPVENO_H
 #define TCPVENO_H
 
-#include "ns3/tcp-congestion-ops.h"
-#include "ns3/tcp-recovery-ops.h"
+#include "tcp-congestion-ops.h"
 
 namespace ns3 {
 
+class TcpSocketState;
+
 /**
  * \ingroup congestionOps
  *