Index: uspace/lib/dltest/dltest.c
===================================================================
--- uspace/lib/dltest/dltest.c	(revision 153c7a29e3a8082bd7b08d69177e32d48d1873a7)
+++ uspace/lib/dltest/dltest.c	(revision fe036fe91eaab8ee7b3d93b1b6e113e69f1e317c)
@@ -34,5 +34,4 @@
  */
 
-#include <fibril.h>
 #include "libdltest.h"
 
@@ -46,14 +45,4 @@
 /** Public uninitialized variable */
 int dl_public_uvar;
-
-/** Private initialized fibril-local variable */
-static fibril_local int dl_private_fib_var = dl_private_fib_var_val;
-/** Private uninitialized fibril-local variable */
-static fibril_local int dl_private_fib_uvar;
-
-/** Public initialized fibril-local variable */
-fibril_local int dl_public_fib_var = dl_public_fib_var_val;
-/** Public uninitialized fibril-local variable */
-fibril_local int dl_public_fib_uvar;
 
 /** Return constant value. */
@@ -69,20 +58,8 @@
 }
 
-/** Return address of private initialized variable */
-int *dl_get_private_var_addr(void)
-{
-	return &private_var;
-}
-
 /** Return value of private uninitialized variable */
 int dl_get_private_uvar(void)
 {
 	return private_uvar;
-}
-
-/** Return vaddress of private uninitialized variable */
-int *dl_get_private_uvar_addr(void)
-{
-	return &private_uvar;
 }
 
@@ -93,10 +70,4 @@
 }
 
-/** Return address of public initialized variable */
-int *dl_get_public_var_addr(void)
-{
-	return &dl_public_var;
-}
-
 /** Return value of public uninitialized variable */
 int dl_get_public_uvar(void)
@@ -105,58 +76,4 @@
 }
 
-/** Return address of public uninitialized variable */
-int *dl_get_public_uvar_addr(void)
-{
-	return &dl_public_uvar;
-}
-
-/** Return value of private initialized fibril-local variable */
-int dl_get_private_fib_var(void)
-{
-	return dl_private_fib_var;
-}
-
-/** Return address of private initialized fibril-local variable */
-int *dl_get_private_fib_var_addr(void)
-{
-	return &dl_private_fib_var;
-}
-
-/** Return value of private uninitialized fibril-local variable */
-int dl_get_private_fib_uvar(void)
-{
-	return dl_private_fib_uvar;
-}
-
-/** Return address of private uninitialized fibril-local variable */
-int *dl_get_private_fib_uvar_addr(void)
-{
-	return &dl_private_fib_uvar;
-}
-
-/** Return value of public initialized fibril-local variable */
-int dl_get_public_fib_var(void)
-{
-	return dl_public_fib_var;
-}
-
-/** Return value of public initialized fibril-local variable */
-int *dl_get_public_fib_var_addr(void)
-{
-	return &dl_public_fib_var;
-}
-
-/** Return value of public uninitialized fibril-local variable */
-int dl_get_public_fib_uvar(void)
-{
-	return dl_public_fib_uvar;
-}
-
-/** Return value of public uninitialized fibril-local variable */
-int *dl_get_public_fib_uvar_addr(void)
-{
-	return &dl_public_fib_uvar;
-}
-
 /**
  * @}
Index: uspace/lib/dltest/libdltest.h
===================================================================
--- uspace/lib/dltest/libdltest.h	(revision 153c7a29e3a8082bd7b08d69177e32d48d1873a7)
+++ uspace/lib/dltest/libdltest.h	(revision fe036fe91eaab8ee7b3d93b1b6e113e69f1e317c)
@@ -37,36 +37,18 @@
 #define LIBDLTEST_H
 
-#include <fibril.h>
-
 enum {
 	dl_constant = 110011,
 	dl_private_var_val = 220022,
-	dl_public_var_val = 330033,
-	dl_private_fib_var_val = 440044,
-	dl_public_fib_var_val = 550055
+	dl_public_var_val = 330033
 };
 
 extern int dl_get_constant(void);
 extern int dl_get_private_var(void);
-extern int *dl_get_private_var_addr(void);
 extern int dl_get_private_uvar(void);
-extern int *dl_get_private_uvar_addr(void);
 extern int dl_get_public_var(void);
-extern int *dl_get_public_var_addr(void);
 extern int dl_get_public_uvar(void);
-extern int *dl_get_public_uvar_addr(void);
-extern int dl_get_private_fib_var(void);
-extern int *dl_get_private_fib_var_addr(void);
-extern int dl_get_private_fib_uvar(void);
-extern int *dl_get_private_fib_uvar_addr(void);
-extern int dl_get_public_fib_var(void);
-extern int *dl_get_public_fib_var_addr(void);
-extern int dl_get_public_fib_uvar(void);
-extern int *dl_get_public_fib_uvar_addr(void);
 
 extern int dl_public_var;
 extern int dl_public_uvar;
-extern fibril_local int dl_public_fib_var;
-extern fibril_local int dl_public_fib_uvar;
 
 #endif