diff --git a/vtkm/ListTag.h b/vtkm/ListTag.h
index 120f60790..e898ef6bb 100644
--- a/vtkm/ListTag.h
+++ b/vtkm/ListTag.h
@@ -24,10 +24,10 @@
 
 #include <vtkm/internal/ExportMacros.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 
diff --git a/vtkm/Math.h b/vtkm/Math.h
index a0610b5d6..0d9e8c977 100644
--- a/vtkm/Math.h
+++ b/vtkm/Math.h
@@ -38,17 +38,17 @@
 // boost seems to want to undefine those macros so that it can implement the
 // C99 templates and other implementations of the same name. Get around the
 // problem by using the boost version when compiling for a CPU.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/special_functions/sign.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 #include <cmath>
 #define VTKM_USE_BOOST_CLASSIFY
 #define VTKM_USE_BOOST_SIGN
 #endif // !VTKM_CUDA
 
 #if defined(VTKM_MSVC) && !defined(VTKM_CUDA)
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/math/special_functions/acosh.hpp>
 #include <boost/math/special_functions/asinh.hpp>
 #include <boost/math/special_functions/atanh.hpp>
@@ -56,7 +56,7 @@ VTKM_BOOST_PRE_INCLUDE
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/round.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 #define VTKM_USE_BOOST_MATH
 #if _MSC_VER <= 1600
 #define VTKM_USE_STL_MIN_MAX
diff --git a/vtkm/Math.h.in b/vtkm/Math.h.in
index f8bb31e69..6544443b2 100644
--- a/vtkm/Math.h.in
+++ b/vtkm/Math.h.in
@@ -50,17 +50,17 @@ $# Ignore the following comment. It is meant for the generated file.
 // boost seems to want to undefine those macros so that it can implement the
 // C99 templates and other implementations of the same name. Get around the
 // problem by using the boost version when compiling for a CPU.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/special_functions/sign.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 #include <cmath>
 #define VTKM_USE_BOOST_CLASSIFY
 #define VTKM_USE_BOOST_SIGN
 #endif // !VTKM_CUDA
 
 #if defined(VTKM_MSVC) && !defined(VTKM_CUDA)
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/math/special_functions/acosh.hpp>
 #include <boost/math/special_functions/asinh.hpp>
 #include <boost/math/special_functions/atanh.hpp>
@@ -68,7 +68,7 @@ VTKM_BOOST_PRE_INCLUDE
 #include <boost/math/special_functions/expm1.hpp>
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/math/special_functions/round.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 #define VTKM_USE_BOOST_MATH
 #if _MSC_VER <= 1600
 #define VTKM_USE_STL_MIN_MAX
diff --git a/vtkm/TopologyElementTag.h b/vtkm/TopologyElementTag.h
index 4fd4221f1..bb4845733 100644
--- a/vtkm/TopologyElementTag.h
+++ b/vtkm/TopologyElementTag.h
@@ -22,9 +22,9 @@
 
 #include <vtkm/Types.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/mpl/assert.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 
diff --git a/vtkm/Types.h b/vtkm/Types.h
index 3bb1db6aa..fcf14aef8 100644
--- a/vtkm/Types.h
+++ b/vtkm/Types.h
@@ -24,12 +24,12 @@
 #include <vtkm/internal/Configure.h>
 #include <vtkm/internal/ExportMacros.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/mpl/or.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/type_traits/is_signed.hpp>
 #include <boost/utility/enable_if.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 /*!
  * \namespace vtkm
diff --git a/vtkm/VecTraits.h b/vtkm/VecTraits.h
index 7a8f66df6..29ca25bdf 100644
--- a/vtkm/VecTraits.h
+++ b/vtkm/VecTraits.h
@@ -22,9 +22,9 @@
 
 #include <vtkm/Types.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits/remove_const.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 
diff --git a/vtkm/benchmarking/BenchmarkDeviceAdapter.h b/vtkm/benchmarking/BenchmarkDeviceAdapter.h
index a3e591a0b..93fc67f66 100644
--- a/vtkm/benchmarking/BenchmarkDeviceAdapter.h
+++ b/vtkm/benchmarking/BenchmarkDeviceAdapter.h
@@ -37,9 +37,9 @@
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/benchmarking/Benchmarker.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/random.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <algorithm>
 #include <cmath>
diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h
index b51c0451d..23ce38a8a 100644
--- a/vtkm/cont/ArrayHandle.h
+++ b/vtkm/cont/ArrayHandle.h
@@ -31,13 +31,13 @@
 #include <vtkm/cont/internal/ArrayHandleExecutionManager.h>
 #include <vtkm/cont/internal/DeviceAdapterTag.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/concept_check.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/smart_ptr/scoped_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <vector>
 
diff --git a/vtkm/cont/ArrayHandleCompositeVector.h b/vtkm/cont/ArrayHandleCompositeVector.h
index 69c35fc5e..9a43c9667 100644
--- a/vtkm/cont/ArrayHandleCompositeVector.h
+++ b/vtkm/cont/ArrayHandleCompositeVector.h
@@ -28,9 +28,9 @@
 
 #include <vtkm/internal/FunctionInterface.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <sstream>
 
diff --git a/vtkm/cont/CellSet.h b/vtkm/cont/CellSet.h
index 8681227d1..947f3f5a1 100644
--- a/vtkm/cont/CellSet.h
+++ b/vtkm/cont/CellSet.h
@@ -27,9 +27,9 @@
 #include <vtkm/cont/DynamicArrayHandle.h>
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/DynamicArrayHandle.h b/vtkm/cont/DynamicArrayHandle.h
index 7abc18ef4..8c1182da0 100644
--- a/vtkm/cont/DynamicArrayHandle.h
+++ b/vtkm/cont/DynamicArrayHandle.h
@@ -29,10 +29,10 @@
 
 #include <vtkm/cont/internal/DynamicTransform.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/utility/enable_if.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/DynamicCellSet.h b/vtkm/cont/DynamicCellSet.h
index 5f72207e5..33ff39463 100644
--- a/vtkm/cont/DynamicCellSet.h
+++ b/vtkm/cont/DynamicCellSet.h
@@ -27,9 +27,9 @@
 #include <vtkm/cont/internal/DynamicTransform.h>
 #include <vtkm/cont/internal/SimplePolymorphicContainer.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/smart_ptr/shared_ptr.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/DynamicPointCoordinates.h b/vtkm/cont/DynamicPointCoordinates.h
index 212492d68..0f48c60cf 100644
--- a/vtkm/cont/DynamicPointCoordinates.h
+++ b/vtkm/cont/DynamicPointCoordinates.h
@@ -27,9 +27,9 @@
 
 #include <vtkm/cont/internal/DynamicTransform.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/shared_ptr.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/Storage.h b/vtkm/cont/Storage.h
index e347b4ba3..4ff0d039e 100644
--- a/vtkm/cont/Storage.h
+++ b/vtkm/cont/Storage.h
@@ -30,9 +30,9 @@
 
 #include <vtkm/internal/ExportMacros.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/arg/ControlSignatureTagBase.h b/vtkm/cont/arg/ControlSignatureTagBase.h
index 83f81a260..147c7d68d 100644
--- a/vtkm/cont/arg/ControlSignatureTagBase.h
+++ b/vtkm/cont/arg/ControlSignatureTagBase.h
@@ -22,10 +22,10 @@
 
 #include <vtkm/internal/ExportMacros.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/arg/TransportTagExecObject.h b/vtkm/cont/arg/TransportTagExecObject.h
index 636c95306..f78008467 100644
--- a/vtkm/cont/arg/TransportTagExecObject.h
+++ b/vtkm/cont/arg/TransportTagExecObject.h
@@ -26,10 +26,10 @@
 
 #include <vtkm/exec/ExecutionObjectBase.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/arg/TypeCheckTagExecObject.h b/vtkm/cont/arg/TypeCheckTagExecObject.h
index 9f3dff761..35dfdb7da 100644
--- a/vtkm/cont/arg/TypeCheckTagExecObject.h
+++ b/vtkm/cont/arg/TypeCheckTagExecObject.h
@@ -26,9 +26,9 @@
 
 #include <vtkm/exec/ExecutionObjectBase.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h
index a038ab575..523e7eb5d 100644
--- a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h
+++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h
@@ -25,11 +25,11 @@
 #include <vtkm/cont/Storage.h>
 
 // Disable warnings we check vtkm for but Thrust does not.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <thrust/system/cuda/vector.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/copy.h>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <vtkm/exec/cuda/internal/ArrayPortalFromThrust.h>
 
diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h
index 3c87c4e2d..3633a6271 100644
--- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h
+++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h
@@ -35,7 +35,7 @@
 #include <vtkm/exec/cuda/internal/WrappedOperators.h>
 
 // Disable warnings we check vtkm for but Thrust does not.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <thrust/advance.h>
 #include <thrust/binary_search.h>
 #include <thrust/copy.h>
