diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt
index 2b6520a91..542632898 100644
--- a/vtkm/cont/CMakeLists.txt
+++ b/vtkm/cont/CMakeLists.txt
@@ -126,6 +126,7 @@ set(template_sources
   StorageAny.hxx
   StorageBasic.hxx
   StorageVirtual.hxx
+  VirtualObjectHandle.hxx
   )
 
 set(sources
diff --git a/vtkm/interop/CMakeLists.txt b/vtkm/interop/CMakeLists.txt
index ee8160ba6..c2617415c 100755
--- a/vtkm/interop/CMakeLists.txt
+++ b/vtkm/interop/CMakeLists.txt
@@ -33,6 +33,5 @@ endif()
 #-----------------------------------------------------------------------------
 add_subdirectory(internal)
 
-if(TARGET vtkm::cuda)
-  add_subdirectory(cuda)
-endif()
+#-----------------------------------------------------------------------------
+add_subdirectory(cuda)
diff --git a/vtkm/rendering/CMakeLists.txt b/vtkm/rendering/CMakeLists.txt
index e5b72060f..e377e0494 100644
--- a/vtkm/rendering/CMakeLists.txt
+++ b/vtkm/rendering/CMakeLists.txt
@@ -83,6 +83,7 @@ set(headers
   View1D.h
   View2D.h
   View3D.h
+  Wireframer.h
   WorldAnnotator.h
   )
 
@@ -105,7 +106,6 @@ set(sources
   MapperQuad.cxx
   MapperRayTracer.cxx
   MapperVolume.cxx
-  #MapperWireframer.cxx
   Scene.cxx
   TextAnnotation.cxx
   TextAnnotationBillboard.cxx
@@ -190,14 +190,16 @@ vtkm_library(
   WRAP_FOR_CUDA ${device_sources}
   )
 
+# Install all headers no matter what backend was selected
+vtkm_declare_headers(${opengl_headers})
+vtkm_declare_headers(${osmesa_headers})
+vtkm_declare_headers(${egl_headers})
+
 if(VTKm_ENABLE_GL_CONTEXT)
-  vtkm_declare_headers(${opengl_headers})
   target_sources(vtkm_rendering PRIVATE ${opengl_sources})
 elseif(VTKm_ENABLE_OSMESA_CONTEXT)
-  vtkm_declare_headers(${opengl_headers} ${osmesa_headers})
   target_sources(vtkm_rendering PRIVATE ${opengl_sources} ${osmesa_sources})
 elseif(VTKm_ENABLE_EGL_CONTEXT)
-  vtkm_declare_headers(${opengl_headers} ${egl_headers})
   target_sources(vtkm_rendering PRIVATE ${opengl_sources} ${egl_sources})
 endif()
 
diff --git a/vtkm/worklet/CMakeLists.txt b/vtkm/worklet/CMakeLists.txt
index fd7d120cc..ed0c85624 100644
--- a/vtkm/worklet/CMakeLists.txt
+++ b/vtkm/worklet/CMakeLists.txt
@@ -115,11 +115,13 @@ set(sources_device
 add_subdirectory(internal)
 add_subdirectory(clip)
 add_subdirectory(colorconversion)
+add_subdirectory(connectivities)
 add_subdirectory(contour)
 add_subdirectory(contourtree)
 add_subdirectory(contourtree_augmented)
 add_subdirectory(cosmotools)
 add_subdirectory(gradient)
+add_subdirectory(histogram)
 add_subdirectory(splatkernels)
 add_subdirectory(spatialstructure)
 add_subdirectory(tetrahedralize)