Index: uspace/lib/c/include/tls.h
===================================================================
--- uspace/lib/c/include/tls.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ uspace/lib/c/include/tls.h	(revision a2eb85d1f769e96dbee6ec14eb7ea648264737db)
@@ -44,18 +44,17 @@
 
 extern tcb_t *tls_make(void);
-extern tcb_t *tls_alloc_arch(void **, size_t);
+extern tcb_t *tls_alloc_arch(size_t, size_t);
 extern void tls_free(tcb_t *);
-extern void tls_free_arch(tcb_t *, size_t);
-extern size_t tls_get_size(void);
+extern void tls_free_arch(tcb_t *, size_t, size_t);
 extern void *tls_get(void);
 
 #ifdef CONFIG_TLS_VARIANT_1
-extern tcb_t *tls_alloc_variant_1(void **, size_t);
-extern void tls_free_variant_1(tcb_t *, size_t);
+extern tcb_t *tls_alloc_variant_1(size_t, size_t);
+extern void tls_free_variant_1(tcb_t *, size_t, size_t);
 #endif
 
 #ifdef CONFIG_TLS_VARIANT_2
-extern tcb_t *tls_alloc_variant_2(void **, size_t);
-extern void tls_free_variant_2(tcb_t *, size_t);
+extern tcb_t *tls_alloc_variant_2(size_t, size_t);
+extern void tls_free_variant_2(tcb_t *, size_t, size_t);
 #endif
 
Index: uspace/lib/c/include/types/rtld/module.h
===================================================================
--- uspace/lib/c/include/types/rtld/module.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ uspace/lib/c/include/types/rtld/module.h	(revision a2eb85d1f769e96dbee6ec14eb7ea648264737db)
@@ -62,5 +62,6 @@
 	size_t tls_align;
 
-	size_t ioffs;
+	/** Offset of this module's TLS from the thread pointer. */
+	ptrdiff_t tpoff;
 
 	/** Containing rtld */
Index: uspace/lib/c/include/types/rtld/rtld.h
===================================================================
--- uspace/lib/c/include/types/rtld/rtld.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
+++ uspace/lib/c/include/types/rtld/rtld.h	(revision a2eb85d1f769e96dbee6ec14eb7ea648264737db)
@@ -54,4 +54,5 @@
 	/** Size of initial TLS tdata + tbss */
 	size_t tls_size;
+	size_t tls_align;
 
 	/** List of all loaded modules including rtld and the program */