diff --git a/examples/groupless/basic/reader.cpp b/examples/groupless/basic/reader.cpp
index 1e91476b27d48444819de5f303b1f1dcdf82f576..7f021604f0b6cfe03661993319f8353ae09c1739 100644
--- a/examples/groupless/basic/reader.cpp
+++ b/examples/groupless/basic/reader.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 int main(int argc, char *argv[])
diff --git a/examples/groupless/basic/writer.cpp b/examples/groupless/basic/writer.cpp
index cbd556ccc1cabf313b470b22fd84da2ca8ca9409..fb4e9c76d6dd212c53b8a62a03724ec7b9d9275c 100644
--- a/examples/groupless/basic/writer.cpp
+++ b/examples/groupless/basic/writer.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 namespace adios
diff --git a/examples/groupless/compound/reader.cpp b/examples/groupless/compound/reader.cpp
index 58a0e1fd69bb18293f1445ab082d2631683132b1..ddd4620854ddc000d16f10409cad3479f4e76712 100644
--- a/examples/groupless/compound/reader.cpp
+++ b/examples/groupless/compound/reader.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 int main(int argc, char *argv[])
diff --git a/examples/groupless/compound/writer.cpp b/examples/groupless/compound/writer.cpp
index f8c105e2f0508cccdf3d5322342afe0dc50c4286..9c49ddf1e528344dd6a7206b898c1b69013d65db 100644
--- a/examples/groupless/compound/writer.cpp
+++ b/examples/groupless/compound/writer.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 namespace adios
diff --git a/examples/groupless/multistep/reader_allsteps.cpp b/examples/groupless/multistep/reader_allsteps.cpp
index 1b28a82c72d71e1438c077f6b00ae88aa837a1f6..563d55369a56b23983b02e46b05483d32e38d61d 100644
--- a/examples/groupless/multistep/reader_allsteps.cpp
+++ b/examples/groupless/multistep/reader_allsteps.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 int main(int argc, char *argv[])
diff --git a/examples/groupless/multistep/reader_stepping.cpp b/examples/groupless/multistep/reader_stepping.cpp
index 5328408da4249e62be66d2157a3cdb43a57ae703..dcac907470edefb6dfd3b6ef7ba06de6a346c4c9 100644
--- a/examples/groupless/multistep/reader_stepping.cpp
+++ b/examples/groupless/multistep/reader_stepping.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 int main(int argc, char *argv[])
diff --git a/examples/groupless/multistep/writer_multistep.cpp b/examples/groupless/multistep/writer_multistep.cpp
index 696d4bdb636ed422d4872ae043505551a84e05a9..0b6b365b52721865a5dbf40d32b0757d2ccba144 100644
--- a/examples/groupless/multistep/writer_multistep.cpp
+++ b/examples/groupless/multistep/writer_multistep.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 #include <mpi.h>
 
 namespace adios
diff --git a/examples/heatTransfer/write/IO_adios2.cpp b/examples/heatTransfer/write/IO_adios2.cpp
index 0f0c06bb795e0972564d8f5884b52955a08207c9..ee3e1b0d8a42314e218c36a307a33498eb902d47 100644
--- a/examples/heatTransfer/write/IO_adios2.cpp
+++ b/examples/heatTransfer/write/IO_adios2.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "IO.h"
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 #include <string>
 
