diff --git a/vtkm/cont/ArrayHandleCartesianProduct.h b/vtkm/cont/ArrayHandleCartesianProduct.h
index 63a57a680..7f89f706d 100644
--- a/vtkm/cont/ArrayHandleCartesianProduct.h
+++ b/vtkm/cont/ArrayHandleCartesianProduct.h
@@ -83,7 +83,6 @@ public:
   {
       vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues();
       vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues();
-      vtkm::Id dim3 = this->PortalThird.GetNumberOfValues();
       vtkm::Id dim12 = dim1*dim2;
       vtkm::Id idx12 = index % dim12;
       vtkm::Id i1 = idx12 % dim1;
@@ -100,7 +99,6 @@ public:
   {
       vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues();
       vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues();
-      vtkm::Id dim3 = this->PortalThird.GetNumberOfValues();
       vtkm::Id dim12 = dim1*dim2;
       vtkm::Id idx12 = index % dim12;
 
diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt
index 241163ecc..a5e0dfc20 100644
--- a/vtkm/cont/CMakeLists.txt
+++ b/vtkm/cont/CMakeLists.txt
@@ -23,6 +23,7 @@ include_directories(${Boost_INCLUDE_DIRS})
 set(headers
   ArrayHandle.h
   ArrayHandleCast.h
+  ArrayHandleCartesianProduct.h
   ArrayHandleCompositeVector.h
   ArrayHandleConstant.h
   ArrayHandleCounting.h
@@ -44,6 +45,10 @@ set(headers
   CellSetPermutation.h
   CoordinateSystem.h
   DataSet.h
+  DataSetBuilderExplicit.h
+  DataSetBuilderRectilinear.h
+  DataSetBuilderRegular.h
+  DataSetFieldAdd.h
   DeviceAdapter.h
   DeviceAdapterAlgorithm.h
   DeviceAdapterSerial.h
diff --git a/vtkm/cont/DataSetFieldAdd.h b/vtkm/cont/DataSetFieldAdd.h
index 3aae73949..bd3061c64 100644
--- a/vtkm/cont/DataSetFieldAdd.h
+++ b/vtkm/cont/DataSetFieldAdd.h
@@ -21,6 +21,9 @@
 #ifndef vtk_m_cont_DataSetFieldAdd_h
 #define vtk_m_cont_DataSetFieldAdd_h
 
+#include <vtkm/cont/DataSet.h>
+#include <vtkm/cont/Field.h>
+
 namespace vtkm {
 namespace cont {