Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 1060)
+++ /issm/trunk/src/c/Makefile.am	(revision 1061)
@@ -1,3 +1,3 @@
-INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @PLAPACKINCL@  @BLASLAPACKINCL@ @MUMPSINCL@  @TRIANGLEINCL@
+INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@
 
 #Compile serial library, and then try and compile parallel library
@@ -578,5 +578,5 @@
 endif
 
-LDADD = ./libpISSM.a $(TRIANGLELIB) $(METISLIB) $(PETSCLIB) $(DAKOTALIB) $(SLEPCLIB) $(MUMPSLIB) $(PLAPACKLIB)  $(MPILIB) $(X_LIBS) -lX11 $(BLASLAPACKLIB) $(SCALAPACKLIB) $(BLACSLIB) $(FLIBS)
+LDADD = ./libpISSM.a $(METISLIB) $(PETSCLIB) $(DAKOTALIB) $(SLEPCLIB) $(MUMPSLIB) $(PLAPACKLIB)  $(MPILIB) $(X_LIBS) -lX11 $(BLASLAPACKLIB) $(MKLLIB) $(SCALAPACKLIB) $(BLACSLIB) $(FLIBS)
 
 diagnostic_exe_SOURCES = parallel/diagnostic.cpp
Index: /issm/trunk/src/c/shared/TriMesh/trimesh.h
===================================================================
--- /issm/trunk/src/c/shared/TriMesh/trimesh.h	(revision 1060)
+++ /issm/trunk/src/c/shared/TriMesh/trimesh.h	(revision 1061)
@@ -10,5 +10,5 @@
 #include <math.h>
 
-#define REAL double
+//#define REAL double //took  it out because it may conflict with stdlib.h defines. put back if necessary
 
 int AssociateSegmentToElement(double** psegments,int nseg, double* index,int nel);
Index: /issm/trunk/src/c/toolkits/petsc/patches/SerialToVec.cpp
===================================================================
--- /issm/trunk/src/c/toolkits/petsc/patches/SerialToVec.cpp	(revision 1060)
+++ /issm/trunk/src/c/toolkits/petsc/patches/SerialToVec.cpp	(revision 1061)
@@ -15,5 +15,7 @@
 
 /*Matlab includes: */
+#ifdef _SERIAL_
 #include "mex.h"
+#endif
 
 #include "../../../shared/shared.h"