diff --git a/wrap/tests/expected/@Point2/argChar.cpp b/wrap/tests/expected/@Point2/argChar.cpp
index 017fe1761..18548ee8f 100644
--- a/wrap/tests/expected/@Point2/argChar.cpp
+++ b/wrap/tests/expected/@Point2/argChar.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("argChar",nargout,nargin-1,1);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   char a = unwrap< char >(in[1]);
   self->argChar(a);
 }
diff --git a/wrap/tests/expected/@Point2/argUChar.cpp b/wrap/tests/expected/@Point2/argUChar.cpp
index 341e4f8a7..bbaa65a8f 100644
--- a/wrap/tests/expected/@Point2/argUChar.cpp
+++ b/wrap/tests/expected/@Point2/argUChar.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("argUChar",nargout,nargin-1,1);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   unsigned char a = unwrap< unsigned char >(in[1]);
   self->argUChar(a);
 }
diff --git a/wrap/tests/expected/@Point2/dim.cpp b/wrap/tests/expected/@Point2/dim.cpp
index 454153690..1349dc267 100644
--- a/wrap/tests/expected/@Point2/dim.cpp
+++ b/wrap/tests/expected/@Point2/dim.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("dim",nargout,nargin-1,0);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   int result = self->dim();
   out[0] = wrap< int >(result);
 }
diff --git a/wrap/tests/expected/@Point2/returnChar.cpp b/wrap/tests/expected/@Point2/returnChar.cpp
index 3b7733862..c5b67a018 100644
--- a/wrap/tests/expected/@Point2/returnChar.cpp
+++ b/wrap/tests/expected/@Point2/returnChar.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("returnChar",nargout,nargin-1,0);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   char result = self->returnChar();
   out[0] = wrap< char >(result);
 }
diff --git a/wrap/tests/expected/@Point2/vectorConfusion.cpp b/wrap/tests/expected/@Point2/vectorConfusion.cpp
index 90be4194b..bb6f02927 100644
--- a/wrap/tests/expected/@Point2/vectorConfusion.cpp
+++ b/wrap/tests/expected/@Point2/vectorConfusion.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("vectorConfusion",nargout,nargin-1,0);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   VectorNotEigen result = self->vectorConfusion();
   out[0] = wrap_shared_ptr(make_shared< VectorNotEigen >(result),"VectorNotEigen");
 }
diff --git a/wrap/tests/expected/@Point2/x.cpp b/wrap/tests/expected/@Point2/x.cpp
index 8df8c6bbc..65e56cae5 100644
--- a/wrap/tests/expected/@Point2/x.cpp
+++ b/wrap/tests/expected/@Point2/x.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("x",nargout,nargin-1,0);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   double result = self->x();
   out[0] = wrap< double >(result);
 }
diff --git a/wrap/tests/expected/@Point2/y.cpp b/wrap/tests/expected/@Point2/y.cpp
index 14e3663ed..f8e10dc5d 100644
--- a/wrap/tests/expected/@Point2/y.cpp
+++ b/wrap/tests/expected/@Point2/y.cpp
@@ -4,7 +4,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("y",nargout,nargin-1,0);
-  shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
+  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
   double result = self->y();
   out[0] = wrap< double >(result);
 }
diff --git a/wrap/tests/expected/@Point3/norm.cpp b/wrap/tests/expected/@Point3/norm.cpp
index 9936958d7..0c7ac2038 100644
--- a/wrap/tests/expected/@Point3/norm.cpp
+++ b/wrap/tests/expected/@Point3/norm.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("norm",nargout,nargin-1,0);
-  shared_ptr<Point3> self = unwrap_shared_ptr< Point3 >(in[0],"Point3");
+  boost::shared_ptr<Point3> self = unwrap_shared_ptr< Point3 >(in[0],"Point3");
   double result = self->norm();
   out[0] = wrap< double >(result);
 }
diff --git a/wrap/tests/expected/@Test/arg_EigenConstRef.cpp b/wrap/tests/expected/@Test/arg_EigenConstRef.cpp
index 487741c07..09a5c6f62 100644
--- a/wrap/tests/expected/@Test/arg_EigenConstRef.cpp
+++ b/wrap/tests/expected/@Test/arg_EigenConstRef.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("arg_EigenConstRef",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Matrix& value = *unwrap_shared_ptr< Matrix >(in[1], "Matrix");
   self->arg_EigenConstRef(value);
 }
