diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
index 85d5f0629d..e5323646d5 100644
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@@ -1,5 +1,7 @@
 MODULE =cc110x
 
+INCLUDES += -I$(RIOTBASE)/sys/net
+
 include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/net/destiny/Makefile b/sys/net/destiny/Makefile
index d8ff381522..e771aa3e96 100644
--- a/sys/net/destiny/Makefile
+++ b/sys/net/destiny/Makefile
@@ -1,4 +1,4 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net/destiny -I$(RIOTBASE)/sys/net/sixlowpan/include -I$(RIOTBASE)/sys/net/net_help/ -I$(RIOTBASE)/drivers/cc110x_ng/include
+INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net/destiny -I$(RIOTBASE)/sys/net/sixlowpan/include -I$(RIOTBASE)/sys/net/net_help/ -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc110x
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/net_help/Makefile b/sys/net/net_help/Makefile
index bb2381c4b3..158b6d764f 100644
--- a/sys/net/net_help/Makefile
+++ b/sys/net/net_help/Makefile
@@ -1,4 +1,4 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/net/sixlowpan/include
+INCLUDES += -I$(RIOTBASE)/sys/net/destiny/ -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/net/sixlowpan/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/net_help/inet_ntop.c b/sys/net/net_help/inet_ntop.c
index 62627a6666..0221ae214d 100644
--- a/sys/net/net_help/inet_ntop.c
+++ b/sys/net/net_help/inet_ntop.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "sys/net/destiny/socket.h"
+#include "socket.h"
 
 #include "inet_ntop.h"
 
diff --git a/sys/net/net_help/inet_pton.c b/sys/net/net_help/inet_pton.c
index c5cdfc858c..baf812a0da 100644
--- a/sys/net/net_help/inet_pton.c
+++ b/sys/net/net_help/inet_pton.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "sys/net/destiny/socket.h"
+#include "socket.h"
 
 #include "inet_pton.h"
 
diff --git a/sys/net/net_help/msg_help.c b/sys/net/net_help/msg_help.c
index adcd924d6b..e12840d466 100644
--- a/sys/net/net_help/msg_help.c
+++ b/sys/net/net_help/msg_help.c
@@ -8,7 +8,7 @@
 #include <thread.h>
 #include <stdio.h>
 #include "msg_help.h"
-#include "sys/net/destiny/tcp_timer.h"
+#include "tcp_timer.h"
 
 void block_continue_thread(void)
 {
diff --git a/sys/net/rpl/Makefile b/sys/net/rpl/Makefile
index 941cd80919..84125a4221 100644
--- a/sys/net/rpl/Makefile
+++ b/sys/net/rpl/Makefile
@@ -1,4 +1,4 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include  -I$(RIOTBASE)/sys/net/sixlowpan/include
+INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include  -I$(RIOTBASE)/sys/net/sixlowpan/include -I$(RIOTBASE)/sys/net/ieee802154/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/rpl/trickle.c b/sys/net/rpl/trickle.c
index c090733459..baa0e1d656 100644
--- a/sys/net/rpl/trickle.c
+++ b/sys/net/rpl/trickle.c
@@ -22,7 +22,7 @@
 #include <math.h>
 #include "inttypes.h"
 #include "trickle.h"
-#include "rpl/rpl.h"
+#include "rpl.h"
 
 //TODO in pointer umwandeln, speicher mit malloc holen
 char *timer_over_buf;
diff --git a/sys/net/sixlowpan/Makefile b/sys/net/sixlowpan/Makefile
index c0697060a0..964127929a 100644
--- a/sys/net/sixlowpan/Makefile
+++ b/sys/net/sixlowpan/Makefile
@@ -1,4 +1,4 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/sixlowpan/include/
+INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/sixlowpan/include/ -I$(RIOTBASE)/sys/net/ieee802154/include -I$(RIOTBASE)/sys/net/net_help
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/sixlowpan/border.c b/sys/net/sixlowpan/border.c
index d07201d343..bb850bd131 100644
--- a/sys/net/sixlowpan/border.c
+++ b/sys/net/sixlowpan/border.c
@@ -35,7 +35,7 @@
 #include "icmp.h"
 #include "serialnumber.h"
 
-#include "sys/net/net_help/net_help.h"
+#include "net_help.h"
 
 #define READER_STACK_SIZE   (KERNEL_CONF_STACKSIZE_DEFAULT)
 
diff --git a/sys/net/sixlowpan/icmp.c b/sys/net/sixlowpan/icmp.c
index 5c81040e5c..2190ae8980 100644
--- a/sys/net/sixlowpan/icmp.c
+++ b/sys/net/sixlowpan/icmp.c
@@ -32,7 +32,7 @@
 #include "icmp.h"
 #include "lowpan.h"
 #include "serialnumber.h"
-#include "sys/net/net_help/net_help.h"
+#include "net_help.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/sys/net/sixlowpan/ip.c b/sys/net/sixlowpan/ip.c
index d419b8d52f..efc0648125 100644
--- a/sys/net/sixlowpan/ip.c
+++ b/sys/net/sixlowpan/ip.c
@@ -31,9 +31,8 @@
 #include "icmp.h"
 #include "lowpan.h"
 
-#include "sys/net/destiny/socket.h"
-#include "sys/net/net_help/net_help.h"
-#include "sys/net/net_help/msg_help.h"
+#include "net_help.h"
+#include "msg_help.h"
 
 #define IP_PKT_RECV_BUF_SIZE        (64)
 #define LLHDR_IPV6HDR_LEN           (LL_HDR_LEN + IPV6_HDR_LEN)
diff --git a/sys/net/sixlowpan/lowpan.c b/sys/net/sixlowpan/lowpan.c
index a54d567101..81fdcd4db0 100644
--- a/sys/net/sixlowpan/lowpan.c
+++ b/sys/net/sixlowpan/lowpan.c
@@ -40,9 +40,8 @@
 #include "ip.h"
 #include "icmp.h"
 
-#include "sys/net/ieee802154/ieee802154_frame.h"
-#include "sys/net/destiny/in.h"
-#include "sys/net/net_help/net_help.h"
+#include "ieee802154_frame.h"
+#include "net_help.h"
 
 #define IP_PROCESS_STACKSIZE           	(KERNEL_CONF_STACKSIZE_DEFAULT * 6)
 #define NC_STACKSIZE                   	(KERNEL_CONF_STACKSIZE_DEFAULT)
diff --git a/sys/net/sixlowpan/mac.c b/sys/net/sixlowpan/mac.c
index d2bed0893a..63534d2a3f 100644
--- a/sys/net/sixlowpan/mac.c
+++ b/sys/net/sixlowpan/mac.c
@@ -36,8 +36,8 @@
 #include "ip.h"
 #include "icmp.h"
 #include "lowpan.h"
-#include "sys/net/ieee802154/ieee802154_frame.h"
-#include "sys/net/net_help/net_help.h"
+#include "ieee802154_frame.h"
+#include "net_help.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"