@@ -47,7 +47,7 @@ VTKM_BOOST_PRE_INCLUDE
 
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/system/cuda/execution_policy.h>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/cuda/internal/MakeThrustIterator.h b/vtkm/cont/cuda/internal/MakeThrustIterator.h
index 55b6b1d30..96f92a27f 100644
--- a/vtkm/cont/cuda/internal/MakeThrustIterator.h
+++ b/vtkm/cont/cuda/internal/MakeThrustIterator.h
@@ -29,12 +29,12 @@
 #include <vtkm/exec/cuda/internal/WrappedOperators.h>
 
 // Disable warnings we check vtkm for but Thrust does not.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <thrust/system/cuda/memory.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h b/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h
index 341f5478a..c17003b1f 100644
--- a/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h
+++ b/vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h
@@ -30,10 +30,10 @@
 
 #include <vtkm/exec/internal/ErrorMessageBuffer.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/iterator/counting_iterator.hpp>
 #include <boost/utility/enable_if.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <algorithm>
 #include <numeric>
diff --git a/vtkm/cont/internal/DeviceAdapterTag.h b/vtkm/cont/internal/DeviceAdapterTag.h
index 8cd483134..966a33b70 100644
--- a/vtkm/cont/internal/DeviceAdapterTag.h
+++ b/vtkm/cont/internal/DeviceAdapterTag.h
@@ -25,9 +25,9 @@
 
 #include <string>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #define VTKM_DEVICE_ADAPTER_ERROR     -2
 #define VTKM_DEVICE_ADAPTER_UNDEFINED -1
diff --git a/vtkm/cont/internal/IteratorFromArrayPortal.h b/vtkm/cont/internal/IteratorFromArrayPortal.h
index c4903d74c..b6cfe2559 100644
--- a/vtkm/cont/internal/IteratorFromArrayPortal.h
+++ b/vtkm/cont/internal/IteratorFromArrayPortal.h
@@ -24,9 +24,9 @@
 
 #include <vtkm/cont/Assert.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/iterator/iterator_facade.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/internal/PointCoordinatesBase.h b/vtkm/cont/internal/PointCoordinatesBase.h
index 6f639d55d..075166b9c 100644
--- a/vtkm/cont/internal/PointCoordinatesBase.h
+++ b/vtkm/cont/internal/PointCoordinatesBase.h
@@ -22,10 +22,10 @@
 
 #include <vtkm/Types.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 /// Checks that the argument is a proper \c PointCoordinates class. This is a
 /// handy concept check for functions and classes to make sure that a template
diff --git a/vtkm/cont/internal/SimplePolymorphicContainer.h b/vtkm/cont/internal/SimplePolymorphicContainer.h
index f29189088..58215d000 100644
--- a/vtkm/cont/internal/SimplePolymorphicContainer.h
+++ b/vtkm/cont/internal/SimplePolymorphicContainer.h
@@ -22,9 +22,9 @@
 
 #include <vtkm/Types.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/smart_ptr/shared_ptr.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
index b791f22c5..78c13db16 100644
--- a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
+++ b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
@@ -32,7 +32,7 @@
 #include <vtkm/cont/ErrorExecution.h>
 #include <vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits/remove_reference.hpp>
 
 // gcc || clang
@@ -67,7 +67,7 @@ VTKM_BOOST_PRE_INCLUDE
 #undef NOMINMAX
 #endif
 
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/tbb/internal/parallel_sort.h b/vtkm/cont/tbb/internal/parallel_sort.h
index f45616b19..8c3ad567e 100644
--- a/vtkm/cont/tbb/internal/parallel_sort.h
+++ b/vtkm/cont/tbb/internal/parallel_sort.h
@@ -29,8 +29,10 @@
 #ifndef __TBB_parallel_sort_H
 #define __TBB_parallel_sort_H
 
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <algorithm>
 #include <iterator>
diff --git a/vtkm/exec/arg/ExecutionSignatureTagBase.h b/vtkm/exec/arg/ExecutionSignatureTagBase.h
index 2bacf2984..c3a17ad97 100644
--- a/vtkm/exec/arg/ExecutionSignatureTagBase.h
+++ b/vtkm/exec/arg/ExecutionSignatureTagBase.h
@@ -22,10 +22,10 @@
 
 #include <vtkm/internal/ExportMacros.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace exec {
