diff --git a/source/adios2/core/IO.inl b/source/adios2/core/IO.inl
index 8f41ca837cc58be359372640e409a489e896eb9c..d7a8505442911b709dcaa079c624cc42daae98e2 100644
--- a/source/adios2/core/IO.inl
+++ b/source/adios2/core/IO.inl
@@ -14,7 +14,6 @@
 #error "Inline file should only be included from it's header, never on it's own"
 #endif
 
-#include "adios2/ADIOSMPI.h"
 #include "adios2/ADIOSMacros.h"
 #include "adios2/helper/adiosFunctions.h" //BuildParametersMap
 
diff --git a/source/adios2/engine/dataman/DataManReader.h b/source/adios2/engine/dataman/DataManReader.h
index a34b455be33eb5d0edad597836e6a5a3051aec47..8fba72a996bd58ca8082f7180b93b707baba43c8 100644
--- a/source/adios2/engine/dataman/DataManReader.h
+++ b/source/adios2/engine/dataman/DataManReader.h
@@ -74,13 +74,13 @@ private:
     Variable<T> *InquireVariableCommon(const std::string name,
                                        const bool readIn)
     {
-        int rank = 0;
-        MPI_Comm_rank(m_MPIComm, &rank);
+        //int rank = 0;
+        //MPI_Comm_rank(m_MPIComm, &rank);
 
-        std::cout << "I am hooked to the DataMan library\n";
-        std::cout << "Hello DatamanReader from rank " << rank << "\n";
-        std::cout << "Trying to read variable " << name
-                  << " from one of the variables coming from a WAN transport\n";
+        //std::cout << "I am hooked to the DataMan library\n";
+        //std::cout << "Hello DatamanReader from rank " << rank << "\n";
+        //std::cout << "Trying to read variable " << name
+        //        << " from one of the variables coming from a WAN transport\n";
 
         // here read variable metadata (dimensions, type, etc.)...then create a
         // Variable like below:
diff --git a/source/adios2/toolkit/interop/adios1/ADIOS1Common.h b/source/adios2/toolkit/interop/adios1/ADIOS1Common.h
index 11a7e1b2e2bbdd1cf6522775fa126a67660f0a2f..d5917f2e89e6360daac1629abb8a9e7dee5dc118 100644
--- a/source/adios2/toolkit/interop/adios1/ADIOS1Common.h
+++ b/source/adios2/toolkit/interop/adios1/ADIOS1Common.h
@@ -25,6 +25,7 @@
 #endif
 
 #include "adios2/ADIOSMacros.h"
+#include "adios2/ADIOSMPICommOnly.h"
 #include "adios2/ADIOSTypes.h"
 
 namespace adios