diff --git a/Makefile.dep b/Makefile.dep
index c0241ca9cda6b000c93906813d53865187151105..2c12c27b7d4854b20f6e0b973601ce10552aaf4d 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -317,6 +317,7 @@ ifneq (,$(filter nhdp,$(USEMODULE)))
 endif
 
 ifneq (,$(filter fib,$(USEMODULE)))
+  USEMODULE += universal_address
   USEMODULE += timex
   USEMODULE += vtimer
   USEMODULE += net_help
diff --git a/sys/Makefile b/sys/Makefile
index d4db3fb42554c4c9b9c21edcf7ea4c57d36cdce5..883321b7a4bce24d895d364bf449bab942139fb9 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -167,6 +167,9 @@ endif
 ifneq (,$(filter ng_netdev_eth,$(USEMODULE)))
     DIRS += net/link_layer/ng_netdev_eth
 endif
+ifneq (,$(filter universal_address,$(USEMODULE)))
+    DIRS += universal_address
+endif
 
 DIRS += $(dir $(wildcard $(addsuffix /Makefile, ${USEMODULE})))
 
diff --git a/sys/include/net/ng_fib/ng_fib_table.h b/sys/include/net/ng_fib/ng_fib_table.h
index de280ee988068d916ee02681d2fa5808ed3b1b0a..0477a0e01ae5d1f23313dc448eae83bdf4ec0405 100644
--- a/sys/include/net/ng_fib/ng_fib_table.h
+++ b/sys/include/net/ng_fib/ng_fib_table.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include "vtimer.h"
-#include "ng_universal_address.h"
+#include "universal_address.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/ng_fib/ng_universal_address.h b/sys/include/universal_address.h
similarity index 97%
rename from sys/include/net/ng_fib/ng_universal_address.h
rename to sys/include/universal_address.h
index 91e55d74ac3024282dd113e516a90cf4d6bb238f..0afe5fb228ad1f607bc517a7204d233d3a089e38 100644
--- a/sys/include/net/ng_fib/ng_universal_address.h
+++ b/sys/include/universal_address.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    net_universal_address Universal Address Container
- * @ingroup     net
+ * @defgroup    sys_universal_address Universal Address Container
+ * @ingroup     sys
  * @brief       universal address container
  *
  * @{
@@ -25,6 +25,9 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #define UNIVERSAL_ADDRESS_SIZE (16)         /**< size of the used addresses in bytes        */
 
 /**
diff --git a/sys/universal_address/Makefile b/sys/universal_address/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..c4a4c6731fa76052b90c36c3a9213606d42cb24d
--- /dev/null
+++ b/sys/universal_address/Makefile
@@ -0,0 +1,3 @@
+MODULE = universal_address
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/network_layer/fib/universal_address.c b/sys/universal_address/universal_address.c
similarity index 99%
rename from sys/net/network_layer/fib/universal_address.c
rename to sys/universal_address/universal_address.c
index 8e8052f2c26e610c909bfdf0d3aa99ccc47aa535..6e0808169198d93b4e52d4d72afc4f51f4560521 100644
--- a/sys/net/network_layer/fib/universal_address.c
+++ b/sys/universal_address/universal_address.c
@@ -7,7 +7,7 @@
  * General Public License v2.1. See the file LICENSE in the top level
  * directory for more details.
  *
- * @ingroup fib
+ * @ingroup sys_universal_address
  * @{
  * @file
  * @brief   Functions to manage universal address container
@@ -23,7 +23,7 @@
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"
-#include "ng_fib/ng_universal_address.h"
+#include "universal_address.h"
 
 /**
  * @brief Maximum number of entries handled
diff --git a/tests/unittests/tests-fib/tests-fib.c b/tests/unittests/tests-fib/tests-fib.c
index e1f0b0674d74a2394bd92fd3ab534e923240ad61..03b86dda7d457d2fd16db5f5a5468d29c5a4b7df 100644
--- a/tests/unittests/tests-fib/tests-fib.c
+++ b/tests/unittests/tests-fib/tests-fib.c
@@ -17,7 +17,7 @@
 
 #include "thread.h"
 #include "ng_fib.h"
-#include "ng_fib/ng_universal_address.h"
+#include "universal_address.h"
 
 /*
 * @brief helper to fill FIB with unique entries