diff --git a/wrap/tests/expected/geometry_wrapper.cpp b/wrap/tests/expected/geometry_wrapper.cpp
index ef9051d14..7e0cb0e47 100644
--- a/wrap/tests/expected/geometry_wrapper.cpp
+++ b/wrap/tests/expected/geometry_wrapper.cpp
@@ -6,6 +6,8 @@
 #include <boost/archive/text_oarchive.hpp>
 
 #include <folder/path/to/Test.h>
+#include <gtsam/geometry/Point2.h>
+#include <gtsam/geometry/Point3.h>
 
 typedef MyTemplate<gtsam::Point2> MyTemplatePoint2;
 typedef MyTemplate<Matrix> MyTemplateMatrix;
diff --git a/wrap/tests/expected2/geometry_wrapper.cpp b/wrap/tests/expected2/geometry_wrapper.cpp
index 475025654..ba06d1309 100644
--- a/wrap/tests/expected2/geometry_wrapper.cpp
+++ b/wrap/tests/expected2/geometry_wrapper.cpp
@@ -2,6 +2,8 @@
 #include <map>
 
 #include <folder/path/to/Test.h>
+#include <gtsam/geometry/Point2.h>
+#include <gtsam/geometry/Point3.h>
 
 typedef MyTemplate<gtsam::Point2> MyTemplatePoint2;
 typedef MyTemplate<Matrix> MyTemplateMatrix;
diff --git a/wrap/tests/geometry.h b/wrap/tests/geometry.h
index 376e39b62..74db80c81 100644
--- a/wrap/tests/geometry.h
+++ b/wrap/tests/geometry.h
@@ -5,6 +5,7 @@ virtual class ns::OtherClass;
 
 namespace gtsam {
 
+#include <gtsam/geometry/Point2.h>
 class Point2 {
  Point2();
  Point2(double x, double y);
@@ -20,6 +21,7 @@ class Point2 {
  void serializable() const; // Sets flag and creates export, but does not make serialization functions
 };
 
+#include <gtsam/geometry/Point3.h>
 class Point3 {
   Point3(double x, double y, double z);
   double norm() const;
diff --git a/wrap/tests/testWrap.cpp b/wrap/tests/testWrap.cpp
index 409a8116f..0cb35a283 100644
--- a/wrap/tests/testWrap.cpp
+++ b/wrap/tests/testWrap.cpp
@@ -152,7 +152,10 @@ TEST( wrap, Geometry ) {
   EXPECT(assert_equal("ns::OtherClass", module.forward_declarations[1].name()));
 
   // includes
-  strvec exp_includes; exp_includes += "folder/path/to/Test.h";
+  strvec exp_includes;
+  exp_includes += "gtsam/geometry/Point2.h";
+  exp_includes += "gtsam/geometry/Point3.h";
+  exp_includes += "folder/path/to/Test.h";
   EXPECT(assert_equal(exp_includes, module.includes));
 
   LONGS_EQUAL(9, module.classes.size());