diff --git a/Makefile.am b/Makefile.am
index b681e0c5..d3a7b329 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,14 +10,25 @@ libGrid_a_SOURCES = Grid_init.cc
 #
 # Include files
 #
-include_HEADERS = Grid.h\
+include_HEADERS = Grid_config.h\
+	Grid.h\
+	Grid_simd.h\
 	Grid_vComplexD.h\
 	Grid_vComplexF.h\
 	Grid_vRealD.h\
 	Grid_vRealF.h\
 	Grid_Cartesian.h\
 	Grid_Lattice.h\
-	Grid_config.h
+	Grid_Communicator.h\
+	Grid_QCD.h\
+	Grid_aligned_allocator.h\
+	Grid_cshift.h\
+	Grid_cshift_common.h\
+	Grid_cshift_fake.h\
+	Grid_cshift_mpi.h\
+	Grid_cshift_none.h\
+	Grid_math_types.h
+
 
 #
 # Test code
diff --git a/Makefile.in b/Makefile.in
index 43ea6616..6983b96a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -339,14 +339,24 @@ libGrid_a_SOURCES = Grid_init.cc
 #
 # Include files
 #
-include_HEADERS = Grid.h\
+include_HEADERS = Grid_config.h\
+	Grid.h\
+	Grid_simd.h\
 	Grid_vComplexD.h\
 	Grid_vComplexF.h\
 	Grid_vRealD.h\
 	Grid_vRealF.h\
 	Grid_Cartesian.h\
 	Grid_Lattice.h\
-	Grid_config.h
+	Grid_Communicator.h\
+	Grid_QCD.h\
+	Grid_aligned_allocator.h\
+	Grid_cshift.h\
+	Grid_cshift_common.h\
+	Grid_cshift_fake.h\
+	Grid_cshift_mpi.h\
+	Grid_cshift_none.h\
+	Grid_math_types.h
 
 extra_sources = $(am__append_1) $(am__append_2) $(am__append_3)
 Grid_main_SOURCES = \