diff --git a/Makefile.core-AM_CPPFLAGS.am b/Makefile.core-AM_CPPFLAGS.am
index 03c313f..736bb22 100644
--- a/Makefile.core-AM_CPPFLAGS.am
+++ b/Makefile.core-AM_CPPFLAGS.am
@@ -1,5 +1,7 @@
 add_includes = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
+		-I$(top_srcdir) \
 		-I$(top_srcdir)/coregrind/$(VG_ARCH) \
+		-I$(top_builddir)/coregrind/$(VG_ARCH) \
 		-I$(top_srcdir)/coregrind/$(VG_OS) \
 		-I$(top_srcdir)/coregrind/$(VG_PLATFORM) \
 		-I$(top_builddir)/include -I$(top_srcdir)/include \
@@ -9,5 +11,5 @@
 		-I@VEX_DIR@/pub
 
 AM_CPPFLAGS = $(add_includes)
-AM_CCASFLAGS = $(add_includes) @ARCH_CORE_AM_CCASFLAGS@
+AM_CCASFLAGS = $(add_includes) @ARCH_CORE_AM_CCASFLAGS@ -Wa,-gstabs