diff --git a/src/mpi/examples/mpi-test-fixtures.cc b/src/mpi/examples/mpi-test-fixtures.cc
index 6cd9063d1..5d0ef59a4 100644
--- a/src/mpi/examples/mpi-test-fixtures.cc
+++ b/src/mpi/examples/mpi-test-fixtures.cc
@@ -19,8 +19,6 @@
 
 #include "mpi-test-fixtures.h"
 
-#include "mpi.h"
-
 #include "ns3/address.h"
 #include "ns3/inet-socket-address.h"
 #include "ns3/inet6-socket-address.h"
@@ -28,6 +26,8 @@
 #include "ns3/ptr.h"
 #include "ns3/simulator.h"
 
+#include <mpi.h>
+
 namespace ns3
 {
 
diff --git a/src/mpi/examples/simple-distributed-empty-node.cc b/src/mpi/examples/simple-distributed-empty-node.cc
index 873def8a3..7b5b58a38 100644
--- a/src/mpi/examples/simple-distributed-empty-node.cc
+++ b/src/mpi/examples/simple-distributed-empty-node.cc
@@ -64,7 +64,6 @@
  */
 
 #include "mpi-test-fixtures.h"
-#include "mpi.h"
 
 #include "ns3/core-module.h"
 #include "ns3/internet-stack-helper.h"
@@ -77,6 +76,8 @@
 #include "ns3/packet-sink-helper.h"
 #include "ns3/point-to-point-helper.h"
 
+#include <mpi.h>
+
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE("SimpleDistributedEmptyNode");
diff --git a/src/mpi/examples/simple-distributed-mpi-comm.cc b/src/mpi/examples/simple-distributed-mpi-comm.cc
index 2c6cd583f..621d43f2b 100644
--- a/src/mpi/examples/simple-distributed-mpi-comm.cc
+++ b/src/mpi/examples/simple-distributed-mpi-comm.cc
@@ -55,7 +55,6 @@
  */
 
 #include "mpi-test-fixtures.h"
-#include "mpi.h"
 
 #include "ns3/core-module.h"
 #include "ns3/internet-stack-helper.h"
@@ -71,6 +70,8 @@
 #include "ns3/packet-sink.h"
 #include "ns3/point-to-point-helper.h"
 
+#include <mpi.h>
+
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE("SimpleDistributedMpiComm");
diff --git a/src/mpi/model/granted-time-window-mpi-interface.h b/src/mpi/model/granted-time-window-mpi-interface.h
index aeff73761..e54316bb5 100644
--- a/src/mpi/model/granted-time-window-mpi-interface.h
+++ b/src/mpi/model/granted-time-window-mpi-interface.h
@@ -27,13 +27,13 @@
 #ifndef NS3_GRANTED_TIME_WINDOW_MPI_INTERFACE_H
 #define NS3_GRANTED_TIME_WINDOW_MPI_INTERFACE_H
 
-#include "mpi.h"
 #include "parallel-communication-interface.h"
 
 #include "ns3/buffer.h"
 #include "ns3/nstime.h"
 
 #include <list>
+#include <mpi.h>
 #include <stdint.h>
 
 namespace ns3
diff --git a/src/mpi/model/mpi-interface.h b/src/mpi/model/mpi-interface.h
index bc12d685e..4d1371ca0 100644
--- a/src/mpi/model/mpi-interface.h
+++ b/src/mpi/model/mpi-interface.h
@@ -26,11 +26,11 @@
 #ifndef NS3_MPI_INTERFACE_H
 #define NS3_MPI_INTERFACE_H
 
-#include "mpi.h"
-
 #include <ns3/nstime.h>
 #include <ns3/packet.h>
 
+#include <mpi.h>
+
 namespace ns3
 {
 /**
diff --git a/src/mpi/model/null-message-mpi-interface.h b/src/mpi/model/null-message-mpi-interface.h
index 112e8559c..4b22d9c79 100644
--- a/src/mpi/model/null-message-mpi-interface.h
+++ b/src/mpi/model/null-message-mpi-interface.h
@@ -26,13 +26,13 @@
 #ifndef NS3_NULLMESSAGE_MPI_INTERFACE_H
 #define NS3_NULLMESSAGE_MPI_INTERFACE_H
 
-#include "mpi.h"
 #include "parallel-communication-interface.h"
 
 #include <ns3/buffer.h>
 #include <ns3/nstime.h>
 
 #include <list>
+#include <mpi.h>
 
 namespace ns3
 {
diff --git a/src/mpi/model/parallel-communication-interface.h b/src/mpi/model/parallel-communication-interface.h
index 297dd06aa..7da9e52dd 100644
--- a/src/mpi/model/parallel-communication-interface.h
+++ b/src/mpi/model/parallel-communication-interface.h
@@ -27,14 +27,13 @@
 #ifndef NS3_PARALLEL_COMMUNICATION_INTERFACE_H
 #define NS3_PARALLEL_COMMUNICATION_INTERFACE_H
 
-#include "mpi.h"
-
 #include <ns3/buffer.h>
 #include <ns3/nstime.h>
 #include <ns3/object.h>
 #include <ns3/packet.h>
 
 #include <list>
+#include <mpi.h>
 #include <stdint.h>
 
 namespace ns3