diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt
index 10b12f830..15c42cb9f 100644
--- a/vtkm/cont/CMakeLists.txt
+++ b/vtkm/cont/CMakeLists.txt
@@ -64,6 +64,7 @@ set(headers
   ErrorInternal.h
   Field.h
   RuntimeDeviceInformation.h
+  RuntimeDeviceTracker.h
   Storage.h
   StorageBasic.h
   StorageImplicit.h
diff --git a/vtkm/cont/internal/RuntimeDeviceTracker.h b/vtkm/cont/RuntimeDeviceTracker.h
similarity index 94%
rename from vtkm/cont/internal/RuntimeDeviceTracker.h
rename to vtkm/cont/RuntimeDeviceTracker.h
index edae02808..cb126c7da 100644
--- a/vtkm/cont/internal/RuntimeDeviceTracker.h
+++ b/vtkm/cont/RuntimeDeviceTracker.h
@@ -17,8 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_internal_RuntimeDeviceTracker_h
-#define vtk_m_cont_internal_RuntimeDeviceTracker_h
+#ifndef vtk_m_cont_RuntimeDeviceTracker_h
+#define vtk_m_cont_RuntimeDeviceTracker_h
 
 #include <vtkm/cont/ErrorBadAllocation.h>
 #include <vtkm/cont/RuntimeDeviceInformation.h>
@@ -32,7 +32,6 @@
 
 namespace vtkm {
 namespace cont {
-namespace internal {
 
 /// A class that can be used to determine if a given device adapter
 /// is supported on the current machine at runtime. This is a more
@@ -117,7 +116,6 @@ private:
 };
 
 }
-}
-}  // namespace vtkm::cont::internal
+}  // namespace vtkm::cont
 
-#endif //vtk_m_filter_internal_RuntimeDeviceTracker_h
+#endif //vtk_m_filter_RuntimeDeviceTracker_h
diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h
index 3ca9f1290..e186bf9eb 100644
--- a/vtkm/cont/TryExecute.h
+++ b/vtkm/cont/TryExecute.h
@@ -25,7 +25,7 @@
 #include <vtkm/cont/ErrorBadType.h>
 #include <vtkm/cont/ErrorBadValue.h>
 
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 namespace vtkm {
 namespace cont {
@@ -39,7 +39,7 @@ template<typename Functor, typename Device>
 struct TryExecuteRunIfValid<Functor, Device, false>
 {
   VTKM_CONT
-  static bool Run(Functor &, vtkm::cont::internal::RuntimeDeviceTracker &) {
+  static bool Run(Functor &, vtkm::cont::RuntimeDeviceTracker &) {
     return false;
   }
 };
@@ -51,7 +51,7 @@ struct TryExecuteRunIfValid<Functor, Device, true>
 
   VTKM_CONT
   static bool Run(Functor &functor,
-                  vtkm::cont::internal::RuntimeDeviceTracker &tracker)
+                  vtkm::cont::RuntimeDeviceTracker &tracker)
   {
     if (tracker.CanRunOn(Device()))
     {
@@ -104,13 +104,13 @@ struct TryExecuteImpl
   // Warning, these are a references. Make sure referenced objects do not go
   // out of scope.
   FunctorType &Functor;
-  vtkm::cont::internal::RuntimeDeviceTracker &Tracker;
+  vtkm::cont::RuntimeDeviceTracker &Tracker;
 
   bool Success;
 
   VTKM_CONT
   TryExecuteImpl(FunctorType &functor,
-                 vtkm::cont::internal::RuntimeDeviceTracker &tracker)
+                 vtkm::cont::RuntimeDeviceTracker &tracker)
     : Functor(functor), Tracker(tracker), Success(false) {  }
 
   template<typename Device>
@@ -159,7 +159,7 @@ private:
 template<typename Functor, typename DeviceList>
 VTKM_CONT
 bool TryExecute(const Functor &functor,
-                vtkm::cont::internal::RuntimeDeviceTracker &tracker,
+                vtkm::cont::RuntimeDeviceTracker &tracker,
                 DeviceList)
 {
   detail::TryExecuteImpl<const Functor> internals(functor, tracker);
@@ -169,7 +169,7 @@ bool TryExecute(const Functor &functor,
 template<typename Functor, typename DeviceList>
 VTKM_CONT
 bool TryExecute(Functor &functor,
-                vtkm::cont::internal::RuntimeDeviceTracker &tracker,
+                vtkm::cont::RuntimeDeviceTracker &tracker,
                 DeviceList)
 {
   detail::TryExecuteImpl<Functor> internals(functor, tracker);
@@ -180,14 +180,14 @@ template<typename Functor, typename DeviceList>
 VTKM_CONT
 bool TryExecute(const Functor &functor, DeviceList)
 {
-  vtkm::cont::internal::RuntimeDeviceTracker tracker;
+  vtkm::cont::RuntimeDeviceTracker tracker;
   return vtkm::cont::TryExecute(functor, tracker, DeviceList());
 }
 template<typename Functor, typename DeviceList>
 VTKM_CONT
 bool TryExecute(Functor &functor, DeviceList)
 {
-  vtkm::cont::internal::RuntimeDeviceTracker tracker;
+  vtkm::cont::RuntimeDeviceTracker tracker;
   return vtkm::cont::TryExecute(functor, tracker, DeviceList());
 }
 template<typename Functor>
diff --git a/vtkm/cont/internal/CMakeLists.txt b/vtkm/cont/internal/CMakeLists.txt
index 5eb146c13..984d6f404 100644
--- a/vtkm/cont/internal/CMakeLists.txt
+++ b/vtkm/cont/internal/CMakeLists.txt
@@ -33,7 +33,6 @@ set(headers
   DynamicTransform.h
   FunctorsGeneral.h
   IteratorFromArrayPortal.h
-  RuntimeDeviceTracker.h
   SimplePolymorphicContainer.h
   StorageError.h
   )
diff --git a/vtkm/filter/FilterDataSet.h b/vtkm/filter/FilterDataSet.h
index 179fb6ed7..42f246617 100644
--- a/vtkm/filter/FilterDataSet.h
+++ b/vtkm/filter/FilterDataSet.h
@@ -25,7 +25,7 @@
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/Field.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/filter/PolicyBase.h>
 #include <vtkm/filter/ResultDataSet.h>
@@ -90,7 +90,7 @@ private:
   std::string OutputFieldName;
   vtkm::Id CellSetIndex;
   vtkm::Id CoordinateSystemIndex;
-  vtkm::cont::internal::RuntimeDeviceTracker Tracker;
+  vtkm::cont::RuntimeDeviceTracker Tracker;
 };
 
 }
diff --git a/vtkm/filter/FilterDataSetWithField.h b/vtkm/filter/FilterDataSetWithField.h
index b9a2c7b00..c027dd8ab 100644
--- a/vtkm/filter/FilterDataSetWithField.h
+++ b/vtkm/filter/FilterDataSetWithField.h
@@ -25,7 +25,7 @@
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/Field.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/filter/PolicyBase.h>
 #include <vtkm/filter/ResultDataSet.h>
@@ -117,7 +117,7 @@ private:
   std::string OutputFieldName;
   vtkm::Id CellSetIndex;
   vtkm::Id CoordinateSystemIndex;
-  vtkm::cont::internal::RuntimeDeviceTracker Tracker;
+  vtkm::cont::RuntimeDeviceTracker Tracker;
 };
 
 }
diff --git a/vtkm/filter/FilterField.h b/vtkm/filter/FilterField.h
index 10740c6ba..fba79c9c9 100644
--- a/vtkm/filter/FilterField.h
+++ b/vtkm/filter/FilterField.h
@@ -24,7 +24,7 @@
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/Field.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/filter/PolicyBase.h>
 #include <vtkm/filter/ResultField.h>
@@ -88,7 +88,7 @@ private:
                                   const vtkm::filter::PolicyBase<DerivedPolicy>& policy);
 
   std::string OutputFieldName;
-  vtkm::cont::internal::RuntimeDeviceTracker Tracker;
+  vtkm::cont::RuntimeDeviceTracker Tracker;
 };
 
 }