diff --git a/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h b/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h
index a0ea3135e..a18a37c7e 100644
--- a/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h
+++ b/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h
@@ -24,9 +24,9 @@
 #include <vtkm/exec/arg/Fetch.h>
 #include <vtkm/exec/TopologyData.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace exec {
diff --git a/vtkm/exec/arg/FetchTagExecObject.h b/vtkm/exec/arg/FetchTagExecObject.h
index a65a10204..fa1259e92 100644
--- a/vtkm/exec/arg/FetchTagExecObject.h
+++ b/vtkm/exec/arg/FetchTagExecObject.h
@@ -25,10 +25,10 @@
 
 #include <vtkm/exec/ExecutionObjectBase.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace exec {
diff --git a/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h b/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h
index 72b301072..53a7d57b5 100644
--- a/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h
+++ b/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h
@@ -25,13 +25,13 @@
 
 #include <iterator>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/utility/enable_if.hpp>
 
 #include <thrust/system/cuda/memory.h>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace exec {
diff --git a/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h b/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h
index 251b88002..474b2de79 100644
--- a/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h
+++ b/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h
@@ -25,11 +25,11 @@
 #include <vtkm/internal/ExportMacros.h>
 
 // Disable warnings we check vtkm for but Thrust does not.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_facade.h>
 #include <thrust/system/cuda/execution_policy.h>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace exec {
