diff --git a/Makefile.am b/Makefile.am
index f52e046..ce1b676 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,11 +46,6 @@ install-exec-hook:
 	   $(LN_S) liberasurecode/config_liberasurecode.h)
 
 test: check
-	$(eval SONAMES := $(shell find $(abs_top_builddir) -name '*.so'))
-	$(eval SODIRS := $(dir $(SONAMES)))
-	$(eval LD_LIBRARY_PATH := LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
-	$(eval DYLD_LIBRARY_PATH := DYLD_LIBRARY_PATH="$(DYLD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
-	$(eval DYLD_FALLBACK_LIBRARY_PATH := DYLD_FALLBACK_LIBRARY_PATH=$(DYLD_FALLBACK_LIBRARY_PATH):"$(subst / ,/:,$(SODIRS))")
 	@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
 		./test/liberasurecode_test
 	@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
@@ -65,19 +60,14 @@ VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=memcheck \
 	--malloc-fill=A5 --free-fill=DE --fullpath-after=. --trace-children=yes
 
 valgrind-test: check
-	$(eval SONAMES := $(shell find $(abs_top_builddir) -name '*.so'))
-	$(eval SODIRS := $(dir $(SONAMES)))
-	$(eval LD_LIBRARY_PATH := LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
-	$(eval DYLD_LIBRARY_PATH := DYLD_LIBRARY_PATH="$(DYLD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))")
-	$(eval DYLD_FALLBACK_LIBRARY_PATH := DYLD_FALLBACK_LIBRARY_PATH=$(DYLD_FALLBACK_LIBRARY_PATH):"$(subst / ,/:,$(SODIRS))")
 	@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
 		./test/alg_sig_test
 	@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
-		./test/.libs/liberasurecode_test
+		./test/liberasurecode_test
 	@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
 		./test/test_xor_hd_code
 	@$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
-		./test/.libs/libec_slap
+		./test/libec_slap
 
 CLEANFILES = cscope.in.out cscope.out cscope.po.out
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b704f4..8312dd0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,12 +2,15 @@ SUBDIRS = builtin/xor_codes builtin/null_code builtin/rs_vand
 
 lib_LTLIBRARIES = liberasurecode.la
 
-INCLUDES = \
-		-I$(top_srcdir)/include/erasurecode \
-		-I$(top_srcdir)/include/xor_codes \
-		-I$(top_srcdir)/include/rs_vand \
-		-I$(top_srcdir)/include/isa_l \
-		-I$(top_srcdir)/include/shss
+INCLUDE = \
+		-I$(abs_top_srcdir)/include/erasurecode \
+		-I$(abs_top_srcdir)/include/xor_codes \
+		-I$(abs_top_srcdir)/include/rs_vand \
+		-I$(abs_top_srcdir)/include/isa_l \
+		-I$(abs_top_srcdir)/include/shss
+
+AM_CPPFLAGS = $(CPPFLAGS) $(INCLUDE)
+AM_CFLAGS = $(AM_CPPFLAGS)
 
 # liberasurecode params
 liberasurecode_la_SOURCES = \