diff --git a/ompi/tools/ompi_info/components.cc b/ompi/tools/ompi_info/components.cc
index 7593c36a6e..0ba7cdfbdc 100644
--- a/ompi/tools/ompi_info/components.cc
+++ b/ompi/tools/ompi_info/components.cc
@@ -17,15 +17,17 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "ompi/runtime/params.h"
 #include "orte/runtime/runtime.h"
+#include "ompi/tools/ompi_info/ompi_info.h"
 
 #include "opal/event/event.h"
 #include "opal/mca/base/base.h"
diff --git a/ompi/tools/ompi_info/ompi_info.cc b/ompi/tools/ompi_info/ompi_info.cc
index a1ba54bbf9..581156cdc6 100644
--- a/ompi/tools/ompi_info/ompi_info.cc
+++ b/ompi/tools/ompi_info/ompi_info.cc
@@ -17,6 +17,8 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 #include <utility>
@@ -35,7 +37,6 @@
 #endif
 #include <errno.h>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/class/opal_object.h"
 #include "opal/runtime/opal.h"
@@ -46,7 +47,7 @@
 #include "opal/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "opal/mca/base/base.h"
-
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/threads/mutex.h"
 
 using namespace std;
diff --git a/ompi/tools/ompi_info/ompi_info.h b/ompi/tools/ompi_info/ompi_info.h
index 81326b1dc1..3a9a77312d 100644
--- a/ompi/tools/ompi_info/ompi_info.h
+++ b/ompi/tools/ompi_info/ompi_info.h
@@ -19,8 +19,6 @@
 #ifndef OMPI_INFO_H
 #define OMPI_INFO_H
 
-#include "ompi_config.h"
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/ompi/tools/ompi_info/output.cc b/ompi/tools/ompi_info/output.cc
index efede16749..9cb8b3dfff 100644
--- a/ompi/tools/ompi_info/output.cc
+++ b/ompi/tools/ompi_info/output.cc
@@ -16,6 +16,8 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 
diff --git a/ompi/tools/ompi_info/param.cc b/ompi/tools/ompi_info/param.cc
index 06b9b18c63..8c8c504059 100644
--- a/ompi/tools/ompi_info/param.cc
+++ b/ompi/tools/ompi_info/param.cc
@@ -16,12 +16,12 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 #include <map>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
-
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -38,6 +38,7 @@
 #include "opal/util/show_help.h"
 #include "opal/memoryhooks/memory.h"
 #include "opal/mca/base/mca_base_param.h"
+#include "ompi/tools/ompi_info/ompi_info.h"
 
 using namespace std;
 using namespace ompi_info;
diff --git a/ompi/tools/ompi_info/version.cc b/ompi/tools/ompi_info/version.cc
index 4c38f175d0..482aa003aa 100644
--- a/ompi/tools/ompi_info/version.cc
+++ b/ompi/tools/ompi_info/version.cc
@@ -16,16 +16,18 @@
 // $HEADER$
 //
 
+#include "ompi_config.h"
+
 #include <iostream>
 #include <string>
 
 #include <stdio.h>
 
-#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/version.h"
 #include "orte/version.h"
 #include "ompi/version.h"
 #include "opal/mca/base/base.h"
+#include "ompi/tools/ompi_info/ompi_info.h"
 #include "opal/util/printf.h"
 
 using namespace std;