Index: uspace/lib/c/include/adt/list.h
===================================================================
--- uspace/lib/c/include/adt/list.h	(revision a2348a9cb6a2a25859addd7ec03111e4e4d3495c)
+++ uspace/lib/c/include/adt/list.h	(revision 5b382774cede49c01f80b52156d1d7532b7dc182)
@@ -102,10 +102,4 @@
 		iterator = next_iter, next_iter = iterator->next)
 
-#ifndef member_to_inst
-#define member_to_inst(ptr_member, type, member_identif) \
-	((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
-#endif
-
-
 #define assert_link_not_used(link) \
 	assert(((link)->prev == NULL) && ((link)->next == NULL))
Index: uspace/lib/c/include/macros.h
===================================================================
--- uspace/lib/c/include/macros.h	(revision a2348a9cb6a2a25859addd7ec03111e4e4d3495c)
+++ uspace/lib/c/include/macros.h	(revision 5b382774cede49c01f80b52156d1d7532b7dc182)
@@ -52,4 +52,10 @@
 	    | ((((uint64_t) (up)) & 0xffffffff) << 32))
 
+#ifndef member_to_inst
+#define member_to_inst(ptr_member, type, member_identif) \
+	((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
+#endif
+
+
 #endif
 
Index: uspace/lib/nic/src/nic_addr_db.c
===================================================================
--- uspace/lib/nic/src/nic_addr_db.c	(revision a2348a9cb6a2a25859addd7ec03111e4e4d3495c)
+++ uspace/lib/nic/src/nic_addr_db.c	(revision 5b382774cede49c01f80b52156d1d7532b7dc182)
@@ -35,4 +35,5 @@
  * @brief Generic hash-set based database of addresses
  */
+#include "nic_addr_db.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -40,8 +41,7 @@
 #include <errno.h>
 #include <mem.h>
-
-#include "nic_addr_db.h"
-#include "adt/hash_table.h"
-//#include "string.h"
+#include <adt/hash_table.h>
+#include <macros.h>
+