diff --git a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h
index 11d544625..4a2462ed3 100644
--- a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h
+++ b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h
@@ -23,7 +23,7 @@
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/cont/TryExecute.h>
 #include <vtkm/cont/internal/DeviceAdapterTag.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/filter/FieldMetadata.h>
 #include <vtkm/filter/PolicyBase.h>
@@ -41,7 +41,7 @@ struct ResolveFieldTypeAndExecute
   const vtkm::cont::DataSet &InputData;
   const vtkm::filter::FieldMetadata& Metadata;
   const vtkm::filter::PolicyBase<DerivedPolicy>& Policy;
-  vtkm::cont::internal::RuntimeDeviceTracker& Tracker;
+  vtkm::cont::RuntimeDeviceTracker& Tracker;
   ResultType& Result;
 
   ResolveFieldTypeAndExecute(
@@ -49,7 +49,7 @@ struct ResolveFieldTypeAndExecute
       const vtkm::cont::DataSet &inputData,
       const vtkm::filter::FieldMetadata& fieldMeta,
       const vtkm::filter::PolicyBase<DerivedPolicy>& policy,
-      vtkm::cont::internal::RuntimeDeviceTracker& tracker,
+      vtkm::cont::RuntimeDeviceTracker& tracker,
       ResultType& result):
     DerivedClass(derivedClass),
     InputData(inputData),
diff --git a/vtkm/filter/internal/ResolveFieldTypeAndMap.h b/vtkm/filter/internal/ResolveFieldTypeAndMap.h
index cfba0d630..ae3265830 100644
--- a/vtkm/filter/internal/ResolveFieldTypeAndMap.h
+++ b/vtkm/filter/internal/ResolveFieldTypeAndMap.h
@@ -23,7 +23,7 @@
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/cont/TryExecute.h>
 #include <vtkm/cont/internal/DeviceAdapterTag.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/filter/FieldMetadata.h>
 #include <vtkm/filter/PolicyBase.h>
