3 files changed, 7 insertions, 9 deletions
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index cccd9e473..97b7234a0 100644
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -44,7 +44,7 @@ ar-target: $(OBJS)
 
 
 $(OBJS): %.o : %.c
-	$(TARGET_CC) -I../d-link -I../d-link/$(TARGET_ARCH) $(TARGET_CFLAGS) -c $< -o $@
+	$(CC) -I../ldso -I../ldso/$(TARGET_ARCH) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(OBJ): Makefile
diff --git a/ldso/libdl/dlib.c b/ldso/libdl/dlib.c
index 540b6640f..901613f30 100644
--- a/ldso/libdl/dlib.c
+++ b/ldso/libdl/dlib.c
@@ -7,11 +7,10 @@
 #include <stdlib.h>
 #include <features.h>
 #include "dlfcn.h"
-#include "sysdep.h"
-#include "syscall.h"
-#include "hash.h"
-#include "string.h"
 #include "linuxelf.h"
+#include "ld_syscall.h"
+#include "ld_hash.h"
+#include "ld_string.h"
 
 extern int _dl_error_number;
 extern struct r_debug *_dl_debug_addr;
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 540b6640f..901613f30 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -7,11 +7,10 @@
 #include <stdlib.h>
 #include <features.h>
 #include "dlfcn.h"
-#include "sysdep.h"
-#include "syscall.h"
-#include "hash.h"
-#include "string.h"
 #include "linuxelf.h"
+#include "ld_syscall.h"
+#include "ld_hash.h"
+#include "ld_string.h"
 
 extern int _dl_error_number;
 extern struct r_debug *_dl_debug_addr;