Index: kernel/arch/ia32/include/arch/barrier.h
===================================================================
--- kernel/arch/ia32/include/arch/barrier.h	(revision 184b600afb3ccf3236dcbfc87929a25a1053b85d)
+++ kernel/arch/ia32/include/arch/barrier.h	(revision 13dfa3f9eae98905dfc11390f35b47eb2559eeef)
@@ -54,5 +54,5 @@
 NO_TRACE static inline void cpuid_serialization(void)
 {
-#ifndef __IN_SHARED_LIBC__
+#ifndef __PIC__
 	asm volatile (
 		"xorl %%eax, %%eax\n"
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 184b600afb3ccf3236dcbfc87929a25a1053b85d)
+++ uspace/Makefile.common	(revision 13dfa3f9eae98905dfc11390f35b47eb2559eeef)
@@ -270,5 +270,5 @@
 	-integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
 
-LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
+LIB_CFLAGS = $(CFLAGS) -fPIC
 LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
 
Index: uspace/lib/c/generic/libc.c
===================================================================
--- uspace/lib/c/generic/libc.c	(revision 184b600afb3ccf3236dcbfc87929a25a1053b85d)
+++ uspace/lib/c/generic/libc.c	(revision 13dfa3f9eae98905dfc11390f35b47eb2559eeef)
@@ -89,5 +89,5 @@
 	char **argv;
 	
-#ifdef __IN_SHARED_LIBC__
+#ifdef __PIC__
 	if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
 		runtime_env = (runtime_env_t *) __pcb->rtld_runtime;