diff --git a/wrap/tests/expected/@Test/create_MixedPtrs.cpp b/wrap/tests/expected/@Test/create_MixedPtrs.cpp
index 269bb990c..9c685d6cf 100644
--- a/wrap/tests/expected/@Test/create_MixedPtrs.cpp
+++ b/wrap/tests/expected/@Test/create_MixedPtrs.cpp
@@ -5,8 +5,8 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("create_MixedPtrs",nargout,nargin-1,0);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  pair< Test, shared_ptr<Test> > result = self->create_MixedPtrs();
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  pair< Test, boost::shared_ptr<Test> > result = self->create_MixedPtrs();
   out[0] = wrap_shared_ptr(make_shared< Test >(result.first),"Test");
   out[1] = wrap_shared_ptr(result.second,"Test");
 }
diff --git a/wrap/tests/expected/@Test/create_ptrs.cpp b/wrap/tests/expected/@Test/create_ptrs.cpp
index bfd9f39bf..830d62a12 100644
--- a/wrap/tests/expected/@Test/create_ptrs.cpp
+++ b/wrap/tests/expected/@Test/create_ptrs.cpp
@@ -5,8 +5,8 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("create_ptrs",nargout,nargin-1,0);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  pair< shared_ptr<Test>, shared_ptr<Test> > result = self->create_ptrs();
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  pair< boost::shared_ptr<Test>, boost::shared_ptr<Test> > result = self->create_ptrs();
   out[0] = wrap_shared_ptr(result.first,"Test");
   out[1] = wrap_shared_ptr(result.second,"Test");
 }
diff --git a/wrap/tests/expected/@Test/print.cpp b/wrap/tests/expected/@Test/print.cpp
index e93f5f09a..1d259f2e8 100644
--- a/wrap/tests/expected/@Test/print.cpp
+++ b/wrap/tests/expected/@Test/print.cpp
@@ -5,6 +5,6 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("print",nargout,nargin-1,0);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   self->print();
 }
diff --git a/wrap/tests/expected/@Test/return_Point2Ptr.cpp b/wrap/tests/expected/@Test/return_Point2Ptr.cpp
index 9ad2a4360..e6990198e 100644
--- a/wrap/tests/expected/@Test/return_Point2Ptr.cpp
+++ b/wrap/tests/expected/@Test/return_Point2Ptr.cpp
@@ -5,8 +5,8 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_Point2Ptr",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   bool value = unwrap< bool >(in[1]);
-  shared_ptr<Point2> result = self->return_Point2Ptr(value);
+  boost::shared_ptr<Point2> result = self->return_Point2Ptr(value);
   out[0] = wrap_shared_ptr(result,"Point2");
 }
diff --git a/wrap/tests/expected/@Test/return_Test.cpp b/wrap/tests/expected/@Test/return_Test.cpp
index 73c63a899..458e0c74d 100644
--- a/wrap/tests/expected/@Test/return_Test.cpp
+++ b/wrap/tests/expected/@Test/return_Test.cpp
@@ -5,8 +5,8 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_Test",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  shared_ptr<Test> value = unwrap_shared_ptr< Test >(in[1], "Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> value = unwrap_shared_ptr< Test >(in[1], "Test");
   Test result = self->return_Test(value);
   out[0] = wrap_shared_ptr(make_shared< Test >(result),"Test");
 }
diff --git a/wrap/tests/expected/@Test/return_TestPtr.cpp b/wrap/tests/expected/@Test/return_TestPtr.cpp
index 607e48cfd..3c053791d 100644
--- a/wrap/tests/expected/@Test/return_TestPtr.cpp
+++ b/wrap/tests/expected/@Test/return_TestPtr.cpp
@@ -5,8 +5,8 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_TestPtr",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  shared_ptr<Test> value = unwrap_shared_ptr< Test >(in[1], "Test");
-  shared_ptr<Test> result = self->return_TestPtr(value);
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> value = unwrap_shared_ptr< Test >(in[1], "Test");
+  boost::shared_ptr<Test> result = self->return_TestPtr(value);
   out[0] = wrap_shared_ptr(result,"Test");
 }
diff --git a/wrap/tests/expected/@Test/return_bool.cpp b/wrap/tests/expected/@Test/return_bool.cpp
index d700ead2b..92612a279 100644
--- a/wrap/tests/expected/@Test/return_bool.cpp
+++ b/wrap/tests/expected/@Test/return_bool.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_bool",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   bool value = unwrap< bool >(in[1]);
   bool result = self->return_bool(value);
   out[0] = wrap< bool >(result);
diff --git a/wrap/tests/expected/@Test/return_double.cpp b/wrap/tests/expected/@Test/return_double.cpp
index 38770e1cd..e167a16c0 100644
--- a/wrap/tests/expected/@Test/return_double.cpp
+++ b/wrap/tests/expected/@Test/return_double.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_double",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   double value = unwrap< double >(in[1]);
   double result = self->return_double(value);
   out[0] = wrap< double >(result);
