diff --git a/cmake/ADIOSFunctions.cmake b/cmake/ADIOSFunctions.cmake
index 8babb5ab5199715f70d14b39b15a79a3a24850de..8864a202fd8a88a2f95efde07d76c8b12c9cd0c8 100644
--- a/cmake/ADIOSFunctions.cmake
+++ b/cmake/ADIOSFunctions.cmake
@@ -193,9 +193,6 @@ function(GenerateADIOSPackageConfig)
         list(APPEND ADIOS2_CXX_INCS ${HDF5_INCLUDE_DIRS})
       endif()
     endif()
-    if(ADIOS2_HAVE_SST)
-      list(APPEND ADIOS2_CXX_LIBS ${EVPATH_LIBRARIES})
-    endif()
   endif()
 
   # Build the non-cmake config script
diff --git a/cmake/FindEVPATH.cmake b/cmake/FindEVPATH.cmake
index 5650e2e019edde66b92cec735fd38f74a9e9954b..cd747600f798f85d767ec75328a35dfa95f297cb 100644
--- a/cmake/FindEVPATH.cmake
+++ b/cmake/FindEVPATH.cmake
@@ -11,7 +11,7 @@
                             # sequential (all are case insentative) 
 #   )
 #
-# Module that finds the includes and libraries for a working EVPATH 1.x install.
+# Module that finds the includes and libraries for a working EVPATH install.
 # This module invokes the `evpath_config` script that should be installed with
 # the other EVPATH tools.
 #
@@ -19,7 +19,7 @@
 # set the EVPATH_ROOT or EVPATH_DIR environment variable.
 #
 # If this variable is not set, make sure that at least the according `bin/`
-# directory of EVPATH 1.x is in your PATH environment variable.
+# directory of EVPATH is in your PATH environment variable.
 #
 # Set the following CMake variables BEFORE calling find_packages to
 # influence this module:
@@ -27,9 +27,9 @@
 #                           libraries.  Default: OFF
 #
 # This module will define the following variables:
-#   EVPATH_INCLUDE_DIRS    - Include directories for the EVPATH 1.x headers.
+#   EVPATH_INCLUDE_DIRS    - Include directories for the EVPATH headers.
 #   EVPATH_LIBRARY_PATH    - Full path of the libevpath library (.a or .so file)
-#   EVPATH_DEPENDENCY_LIBRARIES       - EVPATH 1.x dependency libraries.
+#   EVPATH_DEPENDENCY_LIBRARIES       - EVPATH dependency libraries.
 #   EVPATH_FOUND           - TRUE if FindEVPATH found a working install
 #   EVPATH_VERSION         - Version in format Major.Minor.Patch
 #
@@ -37,21 +37,6 @@
 #   EVPATH_DEFINITIONS     - Compiler definitions you should add with
 #                           add_definitions(${EVPATH_DEFINITIONS})
 #
-# Example to find EVPATH 1.x (default)
-# find_package(EVPATH)
-# if(EVPATH_FOUND)
-#   include_directories(${EVPATH_INCLUDE_DIRS})
-#   add_executable(foo foo.c)
-#   target_link_libraries(foo ${EVPATH_LIBRARY_PATH} EVPATH_DEPENDENCY_LIBRARIES)
-# endif()
-
-# Example to find EVPATH 1.x using component
-# find_package(EVPATH COMPONENTS fortran)
-# if(EVPATH_FOUND)
-#   include_directories(${EVPATH_INCLUDE_DIRS})
-#   add_executable(foo foo.c)
-#   target_link_libraries(foo ${EVPATH_LIBRARY_PATH} ${EVPATH_DEPENDENCY_LIBRARIES})
-# endif()
 ###############################################################################
 #Copyright (c) 2014, Axel Huebl and Felix Schmitt from http://picongpu.hzdr.de
 #All rights reserved.
@@ -133,8 +118,12 @@ if(EVPATH_CONFIG)
     foreach(OPT IN LISTS evpath_match)
       if(OPT MATCHES "^-L(.*)")
         list(APPEND evpath_lib_hints "${CMAKE_MATCH_1}")
+      elseif(OPT STREQUAL "-lstdc++")
+        list(APPEND evpath_lib_flags "${OPT}")
       elseif(OPT MATCHES "^-l(.*)")
         list(APPEND evpath_libs "${CMAKE_MATCH_1}")
+      elseif(OPT MATCHES "/*")
+        list(APPEND evpath_libs "${OPT}")
       else()
         list(APPEND evpath_lib_flags "${OPT}")
       endif()
@@ -188,7 +177,6 @@ find_package_handle_standard_args(EVPATH
 if(EVPATH_FOUND)
   set(EVPATH_INCLUDE_DIRS ${EVPATH_INCLUDE_DIR})
   set(EVPATH_LIBRARIES ${EVPATH_LIBRARY} ${EVPATH_DEPENDENCIES})
-
   ##########################################################################
   # Add target and dependencies to ADIOS2
   ##########################################################################
diff --git a/source/adios2/engine/sst/SstReader.cpp b/source/adios2/engine/sst/SstReader.cpp
index f84b12930bb88c18f4c8e9edb7b4dd36b74696c6..3d8367d45090f79cf07f0edbd65840b222fb0a67 100644
--- a/source/adios2/engine/sst/SstReader.cpp
+++ b/source/adios2/engine/sst/SstReader.cpp
@@ -8,6 +8,9 @@
  *      Author: Greg Eisenhauer
  */
 
+#include <cstring>
+#include <string>
+
 #include "SstReader.h"
 
 namespace adios2
@@ -19,7 +22,7 @@ SstReader::SstReader(IO &io, const std::string &name, const Mode mode,
 {
     SstStream output;
     char *cstr = new char[name.length() + 1];
-    strcpy(cstr, name.c_str());
+    std::strcpy(cstr, name.c_str());
 
     m_Input = SstReaderOpen(cstr, NULL, mpiComm);
     Init();
diff --git a/source/adios2/toolkit/sst/dp/dp.c b/source/adios2/toolkit/sst/dp/dp.c
index 7eef2ab2d65dd84de452c767321289187c0ff827..1add67ab5b8add719cad5be1d6db322f8da97e24 100644
--- a/source/adios2/toolkit/sst/dp/dp.c
+++ b/source/adios2/toolkit/sst/dp/dp.c
@@ -5,9 +5,10 @@
 #include <fm.h>
 #include <mpi.h>
 
-#include "dp_interface.h"
 #include "sst_data.h"
 
+#include "dp_interface.h"
+
 extern CP_DP_Interface LoadDummyDP();
 
 CP_DP_Interface LoadDP(char *dp_name)
diff --git a/source/adios2/toolkit/sst/dp/dummy_dp.c b/source/adios2/toolkit/sst/dp/dummy_dp.c
index 58c9d89f1e35d4befed38d7f8e5cf2a7e9b45085..2203aa42b56b6501abed17d81e11d1a3303353fb 100644
--- a/source/adios2/toolkit/sst/dp/dummy_dp.c
+++ b/source/adios2/toolkit/sst/dp/dummy_dp.c
@@ -7,9 +7,10 @@
 #include <evpath.h>
 #include <mpi.h>
 
-#include "dp_interface.h"
 #include "sst_data.h"
 
+#include "dp_interface.h"
+
 /*
  *  Some conventions:
  *    `RS` indicates a reader-side item.