Index: uspace/lib/c/include/macros.h
===================================================================
--- uspace/lib/c/include/macros.h	(revision 5b0cf635022b821f28f7a014ad5b39d005cd7666)
+++ uspace/lib/c/include/macros.h	(revision f5e5f73a339f61a91c3b3d97e7798f71f126023a)
@@ -55,18 +55,17 @@
 	    | ((((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
+	((type *) (((void *) (ptr_member)) - \
+	    ((void *) &(((type *) 0)->member_identif))))
 
+#define _paddname(line)     PADD_ ## line ## __
+#define _padd(width, line)  uint ## width ## _t _paddname(line)
+
+#define PADD32  _padd(32, __LINE__)
+#define PADD16  _padd(16, __LINE__)
+#define PADD8   _padd(8, __LINE__)
 
 #endif
 
-#define _paddname(line) PADD_ ## line ## __
-#define _padd(width, line) uint ## width ## _t _paddname(line)
-#define PADD32 _padd(32, __LINE__)
-#define PADD16 _padd(16, __LINE__)
-#define PADD8 _padd(8, __LINE__)
-
 /** @}
  */