diff --git a/sys/net/sixlowpan/border.c b/sys/net/sixlowpan/border.c
index 67ecd75cdaefad7b86d09ec9e4f4599feee4ee60..72ab711055fef251b61640ff47751364f1d5652b 100644
--- a/sys/net/sixlowpan/border.c
+++ b/sys/net/sixlowpan/border.c
@@ -25,6 +25,7 @@
 
 #include <posix_io.h>
 #include <board_uart0.h>
+#include "sixlowpan/error.h"
 
 #include "bordermultiplex.h"
 #include "flowcontrol.h"
@@ -32,7 +33,6 @@
 #include "ip.h"
 #include "icmp.h"
 #include "serialnumber.h"
-#include "error.h"
 #include "sys/net/ieee802154/ieee802154_frame.h"
 #include "sys/net/net_help/net_help.h"
 
diff --git a/sys/net/sixlowpan/bordermultiplex.c b/sys/net/sixlowpan/bordermultiplex.c
index 2dcaa1f5fe8af171423653854df168fe8af5b4e2..02ca89b568dd757167138c45fc434ce3e3bbf1ed 100644
--- a/sys/net/sixlowpan/bordermultiplex.c
+++ b/sys/net/sixlowpan/bordermultiplex.c
@@ -20,12 +20,12 @@
 #include <string.h>
 
 #include <board_uart0.h>
+#include "sixlowpan/error.h"
 
 #include "flowcontrol.h"
 #include "lowpan.h"
 #include "icmp.h"
 #include "border.h"
-#include "error.h"
 
 #include "bordermultiplex.h"
 
diff --git a/sys/net/sixlowpan/error.h b/sys/net/sixlowpan/error.h
deleted file mode 100644
index 9159cba85afbf7f619f6f0c3d95ca282b76cec7c..0000000000000000000000000000000000000000
--- a/sys/net/sixlowpan/error.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _SIXLOWPAN_ERROR_H
-#define _SIXLOWPAN_ERROR_H
-
-#define SUCCESS                 0
-#define SIXLOWERROR_ARRAYFULL   132 // array is full
-#define SIXLOWERROR_NULLPTR     133 // null pointer error
-#define SIXLOWERROR_VALUE       134 // illegal value
-#define SIXLOWERROR_ADDRESS     135 // illegal address
-#define SIXLOWERROR_DISPATCH    136 // lowpan dispatch unknown
-#define SIXLOWERROR_FSTFRAG     137 // first lowpan fragment not received
-#define SIXLOWERROR_INVFRAG     138 // invalid fragment received
-#define SIXLOWERROR_SCI         139 // source context not found
-#define SIXLOWERROR_DCI         140 // destination context not found
-#define SIXLOWERROR_CSUM        141 // wrong checksum
-
-#endif /* _SIXLOWPAN_ERROR_H*/
diff --git a/sys/net/sixlowpan/icmp.c b/sys/net/sixlowpan/icmp.c
index 41447db2a5f4d6c7ff89e05f0e0a48352a18bf8c..ad72164dc1df7ba5d9264b211e345021443cbfc0 100644
--- a/sys/net/sixlowpan/icmp.c
+++ b/sys/net/sixlowpan/icmp.c
@@ -20,11 +20,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include "sixlowpan/error.h"
+
 #include "ip.h"
 #include "icmp.h"
 #include "mac.h"
 #include "lowpan.h"
-#include "error.h"
 #include "serialnumber.h"
 #include "sys/net/net_help/net_help.h"
 #include "vtimer.h"
diff --git a/sys/net/sixlowpan/include/ipv6.h b/sys/net/sixlowpan/include/ipv6.h
index 0dad0d380678402cdda7b6a13e3760b198dfdc8e..1cb0dd766168ad62909e9207a5e03b6b041dd7fb 100644
--- a/sys/net/sixlowpan/include/ipv6.h
+++ b/sys/net/sixlowpan/include/ipv6.h
@@ -23,7 +23,6 @@
 #include "sixlowpan/icmp.h"
 #include "sixlowpan/ndp.h"
 
-#include "../error.h"       /* TODO: remove if not needed anymore */
 #include "../ip.h"          /* TODO: remove if not needed anymore */
 #include "../icmp.h"        /* TODO: remove if not needed anymore */
 
diff --git a/sys/net/sixlowpan/include/sixlowpan.h b/sys/net/sixlowpan/include/sixlowpan.h
index 03fa4faa55bcd52cea4376088167c79bfe490416..908e9ec56a85d83f72d103848a22acf7ccf352df 100644
--- a/sys/net/sixlowpan/include/sixlowpan.h
+++ b/sys/net/sixlowpan/include/sixlowpan.h
@@ -24,7 +24,6 @@
 #include "sixlowpan/lowpan.h"
 #include "sixlowpan/mac.h"
 
-#include "../error.h"       /* TODO: remove if not needed anymore */
 #include "../border.h"      /* TODO: remove if not needed anymore */
 #include "../lowpan.h"      /* TODO: remove if not needed anymore */
 #include "../mac.h"         /* TODO: remove if not needed anymore */
diff --git a/sys/net/sixlowpan/include/sixlowpan/error.h b/sys/net/sixlowpan/include/sixlowpan/error.h
index ddecf540518d4d686b4eb5b96cfc0c7d5c1f9a89..f3e4390609fb1aa2ea9365425994b922af43a829 100644
--- a/sys/net/sixlowpan/include/sixlowpan/error.h
+++ b/sys/net/sixlowpan/include/sixlowpan/error.h
@@ -18,4 +18,19 @@
 #ifndef SIXLOWPAN_ERROR_H
 #define SIXLOWPAN_ERROR_H
 
+#ifndef SUCCESS
+#define SUCCESS                 (0)
+#endif
+
+#define SIXLOWERROR_ARRAYFULL   (132)   // array is full
+#define SIXLOWERROR_NULLPTR     (133)   // null pointer error
+#define SIXLOWERROR_VALUE       (134)   // illegal value
+#define SIXLOWERROR_ADDRESS     (135)   // illegal address
+#define SIXLOWERROR_DISPATCH    (136)   // lowpan dispatch unknown
+#define SIXLOWERROR_FSTFRAG     (137)   // first lowpan fragment not received
+#define SIXLOWERROR_INVFRAG     (138)   // invalid fragment received
+#define SIXLOWERROR_SCI         (139)   // source context not found
+#define SIXLOWERROR_DCI         (140)   // destination context not found
+#define SIXLOWERROR_CSUM        (141)   // wrong checksum
+
 #endif /* SIXLOWPAN_ERROR_H */