From 90246a4daba53f2e3df6c6433b4f03b52a889137 Mon Sep 17 00:00:00 2001
From: Alex Cunningham <alexgcunningham@gmail.com>
Date: Thu, 20 Jun 2013 17:08:27 +0000
Subject: [PATCH] Rebasing...

---
 wrap/Module.cpp                          | 4 ++++
 wrap/tests/expected/geometry_wrapper.cpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index a31f57e79..79fb36c3b 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -507,6 +507,10 @@ void Module::matlab_code(const string& toolboxPath, const string& headerPath) co
   }
 
   // Generate includes while avoiding redundant includes
+  if (hasSerialiable) {
+    wrapperFile.oss << "#include <boost/archive/text_iarchive.hpp>\n";
+    wrapperFile.oss << "#include <boost/archive/text_oarchive.hpp>\n\n";
+  }
   generateIncludes(wrapperFile);
 
   // create typedef classes - we put this at the top of the wrap file so that collectors and method arguments can use these typedefs
diff --git a/wrap/tests/expected/geometry_wrapper.cpp b/wrap/tests/expected/geometry_wrapper.cpp
index e00004d57..e62806ef5 100644
--- a/wrap/tests/expected/geometry_wrapper.cpp
+++ b/wrap/tests/expected/geometry_wrapper.cpp
@@ -6,6 +6,9 @@
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
 
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+
 #include <folder/path/to/Test.h>