diff --git a/source/adios2/ADIOS.cpp b/source/adios2/ADIOS.cpp
index d8d2e88ed3bf2e2bb093bd7a60e98d9744c72f26..ac4725a53e4257fe58e1a06bef1e10578db4fb52 100644
--- a/source/adios2/ADIOS.cpp
+++ b/source/adios2/ADIOS.cpp
@@ -17,8 +17,8 @@
 #include <sstream>
 #include <utility>
 
-#include "adios2/ADIOSMacros.h"
 #include "adios2/ADIOSMPI.h"
+#include "adios2/ADIOSMacros.h"
 #include "adios2/core/adiosFunctions.h"
 #include "adios2/engine/bp/BPFileReader.h"
 #include "adios2/engine/bp/BPFileWriter.h"
diff --git a/source/adios2/ADIOS.h b/source/adios2/ADIOS.h
index cbbb9b52b799154ebdca84d2c61ca2162c624609..0a5a23439093831d01d8efd57746369cc7135a7e 100644
--- a/source/adios2/ADIOS.h
+++ b/source/adios2/ADIOS.h
@@ -21,9 +21,9 @@
 /// \endcond
 
 #include "adios2/ADIOSConfig.h"
+#include "adios2/ADIOSMPICommOnly.h"
 #include "adios2/ADIOSMacros.h"
 #include "adios2/ADIOSTypes.h"
-#include "adios2/ADIOSMPICommOnly.h"
 #include "adios2/core/Method.h"
 #include "adios2/core/Support.h"
 #include "adios2/core/Transform.h"
diff --git a/source/adios2/ADIOSMPICommOnly.h b/source/adios2/ADIOSMPICommOnly.h
index 26b365ce4b65d435f483b27feb48acd1356404e4..f0943579943f2a5a0201b02cf61de8acc606feb3 100644
--- a/source/adios2/ADIOSMPICommOnly.h
+++ b/source/adios2/ADIOSMPICommOnly.h
@@ -13,7 +13,7 @@
 #else
 namespace adios
 {
-    using MPI_Comm = int;
+using MPI_Comm = int;
 } // end namespace adios
 #endif
 
diff --git a/source/adios2/core/Engine.h b/source/adios2/core/Engine.h
index 8609a5f1a8eae8aa81fa7646f022c1869801664d..72850a746205db792aae7b610c147e1003eb7258 100644
--- a/source/adios2/core/Engine.h
+++ b/source/adios2/core/Engine.h
@@ -23,8 +23,8 @@
 
 #include "adios2/ADIOS.h"
 #include "adios2/ADIOSConfig.h"
-#include "adios2/ADIOSTypes.h"
 #include "adios2/ADIOSMPICommOnly.h"
+#include "adios2/ADIOSTypes.h"
 #include "adios2/core/Capsule.h"
 #include "adios2/core/Method.h"
 #include "adios2/core/Transform.h"
diff --git a/source/adios2/engine/hdf5/HDF5WriterP.cpp b/source/adios2/engine/hdf5/HDF5WriterP.cpp
index 5370c2555e6ee09a13f6860d5cf55e0bb03cb845..16640b6ce7643eca219aaa101baa36211539de30 100644
--- a/source/adios2/engine/hdf5/HDF5WriterP.cpp
+++ b/source/adios2/engine/hdf5/HDF5WriterP.cpp
@@ -12,9 +12,9 @@
 
 #include <iostream> //needs to go away, this is just for demo purposes
 
-#include "adiso2/ADIOSMPI.h"
 #include "adios2/core/Support.h"
 #include "adios2/core/adiosFunctions.h" //CSVToVector
+#include "adiso2/ADIOSMPI.h"
 
 namespace adios
 {