diff --git a/lib/Makefile.am b/lib/Makefile.am
index 93625c68..dab5c6d3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
 # additional include paths necessary to compile the C++ library
 AM_CXXFLAGS = -I$(top_srcdir)/
 
-
 extra_sources=
 if BUILD_COMMS_MPI
   extra_sources+=Grid_communicator_mpi.cc
@@ -21,7 +20,7 @@ libGrid_a_SOURCES = Grid_init.cc $(extra_sources)
 #
 # Include files
 #
-include_HEADERS = Grid_config.h\
+include_HEADERS =\
 	Grid.h\
 	Grid_QCD.h\
 	Grid_aligned_allocator.h\
@@ -37,11 +36,33 @@ include_HEADERS = Grid_config.h\
 	Grid_cshift_mpi.h\
 	Grid_cshift_none.h\
 	Grid_lattice.h\
+	Grid_lattice_arith.h\
+	Grid_lattice_conformable.h\
+	Grid_lattice_coordinate.h\
+	Grid_lattice_local.h\
+	Grid_lattice_peekpoke.h\
+	Grid_lattice_reality.h\
+	Grid_lattice_reduction.h
+	Grid_lattice_rng.h\
+	Grid_lattice_trace.h\
+	Grid_lattice_transfer.h\
+	Grid_lattice_transpose.h\
 	Grid_math.h\
 	Grid_math_arith.h\
+	Grid_math_arith_add.h\
+	Grid_math_arith_mac.h\
+	Grid_math_arith_mul.h\
+	Grid_math_arith_scalar.h\
+	Grid_math_arith_sub.h\
+	Grid_math_inner.h\
+	Grid_math_outer.h\
+	Grid_math_peek.h\
+	Grid_math_poke.h\
+	Grid_math_reality.h\
 	Grid_math_tensors.h\
+	Grid_math_trace.h\
 	Grid_math_traits.h\
-	Grid_predicated.h\
+	Grid_math_transpose.h\
 	Grid_simd.h\
 	Grid_stencil.h\
 	Grid_summation.h\
@@ -49,7 +70,7 @@ include_HEADERS = Grid_config.h\
 	Grid_vComplexF.h\
 	Grid_vInteger.h\
 	Grid_vRealD.h\
-	Grid_vRealF.h
-
+	Grid_vRealF.h\
+	Grid_where.h
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2bf8cd1a..ec0703b1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,4 +12,3 @@ Grid_main_LDADD = -lGrid
 
 test_Grid_stencil_SOURCES = test_Grid_stencil.cc
 test_Grid_stencil_LDADD = -lGrid
-