From 7dca1d76a55fd614ffb96c01685acea0d67e809f Mon Sep 17 00:00:00 2001
From: alexhagiopol <alexhagiopol@gmail.com>
Date: Fri, 20 Feb 2015 17:09:17 -0500
Subject: [PATCH] More reductions in included lines.

---
 gtsam/base/FastSet.h             | 2 +-
 gtsam/base/GenericValue.h        | 2 +-
 gtsam/base/Matrix.h              | 1 -
 gtsam/base/Vector.cpp            | 3 +--
 gtsam/base/Vector.h              | 5 -----
 gtsam/base/types.cpp             | 2 +-
 gtsam/base/types.h               | 5 +++--
 gtsam/geometry/EssentialMatrix.h | 2 +-
 8 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/gtsam/base/FastSet.h b/gtsam/base/FastSet.h
index 69e841e57..810a48c60 100644
--- a/gtsam/base/FastSet.h
+++ b/gtsam/base/FastSet.h
@@ -21,7 +21,7 @@
 #include <gtsam/base/FastDefaultAllocator.h>
 
 #include <set>
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <cmath>
 #include <boost/mpl/has_xxx.hpp>
diff --git a/gtsam/base/GenericValue.h b/gtsam/base/GenericValue.h
index c67f7dd61..dd0811d8b 100644
--- a/gtsam/base/GenericValue.h
+++ b/gtsam/base/GenericValue.h
@@ -26,7 +26,7 @@
 #include <boost/pool/pool_alloc.hpp>
 
 #include <cmath>
-#include <iostream>
+#include <iosfwd>
 #include <typeinfo> // operator typeid
 
 namespace gtsam {
diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
index 294b5e63a..d5c433d35 100644
--- a/gtsam/base/Matrix.h
+++ b/gtsam/base/Matrix.h
@@ -21,7 +21,6 @@
 // \callgraph
 
 #pragma once
-
 #include <gtsam/base/Vector.h>
 #include <boost/format.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp
index 5368e708e..1b145a116 100644
--- a/gtsam/base/Vector.cpp
+++ b/gtsam/base/Vector.cpp
@@ -19,7 +19,6 @@
 
 #include <cstdarg>
 #include <limits>
-//#include <iostream>
 #include <fstream>
 #include <sstream>
 #include <iomanip>
@@ -28,7 +27,7 @@
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <cstdio>
-#include <vector> //added by alex
+#include <vector>
 #include <gtsam/base/Vector.h>
 
 
diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h
index 58e1d2ff6..d19fee298 100644
--- a/gtsam/base/Vector.h
+++ b/gtsam/base/Vector.h
@@ -21,12 +21,7 @@
 
 #pragma once
 #include <list>
-//#include <vector>
-//#include <iostream>
 #include <gtsam/global_includes.h>
-//#include <gtsam/3rdparty/gtsam_eigen_includes.h>
-//#include <gtsam/3rdparty/Eigen/Eigen/src/Core/Matrix.h>
-//#include <gtsam/3rdparty/Eigen/Eigen/src/Core/MatrixBase.h> 
 #include <gtsam/3rdparty/Eigen/Eigen/Core>
 namespace gtsam {
 
diff --git a/gtsam/base/types.cpp b/gtsam/base/types.cpp
index 3f86dc0c1..9a0d6c627 100644
--- a/gtsam/base/types.cpp
+++ b/gtsam/base/types.cpp
@@ -18,7 +18,7 @@
  */
 
 #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 aca04a14b..839016fd9 100644
--- a/gtsam/base/types.h
+++ b/gtsam/base/types.h
@@ -21,10 +21,11 @@
 
 #include <gtsam/dllexport.h>
 #include <gtsam/config.h>
-
+//#include <iosfwd>
+#include <iostream>
 #include <cstddef>
 #include <string>
-#include <iostream>
+#include <ostream>
 #include <boost/function/function1.hpp>
 #include <boost/range/concepts.hpp>
 #include <boost/optional.hpp>
diff --git a/gtsam/geometry/EssentialMatrix.h b/gtsam/geometry/EssentialMatrix.h
index 606f62f87..9ebcbcf5c 100644
--- a/gtsam/geometry/EssentialMatrix.h
+++ b/gtsam/geometry/EssentialMatrix.h
@@ -10,7 +10,7 @@
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/geometry/Unit3.h>
 #include <gtsam/geometry/Point2.h>
-#include <iostream>
+#include <iosfwd>
 
 namespace gtsam {