diff --git a/CppUnitLite/Makefile.am b/CppUnitLite/Makefile.am
index 760b18bf5..931d5a7be 100644
--- a/CppUnitLite/Makefile.am
+++ b/CppUnitLite/Makefile.am
@@ -10,3 +10,4 @@ headers += $(sources:.cpp=.h)
 CppUnitLitedir = $(pkgincludedir)/CppUnitLite
 noinst_LIBRARIES = libCppUnitLite.a
 libCppUnitLite_a_SOURCES = $(sources)
+noinst_HEADERS = $(headers)
diff --git a/Makefile.am b/Makefile.am
index eec521075..52904afb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,5 +14,4 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 SUBDIRS = CppUnitLite gtsam tests examples
 
 # Add these files to make sure they're in the distribution
-EXTRA_DIST = autogen.sh configure.ac THANKS 
-
+EXTRA_DIST = autogen.sh configure.ac COPYING INSTALL LGPL LICENSE README THANKS USAGE
diff --git a/gtsam/base/Makefile.am b/gtsam/base/Makefile.am
index 61db190b3..57098af9d 100644
--- a/gtsam/base/Makefile.am
+++ b/gtsam/base/Makefile.am
@@ -13,7 +13,7 @@ check_PROGRAMS =
 
 # base Math
 
-headers += FixedVector.h types.h blockMatrices.h
+headers += FixedVector.h types.h blockMatrices.h Matrix-inl.h
 sources += Vector.cpp svdcmp.cpp Matrix.cpp
 check_PROGRAMS += tests/testFixedVector tests/testVector tests/testMatrix 
 
diff --git a/gtsam/linear/Makefile.am b/gtsam/linear/Makefile.am
index 26299ba1b..a861adcf6 100644
--- a/gtsam/linear/Makefile.am
+++ b/gtsam/linear/Makefile.am
@@ -36,7 +36,8 @@ check_PROGRAMS += tests/testGaussianJunctionTree
 # Iterative Methods
 headers += iterative-inl.h
 sources += iterative.cpp SubgraphPreconditioner.cpp
-#headers += iterative-inl.h SubgraphSolver.h SubgraphSolver-inl.h
+headers += IterativeOptimizationParameters.h IterativeSolver.h ConjugateGradientSolver.h ConjugateGradientSolver-inl.h
+headers += SubgraphSolver.h SubgraphSolver-inl.h
 #sources += iterative.cpp BayesNetPreconditioner.cpp SubgraphPreconditioner.cpp
 #check_PROGRAMS += tests/testBayesNetPreconditioner