diff --git a/examples/heatTransfer/write/CMakeLists.txt b/examples/heatTransfer/write/CMakeLists.txt
index fb0b9f029cec18bc8b2e020d518254f37965f036..89373e645092a77f51269358b37e47dd9a538259 100644
--- a/examples/heatTransfer/write/CMakeLists.txt
+++ b/examples/heatTransfer/write/CMakeLists.txt
@@ -34,4 +34,22 @@ if(ADIOS_USE_MPI)
       adios1::adios ${MPI_C_LIBRARIES}
     )
   endif()
+
+  if(ADIOS_USE_HDF5)
+    find_package(HDF5 REQUIRED)
+    find_package(MPI COMPONENTS C REQUIRED)
+
+    add_executable(heatTransfer_write_hdf5
+      main.cpp
+      HeatTransfer.cpp
+      Settings.cpp
+      IO_hdf5_a.cpp
+    )
+    target_include_directories(heatTransfer_write_hdf5
+      PRIVATE ${MPI_C_INCLUDE_PATH} ${HDF5_INCLUDE_DIRS}
+    )
+    target_link_libraries(heatTransfer_write_hdf5
+      ${MPI_C_LIBRARIES} ${HDF5_C_LIBRARIES}
+    )
+  endif()
 endif()
diff --git a/examples/heatTransfer/write/HeatTransfer.cpp b/examples/heatTransfer/write/HeatTransfer.cpp
index eb37cadc5296a4e45590fbd1fec0f49b49a74b67..29283fa776a39650cec330d1688402a6b7f83299 100644
--- a/examples/heatTransfer/write/HeatTransfer.cpp
+++ b/examples/heatTransfer/write/HeatTransfer.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "adios2/HeatTransfer.h"
+#include "HeatTransfer.h"
 
 HeatTransfer::HeatTransfer(const Settings &settings) : m_s{settings}
 {
diff --git a/examples/heatTransfer/write/HeatTransfer.h b/examples/heatTransfer/write/HeatTransfer.h
index c1efc5fdf34064e3ec5cfb6e50bd9f80c70a8a1d..a52acbb742ba6cd617bcd2b7f94e8ec760c13cb9 100644
--- a/examples/heatTransfer/write/HeatTransfer.h
+++ b/examples/heatTransfer/write/HeatTransfer.h
@@ -15,7 +15,7 @@
 
 #include <vector>
 
-#include "adios2/Settings.h"
+#include "Settings.h"
 
 class HeatTransfer
 {
diff --git a/examples/heatTransfer/write/IO.h b/examples/heatTransfer/write/IO.h
index 8c888d26ed8852e1ac759c62061b28fa92e31e78..53caaf599fe4e1c2aac8f4cd58c216c7888adf6e 100644
--- a/examples/heatTransfer/write/IO.h
+++ b/examples/heatTransfer/write/IO.h
@@ -11,8 +11,8 @@
 #ifndef IO_H_
 #define IO_H_
 
-#include "adios2/HeatTransfer.h"
-#include "adios2/Settings.h"
+#include "HeatTransfer.h"
+#include "Settings.h"
 
 #include <mpi.h>
 
diff --git a/examples/heatTransfer/write/IO_adios1.cpp b/examples/heatTransfer/write/IO_adios1.cpp
index c858c07d9d8be5d9fafa263b9418ebbbddd3427a..898691a1d9d945cebeba5149fede4eed512cb05e 100644
--- a/examples/heatTransfer/write/IO_adios1.cpp
+++ b/examples/heatTransfer/write/IO_adios1.cpp
@@ -8,12 +8,13 @@
  *      Author: Norbert Podhorszki
  */
 
+#include "IO.h"
+
 #include <iomanip>
 #include <iostream>
 #include <string>
 
-#include "adios2/IO.h"
-#include "adios2/adios.h"
+#include <adios.h>
 
 static int64_t group;
 static int rank_saved;
diff --git a/examples/heatTransfer/write/IO_adios2.cpp b/examples/heatTransfer/write/IO_adios2.cpp
index 9eb19b2ec3b69e9e73b64e21bbd5da3de5c784bd..c16c4000d1b08e1abb344b3f1ab7f764f7e37042 100644
--- a/examples/heatTransfer/write/IO_adios2.cpp
+++ b/examples/heatTransfer/write/IO_adios2.cpp
@@ -8,11 +8,12 @@
  *      Author: Norbert Podhorszki
  */
 
-#include "adios2/IO.h"
-#include <adios2.h>
+#include "IO.h"
 
 #include <string>
 
+#include <adios2.h>
+
 static int rank_saved;
 adios::ADIOS *ad = nullptr;
 std::shared_ptr<adios::Engine> bpWriter;
diff --git a/examples/heatTransfer/write/IO_ascii.cpp b/examples/heatTransfer/write/IO_ascii.cpp
index a83e11512f3a6ac33fae3cf0d6fc3379ae38ff34..0cce79fbb04f78bbca74819a6ffe5231e2b2dda1 100644
--- a/examples/heatTransfer/write/IO_ascii.cpp
+++ b/examples/heatTransfer/write/IO_ascii.cpp
@@ -8,12 +8,12 @@
  *      Author: Norbert Podhorszki
  */
 
+#include "IO.h"
+
 #include <fstream>
 #include <iomanip>
 #include <iostream>
 
-#include "adios2/IO.h"
-
 static std::ofstream of;
 static std::streambuf *buf;
 
diff --git a/examples/heatTransfer/write/IO_hdf5_a.cpp b/examples/heatTransfer/write/IO_hdf5_a.cpp
index b63553ebd4a66b224c92245731ad5e991657500a..1100fbeb80ed0490ec6920430446bee65f70b3bf 100644
--- a/examples/heatTransfer/write/IO_hdf5_a.cpp
+++ b/examples/heatTransfer/write/IO_hdf5_a.cpp
@@ -11,13 +11,14 @@
  *      Author: Norbert Podhorszki
  */
 
+#include "IO.h"
+
 #include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <string>
 
-#include "adios2/IO.h"
-#include "adios2/hdf5.h"
+#include <hdf5.h>
 
 IO::IO(const Settings &s, MPI_Comm comm) : m_outputfilename{s.outputfile} {}
 
diff --git a/examples/heatTransfer/write/Settings.cpp b/examples/heatTransfer/write/Settings.cpp
index 7e563180978538bb48feeea8d5413a11c11c48b8..bb473192c84136344b58b5471e6f442530bb773a 100644
--- a/examples/heatTransfer/write/Settings.cpp
+++ b/examples/heatTransfer/write/Settings.cpp
@@ -8,12 +8,13 @@
  *      Author: Norbert Podhorszki
  */
 
-#include <cstdlib>
+#include "Settings.h"
+
 #include <errno.h>
 
-#include <stdexcept>
+#include <cstdlib>
 
-#include "adios2/Settings.h"
+#include <stdexcept>
 
 static unsigned int convertToUint(std::string varName, char *arg)
 {
diff --git a/examples/heatTransfer/write/main.cpp b/examples/heatTransfer/write/main.cpp
index 34b10ca2e094330ab9e469189d7bf9a4d99de8e9..657348f1d77654f6792a57c1ea0bbc0da14c8662 100644
--- a/examples/heatTransfer/write/main.cpp
+++ b/examples/heatTransfer/write/main.cpp
@@ -17,9 +17,9 @@
 #include <stdexcept>
 #include <string>
 
-#include "adios2/HeatTransfer.h"
-#include "adios2/IO.h"
-#include "adios2/Settings.h"
+#include "HeatTransfer.h"
+#include "IO.h"
+#include "Settings.h"
 
 void printUsage()
 {