diff --git a/.gitignore b/.gitignore
index cde059767b..e6e38132f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .idea
 *.pyc
 *.DS_Store
+*.swp
 /examples/Data/dubrovnik-3-7-pre-rewritten.txt
 /examples/Data/pose2example-rewritten.txt
 /examples/Data/pose3example-rewritten.txt
diff --git a/gtsam/geometry/Similarity3.cpp b/gtsam/geometry/Similarity3.cpp
index fcaf0c8740..ea7a6d0498 100644
--- a/gtsam/geometry/Similarity3.cpp
+++ b/gtsam/geometry/Similarity3.cpp
@@ -40,8 +40,8 @@ static Point3Pairs subtractCentroids(const Point3Pairs &abPointPairs,
 }
 
 /// Form inner products x and y and calculate scale.
-static const double calculateScale(const Point3Pairs &d_abPointPairs,
-                                   const Rot3 &aRb) {
+static double calculateScale(const Point3Pairs &d_abPointPairs,
+                             const Rot3 &aRb) {
   double x = 0, y = 0;
   Point3 da, db;
   for (const Point3Pair& d_abPair : d_abPointPairs) {
diff --git a/gtsam/inference/BayesTree.h b/gtsam/inference/BayesTree.h
index 7199da0ad2..cc003d8dcb 100644
--- a/gtsam/inference/BayesTree.h
+++ b/gtsam/inference/BayesTree.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <boost/shared_ptr.hpp>
+
 #include <gtsam/inference/Key.h>
 #include <gtsam/base/FastList.h>
 #include <gtsam/base/ConcurrentMap.h>
diff --git a/gtsam/inference/Factor.h b/gtsam/inference/Factor.h
index 6ea81030a4..c0ea4ea78b 100644
--- a/gtsam/inference/Factor.h
+++ b/gtsam/inference/Factor.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <boost/serialization/nvp.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include <gtsam/base/types.h>
 #include <gtsam/base/FastVector.h>
diff --git a/gtsam/slam/dataset.cpp b/gtsam/slam/dataset.cpp
index c8a8b15c52..d7e925bd95 100644
--- a/gtsam/slam/dataset.cpp
+++ b/gtsam/slam/dataset.cpp
@@ -392,7 +392,7 @@ parseMeasurements(const std::string &filename,
                   size_t maxIndex) {
   ParseMeasurement<Pose2> parse{model ? createSampler(model) : nullptr,
                                 maxIndex, true, NoiseFormatAUTO,
-                                KernelFunctionTypeNONE};
+                                KernelFunctionTypeNONE, nullptr};
   return parseToVector<BinaryMeasurement<Pose2>>(filename, parse);
 }