--- trunk/src/utils/OpenMDBitSet.cpp	2013/06/16 15:15:42	1879
+++ trunk/src/utils/OpenMDBitSet.cpp	2014/02/26 14:14:50	1969
@@ -40,6 +40,10 @@
  * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
 
+#ifdef IS_MPI
+#include <mpi.h>
+#endif
+
 #include <algorithm>
 #include <cassert>
 #include <string>
@@ -47,9 +51,6 @@
 
 #include "utils/OpenMDBitSet.hpp"
 #include "utils/Algorithm.hpp"
-#ifdef IS_MPI
-#include <mpi.h>
-#endif
 
 namespace OpenMD {
   int OpenMDBitSet::countBits() {
@@ -209,8 +210,8 @@ namespace OpenMD {
 
     std::vector<int> bsInt(bitset_.begin(), bitset_.end());
 
-    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bsInt[0], 
-                              bsInt.size(), MPI::INT, MPI::LOR);
+    MPI_Allreduce(MPI_IN_PLACE, &bsInt[0], 
+                  bsInt.size(), MPI_INT, MPI_LOR, MPI_COMM_WORLD);
 
     std::transform(bsInt.begin(), bsInt.end(), 
                    std::back_inserter( result.bitset_ ), to_bool<int>());