diff --git a/GaudiKernel/include/GaudiKernel/DirSearchPath.h b/GaudiKernel/include/GaudiKernel/DirSearchPath.h
index 450bc5a51f2d01d67bf8434ab04bfd5c09a388bd..dae7a9b0a1748f435e09bda22c273fd4e61abab5 100644
--- a/GaudiKernel/include/GaudiKernel/DirSearchPath.h
+++ b/GaudiKernel/include/GaudiKernel/DirSearchPath.h
@@ -18,8 +18,10 @@
 #include "boost/filesystem/exception.hpp" /*filesystem_error*/
 #include "boost/filesystem/path.hpp"
 #include <functional> /* binary_function */
+#include <list>
 #include <string>
 #include <vector>
+
 /** @class DirSearchPath
  * @brief search for files in a list of directories
  * @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration
diff --git a/GaudiKernel/src/Util/genconf.cpp b/GaudiKernel/src/Util/genconf.cpp
index d0bae498a94662f24e13158ebe9dcdbe6daa5efc..072195a049f6b6d9ab8f4250489e570910067f55 100644
--- a/GaudiKernel/src/Util/genconf.cpp
+++ b/GaudiKernel/src/Util/genconf.cpp
@@ -49,7 +49,10 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 108500
+#  include <boost/filesystem/convenience.hpp>
+#endif
 #include <boost/filesystem/exception.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/core.hpp>