diff --git a/eo/tutorial/Lesson2/FirstBitEA.cpp b/eo/tutorial/Lesson2/FirstBitEA.cpp
index f5ca1afa..928e6019 100644
--- a/eo/tutorial/Lesson2/FirstBitEA.cpp
+++ b/eo/tutorial/Lesson2/FirstBitEA.cpp
@@ -6,10 +6,18 @@
 // (see FirstBitGA.cpp) but now with  Breeder - and Combined Ops
 //
 //-----------------------------------------------------------------------------
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // standard includes
 #include <stdexcept>  // runtime_error 
 #include <iostream>   // cout
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
 #include <strstream>  // ostrstream, istrstream
+#endif
 
 // the general include for eo
 #include <eo>
diff --git a/eo/tutorial/Lesson2/FirstRealEA.cpp b/eo/tutorial/Lesson2/FirstRealEA.cpp
index 1f9686f9..91793a1b 100644
--- a/eo/tutorial/Lesson2/FirstRealEA.cpp
+++ b/eo/tutorial/Lesson2/FirstRealEA.cpp
@@ -6,10 +6,18 @@
 // (see FirstBitGA.cpp) but now with  Breeder - and Combined Ops
 //
 //-----------------------------------------------------------------------------
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // standard includes
 #include <stdexcept>  // runtime_error 
 #include <iostream>   // cout
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
 #include <strstream>  // ostrstream, istrstream
+#endif
 
 // the general include for eo
 #include <eo>
diff --git a/eo/tutorial/Lesson2/exercise2.3.cpp b/eo/tutorial/Lesson2/exercise2.3.cpp
index e07dd768..20867a0f 100644
--- a/eo/tutorial/Lesson2/exercise2.3.cpp
+++ b/eo/tutorial/Lesson2/exercise2.3.cpp
@@ -6,10 +6,18 @@
 // (see FirstBitGA.cpp) but now with  Breeder - and Combined Ops
 //
 //-----------------------------------------------------------------------------
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // standard includes
 #include <stdexcept>  // runtime_error 
 #include <iostream>   // cout
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
 #include <strstream>  // ostrstream, istrstream
+#endif
 
 // the general include for eo
 #include <eo>
diff --git a/eo/tutorial/Lesson3/SecondBitEA.cpp b/eo/tutorial/Lesson3/SecondBitEA.cpp
index 7a7bbb0c..dfcf8e13 100644
--- a/eo/tutorial/Lesson3/SecondBitEA.cpp
+++ b/eo/tutorial/Lesson3/SecondBitEA.cpp
@@ -6,11 +6,19 @@
 // but now you learn to enter the parameters in a more flexible way
 // and to twidle the output to your preferences!
 //-----------------------------------------------------------------------------
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // standard includes
-#include <stdexcept>  // runtime_error 
-#include <iostream>   // cout
-#include <strstream>  // ostrstream, istrstream
 #include <fstream>
+#include <iostream>   // cout
+#include <stdexcept>  // runtime_error 
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
+#include <strstream>  // ostrstream, istrstream
+#endif
 
 // the general include for eo
 #include <eo>
diff --git a/eo/tutorial/Lesson3/SecondRealEA.cpp b/eo/tutorial/Lesson3/SecondRealEA.cpp
index df2bed9a..48d50b6c 100644
--- a/eo/tutorial/Lesson3/SecondRealEA.cpp
+++ b/eo/tutorial/Lesson3/SecondRealEA.cpp
@@ -8,10 +8,19 @@
 // and to twidle the output to your preferences (as in SecondBitEA.cpp)
 //
 //-----------------------------------------------------------------------------
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // standard includes
-#include <stdexcept>  // runtime_error 
+#include <fstream>
 #include <iostream>   // cout
+#include <stdexcept>  // runtime_error 
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
 #include <strstream>  // ostrstream, istrstream
+#endif
 
 // the general include for eo
 #include <eo>
diff --git a/eo/tutorial/Lesson3/exercise3.1.cpp b/eo/tutorial/Lesson3/exercise3.1.cpp
index cde1cc53..30000541 100644
--- a/eo/tutorial/Lesson3/exercise3.1.cpp
+++ b/eo/tutorial/Lesson3/exercise3.1.cpp
@@ -6,11 +6,19 @@
 // but now you learn to enter the parameters in a more flexible way
 // and to twidle the output to your preferences!
 //-----------------------------------------------------------------------------
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // standard includes
-#include <stdexcept>  // runtime_error 
-#include <iostream>   // cout
-#include <strstream>  // ostrstream, istrstream
 #include <fstream>
+#include <iostream>   // cout
+#include <stdexcept>  // runtime_error 
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
+#include <strstream>  // ostrstream, istrstream
+#endif
 
 // the general include for eo
 #include <eo>