diff --git a/e17/evas/evas.conf b/e17/evas/evas.conf
index 3dc68c0a3..db9b708b7 100644
--- a/e17/evas/evas.conf
+++ b/e17/evas/evas.conf
@@ -45,10 +45,8 @@ fi
 
 # check for xorg
 if pkginstalled xorg-server ; then
-	var_append confopt " " "--x-includes=$( pkgprefix includedir xorg-server )"
-	var_append confopt " " "--x-libraries=$( pkgprefix libdir xorg-server )"
-	var_append LDFLAGS ' ' "-L$( pkgprefix -r libdir xorg-server )"
-	export LDFLAGS
+	var_append confopt " " "--x-includes=$( pkgprefix -r includedir xorg-server )"
+	var_append confopt " " "--x-libraries=$( pkgprefix -r libdir xorg-server )"
 fi
 
 # check if we can enable the OpenGL X11 display engine
@@ -60,8 +58,6 @@ if pkginstalled cairo ; then
 	var_append GCC_WRAPPER_APPEND ' ' "`pkg-config cairo --cflags`"
 fi
 
-var_append GCC_WRAPPER_APPEND ' ' "-I$includedir"
-
 if pkginstalled fontconfig ; then
 	pkgprefix -t fontconfig
 	var_append confopt ' ' "--enable-fontconfig"