diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
index ee3c84464..fc9f27099 100644
--- a/gtsam/base/Matrix.h
+++ b/gtsam/base/Matrix.h
@@ -370,7 +370,6 @@ GTSAM_EXPORT std::pair<Matrix,Matrix> qr(const Matrix& A);
  * @param A is the input matrix, and is the output
  * @param clear_below_diagonal enables zeroing out below diagonal
  */
-//template <class MATRIX>
 void inplace_QR(Matrix& A);
 
 /**
diff --git a/gtsam/base/types.cpp b/gtsam/base/types.cpp
index 9a0d6c627..4f61c6a1d 100644
--- a/gtsam/base/types.cpp
+++ b/gtsam/base/types.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <boost/lexical_cast.hpp>
-//#include <iostream>
 #include <gtsam/base/types.h>
 #include <gtsam/inference/Symbol.h>
 
diff --git a/gtsam/base/types.h b/gtsam/base/types.h
index 839016fd9..d0ba526c2 100644
--- a/gtsam/base/types.h
+++ b/gtsam/base/types.h
@@ -21,7 +21,6 @@
 
 #include <gtsam/dllexport.h>
 #include <gtsam/config.h>
-//#include <iosfwd>
 #include <iostream>
 #include <cstddef>
 #include <string>
diff --git a/gtsam/nonlinear/Values.h b/gtsam/nonlinear/Values.h
index 73d0711be..ad727f45e 100644
--- a/gtsam/nonlinear/Values.h
+++ b/gtsam/nonlinear/Values.h
@@ -26,14 +26,9 @@
 
 #include <gtsam/base/GenericValue.h>
 #include <gtsam/base/VectorSpace.h>
-#include <gtsam/base/FastMap.h>
 #include <gtsam/inference/Key.h>
-
-#include <boost/optional.hpp>
-#include <boost/ptr_container/ptr_map.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/function.hpp>
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
@@ -43,7 +38,6 @@
 #pragma GCC diagnostic pop
 #endif
 #include <boost/ptr_container/serialize_ptr_map.hpp>
-#include <boost/iterator_adaptors.hpp>
 
 #include <string>
 #include <utility>