Index: intern/elbeem/CMakeLists.txt
===================================================================
--- intern/elbeem/CMakeLists.txt	(revision 46215)
+++ intern/elbeem/CMakeLists.txt	(working copy)
@@ -86,6 +86,7 @@
 	intern/solver_interface.h
 	intern/solver_relax.h
 	intern/utilities.h
+    intern/globals.h
 )
 
 add_definitions(
Index: intern/elbeem/intern/globals.h
===================================================================
--- intern/elbeem/intern/globals.h	(revision 0)
+++ intern/elbeem/intern/globals.h	(working copy)
@@ -0,0 +1,10 @@
+/** \file elbeem/intern/globals.h
+ *  \ingroup elbeem
+ */
+
+// required globals
+
+extern bool glob_mpactive;
+
+extern int glob_mpnum;
+extern int glob_mpindex;
Index: intern/elbeem/intern/ntl_blenderdumper.cpp
===================================================================
--- intern/elbeem/intern/ntl_blenderdumper.cpp	(revision 46215)
+++ intern/elbeem/intern/ntl_blenderdumper.cpp	(working copy)
@@ -18,6 +18,7 @@
 #include "ntl_blenderdumper.h"
 #include "ntl_world.h"
 #include "solver_interface.h"
+#include "globals.h"
 
 #include <zlib.h>
 
@@ -46,10 +47,6 @@
 	debMsgStd("ntlBlenderDumper",DM_NOTIFY, "ntlBlenderDumper done", 10);
 }
 
-// required globals
-extern bool glob_mpactive;
-extern int glob_mpnum, glob_mpindex;
-
 /******************************************************************************
  * Only dump time dep. objects to file
  *****************************************************************************/
Index: intern/elbeem/intern/ntl_vector3dim.h
===================================================================
--- intern/elbeem/intern/ntl_vector3dim.h	(revision 46215)
+++ intern/elbeem/intern/ntl_vector3dim.h	(working copy)
@@ -17,6 +17,11 @@
 // under windos there seem to be strange 
 // errors when including the STL header too
 // late...
+
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES 1
+#endif
+
 #include <iostream>
 #include <map>
 #include <vector>
@@ -63,15 +68,12 @@
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
-#ifndef bool
-#define bool int
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1300
+#include <float.h>
 #endif
-#ifndef false
-#define false 0
 #endif
-#ifndef true
-#define true 1
-#endif
 
 #else // WIN32
 
@@ -102,6 +104,9 @@
 
 #ifndef M_PI
 #define M_PI 3.1415926536
+#endif
+
+#ifndef M_E
 #define M_E  2.7182818284
 #endif
 
Index: intern/elbeem/intern/ntl_world.cpp
===================================================================
--- intern/elbeem/intern/ntl_world.cpp	(revision 46215)
+++ intern/elbeem/intern/ntl_world.cpp	(working copy)
@@ -496,9 +496,6 @@
 
 
 
-extern bool glob_mpactive;
-extern int glob_mpindex;
-
 /******************************************************************************
  * Render the current scene
  * uses the global variables from the parser
Index: intern/elbeem/intern/particletracer.cpp
===================================================================
--- intern/elbeem/intern/particletracer.cpp	(revision 46215)
+++ intern/elbeem/intern/particletracer.cpp	(working copy)
@@ -19,6 +19,7 @@
 #include "ntl_matrices.h"
 #include "ntl_ray.h"
 #include "ntl_matrices.h"
+#include "globals.h"
 
 #include <zlib.h>
 
@@ -155,9 +156,6 @@
 	}
 }
 		
-extern bool glob_mpactive;
-extern int glob_mpindex,glob_mpnum;
-
 /******************************************************************************
  *! dump particles if desired 
  *****************************************************************************/
Index: intern/elbeem/intern/solver_adap.cpp
===================================================================
--- intern/elbeem/intern/solver_adap.cpp	(revision 46215)
+++ intern/elbeem/intern/solver_adap.cpp	(working copy)
@@ -928,9 +928,6 @@
 
 
 
-// required globals
-extern bool glob_mpactive;
-extern int glob_mpnum, glob_mpindex;
 #define MPTADAP_INTERV 4
 
 /*****************************************************************************/
Index: intern/elbeem/intern/solver_init.cpp
===================================================================
--- intern/elbeem/intern/solver_init.cpp	(revision 46215)
+++ intern/elbeem/intern/solver_init.cpp	(working copy)
@@ -15,7 +15,9 @@
 #include "solver_relax.h"
 // for geo init FGI_ defines
 #include "elbeem.h"
+#include "globals.h"
 
+
 // helper for 2d init
 #define SWAPYZ(vec) { \
 		const LbmFloat tmp = (vec)[2]; \
@@ -296,9 +298,6 @@
 #endif  // LBMDIM==2
 
 
-// required globals
-extern bool glob_mpactive;
-extern int glob_mpnum, glob_mpindex;
 
 
 /******************************************************************************
Index: intern/elbeem/intern/solver_main.cpp
===================================================================
--- intern/elbeem/intern/solver_main.cpp	(revision 46215)
+++ intern/elbeem/intern/solver_main.cpp	(working copy)
@@ -14,6 +14,8 @@
 #include "solver_relax.h"
 #include "particletracer.h"
 #include "loop_tools.h"
+#include "globals.h"
+
 #include <stdlib.h>
 
 /*****************************************************************************/
@@ -24,8 +26,6 @@
 double globdfavg[19];
 double globdfmax[19];
 double globdfmin[19];
-extern int glob_mpindex,glob_mpnum;
-extern bool globOutstrForce;
 
 // simulation object interface
 void LbmFsgrSolver::step() { 
Index: intern/elbeem/intern/solver_relax.h
===================================================================
--- intern/elbeem/intern/solver_relax.h	(revision 46215)
+++ intern/elbeem/intern/solver_relax.h	(working copy)
@@ -390,7 +390,7 @@
 #define  DEFAULT_STREAM  \
 	m[dC] = RAC(ccel,dC); \
 	 \
-	if(((!nbored) & CFBnd)) { \
+	if(!(nbored & CFBnd)) { \
 	 \
 	m[dN ] = CSRC_N ; m[dS ] = CSRC_S ; \
 	m[dE ] = CSRC_E ; m[dW ] = CSRC_W ; \
Index: intern/elbeem/intern/solver_util.cpp
===================================================================
--- intern/elbeem/intern/solver_util.cpp	(revision 46215)
+++ intern/elbeem/intern/solver_util.cpp	(working copy)
@@ -18,6 +18,8 @@
 #include "ntl_world.h"
 #include "simulation_object.h"
 
+#include "globals.h"
+
 #include <stdlib.h>
 #include <zlib.h>
 #ifndef sqrtf
@@ -31,10 +33,6 @@
 // try to enhance surface?
 #define SURFACE_ENH 2
 
-extern bool glob_mpactive;
-extern bool glob_mpnum;
-extern bool glob_mpindex;
-
 //! for raytracing
 void LbmFsgrSolver::prepareVisualization( void ) {
 	int lev = mMaxRefine;