diff --git a/wrap/tests/expected/@Test/return_field.cpp b/wrap/tests/expected/@Test/return_field.cpp
index b5e067801..838bab0a4 100644
--- a/wrap/tests/expected/@Test/return_field.cpp
+++ b/wrap/tests/expected/@Test/return_field.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_field",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Test& t = *unwrap_shared_ptr< Test >(in[1], "Test");
   bool result = self->return_field(t);
   out[0] = wrap< bool >(result);
diff --git a/wrap/tests/expected/@Test/return_int.cpp b/wrap/tests/expected/@Test/return_int.cpp
index e2dfd25e8..4cdaf5abc 100644
--- a/wrap/tests/expected/@Test/return_int.cpp
+++ b/wrap/tests/expected/@Test/return_int.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_int",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   int value = unwrap< int >(in[1]);
   int result = self->return_int(value);
   out[0] = wrap< int >(result);
diff --git a/wrap/tests/expected/@Test/return_matrix1.cpp b/wrap/tests/expected/@Test/return_matrix1.cpp
index 8bb9acff8..f7fb72040 100644
--- a/wrap/tests/expected/@Test/return_matrix1.cpp
+++ b/wrap/tests/expected/@Test/return_matrix1.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_matrix1",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Matrix value = unwrap< Matrix >(in[1]);
   Matrix result = self->return_matrix1(value);
   out[0] = wrap< Matrix >(result);
diff --git a/wrap/tests/expected/@Test/return_matrix2.cpp b/wrap/tests/expected/@Test/return_matrix2.cpp
index f1a22da47..f8b6823fa 100644
--- a/wrap/tests/expected/@Test/return_matrix2.cpp
+++ b/wrap/tests/expected/@Test/return_matrix2.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_matrix2",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Matrix value = unwrap< Matrix >(in[1]);
   Matrix result = self->return_matrix2(value);
   out[0] = wrap< Matrix >(result);
diff --git a/wrap/tests/expected/@Test/return_pair.cpp b/wrap/tests/expected/@Test/return_pair.cpp
index 8f6949d7c..54b3f6522 100644
--- a/wrap/tests/expected/@Test/return_pair.cpp
+++ b/wrap/tests/expected/@Test/return_pair.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_pair",nargout,nargin-1,2);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Vector v = unwrap< Vector >(in[1]);
   Matrix A = unwrap< Matrix >(in[2]);
   pair< Vector, Matrix > result = self->return_pair(v,A);
diff --git a/wrap/tests/expected/@Test/return_ptrs.cpp b/wrap/tests/expected/@Test/return_ptrs.cpp
index 20d6c57fe..eea94ca3c 100644
--- a/wrap/tests/expected/@Test/return_ptrs.cpp
+++ b/wrap/tests/expected/@Test/return_ptrs.cpp
@@ -5,10 +5,10 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_ptrs",nargout,nargin-1,2);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  shared_ptr<Test> p1 = unwrap_shared_ptr< Test >(in[1], "Test");
-  shared_ptr<Test> p2 = unwrap_shared_ptr< Test >(in[2], "Test");
-  pair< shared_ptr<Test>, shared_ptr<Test> > result = self->return_ptrs(p1,p2);
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> p1 = unwrap_shared_ptr< Test >(in[1], "Test");
+  boost::shared_ptr<Test> p2 = unwrap_shared_ptr< Test >(in[2], "Test");
+  pair< boost::shared_ptr<Test>, boost::shared_ptr<Test> > result = self->return_ptrs(p1,p2);
   out[0] = wrap_shared_ptr(result.first,"Test");
   out[1] = wrap_shared_ptr(result.second,"Test");
 }
diff --git a/wrap/tests/expected/@Test/return_size_t.cpp b/wrap/tests/expected/@Test/return_size_t.cpp
index 6b12a167b..901c5c9bd 100644
--- a/wrap/tests/expected/@Test/return_size_t.cpp
+++ b/wrap/tests/expected/@Test/return_size_t.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_size_t",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   size_t value = unwrap< size_t >(in[1]);
   size_t result = self->return_size_t(value);
   out[0] = wrap< size_t >(result);
diff --git a/wrap/tests/expected/@Test/return_string.cpp b/wrap/tests/expected/@Test/return_string.cpp
index c05a57fba..778e07522 100644
--- a/wrap/tests/expected/@Test/return_string.cpp
+++ b/wrap/tests/expected/@Test/return_string.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_string",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   string value = unwrap< string >(in[1]);
   string result = self->return_string(value);
   out[0] = wrap< string >(result);
