diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
index 7099e25b265fc69134904739ca277005eaceaac7..98e2c4ac25dcdc10b65df177971933d7c0b6d46f 100644
--- a/source/adios2/CMakeLists.txt
+++ b/source/adios2/CMakeLists.txt
@@ -106,6 +106,7 @@ if(ADIOS_USE_HDF5)
   target_sources(adios2 PRIVATE
     engine/hdf5/HDF5ReaderP.cpp
     engine/hdf5/HDF5WriterP.cpp
+    engine/hdf5/HDF5Common.cpp
   )
   target_link_libraries(adios2 PRIVATE ${HDF5_C_LIBRARIES})
 endif()
diff --git a/source/adios2/engine/hdf5/HDF5Common.cpp b/source/adios2/engine/hdf5/HDF5Common.cpp
index 2ce2913985029b44fcaccc54e1627eac9af54861..0862a6babc21f8f2d417c01fbb0d9bc6b970e5b6 100644
--- a/source/adios2/engine/hdf5/HDF5Common.cpp
+++ b/source/adios2/engine/hdf5/HDF5Common.cpp
@@ -8,9 +8,11 @@
  *      Author: Junmin
  */
 
+#include "HDF5Common.h"
+
 #include <iostream> //needs to go away, this is just for demo purposes
 
-#include "engine/hdf5/HDF5Common.h"
+#include "adios2/ADIOSMPI.h"
 
 namespace adios
 {
diff --git a/source/adios2/engine/hdf5/HDF5Common.h b/source/adios2/engine/hdf5/HDF5Common.h
index d5978b53416aa3ac8fb42ff083f2083c2a2a1be9..d12994c1cdb24a08ee3c9741c007527812e91bc4 100644
--- a/source/adios2/engine/hdf5/HDF5Common.h
+++ b/source/adios2/engine/hdf5/HDF5Common.h
@@ -1,4 +1,3 @@
-
 /*
  * Distributed under the OSI-approved Apache License, Version 2.0.  See
  * accompanying file Copyright.txt for details.
@@ -12,8 +11,8 @@
 #ifndef HDF5_COMMON_P_H_
 #define HDF5_COMMON_P_H_
 
-#include "core/Engine.h"
-#include "ADIOS_MPI.h"
+#include "adios2/core/Engine.h"
+#include "adios2/ADIOSMPICommOnly.h"
 
 #include <hdf5.h>