Index: uspace/lib/c/Makefile
===================================================================
--- uspace/lib/c/Makefile	(revision 5baf2091c9d0ccfd0e7f817add7719093b215010)
+++ uspace/lib/c/Makefile	(revision 90b8d58f176d051b5f45a211c684f8d1ef2e25dd)
@@ -58,6 +58,4 @@
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
-
-EXTRA_CFLAGS += -I../../srv/loader/include
 
 GENERIC_SOURCES = \
Index: uspace/lib/c/include/elf/elf.h
===================================================================
--- uspace/lib/c/include/elf/elf.h	(revision 5baf2091c9d0ccfd0e7f817add7719093b215010)
+++ uspace/lib/c/include/elf/elf.h	(revision 90b8d58f176d051b5f45a211c684f8d1ef2e25dd)
@@ -358,12 +358,4 @@
 #endif
 
-/*
- * Note types are not defined by the standard. These are the ones used
- * by SVr4 derivatives.
- */
-#define NT_PRSTATUS	1
-
-extern char *elf_error(unsigned int rc);
-
 #endif
 
Index: uspace/lib/c/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/include/rtld/elf_dyn.h	(revision 5baf2091c9d0ccfd0e7f817add7719093b215010)
+++ uspace/lib/c/include/rtld/elf_dyn.h	(revision 90b8d58f176d051b5f45a211c684f8d1ef2e25dd)
@@ -39,5 +39,5 @@
 #include <sys/types.h>
 
-#include <elf.h>
+#include <elf/elf.h>
 #include <libarch/rtld/elf_dyn.h>
 
Index: uspace/lib/c/include/rtld/symbol.h
===================================================================
--- uspace/lib/c/include/rtld/symbol.h	(revision 5baf2091c9d0ccfd0e7f817add7719093b215010)
+++ uspace/lib/c/include/rtld/symbol.h	(revision 90b8d58f176d051b5f45a211c684f8d1ef2e25dd)
@@ -36,6 +36,6 @@
 #define LIBC_RTLD_SYMBOL_H_
 
+#include <elf/elf.h>
 #include <rtld/rtld.h>
-#include <elf.h>
 
 elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod);