fix(build): fix includes for all feature combinations

Author: ZoltanBojthe

src/inet/networklayer/diffserv/DscpMarker.cc

@@ -8,6 +8,7 @@
 #include "inet/networklayer/diffserv/DscpMarker.h"
 
 #include "inet/common/ModuleAccess.h"
+#include "inet/common/ProtocolGroup.h"
 #include "inet/common/ProtocolTag_m.h"
 #include "inet/networklayer/diffserv/DiffservUtil.h"
 #include "inet/networklayer/diffserv/Dscp_m.h"

src/inet/transportlayer/tcp/TcpConnection.h

@@ -10,9 +10,9 @@
 #define __INET_TCPCONNECTION_H
 
 #include "inet/common/SimpleModule.h"
+#include "inet/networklayer/common/IcmpType_m.h"
+#include "inet/networklayer/common/Icmpv6Type_m.h"
 #include "inet/networklayer/common/L3Address.h"
-#include "inet/networklayer/ipv4/IcmpHeader_m.h"
-#include "inet/networklayer/icmpv6/Icmpv6Header_m.h"
 #include "inet/transportlayer/tcp/Tcp.h"
 #include "inet/transportlayer/tcp/TcpConnectionState_m.h"
 #include "inet/transportlayer/tcp_common/TcpHeader.h"

src/inet/transportlayer/tcp/TcpConnectionUtil.cc

@@ -16,10 +16,10 @@
 #include "inet/common/packet/Message.h"
 #include "inet/common/socket/SocketTag_m.h"
 #include "inet/networklayer/common/DscpTag_m.h"
+#include "inet/networklayer/common/IcmpType_m.h"
 #include "inet/networklayer/common/Icmpv4ErrorTag_m.h"
 #include "inet/networklayer/common/Icmpv6ErrorTag_m.h"
-#include "inet/networklayer/ipv4/IcmpHeader_m.h"
-#include "inet/networklayer/icmpv6/Icmpv6Header_m.h"
+#include "inet/networklayer/common/Icmpv6Type_m.h"
 #include "inet/networklayer/common/EcnTag_m.h"
 #include "inet/networklayer/common/FragmentationTag_m.h"
 #include "inet/networklayer/common/HopLimitTag_m.h"