diff --git a/vtkm/exec/cuda/internal/WrappedOperators.h b/vtkm/exec/cuda/internal/WrappedOperators.h
index 4a2a1eaa9..c53147a0d 100644
--- a/vtkm/exec/cuda/internal/WrappedOperators.h
+++ b/vtkm/exec/cuda/internal/WrappedOperators.h
@@ -26,9 +26,9 @@
 #include <vtkm/exec/cuda/internal/IteratorFromArrayPortal.h>
 
 // Disable warnings we check vtkm for but Thrust does not.
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <thrust/system/cuda/memory.h>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace exec {
diff --git a/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx b/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx
index e2e84577b..adaeac7fb 100644
--- a/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx
+++ b/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx
@@ -26,10 +26,10 @@
 
 #include <vtkm/testing/Testing.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace {
 
diff --git a/vtkm/internal/Configure.h.in b/vtkm/internal/Configure.h.in
index ea267977a..f2b948d92 100644
--- a/vtkm/internal/Configure.h.in
+++ b/vtkm/internal/Configure.h.in
@@ -114,21 +114,21 @@
 # endif
 #endif
 
-// Define a pair of macros, VTKM_BOOST_PRE_INCLUDE and VTKM_BOOST_POST_INCLUDE,
-// that should be wrapped around any #include for a boost header file. Mostly
+// Define a pair of macros, VTKM_THIRDPARTY_PRE_INCLUDE and VTKM_THIRDPARTY_POST_INCLUDE,
+// that should be wrapped around any #include for a boost or thrust header file. Mostly
 // this is used to set pragmas that dissable warnings that VTK-m checks for
-// but boost does not.
+// but boost and thrust does not.
 #if (defined(VTKM_GCC) || defined(VTKM_CLANG)) && !defined(VTKM_PGI)
-#define VTKM_BOOST_PRE_INCLUDE \
+#define VTKM_THIRDPARTY_PRE_INCLUDE \
   _Pragma("GCC diagnostic push") \
   _Pragma("GCC diagnostic ignored \"-Wconversion\"") \
   _Pragma("GCC diagnostic ignored \"-Wshadow\"") \
   _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
-#define VTKM_BOOST_POST_INCLUDE \
+#define VTKM_THIRDPARTY_POST_INCLUDE \
   _Pragma("GCC diagnostic pop")
 #else
-#define VTKM_BOOST_PRE_INCLUDE
-#define VTKM_BOOST_POST_INCLUDE
+#define VTKM_THIRDPARTY_PRE_INCLUDE
+#define VTKM_THIRDPARTY_POST_INCLUDE
 #endif
 
 // Determine whether we will use variadic templates (a new feature in C++11).
@@ -137,9 +137,9 @@
 #if !defined(VTKM_USE_VARIADIC_TEMPLATE) && !defined(VTKM_NO_VARIADIC_TEMPLATE)
 // Currently using Boost to determine support.
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 # include <boost/config.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 
 # if defined(BOOST_HAS_VARIADIC_TMPL)
diff --git a/vtkm/internal/ConnectivityStructuredInternals.h b/vtkm/internal/ConnectivityStructuredInternals.h
index 2e6f2dfd1..90a49a662 100644
--- a/vtkm/internal/ConnectivityStructuredInternals.h
+++ b/vtkm/internal/ConnectivityStructuredInternals.h
@@ -25,9 +25,9 @@
 #include <vtkm/TopologyElementTag.h>
 #include <vtkm/Types.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <iostream>
 
diff --git a/vtkm/internal/FunctionInterface.h b/vtkm/internal/FunctionInterface.h
index 8ff4e9582..14d5bfd8e 100644
--- a/vtkm/internal/FunctionInterface.h
+++ b/vtkm/internal/FunctionInterface.h
@@ -25,7 +25,7 @@
 #include <vtkm/internal/IndexTag.h>
 
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/function_types/components.hpp>
 #include <boost/function_types/function_arity.hpp>
 #include <boost/function_types/function_type.hpp>
@@ -40,7 +40,7 @@ VTKM_BOOST_PRE_INCLUDE
 #include <boost/mpl/less.hpp>
 #include <boost/mpl/push_back.hpp>
 #include <boost/utility/enable_if.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 
 
diff --git a/vtkm/internal/FunctionInterfaceDetailPre.h b/vtkm/internal/FunctionInterfaceDetailPre.h
index 124869a8d..6d0bb40b4 100644
--- a/vtkm/internal/FunctionInterfaceDetailPre.h
+++ b/vtkm/internal/FunctionInterfaceDetailPre.h
@@ -30,10 +30,10 @@
 #include <vtkm/Types.h>
 #include <vtkm/internal/IndexTag.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/function_types/function_type.hpp>
 #include <boost/mpl/at.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #define VTKM_MAX_FUNCTION_PARAMETERS 10
 
diff --git a/vtkm/internal/FunctionInterfaceDetailPre.h.in b/vtkm/internal/FunctionInterfaceDetailPre.h.in
index 97332a92a..b9f3b5f9e 100644
--- a/vtkm/internal/FunctionInterfaceDetailPre.h.in
+++ b/vtkm/internal/FunctionInterfaceDetailPre.h.in
@@ -42,10 +42,10 @@ $# Ignore the following comment. It is meant for the generated file.
 #include <vtkm/Types.h>
 #include <vtkm/internal/IndexTag.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/function_types/function_type.hpp>
 #include <boost/mpl/at.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 $py(max_parameters=10)\
 #define VTKM_MAX_FUNCTION_PARAMETERS $(max_parameters)
diff --git a/vtkm/testing/Testing.h b/vtkm/testing/Testing.h
index d247b3f98..c00e59e14 100644
--- a/vtkm/testing/Testing.h
+++ b/vtkm/testing/Testing.h
@@ -26,9 +26,9 @@
 #include <vtkm/TypeTraits.h>
 #include <vtkm/VecTraits.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/static_assert.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <iostream>
 #include <sstream>
diff --git a/vtkm/testing/VecTraitsTests.h b/vtkm/testing/VecTraitsTests.h
index deeaac724..7adf722c2 100644
--- a/vtkm/testing/VecTraitsTests.h
+++ b/vtkm/testing/VecTraitsTests.h
@@ -26,9 +26,9 @@
 
 #include <vtkm/testing/Testing.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/type_traits/remove_const.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace vtkm {
 namespace testing {
diff --git a/vtkm/worklet/internal/DispatcherBase.h b/vtkm/worklet/internal/DispatcherBase.h
index ef8241e59..6c0bd1650 100644
--- a/vtkm/worklet/internal/DispatcherBase.h
+++ b/vtkm/worklet/internal/DispatcherBase.h
@@ -36,12 +36,12 @@
 
 #include <vtkm/exec/internal/WorkletInvokeFunctor.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/mpl/assert.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/utility/enable_if.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 #include <sstream>
 
diff --git a/vtkm/worklet/testing/UnitTestCellAverage.cxx b/vtkm/worklet/testing/UnitTestCellAverage.cxx
index 19b29ecf3..481c5aa0a 100644
--- a/vtkm/worklet/testing/UnitTestCellAverage.cxx
+++ b/vtkm/worklet/testing/UnitTestCellAverage.cxx
@@ -24,9 +24,9 @@
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/cont/testing/MakeTestDataSet.h>
 
-VTKM_BOOST_PRE_INCLUDE
+VTKM_THIRDPARTY_PRE_INCLUDE
 #include <boost/shared_ptr.hpp>
-VTKM_BOOST_POST_INCLUDE
+VTKM_THIRDPARTY_POST_INCLUDE
 
 namespace {