@@ -48,7 +48,7 @@ struct ResolveFieldTypeAndMap
   vtkm::filter::ResultDataSet& InputResult;
   const vtkm::filter::FieldMetadata& Metadata;
   const vtkm::filter::PolicyBase<DerivedPolicy>& Policy;
-  vtkm::cont::internal::RuntimeDeviceTracker& Tracker;
+  vtkm::cont::RuntimeDeviceTracker& Tracker;
   bool& RanProperly;
 
 
@@ -56,7 +56,7 @@ struct ResolveFieldTypeAndMap
                          vtkm::filter::ResultDataSet& inResult,
                          const vtkm::filter::FieldMetadata& fieldMeta,
                          const vtkm::filter::PolicyBase<DerivedPolicy>& policy,
-                         vtkm::cont::internal::RuntimeDeviceTracker& tracker,
+                         vtkm::cont::RuntimeDeviceTracker& tracker,
                          bool& ran):
     DerivedClass(derivedClass),
     InputResult(inResult),
diff --git a/vtkm/rendering/MapperRayTracer.cxx b/vtkm/rendering/MapperRayTracer.cxx
index f9b0db2de..653f441b8 100644
--- a/vtkm/rendering/MapperRayTracer.cxx
+++ b/vtkm/rendering/MapperRayTracer.cxx
@@ -20,8 +20,8 @@
 
 #include <vtkm/rendering/MapperRayTracer.h>
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/TryExecute.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
 #include <vtkm/cont/internal/SimplePolymorphicContainer.h>
 
 #include <vtkm/rendering/CanvasRayTracer.h>
@@ -35,7 +35,7 @@ namespace rendering {
 struct MapperRayTracer::InternalsType
 {
   vtkm::rendering::CanvasRayTracer *Canvas;
-  vtkm::cont::internal::RuntimeDeviceTracker DeviceTracker;
+  vtkm::cont::RuntimeDeviceTracker DeviceTracker;
   std::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
       RayTracerContainer;
 
diff --git a/vtkm/rendering/MapperVolume.cxx b/vtkm/rendering/MapperVolume.cxx
index cba681df1..581f032c4 100644
--- a/vtkm/rendering/MapperVolume.cxx
+++ b/vtkm/rendering/MapperVolume.cxx
@@ -20,8 +20,8 @@
 
 #include <vtkm/rendering/MapperVolume.h>
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/TryExecute.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
 #include <vtkm/cont/internal/SimplePolymorphicContainer.h>
 
 #include <vtkm/rendering/CanvasRayTracer.h>
@@ -41,7 +41,7 @@ struct MapperVolume::InternalsType
   vtkm::rendering::CanvasRayTracer *Canvas;
   vtkm::Float32 SampleDistance;
   bool CompositeBackground;
-  vtkm::cont::internal::RuntimeDeviceTracker DeviceTracker;
+  vtkm::cont::RuntimeDeviceTracker DeviceTracker;
   std::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
       RayTracerContainer;
 
diff --git a/vtkm/rendering/internal/RunTriangulator.cxx b/vtkm/rendering/internal/RunTriangulator.cxx
index 2f15d3549..89ef04bc5 100644
--- a/vtkm/rendering/internal/RunTriangulator.cxx
+++ b/vtkm/rendering/internal/RunTriangulator.cxx
@@ -55,7 +55,7 @@ struct TriangulatorFunctor
 void RunTriangulator(const vtkm::cont::DynamicCellSet &cellSet,
                      vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Id,4> > &indices,
                      vtkm::Id &numberOfTriangles,
-                     vtkm::cont::internal::RuntimeDeviceTracker &tracker)
+                     vtkm::cont::RuntimeDeviceTracker &tracker)
 {
   // TODO: Should the rendering library support policies or some other way to
   // configure with custom devices?
@@ -75,7 +75,7 @@ void RunTriangulator(const vtkm::cont::DynamicCellSet &cellSet,
                      vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Id,4> > &indices,
                      vtkm::Id &numberOfTriangles)
 {
-  vtkm::cont::internal::RuntimeDeviceTracker tracker;
+  vtkm::cont::RuntimeDeviceTracker tracker;
   vtkm::rendering::internal::RunTriangulator(
         cellSet, indices, numberOfTriangles, tracker);
 }
diff --git a/vtkm/rendering/internal/RunTriangulator.h b/vtkm/rendering/internal/RunTriangulator.h
index dd9cffb4f..52542c438 100644
--- a/vtkm/rendering/internal/RunTriangulator.h
+++ b/vtkm/rendering/internal/RunTriangulator.h
@@ -24,7 +24,7 @@
 
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/DynamicCellSet.h>
-#include <vtkm/cont/internal/RuntimeDeviceTracker.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 namespace vtkm {
 namespace rendering {
@@ -43,7 +43,7 @@ VTKM_RENDERING_EXPORT
 void RunTriangulator(const vtkm::cont::DynamicCellSet &cellSet,
                      vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Id,4> > &indices,
                      vtkm::Id &numberOfTriangles,
-                     vtkm::cont::internal::RuntimeDeviceTracker &tracker);
+                     vtkm::cont::RuntimeDeviceTracker &tracker);
 
 }
 }