diff --git a/gtsam/base/Matrix.cpp b/gtsam/base/Matrix.cpp
index 644a437fa..7b21c080c 100644
--- a/gtsam/base/Matrix.cpp
+++ b/gtsam/base/Matrix.cpp
@@ -547,7 +547,7 @@ void vector_scale_inplace(const Vector& v, Matrix& A, bool inf_mask) {
   if (inf_mask) {
     for (size_t i=0; i<m; ++i) {
       const double& vi = v(i);
-      if (!isnan(vi) && !isinf(vi))
+      if (std::isfinite(vi))
         A.row(i) *= vi;
     }
   } else {
@@ -572,7 +572,7 @@ Matrix vector_scale(const Matrix& A, const Vector& v, bool inf_mask) {
   if (inf_mask) {
     for (size_t j=0; j<n; ++j) {
       const double& vj = v(j);
-      if (!isnan(vj) && !isinf(vj))
+      if (std::isfinite(vj))
         M.col(j) *= vj;
     }
   } else {
diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp
index 243e1e990..2a0192930 100644
--- a/gtsam/base/Vector.cpp
+++ b/gtsam/base/Vector.cpp
@@ -165,7 +165,7 @@ bool equal_with_abs_tol(const Vector& vec1, const Vector& vec2, double tol) {
   if (vec1.size()!=vec2.size()) return false;
   size_t m = vec1.size();
   for(size_t i=0; i<m; ++i) {
-    if(isnan(vec1[i]) ^ isnan(vec2[i]))
+    if(std::isnan(vec1[i]) ^ std::isnan(vec2[i]))
       return false;
     if(fabs(vec1[i] - vec2[i]) > tol)
       return false;
@@ -178,7 +178,7 @@ bool equal_with_abs_tol(const SubVector& vec1, const SubVector& vec2, double tol
   if (vec1.size()!=vec2.size()) return false;
   size_t m = vec1.size();
   for(size_t i=0; i<m; ++i) {
-    if(isnan(vec1[i]) ^ isnan(vec2[i]))
+    if(std::isnan(vec1[i]) ^ std::isnan(vec2[i]))
       return false;
     if(fabs(vec1[i] - vec2[i]) > tol)
       return false;
diff --git a/gtsam/inference/EliminateableFactorGraph.h b/gtsam/inference/EliminateableFactorGraph.h
index e7ef48460..5cdaf6ddd 100644
--- a/gtsam/inference/EliminateableFactorGraph.h
+++ b/gtsam/inference/EliminateableFactorGraph.h
@@ -21,6 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/variant.hpp>
+#include <boost/optional.hpp>
 
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/VariableIndex.h>
diff --git a/gtsam/inference/Ordering.cpp b/gtsam/inference/Ordering.cpp
index 062a173d3..eeb81e067 100644
--- a/gtsam/inference/Ordering.cpp
+++ b/gtsam/inference/Ordering.cpp
@@ -15,11 +15,11 @@
  * @date    Sep 2, 2010
  */
 
-#pragma once
-
 #include <vector>
 #include <limits>
 
+#include <boost/format.hpp>
+
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/3rdparty/CCOLAMD/Include/ccolamd.h>