diff --git a/THANKS b/THANKS
index a5daf579..e564cf22 100644
--- a/THANKS
+++ b/THANKS
@@ -9,6 +9,7 @@ Akim Demaille             akim@lrde.epita.fr
 Albert Chin-A-Young       china@thewrittenword.com
 Alexander Belopolsky      alexb@rentec.com
 Alexandre Duret-Lutz      adl@lrde.epita.fr
+Andre da Costa Barros     andre.cbarros@yahoo.com
 Andreas Schwab            schwab@suse.de
 Andrew Suffield           asuffield@users.sourceforge.net
 Angelo Borsotti           angelo.borsotti@gmail.com
diff --git a/examples/calc++/local.mk b/examples/calc++/local.mk
index 4b31283f..059f2b05 100644
--- a/examples/calc++/local.mk
+++ b/examples/calc++/local.mk
@@ -57,9 +57,7 @@ extracted += $(calcxx_extracted)
 calcxx_sources_generated =                      \
   %D%/parser.cc                                 \
   %D%/parser.hh                                 \
-  %D%/location.hh                               \
-  %D%/position.hh                               \
-  %D%/stack.hh
+  %D%/location.hh
 calcxx_sources =                                \
   $(calcxx_sources_extracted)                   \
   $(calcxx_sources_generated)
@@ -69,7 +67,7 @@ if  ENABLE_CXX
   check_PROGRAMS += %D%/calc++
   nodist_%C%_calc___SOURCES = $(calcxx_sources)
   # Don't use gnulib's system headers.
-  %C%_calc___CPPFLAGS = -I$(top_builddir)/%D%
+  %C%_calc___CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D%
   %C%_calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
   TESTS += %D%/calc++.test
 endif  ENABLE_CXX
diff --git a/examples/mfcalc/local.mk b/examples/mfcalc/local.mk
index 9df3b05e..62923b37 100644
--- a/examples/mfcalc/local.mk
+++ b/examples/mfcalc/local.mk
@@ -29,7 +29,7 @@ extracted += $(mfcalc_extracted)
 check_PROGRAMS += %D%/mfcalc
 nodist_%C%_mfcalc_SOURCES = $(mfcalc_sources)
 # Don't use gnulib's system headers.
-%C%_mfcalc_CPPFLAGS = -I$(top_builddir)/%D%
+%C%_mfcalc_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D%
 %C%_mfcalc_LDADD = -lm
 
 dist_TESTS += %D%/mfcalc.test