--- trunk/src/applications/openmd/openmd.cpp	2012/08/22 02:28:28	1782
+++ trunk/src/applications/openmd/openmd.cpp	2012/09/10 18:38:44	1796
@@ -46,6 +46,8 @@
 #endif
 
 #include <fstream>
+#include <iostream>
+#include <locale>
 #include "utils/simError.h"
 #include "utils/CaseConversion.hpp"
 #include "brains/Register.hpp"
@@ -65,12 +67,12 @@ using namespace QuantLib;
 using namespace OpenMD;
 using namespace QuantLib;
 
-int main(int argc,char* argv[]){
+int main(int argc, char* argv[]){
   
   // first things first, all of the initializations
 
 #ifdef IS_MPI
-  MPI_Init( &argc, &argv ); // the MPI communicators
+  MPI::Init( argc, argv ); // the MPI communicators
 #endif
    
   initSimError();           // the error handler
@@ -227,7 +229,7 @@ int main(int argc,char* argv[]){
   errorCheckPoint();
 
 #ifdef IS_MPI  
-  MPI_Finalize();
+  MPI::Finalize();
 #endif
 
   return 0 ;