diff --git a/sys/include/net/gnrc/gomach/types.h b/sys/include/net/gnrc/gomach/types.h
index 8a0f0114d4cd105b0a6aa412c1ed1444290ec392..4f20bd45f763cb80a6cd5fe516825e6063880574 100644
--- a/sys/include/net/gnrc/gomach/types.h
+++ b/sys/include/net/gnrc/gomach/types.h
@@ -24,7 +24,6 @@
 
 #include "kernel_types.h"
 #include "xtimer.h"
-#include "net/gnrc.h"
 #include "net/gnrc/gomach/hdr.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/net/gnrc/mac/types.h b/sys/include/net/gnrc/mac/types.h
index c69b301436cadff480f6825262e26ebfe55137e9..0f77810770fd89526b5e9b01ea8ec416ecd34858 100644
--- a/sys/include/net/gnrc/mac/types.h
+++ b/sys/include/net/gnrc/mac/types.h
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 
 #include "kernel_types.h"
-#include "net/gnrc.h"
+#include "net/gnrc/pkt.h"
 #include "net/gnrc/priority_pktqueue.h"
 #include "net/ieee802154.h"
 #include "net/gnrc/mac/mac.h"
diff --git a/sys/net/gnrc/link_layer/lwmac/lwmac.c b/sys/net/gnrc/link_layer/lwmac/lwmac.c
index 402e20779955696f07ce322fd3b1f567b1226e41..646a059827266b78d86cb6628d86ed4408c7f625 100644
--- a/sys/net/gnrc/link_layer/lwmac/lwmac.c
+++ b/sys/net/gnrc/link_layer/lwmac/lwmac.c
@@ -29,6 +29,7 @@
 #include "random.h"
 #include "periph/rtt.h"
 #include "net/gnrc/netif.h"
+#include "net/gnrc/netif/hdr.h"
 #include "net/gnrc/netif/internal.h"
 #include "net/gnrc/netif/ieee802154.h"
 #include "net/netdev/ieee802154.h"
diff --git a/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.c b/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.c
index 31cc5870f0612eb365f53dc6dc951f6598f8e0ad..12edf0f7963196377a09df2560b386e9da80ec81 100644
--- a/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.c
+++ b/tests/unittests/tests-gnrc_mac_internal/tests-gnrc_mac_internal.c
@@ -15,7 +15,8 @@
 
 #include "embUnit.h"
 
-#include "net/gnrc/pkt.h"
+#include "net/gnrc/pktbuf.h"
+#include "net/gnrc/netif/hdr.h"
 #include "net/gnrc/mac/internal.h"
 
 #include "unittests-constants.h"