diff --git a/wrap/tests/expected/@Test/return_vector1.cpp b/wrap/tests/expected/@Test/return_vector1.cpp
index 3710e5d48..5e8aed397 100644
--- a/wrap/tests/expected/@Test/return_vector1.cpp
+++ b/wrap/tests/expected/@Test/return_vector1.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_vector1",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Vector value = unwrap< Vector >(in[1]);
   Vector result = self->return_vector1(value);
   out[0] = wrap< Vector >(result);
diff --git a/wrap/tests/expected/@Test/return_vector2.cpp b/wrap/tests/expected/@Test/return_vector2.cpp
index 72564f05c..4c3242f2e 100644
--- a/wrap/tests/expected/@Test/return_vector2.cpp
+++ b/wrap/tests/expected/@Test/return_vector2.cpp
@@ -5,7 +5,7 @@ using namespace geometry;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_vector2",nargout,nargin-1,1);
-  shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
   Vector value = unwrap< Vector >(in[1]);
   Vector result = self->return_vector2(value);
   out[0] = wrap< Vector >(result);
diff --git a/wrap/tests/expected/make_geometry.m b/wrap/tests/expected/make_geometry.m
index 7baac182f..2858f2994 100644
--- a/wrap/tests/expected/make_geometry.m
+++ b/wrap/tests/expected/make_geometry.m
@@ -2,7 +2,7 @@
 echo on
 
 toolboxpath = mfilename('fullpath');
-delims = find(toolboxpath == '/');
+delims = find(toolboxpath == '/' | toolboxpath == '\');
 toolboxpath = toolboxpath(1:(delims(end)-1));
 clear delims
 addpath(toolboxpath);
diff --git a/wrap/tests/expected_namespaces/@ns2ClassA/memberFunction.cpp b/wrap/tests/expected_namespaces/@ns2ClassA/memberFunction.cpp
index 8e5bc3960..514e5db08 100644
--- a/wrap/tests/expected_namespaces/@ns2ClassA/memberFunction.cpp
+++ b/wrap/tests/expected_namespaces/@ns2ClassA/memberFunction.cpp
@@ -5,7 +5,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("memberFunction",nargout,nargin-1,0);
-  shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
+  boost::shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
   double result = self->memberFunction();
   out[0] = wrap< double >(result);
 }
diff --git a/wrap/tests/expected_namespaces/@ns2ClassA/nsArg.cpp b/wrap/tests/expected_namespaces/@ns2ClassA/nsArg.cpp
index 7c06bcfdc..789b0815e 100644
--- a/wrap/tests/expected_namespaces/@ns2ClassA/nsArg.cpp
+++ b/wrap/tests/expected_namespaces/@ns2ClassA/nsArg.cpp
@@ -5,7 +5,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("nsArg",nargout,nargin-1,1);
-  shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
+  boost::shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
   ns1::ClassB& arg = *unwrap_shared_ptr< ns1::ClassB >(in[1], "ns1ClassB");
   int result = self->nsArg(arg);
   out[0] = wrap< int >(result);
diff --git a/wrap/tests/expected_namespaces/@ns2ClassA/nsReturn.cpp b/wrap/tests/expected_namespaces/@ns2ClassA/nsReturn.cpp
index c6714ee9f..826e30c8c 100644
--- a/wrap/tests/expected_namespaces/@ns2ClassA/nsReturn.cpp
+++ b/wrap/tests/expected_namespaces/@ns2ClassA/nsReturn.cpp
@@ -5,7 +5,7 @@
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("nsReturn",nargout,nargin-1,1);
-  shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
+  boost::shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
   double q = unwrap< double >(in[1]);
   ns2::ns3::ClassB result = self->nsReturn(q);
   out[0] = wrap_shared_ptr(make_shared< ns2::ns3::ClassB >(result),"ns2ns3ClassB");
diff --git a/wrap/tests/expected_namespaces/make_testNamespaces.m b/wrap/tests/expected_namespaces/make_testNamespaces.m
index eac4146c8..d835a2da0 100644
--- a/wrap/tests/expected_namespaces/make_testNamespaces.m
+++ b/wrap/tests/expected_namespaces/make_testNamespaces.m
@@ -2,7 +2,7 @@
 echo on
 
 toolboxpath = mfilename('fullpath');
-delims = find(toolboxpath == '/');
+delims = find(toolboxpath == '/' | toolboxpath == '\');
 toolboxpath = toolboxpath(1:(delims(end)-1));
 clear delims
 addpath(toolboxpath);