diff --git a/NameDouble.h b/NameDouble.h
index cac0a527..f3994a01 100644
--- a/NameDouble.h
+++ b/NameDouble.h
@@ -1,14 +1,14 @@
 #if !defined(NAMEDOUBLE_H_INCLUDED)
 #define NAMEDOUBLE_H_INCLUDED
 
-#define EXTERNAL extern
+//#define EXTERNAL extern
 #include <cassert> // assert
 #include <map>     // std::map
 #include <string>  // std::string
 #include <list>    // std::list
 #include <vector>  // std::vector
 
-#include "global.h"
+//#include "global.h"
 #include "char_star.h"
 #include "Parser.h"
 class cxxNameDouble : public std::map <char *, double, CHARSTAR_LESS> 
diff --git a/PPassemblageComp.cxx b/PPassemblageComp.cxx
index f040d37a..c9a2223a 100644
--- a/PPassemblageComp.cxx
+++ b/PPassemblageComp.cxx
@@ -301,7 +301,7 @@ void cxxPPassemblageComp::mpi_unpack(int *ints, int *ii, double *doubles, int *d
 	this->moles = doubles[d++];
 	this->delta = doubles[d++];
 	this->initial_moles = doubles[d++];
-	this->dissolve_only = (bool) ints[i++];
+	this->dissolve_only = (ints[i++] != 0);
 	*ii = i;
 	*dd = d;
 }
diff --git a/SSassemblageSS.cxx b/SSassemblageSS.cxx
index 80be9d60..4754283d 100644
--- a/SSassemblageSS.cxx
+++ b/SSassemblageSS.cxx
@@ -467,7 +467,7 @@ void cxxSSassemblageSS::mpi_unpack(int *ints, int *ii, double *doubles, int *dd)
 	this->a1 = doubles[d++];
 	this->ag0 = doubles[d++];
 	this->ag1 = doubles[d++];
-	this->miscibility = (bool) ints[i++];
+	this->miscibility = (ints[i++] != 0);
 	this->xb1 = doubles[d++];
 	this->xb2 = doubles[d++];
 	*ii = i;
diff --git a/Solution.h b/Solution.h
index d2d72cbb..52c3983c 100644
--- a/Solution.h
+++ b/Solution.h
@@ -6,8 +6,8 @@
 #include "NameDouble.h"
 #include "cxxMix.h"
 
-#define EXTERNAL extern
-#include "global.h"
+//#define EXTERNAL extern
+//#include "global.h"
 #include <cassert> // assert
 #include <map>     // std::map
 #include <string>  // std::string
diff --git a/SolutionIsotopeList.h b/SolutionIsotopeList.h
index 92301ab1..6867e14c 100644
--- a/SolutionIsotopeList.h
+++ b/SolutionIsotopeList.h
@@ -1,15 +1,16 @@
 #if !defined(SOLUTIONISOTOPELIST_H_INCLUDED)
 #define SOLUTIONISOTOPELIST_H_INCLUDED
 
-#define EXTERNAL extern
+//#define EXTERNAL extern
 #include "SolutionIsotope.h"
-#include "global.h"
+//#include "global.h"
 #include <cassert> // assert
 #include <string>  // std::string
 #include <list>    // std::list
 
 #include "char_star.h"
 #include "Parser.h"
+
 class cxxSolutionIsotopeList : public std::list <cxxSolutionIsotope> 
 {
 
diff --git a/Surface.cxx b/Surface.cxx
index a2cd9246..a32e1dde 100644
--- a/Surface.cxx
+++ b/Surface.cxx
@@ -414,10 +414,10 @@ void cxxSurface::mpi_unpack(int *ints, int *ii, double *doubles, int *dd)
 		sc.mpi_unpack(ints, &i, doubles, &d);
 		this->surfaceCharges.push_back(sc);
 	}
-	this->diffuse_layer = (bool) ints[i++];
-	this->edl = (bool) ints[i++];
-	this->only_counter_ions = (bool) ints[i++];
-	this->donnan = (bool) ints[i++];
+	this->diffuse_layer = (ints[i++] != 0);
+	this->edl = (ints[i++] != 0);
+	this->only_counter_ions = (ints[i++] != 0);
+	this->donnan = (ints[i++] != 0);
 	this->thickness = doubles[d++];
 	*ii = i;
 	*dd = d;
diff --git a/cxxMix.h b/cxxMix.h
index 4f28bf3f..6084c0e5 100644
--- a/cxxMix.h
+++ b/cxxMix.h
@@ -2,8 +2,8 @@
 #define CXXMIX_H_INCLUDED
 
 #include "NumKeyword.h"
-#define EXTERNAL extern
-#include "global.h"
+//#define EXTERNAL extern
+//#include "global.h"
 #include <cassert> // assert
 #include <map>     // std::map
 #include <string>  // std::string