commit dbc4647dab33d38a08bc3f626b8df5c120162194
Author: Ake Sandgren <ake@hpc2n.umu.se>
Date:   Tue Jan 8 18:38:20 2013 +0100

    Intel MPI needs mpi.h included before stdio.h for C++ bindings to work.

diff --git a/src/ck-core/mpi-interoperate.h b/src/ck-core/mpi-interoperate.h
index 3f89746..d8143d8 100644
--- a/src/ck-core/mpi-interoperate.h
+++ b/src/ck-core/mpi-interoperate.h
@@ -1,9 +1,7 @@
 #ifndef _MPI_INTEROPERATE_
 #define _MPI_INTEROPERATE_
 
-#include "converse.h"
-#include "ck.h"
-#include "trace.h"
+#include "conv-config.h"
 
 #if CMK_CONVERSE_MPI
 #include <mpi.h>
@@ -12,6 +10,10 @@ extern "C" void CharmLibInit(MPI_Comm userComm, int argc, char **argv);
 extern "C" void CharmLibInit(int userComm, int argc, char **argv);
 #endif
 
+#include "converse.h"
+#include "ck.h"
+#include "trace.h"
+
 extern "C" void CharmLibExit();
 
 extern "C" void LibCkExit(void);
diff --git a/src/ck-core/mpi-mainmodule.C b/src/ck-core/mpi-mainmodule.C
index e604d13..3a9ebc3 100644
--- a/src/ck-core/mpi-mainmodule.C
+++ b/src/ck-core/mpi-mainmodule.C
@@ -1,3 +1,5 @@
+#include <mpi.h>
+
 #include "mpi_main.decl.h"
 #include "mpi-interoperate.h"