diff --git a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp.c b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp.c
index 273d3b3703..7e824ac976 100644
--- a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp.c
+++ b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp.c
@@ -19,7 +19,9 @@
 
 #include <errno.h>
 #include <utlist.h>
+#include <string.h>
 #include "net/af.h"
+#include "net/gnrc.h"
 #include "net/gnrc/tcp.h"
 #include "internal/common.h"
 #include "internal/fsm.h"
@@ -151,6 +153,9 @@ static int _gnrc_tcp_open(gnrc_tcp_tcb_t *tcb, char *target_addr, uint16_t targe
                 return -EINVAL;
             }
         }
+#else
+        /* Supress Compiler Warnings */
+        (void) target_addr;
 #endif
         /* Set port number to listen on */
         tcb->local_port = local_port;
diff --git a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c
index 85769f45a7..e8d8acce57 100644
--- a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c
+++ b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include "net/af.h"
 #include "net/tcp.h"
+#include "net/gnrc.h"
 #include "internal/common.h"
 #include "internal/pkt.h"
 #include "internal/fsm.h"
diff --git a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_fsm.c b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_fsm.c
index c877aa92fc..ffa8ad9595 100644
--- a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_fsm.c
+++ b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_fsm.c
@@ -17,8 +17,11 @@
  * @}
  */
 
+#include <utlist.h>
+#include <errno.h>
 #include "random.h"
 #include "net/af.h"
+#include "net/gnrc.h"
 #include "internal/common.h"
 #include "internal/pkt.h"
 #include "internal/option.h"
diff --git a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_pkt.c b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_pkt.c
index f9c99e45b0..c37a0040ce 100644
--- a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_pkt.c
+++ b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_pkt.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include "byteorder.h"
 #include "net/inet_csum.h"
-#include "net/gnrc/pktbuf.h"
+#include "net/gnrc.h"
 #include "internal/common.h"
 #include "internal/option.h"
 #include "internal/pkt.h"
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/fsm.h b/sys/net/gnrc/transport_layer/tcp/internal/fsm.h
index 5a076f9469..849eb85874 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/fsm.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/fsm.h
@@ -23,7 +23,7 @@
 #define FSM_H
 
 #include <stdint.h>
-#include "net/gnrc/pkt.h"
+#include "net/gnrc.h"
 #include "net/gnrc/tcp/tcb.h"
 
 #ifdef __cplusplus
diff --git a/sys/net/gnrc/transport_layer/tcp/internal/pkt.h b/sys/net/gnrc/transport_layer/tcp/internal/pkt.h
index e05397e9ab..9f0fc3f195 100644
--- a/sys/net/gnrc/transport_layer/tcp/internal/pkt.h
+++ b/sys/net/gnrc/transport_layer/tcp/internal/pkt.h
@@ -23,7 +23,7 @@
 #define PKT_H
 
 #include <stdint.h>
-#include "net/gnrc/pkt.h"
+#include "net/gnrc.h"
 #include "net/gnrc/tcp/tcb.h"
 
 #ifdef __cplusplus