Index: /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp
===================================================================
--- /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp	(revision 12017)
@@ -9,6 +9,4 @@
 #endif
 
-
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
 
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
@@ -37,4 +35,2 @@
 	return 1;
 }
-
-#endif
Index: /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp
===================================================================
--- /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp	(revision 12017)
@@ -16,5 +16,4 @@
 #include "../../shared/shared.h"
 
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
 /*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{1*/
 void FetchData(char** pstring,PyObject* py_unicode){
@@ -72,3 +71,2 @@
 }
 /*}}}*/
-#endif
Index: /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp
===================================================================
--- /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp	(revision 12017)
@@ -8,6 +8,4 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
 
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
@@ -66,4 +64,2 @@
 }
 /*}}}*/
-
-#endif
Index: /issm/trunk-jpl/src/c/python/objects/Bamg/BamgGeom.cpp
===================================================================
--- /issm/trunk-jpl/src/c/python/objects/Bamg/BamgGeom.cpp	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/objects/Bamg/BamgGeom.cpp	(revision 12017)
@@ -1,6 +1,11 @@
+/*!\file BamgGeom.cpp
+ */
+
 #include <stdio.h>
-#include "../objects.h"
-#include "../../io/io.h"
-#include "../../shared/shared.h"
+#include "../../../objects/objects.h"
+#include "../../../io/io.h"
+#include "../../../shared/shared.h"
+#include "../../io/pythonio.h"
+
 
 /*Constructors/Destructors*/
Index: /issm/trunk-jpl/src/c/python/objects/Bamg/BamgMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/c/python/objects/Bamg/BamgMesh.cpp	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/objects/Bamg/BamgMesh.cpp	(revision 12017)
@@ -1,6 +1,11 @@
+/*!\file BamgMesh.cpp
+ */
+
 #include <stdio.h>
-#include "../objects.h"
-#include "../../io/io.h"
-#include "../../shared/shared.h"
+#include "../../../objects/objects.h"
+#include "../../../io/io.h"
+#include "../../../shared/shared.h"
+#include "../../io/pythonio.h"
+
 
 /*Constructors/Destructors*/
Index: /issm/trunk-jpl/src/c/python/objects/Bamg/BamgOpts.cpp
===================================================================
--- /issm/trunk-jpl/src/c/python/objects/Bamg/BamgOpts.cpp	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/objects/Bamg/BamgOpts.cpp	(revision 12017)
@@ -1,7 +1,11 @@
+/*!\file BamgOpts.cpp
+ */
+
 #include <stdio.h>
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../objects.h"
-#include "../../io/io.h"
+#include "../../../objects/objects.h"
+#include "../../../io/io.h"
+#include "../../../shared/shared.h"
+#include "../../io/pythonio.h"
+#include "../../../include/include.h"
 
 /*Constructors/Destructors*/
Index: /issm/trunk-jpl/src/c/python/python-binding.h
===================================================================
--- /issm/trunk-jpl/src/c/python/python-binding.h	(revision 12016)
+++ /issm/trunk-jpl/src/c/python/python-binding.h	(revision 12017)
@@ -4,3 +4,4 @@
 #include "./io/pythonio.h"
 #include "./include/python_macros.h"
+
 #endif
Index: /issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h	(revision 12016)
+++ /issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h	(revision 12017)
@@ -9,6 +9,4 @@
 #include "Python.h"
 #include "arrayobject.h"
-
-
 
 #ifdef _HAVE_BOOST_
Index: /issm/trunk-jpl/src/c/toolkits/toolkits.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/toolkits.h	(revision 12016)
+++ /issm/trunk-jpl/src/c/toolkits/toolkits.h	(revision 12017)
@@ -12,5 +12,5 @@
 #endif
 
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
+#ifdef _HAVE_PYTHON_
 #include "./python/pythonincludes.h"
 #endif
Index: /issm/trunk-jpl/test/NightlyRun/test101.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test101.py	(revision 12016)
+++ /issm/trunk-jpl/test/NightlyRun/test101.py	(revision 12017)
@@ -1,4 +1,4 @@
 from model import *
-from TriMesh.Python import *
+from TriMesh import *
 
 #md=model()