diff --git a/examples/hello/adios1Writer/helloADIOS1Writer.cpp b/examples/hello/adios1Writer/helloADIOS1Writer.cpp
index e2dd0bf435869c412bc5622f5d43d8357d4bb0b2..068a7b15157d1521e65b542954a903e4fb36984b 100644
--- a/examples/hello/adios1Writer/helloADIOS1Writer.cpp
+++ b/examples/hello/adios1Writer/helloADIOS1Writer.cpp
@@ -13,7 +13,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp b/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
index 2b850253a997c94106cd472043f05d4e7050372e..f5d1f9b72506b0c732779f655d8b6c10d619a078 100644
--- a/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
+++ b/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/bpReader/helloBPReader.cpp b/examples/hello/bpReader/helloBPReader.cpp
index 934439584aad6c69509e2191e4a5d1ee3e38e0d0..e83a66c3f7e4a88714334ef4e9843862415dc2f7 100644
--- a/examples/hello/bpReader/helloBPReader.cpp
+++ b/examples/hello/bpReader/helloBPReader.cpp
@@ -13,7 +13,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/bpReader/helloBPReader_nompi.cpp b/examples/hello/bpReader/helloBPReader_nompi.cpp
index 79de6af15eb5b0c6892d57a8a2c4b5a92d6f7009..fff9b96d42106b5975789771dcd1ad1569520084 100644
--- a/examples/hello/bpReader/helloBPReader_nompi.cpp
+++ b/examples/hello/bpReader/helloBPReader_nompi.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/bpWriter/helloBPWriter.cpp b/examples/hello/bpWriter/helloBPWriter.cpp
index 6dc601b17ba973c57d4a642197f34c0793d9ab86..e10ecea77e329238e6d730002fc061e94a2a13a6 100644
--- a/examples/hello/bpWriter/helloBPWriter.cpp
+++ b/examples/hello/bpWriter/helloBPWriter.cpp
@@ -13,7 +13,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/bpWriter/helloBPWriter_nompi.cpp b/examples/hello/bpWriter/helloBPWriter_nompi.cpp
index 68e3fcf6a79548e893939d24e264861b89861168..51f36d8aebb8a7e6f2bdfd7373f8f6b766dab51f 100644
--- a/examples/hello/bpWriter/helloBPWriter_nompi.cpp
+++ b/examples/hello/bpWriter/helloBPWriter_nompi.cpp
@@ -13,7 +13,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int /*argc*/, char ** /*argv*/)
 {
diff --git a/examples/hello/compound/helloCompound.cpp b/examples/hello/compound/helloCompound.cpp
index 32ccddd7f70ffd8f0b992f36dda2839118d07c55..50fed574af830c509dfc6c7a27ef230f312cf583 100644
--- a/examples/hello/compound/helloCompound.cpp
+++ b/examples/hello/compound/helloCompound.cpp
@@ -14,7 +14,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 struct Particle
 {
diff --git a/examples/hello/compound/helloCompound_nompi.cpp b/examples/hello/compound/helloCompound_nompi.cpp
index 52d4075ccde051180437ba06a1f7b66b9121c293..e14995a6d025483fa002cb97d54fcb296d7c350c 100644
--- a/examples/hello/compound/helloCompound_nompi.cpp
+++ b/examples/hello/compound/helloCompound_nompi.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 struct Particle
 {
diff --git a/examples/hello/datamanReader/helloDataManReader.cpp b/examples/hello/datamanReader/helloDataManReader.cpp
index 07a0099153c2b21b9dd2b54254f156ad5265fa4b..336bc0a779502415cbcc56c8372e113ee56df832 100644
--- a/examples/hello/datamanReader/helloDataManReader.cpp
+++ b/examples/hello/datamanReader/helloDataManReader.cpp
@@ -16,7 +16,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 void getcb(const void *data, std::string doid, std::string var,
            std::string dtype, std::vector<std::size_t> varshape)
diff --git a/examples/hello/datamanReader/helloDataManReader_nompi.cpp b/examples/hello/datamanReader/helloDataManReader_nompi.cpp
index cb406b450f24970146d0fcc6f4a6e270baea18f7..bfbed7b37f062b23a8c452a845a91c93c3aa3022 100644
--- a/examples/hello/datamanReader/helloDataManReader_nompi.cpp
+++ b/examples/hello/datamanReader/helloDataManReader_nompi.cpp
@@ -12,7 +12,7 @@
 #include <numeric>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 void getcb(const void *data, std::string doid, std::string var,
            std::string dtype, std::vector<std::size_t> varshape)
diff --git a/examples/hello/datamanWriter/helloDataManWriter.cpp b/examples/hello/datamanWriter/helloDataManWriter.cpp
index c6894ed08557c237aef3953a217172504a0a9066..5c413d4ac035c4d38e2cfc206537cdce6de57183 100644
--- a/examples/hello/datamanWriter/helloDataManWriter.cpp
+++ b/examples/hello/datamanWriter/helloDataManWriter.cpp
@@ -13,7 +13,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp b/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp
index aa2aed47a3ae5779ba7cbe7155b2245d32284f44..4a0b1ea989b0d47be10fe7bc67901a23eac2d3cb 100644
--- a/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp
+++ b/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/hdf5Writer/helloHDF5Writer.cpp b/examples/hello/hdf5Writer/helloHDF5Writer.cpp
index 3b32828404b86a4e3d8b7bda77a33cdce16a141b..ecfe1b940a2bf105f93f4477a23a4d02e5f02b88 100644
--- a/examples/hello/hdf5Writer/helloHDF5Writer.cpp
+++ b/examples/hello/hdf5Writer/helloHDF5Writer.cpp
@@ -10,7 +10,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp b/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
index d2c79ad1de3c4b0eb5547c8b5bb1fd1516cf1439..61ed8f26b344038285c685fcd601ea54456aac28 100644
--- a/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
+++ b/examples/hello/hdf5Writer/helloHDF5Writer_nompi.cpp
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/timeBP/timeBPWriter.cpp b/examples/hello/timeBP/timeBPWriter.cpp
index 3bcff1b4376a3157bb262ee60095a4dcf684b88c..eea25dcb201317566822493dfef238d134fe0159 100644
--- a/examples/hello/timeBP/timeBPWriter.cpp
+++ b/examples/hello/timeBP/timeBPWriter.cpp
@@ -13,7 +13,7 @@
 
 #include <mpi.h>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/hello/timeBP/timeBPWriter_nompi.cpp b/examples/hello/timeBP/timeBPWriter_nompi.cpp
index e562a5594bc179b4dcc83f42c7f49e450ba5431f..65bd8a65e210938a012cd73e93ca32e9df836712 100644
--- a/examples/hello/timeBP/timeBPWriter_nompi.cpp
+++ b/examples/hello/timeBP/timeBPWriter_nompi.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 int main(int /*argc*/, char ** /*argv*/)
 {
diff --git a/examples/solidfluid/solidfluid_write.cpp b/examples/solidfluid/solidfluid_write.cpp
index 68992800e2c9496ad51caa01b2e3e3a30e4eb66d..a746dd52b6312dce6524f318690ee369cd288ccd 100644
--- a/examples/solidfluid/solidfluid_write.cpp
+++ b/examples/solidfluid/solidfluid_write.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 using adiosFile = std::shared_ptr<adios::Engine>;
 
diff --git a/examples/solidfluid/solidfluid_write_nompi.cpp b/examples/solidfluid/solidfluid_write_nompi.cpp
index 37e641fdfcc455f318cbccfabfdf6f459ef362d7..ef8732ca2d5b951b65315298007ec30a813aa4a4 100644
--- a/examples/solidfluid/solidfluid_write_nompi.cpp
+++ b/examples/solidfluid/solidfluid_write_nompi.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "ADIOS_CPP.h"
+#include <adios2.h>
 
 using adiosFile = std::shared_ptr<adios::Engine>;