Index: uspace/srv/loader/Makefile
===================================================================
--- uspace/srv/loader/Makefile	(revision d2a6a04bb73334eb8e0284948a7738837fa1d55d)
+++ uspace/srv/loader/Makefile	(revision 9fb139781eb1d46cd1aac425d62ecabc7a14ff46)
@@ -39,5 +39,5 @@
 LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
 
-EXTRA_CFLAGS = -Iinclude -I../../lib/c/rtld/include
+EXTRA_CFLAGS = -Iinclude
 
 BINARY = loader
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision d2a6a04bb73334eb8e0284948a7738837fa1d55d)
+++ uspace/srv/loader/main.c	(revision 9fb139781eb1d46cd1aac425d62ecabc7a14ff46)
@@ -64,10 +64,8 @@
 #include <elf_load.h>
 
-/* From librtld */
 #ifdef CONFIG_RTLD
-#include <rtld.h>
-#include <dynamic.h>
-#include <elf_load.h>
-#include <module.h>
+#include <rtld/rtld.h>
+#include <rtld/dynamic.h>
+#include <rtld/module.h>
 
 static int ldr_load_dyn_linked(elf_info_t *p_info);