diff --git a/eo/autogen.sh b/eo/autogen.sh
index 22b83ab3..8005b6bb 100755
--- a/eo/autogen.sh
+++ b/eo/autogen.sh
@@ -33,7 +33,7 @@ set aclocalinclude="$ACLOCAL_FLAGS"
 aclocal $aclocalinclude
 unset $aclocalinclude
 autoheader
-automake --add --copy
+automake -a -c
 autoconf
 
 # we want doc to be recompiled - and it keeps saying it's up to date!!!
diff --git a/eo/src/es/Makefile.am b/eo/src/es/Makefile.am
index ae6d7d0f..e15e5eff 100644
--- a/eo/src/es/Makefile.am
+++ b/eo/src/es/Makefile.am
@@ -42,3 +42,5 @@ pkginclude_HEADERS 	= eoEsChromInit.h \
 			make_op_real.h \
 			make_real.h
 
+
+AM_CXXFLAGS		= -I$(top_srcdir)/src
diff --git a/eo/tutorial/Lesson1/exercise1.3.cpp b/eo/tutorial/Lesson1/exercise1.3.cpp
index d2702ad1..c7bf389a 100644
--- a/eo/tutorial/Lesson1/exercise1.3.cpp
+++ b/eo/tutorial/Lesson1/exercise1.3.cpp
@@ -1,4 +1,6 @@
-#include <stdexcept>  // runtime_error 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 //-----------------------------------------------------------------------------
 // FirstBitGA.cpp
@@ -8,12 +10,15 @@
 //
 //-----------------------------------------------------------------------------
 // standard includes
-
-#include <iostream>   // cout
-#include <strstream>  // ostrstream, istrstream
+#include <iostream>
+#include <stdexcept>
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
+#include <strstream>
+#endif
 
 // the general include for eo
-
 #include <eo>
 
 //-----------------------------------------------------------------------------