diff --git a/doc/thrust.dox b/doc/thrust.dox
index 95ec1a480..fcfdc6c44 100644
--- a/doc/thrust.dox
+++ b/doc/thrust.dox
@@ -2057,12 +2057,8 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = THRUST_NOEXCEPT=noexcept \
-                         "THRUST_DEFAULT={}" \
-                         "THRUST_NODISCARD=[[nodiscard]]" \
+PREDEFINED             = "THRUST_NODISCARD=[[nodiscard]]" \
                          "THRUST_MR_DEFAULT_ALIGNMENT=alignof(max_align_t)" \
-                         "THRUST_FINAL=final" \
-                         "THRUST_OVERRIDE=" \
                          "cuda_cub=system::cuda"
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
diff --git a/testing/adjacent_difference.cu b/testing/adjacent_difference.cu
index 5f97ea350..53f5721da 100644
--- a/testing/adjacent_difference.cu
+++ b/testing/adjacent_difference.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/adjacent_difference.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/device_malloc.h>
 #include <thrust/device_free.h>
 
diff --git a/testing/allocator_aware_policies.cu b/testing/allocator_aware_policies.cu
index aaf841c70..0a737c3ce 100644
--- a/testing/allocator_aware_policies.cu
+++ b/testing/allocator_aware_policies.cu
@@ -17,14 +17,14 @@ struct test_allocator_t
 test_allocator_t<int> test_allocator = test_allocator_t<int>();
 const test_allocator_t<int> const_test_allocator = test_allocator_t<int>();
 
-struct test_memory_resource_t THRUST_FINAL : thrust::mr::memory_resource<>
+struct test_memory_resource_t final : thrust::mr::memory_resource<>
 {
-    void * do_allocate(std::size_t size, std::size_t) THRUST_OVERRIDE
+    void * do_allocate(std::size_t size, std::size_t) override
     {
         return reinterpret_cast<void *>(size);
     }
 
-    void do_deallocate(void * ptr, std::size_t size, std::size_t) THRUST_OVERRIDE
+    void do_deallocate(void * ptr, std::size_t size, std::size_t) override
     {
         ASSERT_EQUAL(ptr, reinterpret_cast<void *>(size));
     }
diff --git a/testing/binary_search.cu b/testing/binary_search.cu
index 2aceb8645..314c03843 100644
--- a/testing/binary_search.cu
+++ b/testing/binary_search.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/binary_search.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 #include <thrust/sequence.h>
 #include <thrust/sort.h>
diff --git a/testing/binary_search_vector.cu b/testing/binary_search_vector.cu
index d9a261c45..244849b20 100644
--- a/testing/binary_search_vector.cu
+++ b/testing/binary_search_vector.cu
@@ -4,7 +4,7 @@
 #include <thrust/sequence.h>
 #include <thrust/sort.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 //////////////////////
diff --git a/testing/copy.cu b/testing/copy.cu
index 6359baf79..d99303158 100644
--- a/testing/copy.cu
+++ b/testing/copy.cu
@@ -8,7 +8,7 @@
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/device_malloc.h>
 #include <thrust/device_free.h>
 
diff --git a/testing/copy_n.cu b/testing/copy_n.cu
index 2003b1069..c421e7672 100644
--- a/testing/copy_n.cu
+++ b/testing/copy_n.cu
@@ -8,7 +8,7 @@
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 void TestCopyNFromConstIterator(void)
 {
diff --git a/testing/count.cu b/testing/count.cu
index a6021da79..30887cb56 100644
--- a/testing/count.cu
+++ b/testing/count.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/count.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template <class Vector>
 void TestCountSimple(void)
diff --git a/testing/equal.cu b/testing/equal.cu
index ca9f7eb69..7093a88bd 100644
--- a/testing/equal.cu
+++ b/testing/equal.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/equal.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/device_malloc.h>
 #include <thrust/device_free.h>
 
diff --git a/testing/fill.cu b/testing/fill.cu
index 7154b4118..1f1898505 100644
--- a/testing/fill.cu
+++ b/testing/fill.cu
@@ -2,7 +2,7 @@
 #include <thrust/fill.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <algorithm>
 
 THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
diff --git a/testing/find.cu b/testing/find.cu
index 427c8a723..0332fc9bd 100644
--- a/testing/find.cu
+++ b/testing/find.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/find.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template <typename T>
diff --git a/testing/for_each.cu b/testing/for_each.cu
index 8040e5f78..b0b7a25f5 100644
--- a/testing/for_each.cu
+++ b/testing/for_each.cu
@@ -2,7 +2,7 @@
 #include <thrust/for_each.h>
 #include <thrust/device_ptr.h>
 #include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/device_malloc.h>
 #include <thrust/device_free.h>
 #include <algorithm>
diff --git a/testing/gather.cu b/testing/gather.cu
index c164e44b2..8acc8f197 100644
--- a/testing/gather.cu
+++ b/testing/gather.cu
@@ -3,7 +3,7 @@
 #include <thrust/fill.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/sequence.h>
 #include <algorithm>
 
diff --git a/testing/generate.cu b/testing/generate.cu
index fefd7d8e6..ae999b410 100644
--- a/testing/generate.cu
+++ b/testing/generate.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/generate.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
 
diff --git a/testing/inner_product.cu b/testing/inner_product.cu
index 1bb897e6d..e6a29a6a1 100644
--- a/testing/inner_product.cu
+++ b/testing/inner_product.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/inner_product.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/device_malloc.h>
 #include <thrust/device_free.h>
 
diff --git a/testing/is_partitioned.cu b/testing/is_partitioned.cu
index e503f32a3..4fb1ca065 100644
--- a/testing/is_partitioned.cu
+++ b/testing/is_partitioned.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/partition.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template<typename T>
 struct is_even
diff --git a/testing/is_sorted.cu b/testing/is_sorted.cu
index 9edb7ed22..6af9ce450 100644
--- a/testing/is_sorted.cu
+++ b/testing/is_sorted.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/sort.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template <class Vector>
 void TestIsSortedSimple(void)
diff --git a/testing/is_sorted_until.cu b/testing/is_sorted_until.cu
index 128395581..2f3f7a9eb 100644
--- a/testing/is_sorted_until.cu
+++ b/testing/is_sorted_until.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/sort.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template<typename Vector>
 void TestIsSortedUntilSimple(void)
diff --git a/testing/logical.cu b/testing/logical.cu
index 0a2b6edc9..33098b835 100644
--- a/testing/logical.cu
+++ b/testing/logical.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/logical.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template <class Vector>
diff --git a/testing/max_element.cu b/testing/max_element.cu
index 456239264..772b017dc 100644
--- a/testing/max_element.cu
+++ b/testing/max_element.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/extrema.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/functional.h>
 
diff --git a/testing/merge.cu b/testing/merge.cu
index d225edb07..3b7fcb401 100644
--- a/testing/merge.cu
+++ b/testing/merge.cu
@@ -5,7 +5,7 @@
 #include <thrust/unique.h>
 #include <thrust/extrema.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template<typename Vector>
 void TestMergeSimple(void)
diff --git a/testing/merge_by_key.cu b/testing/merge_by_key.cu
index 4f504add8..6cee644fd 100644
--- a/testing/merge_by_key.cu
+++ b/testing/merge_by_key.cu
@@ -4,7 +4,7 @@
 #include <thrust/sort.h>
 #include <thrust/unique.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template<typename Vector>
 void TestMergeByKeySimple(void)
diff --git a/testing/min_element.cu b/testing/min_element.cu
index 81fedbdab..109eae601 100644
--- a/testing/min_element.cu
+++ b/testing/min_element.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/extrema.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template <class Vector>
 void TestMinElementSimple(void)
diff --git a/testing/minmax_element.cu b/testing/minmax_element.cu
index 4a87f5bb4..61dc6cdef 100644
--- a/testing/minmax_element.cu
+++ b/testing/minmax_element.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/extrema.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template <class Vector>
 void TestMinMaxElementSimple(void)
diff --git a/testing/mismatch.cu b/testing/mismatch.cu
index 9c2ce351a..1b9e3d6b4 100644
--- a/testing/mismatch.cu
+++ b/testing/mismatch.cu
@@ -1,6 +1,6 @@
 #include <unittest/unittest.h>
 #include <thrust/mismatch.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template <class Vector>
 void TestMismatchSimple(void)
diff --git a/testing/mr_disjoint_pool.cu b/testing/mr_disjoint_pool.cu
index 8499c6c53..84ffd22fa 100644
--- a/testing/mr_disjoint_pool.cu
+++ b/testing/mr_disjoint_pool.cu
@@ -50,7 +50,7 @@ struct pointer_traits<alloc_id>
 };
 }}
 
-class dummy_resource THRUST_FINAL : public thrust::mr::memory_resource<alloc_id>
+class dummy_resource final : public thrust::mr::memory_resource<alloc_id>
 {
 public:
     dummy_resource() : id_to_allocate(0), id_to_deallocate(0)
@@ -63,7 +63,7 @@ public:
         ASSERT_EQUAL(id_to_deallocate, 0u);
     }
 
-    virtual alloc_id do_allocate(std::size_t bytes, std::size_t alignment) THRUST_OVERRIDE
+    virtual alloc_id do_allocate(std::size_t bytes, std::size_t alignment) override
     {
         ASSERT_EQUAL(static_cast<bool>(id_to_allocate), true);
 
@@ -77,7 +77,7 @@ public:
         return ret;
     }
 
-    virtual void do_deallocate(alloc_id p, std::size_t bytes, std::size_t alignment) THRUST_OVERRIDE
+    virtual void do_deallocate(alloc_id p, std::size_t bytes, std::size_t alignment) override
     {
         ASSERT_EQUAL(p.size, bytes);
         ASSERT_EQUAL(p.alignment, alignment);
diff --git a/testing/mr_pool.cu b/testing/mr_pool.cu
index 75b18f038..30c1f18a4 100644
--- a/testing/mr_pool.cu
+++ b/testing/mr_pool.cu
@@ -108,7 +108,7 @@ struct tracked_pointer : thrust::iterator_facade<
     }
 };
 
-class tracked_resource THRUST_FINAL : public thrust::mr::memory_resource<tracked_pointer<void> >
+class tracked_resource final : public thrust::mr::memory_resource<tracked_pointer<void> >
 {
 public:
     tracked_resource() : id_to_allocate(0), id_to_deallocate(0)
@@ -121,7 +121,7 @@ public:
         ASSERT_EQUAL(id_to_deallocate, 0u);
     }
 
-    virtual tracked_pointer<void> do_allocate(std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual tracked_pointer<void> do_allocate(std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         ASSERT_EQUAL(static_cast<bool>(id_to_allocate), true);
 
@@ -136,7 +136,7 @@ public:
         return ret;
     }
 
-    virtual void do_deallocate(tracked_pointer<void> p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual void do_deallocate(tracked_pointer<void> p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         ASSERT_EQUAL(p.size, n);
         ASSERT_EQUAL(p.alignment, alignment);
diff --git a/testing/partition.cu b/testing/partition.cu
index 742560f59..03ca9f804 100644
--- a/testing/partition.cu
+++ b/testing/partition.cu
@@ -3,7 +3,7 @@
 #include <thrust/count.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/sort.h>
 
 template<typename T>
diff --git a/testing/partition_point.cu b/testing/partition_point.cu
index bd5a6a8c8..8fabf692f 100644
--- a/testing/partition_point.cu
+++ b/testing/partition_point.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/partition.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template<typename T>
 struct is_even
diff --git a/testing/reduce.cu b/testing/reduce.cu
index cb08bc889..1cbe346c6 100644
--- a/testing/reduce.cu
+++ b/testing/reduce.cu
@@ -2,7 +2,7 @@
 #include <thrust/reduce.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/constant_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <limits>
 
 template<typename T>
diff --git a/testing/reduce_by_key.cu b/testing/reduce_by_key.cu
index f8539c066..54b00b189 100644
--- a/testing/reduce_by_key.cu
+++ b/testing/reduce_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/reduce.h>
 #include <thrust/unique.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 template<typename T>
 struct is_equal_div_10_reduce
diff --git a/testing/remove.cu b/testing/remove.cu
index 95b679dc7..804fdad8e 100644
--- a/testing/remove.cu
+++ b/testing/remove.cu
@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename T>
diff --git a/testing/replace.cu b/testing/replace.cu
index 31e9890bb..d9e130301 100644
--- a/testing/replace.cu
+++ b/testing/replace.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/replace.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template <class Vector>
diff --git a/testing/reverse.cu b/testing/reverse.cu
index b04e446dc..ba1cea062 100644
--- a/testing/reverse.cu
+++ b/testing/reverse.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/reverse.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 typedef unittest::type_list<unittest::int8_t,unittest::int16_t,unittest::int32_t> ReverseTypes;
diff --git a/testing/scan.cu b/testing/scan.cu
index 347b1c126..86bb5e829 100644
--- a/testing/scan.cu
+++ b/testing/scan.cu
@@ -3,7 +3,7 @@
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/constant_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/device_malloc.h>
 #include <thrust/device_free.h>
 
diff --git a/testing/scan_by_key.cu b/testing/scan_by_key.cu
index efc48bdb4..a156380bb 100644
--- a/testing/scan_by_key.cu
+++ b/testing/scan_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/scan.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/transform_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/random.h>
 
 
diff --git a/testing/scatter.cu b/testing/scatter.cu
index ffd56f27c..2d3c0f1a3 100644
--- a/testing/scatter.cu
+++ b/testing/scatter.cu
@@ -2,7 +2,7 @@
 #include <thrust/scatter.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/sequence.h>
 #include <thrust/fill.h>
 #include <algorithm>
diff --git a/testing/sequence.cu b/testing/sequence.cu
index cd3e17744..55e91bb02 100644
--- a/testing/sequence.cu
+++ b/testing/sequence.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/sequence.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename ForwardIterator>
diff --git a/testing/set_difference.cu b/testing/set_difference.cu
index 8ae553fd8..f79457b16 100644
--- a/testing/set_difference.cu
+++ b/testing/set_difference.cu
@@ -3,7 +3,7 @@
 #include <thrust/functional.h>
 #include <thrust/sort.h>
 #include <thrust/extrema.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_difference_by_key.cu b/testing/set_difference_by_key.cu
index be68685fc..3c66f1a66 100644
--- a/testing/set_difference_by_key.cu
+++ b/testing/set_difference_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/set_operations.h>
 #include <thrust/functional.h>
 #include <thrust/sort.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_intersection.cu b/testing/set_intersection.cu
index a8fae6537..788409eb1 100644
--- a/testing/set_intersection.cu
+++ b/testing/set_intersection.cu
@@ -4,7 +4,7 @@
 #include <thrust/sort.h>
 #include <thrust/extrema.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_intersection_by_key.cu b/testing/set_intersection_by_key.cu
index 6b7d51fc8..34b5454e9 100644
--- a/testing/set_intersection_by_key.cu
+++ b/testing/set_intersection_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/set_operations.h>
 #include <thrust/functional.h>
 #include <thrust/sort.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_symmetric_difference.cu b/testing/set_symmetric_difference.cu
index b3e3c1493..c34d5ea94 100644
--- a/testing/set_symmetric_difference.cu
+++ b/testing/set_symmetric_difference.cu
@@ -3,7 +3,7 @@
 #include <thrust/functional.h>
 #include <thrust/sort.h>
 #include <thrust/extrema.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_symmetric_difference_by_key.cu b/testing/set_symmetric_difference_by_key.cu
index c2688fdb8..c40667582 100644
--- a/testing/set_symmetric_difference_by_key.cu
+++ b/testing/set_symmetric_difference_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/set_operations.h>
 #include <thrust/functional.h>
 #include <thrust/sort.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_union.cu b/testing/set_union.cu
index 414bd3c81..71012ef30 100644
--- a/testing/set_union.cu
+++ b/testing/set_union.cu
@@ -4,7 +4,7 @@
 #include <thrust/extrema.h>
 #include <thrust/sort.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/set_union_by_key.cu b/testing/set_union_by_key.cu
index ec8864941..c8af9d180 100644
--- a/testing/set_union_by_key.cu
+++ b/testing/set_union_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/set_operations.h>
 #include <thrust/functional.h>
 #include <thrust/sort.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator1,
diff --git a/testing/sort.cu b/testing/sort.cu
index e460655c4..4d4724a09 100644
--- a/testing/sort.cu
+++ b/testing/sort.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/sort.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename RandomAccessIterator>
diff --git a/testing/sort_by_key.cu b/testing/sort_by_key.cu
index 7e8c870eb..8bb1baa5b 100644
--- a/testing/sort_by_key.cu
+++ b/testing/sort_by_key.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/sort.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename RandomAccessIterator1,
diff --git a/testing/stable_sort.cu b/testing/stable_sort.cu
index c7cdb3e52..7a517d69a 100644
--- a/testing/stable_sort.cu
+++ b/testing/stable_sort.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/sort.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename RandomAccessIterator>
diff --git a/testing/stable_sort_by_key.cu b/testing/stable_sort_by_key.cu
index e3736542d..0b96b5dc0 100644
--- a/testing/stable_sort_by_key.cu
+++ b/testing/stable_sort_by_key.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/sort.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename RandomAccessIterator1, typename RandomAccessIterator2>
diff --git a/testing/swap_ranges.cu b/testing/swap_ranges.cu
index 843c66240..691f76e52 100644
--- a/testing/swap_ranges.cu
+++ b/testing/swap_ranges.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/swap.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 #include <thrust/system/cpp/memory.h>
 
 
diff --git a/testing/tabulate.cu b/testing/tabulate.cu
index 25c6e40ac..4aa3fedfd 100644
--- a/testing/tabulate.cu
+++ b/testing/tabulate.cu
@@ -2,7 +2,7 @@
 #include <thrust/tabulate.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename ForwardIterator, typename UnaryOperation>
diff --git a/testing/transform.cu b/testing/transform.cu
index 7e3c3e60f..ebaa87b08 100644
--- a/testing/transform.cu
+++ b/testing/transform.cu
@@ -5,7 +5,7 @@
 #include <thrust/tuple.h>
 #include <thrust/pair.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template <class Vector>
diff --git a/testing/transform_reduce.cu b/testing/transform_reduce.cu
index 3ff3159d6..723abedb9 100644
--- a/testing/transform_reduce.cu
+++ b/testing/transform_reduce.cu
@@ -3,7 +3,7 @@
 
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator, 
diff --git a/testing/transform_scan.cu b/testing/transform_scan.cu
index 2e6633923..2fd73e939 100644
--- a/testing/transform_scan.cu
+++ b/testing/transform_scan.cu
@@ -5,7 +5,7 @@
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator,
diff --git a/testing/uninitialized_copy.cu b/testing/uninitialized_copy.cu
index 7455d8c81..57e031aad 100644
--- a/testing/uninitialized_copy.cu
+++ b/testing/uninitialized_copy.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/uninitialized_copy.h>
 #include <thrust/device_malloc_allocator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename InputIterator, typename ForwardIterator>
diff --git a/testing/uninitialized_fill.cu b/testing/uninitialized_fill.cu
index 5e0d53c72..d7c2b29f1 100644
--- a/testing/uninitialized_fill.cu
+++ b/testing/uninitialized_fill.cu
@@ -1,7 +1,7 @@
 #include <unittest/unittest.h>
 #include <thrust/uninitialized_fill.h>
 #include <thrust/device_malloc_allocator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template<typename ForwardIterator, typename T>
diff --git a/testing/unique.cu b/testing/unique.cu
index 8073832df..a61a98565 100644
--- a/testing/unique.cu
+++ b/testing/unique.cu
@@ -2,7 +2,7 @@
 #include <thrust/unique.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template <typename ForwardIterator>
diff --git a/testing/unique_by_key.cu b/testing/unique_by_key.cu
index 76073e0ca..442ed2626 100644
--- a/testing/unique_by_key.cu
+++ b/testing/unique_by_key.cu
@@ -2,7 +2,7 @@
 #include <thrust/unique.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/retag.h>
+#include <thrust/iterator/detail/retag.h>
 
 
 template <typename ForwardIterator1,
diff --git a/thrust/addressof.h b/thrust/addressof.h
index 1134c759b..a4ee064d4 100644
--- a/thrust/addressof.h
+++ b/thrust/addressof.h
@@ -7,9 +7,7 @@
 
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
-#  include <memory>
-#endif
+#include <memory>
 
 namespace thrust
 {
@@ -20,7 +18,7 @@ namespace thrust
  */
 template <typename T>
 __host__ __device__
-T* addressof(T& arg) 
+T* addressof(T& arg)
 {
   return reinterpret_cast<T*>(
     &const_cast<char&>(reinterpret_cast<const volatile char&>(arg))
diff --git a/thrust/allocate_unique.h b/thrust/allocate_unique.h
index 8b1562b0e..f1ef576d0 100644
--- a/thrust/allocate_unique.h
+++ b/thrust/allocate_unique.h
@@ -6,10 +6,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/type_deduction.h>
 #include <thrust/detail/memory_algorithms.h>
@@ -246,7 +242,7 @@ struct array_allocator_delete final
   allocator_type alloc_;
   std::size_t    count_;
 };
-  
+
 template <typename T, typename Allocator>
 using uninitialized_array_allocator_delete
   = array_allocator_delete<T, Allocator, true>;
@@ -440,5 +436,3 @@ uninitialized_allocate_unique_n(
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/async/copy.h b/thrust/async/copy.h
index c3d7b3bdd..3ac347bb8 100644
--- a/thrust/async/copy.h
+++ b/thrust/async/copy.h
@@ -21,11 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
-
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
 #include <thrust/type_traits/remove_cvref.h>
@@ -146,5 +141,3 @@ THRUST_INLINE_CONSTANT copy_detail::copy_fn copy{};
 
 } // end namespace thrust
 
-#endif
-
diff --git a/thrust/async/for_each.h b/thrust/async/for_each.h
index fc1814bdc..ab93caf88 100644
--- a/thrust/async/for_each.h
+++ b/thrust/async/for_each.h
@@ -21,11 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
-
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
 #include <thrust/type_traits/remove_cvref.h>
@@ -57,13 +52,13 @@ async_for_each(
   , "this algorithm is not implemented for the specified system"
   );
   return {};
-} 
+}
 
 } // namespace unimplemented
 
 namespace for_each_detail
 {
-    
+
 using thrust::async::unimplemented::async_for_each;
 
 struct for_each_fn final
@@ -76,7 +71,7 @@ struct for_each_fn final
   static auto call(
     thrust::detail::execution_policy_base<DerivedPolicy> const& exec
   , ForwardIt&& first, Sentinel&& last
-  , UnaryFunction&& f 
+  , UnaryFunction&& f
   )
   // ADL dispatch.
   THRUST_DECLTYPE_RETURNS(
@@ -89,7 +84,7 @@ struct for_each_fn final
 
   template <typename ForwardIt, typename Sentinel, typename UnaryFunction>
   __host__
-  static auto call(ForwardIt&& first, Sentinel&& last, UnaryFunction&& f) 
+  static auto call(ForwardIt&& first, Sentinel&& last, UnaryFunction&& f)
   THRUST_DECLTYPE_RETURNS(
     for_each_fn::call(
       thrust::detail::select_system(
@@ -116,5 +111,3 @@ THRUST_INLINE_CONSTANT for_each_detail::for_each_fn for_each{};
 
 } // end namespace thrust
 
-#endif
-
diff --git a/thrust/async/reduce.h b/thrust/async/reduce.h
index a37499584..5b045fbca 100644
--- a/thrust/async/reduce.h
+++ b/thrust/async/reduce.h
@@ -21,11 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
-
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
 #include <thrust/type_traits/logical_metafunctions.h>
@@ -48,7 +43,7 @@ template <
   typename DerivedPolicy
 , typename ForwardIt, typename Sentinel, typename T, typename BinaryOp
 >
-__host__ 
+__host__
 future<DerivedPolicy, T>
 async_reduce(
   thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, T, BinaryOp
@@ -59,7 +54,7 @@ async_reduce(
   , "this algorithm is not implemented for the specified system"
   );
   return {};
-} 
+}
 
 } // namespace unimplemented
 
@@ -208,7 +203,7 @@ struct reduce_fn final
   )
 
   template <typename... Args>
-  THRUST_NODISCARD __host__ 
+  THRUST_NODISCARD __host__
   auto operator()(Args&&... args) const
   THRUST_DECLTYPE_RETURNS(
     call(THRUST_FWD(args)...)
@@ -241,7 +236,7 @@ async_reduce_into(
   , "this algorithm is not implemented for the specified system"
   );
   return {};
-} 
+}
 
 } // namespace unimplemented
 
@@ -423,7 +418,7 @@ struct reduce_into_fn final
   )
 
   template <typename... Args>
-  THRUST_NODISCARD __host__ 
+  THRUST_NODISCARD __host__
   auto operator()(Args&&... args) const
   THRUST_DECLTYPE_RETURNS(
     call(THRUST_FWD(args)...)
@@ -438,5 +433,3 @@ THRUST_INLINE_CONSTANT reduce_into_detail::reduce_into_fn reduce_into{};
 
 } // end namespace thrust
 
-#endif
-
diff --git a/thrust/async/sort.h b/thrust/async/sort.h
index 0b6a55830..5388e49c1 100644
--- a/thrust/async/sort.h
+++ b/thrust/async/sort.h
@@ -21,11 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
-
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
 #include <thrust/type_traits/logical_metafunctions.h>
@@ -48,10 +43,10 @@ template <
   typename DerivedPolicy
 , typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
 >
-__host__ 
+__host__
 event<DerivedPolicy>
 async_stable_sort(
-  thrust::execution_policy<DerivedPolicy>& 
+  thrust::execution_policy<DerivedPolicy>&
 , ForwardIt, Sentinel, StrictWeakOrdering
 )
 {
@@ -60,7 +55,7 @@ async_stable_sort(
   , "this algorithm is not implemented for the specified system"
   );
   return {};
-} 
+}
 
 } // namespace unimplemented
 
@@ -75,7 +70,7 @@ struct stable_sort_fn final
     typename DerivedPolicy
   , typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
   >
-  __host__ 
+  __host__
   static auto call(
     thrust::detail::execution_policy_base<DerivedPolicy> const& exec
   , ForwardIt&& first, Sentinel&& last
@@ -94,7 +89,7 @@ struct stable_sort_fn final
     typename DerivedPolicy
   , typename ForwardIt, typename Sentinel
   >
-  __host__ 
+  __host__
   static auto call(
     thrust::detail::execution_policy_base<DerivedPolicy> const& exec
   , ForwardIt&& first, Sentinel&& last
@@ -111,8 +106,8 @@ struct stable_sort_fn final
   )
 
   template <typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
-  __host__ 
-  static auto call(ForwardIt&& first, Sentinel&& last, StrictWeakOrdering&& comp) 
+  __host__
+  static auto call(ForwardIt&& first, Sentinel&& last, StrictWeakOrdering&& comp)
   THRUST_DECLTYPE_RETURNS(
     stable_sort_fn::call(
       thrust::detail::select_system(
@@ -124,8 +119,8 @@ struct stable_sort_fn final
   )
 
   template <typename ForwardIt, typename Sentinel>
-  __host__ 
-  static auto call(ForwardIt&& first, Sentinel&& last) 
+  __host__
+  static auto call(ForwardIt&& first, Sentinel&& last)
   THRUST_DECLTYPE_RETURNS(
     stable_sort_fn::call(
       THRUST_FWD(first), THRUST_FWD(last)
@@ -136,7 +131,7 @@ struct stable_sort_fn final
   )
 
   template <typename... Args>
-  THRUST_NODISCARD __host__ 
+  THRUST_NODISCARD __host__
   auto operator()(Args&&... args) const
   THRUST_DECLTYPE_RETURNS(
     call(THRUST_FWD(args)...)
@@ -154,7 +149,7 @@ template <
   typename DerivedPolicy
 , typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
 >
-__host__ 
+__host__
 event<DerivedPolicy>
 async_sort(
   thrust::execution_policy<DerivedPolicy>& exec
@@ -165,7 +160,7 @@ async_sort(
     thrust::detail::derived_cast(exec)
   , THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(comp)
   );
-} 
+}
 
 } // namespace fallback
 
@@ -180,7 +175,7 @@ struct sort_fn final
     typename DerivedPolicy
   , typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
   >
-  __host__ 
+  __host__
   static auto call(
     thrust::detail::execution_policy_base<DerivedPolicy> const& exec
   , ForwardIt&& first, Sentinel&& last
@@ -199,7 +194,7 @@ struct sort_fn final
     typename DerivedPolicy
   , typename ForwardIt, typename Sentinel
   >
-  __host__ 
+  __host__
   static auto call3(
     thrust::detail::execution_policy_base<DerivedPolicy> const& exec
   , ForwardIt&& first, Sentinel&& last
@@ -216,7 +211,7 @@ struct sort_fn final
   )
 
   template <typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
-  __host__ 
+  __host__
   static auto call3(ForwardIt&& first, Sentinel&& last,
                     StrictWeakOrdering&& comp,
                     thrust::false_type)
@@ -242,8 +237,8 @@ struct sort_fn final
   )
 
   template <typename ForwardIt, typename Sentinel>
-  __host__ 
-  static auto call(ForwardIt&& first, Sentinel&& last) 
+  __host__
+  static auto call(ForwardIt&& first, Sentinel&& last)
   THRUST_DECLTYPE_RETURNS(
     sort_fn::call(
       thrust::detail::select_system(
@@ -257,7 +252,7 @@ struct sort_fn final
   )
 
   template <typename... Args>
-  THRUST_NODISCARD __host__ 
+  THRUST_NODISCARD __host__
   auto operator()(Args&&... args) const
   THRUST_DECLTYPE_RETURNS(
     call(THRUST_FWD(args)...)
@@ -272,5 +267,4 @@ THRUST_INLINE_CONSTANT sort_detail::sort_fn sort{};
 
 } // end namespace thrust
 
-#endif
 
diff --git a/thrust/async/transform.h b/thrust/async/transform.h
index 3011a5df7..8842baa2c 100644
--- a/thrust/async/transform.h
+++ b/thrust/async/transform.h
@@ -21,11 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
-
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/select_system.h>
 #include <thrust/type_traits/remove_cvref.h>
@@ -131,5 +126,3 @@ THRUST_INLINE_CONSTANT transform_detail::transform_fn transform{};
 
 } // end namespace thrust
 
-#endif
-
diff --git a/thrust/complex.h b/thrust/complex.h
index badacb467..544acba6b 100644
--- a/thrust/complex.h
+++ b/thrust/complex.h
@@ -28,21 +28,15 @@
 #include <sstream>
 #include <thrust/detail/type_traits.h>
 
-#if THRUST_CPP_DIALECT >= 2011
-#  define THRUST_STD_COMPLEX_REAL(z) \
-    reinterpret_cast< \
-      const typename thrust::detail::remove_reference<decltype(z)>::type::value_type (&)[2] \
-    >(z)[0]
-#  define THRUST_STD_COMPLEX_IMAG(z) \
-    reinterpret_cast< \
-      const typename thrust::detail::remove_reference<decltype(z)>::type::value_type (&)[2] \
-    >(z)[1]
-#  define THRUST_STD_COMPLEX_DEVICE __device__
-#else
-#  define THRUST_STD_COMPLEX_REAL(z) (z).real()
-#  define THRUST_STD_COMPLEX_IMAG(z) (z).imag()
-#  define THRUST_STD_COMPLEX_DEVICE
-#endif
+#define THRUST_STD_COMPLEX_REAL(z) \
+  reinterpret_cast< \
+    const typename thrust::detail::remove_reference<decltype(z)>::type::value_type (&)[2] \
+  >(z)[0]
+#define THRUST_STD_COMPLEX_IMAG(z) \
+  reinterpret_cast< \
+    const typename thrust::detail::remove_reference<decltype(z)>::type::value_type (&)[2] \
+  >(z)[1]
+#define THRUST_STD_COMPLEX_DEVICE __device__
 
 namespace thrust
 {
@@ -65,75 +59,12 @@ namespace thrust
 
 namespace detail
 {
-  
+
 template <typename T, std::size_t Align>
-struct complex_storage;
-
-#if THRUST_CPP_DIALECT >= 2011                                                    \
-  && (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC)                       \
-  && (THRUST_GCC_VERSION >= 40800)
-  // C++11 implementation, excluding GCC 4.7, which doesn't have `alignas`.
-  template <typename T, std::size_t Align>
-  struct complex_storage
-  {
-    struct alignas(Align) type { T x; T y; };
-  };
-#elif  (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC)                    \
-    || (   (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC)                 \
-        && (THRUST_GCC_VERSION < 40600))
-  // C++03 implementation for MSVC and GCC <= 4.5.
-  // 
-  // We have to implement `aligned_type` with specializations for MSVC
-  // and GCC 4.2 and older because they require literals as arguments to 
-  // their alignment attribute.
-
-  #if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC)
-    // MSVC implementation.
-    #define THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(X)                   \
-      template <typename T>                                                   \
-      struct complex_storage<T, X>                                            \
-      {                                                                       \
-        __declspec(align(X)) struct type { T x; T y; };                       \
-      };                                                                      \
-      /**/
-  #else
-    // GCC <= 4.2 implementation.
-    #define THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(X)                   \
-      template <typename T>                                                   \
-      struct complex_storage<T, X>                                            \
-      {                                                                       \
-        struct type { T x; T y; } __attribute__((aligned(X)));                \
-      };                                                                      \
-      /**/
-  #endif
-
-  // The primary template is a fallback, which doesn't specify any alignment.
-  // It's only used when T is very large and we're using an older compilers
-  // which we have to fully specialize each alignment case.
-  template <typename T, std::size_t Align>
-  struct complex_storage
-  {
-    T x; T y;
-  };
-  
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(1);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(2);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(4);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(8);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(16);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(32);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(64);
-  THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION(128);
-
-  #undef THRUST_DEFINE_COMPLEX_STORAGE_SPECIALIZATION
-#else
-  // C++03 implementation for GCC > 4.5, Clang, PGI, ICPC, and xlC.
-  template <typename T, std::size_t Align>
-  struct complex_storage
-  {
-    struct type { T x; T y; } __attribute__((aligned(Align)));
-  };
-#endif
+struct complex_storage
+{
+  struct alignas(Align) type { T x; T y; };
+};
 
 } // end namespace detail
 
@@ -173,7 +104,6 @@ struct complex
   __host__ __device__
   complex(const T& re, const T& im);
 
-#if THRUST_CPP_DIALECT >= 2011
   /*! Default construct a complex number.
    */
   complex() = default;
@@ -184,20 +114,6 @@ struct complex
    *  \param z The \p complex to copy from.
    */
   complex(const complex<T>& z) = default;
-#else
-  /*! Default construct a complex number.
-   */
-  __host__ __device__
-  complex();
-
-  /*! This copy constructor copies from a \p complex with a type that is
-   *  convertible to this \p complex's \c value_type.
-   *
-   *  \param z The \p complex to copy from.
-   */
-  __host__ __device__
-  complex(const complex<T>& z);
-#endif
 
   /*! This converting copy constructor copies from a \p complex with a type
    *  that is convertible to this \p complex's \c value_type.
@@ -241,22 +157,12 @@ struct complex
   __host__ __device__
   complex& operator=(const T& re);
 
-#if THRUST_CPP_DIALECT >= 2011
   /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
    *  \p complex respectively.
    *
    *  \param z The \p complex to copy from.
    */
   complex& operator=(const complex<T>& z) = default;
-#else
-  /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
-   *  \p complex respectively.
-   *
-   *  \param z The \p complex to copy from.
-   */
-  __host__ __device__
-  complex& operator=(const complex<T>& z);
-#endif
 
   /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
    *  \p complex respectively.
diff --git a/thrust/detail/alignment.h b/thrust/detail/alignment.h
index 89c8afcd8..05f5862bf 100644
--- a/thrust/detail/alignment.h
+++ b/thrust/detail/alignment.h
@@ -25,9 +25,7 @@
 
 #include <cstddef> // For `std::size_t` and `std::max_align_t`.
 
-#if THRUST_CPP_DIALECT >= 2011
-    #include <type_traits> // For `std::alignment_of` and `std::aligned_storage`.
-#endif
+#include <type_traits> // For `std::alignment_of` and `std::aligned_storage`.
 
 namespace thrust
 {
@@ -36,175 +34,48 @@ namespace detail
 
 /// \p THRUST_ALIGNOF is a macro that takes a single type-id as a parameter,
 /// and returns the alignment requirement of the type in bytes.
-/// 
+///
 /// It is an approximation of C++11's `alignof` operator.
 ///
 /// Note: MSVC does not allow the builtin used to implement this to be placed
 /// inside of a `__declspec(align(#))` attribute. As a workaround, you can
 /// assign the result of \p THRUST_ALIGNOF to a variable and pass the variable
 /// as the argument to `__declspec(align(#))`.
-#if THRUST_CPP_DIALECT >= 2011
-    #define THRUST_ALIGNOF(x) alignof(x) 
-#else
-    #define THRUST_ALIGNOF(x) __alignof(x)
-#endif
+#define THRUST_ALIGNOF(x) alignof(x)
 
 /// \p alignment_of provides the member constant `value` which is equal to the
 /// alignment requirement of the type `T`, as if obtained by a C++11 `alignof`
 /// expression.
-/// 
+///
 /// It is an implementation of C++11's \p std::alignment_of.
-#if THRUST_CPP_DIALECT >= 2011
-    template <typename T>
-    using alignment_of = std::alignment_of<T>;
-#else
-    template <typename T>
-    struct alignment_of;
-
-    template <typename T, std::size_t size_diff>
-    struct alignment_of_helper
-    {
-        static const std::size_t value =
-            integral_constant<std::size_t, size_diff>::value;
-    };
-
-    template <typename T>
-    struct alignment_of_helper<T, 0>
-    {
-        static const std::size_t value = alignment_of<T>::value;
-    };
-
-    template <typename T>
-    struct alignment_of
-    {
-      private:
-        struct impl
-        {
-            T    x;
-            char c;
-        };
-
-      public:
-        static const std::size_t value =
-            alignment_of_helper<impl, sizeof(impl) - sizeof(T)>::value;
-    };
-#endif
+template <typename T>
+using alignment_of = std::alignment_of<T>;
 
 /// \p aligned_type provides the nested type `type`, which is a trivial
 /// type whose alignment requirement is a divisor of `Align`.
 ///
 /// The behavior is undefined if `Align` is not a power of 2.
 template <std::size_t Align>
-struct aligned_type;
-
-#if THRUST_CPP_DIALECT >= 2011                                                     \
-  && (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC)                        \
-  && (THRUST_GCC_VERSION >= 40800)
-    // C++11 implementation, excluding GCC 4.7, which doesn't have `alignas`.
-    template <std::size_t Align>
-    struct aligned_type
-    {
-        struct alignas(Align) type {};
-    };
-#elif  (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC)                    \
-    || (   (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC)                 \
-        && (THRUST_GCC_VERSION < 40600))
-    // C++03 implementation for MSVC and GCC <= 4.5.
-    // 
-    // We have to implement `aligned_type` with specializations for MSVC
-    // and GCC 4.2.x and older because they require literals as arguments to 
-    // their alignment attribute.
-
-    #if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC)
-        // MSVC implementation.
-        #define THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(X)                  \
-            template <>                                                       \
-            struct aligned_type<X>                                            \
-            {                                                                 \
-                __declspec(align(X)) struct type {};                          \
-            };                                                                \
-            /**/
-    #else
-        // GCC <= 4.2 implementation.
-        #define THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(X)                  \
-            template <>                                                       \
-            struct aligned_type<X>                                            \
-            {                                                                 \
-                struct type {} __attribute__((aligned(X)));                   \
-            };                                                                \
-            /**/
-    #endif
-    
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(1);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(2);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(4);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(8);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(16);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(32);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(64);
-    THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION(128);
-
-    #undef THRUST_DEFINE_ALIGNED_TYPE_SPECIALIZATION
-#else
-    // C++03 implementation for GCC > 4.5, Clang, PGI, ICPC, and xlC.
-    template <std::size_t Align>
-    struct aligned_type
-    {
-        struct type {} __attribute__((aligned(Align)));
-    };
-#endif
+struct aligned_type
+{
+    struct alignas(Align) type {};
+};
 
 /// \p aligned_storage provides the nested type `type`, which is a trivial type
 /// suitable for use as uninitialized storage for any object whose size is at
 /// most `Len` bytes and whose alignment requirement is a divisor of `Align`.
-/// 
+///
 /// The behavior is undefined if `Len` is 0 or `Align` is not a power of 2.
 ///
 /// It is an implementation of C++11's \p std::aligned_storage.
-#if THRUST_CPP_DIALECT >= 2011
-    template <std::size_t Len, std::size_t Align>
-    using aligned_storage = std::aligned_storage<Len, Align>;
-#else
-    template <std::size_t Len, std::size_t Align>
-    struct aligned_storage
-    {
-        union type
-        {
-            unsigned char data[Len];
-            // We put this into the union in case the alignment requirement of
-            // an array of `unsigned char` of length `Len` is greater than
-            // `Align`.
-
-            typename aligned_type<Align>::type align;
-        };
-    };
-#endif
+template <std::size_t Len, std::size_t Align>
+using aligned_storage = std::aligned_storage<Len, Align>;
 
 /// \p max_align_t is a trivial type whose alignment requirement is at least as
 /// strict (as large) as that of every scalar type.
 ///
 /// It is an implementation of C++11's \p std::max_align_t.
-#if THRUST_CPP_DIALECT >= 2011                                                     \
-  && (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC)                        \
-  && (THRUST_GCC_VERSION >= 40900)
-    // GCC 4.7 and 4.8 don't have `std::max_align_t`.
-    using max_align_t = std::max_align_t;
-#else
-    union max_align_t
-    {
-        // These cannot be private because C++03 POD types cannot have private
-        // data members.
-        char c;
-        short s;
-        int i;
-        long l;
-        float f;
-        double d;
-        long long ll;
-        long double ld;
-        void* p;
-    };
-#endif
+using max_align_t = std::max_align_t;
 
 /// \p aligned_reinterpret_cast `reinterpret_cast`s \p u of type \p U to `void*`
 /// and then `reinterpret_cast`s the result to \p T. The indirection through
diff --git a/thrust/detail/allocator/allocator_traits.h b/thrust/detail/allocator/allocator_traits.h
index 768f74dab..087c820f6 100644
--- a/thrust/detail/allocator/allocator_traits.h
+++ b/thrust/detail/allocator/allocator_traits.h
@@ -164,7 +164,6 @@ template<class Alloc, class U, bool = has_rebind<Alloc, U>::value>
     typedef typename Alloc::template rebind<U>::other type;
 };
 
-#if THRUST_CPP_DIALECT >= 2011
 template<template<typename, typename...> class Alloc,
          typename T, typename... Args, typename U>
   struct rebind_alloc<Alloc<T, Args...>, U, true>
@@ -178,61 +177,6 @@ template<template<typename, typename...> class Alloc,
 {
     typedef Alloc<U, Args...> type;
 };
-#else // C++03
-template <template <typename> class Alloc, typename T, typename U>
-  struct rebind_alloc<Alloc<T>, U, true>
-{
-    typedef typename Alloc<T>::template rebind<U>::other type;
-};
-
-template <template <typename> class Alloc, typename T, typename U>
-  struct rebind_alloc<Alloc<T>, U, false>
-{
-    typedef Alloc<U> type;
-};
-
-template<template<typename, typename> class Alloc,
-         typename T, typename A0, typename U>
-  struct rebind_alloc<Alloc<T, A0>, U, true>
-{
-    typedef typename Alloc<T, A0>::template rebind<U>::other type;
-};
-
-template<template<typename, typename> class Alloc,
-         typename T, typename A0, typename U>
-  struct rebind_alloc<Alloc<T, A0>, U, false>
-{
-    typedef Alloc<U, A0> type;
-};
-
-template<template<typename, typename, typename> class Alloc,
-         typename T, typename A0, typename A1, typename U>
-  struct rebind_alloc<Alloc<T, A0, A1>, U, true>
-{
-    typedef typename Alloc<T, A0, A1>::template rebind<U>::other type;
-};
-
-template<template<typename, typename, typename> class Alloc,
-         typename T, typename A0, typename A1, typename U>
-  struct rebind_alloc<Alloc<T, A0, A1>, U, false>
-{
-    typedef Alloc<U, A0, A1> type;
-};
-
-template<template<typename, typename, typename, typename> class Alloc,
-         typename T, typename A0, typename A1, typename A2, typename U>
-  struct rebind_alloc<Alloc<T, A0, A1, A2>, U, true>
-{
-    typedef typename Alloc<T, A0, A1, A2>::template rebind<U>::other type;
-};
-
-template<template<typename, typename, typename, typename> class Alloc,
-         typename T, typename A0, typename A1, typename A2, typename U>
-  struct rebind_alloc<Alloc<T, A0, A1, A2>, U, false>
-{
-    typedef Alloc<U, A0, A1, A2> type;
-};
-#endif
 
 } // end allocator_traits_detail
 
@@ -322,7 +266,6 @@ template<typename Alloc>
   // XXX rebind and rebind_traits are alias templates
   //     and so are omitted while c++11 is unavailable
 
-#if THRUST_CPP_DIALECT >= 2011
   template <typename U>
   using rebind_alloc =
     typename allocator_traits_detail::rebind_alloc<allocator_type, U>::type;
@@ -333,19 +276,6 @@ template<typename Alloc>
   // We define this nested type alias for compatibility with the C++03-style
   // rebind_* mechanisms.
   using other = allocator_traits;
-#else
-  template <typename U>
-  struct rebind_alloc
-  {
-    typedef typename
-      allocator_traits_detail::rebind_alloc<allocator_type, U>::type other;
-  };
-  template <typename U>
-  struct rebind_traits
-  {
-    typedef allocator_traits<typename rebind_alloc<U>::other> other;
-  };
-#endif
 
   inline __host__ __device__
   static pointer allocate(allocator_type &a, size_type n);
@@ -360,14 +290,12 @@ template<typename Alloc>
 
   template<typename T>
   inline __host__ __device__ static void construct(allocator_type &a, T *p);
-  
+
   template<typename T, typename Arg1>
   inline __host__ __device__ static void construct(allocator_type &a, T *p, const Arg1 &arg1);
 
-#if THRUST_CPP_DIALECT >= 2011
   template<typename T, typename... Args>
   inline __host__ __device__ static void construct(allocator_type &a, T *p, Args&&... args);
-#endif
 
   template<typename T>
   inline __host__ __device__ static void destroy(allocator_type &a, T *p);
diff --git a/thrust/detail/allocator/allocator_traits.inl b/thrust/detail/allocator/allocator_traits.inl
index a1a7d0e9e..05a2c7ad9 100644
--- a/thrust/detail/allocator/allocator_traits.inl
+++ b/thrust/detail/allocator/allocator_traits.inl
@@ -18,10 +18,7 @@
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/type_traits/is_call_possible.h>
 #include <thrust/detail/integer_traits.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-  #include <thrust/detail/type_deduction.h>
-#endif
+#include <thrust/detail/type_deduction.h>
 
 #include <new>
 
@@ -128,8 +125,6 @@ template<typename Alloc, typename T, typename Arg1>
   ::new(static_cast<void*>(p)) T(arg1);
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-
 __THRUST_DEFINE_IS_CALL_POSSIBLE(has_member_constructN_impl, construct)
 
 template<typename Alloc, typename T, typename... Args>
@@ -159,8 +154,6 @@ template<typename Alloc, typename T, typename... Args>
   ::new(static_cast<void*>(p)) T(THRUST_FWD(args)...);
 }
 
-#endif
-
 __THRUST_DEFINE_IS_CALL_POSSIBLE(has_member_destroy_impl, destroy)
 
 template<typename Alloc, typename T>
@@ -264,7 +257,7 @@ __host__ __device__
   struct workaround_warnings
   {
     __thrust_exec_check_disable__
-    static __host__ __device__ 
+    static __host__ __device__
     typename allocator_traits<Alloc>::pointer
       allocate(Alloc &a, typename allocator_traits<Alloc>::size_type n)
     {
@@ -320,8 +313,6 @@ template<typename Alloc>
   return allocator_traits_detail::construct(a,p,arg1);
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-
 template<typename Alloc>
   template<typename T, typename... Args>
   __host__ __device__
@@ -331,8 +322,6 @@ template<typename Alloc>
   return allocator_traits_detail::construct(a, p, THRUST_FWD(args)...);
 }
 
-#endif
-
 template<typename Alloc>
   template<typename T>
   __host__ __device__
diff --git a/thrust/detail/allocator_aware_execution_policy.h b/thrust/detail/allocator_aware_execution_policy.h
index 28fd54f9b..b427427fe 100644
--- a/thrust/detail/allocator_aware_execution_policy.h
+++ b/thrust/detail/allocator_aware_execution_policy.h
@@ -20,9 +20,7 @@
 #include <thrust/detail/execute_with_allocator_fwd.h>
 #include <thrust/detail/alignment.h>
 
-#if THRUST_CPP_DIALECT >= 2011
-  #include <type_traits>
-#endif
+#include <type_traits>
 
 namespace thrust
 {
@@ -83,7 +81,6 @@ struct allocator_aware_execution_policy
     return typename execute_with_allocator_type<Allocator>::type(alloc);
   }
 
-#if THRUST_CPP_DIALECT >= 2011
   // just the rvalue overload
   // perfect forwarding doesn't help, because a const reference has to be turned
   // into a value by copying for the purpose of storing it in execute_with_allocator
@@ -94,7 +91,6 @@ struct allocator_aware_execution_policy
   {
     return typename execute_with_allocator_type<Allocator>::type(std::move(alloc));
   }
-#endif
 };
 
 }
diff --git a/thrust/detail/complex/catrig.h b/thrust/detail/complex/catrig.h
index 6549fbb2e..4c9114d07 100644
--- a/thrust/detail/complex/catrig.h
+++ b/thrust/detail/complex/catrig.h
@@ -56,20 +56,20 @@
 
 namespace thrust{
 namespace detail{
-namespace complex{		      	
+namespace complex{
 
 using thrust::complex;
 
 __host__ __device__
 inline void raise_inexact(){
-  const volatile float tiny = 7.888609052210118054117286e-31; /* 0x1p-100; */ 
+  const volatile float tiny = 7.888609052210118054117286e-31; /* 0x1p-100; */
   // needs the volatile to prevent compiler from ignoring it
   volatile float junk = 1 + tiny;
   (void)junk;
 }
 
 __host__ __device__ inline complex<double> clog_for_large_values(complex<double> z);
-  
+
 /*
  * Testing indicates that all these functions are accurate up to 4 ULP.
  * The functions casin(h) and cacos(h) are about 2.5 times slower than asinh.
@@ -147,7 +147,7 @@ f(double a, double b, double hypot_a_b)
     return (a / 2);
   return (a * a / (hypot_a_b + b) / 2);
 }
-  
+
 /*
  * All the hard work is contained in this function.
  * x and y are assumed positive or zero, and less than RECIP_EPSILON.
@@ -168,10 +168,10 @@ do_hard_work(double x, double y, double *rx, int *B_is_usable, double *B,
   const double A_crossover = 10; /* Hull et al suggest 1.5, but 10 works better */
   const double FOUR_SQRT_MIN = 5.966672584960165394632772e-154; /* =0x1p-509; >= 4 * sqrt(DBL_MIN) */
   const double B_crossover = 0.6417; /* suggested by Hull et al */
-  
+
   R = hypot(x, y + 1);		/* |z+I| */
   S = hypot(x, y - 1);		/* |z-I| */
-  
+
   /* A = (|z+I| + |z-I|) / 2 */
   A = (R + S) / 2;
   /*
@@ -181,7 +181,7 @@ do_hard_work(double x, double y, double *rx, int *B_is_usable, double *B,
    */
   if (A < 1)
     A = 1;
-  
+
   if (A < A_crossover) {
     /*
      * Am1 = fp + fm, where fp = f(x, 1+y), and fm = f(x, 1-y).
@@ -215,9 +215,9 @@ do_hard_work(double x, double y, double *rx, int *B_is_usable, double *B,
   } else {
     *rx = log(A + sqrt(A * A - 1));
   }
-  
+
   *new_y = y;
-  
+
   if (y < FOUR_SQRT_MIN) {
     /*
      * Avoid a possible underflow caused by y/A.  For casinh this
@@ -229,11 +229,11 @@ do_hard_work(double x, double y, double *rx, int *B_is_usable, double *B,
     *new_y = y * (2 / DBL_EPSILON);
     return;
   }
-  
+
   /* B = (|z+I| - |z-I|) / 2 = y/A */
   *B = y / A;
   *B_is_usable = 1;
-  
+
   if (*B > B_crossover) {
     *B_is_usable = 0;
     /*
@@ -275,7 +275,7 @@ do_hard_work(double x, double y, double *rx, int *B_is_usable, double *B,
     }
   }
 }
-  
+
 /*
  * casinh(z) = z + O(z^3)   as z -> 0
  *
@@ -296,7 +296,7 @@ complex<double> casinh(complex<double> z)
   y = z.imag();
   ax = fabs(x);
   ay = fabs(y);
-  
+
   if (isnan(x) || isnan(y)) {
     /* casinh(+-Inf + I*NaN) = +-Inf + I*NaN */
     if (isinf(x))
@@ -351,10 +351,10 @@ __host__ __device__ inline
 complex<double> casin(complex<double> z)
 {
   complex<double> w = casinh(complex<double>(z.imag(), z.real()));
-  
+
   return (complex<double>(w.imag(), w.real()));
 }
-  
+
 /*
  * cacos(z) = PI/2 - casin(z)
  * but do the computation carefully so cacos(z) is accurate when z is
@@ -451,7 +451,7 @@ complex<double> cacosh(complex<double> z)
 {
   complex<double> w;
   double rx, ry;
-  
+
   w = cacos(z);
   rx = w.real();
   ry = w.imag();
@@ -477,7 +477,7 @@ complex<double> clog_for_large_values(complex<double> z)
   double x, y;
   double ax, ay, t;
   const double m_e = 2.7182818284590452e0; /*  0x15bf0a8b145769.0p-51 */
-  
+
   x = z.real();
   y = z.imag();
   ax = fabs(x);
@@ -487,7 +487,7 @@ complex<double> clog_for_large_values(complex<double> z)
     ax = ay;
     ay = t;
   }
-  
+
   /*
    * Avoid overflow in hypot() when x and y are both very large.
    * Divide x and y by E, and then add 1 to the logarithm.  This depends
@@ -497,7 +497,7 @@ complex<double> clog_for_large_values(complex<double> z)
    */
   if (ax > DBL_MAX / 2)
     return (complex<double>(log(hypot(x / m_e, y / m_e)) + 1, atan2(y, x)));
-  
+
   /*
    * Avoid overflow when x or y is large.  Avoid underflow when x or
    * y is small.
@@ -506,16 +506,16 @@ complex<double> clog_for_large_values(complex<double> z)
   const double SQRT_MIN =	1.491668146240041348658193e-154; /* = 0x1p-511; >= sqrt(DBL_MIN) */
   if (ax > QUARTER_SQRT_MAX || ay < SQRT_MIN)
     return (complex<double>(log(hypot(x, y)), atan2(y, x)));
-  
+
   return (complex<double>(log(ax * ax + ay * ay) / 2, atan2(y, x)));
 }
-  
+
 /*
  *				=================
  *				| catanh, catan |
  *				=================
  */
-  
+
 /*
    * sum_squares(x,y) = x*x + y*y (or just x*x if y*y would underflow).
    * Assumes x*x and y*y will not overflow.
@@ -530,10 +530,10 @@ inline double sum_squares(double x, double y)
   /* Avoid underflow when y is small. */
   if (y < SQRT_MIN)
     return (x * x);
-  
+
   return (x * x + y * y);
 }
-  
+
 /*
  * real_part_reciprocal(x, y) = Re(1/(x+I*y)) = x/(x*x + y*y).
  * Assumes x and y are not NaN, and one of x and y is larger than
@@ -549,7 +549,7 @@ inline double real_part_reciprocal(double x, double y)
   double scale;
   uint32_t hx, hy;
   int32_t ix, iy;
-  
+
   /*
    * This code is inspired by the C99 document n1124.pdf, Section G.5.1,
    * example 2.
@@ -575,8 +575,8 @@ inline double real_part_reciprocal(double x, double y)
   y *= scale;
   return (x / (x * x + y * y) * scale);
 }
-  
-  
+
+
 /*
  * catanh(z) = log((1+z)/(1-z)) / 2
  *           = log1p(4*x / |z-1|^2) / 4
@@ -589,15 +589,14 @@ inline double real_part_reciprocal(double x, double y)
  * Re(catanh(z)) = x/|z|^2 + O(x/z^4)
  *    as z -> infinity, uniformly in x
  */
-#if THRUST_CPP_DIALECT >= 2011 || THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 __host__ __device__ inline
 complex<double> catanh(complex<double> z)
 {
   double x, y, ax, ay, rx, ry;
   const volatile double pio2_lo = 6.1232339957367659e-17; /*  0x11a62633145c07.0p-106 */
   const double pio2_hi = 1.5707963267948966e0;/*  0x1921fb54442d18.0p-52 */
-  
-  
+
+
   x = z.real();
   y = z.imag();
   ax = fabs(x);
@@ -606,11 +605,11 @@ complex<double> catanh(complex<double> z)
   /* This helps handle many cases. */
   if (y == 0 && ax <= 1)
     return (complex<double>(atanh(x), y));
-  
+
   /* To ensure the same accuracy as atan(), and to filter out z = 0. */
   if (x == 0)
     return (complex<double>(x, atan(y)));
-  
+
   if (isnan(x) || isnan(y)) {
     /* catanh(+-Inf + I*NaN) = +-0 + I*NaN */
     if (isinf(x))
@@ -626,12 +625,12 @@ complex<double> catanh(complex<double> z)
      */
     return (complex<double>(x + 0.0 + (y + 0), x + 0.0 + (y + 0)));
   }
-  
+
   const double RECIP_EPSILON = 1.0 / DBL_EPSILON;
   if (ax > RECIP_EPSILON || ay > RECIP_EPSILON)
     return (complex<double>(real_part_reciprocal(x, y),
 			    copysign(pio2_hi + pio2_lo, y)));
-  
+
   const double SQRT_3_EPSILON = 2.5809568279517849e-8; /*  0x1bb67ae8584caa.0p-78 */
   if (ax < SQRT_3_EPSILON / 2 && ay < SQRT_3_EPSILON / 2) {
     /*
@@ -642,23 +641,23 @@ complex<double> catanh(complex<double> z)
     raise_inexact();
     return (z);
   }
-  
+
   const double m_ln2 = 6.9314718055994531e-1; /*  0x162e42fefa39ef.0p-53 */
   if (ax == 1 && ay < DBL_EPSILON)
     rx = (m_ln2 - log(ay)) / 2;
   else
     rx = log1p(4 * ax / sum_squares(ax - 1, ay)) / 4;
-  
+
   if (ax == 1)
     ry = atan2(2.0, -ay) / 2;
   else if (ay < DBL_EPSILON)
     ry = atan2(2 * ay, (1 - ax) * (1 + ax)) / 2;
   else
     ry = atan2(2 * ay, (1 - ax) * (1 + ax) - ay * ay) / 2;
-  
+
   return (complex<double>(copysign(rx, x), copysign(ry, y)));
 }
-  
+
 /*
  * catan(z) = reverse(catanh(reverse(z)))
  * where reverse(x + I*y) = y + I*x = I*conj(z).
@@ -670,8 +669,6 @@ complex<double>catan(complex<double> z)
   return (complex<double>(w.imag(), w.real()));
 }
 
-#endif
-
 } // namespace complex
 
 } // namespace detail
@@ -692,20 +689,20 @@ inline complex<ValueType> asin(const complex<ValueType>& z){
   const complex<ValueType> i(0,1);
   return -i*asinh(i*z);
 }
-  
+
 template <typename ValueType>
 __host__ __device__
 inline complex<ValueType> atan(const complex<ValueType>& z){
   const complex<ValueType> i(0,1);
   return -i*thrust::atanh(i*z);
 }
-  
+
 
 template <typename ValueType>
 __host__ __device__
 inline complex<ValueType> acosh(const complex<ValueType>& z){
   thrust::complex<ValueType> ret((z.real() - z.imag()) * (z.real() + z.imag()) - ValueType(1.0),
-				 ValueType(2.0) * z.real() * z.imag());    
+				 ValueType(2.0) * z.real() * z.imag());
   ret = thrust::sqrt(ret);
   if (z.real() < ValueType(0.0)){
     ret = -ret;
@@ -717,49 +714,47 @@ inline complex<ValueType> acosh(const complex<ValueType>& z){
   }
   return ret;
 }
-  
+
 template <typename ValueType>
 __host__ __device__
 inline complex<ValueType> asinh(const complex<ValueType>& z){
   return thrust::log(thrust::sqrt(z*z+ValueType(1))+z);
 }
-  
+
 template <typename ValueType>
 __host__ __device__
 inline complex<ValueType> atanh(const complex<ValueType>& z){
-  ValueType imag2 = z.imag() *  z.imag();   
+  ValueType imag2 = z.imag() *  z.imag();
   ValueType n = ValueType(1.0) + z.real();
   n = imag2 + n * n;
-  
+
   ValueType d = ValueType(1.0) - z.real();
   d = imag2 + d * d;
   complex<ValueType> ret(ValueType(0.25) * (std::log(n) - std::log(d)),0);
-  
+
   d = ValueType(1.0) -  z.real() * z.real() - imag2;
-  
+
   ret.imag(ValueType(0.5) * std::atan2(ValueType(2.0) * z.imag(), d));
   return ret;
 }
-  
+
 template <>
 __host__ __device__
 inline complex<double> acos(const complex<double>& z){
   return detail::complex::cacos(z);
 }
-  
+
 template <>
 __host__ __device__
 inline complex<double> asin(const complex<double>& z){
   return detail::complex::casin(z);
 }
-  
-#if THRUST_CPP_DIALECT >= 2011 || THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+
 template <>
 __host__ __device__
 inline complex<double> atan(const complex<double>& z){
   return detail::complex::catan(z);
 }
-#endif
 
 template <>
 __host__ __device__
@@ -773,13 +768,11 @@ __host__ __device__
 inline complex<double> asinh(const complex<double>& z){
   return detail::complex::casinh(z);
 }
-  
-#if THRUST_CPP_DIALECT >= 2011 || THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+
 template <>
 __host__ __device__
 inline complex<double> atanh(const complex<double>& z){
   return detail::complex::catanh(z);
 }
-#endif
 
 } // namespace thrust
diff --git a/thrust/detail/complex/catrigf.h b/thrust/detail/complex/catrigf.h
index aa924717a..2428b5935 100644
--- a/thrust/detail/complex/catrigf.h
+++ b/thrust/detail/complex/catrigf.h
@@ -56,10 +56,10 @@
 
 namespace thrust{
 namespace detail{
-namespace complex{		      	
+namespace complex{
 
 using thrust::complex;
-  
+
 __host__ __device__ inline
       complex<float> clog_for_large_values(complex<float> z);
 
@@ -98,7 +98,7 @@ f(float a, float b, float hypot_a_b)
  * If returning sqrt_A2my2 has potential to result in an underflow, it is
  * rescaled, and new_y is similarly rescaled.
  */
-__host__ __device__ 
+__host__ __device__
 inline void
 do_hard_work(float x, float y, float *rx, int *B_is_usable, float *B,
 	     float *sqrt_A2my2, float *new_y)
@@ -387,7 +387,6 @@ inline float real_part_reciprocal(float x, float y)
   return (x / (x * x + y * y) * scale);
 }
 
-#if THRUST_CPP_DIALECT >= 2011 || THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 __host__ __device__ inline
 complex<float> catanhf(complex<float> z)
 {
@@ -449,7 +448,6 @@ complex<float>catanf(complex<float> z){
   complex<float> w = catanhf(complex<float>(z.imag(), z.real()));
   return (complex<float>(w.imag(), w.real()));
 }
-#endif
 
 } // namespace complex
 
@@ -468,13 +466,11 @@ inline complex<float> asin(const complex<float>& z){
   return detail::complex::casinf(z);
 }
 
-#if THRUST_CPP_DIALECT >= 2011 || THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 template <>
 __host__ __device__
 inline complex<float> atan(const complex<float>& z){
   return detail::complex::catanf(z);
 }
-#endif
 
 template <>
 __host__ __device__
@@ -489,12 +485,10 @@ inline complex<float> asinh(const complex<float>& z){
   return detail::complex::casinhf(z);
 }
 
-#if THRUST_CPP_DIALECT >= 2011 || THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 template <>
 __host__ __device__
 inline complex<float> atanh(const complex<float>& z){
   return detail::complex::catanhf(z);
 }
-#endif
 
 } // namespace thrust
diff --git a/thrust/detail/complex/complex.inl b/thrust/detail/complex/complex.inl
index 2e2a106bc..431e0805b 100644
--- a/thrust/detail/complex/complex.inl
+++ b/thrust/detail/complex/complex.inl
@@ -24,105 +24,50 @@ namespace thrust
 
 /* --- Constructors --- */
 
-#if THRUST_CPP_DIALECT < 2011
-template <typename T>
-__host__ __device__
-complex<T>::complex()
-{
-  real(T());
-  imag(T());
-}
-#endif
-
 template <typename T>
 __host__ __device__
 complex<T>::complex(const T& re)
-#if THRUST_CPP_DIALECT >= 2011
   // Initialize the storage in the member initializer list using C++ unicorn
   // initialization. This allows `complex<T const>` to work.
   : data{re, T()}
 {}
-#else
-{
-  real(re);
-  imag(T());
-}
-#endif
 
 
 template <typename T>
 __host__ __device__
 complex<T>::complex(const T& re, const T& im)
-#if THRUST_CPP_DIALECT >= 2011
   // Initialize the storage in the member initializer list using C++ unicorn
   // initialization. This allows `complex<T const>` to work.
   : data{re, im}
 {}
-#else
-{
-  real(re);
-  imag(im);
-}
-#endif
-
-#if THRUST_CPP_DIALECT < 2011
-template <typename T>
-__host__ __device__
-complex<T>::complex(const complex<T>& z)
-{
-  real(z.real());
-  imag(z.imag());
-}
-#endif
 
 template <typename T>
 template <typename U>
 __host__ __device__
 complex<T>::complex(const complex<U>& z)
-#if THRUST_CPP_DIALECT >= 2011
   // Initialize the storage in the member initializer list using C++ unicorn
   // initialization. This allows `complex<T const>` to work.
   // We do a functional-style cast here to suppress conversion warnings.
   : data{T(z.real()), T(z.imag())}
 {}
-#else
-{
-  real(T(z.real()));
-  imag(T(z.imag()));
-}
-#endif
 
 template <typename T>
 __host__ THRUST_STD_COMPLEX_DEVICE
 complex<T>::complex(const std::complex<T>& z)
-#if THRUST_CPP_DIALECT >= 2011
   // Initialize the storage in the member initializer list using C++ unicorn
   // initialization. This allows `complex<T const>` to work.
   : data{THRUST_STD_COMPLEX_REAL(z), THRUST_STD_COMPLEX_IMAG(z)}
 {}
-#else
-{
-  real(THRUST_STD_COMPLEX_REAL(z));
-  imag(THRUST_STD_COMPLEX_IMAG(z));
-}
-#endif
 
 template <typename T>
 template <typename U>
 __host__ THRUST_STD_COMPLEX_DEVICE
 complex<T>::complex(const std::complex<U>& z)
-#if THRUST_CPP_DIALECT >= 2011
   // Initialize the storage in the member initializer list using C++ unicorn
   // initialization. This allows `complex<T const>` to work.
   // We do a functional-style cast here to suppress conversion warnings.
   : data{T(THRUST_STD_COMPLEX_REAL(z)), T(THRUST_STD_COMPLEX_IMAG(z))}
 {}
-#else
-{
-  real(T(THRUST_STD_COMPLEX_REAL(z)));
-  imag(T(THRUST_STD_COMPLEX_IMAG(z)));
-}
-#endif
 
 
 
@@ -137,17 +82,6 @@ complex<T>& complex<T>::operator=(const T& re)
   return *this;
 }
 
-#if THRUST_CPP_DIALECT < 2011
-template <typename T>
-__host__ __device__
-complex<T>& complex<T>::operator=(const complex<T>& z)
-{
-  real(z.real());
-  imag(z.imag());
-  return *this;
-}
-#endif
-
 template <typename T>
 template <typename U>
 __host__ __device__
diff --git a/thrust/detail/config/cpp_compatibility.h b/thrust/detail/config/cpp_compatibility.h
index 646f57504..0d1d90982 100644
--- a/thrust/detail/config/cpp_compatibility.h
+++ b/thrust/detail/config/cpp_compatibility.h
@@ -20,29 +20,13 @@
 
 #include <cstddef>
 
-#if THRUST_CPP_DIALECT >= 2011
-#  ifndef __has_cpp_attribute
-#    define __has_cpp_attribute(X) 0
-#  endif
-
-#  if __has_cpp_attribute(nodiscard)
-#    define THRUST_NODISCARD [[nodiscard]]
-#  endif
-
-#  define THRUST_CONSTEXPR constexpr
-#  define THRUST_OVERRIDE override
-#  define THRUST_DEFAULT = default;
-#  define THRUST_NOEXCEPT noexcept
-#  define THRUST_FINAL final
-#else
-#  define THRUST_CONSTEXPR
-#  define THRUST_OVERRIDE
-#  define THRUST_DEFAULT {}
-#  define THRUST_NOEXCEPT throw()
-#  define THRUST_FINAL
+#ifndef __has_cpp_attribute
+#  define __has_cpp_attribute(X) 0
 #endif
 
-#ifndef THRUST_NODISCARD
+#if __has_cpp_attribute(nodiscard)
+#  define THRUST_NODISCARD [[nodiscard]]
+#else
 #  define THRUST_NODISCARD
 #endif
 
@@ -51,28 +35,16 @@
 // supports `constexpr` globals in host and device code.
 #if defined(__CUDA_ARCH__) || defined(__NVCOMPILER_CUDA__)
 // FIXME: Add this when NVCC supports inline variables.
-//#  if   THRUST_CPP_DIALECT >= 2017
-//#    define THRUST_INLINE_CONSTANT                 inline constexpr
-//#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT inline constexpr
-#  if THRUST_CPP_DIALECT >= 2011
-#    define THRUST_INLINE_CONSTANT                 static const __device__
-#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
-#  else
-#    define THRUST_INLINE_CONSTANT                 static const __device__
-#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static const
-#  endif
+//#  define THRUST_INLINE_CONSTANT                 inline constexpr
+//#  define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT inline constexpr
+#  define THRUST_INLINE_CONSTANT                 static const __device__
+#  define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
 #else
 // FIXME: Add this when NVCC supports inline variables.
-//#  if   THRUST_CPP_DIALECT >= 2017
-//#    define THRUST_INLINE_CONSTANT                 inline constexpr
-//#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT inline constexpr
-#  if THRUST_CPP_DIALECT >= 2011
-#    define THRUST_INLINE_CONSTANT                 static constexpr
-#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
-#  else
-#    define THRUST_INLINE_CONSTANT                 static const
-#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static const
-#  endif
+//#  define THRUST_INLINE_CONSTANT                 inline constexpr
+//#  define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT inline constexpr
+#  define THRUST_INLINE_CONSTANT                 static constexpr
+#  define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
 #endif
 
 #if defined(__NVCOMPILER_CUDA__)
diff --git a/thrust/detail/contiguous_storage.h b/thrust/detail/contiguous_storage.h
index 84485e754..6b1f86c11 100644
--- a/thrust/detail/contiguous_storage.h
+++ b/thrust/detail/contiguous_storage.h
@@ -168,7 +168,6 @@ template<typename T, typename Alloc>
     __host__ __device__
     void propagate_allocator(const contiguous_storage &other);
 
-#if THRUST_CPP_DIALECT >= 2011
     __host__ __device__
     void propagate_allocator(contiguous_storage &other);
 
@@ -176,7 +175,6 @@ template<typename T, typename Alloc>
     // on move assignment
     __host__ __device__
     contiguous_storage &operator=(contiguous_storage &&other);
-#endif
 
   private:
     // XXX we could inherit from this to take advantage of empty base class optimization
@@ -221,13 +219,11 @@ template<typename T, typename Alloc>
     __host__ __device__
     void propagate_allocator_dispatch(false_type, const contiguous_storage &other);
 
-#if THRUST_CPP_DIALECT >= 2011
     __host__ __device__
     void propagate_allocator_dispatch(true_type, contiguous_storage &other);
 
     __host__ __device__
     void propagate_allocator_dispatch(false_type, contiguous_storage &other);
-#endif
 }; // end contiguous_storage
 
 } // end detail
diff --git a/thrust/detail/contiguous_storage.inl b/thrust/detail/contiguous_storage.inl
index 8f26cb810..07e5866ce 100644
--- a/thrust/detail/contiguous_storage.inl
+++ b/thrust/detail/contiguous_storage.inl
@@ -385,7 +385,6 @@ __host__ __device__
   propagate_allocator_dispatch(c, other);
 } // end contiguous_storage::propagate_allocator()
 
-#if THRUST_CPP_DIALECT >= 2011
 template<typename T, typename Alloc>
 __host__ __device__
   void contiguous_storage<T,Alloc>
@@ -417,7 +416,6 @@ __host__ __device__
 
   return *this;
 } // end contiguous_storage::propagate_allocator()
-#endif
 
 template<typename T, typename Alloc>
 __host__ __device__
@@ -520,7 +518,6 @@ __host__ __device__
 {
 } // end contiguous_storage::propagate_allocator()
 
-#if THRUST_CPP_DIALECT >= 2011
 __thrust_exec_check_disable__
 template<typename T, typename Alloc>
 __host__ __device__
@@ -536,7 +533,6 @@ __host__ __device__
     ::propagate_allocator_dispatch(false_type, contiguous_storage &)
 {
 } // end contiguous_storage::propagate_allocator()
-#endif
 
 } // end detail
 
diff --git a/thrust/detail/cpp11_required.h b/thrust/detail/cpp11_required.h
deleted file mode 100644
index a7fb4fb12..000000000
--- a/thrust/detail/cpp11_required.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Copyright 2018 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config/cpp_dialect.h>
-
-#ifndef THRUST_CPP11_REQUIRED_NO_ERROR
-#  if THRUST_CPP_DIALECT < 2011 
-#    error C++11 is required for this Thrust feature; please upgrade your compiler or pass the appropriate -std=c++XX flag to it.
-#  endif
-#endif
-
diff --git a/thrust/detail/dependencies_aware_execution_policy.h b/thrust/detail/dependencies_aware_execution_policy.h
index 1806276f9..b3abb7763 100644
--- a/thrust/detail/dependencies_aware_execution_policy.h
+++ b/thrust/detail/dependencies_aware_execution_policy.h
@@ -17,9 +17,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <tuple>
 
@@ -101,5 +98,4 @@ struct dependencies_aware_execution_policy
 } // end detail
 } // end thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
 
diff --git a/thrust/detail/event_error.h b/thrust/detail/event_error.h
index 114d4763f..b78bf919b 100644
--- a/thrust/detail/event_error.h
+++ b/thrust/detail/event_error.h
@@ -20,11 +20,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
-
 #include <thrust/detail/type_traits.h>
 #include <thrust/system/error_code.h>
 
@@ -162,5 +157,3 @@ inline bool operator<(event_error const& lhs, event_error const& rhs) noexcept
 
 } // end namespace thrust
 
-#endif
-
diff --git a/thrust/detail/execute_with_allocator.h b/thrust/detail/execute_with_allocator.h
index 93dee663c..19f73e074 100644
--- a/thrust/detail/execute_with_allocator.h
+++ b/thrust/detail/execute_with_allocator.h
@@ -84,8 +84,6 @@ return_temporary_buffer(
   alloc_traits::deallocate(system.get_allocator(), to_ptr, num_elements);
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-
 template <
     typename T,
     template <typename> class BaseSystem,
@@ -142,7 +140,5 @@ return_temporary_buffer(
   alloc_traits::deallocate(system.get_allocator(), to_ptr, num_elements);
 }
 
-#endif
-
 }} // namespace thrust::detail
 
diff --git a/thrust/detail/execute_with_allocator_fwd.h b/thrust/detail/execute_with_allocator_fwd.h
index 22d78fdd6..5d144d2ed 100644
--- a/thrust/detail/execute_with_allocator_fwd.h
+++ b/thrust/detail/execute_with_allocator_fwd.h
@@ -20,9 +20,7 @@
 
 #include <thrust/detail/type_traits.h>
 
-#if THRUST_CPP_DIALECT >= 2011
-  #include <thrust/detail/execute_with_dependencies.h>
-#endif
+#include <thrust/detail/execute_with_dependencies.h>
 
 namespace thrust
 {
@@ -52,7 +50,6 @@ struct execute_with_allocator
 
   typename remove_reference<Allocator>::type& get_allocator() { return alloc; }
 
-#if THRUST_CPP_DIALECT >= 2011
   template<typename ...Dependencies>
   __host__
   execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
@@ -98,7 +95,6 @@ struct execute_with_allocator
   {
       return { alloc, capture_as_dependency(std::move(dependencies)) };
   }
-#endif
 };
 
 }} // namespace thrust::detail
diff --git a/thrust/detail/execute_with_dependencies.h b/thrust/detail/execute_with_dependencies.h
index cb92b1ba2..44370c2f2 100644
--- a/thrust/detail/execute_with_dependencies.h
+++ b/thrust/detail/execute_with_dependencies.h
@@ -17,9 +17,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/detail/type_deduction.h>
 #include <thrust/type_traits/remove_cvref.h>
@@ -96,7 +93,7 @@ struct execute_with_dependencies
 
     std::tuple<remove_cvref_t<Dependencies>...>
     __host__
-    extract_dependencies() 
+    extract_dependencies()
     {
         return std::move(dependencies);
     }
@@ -184,7 +181,7 @@ struct execute_with_allocator_and_dependencies
 
     std::tuple<remove_cvref_t<Dependencies>...>
     __host__
-    extract_dependencies() 
+    extract_dependencies()
     {
         return std::move(dependencies);
     }
@@ -263,5 +260,4 @@ extract_dependencies(System &&)
 } // end detail
 } // end thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
 
diff --git a/thrust/detail/execution_policy.h b/thrust/detail/execution_policy.h
index ec554b689..e410d8c28 100644
--- a/thrust/detail/execution_policy.h
+++ b/thrust/detail/execution_policy.h
@@ -44,7 +44,7 @@ struct execution_policy_base : execution_policy_marker {};
 
 
 template<typename DerivedPolicy>
-THRUST_CONSTEXPR __host__ __device__
+constexpr __host__ __device__
 execution_policy_base<DerivedPolicy> &strip_const(const execution_policy_base<DerivedPolicy> &x)
 {
   return const_cast<execution_policy_base<DerivedPolicy>&>(x);
@@ -52,7 +52,7 @@ execution_policy_base<DerivedPolicy> &strip_const(const execution_policy_base<De
 
 
 template<typename DerivedPolicy>
-THRUST_CONSTEXPR __host__ __device__
+constexpr __host__ __device__
 DerivedPolicy &derived_cast(execution_policy_base<DerivedPolicy> &x)
 {
   return static_cast<DerivedPolicy&>(x);
@@ -60,7 +60,7 @@ DerivedPolicy &derived_cast(execution_policy_base<DerivedPolicy> &x)
 
 
 template<typename DerivedPolicy>
-THRUST_CONSTEXPR __host__ __device__
+constexpr __host__ __device__
 const DerivedPolicy &derived_cast(const execution_policy_base<DerivedPolicy> &x)
 {
   return static_cast<const DerivedPolicy&>(x);
diff --git a/thrust/detail/functional/actor.h b/thrust/detail/functional/actor.h
index 5759f79e3..63de2f24a 100644
--- a/thrust/detail/functional/actor.h
+++ b/thrust/detail/functional/actor.h
@@ -52,7 +52,7 @@ template<typename Eval>
   typedef Eval eval_type;
 
   __host__ __device__
-  THRUST_CONSTEXPR actor();
+  constexpr actor();
 
   __host__ __device__
   actor(const Eval &base);
diff --git a/thrust/detail/functional/actor.inl b/thrust/detail/functional/actor.inl
index 2c7fadd36..093a400c6 100644
--- a/thrust/detail/functional/actor.inl
+++ b/thrust/detail/functional/actor.inl
@@ -38,7 +38,7 @@ namespace functional
 
 template<typename Eval>
   __host__ __device__
-  THRUST_CONSTEXPR actor<Eval>
+  constexpr actor<Eval>
     ::actor()
       : eval_type()
 {}
diff --git a/thrust/detail/functional/argument.h b/thrust/detail/functional/argument.h
index 0b7541716..6940ddad1 100644
--- a/thrust/detail/functional/argument.h
+++ b/thrust/detail/functional/argument.h
@@ -59,7 +59,7 @@ template<unsigned int i>
     };
 
     __host__ __device__
-    THRUST_CONSTEXPR argument(){}
+    constexpr argument(){}
 
     template<typename Env>
     __host__ __device__
diff --git a/thrust/detail/integer_math.h b/thrust/detail/integer_math.h
index f2495c0b2..fddfe40c9 100644
--- a/thrust/detail/integer_math.h
+++ b/thrust/detail/integer_math.h
@@ -19,9 +19,7 @@
 #include <thrust/detail/config.h>
 #include <limits>
 
-#if THRUST_CPP_DIALECT >= 2011
-  #include <thrust/detail/type_deduction.h>
-#endif
+#include <thrust/detail/type_deduction.h>
 
 namespace thrust
 {
@@ -97,58 +95,31 @@ Integer log2_ri(Integer x)
 // Used to determine # of blocks/warps etc.
 template <typename Integer0, typename Integer1>
 __host__ __device__ __thrust_forceinline__
-#if THRUST_CPP_DIALECT >= 2011
 // FIXME: Should use common_type.
 auto divide_ri(Integer0 const x, Integer1 const y)
 THRUST_DECLTYPE_RETURNS((x + (y - 1)) / y)
-#else
-// FIXME: Should use common_type.
-Integer0 divide_ri(Integer0 const x, Integer1 const y)
-{
-  return (x + (y - 1)) / y;
-}
-#endif
 
 // x/y rounding towards zero for integers.
 // Used to determine # of blocks/warps etc.
 template <typename Integer0, typename Integer1>
 __host__ __device__ __thrust_forceinline__
-#if THRUST_CPP_DIALECT >= 2011
+// FIXME: Should use common_type.
 auto divide_rz(Integer0 const x, Integer1 const y)
 THRUST_DECLTYPE_RETURNS(x / y)
-#else
-// FIXME: Should use common_type.
-Integer0 divide_rz(Integer0 const x, Integer1 const y)
-{
-  return x / y;
-}
-#endif
 
 // Round x towards infinity to the next multiple of y.
 template <typename Integer0, typename Integer1>
 __host__ __device__ __thrust_forceinline__
-#if THRUST_CPP_DIALECT >= 2011
+// FIXME: Should use common_type.
 auto round_i(Integer0 const x, Integer1 const y)
 THRUST_DECLTYPE_RETURNS(y * divide_ri(x, y))
-#else
-Integer0 round_i(Integer0 const x, Integer1 const y)
-{
-  return y * divide_ri(x, y);
-}
-#endif
 
 // Round x towards 0 to the next multiple of y.
 template <typename Integer0, typename Integer1>
 __host__ __device__ __thrust_forceinline__
-#if THRUST_CPP_DIALECT >= 2011
+// FIXME: Should use common_type.
 auto round_z(Integer0 const x, Integer1 const y)
 THRUST_DECLTYPE_RETURNS(y * divide_rz(x, y))
-#else
-Integer0 round_z(Integer0 const x, Integer1 const y)
-{
-  return y * divide_rz(x, y);
-}
-#endif
 
 } // end detail
 } // end thrust
diff --git a/thrust/detail/memory_algorithms.h b/thrust/detail/memory_algorithms.h
index de0d53de6..ac44ac4c5 100644
--- a/thrust/detail/memory_algorithms.h
+++ b/thrust/detail/memory_algorithms.h
@@ -103,7 +103,6 @@ ForwardIt destroy_n(Allocator const& alloc, ForwardIt first, Size n)
   return first;
 }
 
-#if THRUST_CPP_DIALECT >= 2011
 template <typename ForwardIt, typename... Args>
 __host__ __device__
 void uninitialized_construct(
@@ -202,7 +201,6 @@ void uninitialized_construct_n_with_allocator(
   }
   #endif
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/thrust/detail/modern_gcc_required.h b/thrust/detail/modern_gcc_required.h
deleted file mode 100644
index a8c3d98ba..000000000
--- a/thrust/detail/modern_gcc_required.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Copyright 2018 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config/cpp_dialect.h>
-
-#ifndef THRUST_MODERN_GCC_REQUIRED_NO_ERROR
-#  if defined(THRUST_GCC_VERSION) && !defined(THRUST_MODERN_GCC)
-#    error GCC 5 or later is required for this Thrust feature; please upgrade your compiler.
-#  endif
-#endif
-
diff --git a/thrust/detail/numeric_traits.h b/thrust/detail/numeric_traits.h
index 168b9ad0f..0db5f997f 100644
--- a/thrust/detail/numeric_traits.h
+++ b/thrust/detail/numeric_traits.h
@@ -19,15 +19,12 @@
 #include <thrust/detail/type_traits.h>
 #include <limits>
 
-//#include <stdint.h> // for intmax_t (not provided on MSVS 2005)
-
 namespace thrust
 {
 
 namespace detail
 {
 
-// XXX good enough for the platforms we care about
 typedef long long intmax_t;
 
 template<typename Number>
@@ -46,7 +43,7 @@ template<typename T>
         >,
         integral_constant<
           int,
-          sizeof(T) * std::numeric_limits<unsigned char>::digits - (is_signed<T>::value ? 1 : 0)  
+          sizeof(T) * std::numeric_limits<unsigned char>::digits - (is_signed<T>::value ? 1 : 0)
         >
       >::type
 {}; // end num_digits
diff --git a/thrust/detail/pointer.h b/thrust/detail/pointer.h
index e9204978f..71c5aca46 100644
--- a/thrust/detail/pointer.h
+++ b/thrust/detail/pointer.h
@@ -146,12 +146,10 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
     __host__ __device__
     pointer();
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     pointer(decltype(nullptr));
-    #endif
 
     // OtherValue shall be convertible to Value
     // XXX consider making the pointer implementation a template parameter which defaults to Element *
@@ -182,12 +180,10 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
 
     // assignment
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     derived_type& operator=(decltype(nullptr));
-    #endif
 
     // OtherPointer's element_type shall be convertible to Element
     // OtherPointer's system shall be convertible to Tag
@@ -205,12 +201,10 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
     __host__ __device__
     Element *get() const;
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     explicit operator bool() const;
-    #endif
 
     __host__ __device__
     static derived_type pointer_to(typename thrust::detail::pointer_traits_detail::pointer_to_param<Element>::type r)
@@ -227,7 +221,6 @@ std::basic_ostream<charT, traits> &
 operator<<(std::basic_ostream<charT, traits> &os,
            const pointer<Element, Tag, Reference, Derived> &p);
 
-#if THRUST_CPP_DIALECT >= 2011
 // NOTE: This is needed so that Thrust smart pointers can be used in
 // `std::unique_ptr`.
 template <typename Element, typename Tag, typename Reference, typename Derived>
@@ -245,7 +238,6 @@ bool operator!=(decltype(nullptr), pointer<Element, Tag, Reference, Derived> p);
 template <typename Element, typename Tag, typename Reference, typename Derived>
 __host__ __device__
 bool operator!=(pointer<Element, Tag, Reference, Derived> p, decltype(nullptr));
-#endif
 
 } // end thrust
 
diff --git a/thrust/detail/pointer.inl b/thrust/detail/pointer.inl
index 464c3579e..ab221dea9 100644
--- a/thrust/detail/pointer.inl
+++ b/thrust/detail/pointer.inl
@@ -28,23 +28,17 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
   pointer<Element,Tag,Reference,Derived>
     ::pointer()
       : super_t(static_cast<Element*>(
-          #if THRUST_CPP_DIALECT >= 2011
           nullptr
-          #else
-          0
-          #endif
         ))
 {} // end pointer::pointer
 
 
-#if THRUST_CPP_DIALECT >= 2011
 template<typename Element, typename Tag, typename Reference, typename Derived>
   __host__ __device__
   pointer<Element,Tag,Reference,Derived>
     ::pointer(decltype(nullptr))
       : super_t(static_cast<Element*>(nullptr))
 {} // end pointer::pointer
-#endif
 
 
 template<typename Element, typename Tag, typename Reference, typename Derived>
@@ -82,7 +76,6 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
 {} // end pointer::pointer
 
 
-#if THRUST_CPP_DIALECT >= 2011
 template<typename Element, typename Tag, typename Reference, typename Derived>
   __host__ __device__
   typename pointer<Element,Tag,Reference,Derived>::derived_type &
@@ -92,7 +85,6 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
   super_t::base_reference() = nullptr;
   return static_cast<derived_type&>(*this);
 } // end pointer::operator=
-#endif
 
 
 template<typename Element, typename Tag, typename Reference, typename Derived>
@@ -159,7 +151,6 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
 } // end pointer::get
 
 
-#if THRUST_CPP_DIALECT >= 2011
 template<typename Element, typename Tag, typename Reference, typename Derived>
   __host__ __device__
   pointer<Element,Tag,Reference,Derived>
@@ -167,7 +158,6 @@ template<typename Element, typename Tag, typename Reference, typename Derived>
 {
   return bool(get());
 } // end pointer::operator bool
-#endif
 
 
 template<typename Element, typename Tag, typename Reference, typename Derived,
@@ -179,7 +169,6 @@ operator<<(std::basic_ostream<charT, traits> &os,
   return os << p.get();
 }
 
-#if THRUST_CPP_DIALECT >= 2011
 // NOTE: These are needed so that Thrust smart pointers work with
 // `std::unique_ptr`.
 template <typename Element, typename Tag, typename Reference, typename Derived>
@@ -209,65 +198,6 @@ bool operator!=(pointer<Element, Tag, Reference, Derived> p, decltype(nullptr))
 {
   return !(nullptr == p);
 }
-#endif
-
-namespace detail
-{
-
-#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (_MSC_VER <= 1400)
-// XXX WAR MSVC 2005 problem with correctly implementing
-//     pointer_raw_pointer for pointer by specializing it here
-template<typename Element, typename Tag, typename Reference, typename Derived>
-  struct pointer_raw_pointer< thrust::pointer<Element,Tag,Reference,Derived> >
-{
-  typedef typename pointer<Element,Tag,Reference,Derived>::raw_pointer type;
-}; // end pointer_raw_pointer
-#endif
-
-
-#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && (THRUST_GCC_VERSION < 40200)
-// XXX WAR g++-4.1 problem with correctly implementing
-//     pointer_element for pointer by specializing it here
-template<typename Element, typename Tag>
-  struct pointer_element< thrust::pointer<Element,Tag> >
-{
-  typedef Element type;
-}; // end pointer_element
-
-template<typename Element, typename Tag, typename Reference>
-  struct pointer_element< thrust::pointer<Element,Tag,Reference> >
-    : pointer_element< thrust::pointer<Element,Tag> >
-{}; // end pointer_element
-
-template<typename Element, typename Tag, typename Reference, typename Derived>
-  struct pointer_element< thrust::pointer<Element,Tag,Reference,Derived> >
-    : pointer_element< thrust::pointer<Element,Tag,Reference> >
-{}; // end pointer_element
-
-
-
-// XXX WAR g++-4.1 problem with correctly implementing
-//     rebind_pointer for pointer by specializing it here
-template<typename Element, typename Tag, typename NewElement>
-  struct rebind_pointer<thrust::pointer<Element,Tag>, NewElement>
-{
-  // XXX note we don't attempt to rebind the pointer's Reference type (or Derived)
-  typedef thrust::pointer<NewElement,Tag> type;
-};
-
-template<typename Element, typename Tag, typename Reference, typename NewElement>
-  struct rebind_pointer<thrust::pointer<Element,Tag,Reference>, NewElement>
-    : rebind_pointer<thrust::pointer<Element,Tag>, NewElement>
-{};
-
-template<typename Element, typename Tag, typename Reference, typename Derived, typename NewElement>
-  struct rebind_pointer<thrust::pointer<Element,Tag,Reference,Derived>, NewElement>
-    : rebind_pointer<thrust::pointer<Element,Tag,Reference>, NewElement>
-{};
-#endif
-
-} // end namespace detail
-
 
 } // end thrust
 
diff --git a/thrust/detail/reference.h b/thrust/detail/reference.h
index 89bcf63ca..1761e0cfb 100644
--- a/thrust/detail/reference.h
+++ b/thrust/detail/reference.h
@@ -61,9 +61,7 @@ template<typename Element, typename Pointer, typename Derived>
     __host__ __device__
     explicit reference(const pointer &ptr);
 
-#if THRUST_CPP_DIALECT >= 2011
     reference(const reference &) = default;
-#endif
 
     template<typename OtherElement, typename OtherPointer, typename OtherDerived>
     __host__ __device__
diff --git a/thrust/detail/select_system.h b/thrust/detail/select_system.h
index b22ceb0e9..c14648f04 100644
--- a/thrust/detail/select_system.h
+++ b/thrust/detail/select_system.h
@@ -17,10 +17,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-
 #include <thrust/detail/type_deduction.h>
 #include <thrust/type_traits/remove_cvref.h>
 #include <thrust/system/detail/generic/select_system.h>
@@ -81,5 +77,3 @@ THRUST_INLINE_CONSTANT select_system_detail::select_system_fn select_system{};
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/detail/seq.h b/thrust/detail/seq.h
index b548652d2..8268ad05a 100644
--- a/thrust/detail/seq.h
+++ b/thrust/detail/seq.h
@@ -31,7 +31,7 @@ struct seq_t : thrust::system::detail::sequential::execution_policy<seq_t>,
     thrust::system::detail::sequential::execution_policy>
 {
   __host__ __device__
-  THRUST_CONSTEXPR seq_t() : thrust::system::detail::sequential::execution_policy<seq_t>() {}
+  constexpr seq_t() : thrust::system::detail::sequential::execution_policy<seq_t>() {}
 
   // allow any execution_policy to convert to seq_t
   template<typename DerivedPolicy>
diff --git a/thrust/detail/shuffle.inl b/thrust/detail/shuffle.inl
index edccc8787..0628256a3 100644
--- a/thrust/detail/shuffle.inl
+++ b/thrust/detail/shuffle.inl
@@ -19,9 +19,6 @@
  */
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/shuffle.h>
@@ -82,4 +79,3 @@ __host__ __device__ void shuffle_copy(RandomIterator first, RandomIterator last,
 
 }  // namespace thrust
 
-#endif
diff --git a/thrust/detail/static_assert.h b/thrust/detail/static_assert.h
index 52674dcaf..7319337c5 100644
--- a/thrust/detail/static_assert.h
+++ b/thrust/detail/static_assert.h
@@ -16,7 +16,7 @@
 
 /*
  * (C) Copyright John Maddock 2000.
- * 
+ *
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying NOTICE file for the complete license)
  *
@@ -41,49 +41,13 @@ struct depend_on_instantiation
   THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT bool value = x;
 };
 
-#if THRUST_CPP_DIALECT >= 2011
-
-#  if THRUST_CPP_DIALECT >= 2017
-#    define THRUST_STATIC_ASSERT(B)        static_assert(B)
-#  else
-#    define THRUST_STATIC_ASSERT(B)        static_assert(B, "static assertion failed")
-#  endif
-#  define THRUST_STATIC_ASSERT_MSG(B, msg) static_assert(B, msg)
-
-#else // Older than C++11.
-
-// HP aCC cannot deal with missing names for template value parameters.
-template <bool x> struct STATIC_ASSERTION_FAILURE;
-
-template <> struct STATIC_ASSERTION_FAILURE<true> {};
-
-// HP aCC cannot deal with missing names for template value parameters.
-template <int x> struct static_assert_test {};
-
-#if    (  (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC)                  \
-       && (THRUST_GCC_VERSION >= 40800))                                      \
-    || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG)
-  // Clang and GCC 4.8+ will complain about this typedef being unused unless we
-  // annotate it as such.
-#  define THRUST_STATIC_ASSERT(B)                                             \
-    typedef ::thrust::detail::static_assert_test<                             \
-      sizeof(::thrust::detail::STATIC_ASSERTION_FAILURE<(bool)(B)>)           \
-    >                                                                         \
-      THRUST_PP_CAT2(thrust_static_assert_typedef_, __LINE__)                 \
-      __attribute__((unused))                                                 \
-    /**/      
+#if THRUST_CPP_DIALECT >= 2017
+#  define THRUST_STATIC_ASSERT(B)        static_assert(B)
 #else
-#  define THRUST_STATIC_ASSERT(B)                                             \
-    typedef ::thrust::detail::static_assert_test<                             \
-      sizeof(::thrust::detail::STATIC_ASSERTION_FAILURE<(bool)(B)>)           \
-    >                                                                         \
-      THRUST_PP_CAT2(thrust_static_assert_typedef_, __LINE__)                 \
-    /**/      
+#  define THRUST_STATIC_ASSERT(B)        static_assert(B, "static assertion failed")
 #endif
 
-#define THRUST_STATIC_ASSERT_MSG(B, msg) THRUST_STATIC_ASSERT(B)
-
-#endif // THRUST_CPP_DIALECT >= 2011
+#define THRUST_STATIC_ASSERT_MSG(B, msg) static_assert(B, msg)
 
 } // namespace detail
 
diff --git a/thrust/detail/tuple.inl b/thrust/detail/tuple.inl
index 7d9841fd2..c51eb768e 100644
--- a/thrust/detail/tuple.inl
+++ b/thrust/detail/tuple.inl
@@ -169,7 +169,7 @@ struct get_class
     // XXX we may not need to deal with this for any compiler we care about -jph
     //return get_class<N-1>::BOOST_NESTED_TEMPLATE get<RET>(t.tail);
     return get_class<N-1>::template get<RET>(t.tail);
-    
+
     // gcc 4.3 couldn't compile this:
     //return get_class<N-1>::get<RET>(t.tail);
   }
@@ -309,9 +309,7 @@ template <class HT, class TT>
   inline __host__ __device__
   cons( const cons<HT2, TT2>& u ) : head(u.head), tail(u.tail) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   cons(const cons &) = default;
-#endif
 
   __thrust_exec_check_disable__
   template <class HT2, class TT2>
@@ -416,9 +414,7 @@ template <class HT>
   inline __host__ __device__
   cons( const cons<HT2, null_type>& u ) : head(u.head) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   cons(const cons &) = default;
-#endif
 
   __thrust_exec_check_disable__
   template <class HT2>
@@ -598,7 +594,7 @@ inline typename access_traits<
 get(detail::cons<HT, TT>& c)
 {
   //return detail::get_class<N>::BOOST_NESTED_TEMPLATE
-  
+
   // gcc 4.3 couldn't compile this:
   //return detail::get_class<N>::
 
diff --git a/thrust/detail/tuple_algorithms.h b/thrust/detail/tuple_algorithms.h
index 530de4b3f..cb1975594 100644
--- a/thrust/detail/tuple_algorithms.h
+++ b/thrust/detail/tuple_algorithms.h
@@ -17,9 +17,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/detail/type_deduction.h>
 #include <thrust/type_traits/integer_sequence.h>
@@ -107,5 +104,3 @@ THRUST_DECLTYPE_RETURNS(
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/detail/type_deduction.h b/thrust/detail/type_deduction.h
index 735b31d68..48c755584 100644
--- a/thrust/detail/type_deduction.h
+++ b/thrust/detail/type_deduction.h
@@ -8,9 +8,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/detail/preprocessor.h>
 
@@ -59,7 +56,7 @@
 
 /// \def THRUST_DECLTYPE_RETURNS_WITH_SFINAE_CONDITION(condition, ...)
 /// \brief Expands to a function definition, including a trailing returning
-///        type, that returns the expression \c __VA_ARGS__. It shall only 
+///        type, that returns the expression \c __VA_ARGS__. It shall only
 ///        participate in overload resolution if \c condition is \c true.
 ///
 #define THRUST_DECLTYPE_RETURNS_WITH_SFINAE_CONDITION(condition, ...)         \
@@ -70,5 +67,3 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/detail/type_traits.h b/thrust/detail/type_traits.h
index 9bfe60d31..f9391b8c5 100644
--- a/thrust/detail/type_traits.h
+++ b/thrust/detail/type_traits.h
@@ -24,9 +24,7 @@
 
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
-#  include <type_traits>
-#endif
+#include <type_traits>
 
 namespace thrust
 {
@@ -48,7 +46,6 @@ namespace detail
      // We don't want to switch to std::integral_constant, because we want access
      // to the C++14 operator(), but we'd like standard traits to interoperate
      // with our version when tag dispatching.
-     #if THRUST_CPP_DIALECT >= 2011
      integral_constant() = default;
 
      integral_constant(integral_constant const&) = default;
@@ -57,12 +54,11 @@ namespace detail
 
      constexpr __host__ __device__
      integral_constant(std::integral_constant<T, v>) noexcept {}
-     #endif
 
-     THRUST_CONSTEXPR __host__ __device__ operator value_type() const THRUST_NOEXCEPT { return value; }
-     THRUST_CONSTEXPR __host__ __device__ value_type operator()() const THRUST_NOEXCEPT { return value; }
+     constexpr __host__ __device__ operator value_type() const noexcept { return value; }
+     constexpr __host__ __device__ value_type operator()() const noexcept { return value; }
    };
- 
+
  /// typedef for true_type
  typedef integral_constant<bool, true>  true_type;
 
@@ -298,89 +294,8 @@ template<typename T1, typename T2>
 {
 }; // end lazy_is_different
 
-#if THRUST_CPP_DIALECT >= 2011
-
 using std::is_convertible;
 
-#else
-
-namespace tt_detail
-{
-
-template<typename T>
-  struct is_int_or_cref
-{
-  typedef typename remove_reference<T>::type type_sans_ref;
-  static const bool value = (is_integral<T>::value
-                             || (is_integral<type_sans_ref>::value
-                                 && is_const<type_sans_ref>::value
-                                 && !is_volatile<type_sans_ref>::value));
-}; // end is_int_or_cref
-
-
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
-THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_BEGIN
-
-template<typename From, typename To>
-  struct is_convertible_sfinae
-{
-  private:
-    typedef char                          yes;
-    typedef struct { char two_chars[2]; } no;
-
-    static inline yes   test(To) { return yes(); }
-    static inline no    test(...) { return no(); } 
-    static inline typename remove_reference<From>::type& from() { typename remove_reference<From>::type* ptr = 0; return *ptr; }
-
-  public:
-    static const bool value = sizeof(test(from())) == sizeof(yes);
-}; // end is_convertible_sfinae
-
-
-THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_END
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
-
-
-template<typename From, typename To>
-  struct is_convertible_needs_simple_test
-{
-  static const bool from_is_void      = is_void<From>::value;
-  static const bool to_is_void        = is_void<To>::value;
-  static const bool from_is_float     = is_floating_point<typename remove_reference<From>::type>::value;
-  static const bool to_is_int_or_cref = is_int_or_cref<To>::value;
-
-  static const bool value = (from_is_void || to_is_void || (from_is_float && to_is_int_or_cref));
-}; // end is_convertible_needs_simple_test
-
-
-template<typename From, typename To,
-         bool = is_convertible_needs_simple_test<From,To>::value>
-  struct is_convertible
-{
-  static const bool value = (is_void<To>::value
-                             || (is_int_or_cref<To>::value
-                                 && !is_void<From>::value));
-}; // end is_convertible
-
-
-template<typename From, typename To>
-  struct is_convertible<From, To, false>
-{
-  static const bool value = (is_convertible_sfinae<typename
-                             add_reference<From>::type, To>::value);
-}; // end is_convertible
-
-
-} // end tt_detail
-
-template<typename From, typename To>
-  struct is_convertible
-    : public integral_constant<bool, tt_detail::is_convertible<From, To>::value>
-{
-}; // end is_convertible
-
-#endif
-
 template<typename T1, typename T2>
   struct is_one_convertible_to_the_other
     : public integral_constant<
@@ -418,7 +333,7 @@ template <typename Boolean>
 
 template<bool B, class T, class F>
 struct conditional { typedef T type; };
- 
+
 template<class T, class F>
 struct conditional<false, T, F> { typedef F type; };
 
@@ -548,11 +463,7 @@ template<typename T>
 struct largest_available_float
 {
 #if defined(__CUDA_ARCH__)
-#  if (__CUDA_ARCH__ < 130)
-  typedef float type;
-#  else
   typedef double type;
-#  endif
 #else
   typedef double type;
 #endif
@@ -568,47 +479,8 @@ template<typename T1, typename T2>
       >
 {};
 
-#if THRUST_CPP_DIALECT >= 2011
-
 using std::is_base_of;
 
-#else
-
-namespace is_base_of_ns
-{
-
-typedef char                          yes;
-typedef struct { char two_chars[2]; } no;
-
-template<typename Base, typename Derived>
-  struct host
-{
-  operator Base*() const;
-  operator Derived*();
-}; // end host
-
-template<typename Base, typename Derived>
-  struct impl
-{
-  template<typename T> static yes check(Derived *, T);
-  static no check(Base*, int);
-
-  static const bool value = sizeof(check(host<Base,Derived>(), int())) == sizeof(yes);
-}; // end impl
-
-} // end is_base_of_ns
-
-
-template<typename Base, typename Derived>
-  struct is_base_of
-    : integral_constant<
-        bool,
-        is_base_of_ns::impl<Base,Derived>::value
-      >
-{};
-
-#endif
-
 template<typename Base, typename Derived, typename Result = void>
   struct enable_if_base_of
     : enable_if<
@@ -628,7 +500,7 @@ template<typename T1, typename T2>
   typedef struct { char array[2]; } no_type;
 
   template<typename T> static typename add_reference<T>::type declval();
-  
+
   template<unsigned int> struct helper { typedef void * type; };
 
   template<typename U1, typename U2> static yes_type test(typename helper<sizeof(declval<U1>() = declval<U2>())>::type);
@@ -662,7 +534,7 @@ template<typename T>
 
 template<typename T1, typename T2, typename Enable = void> struct promoted_numerical_type;
 
-template<typename T1, typename T2> 
+template<typename T1, typename T2>
   struct promoted_numerical_type<T1,T2,typename enable_if<and_
   <typename is_floating_point<T1>::type,typename is_floating_point<T2>::type>
   ::value>::type>
@@ -670,7 +542,7 @@ template<typename T1, typename T2>
   typedef typename larger_type<T1,T2>::type type;
   };
 
-template<typename T1, typename T2> 
+template<typename T1, typename T2>
   struct promoted_numerical_type<T1,T2,typename enable_if<and_
   <typename is_integral<T1>::type,typename is_floating_point<T2>::type>
   ::value>::type>
diff --git a/thrust/detail/type_traits/result_of_adaptable_function.h b/thrust/detail/type_traits/result_of_adaptable_function.h
index 8f91ff0b2..cd7057ff6 100644
--- a/thrust/detail/type_traits/result_of_adaptable_function.h
+++ b/thrust/detail/type_traits/result_of_adaptable_function.h
@@ -20,24 +20,16 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/function_traits.h>
 
-#if THRUST_CPP_DIALECT >= 2011 || defined(__cpp_lib_result_of_sfinae)
-// necessary for std::result_of
 #include <type_traits>
-#endif
 
 namespace thrust
 {
 namespace detail
 {
 
-// In the C++11 mode, by default, result_of_adaptable function inheritfrom std::result_of
-#if THRUST_CPP_DIALECT >= 2011 || defined(__cpp_lib_result_of_sfinae)
+// In the C++11 mode, by default, result_of_adaptable function inherit from std::result_of
 template <typename Signature, typename Enable = void>
 struct result_of_adaptable_function : std::result_of<Signature> {};
-#else  /* cxx11 */
-template<typename Signature, typename Enable = void> 
-struct result_of_adaptable_function;
-#endif  /* cxx11 */
 
 // specialization for unary invocations of things which have result_type
 template<typename Functor, typename Arg1>
diff --git a/thrust/detail/vector_base.h b/thrust/detail/vector_base.h
index eecedfc14..56a7acd1a 100644
--- a/thrust/detail/vector_base.h
+++ b/thrust/detail/vector_base.h
@@ -107,7 +107,6 @@ template<typename T, typename Alloc>
      */
     vector_base(const vector_base &v, const Alloc &alloc);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor moves from another vector_base.
      *  \param v The vector_base to move.
      */
@@ -117,19 +116,16 @@ template<typename T, typename Alloc>
     // iterators, which is necessary for the following constructor to be implemented
     // correctly
     // vector_base(vector_base &&v, const Alloc &alloc);
-  #endif
 
     /*! Copy assign operator copies from another vector_base.
      *  \param v The vector_base to copy.
      */
     vector_base &operator=(const vector_base &v);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assign operator moves from another vector_base.
      *  \param v The vector_base to move.
      */
     vector_base &operator=(vector_base &&v);
-  #endif
 
     /*! Copy constructor copies from an exemplar vector_base with different
      *  type.
@@ -406,7 +402,7 @@ template<typename T, typename Alloc>
      *  \param x The exemplar element to copy & insert.
      *  \return An iterator pointing to the newly inserted element.
      */
-    iterator insert(iterator position, const T &x); 
+    iterator insert(iterator position, const T &x);
 
     /*! This method inserts a copy of an exemplar value to a range at the
      *  specified position in this vector_base.
@@ -459,10 +455,10 @@ template<typename T, typename Alloc>
   private:
     // these methods resolve the ambiguity of the constructor template of form (Iterator, Iterator)
     template<typename IteratorOrIntegralType>
-      void init_dispatch(IteratorOrIntegralType begin, IteratorOrIntegralType end, false_type); 
+      void init_dispatch(IteratorOrIntegralType begin, IteratorOrIntegralType end, false_type);
 
     template<typename IteratorOrIntegralType>
-      void init_dispatch(IteratorOrIntegralType n, IteratorOrIntegralType value, true_type); 
+      void init_dispatch(IteratorOrIntegralType n, IteratorOrIntegralType value, true_type);
 
     template<typename InputIterator>
       void range_init(InputIterator first, InputIterator last);
@@ -550,7 +546,7 @@ template<typename T1, typename Alloc1,
          typename T2, typename Alloc2>
 bool operator==(const detail::vector_base<T1,Alloc1>& lhs,
                 const detail::vector_base<T2,Alloc2>& rhs);
-    
+
 template<typename T1, typename Alloc1,
          typename T2, typename Alloc2>
 bool operator==(const detail::vector_base<T1,Alloc1>& lhs,
@@ -571,7 +567,7 @@ template<typename T1, typename Alloc1,
          typename T2, typename Alloc2>
 bool operator!=(const detail::vector_base<T1,Alloc1>& lhs,
                 const detail::vector_base<T2,Alloc2>& rhs);
-    
+
 template<typename T1, typename Alloc1,
          typename T2, typename Alloc2>
 bool operator!=(const detail::vector_base<T1,Alloc1>& lhs,
diff --git a/thrust/detail/vector_base.inl b/thrust/detail/vector_base.inl
index 2e2331770..7c128fb22 100644
--- a/thrust/detail/vector_base.inl
+++ b/thrust/detail/vector_base.inl
@@ -111,16 +111,14 @@ template<typename T, typename Alloc>
   range_init(v.begin(), v.end());
 } // end vector_base::vector_base()
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Alloc>
-    vector_base<T,Alloc>
-      ::vector_base(vector_base &&v)
-        :m_storage(copy_allocator_t(), v.m_storage),
-         m_size(0)
-  {
-    *this = std::move(v);
-  } //end vector_base::vector_base()
-#endif
+template<typename T, typename Alloc>
+  vector_base<T,Alloc>
+    ::vector_base(vector_base &&v)
+      :m_storage(copy_allocator_t(), v.m_storage),
+       m_size(0)
+{
+  *this = std::move(v);
+} //end vector_base::vector_base()
 
 template<typename T, typename Alloc>
   vector_base<T,Alloc> &
@@ -140,22 +138,20 @@ template<typename T, typename Alloc>
   return *this;
 } // end vector_base::operator=()
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Alloc>
-    vector_base<T,Alloc> &
-      vector_base<T,Alloc>
-        ::operator=(vector_base &&v)
-  {
-    m_storage.destroy(begin(), end());
-    m_storage = std::move(v.m_storage);
-    m_size = std::move(v.m_size);
+template<typename T, typename Alloc>
+  vector_base<T,Alloc> &
+    vector_base<T,Alloc>
+      ::operator=(vector_base &&v)
+{
+  m_storage.destroy(begin(), end());
+  m_storage = std::move(v.m_storage);
+  m_size = std::move(v.m_size);
 
-    v.m_storage = contiguous_storage<T,Alloc>(copy_allocator_t(), m_storage);
-    v.m_size = 0;
+  v.m_storage = contiguous_storage<T,Alloc>(copy_allocator_t(), m_storage);
+  v.m_size = 0;
 
-    return *this;
-  } // end vector_base::operator=()
-#endif
+  return *this;
+} // end vector_base::operator=()
 
 template<typename T, typename Alloc>
   template<typename OtherT, typename OtherAlloc>
diff --git a/thrust/device_allocator.h b/thrust/device_allocator.h
index f5ff0d965..85d3cf39c 100644
--- a/thrust/device_allocator.h
+++ b/thrust/device_allocator.h
@@ -42,7 +42,7 @@ namespace thrust
  *      a \p device_ptr.
  */
 template<typename Upstream>
-class device_ptr_memory_resource THRUST_FINAL
+class device_ptr_memory_resource final
     : public thrust::mr::memory_resource<
         device_ptr<void>
     >
@@ -68,13 +68,13 @@ class device_ptr_memory_resource THRUST_FINAL
     }
 
     THRUST_NODISCARD __host__
-    virtual pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         return pointer(m_upstream->do_allocate(bytes, alignment).get());
     }
 
     __host__
-    virtual void do_deallocate(pointer p, std::size_t bytes, std::size_t alignment) THRUST_OVERRIDE
+    virtual void do_deallocate(pointer p, std::size_t bytes, std::size_t alignment) override
     {
         m_upstream->do_deallocate(upstream_ptr(p.get()), bytes, alignment);
     }
@@ -130,9 +130,7 @@ class device_allocator
     __host__
     device_allocator(const device_allocator<U>& other) : base(other) {}
 
-#if THRUST_CPP_DIALECT >= 2011
     device_allocator & operator=(const device_allocator &) = default;
-#endif
 
     /*! Destructor has no effect. */
     __host__
diff --git a/thrust/device_make_unique.h b/thrust/device_make_unique.h
index 939006f27..ccf04b657 100644
--- a/thrust/device_make_unique.h
+++ b/thrust/device_make_unique.h
@@ -22,9 +22,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/allocate_unique.h>
 #include <thrust/device_new.h>
@@ -44,7 +41,7 @@ auto device_make_unique(Args&&... args)
     uninitialized_allocate_unique<T>(device_allocator<T>{})
   )
 {
-  // FIXME: This is crude - we construct an unnecessary T on the host for 
+  // FIXME: This is crude - we construct an unnecessary T on the host for
   // `device_new`. We need a proper dispatched `construct` algorithm to
   // do this properly.
   auto p = uninitialized_allocate_unique<T>(device_allocator<T>{});
@@ -56,4 +53,3 @@ auto device_make_unique(Args&&... args)
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
diff --git a/thrust/device_malloc_allocator.h b/thrust/device_malloc_allocator.h
index e40c362e0..8ddbc98af 100644
--- a/thrust/device_malloc_allocator.h
+++ b/thrust/device_malloc_allocator.h
@@ -108,9 +108,7 @@ template<typename T>
     __host__ __device__
     inline device_malloc_allocator(device_malloc_allocator<U> const&) {}
 
-#if THRUST_CPP_DIALECT >= 2011
     device_malloc_allocator & operator=(const device_malloc_allocator &) = default;
-#endif
 
     /*! Returns the address of an allocated object.
      *  \return <tt>&r</tt>.
diff --git a/thrust/device_ptr.h b/thrust/device_ptr.h
index fb3ad1ee0..6243d0bca 100644
--- a/thrust/device_ptr.h
+++ b/thrust/device_ptr.h
@@ -80,16 +80,14 @@ template<typename T>
     __host__ __device__
     device_ptr() : super_t() {}
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     device_ptr(decltype(nullptr)) : super_t(nullptr) {}
-    #endif
 
     /*! \p device_ptr's copy constructor is templated to allow copying to a
      *  <tt>device_ptr<const T></tt> from a <tt>T *</tt>.
-     *  
+     *
      *  \param ptr A raw pointer to copy from, presumed to point to a location in
      *         device memory.
      */
@@ -116,7 +114,6 @@ template<typename T>
       return *this;
     }
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
@@ -125,7 +122,6 @@ template<typename T>
       super_t::operator=(nullptr);
       return *this;
     }
-    #endif
 
 // declare these members for the purpose of Doxygenating them
 // they actually exist in a derived-from class
diff --git a/thrust/device_vector.h b/thrust/device_vector.h
index fa52ec662..5f953006b 100644
--- a/thrust/device_vector.h
+++ b/thrust/device_vector.h
@@ -128,7 +128,6 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
     device_vector(const device_vector &v, const Alloc &alloc)
       :Parent(v,alloc) {}
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor moves from another \p device_vector.
      *  \param v The device_vector to move.
      */
@@ -141,7 +140,6 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
      */
     device_vector(device_vector &&v, const Alloc &alloc)
       :Parent(std::move(v), alloc) {}
-  #endif // THRUST_CPP_DIALECT >= 2011
 
     /*! Copy assign operator copies another \p device_vector with the same type.
      *  \param v The \p device_vector to copy.
@@ -149,13 +147,11 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
     device_vector &operator=(const device_vector &v)
     { Parent::operator=(v); return *this; }
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assign operator moves from another \p device_vector.
      *  \param v The device_vector to move.
      */
-     device_vector &operator=(device_vector &&v)
-     { Parent::operator=(std::move(v)); return *this; }
-  #endif // THRUST_CPP_DIALECT >= 2011
+    device_vector &operator=(device_vector &&v)
+    { Parent::operator=(std::move(v)); return *this; }
 
     /*! Copy constructor copies from an exemplar \p device_vector with different type.
      *  \param v The \p device_vector to copy.
@@ -431,7 +427,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
      *  \param x The exemplar element to copy & insert.
      *  \return An iterator pointing to the newly inserted element.
      */
-    iterator insert(iterator position, const T &x); 
+    iterator insert(iterator position, const T &x);
 
     /*! This method inserts a copy of an exemplar value to a range at the
      *  specified position in this vector.
diff --git a/thrust/future.h b/thrust/future.h
index 12bebf8c6..410188450 100644
--- a/thrust/future.h
+++ b/thrust/future.h
@@ -21,10 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/execution_policy.h>
 #include <thrust/detail/static_assert.h>
@@ -72,14 +68,14 @@ namespace unimplemented
 
 struct no_unique_eager_event_type_found {};
 
-inline __host__ 
+inline __host__
 no_unique_eager_event_type_found
 unique_eager_event_type(...) noexcept;
 
 struct no_unique_eager_future_type_found {};
 
 template <typename T>
-__host__ 
+__host__
 no_unique_eager_future_type_found
 unique_eager_future_type(...) noexcept;
 
@@ -175,5 +171,3 @@ using thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::when_all;
 
 } // end namespace thrust
 
-#endif
-
diff --git a/thrust/host_vector.h b/thrust/host_vector.h
index bd97b69de..a6605bd87 100644
--- a/thrust/host_vector.h
+++ b/thrust/host_vector.h
@@ -135,7 +135,6 @@ template<typename T, typename Alloc = std::allocator<T> >
     host_vector(const host_vector &v, const Alloc &alloc)
       :Parent(v,alloc) {}
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor moves from another host_vector.
      *  \param v The host_vector to move.
      */
@@ -150,23 +149,20 @@ template<typename T, typename Alloc = std::allocator<T> >
      __host__
     host_vector(host_vector &&v, const Alloc &alloc)
       :Parent(std::move(v),alloc) {}
-  #endif
 
-  /*! Assign operator copies from an exemplar \p host_vector.
-   *  \param v The \p host_vector to copy.
-   */
-  __host__
-  host_vector &operator=(const host_vector &v)
-  { Parent::operator=(v); return *this; }
+    /*! Assign operator copies from an exemplar \p host_vector.
+     *  \param v The \p host_vector to copy.
+     */
+    __host__
+    host_vector &operator=(const host_vector &v)
+    { Parent::operator=(v); return *this; }
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assign operator moves from another host_vector.
      *  \param v The host_vector to move.
      */
-     __host__
-     host_vector &operator=(host_vector &&v)
-     { Parent::operator=(std::move(v)); return *this; }
-  #endif
+    __host__
+    host_vector &operator=(host_vector &&v)
+    { Parent::operator=(std::move(v)); return *this; }
 
     /*! Copy constructor copies from an exemplar \p host_vector with different type.
      *  \param v The \p host_vector to copy.
@@ -450,7 +446,7 @@ template<typename T, typename Alloc = std::allocator<T> >
      *  \param x The exemplar element to copy & insert.
      *  \return An iterator pointing to the newly inserted element.
      */
-    iterator insert(iterator position, const T &x); 
+    iterator insert(iterator position, const T &x);
 
     /*! This method inserts a copy of an exemplar value to a range at the
      *  specified position in this vector.
diff --git a/thrust/iterator/counting_iterator.h b/thrust/iterator/counting_iterator.h
index 25d495db0..da53f3b34 100644
--- a/thrust/iterator/counting_iterator.h
+++ b/thrust/iterator/counting_iterator.h
@@ -182,9 +182,7 @@ template<typename Incrementable,
     __host__ __device__
     explicit counting_iterator(Incrementable x):super_t(x){}
 
-#if THRUST_CPP_DIALECT >= 2011
     counting_iterator & operator=(const counting_iterator &) = default;
-#endif
 
     /*! \cond
      */
diff --git a/thrust/iterator/discard_iterator.h b/thrust/iterator/discard_iterator.h
index c1613694d..3f938c5d8 100644
--- a/thrust/iterator/discard_iterator.h
+++ b/thrust/iterator/discard_iterator.h
@@ -116,9 +116,7 @@ template<typename System = use_default>
     discard_iterator(discard_iterator const &rhs)
       : super_t(rhs.base()) {}
 
-#if THRUST_CPP_DIALECT >= 2011
     discard_iterator & operator=(const discard_iterator &) = default;
-#endif
 
     /*! This constructor receives an optional index specifying the position of this
      *  \p discard_iterator in a range.
diff --git a/thrust/iterator/retag.h b/thrust/iterator/retag.h
deleted file mode 100644
index 6adf5e244..000000000
--- a/thrust/iterator/retag.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright 2008-2013 NVIDIA Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/*! \file thrust/iterator/retag.h
- *  \brief Functionality for altering an iterator's associated system.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-#include <thrust/iterator/detail/retag.h>
-
-namespace thrust
-{
-
-
-/*! \ingroup iterator_tags
- *  \{
- */
-
-#if 0
-/*! \p reinterpret_tag returns a copy of an iterator and changes the type of the result's system tag.
- *  \tparam Tag Any system tag.
- *  \tparam Iterator Any iterator type.
- *  \param iter The iterator of interest.
- *  \return An iterator of unspecified type whose system tag is \p Tag and whose behavior is otherwise
- *          equivalent to \p iter.
- *  \note Unlike \p retag, \p reinterpret_tag does not enforce that the converted-to system tag be
- *        related to the converted-from system tag.
- *  \see retag
- */
-template<typename Tag, typename Iterator>
-__host__ __device__
-unspecified_iterator_type reinterpret_tag(Iterator iter);
-
-/*! \p retag returns a copy of an iterator and changes the type of the result's system tag.
- *  \tparam Tag \p Tag shall be convertible to <tt>thrust::iterator_system<Iterator>::type</tt>,
- *              or <tt>thrust::iterator_system<Iterator>::type</tt> is a base type of \p Tag.
- *  \tparam Iterator Any iterator type.
- *  \param iter The iterator of interest.
- *  \return An iterator of unspecified type whose system tag is \p Tag and whose behavior is
- *          otherwise equivalent to \p iter.
- *  \note Unlike \p reinterpret_tag, \p retag enforces that the converted-to system tag be
- *        related to the converted-from system tag.
- *  \see reinterpret_tag
- */
-template<typename Tag, typename Iterator>
-__host__ __device__
-unspecified_iterator_type retag(Iterator iter);
-#endif
-
-/*! \} // iterator_tags
- */
-
-
-} // end thrust
-
diff --git a/thrust/iterator/transform_iterator.h b/thrust/iterator/transform_iterator.h
index fff050e1c..d3b73b3e6 100644
--- a/thrust/iterator/transform_iterator.h
+++ b/thrust/iterator/transform_iterator.h
@@ -204,12 +204,9 @@ template <class AdaptableUnaryFunction, class Iterator, class Reference = use_de
   public:
     /*! Null constructor does nothing.
      */
-    __host__ __device__
-    transform_iterator() {}
+    transform_iterator() = default;
 
-#if THRUST_CPP_DIALECT >= 2011
     transform_iterator(transform_iterator const&) = default;
-#endif
 
     /*! This constructor takes as arguments an \c Iterator and an \c AdaptableUnaryFunction
      *  and copies them to a new \p transform_iterator.
diff --git a/thrust/memory.h b/thrust/memory.h
index 9ef8833f5..6d49adce6 100644
--- a/thrust/memory.h
+++ b/thrust/memory.h
@@ -49,7 +49,7 @@ namespace thrust
  *  type ensures type safety when dispatching standard algorithms on ranges resident in memory.
  *
  *  \p pointer generalizes \p device_ptr by relaxing the backend system associated with the \p pointer.
- *  Instead of the backend system specified by \p THRUST_DEFAULT_DEVICE_BACKEND, \p pointer's
+ *  Instead of the backend system specified by \p = default;_DEVICE_BACKEND, \p pointer's
  *  system is given by its second template parameter, \p Tag. For the purpose of Thrust dispatch,
  *  <tt>device_ptr<Element></tt> and <tt>pointer<Element,device_system_tag></tt> are considered equivalent.
  *
@@ -82,7 +82,7 @@ template<typename Element, typename Tag, typename Reference = thrust::use_defaul
     /*! The type of the raw pointer
      */
     typedef typename super_t::base_type raw_pointer;
-    
+
     /*! \p pointer's default constructor initializes its encapsulated pointer to \c 0
      */
     __host__ __device__
@@ -176,13 +176,13 @@ template<typename Element, typename Pointer, typename Derived = thrust::use_defa
     /*! This copy constructor accepts a const reference to another
      *  \p reference of related type. After this \p reference is constructed,
      *  it shall refer to the same object as \p other.
-     *  
+     *
      *  \param other A \p reference to copy from.
      *  \tparam OtherElement the element type of the other \p reference.
      *  \tparam OtherPointer the pointer type of the other \p reference.
      *  \tparam OtherDerived the derived type of the other \p reference.
      *
-     *  \note This constructor is templated primarily to allow initialization of 
+     *  \note This constructor is templated primarily to allow initialization of
      *  <tt>reference<const T,...></tt> from <tt>reference<T,...></tt>.
      */
     template<typename OtherElement, typename OtherPointer, typename OtherDerived>
@@ -233,7 +233,7 @@ template<typename Element, typename Pointer, typename Derived = thrust::use_defa
 
     /*! Conversion operator converts this \p reference to \p value_type by
      *  returning a copy of the referent object.
-     *  
+     *
      *  \return A copy of the referent object.
      */
     __host__ __device__
diff --git a/thrust/mr/allocator.h b/thrust/mr/allocator.h
index 4c6c32886..9ce131a77 100644
--- a/thrust/mr/allocator.h
+++ b/thrust/mr/allocator.h
@@ -157,7 +157,7 @@ class allocator : private validator<MR>
 /*! Compares the allocators for equality by comparing the underlying memory resources. */
 template<typename T, typename MR>
 __host__ __device__
-bool operator==(const allocator<T, MR> & lhs, const allocator<T, MR> & rhs) THRUST_NOEXCEPT
+bool operator==(const allocator<T, MR> & lhs, const allocator<T, MR> & rhs) noexcept
 {
     return *lhs.resource() == *rhs.resource();
 }
@@ -165,33 +165,14 @@ bool operator==(const allocator<T, MR> & lhs, const allocator<T, MR> & rhs) THRU
 /*! Compares the allocators for inequality by comparing the underlying memory resources. */
 template<typename T, typename MR>
 __host__ __device__
-bool operator!=(const allocator<T, MR> & lhs, const allocator<T, MR> & rhs) THRUST_NOEXCEPT
+bool operator!=(const allocator<T, MR> & lhs, const allocator<T, MR> & rhs) noexcept
 {
     return !(lhs == rhs);
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-
 template<typename T, typename Pointer>
 using polymorphic_allocator = allocator<T, polymorphic_adaptor_resource<Pointer> >;
 
-#else // C++11
-
-template<typename T, typename Pointer>
-class polymorphic_allocator : public allocator<T, polymorphic_adaptor_resource<Pointer> >
-{
-    typedef allocator<T, polymorphic_adaptor_resource<Pointer> > base;
-
-public:
-    /*! Initializes the base class with the parameter \p resource.
-     */
-    polymorphic_allocator(polymorphic_adaptor_resource<Pointer>  * resource) : base(resource)
-    {
-    }
-};
-
-#endif // C++11
-
 /*! A helper allocator class that uses global instances of a given upstream memory resource. Requires the memory resource
  *      to be default constructible.
  *
@@ -236,9 +217,7 @@ class stateless_resource_allocator : public thrust::mr::allocator<T, Upstream>
     stateless_resource_allocator(const stateless_resource_allocator<U, Upstream> & other)
         : base(other) {}
 
-#if THRUST_CPP_DIALECT >= 2011
     stateless_resource_allocator & operator=(const stateless_resource_allocator &) = default;
-#endif
 
     /*! Destructor. */
     __host__ __device__
diff --git a/thrust/mr/disjoint_pool.h b/thrust/mr/disjoint_pool.h
index 283965fc6..c8e13ea9c 100644
--- a/thrust/mr/disjoint_pool.h
+++ b/thrust/mr/disjoint_pool.h
@@ -68,7 +68,7 @@ namespace mr
  *  \tparam Bookkeeper the type of memory resources that will be used for allocating bookkeeping memory
  */
 template<typename Upstream, typename Bookkeeper>
-class disjoint_unsynchronized_pool_resource THRUST_FINAL
+class disjoint_unsynchronized_pool_resource final
     : public memory_resource<typename Upstream::pointer>,
         private validator2<Upstream, Bookkeeper>
 {
@@ -249,9 +249,7 @@ class disjoint_unsynchronized_pool_resource THRUST_FINAL
         {
         }
 
-#if THRUST_CPP_DIALECT >= 2011
         pool & operator=(const pool &) = default;
-#endif
 
         __host__
         ~pool() {}
@@ -315,7 +313,7 @@ class disjoint_unsynchronized_pool_resource THRUST_FINAL
         m_cached_oversized.clear();
     }
 
-    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         bytes = (std::max)(bytes, m_options.smallest_block_size);
         assert(detail::is_power_of_2(alignment));
@@ -442,7 +440,7 @@ class disjoint_unsynchronized_pool_resource THRUST_FINAL
         return ret;
     }
 
-    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         n = (std::max)(n, m_options.smallest_block_size);
         assert(detail::is_power_of_2(alignment));
diff --git a/thrust/mr/disjoint_sync_pool.h b/thrust/mr/disjoint_sync_pool.h
index ed6cab7ed..28fd1b734 100644
--- a/thrust/mr/disjoint_sync_pool.h
+++ b/thrust/mr/disjoint_sync_pool.h
@@ -20,10 +20,6 @@
 
 #pragma once
 
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-
 #include <mutex>
 
 #include <thrust/mr/disjoint_pool.h>
@@ -92,13 +88,13 @@ struct disjoint_synchronized_pool_resource : public memory_resource<typename Ups
         upstream_pool.release();
     }
 
-    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         lock_t lock(mtx);
         return upstream_pool.do_allocate(bytes, alignment);
     }
 
-    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         lock_t lock(mtx);
         upstream_pool.do_deallocate(p, n, alignment);
@@ -115,5 +111,3 @@ struct disjoint_synchronized_pool_resource : public memory_resource<typename Ups
 } // end mr
 } // end thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/mr/disjoint_tls_pool.h b/thrust/mr/disjoint_tls_pool.h
index e50eba762..0fa5d6a9c 100644
--- a/thrust/mr/disjoint_tls_pool.h
+++ b/thrust/mr/disjoint_tls_pool.h
@@ -20,10 +20,6 @@
 
 #pragma once
 
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-
 #include <thrust/mr/disjoint_pool.h>
 
 namespace thrust
@@ -65,5 +61,4 @@ thrust::mr::disjoint_unsynchronized_pool_resource<Upstream, Bookkeeper> & tls_di
 } // end mr
 } // end thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
 
diff --git a/thrust/mr/fancy_pointer_resource.h b/thrust/mr/fancy_pointer_resource.h
index 53ffc7eb7..e6e0bd240 100644
--- a/thrust/mr/fancy_pointer_resource.h
+++ b/thrust/mr/fancy_pointer_resource.h
@@ -27,7 +27,7 @@ namespace mr
 {
 
 template<typename Upstream, typename Pointer>
-class fancy_pointer_resource THRUST_FINAL : public memory_resource<Pointer>, private validator<Upstream>
+class fancy_pointer_resource final : public memory_resource<Pointer>, private validator<Upstream>
 {
 public:
     fancy_pointer_resource() : m_upstream(get_global_resource<Upstream>())
@@ -39,12 +39,12 @@ class fancy_pointer_resource THRUST_FINAL : public memory_resource<Pointer>, pri
     }
 
     THRUST_NODISCARD
-    virtual Pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual Pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         return static_cast<Pointer>(m_upstream->do_allocate(bytes, alignment));
     }
 
-    virtual void do_deallocate(Pointer p, std::size_t bytes, std::size_t alignment) THRUST_OVERRIDE
+    virtual void do_deallocate(Pointer p, std::size_t bytes, std::size_t alignment) override
     {
         return m_upstream->do_deallocate(
             static_cast<typename Upstream::pointer>(
diff --git a/thrust/mr/memory_resource.h b/thrust/mr/memory_resource.h
index 048ca2405..3d9b9ab99 100644
--- a/thrust/mr/memory_resource.h
+++ b/thrust/mr/memory_resource.h
@@ -54,7 +54,7 @@ class memory_resource
 
     /*! Virtual destructor, defaulted when possible.
      */
-    virtual ~memory_resource() THRUST_DEFAULT
+    virtual ~memory_resource() = default;
 
     /*! Allocates memory of size at least \p bytes and alignment at least \p alignment.
      *
@@ -89,7 +89,7 @@ class memory_resource
      *  \returns whether the two resources are equivalent.
      */
     __host__ __device__
-    bool is_equal(const memory_resource & other) const THRUST_NOEXCEPT
+    bool is_equal(const memory_resource & other) const noexcept
     {
         return do_is_equal(other);
     }
@@ -120,7 +120,7 @@ class memory_resource
      *  \returns whether the two resources are equivalent.
      */
     __host__ __device__
-    virtual bool do_is_equal(const memory_resource & other) const THRUST_NOEXCEPT
+    virtual bool do_is_equal(const memory_resource & other) const noexcept
     {
         return this == &other;
     }
@@ -135,7 +135,7 @@ class memory_resource<void *>
 public:
     typedef void * pointer;
 
-    virtual ~memory_resource() THRUST_DEFAULT
+    virtual ~memory_resource() = default;
 
     THRUST_NODISCARD
     pointer allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT)
@@ -149,7 +149,7 @@ class memory_resource<void *>
     }
 
     __host__ __device__
-    bool is_equal(const memory_resource & other) const THRUST_NOEXCEPT
+    bool is_equal(const memory_resource & other) const noexcept
     {
         return do_is_equal(other);
     }
@@ -157,7 +157,7 @@ class memory_resource<void *>
     virtual pointer do_allocate(std::size_t bytes, std::size_t alignment) = 0;
     virtual void do_deallocate(pointer p, std::size_t bytes, std::size_t alignment) = 0;
     __host__ __device__
-    virtual bool do_is_equal(const memory_resource & other) const THRUST_NOEXCEPT
+    virtual bool do_is_equal(const memory_resource & other) const noexcept
     {
         return this == &other;
     }
@@ -182,7 +182,7 @@ class memory_resource<void *>
  */
 template<typename Pointer>
 __host__ __device__
-bool operator==(const memory_resource<Pointer> & lhs, const memory_resource<Pointer> & rhs) THRUST_NOEXCEPT
+bool operator==(const memory_resource<Pointer> & lhs, const memory_resource<Pointer> & rhs) noexcept
 {
     return &lhs == &rhs || rhs.is_equal(rhs);
 }
@@ -191,7 +191,7 @@ bool operator==(const memory_resource<Pointer> & lhs, const memory_resource<Poin
  */
 template<typename Pointer>
 __host__ __device__
-bool operator!=(const memory_resource<Pointer> & lhs, const memory_resource<Pointer> & rhs) THRUST_NOEXCEPT
+bool operator!=(const memory_resource<Pointer> & lhs, const memory_resource<Pointer> & rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/thrust/mr/new.h b/thrust/mr/new.h
index f8e4fe021..996432485 100644
--- a/thrust/mr/new.h
+++ b/thrust/mr/new.h
@@ -35,10 +35,10 @@ namespace mr
 /*! A memory resource that uses global operators new and delete to allocate and deallocate memory. Uses alignment-enabled
  *      overloads when available, otherwise uses regular overloads and implements alignment requirements by itself.
  */
-class new_delete_resource THRUST_FINAL : public memory_resource<>
+class new_delete_resource final : public memory_resource<>
 {
 public:
-    void * do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    void * do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
 #if defined(__cpp_aligned_new)
         return ::operator new(bytes, std::align_val_t(alignment));
@@ -59,7 +59,7 @@ class new_delete_resource THRUST_FINAL : public memory_resource<>
 #endif
     }
 
-    void do_deallocate(void * p, std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    void do_deallocate(void * p, std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
 #if defined(__cpp_aligned_new)
 # if defined(__cpp_sized_deallocation)
diff --git a/thrust/mr/polymorphic_adaptor.h b/thrust/mr/polymorphic_adaptor.h
index d5d98bf83..5aaafc655 100644
--- a/thrust/mr/polymorphic_adaptor.h
+++ b/thrust/mr/polymorphic_adaptor.h
@@ -24,25 +24,25 @@ namespace mr
 {
 
 template<typename Pointer = void *>
-class polymorphic_adaptor_resource THRUST_FINAL : public memory_resource<Pointer>
+class polymorphic_adaptor_resource final : public memory_resource<Pointer>
 {
 public:
     polymorphic_adaptor_resource(memory_resource<Pointer> * t) : upstream_resource(t)
     {
     }
 
-    virtual Pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual Pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         return upstream_resource->allocate(bytes, alignment);
     }
 
-    virtual void do_deallocate(Pointer p, std::size_t bytes, std::size_t alignment) THRUST_OVERRIDE
+    virtual void do_deallocate(Pointer p, std::size_t bytes, std::size_t alignment) override
     {
         return upstream_resource->deallocate(p, bytes, alignment);
     }
 
     __host__ __device__
-    virtual bool do_is_equal(const memory_resource<Pointer> & other) const THRUST_NOEXCEPT THRUST_OVERRIDE
+    virtual bool do_is_equal(const memory_resource<Pointer> & other) const noexcept override
     {
         return upstream_resource->is_equal(other);
     }
diff --git a/thrust/mr/pool.h b/thrust/mr/pool.h
index 4e311f5b3..bf7a92ccb 100644
--- a/thrust/mr/pool.h
+++ b/thrust/mr/pool.h
@@ -63,7 +63,7 @@ namespace mr
  *  \tparam Upstream the type of memory resources that will be used for allocating memory blocks
  */
 template<typename Upstream>
-class unsynchronized_pool_resource THRUST_FINAL
+class unsynchronized_pool_resource final
     : public memory_resource<typename Upstream::pointer>,
         private validator<Upstream>
 {
@@ -250,7 +250,7 @@ class unsynchronized_pool_resource THRUST_FINAL
         m_cached_oversized = oversized_block_descriptor_ptr();
     }
 
-    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         bytes = (std::max)(bytes, m_options.smallest_block_size);
         assert(detail::is_power_of_2(alignment));
@@ -423,7 +423,7 @@ class unsynchronized_pool_resource THRUST_FINAL
         );
     }
 
-    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         n = (std::max)(n, m_options.smallest_block_size);
         assert(detail::is_power_of_2(alignment));
diff --git a/thrust/mr/sync_pool.h b/thrust/mr/sync_pool.h
index 9cf8640ca..39addf469 100644
--- a/thrust/mr/sync_pool.h
+++ b/thrust/mr/sync_pool.h
@@ -20,10 +20,6 @@
 
 #pragma once
 
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-
 #include <mutex>
 
 #include <thrust/mr/pool.h>
@@ -89,13 +85,13 @@ struct synchronized_pool_resource : public memory_resource<typename Upstream::po
         upstream_pool.release();
     }
 
-    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    THRUST_NODISCARD virtual void_ptr do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         lock_t lock(mtx);
         return upstream_pool.do_allocate(bytes, alignment);
     }
 
-    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+    virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
     {
         lock_t lock(mtx);
         upstream_pool.do_deallocate(p, n, alignment);
@@ -112,5 +108,3 @@ struct synchronized_pool_resource : public memory_resource<typename Upstream::po
 } // end mr
 } // end thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/mr/tls_pool.h b/thrust/mr/tls_pool.h
index c732f022f..f0e9252db 100644
--- a/thrust/mr/tls_pool.h
+++ b/thrust/mr/tls_pool.h
@@ -20,10 +20,6 @@
 
 #pragma once
 
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-
 #include <thrust/mr/pool.h>
 
 namespace thrust
@@ -60,5 +56,3 @@ thrust::mr::unsynchronized_pool_resource<Upstream> & tls_pool(Upstream * upstrea
 } // end mr
 } // end thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/mr/validator.h b/thrust/mr/validator.h
index 9376ae870..ce71e3afd 100644
--- a/thrust/mr/validator.h
+++ b/thrust/mr/validator.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "detail/config.h"
-#include "memory_resource.h"
+#include <thrust/mr/detail/config.h>
+#include <thrust/mr/memory_resource.h>
 
 namespace thrust
 {
@@ -27,12 +27,10 @@ namespace mr
 template<typename MR>
 struct validator
 {
-#if THRUST_CPP_DIALECT >= 2011
   static_assert(
     std::is_base_of<memory_resource<typename MR::pointer>, MR>::value,
     "a type used as a memory resource must derive from memory_resource"
   );
-#endif
 };
 
 template<typename T, typename U>
diff --git a/thrust/optional.h b/thrust/optional.h
index f2d9bb2a7..ea0df34b4 100644
--- a/thrust/optional.h
+++ b/thrust/optional.h
@@ -14,9 +14,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/addressof.h>
 #include <thrust/swap.h>
@@ -77,7 +74,7 @@ namespace thrust
       template<class T, class A>
       struct is_trivially_copy_constructible<std::vector<T,A>>
           : std::is_trivially_copy_constructible<T>{};
-#endif      
+#endif
   }
 } // end namespace thrust
 #endif
@@ -161,17 +158,17 @@ struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...)> : std::true_typ
 template <class T, class Ret, class... Args>
 struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...)&> : std::true_type{};
 template <class T, class Ret, class... Args>
-struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...)&&> : std::true_type{};        
+struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...)&&> : std::true_type{};
 template <class T, class Ret, class... Args>
 struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...) volatile> : std::true_type{};
 template <class T, class Ret, class... Args>
 struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...) volatile&> : std::true_type{};
 template <class T, class Ret, class... Args>
-struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...) volatile&&> : std::true_type{};        
+struct is_pointer_to_non_const_member_func<Ret (T::*) (Args...) volatile&&> : std::true_type{};
 
 template <class T> struct is_const_or_const_ref : std::false_type{};
 template <class T> struct is_const_or_const_ref<T const&> : std::true_type{};
-template <class T> struct is_const_or_const_ref<T const> : std::true_type{};    
+template <class T> struct is_const_or_const_ref<T const> : std::true_type{};
 #endif
 
 // std::invoke from C++17
@@ -179,8 +176,8 @@ template <class T> struct is_const_or_const_ref<T const> : std::true_type{};
 __thrust_exec_check_disable__
 template <typename Fn, typename... Args,
 #ifdef THRUST_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
-          typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value 
-                                 && is_const_or_const_ref<Args...>::value)>, 
+          typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value
+                                 && is_const_or_const_ref<Args...>::value)>,
 #endif
           typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>,
           int = 0>
@@ -1571,7 +1568,7 @@ class optional : private detail::optional_move_assign_base<T>,
   emplace(std::initializer_list<U> il, Args &&... args) {
     *this = nullopt;
     this->construct(il, std::forward<Args>(args)...);
-    return value();    
+    return value();
   }
 
   /// Swaps this optional with the other.
@@ -1815,58 +1812,58 @@ inline constexpr bool operator!=(nullopt_t, const optional<T> &rhs) noexcept {
   return rhs.has_value();
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator<(const optional<T> &, nullopt_t) noexcept {
   return false;
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator<(nullopt_t, const optional<T> &rhs) noexcept {
   return rhs.has_value();
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator<=(const optional<T> &lhs, nullopt_t) noexcept {
   return !lhs.has_value();
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator<=(nullopt_t, const optional<T> &) noexcept {
   return true;
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator>(const optional<T> &lhs, nullopt_t) noexcept {
   return lhs.has_value();
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator>(nullopt_t, const optional<T> &) noexcept {
   return false;
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator>=(const optional<T> &, nullopt_t) noexcept {
   return true;
 }
 /// \group relop_nullopt
-__thrust_exec_check_disable__                                                    
-template <class T>                                                               
-__host__ __device__       
+__thrust_exec_check_disable__
+template <class T>
+__host__ __device__
 inline constexpr bool operator>=(nullopt_t, const optional<T> &rhs) noexcept {
   return !rhs.has_value();
 }
@@ -2845,5 +2842,3 @@ template <class T> struct hash<thrust::optional<T>> {
 };
 } // namespace std
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/pair.h b/thrust/pair.h
index 48da892c7..0a0cc9530 100644
--- a/thrust/pair.h
+++ b/thrust/pair.h
@@ -105,7 +105,7 @@ template <typename T1, typename T2>
   pair(const std::pair<U1,U2> &p);
 
   /*! \p swap swaps the elements of two <tt>pair</tt>s.
-   *  
+   *
    *  \param p The other <tt>pair</tt> with which to swap.
    */
   inline __host__ __device__
@@ -118,7 +118,7 @@ template <typename T1, typename T2>
  *  \param x The first \p pair to compare.
  *  \param y The second \p pair to compare.
  *  \return \c true if and only if <tt>x.first == y.first && x.second == y.second</tt>.
- *  
+ *
  *  \tparam T1 is a model of <a href="http://www.sgi.com/tech/stl/EqualityComparable.html">Equality Comparable</a>.
  *  \tparam T2 is a model of <a href="http://www.sgi.com/tech/stl/EqualityComparable.html">Equality Comparable</a>.
  */
@@ -249,11 +249,10 @@ template<typename Pair> struct tuple_size;
  *
  *  \tparam N This parameter selects the member of interest.
  */
-// XXX comment out these prototypes as a WAR to a problem on MSVC 2005
-//template<unsigned int N, typename T1, typename T2>
-//  inline __host__ __device__
-//    typename tuple_element<N, pair<T1,T2> >::type &
-//      get(pair<T1,T2> &p);
+template<unsigned int N, typename T1, typename T2>
+  inline __host__ __device__
+    typename tuple_element<N, pair<T1,T2> >::type &
+      get(pair<T1,T2> &p);
 
 
 /*! This convenience function returns a const reference to either the
@@ -265,11 +264,10 @@ template<typename Pair> struct tuple_size;
  *
  *  \tparam i This parameter selects the member of interest.
  */
-// XXX comment out these prototypes as a WAR to a problem on MSVC 2005
-//template<int N, typename T1, typename T2>
-//  inline __host__ __device__
-//    const typename tuple_element<N, pair<T1,T2> >::type &
-//      get(const pair<T1,T2> &p);
+template<int N, typename T1, typename T2>
+  inline __host__ __device__
+    const typename tuple_element<N, pair<T1,T2> >::type &
+      get(const pair<T1,T2> &p);
 
 /*! \} // pair
  */
diff --git a/thrust/per_device_resource.h b/thrust/per_device_resource.h
index 3c0158aee..9caa1c9d3 100644
--- a/thrust/per_device_resource.h
+++ b/thrust/per_device_resource.h
@@ -17,9 +17,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/system/detail/generic/per_device_resource.h>
 #include <thrust/system/detail/adl/per_device_resource.h>
@@ -101,4 +98,3 @@ class per_device_allocator : public thrust::mr::allocator<T, Upstream>
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
diff --git a/thrust/shuffle.h b/thrust/shuffle.h
index 8ed156e15..b2980fb20 100644
--- a/thrust/shuffle.h
+++ b/thrust/shuffle.h
@@ -21,9 +21,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/detail/config.h>
 #include <thrust/detail/execution_policy.h>
@@ -176,4 +173,4 @@ __host__ __device__ void shuffle_copy(RandomIterator first, RandomIterator last,
 }  // namespace thrust
 
 #include <thrust/detail/shuffle.inl>
-#endif
+
diff --git a/thrust/system/cpp/detail/par.h b/thrust/system/cpp/detail/par.h
index 740c39e8b..b884e7bba 100644
--- a/thrust/system/cpp/detail/par.h
+++ b/thrust/system/cpp/detail/par.h
@@ -35,7 +35,7 @@ struct par_t : thrust::system::cpp::detail::execution_policy<par_t>,
     thrust::system::cpp::detail::execution_policy>
 {
   __host__ __device__
-  THRUST_CONSTEXPR par_t() : thrust::system::cpp::detail::execution_policy<par_t>() {}
+  constexpr par_t() : thrust::system::cpp::detail::execution_policy<par_t>() {}
 };
 
 
diff --git a/thrust/system/cpp/detail/pointer.inl b/thrust/system/cpp/detail/pointer.inl
index 7d9de3e55..12993a8f9 100644
--- a/thrust/system/cpp/detail/pointer.inl
+++ b/thrust/system/cpp/detail/pointer.inl
@@ -17,21 +17,6 @@
 namespace thrust
 {
 
-// XXX WAR an issue with MSVC 2005 (cl v14.00) incorrectly implementing
-//     pointer_raw_pointer for pointer by specializing it here
-#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (_MSC_VER <= 1400)
-namespace detail
-{
-
-template<typename T>
-  struct pointer_raw_pointer< thrust::cpp::pointer<T> >
-{
-  typedef typename thrust::cpp::pointer<T>::raw_pointer type;
-}; // end pointer_raw_pointer
-
-} // end detail
-#endif
-
 namespace system
 {
 namespace cpp
diff --git a/thrust/system/cpp/detail/vector.inl b/thrust/system/cpp/detail/vector.inl
index 55a1fa4ba..891a7766e 100644
--- a/thrust/system/cpp/detail/vector.inl
+++ b/thrust/system/cpp/detail/vector.inl
@@ -51,13 +51,11 @@ template<typename T, typename Allocator>
       : super_t(x)
 {}
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator>
-      ::vector(vector &&x)
-        : super_t(std::move(x))
-  {}
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(vector &&x)
+      : super_t(std::move(x))
+{}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -89,16 +87,14 @@ template<typename T, typename Allocator>
   return *this;
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator> &
-      vector<T,Allocator>
-        ::operator=(vector &&x)
-  {
-    super_t::operator=(std::move(x));
-    return *this;
-  }
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator> &
+    vector<T,Allocator>
+      ::operator=(vector &&x)
+{
+  super_t::operator=(std::move(x));
+  return *this;
+}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -119,7 +115,7 @@ template<typename T, typename Allocator>
   super_t::operator=(x);
   return *this;
 }
-      
+
 } // end cpp
 } // end system
 } // end thrust
diff --git a/thrust/system/cpp/execution_policy.h b/thrust/system/cpp/execution_policy.h
index 3bf521be3..b519f8e1a 100644
--- a/thrust/system/cpp/execution_policy.h
+++ b/thrust/system/cpp/execution_policy.h
@@ -104,7 +104,7 @@ struct execution_policy : thrust::execution_policy<DerivedPolicy>
 struct tag : thrust::system::cpp::execution_policy<tag> { unspecified };
 
 
-/*! 
+/*!
  *  \p thrust::system::cpp::par is the parallel execution policy associated with Thrust's standard
  *  C++ backend system.
  *
diff --git a/thrust/system/cpp/memory.h b/thrust/system/cpp/memory.h
index 8f6fa2969..c9b811eac 100644
--- a/thrust/system/cpp/memory.h
+++ b/thrust/system/cpp/memory.h
@@ -117,9 +117,7 @@ template<typename T>
   __host__ __device__
   inline allocator(const allocator<U> & other) : base(other) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   allocator & operator=(const allocator &) = default;
-#endif
 
   /*! Destructor has no effect.
    */
diff --git a/thrust/system/cpp/pointer.h b/thrust/system/cpp/pointer.h
index 8efeb33c4..cccd1ce34 100644
--- a/thrust/system/cpp/pointer.h
+++ b/thrust/system/cpp/pointer.h
@@ -164,12 +164,10 @@ template<typename T>
     __host__ __device__
     pointer() : super_t() {}
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     pointer(decltype(nullptr)) : super_t(nullptr) {}
-    #endif
 
     /*! This constructor allows construction of a <tt>pointer<const T></tt> from a <tt>T*</tt>.
      *
@@ -228,7 +226,6 @@ template<typename T>
       return super_t::operator=(other);
     }
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
@@ -237,7 +234,6 @@ template<typename T>
       super_t::operator=(nullptr);
       return *this;
     }
-    #endif
 }; // end pointer
 
 /*! \p reference is a wrapped reference to an object stored in memory available to the \p cpp system.
diff --git a/thrust/system/cpp/vector.h b/thrust/system/cpp/vector.h
index 9aeb7206b..3647cb63e 100644
--- a/thrust/system/cpp/vector.h
+++ b/thrust/system/cpp/vector.h
@@ -96,12 +96,10 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor moves from over another \p cpp::vector.
      *  \param x The other \p cpp::vector to move from.
      */
     vector(vector &&x);
-  #endif
 
     /*! This constructor copies from another Thrust vector-like object.
      *  \param x The other object to copy from.
@@ -130,13 +128,11 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector &operator=(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assignment operator moves from another \p cpp::vector.
      *  \param x The other \p cpp::vector to move from.
      *  \return <tt>*this</tt>
      */
-     vector &operator=(vector &&x);
-  #endif
+    vector &operator=(vector &&x);
 
     /*! Assignment operator assigns from a \c std::vector.
      *  \param x The \c std::vector to assign from.
diff --git a/thrust/system/cuda/config.h b/thrust/system/cuda/config.h
index 246f2ccd0..aaa3e7ea9 100644
--- a/thrust/system/cuda/config.h
+++ b/thrust/system/cuda/config.h
@@ -54,13 +54,7 @@
 #define THRUST_DEVICE_FUNCTION __device__ __forceinline__
 #define THRUST_HOST_FUNCTION __host__     __forceinline__
 #define THRUST_FUNCTION __host__ __device__ __forceinline__
-#if 0
-#define THRUST_ARGS(...) __VA_ARGS__
-#define THRUST_STRIP_PARENS(X) X
-#define THRUST_AGENT_ENTRY(ARGS) THRUST_FUNCTION static void entry(THRUST_STRIP_PARENS(THRUST_ARGS ARGS))
-#else
 #define THRUST_AGENT_ENTRY(...) THRUST_AGENT_ENTRY_INLINE_ATTR __device__ static void entry(__VA_ARGS__)
-#endif
 
 #ifdef THRUST_DEBUG_SYNC
 #define THRUST_DEBUG_SYNC_FLAG true
diff --git a/thrust/system/cuda/detail/async/copy.h b/thrust/system/cuda/detail/async/copy.h
index 8d8779eb1..5905b6015 100644
--- a/thrust/system/cuda/detail/async/copy.h
+++ b/thrust/system/cuda/detail/async/copy.h
@@ -30,10 +30,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -544,5 +540,3 @@ THRUST_DECLTYPE_RETURNS(
 
 #endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
-#endif
-
diff --git a/thrust/system/cuda/detail/async/customization.h b/thrust/system/cuda/detail/async/customization.h
index 4cabe372f..ff2b72d2f 100644
--- a/thrust/system/cuda/detail/async/customization.h
+++ b/thrust/system/cuda/detail/async/customization.h
@@ -30,10 +30,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -125,5 +121,3 @@ THRUST_DECLTYPE_RETURNS(
 
 #endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
-#endif
-
diff --git a/thrust/system/cuda/detail/async/for_each.h b/thrust/system/cuda/detail/async/for_each.h
index 37d998fe2..060ab6ac5 100644
--- a/thrust/system/cuda/detail/async/for_each.h
+++ b/thrust/system/cuda/detail/async/for_each.h
@@ -31,10 +31,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -158,5 +154,3 @@ THRUST_DECLTYPE_RETURNS(
 
 #endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
-#endif
-
diff --git a/thrust/system/cuda/detail/async/reduce.h b/thrust/system/cuda/detail/async/reduce.h
index 8d538250e..4e60571d5 100644
--- a/thrust/system/cuda/detail/async/reduce.h
+++ b/thrust/system/cuda/detail/async/reduce.h
@@ -32,10 +32,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -351,5 +347,3 @@ THRUST_DECLTYPE_RETURNS(
 
 #endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
-#endif
-
diff --git a/thrust/system/cuda/detail/async/sort.h b/thrust/system/cuda/detail/async/sort.h
index f258a9c2a..4c2e6220b 100644
--- a/thrust/system/cuda/detail/async/sort.h
+++ b/thrust/system/cuda/detail/async/sort.h
@@ -30,10 +30,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -523,5 +519,3 @@ THRUST_DECLTYPE_RETURNS(
 
 #endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
-#endif
-
diff --git a/thrust/system/cuda/detail/async/transform.h b/thrust/system/cuda/detail/async/transform.h
index 44934f4a6..8c9e54725 100644
--- a/thrust/system/cuda/detail/async/transform.h
+++ b/thrust/system/cuda/detail/async/transform.h
@@ -30,10 +30,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -162,5 +158,3 @@ THRUST_DECLTYPE_RETURNS(
 
 #endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
-#endif
-
diff --git a/thrust/system/cuda/detail/binary_search.h b/thrust/system/cuda/detail/binary_search.h
deleted file mode 100644
index 1859824b8..000000000
--- a/thrust/system/cuda/detail/binary_search.h
+++ /dev/null
@@ -1,781 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-#pragma once
-
-#if 0
-
-#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
-#include <thrust/detail/cstdint.h>
-#include <thrust/detail/temporary_array.h>
-#include <thrust/system/cuda/detail/util.h>
-
-#include <thrust/system/cuda/execution_policy.h>
-#include <thrust/system/cuda/detail/core/agent_launcher.h>
-#include <thrust/system/cuda/detail/core/util.h>
-#include <thrust/system/cuda/detail/par_to_seq.h>
-#include <thrust/binary_search.h>
-#include <thrust/distance.h>
-
-#if 1
-#  define BS_SIMPLE
-#endif
-
-namespace thrust
-{
-namespace cuda_cub {
-
-namespace __binary_search {
-
-  template <class HaystackIt, class NeedlesIt>
-  struct lbf
-  {
-    typedef typename iterator_traits<HaystackIt>::difference_type result_type;
-    typedef typename iterator_traits<NeedlesIt>::value_type T;
-
-    template <class It, class CompareOp>
-    THRUST_DEVICE_FUNCTION result_type
-    operator()(It begin, It end, T const& value, CompareOp comp)
-    {
-      return system::detail::generic::scalar::lower_bound(begin,
-                                                          end,
-                                                          value,
-                                                          comp) -
-             begin;
-    }
-  };    // struct lbf
-
-  template<class HaystackIt, class NeedlesIt>
-  struct ubf
-  {
-    typedef typename iterator_traits<HaystackIt>::difference_type result_type;
-    typedef typename iterator_traits<NeedlesIt>::value_type T;
-
-    template <class It, class CompareOp>
-    THRUST_DEVICE_FUNCTION result_type
-    operator()(It begin, It end, T const& value, CompareOp comp)
-    {
-      return system::detail::generic::scalar::upper_bound(begin,
-                                                          end,
-                                                          value,
-                                                          comp) -
-             begin;
-    }
-  };    // struct ubf
-
-  template<class HaystackIt, class NeedlesIt>
-  struct bsf
-  {
-    typedef bool result_type;
-    typedef typename iterator_traits<NeedlesIt>::value_type T;
-
-    template <class It, class CompareOp>
-    THRUST_DEVICE_FUNCTION bool
-    operator()(It begin, It end, T const& value, CompareOp comp)
-    {
-      HaystackIt iter = system::detail::generic::scalar::lower_bound(begin,
-                                                                     end,
-                                                                     value,
-                                                                     comp);
-
-      detail::wrapped_function<CompareOp, bool> wrapped_comp(comp);
-
-      return iter != end && !wrapped_comp(value, *iter);
-    }
-  };    // struct bsf
-
-  template <class KeysIt1,
-            class KeysIt2,
-            class Size,
-            class BinaryPred>
-  THRUST_DEVICE_FUNCTION Size
-  merge_path(KeysIt1    keys1,
-             KeysIt2    keys2,
-             Size       keys1_count,
-             Size       keys2_count,
-             Size       diag,
-             BinaryPred binary_pred)
-  {
-    typedef typename iterator_traits<KeysIt1>::value_type key1_type;
-    typedef typename iterator_traits<KeysIt2>::value_type key2_type;
-
-    Size keys1_begin = thrust::max<Size>(0, diag - keys2_count);
-    Size keys1_end   = thrust::min<Size>(diag, keys1_count);
-
-    while (keys1_begin < keys1_end)
-    {
-      Size      mid  = (keys1_begin + keys1_end) >> 1;
-      key1_type key1 = keys1[mid];
-      key2_type key2 = keys2[diag - 1 - mid];
-      bool      pred = binary_pred(key2, key1);
-      if (pred)
-      {
-        keys1_end = mid;
-      }
-      else
-      {
-        keys1_begin = mid + 1;
-      }
-    }
-    return keys1_begin;
-  }
-
-  template <class It, class T2, class CompareOp, int ITEMS_PER_THREAD>
-  THRUST_DEVICE_FUNCTION void
-  serial_merge(It  keys_shared,
-               int keys1_beg,
-               int keys2_beg,
-               int keys1_count,
-               int keys2_count,
-               T2 (&output)[ITEMS_PER_THREAD],
-               int (&indices)[ITEMS_PER_THREAD],
-               CompareOp compare_op)
-  {
-    int keys1_end = keys1_beg + keys1_count;
-    int keys2_end = keys2_beg + keys2_count;
-
-    typedef typename iterator_value<It>::type key_type;
-
-    key_type key1 = keys_shared[keys1_beg];
-    key_type key2 = keys_shared[keys2_beg];
-
-
-#pragma unroll
-    for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-    {
-      bool p = (keys2_beg < keys2_end) &&
-               ((keys1_beg >= keys1_end) ||
-                compare_op(key2,key1));
-
-      output[ITEM]  = p ? key2 : key1;
-      indices[ITEM] = p ? keys2_beg++ : keys1_beg++;
-
-      if (p)
-      {
-        key2 = keys_shared[keys2_beg];
-      }
-      else
-      {
-        key1 = keys_shared[keys1_beg];
-      }
-    }
-  }
-
-  template <int                      _BLOCK_THREADS,
-            int                      _ITEMS_PER_THREAD = 1,
-            cub::BlockLoadAlgorithm  _LOAD_ALGORITHM   = cub::BLOCK_LOAD_DIRECT,
-            cub::CacheLoadModifier   _LOAD_MODIFIER    = cub::LOAD_LDG,
-            cub::BlockStoreAlgorithm _STORE_ALGORITHM  = cub::BLOCK_STORE_DIRECT>
-  struct PtxPolicy
-  {
-    enum
-    {
-      BLOCK_THREADS      = _BLOCK_THREADS,
-      ITEMS_PER_THREAD   = _ITEMS_PER_THREAD,
-      ITEMS_PER_TILE     = _BLOCK_THREADS * _ITEMS_PER_THREAD
-    };
-
-    static const cub::BlockLoadAlgorithm  LOAD_ALGORITHM  = _LOAD_ALGORITHM;
-    static const cub::CacheLoadModifier   LOAD_MODIFIER   = _LOAD_MODIFIER;
-    static const cub::BlockStoreAlgorithm STORE_ALGORITHM = _STORE_ALGORITHM;
-  };    // PtxPolicy
-
-  template <class Arch, class T>
-  struct Tuning;
-
-  template<class T>
-  struct Tuning<sm30,T>
-  {
-    enum
-    {
-      NOMINAL_4B_ITEMS_PER_THREAD = 7,
-      ITEMS_PER_THREAD            = CUB_MIN(NOMINAL_4B_ITEMS_PER_THREAD, CUB_MAX(3, (NOMINAL_4B_ITEMS_PER_THREAD * 4 / sizeof(T)))),
-    };
-
-    typedef PtxPolicy<128,
-                      ITEMS_PER_THREAD,
-                      cub::BLOCK_LOAD_WARP_TRANSPOSE,
-                      cub::LOAD_LDG,
-                      cub::BLOCK_STORE_TRANSPOSE>
-        type;
-  };
-
-  template<class T>
-  struct Tuning<sm52,T>
-  {
-    const static int INPUT_SIZE = sizeof(T);
-
-    enum
-    {
-      NOMINAL_4B_ITEMS_PER_THREAD = 7,
-      ITEMS_PER_THREAD            = CUB_MIN(NOMINAL_4B_ITEMS_PER_THREAD, CUB_MAX(1, (NOMINAL_4B_ITEMS_PER_THREAD * 4 / sizeof(T)))),
-    };
-
-    typedef PtxPolicy<128,
-                      ITEMS_PER_THREAD,
-                      cub::BLOCK_LOAD_WARP_TRANSPOSE,
-                      cub::LOAD_LDG,
-                      cub::BLOCK_STORE_WARP_TRANSPOSE>
-        type;
-  };
-
-  template <class NeedlesIt,
-            class HaystackIt,
-            class Size,
-            class OutputIt,
-            class CompareOp,
-            class SearchOp>
-  struct VectorizedBinarySearchAgent
-  {
-    typedef typename iterator_traits<NeedlesIt>::value_type  needle_type;
-    typedef typename iterator_traits<HaystackIt>::value_type haystack_type;
-    typedef typename SearchOp::result_type                   result_type;
-
-    template <class Arch>
-    struct PtxPlan : Tuning<Arch, needle_type>::type
-    {
-      typedef Tuning<Arch,needle_type> tuning;
-
-      typedef typename core::LoadIterator<PtxPlan, NeedlesIt>::type  NeedlesLoadIt;
-      typedef typename core::LoadIterator<PtxPlan, HaystackIt>::type HaystackLoadIt;
-
-      typedef typename core::BlockLoad<PtxPlan, NeedlesLoadIt>::type BlockLoadNeedles;
-
-      typedef typename core::BlockStore<PtxPlan, OutputIt, result_type>::type BlockStoreResult;
-
-      union TempStorage
-      {
-        typename BlockLoadNeedles::TempStorage load_needles;
-        typename BlockStoreResult::TempStorage store_result;
-
-#ifndef BS_SIMPLE
-        core::uninitialized_array<needle_type, PtxPlan::ITEMS_PER_TILE + 1> needles_shared;
-        core::uninitialized_array<result_type, PtxPlan::ITEMS_PER_TILE>     result_shared;
-        core::uninitialized_array<int, PtxPlan::ITEMS_PER_TILE>             indices_shared;
-#endif
-      };    // union TempStorage
-    };
-
-    typedef typename core::specialize_plan_msvc10_war<PtxPlan>::type::type ptx_plan;
-
-    typedef typename ptx_plan::NeedlesLoadIt    NeedlesLoadIt;
-    typedef typename ptx_plan::HaystackLoadIt   HaystackLoadIt;
-    typedef typename ptx_plan::BlockLoadNeedles BlockLoadNeedles;
-    typedef typename ptx_plan::BlockStoreResult BlockStoreResult;
-    typedef typename ptx_plan::TempStorage     TempStorage;
-
-    enum
-    {
-      ITEMS_PER_THREAD = ptx_plan::ITEMS_PER_THREAD,
-      BLOCK_THREADS    = ptx_plan::BLOCK_THREADS,
-      ITEMS_PER_TILE   = ptx_plan::ITEMS_PER_TILE
-    };
-
-    struct impl
-    {
-      TempStorage&   storage;
-      NeedlesLoadIt  needles_load_it;
-      HaystackLoadIt haystack_load_it;
-      Size           needles_count;
-      Size           haystack_size;
-      OutputIt       result;
-      CompareOp      compare_op;
-      SearchOp       search_op;
-
-      THRUST_DEVICE_FUNCTION
-      void stable_odd_even_sort(needle_type (&needles)[ITEMS_PER_THREAD],
-                                int (&indices)[ITEMS_PER_THREAD])
-      {
-#pragma unroll
-        for (int I = 0; I < ITEMS_PER_THREAD; ++I)
-        {
-#pragma unroll
-          for (int J = 1 & I; J < ITEMS_PER_THREAD - 1; J += 2)
-          {
-            if (compare_op(needles[J + 1], needles[J]))
-            {
-              using thrust::swap;
-              swap(needles[J], needles[J + 1]);
-              swap(indices[J], indices[J + 1]);
-            }
-          }    // inner loop
-        }      // outer loop
-      }
-
-      THRUST_DEVICE_FUNCTION void
-      block_mergesort(int tid,
-                      int count,
-                      needle_type (&needles_loc)[ITEMS_PER_THREAD],
-                      int (&indices_loc)[ITEMS_PER_THREAD])
-      {
-        using core::sync_threadblock;
-
-        // stable sort items in a single thread
-        //
-        stable_odd_even_sort(needles_loc,indices_loc);
-
-        // each thread has  sorted keys_loc
-        // merge sort keys_loc in shared memory
-        //
-#pragma unroll
-        for (int coop = 2; coop <= BLOCK_THREADS; coop *= 2)
-        {
-          sync_threadblock();
-
-          // store keys in shmem
-          //
-#pragma unroll
-          for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-          {
-            int idx = ITEMS_PER_THREAD * threadIdx.x + ITEM;
-            storage.needles_shared[idx] = needles_loc[ITEM];
-          }
-
-          sync_threadblock();
-
-          int  indices[ITEMS_PER_THREAD];
-
-          int list  = ~(coop - 1) & tid;
-          int start = ITEMS_PER_THREAD * list;
-          int size  = ITEMS_PER_THREAD * (coop >> 1);
-
-          int diag = min(count, ITEMS_PER_THREAD * ((coop - 1) & tid));
-
-          int keys1_beg = min(count, start);
-          int keys1_end = min(count, keys1_beg + size);
-          int keys2_beg = keys1_end;
-          int keys2_end = min(count, keys2_beg + size);
-
-          int keys1_count = keys1_end - keys1_beg;
-          int keys2_count = keys2_end - keys2_beg;
-
-          int partition_diag = merge_path(&storage.needles_shared[keys1_beg],
-                                          &storage.needles_shared[keys2_beg],
-                                          keys1_count,
-                                          keys2_count,
-                                          diag,
-                                          compare_op);
-
-          int keys1_beg_loc   = keys1_beg + partition_diag;
-          int keys1_end_loc   = keys1_end;
-          int keys2_beg_loc   = keys2_beg + diag - partition_diag;
-          int keys2_end_loc   = keys2_end;
-          int keys1_count_loc = keys1_end_loc - keys1_beg_loc;
-          int keys2_count_loc = keys2_end_loc - keys2_beg_loc;
-          serial_merge(&storage.needles_shared[0],
-                       keys1_beg_loc,
-                       keys2_beg_loc,
-                       keys1_count_loc,
-                       keys2_count_loc,
-                       needles_loc,
-                       indices,
-                       compare_op);
-
-
-          sync_threadblock();
-
-#pragma unroll
-          for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-          {
-            int idx = ITEMS_PER_THREAD * threadIdx.x + ITEM;
-            storage.indices_shared[idx] = indices_loc[ITEM];
-          }
-
-          sync_threadblock();
-
-#pragma unroll
-          for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-          {
-            indices_loc[ITEM] = storage.indices_shared[indices[ITEM]];
-          }
-        }
-      }    // func block_merge_sort
-
-      template <bool IS_LAST_TILE>
-      THRUST_DEVICE_FUNCTION void
-      consume_tile(int  tid,
-                   Size tile_idx,
-                   Size tile_base,
-                   int  num_remaining)
-      {
-        using core::sync_threadblock;
-
-        needle_type needles_loc[ITEMS_PER_THREAD];
-        BlockLoadNeedles(storage.load_needles)
-            .Load(needles_load_it + tile_base, needles_loc, num_remaining);
-
-#ifdef BS_SIMPLE
-
-        result_type results_loc[ITEMS_PER_THREAD];
-        for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-        {
-          results_loc[ITEM] = search_op(haystack_load_it,
-                                        haystack_load_it + haystack_size,
-                                        needles_loc[ITEM],
-                                        compare_op);
-        }
-
-
-#else
-
-        if (IS_LAST_TILE)
-        {
-          needle_type max_value = needles_loc[0];
-#pragma unroll
-          for (int ITEM = 1; ITEM < ITEMS_PER_THREAD; ++ITEM)
-          {
-            if (ITEMS_PER_THREAD * tid + ITEM < num_remaining)
-            {
-              max_value = compare_op(max_value, needles_loc[ITEM])
-                            ? needles_loc[ITEM]
-                            : max_value;
-            }
-            else
-            {
-              needles_loc[ITEM] = max_value;
-            }
-          }
-        }
-
-        sync_threadblock();
-
-        int indices_loc[ITEMS_PER_THREAD];
-        for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-        {
-          int idx = ITEMS_PER_THREAD*threadIdx.x + ITEM;
-          indices_loc[ITEM] = idx;
-        }
-
-        if (IS_LAST_TILE)
-        {
-          block_mergesort(tid,
-                          num_remaining,
-                          needles_loc,
-                          indices_loc);
-        }
-        else
-        {
-          block_mergesort(tid,
-                          ITEMS_PER_TILE,
-                          needles_loc,
-                          indices_loc);
-        }
-
-        sync_threadblock();
-
-#pragma unroll
-        for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-        {
-          int idx = indices_loc[ITEM];
-          storage.result_shared[idx] =
-              search_op(haystack_load_it,
-                        haystack_load_it + haystack_size,
-                        needles_loc[ITEM],
-                        compare_op);
-        }
-
-        sync_threadblock();
-
-        result_type results_loc[ITEMS_PER_THREAD];
-#pragma unroll
-        for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
-        {
-          int idx = ITEMS_PER_THREAD*threadIdx.x + ITEM;
-          results_loc[ITEM] = storage.result_shared[idx];
-        }
-
-        sync_threadblock();
-#endif
-
-        BlockStoreResult(storage.store_result)
-            .Store(result + tile_base, results_loc, num_remaining);
-      }
-
-      THRUST_DEVICE_FUNCTION
-      impl(TempStorage& storage_,
-           NeedlesIt    needles_it_,
-           HaystackIt   haystack_it_,
-           Size         needles_count_,
-           Size         haystack_size_,
-           OutputIt     result_,
-           CompareOp    compare_op_,
-           SearchOp     search_op_)
-          : storage(storage_),
-            needles_load_it(core::make_load_iterator(ptx_plan(), needles_it_)),
-            haystack_load_it(core::make_load_iterator(ptx_plan(), haystack_it_)),
-            needles_count(needles_count_),
-            haystack_size(haystack_size_),
-            result(result_),
-            compare_op(compare_op_),
-            search_op(search_op_)
-      {
-        int  tid           = threadIdx.x;
-        Size tile_idx      = blockIdx.x;
-        Size num_tiles     = gridDim.x;
-        Size tile_base     = tile_idx * ITEMS_PER_TILE;
-        int  items_in_tile = min<int>(needles_count - tile_base, ITEMS_PER_TILE);
-        if (tile_idx < num_tiles - 1)
-        {
-          consume_tile<false>(tid, tile_idx, tile_base, ITEMS_PER_TILE);
-        }
-        else
-        {
-          consume_tile<true>(tid, tile_idx, tile_base, items_in_tile);
-        }
-      }
-    };    // struct impl
-
-
-    THRUST_AGENT_ENTRY(NeedlesIt  needles_it,
-                       HaystackIt haystack_it,
-                       Size       needles_count,
-                       Size       haystack_size,
-                       OutputIt   result,
-                       CompareOp  compare_op,
-                       SearchOp   search_op,
-                       char*      shmem)
-    {
-      TempStorage& storage = *reinterpret_cast<TempStorage*>(shmem);
-
-      impl(storage,
-           needles_it,
-           haystack_it,
-           needles_count,
-           haystack_size,
-           result,
-           compare_op,
-           search_op);
-    }
-  };    // struct VectorizedBinarySearchAgent
-
-  template <class NeedlesIt,
-            class HaystackIt,
-            class Size,
-            class OutputIt,
-            class CompareOp,
-            class SearchOp>
-  cudaError_t THRUST_RUNTIME_FUNCTION
-  doit_pass(void*        d_temp_storage,
-            size_t&      temp_storage_size,
-            NeedlesIt    needles_it,
-            HaystackIt   haystack_it,
-            Size         needles_count,
-            Size         haystack_size,
-            OutputIt     result,
-            CompareOp    compare_op,
-            SearchOp     search_op,
-            cudaStream_t stream,
-            bool         debug_sync)
-  {
-    if (needles_count == 0)
-      return cudaErrorNotSupported;
-
-    cudaError_t status = cudaSuccess;
-
-    using core::AgentPlan;
-    using core::AgentLauncher;
-
-
-    typedef AgentLauncher<
-        VectorizedBinarySearchAgent<NeedlesIt,
-                                    HaystackIt,
-                                    Size,
-                                    OutputIt,
-                                    CompareOp,
-                                    SearchOp> >
-        search_agent;
-
-    AgentPlan search_plan = search_agent::get_plan(stream);
-
-    temp_storage_size = 1;
-    if (d_temp_storage == NULL)
-    {
-      return status;
-    }
-
-    search_agent sa(search_plan, needles_count, stream, "binary_search::search_agent", debug_sync);
-    sa.launch(needles_it,
-              haystack_it,
-              needles_count,
-              haystack_size,
-              result,
-              compare_op,
-              search_op);
-
-    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
-
-    return status;
-  }
-
-  template <typename Derived,
-            typename NeedlesIt,
-            typename HaystackIt,
-            typename OutputIt,
-            typename CompareOp,
-            typename SearchOp>
-  OutputIt THRUST_RUNTIME_FUNCTION
-  doit(execution_policy<Derived>& policy,
-       HaystackIt                 haystack_begin,
-       HaystackIt                 haystack_end,
-       NeedlesIt                  needles_begin,
-       NeedlesIt                  needles_end,
-       OutputIt                   result,
-       CompareOp                  compare_op,
-       SearchOp                   search_op)
-  {
-    typedef typename iterator_traits<NeedlesIt>::difference_type size_type;
-
-    size_type needles_count = thrust::distance(needles_begin, needles_end);
-    size_type haystack_size = thrust::distance(haystack_begin, haystack_end);
-
-    if (needles_count == 0)
-      return result;
-
-    size_t       storage_size = 0;
-    cudaStream_t stream       = cuda_cub::stream(policy);
-    bool         debug_sync   = THRUST_DEBUG_SYNC_FLAG;
-
-    cudaError status;
-    status = doit_pass(NULL,
-                       storage_size,
-                       needles_begin,
-                       haystack_begin,
-                       needles_count,
-                       haystack_size,
-                       result,
-                       compare_op,
-                       search_op,
-                       stream,
-                       debug_sync);
-    cuda_cub::throw_on_error(status, "binary_search: failed on 1st call");
-
-    // Allocate temporary storage.
-    thrust::detail::temporary_array<thrust::detail::uint8_t, Derived>
-      tmp(policy, storage_size);
-    void *ptr = static_cast<void*>(tmp.data().get());
-
-    status = doit_pass(ptr,
-                       storage_size,
-                       needles_begin,
-                       haystack_begin,
-                       needles_count,
-                       haystack_size,
-                       result,
-                       compare_op,
-                       search_op,
-                       stream,
-                       debug_sync);
-    cuda_cub::throw_on_error(status, "binary_search: failed on 2nt call");
-
-    status = cuda_cub::synchronize(policy);
-    cuda_cub::throw_on_error(status, "binary_search: failed to synchronize");
-
-    return result + needles_count;
-  }
-
-  struct less
-  {
-    template <typename T1, typename T2>
-    THRUST_DEVICE_FUNCTION bool
-    operator()(const T1& lhs, const T2& rhs) const
-    {
-      return lhs < rhs;
-    }
-  };
-}    // namespace __binary_search
-
-//-------------------------
-// Thrust API entry points
-//-------------------------
-
-__thrust_exec_check_disable__
-template <class Derived,
-          class HaystackIt,
-          class NeedlesIt,
-          class OutputIt,
-          class CompareOp>
-OutputIt __host__ __device__
-lower_bound(execution_policy<Derived>& policy,
-            HaystackIt                 first,
-            HaystackIt                 last,
-            NeedlesIt                  values_first,
-            NeedlesIt                  values_last,
-            OutputIt                   result,
-            CompareOp                  compare_op)
-{
-  OutputIt ret = result;
-  if (__THRUST_HAS_CUDART__)
-  {
-    ret = __binary_search::doit(policy,
-                                first,
-                                last,
-                                values_first,
-                                values_last,
-                                result,
-                                compare_op,
-                                __binary_search::lbf<HaystackIt, NeedlesIt>());
-  }
-  else
-  {
-#if !__THRUST_HAS_CUDART__
-    ret = thrust::lower_bound(cvt_to_seq(derived_cast(policy)),
-                              first,
-                              last,
-                              values_first,
-                              values_last,
-                              result);
-#endif
-  }
-  return ret;
-}
-
-
-template <class Derived,
-          class HaystackIt,
-          class NeedlesIt,
-          class OutputIt>
-OutputIt __host__ __device__
-lower_bound(execution_policy<Derived>& policy,
-            HaystackIt                 first,
-            HaystackIt                 last,
-            NeedlesIt                  values_first,
-            NeedlesIt                  values_last,
-            OutputIt                   result)
-{
-  return cuda_cub::lower_bound(policy,
-                               first,
-                               last,
-                               values_first,
-                               values_last,
-                               result,
-                               __binary_search::less());
-}
-
-}    // namespace cuda_cub
-} // end namespace thrust
-#endif
-
-#endif
diff --git a/thrust/system/cuda/detail/core/agent_launcher.h b/thrust/system/cuda/detail/core/agent_launcher.h
index 7788481c7..08d482f58 100644
--- a/thrust/system/cuda/detail/core/agent_launcher.h
+++ b/thrust/system/cuda/detail/core/agent_launcher.h
@@ -33,14 +33,6 @@
 #include <thrust/system/cuda/detail/core/util.h>
 #include <cassert>
 
-#if 0
-#define __THRUST__TEMPLATE_DEBUG
-#endif
-
-#if __THRUST__TEMPLATE_DEBUG
-template<int...> class ID_impl;
-template<int... I> class Foo { ID_impl<I...> t;};
-#endif
 
 namespace thrust
 {
@@ -475,32 +467,6 @@ namespace core {
       assert(plan.grid_size > 0);
     }
 
-#if 0
-    THRUST_RUNTIME_FUNCTION
-    AgentPlan static get_plan(cudaStream_t s, void* d_ptr = 0)
-    {
-      // in separable compilation mode, we have no choice
-      // but to call kernel to get agent_plan
-      // otherwise the risk is something may fail
-      // if user mix & match ptx versions in a separably compiled function
-      // http://nvbugs/1772071
-      // XXX may be it is too string of a requirements, consider relaxing it in
-      // the future
-#ifdef __CUDACC_RDC__
-      return core::get_agent_plan<Agent>(s, d_ptr);
-#else
-      core::cuda_optional<int> ptx_version = core::get_ptx_version();
-      //CUDA_CUB_RET_IF_FAIL(ptx_version.status());
-      return get_agent_plan<Agent>(ptx_version);
-#endif
-    }
-    THRUST_RUNTIME_FUNCTION
-    AgentPlan static get_plan_default()
-    {
-      return get_agent_plan<Agent>(sm_arch<0>::type::ver);
-    }
-#endif
-
     THRUST_RUNTIME_FUNCTION
     typename core::get_plan<Agent>::type static get_plan(cudaStream_t , void* d_ptr = 0)
     {
@@ -745,16 +711,6 @@ namespace core {
     void THRUST_RUNTIME_FUNCTION
     launch(Args... args) const
     {
-#if __THRUST__TEMPLATE_DEBUG
-#ifdef __CUDA_ARCH__
-      typedef typename Foo<
-        shm1::v1,
-        shm1::v2,
-        shm1::v3,
-        shm1::v4,
-        shm1::v5>::t tt;
-#endif
-#endif
       launch_impl(has_enough_shmem_t(),args...);
       sync();
     }
diff --git a/thrust/system/cuda/detail/core/util.h b/thrust/system/cuda/detail/core/util.h
index a2c87772e..e23253048 100644
--- a/thrust/system/cuda/detail/core/util.h
+++ b/thrust/system/cuda/detail/core/util.h
@@ -380,85 +380,6 @@ namespace core {
       #endif
     }
 
-// XXX keep this dead-code for now as a gentle reminder
-//     that kernel luunch which reats plan values is the most robust
-//     mechanism to extract sm-specific tuning parameters
-// TODO: since we are unable to afford kernel launch + cudaMemcpy ON EVERY
-//       algorithm invocation, we need to design a good caching strategy
-//       such that when the algorithm is called multiple times, only the
-//       first invocation will invoke kernel launch + cudaMemcpy, but
-//       the subsequent invocations, will just read cached values from host mem
-//       If launched from device, this is just a device-function call
-//       no caching is required.
-// ----------------------------------------------------------------------------
-  // if we don't know ptx version, we can call kernel
-  // to retrieve AgentPlan from device code. Slower, but guaranteed to work
-  // -----------------------------------------------------------------------
-#if 0
-  template<class Agent>
-  void __global__ get_agent_plan_kernel(AgentPlan *plan);
-
-  static __device__ AgentPlan agent_plan_device;
-
-  template<class Agent>
-  AgentPlan __device__ get_agent_plan_dev()
-  {
-    AgentPlan plan;
-    plan.block_threads      = Agent::ptx_plan::BLOCK_THREADS;
-    plan.items_per_thread   = Agent::ptx_plan::ITEMS_PER_THREAD;
-    plan.items_per_tile     = Agent::ptx_plan::ITEMS_PER_TILE;
-    plan.shared_memory_size = temp_storage_size<typename Agent::ptx_plan>::value;
-    return plan;
-  }
-
-  template <class Agent, class F>
-  AgentPlan __host__ __device__ __forceinline__
-  xget_agent_plan_impl(F f, cudaStream_t s, void* d_ptr)
-  {
-    AgentPlan plan;
-#ifdef __CUDA_ARCH__
-    plan = get_agent_plan_dev<Agent>();
-#else
-    static cub::Mutex mutex;
-    bool lock = false;
-    if (d_ptr == 0)
-    {
-      lock = true;
-      cudaGetSymbolAddress(&d_ptr, agent_plan_device);
-    }
-    if (lock)
-      mutex.Lock();
-    f<<<1,1,0,s>>>((AgentPlan*)d_ptr);
-    cudaMemcpyAsync((void*)&plan,
-                    d_ptr,
-                    sizeof(AgentPlan),
-                    cudaMemcpyDeviceToHost,
-                    s);
-    if (lock)
-      mutex.Unlock();
-    cudaStreamSynchronize(s);
-#endif
-    return plan;
-  }
-
-  template <class Agent>
-  AgentPlan THRUST_RUNTIME_FUNCTION
-  get_agent_plan(cudaStream_t s = 0, void *ptr = 0)
-  {
-    return xget_agent_plan_impl<Agent>(get_agent_plan_kernel<Agent>,
-                                        s,
-                                        ptr);
-  }
-
-  template<class Agent>
-  void __global__ get_agent_plan_kernel(AgentPlan *plan)
-  {
-    *plan = get_agent_plan_dev<Agent>();
-  }
-#endif
-
-  /////////////////////////
-  /////////////////////////
   /////////////////////////
 
   THRUST_RUNTIME_FUNCTION
diff --git a/thrust/system/cuda/detail/cross_system.h b/thrust/system/cuda/detail/cross_system.h
index f89f3dba8..d539116a8 100644
--- a/thrust/system/cuda/detail/cross_system.h
+++ b/thrust/system/cuda/detail/cross_system.h
@@ -53,10 +53,9 @@ namespace cuda_cub {
     }
   };
 
-#if THRUST_CPP_DIALECT >= 2011
   // Device to host.
   template <class Sys1, class Sys2>
-  THRUST_CONSTEXPR __host__ __device__ 
+  constexpr __host__ __device__
   auto direction_of_copy(
     thrust::system::cuda::execution_policy<Sys1> const&
   , thrust::cpp::execution_policy<Sys2> const&
@@ -69,7 +68,7 @@ namespace cuda_cub {
 
   // Host to device.
   template <class Sys1, class Sys2>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto direction_of_copy(
     thrust::cpp::execution_policy<Sys1> const&
   , thrust::system::cuda::execution_policy<Sys2> const&
@@ -82,7 +81,7 @@ namespace cuda_cub {
 
   // Device to device.
   template <class Sys1, class Sys2>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto direction_of_copy(
     thrust::system::cuda::execution_policy<Sys1> const&
   , thrust::system::cuda::execution_policy<Sys2> const&
@@ -95,7 +94,7 @@ namespace cuda_cub {
 
   // Device to device.
   template <class DerivedPolicy>
-  THRUST_CONSTEXPR __host__ __device__ 
+  constexpr __host__ __device__
   auto direction_of_copy(execution_policy<DerivedPolicy> const &)
   THRUST_DECLTYPE_RETURNS(
     thrust::detail::integral_constant<
@@ -104,7 +103,7 @@ namespace cuda_cub {
   )
 
   template <class Sys1, class Sys2>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto direction_of_copy(
     execution_policy<cross_system<Sys1, Sys2>> const &systems
   )
@@ -121,12 +120,12 @@ namespace cuda_cub {
             typename Direction =
               decltype(direction_of_copy(std::declval<ExecutionPolicy0>(),
                                          std::declval<ExecutionPolicy1>()))>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto is_device_to_host_copy(
     ExecutionPolicy0 const& exec0
   , ExecutionPolicy1 const& exec1
   )
-    noexcept -> 
+    noexcept ->
       thrust::detail::integral_constant<
         bool, cudaMemcpyDeviceToHost == Direction::value
       >
@@ -138,9 +137,9 @@ namespace cuda_cub {
             // MSVC2015 WAR: put decltype here instead of in trailing return type
             typename Direction =
               decltype(direction_of_copy(std::declval<ExecutionPolicy>()))>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto is_device_to_host_copy(ExecutionPolicy const& exec)
-    noexcept -> 
+    noexcept ->
       thrust::detail::integral_constant<
         bool, cudaMemcpyDeviceToHost == Direction::value
       >
@@ -154,12 +153,12 @@ namespace cuda_cub {
             typename Direction =
               decltype(direction_of_copy(std::declval<ExecutionPolicy0>(),
                                          std::declval<ExecutionPolicy1>()))>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto is_host_to_device_copy(
     ExecutionPolicy0 const& exec0
   , ExecutionPolicy1 const& exec1
   )
-    noexcept -> 
+    noexcept ->
       thrust::detail::integral_constant<
         bool, cudaMemcpyHostToDevice == Direction::value
       >
@@ -171,9 +170,9 @@ namespace cuda_cub {
             // MSVC2015 WAR: put decltype here instead of in trailing return type
             typename Direction =
               decltype(direction_of_copy(std::declval<ExecutionPolicy>()))>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto is_host_to_device_copy(ExecutionPolicy const& exec)
-    noexcept -> 
+    noexcept ->
       thrust::detail::integral_constant<
         bool, cudaMemcpyHostToDevice == Direction::value
       >
@@ -187,12 +186,12 @@ namespace cuda_cub {
             typename Direction =
               decltype(direction_of_copy(std::declval<ExecutionPolicy0>(),
                                          std::declval<ExecutionPolicy1>()))>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto is_device_to_device_copy(
     ExecutionPolicy0 const& exec0
   , ExecutionPolicy1 const& exec1
   )
-    noexcept -> 
+    noexcept ->
       thrust::detail::integral_constant<
         bool, cudaMemcpyDeviceToDevice == Direction::value
       >
@@ -204,9 +203,9 @@ namespace cuda_cub {
             // MSVC2015 WAR: put decltype here instead of in trailing return type
             typename Direction =
               decltype(direction_of_copy(std::declval<ExecutionPolicy>()))>
-  THRUST_CONSTEXPR __host__ __device__
+  constexpr __host__ __device__
   auto is_device_to_device_copy(ExecutionPolicy const& exec)
-    noexcept -> 
+    noexcept ->
       thrust::detail::integral_constant<
         bool, cudaMemcpyDeviceToDevice == Direction::value
       >
@@ -313,7 +312,6 @@ namespace cuda_cub {
   select_host_system(thrust::execution_policy<Sys1> const &sys1,
                      thrust::execution_policy<Sys2> const &)
   THRUST_DECLTYPE_RETURNS(sys1)
-#endif
 
   // Device to host.
   template <class Sys1, class Sys2>
diff --git a/thrust/system/cuda/detail/execution_policy.h b/thrust/system/cuda/detail/execution_policy.h
index ee49a60cb..e747ebc62 100644
--- a/thrust/system/cuda/detail/execution_policy.h
+++ b/thrust/system/cuda/detail/execution_policy.h
@@ -33,10 +33,7 @@
 #include <thrust/system/cuda/config.h>
 
 #include <thrust/detail/allocator_aware_execution_policy.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-  #include <thrust/detail/dependencies_aware_execution_policy.h>
-#endif
+#include <thrust/detail/dependencies_aware_execution_policy.h>
 
 namespace thrust
 {
@@ -55,17 +52,16 @@ struct execution_policy<tag> : thrust::execution_policy<tag>
   typedef tag tag_type;
 };
 
-struct tag : execution_policy<tag>
+struct tag :
+  execution_policy<tag>
 , thrust::detail::allocator_aware_execution_policy<cuda_cub::execution_policy>
-#if THRUST_CPP_DIALECT >= 2011
 , thrust::detail::dependencies_aware_execution_policy<cuda_cub::execution_policy>
-#endif
 {};
 
 template <class Derived>
 struct execution_policy : thrust::execution_policy<Derived>
 {
-  typedef tag tag_type; 
+  typedef tag tag_type;
   operator tag() const { return tag(); }
 };
 
diff --git a/thrust/system/cuda/detail/future.inl b/thrust/system/cuda/detail/future.inl
index 8715559d8..238e19077 100644
--- a/thrust/system/cuda/detail/future.inl
+++ b/thrust/system/cuda/detail/future.inl
@@ -9,10 +9,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/optional.h>
 #include <thrust/detail/type_deduction.h>
@@ -358,7 +354,7 @@ try_acquire_stream(int device, unique_eager_future<X>& parent) noexcept;
 template <typename... Dependencies>
 __host__
 acquired_stream acquire_stream(int device, Dependencies&... deps) noexcept;
-  
+
 template <typename... Dependencies>
 __host__
 unique_eager_event
@@ -517,7 +513,7 @@ public:
 
   // Precondition: `true == valid_content()`.
   __host__
-  pointer data() 
+  pointer data()
   {
     if (!valid_content())
       throw thrust::event_error(event_errc::no_content);
@@ -527,7 +523,7 @@ public:
 
   // Precondition: `true == valid_content()`.
   __host__
-  const_pointer data() const 
+  const_pointer data() const
   {
     if (!valid_content())
       throw thrust::event_error(event_errc::no_content);
@@ -670,7 +666,7 @@ public:
   }
 
   THRUST_NODISCARD __host__ __device__
-  value_type extract() 
+  value_type extract()
   {
     return std::move(value_);
   }
@@ -1328,7 +1324,7 @@ make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps)
   std::unique_ptr<async_signal_type> sig(
     new async_signal_type(std::move(as.stream), std::move(ka), std::move(cc))
   );
- 
+
   // Finally, we create the promise and future objects.
   weak_promise<X, XPointer> child_prom(device, sig->data());
   unique_eager_future<X> child_fut(device, std::move(sig));
@@ -1347,7 +1343,7 @@ unique_eager_event when_all(Events&&... evs)
 // TODO: Constrain to events, futures, and maybe streams (currently allows keep
 // alives).
 {
-  return detail::make_dependent_event(std::make_tuple(std::move(evs)...)); 
+  return detail::make_dependent_event(std::make_tuple(std::move(evs)...));
 }
 
 // ADL hook for transparent `.after` move support.
@@ -1365,5 +1361,3 @@ THRUST_DECLTYPE_RETURNS(std::move(dependency))
 
 } // end namespace thrust
 
-#endif 
-
diff --git a/thrust/system/cuda/detail/managed_memory_pointer.h b/thrust/system/cuda/detail/managed_memory_pointer.h
index c6a4c9756..55ca60706 100644
--- a/thrust/system/cuda/detail/managed_memory_pointer.h
+++ b/thrust/system/cuda/detail/managed_memory_pointer.h
@@ -99,13 +99,11 @@ class managed_memory_pointer
       : super_t()
   {}
 
-#if THRUST_CPP_DIALECT >= 2011
   // NOTE: This is needed so that Thrust smart pointers can be used in
   // `std::unique_ptr`.
   __host__ __device__ managed_memory_pointer(decltype(nullptr))
       : super_t(nullptr)
   {}
-#endif
 
   /*! This constructor allows construction of a <tt><const T></tt> from a
    * <tt>T*</tt>.
@@ -171,7 +169,6 @@ class managed_memory_pointer
     return super_t::operator=(other);
   }
 
-#if THRUST_CPP_DIALECT >= 2011
   // NOTE: This is needed so that Thrust smart pointers can be used in
   // `std::unique_ptr`.
   __host__ __device__ managed_memory_pointer& operator=(decltype(nullptr))
@@ -179,7 +176,6 @@ class managed_memory_pointer
     super_t::operator=(nullptr);
     return *this;
   }
-#endif
 
   __host__ __device__
   pointer operator->() const
diff --git a/thrust/system/cuda/detail/par.h b/thrust/system/cuda/detail/par.h
index 1e3be070f..d53cf1a64 100644
--- a/thrust/system/cuda/detail/par.h
+++ b/thrust/system/cuda/detail/par.h
@@ -32,11 +32,7 @@
 #include <thrust/system/cuda/detail/util.h>
 
 #include <thrust/detail/allocator_aware_execution_policy.h>
-
-#if THRUST_CPP_DIALECT >= 2011
-#  include <thrust/detail/dependencies_aware_execution_policy.h>
-#endif
-
+#include <thrust/detail/dependencies_aware_execution_policy.h>
 
 namespace thrust
 {
@@ -107,18 +103,17 @@ struct execute_on_stream : execute_on_stream_base<execute_on_stream>
 };
 
 
-struct par_t : execution_policy<par_t>,
-  thrust::detail::allocator_aware_execution_policy<
+struct par_t :
+  execution_policy<par_t>
+, thrust::detail::allocator_aware_execution_policy<
     execute_on_stream_base>
-#if THRUST_CPP_DIALECT >= 2011
 , thrust::detail::dependencies_aware_execution_policy<
     execute_on_stream_base>
-#endif
 {
   typedef execution_policy<par_t> base_t;
 
   __host__ __device__
-  THRUST_CONSTEXPR par_t() : base_t() {}
+  constexpr par_t() : base_t() {}
 
   typedef execute_on_stream stream_attachment_type;
 
diff --git a/thrust/system/cuda/detail/par_to_seq.h b/thrust/system/cuda/detail/par_to_seq.h
index 22c4e5838..912862ccc 100644
--- a/thrust/system/cuda/detail/par_to_seq.h
+++ b/thrust/system/cuda/detail/par_to_seq.h
@@ -51,29 +51,6 @@ struct cvt_to_seq_impl
   }
 };    // cvt_to_seq_impl
 
-#if 0
-template <class Allocator>
-struct cvt_to_seq_impl<
-    thrust::detail::execute_with_allocator<Allocator,
-                                           execute_on_stream_base> >
-{
-  typedef thrust::detail::execute_with_allocator<Allocator,
-                                                 execute_on_stream_base>
-      Policy;
-  typedef thrust::detail::execute_with_allocator<
-      Allocator,
-      thrust::system::detail::sequential::execution_policy>
-      seq_t;
-
-
-  static seq_t __host__ __device__
-  doit(Policy& policy)
-  {
-    return seq_t(policy.m_alloc);
-  }
-};    // specialization of struct cvt_to_seq_impl
-#endif
-
 template <class Policy>
 typename cvt_to_seq_impl<Policy>::seq_t __host__ __device__
 cvt_to_seq(Policy& policy)
diff --git a/thrust/system/cuda/detail/per_device_resource.h b/thrust/system/cuda/detail/per_device_resource.h
index 68f7194af..4fe4f25c4 100644
--- a/thrust/system/cuda/detail/per_device_resource.h
+++ b/thrust/system/cuda/detail/per_device_resource.h
@@ -28,9 +28,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
 
@@ -69,5 +66,3 @@ MR * get_per_device_resource(execution_policy<DerivedPolicy>&)
 
 #endif
 
-#endif
-
diff --git a/thrust/system/cuda/detail/pointer.inl b/thrust/system/cuda/detail/pointer.inl
index 60f277f59..345d15b25 100644
--- a/thrust/system/cuda/detail/pointer.inl
+++ b/thrust/system/cuda/detail/pointer.inl
@@ -17,23 +17,6 @@
 namespace thrust
 {
 
-// XXX WAR an issue with MSVC 2005 (cl v14.00) incorrectly implementing
-//     pointer_raw_pointer for pointer by specializing it here
-//     note that we specialize it here, before the use of raw_pointer_cast
-//     below, which causes pointer_raw_pointer's instantiation
-#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (_MSC_VER <= 1400)
-namespace detail
-{
-
-template<typename T>
-  struct pointer_raw_pointer< thrust::cuda_cub::pointer<T> >
-{
-  typedef typename thrust::cuda_cub::pointer<T>::raw_pointer type;
-}; // end pointer_raw_pointer
-
-} // end detail
-#endif
-
 namespace cuda_cub {
 
 template <typename T>
diff --git a/thrust/system/cuda/detail/set_operations.h b/thrust/system/cuda/detail/set_operations.h
index 38ba1011d..037024cd1 100644
--- a/thrust/system/cuda/detail/set_operations.h
+++ b/thrust/system/cuda/detail/set_operations.h
@@ -643,10 +643,6 @@ namespace __set_operations {
                                         compare_op,
                                         set_op);
         sync_threadblock();
-#if 0
-        if (ITEMS_PER_THREAD*threadIdx.x >= num_keys1 + num_keys2)
-          active_mask = 0;
-#endif
 
         // look-back scan over thread_output_count
         // to compute global thread_output_base and tile_otput_count;
diff --git a/thrust/system/cuda/detail/util.h b/thrust/system/cuda/detail/util.h
index 0ddb369af..6af1bc72f 100644
--- a/thrust/system/cuda/detail/util.h
+++ b/thrust/system/cuda/detail/util.h
@@ -249,9 +249,7 @@ struct transform_input_iterator_t
   transform_input_iterator_t(InputIt input, UnaryOp op)
       : input(input), op(op) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   transform_input_iterator_t(const self_t &) = default;
-#endif
 
   // UnaryOp might not be copy assignable, such as when it is a lambda.  Define
   // an explicit copy assignment operator that doesn't try to assign it.
@@ -327,14 +325,6 @@ struct transform_input_iterator_t
     return op(input[n]);
   }
 
-#if 0
-    /// Structure dereference
-    __host__ __device__ __forceinline__ pointer operator->()
-    {
-        return &op(*input_itr);
-    }
-#endif
-
   /// Equal to
   __host__ __device__ __forceinline__ bool operator==(const self_t &rhs) const
   {
@@ -346,14 +336,6 @@ struct transform_input_iterator_t
   {
     return (input != rhs.input);
   }
-
-#if 0
-    /// ostream operator
-    friend std::ostream& operator<<(std::ostream& os, const self& itr)
-    {
-        return os;
-    }
-#endif
 };    // struct transform_input_iterarot_t
 
 template <class ValueType,
@@ -379,9 +361,7 @@ struct transform_pair_of_input_iterators_t
                                       BinaryOp op_)
       : input1(input1_), input2(input2_), op(op_) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   transform_pair_of_input_iterators_t(const self_t &) = default;
-#endif
 
   // BinaryOp might not be copy assignable, such as when it is a lambda.
   // Define an explicit copy assignment operator that doesn't try to assign it.
diff --git a/thrust/system/cuda/detail/vector.inl b/thrust/system/cuda/detail/vector.inl
index dfd4c89b5..b4b7e0e64 100644
--- a/thrust/system/cuda/detail/vector.inl
+++ b/thrust/system/cuda/detail/vector.inl
@@ -48,13 +48,11 @@ template<typename T, typename Allocator>
       : super_t(x)
 {}
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator>
-      ::vector(vector &&x)
-        : super_t(std::move(x))
-  {}
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(vector &&x)
+      : super_t(std::move(x))
+{}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -86,16 +84,14 @@ template<typename T, typename Allocator>
   return *this;
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator> &
-      vector<T,Allocator>
-        ::operator=(vector &&x)
-  {
-    super_t::operator=(std::move(x));
-    return *this;
-  }
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator> &
+    vector<T,Allocator>
+      ::operator=(vector &&x)
+{
+  super_t::operator=(std::move(x));
+  return *this;
+}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -116,7 +112,7 @@ template<typename T, typename Allocator>
   super_t::operator=(x);
   return *this;
 }
-      
+
 } // end cuda_cub
 } // end thrust
 
diff --git a/thrust/system/cuda/execution_policy.h b/thrust/system/cuda/execution_policy.h
index 39bbb7927..27a5553e6 100644
--- a/thrust/system/cuda/execution_policy.h
+++ b/thrust/system/cuda/execution_policy.h
@@ -74,7 +74,6 @@
 
 // stubs passed
 // ----------------
-#include <thrust/system/cuda/detail/binary_search.h>
 #include <thrust/system/cuda/detail/merge.h>
 #include <thrust/system/cuda/detail/scan_by_key.h>
 #include <thrust/system/cuda/detail/set_operations.h>
diff --git a/thrust/system/cuda/future.h b/thrust/system/cuda/future.h
index fc2986f8b..56809d804 100644
--- a/thrust/system/cuda/future.h
+++ b/thrust/system/cuda/future.h
@@ -6,10 +6,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/system/cuda/pointer.h>
 #include <thrust/system/cuda/detail/execution_policy.h>
@@ -54,14 +50,14 @@ using thrust::system::cuda::when_all;
 } // namespace cuda
 
 template <typename DerivedPolicy>
-__host__ 
+__host__
 thrust::cuda::unique_eager_event
 unique_eager_event_type(
   thrust::cuda::execution_policy<DerivedPolicy> const&
 ) noexcept;
 
 template <typename T, typename DerivedPolicy>
-__host__ 
+__host__
 thrust::cuda::unique_eager_future<T>
 unique_eager_future_type(
   thrust::cuda::execution_policy<DerivedPolicy> const&
@@ -71,5 +67,3 @@ unique_eager_future_type(
 
 #include <thrust/system/cuda/detail/future.inl>
 
-#endif
-
diff --git a/thrust/system/cuda/memory.h b/thrust/system/cuda/memory.h
index cd27e4da6..063be995f 100644
--- a/thrust/system/cuda/memory.h
+++ b/thrust/system/cuda/memory.h
@@ -115,9 +115,7 @@ struct allocator
   __host__ __device__
   inline allocator(const allocator<U> & other) : base(other) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   allocator & operator=(const allocator &) = default;
-#endif
 
   /*! Destructor has no effect.
    */
diff --git a/thrust/system/cuda/memory_resource.h b/thrust/system/cuda/memory_resource.h
index 9110e0af4..b674550d5 100644
--- a/thrust/system/cuda/memory_resource.h
+++ b/thrust/system/cuda/memory_resource.h
@@ -46,10 +46,10 @@ namespace detail
     typedef cudaError_t (*deallocation_fn)(void *);
 
     template<allocation_fn Alloc, deallocation_fn Dealloc, typename Pointer>
-    class cuda_memory_resource THRUST_FINAL : public mr::memory_resource<Pointer>
+    class cuda_memory_resource final : public mr::memory_resource<Pointer>
     {
     public:
-        Pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) THRUST_OVERRIDE
+        Pointer do_allocate(std::size_t bytes, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
         {
             (void)alignment;
 
@@ -65,7 +65,7 @@ namespace detail
             return Pointer(ret);
         }
 
-        void do_deallocate(Pointer p, std::size_t bytes, std::size_t alignment) THRUST_OVERRIDE
+        void do_deallocate(Pointer p, std::size_t bytes, std::size_t alignment) override
         {
             (void)bytes;
             (void)alignment;
diff --git a/thrust/system/cuda/pointer.h b/thrust/system/cuda/pointer.h
index f198385ce..46ff21276 100644
--- a/thrust/system/cuda/pointer.h
+++ b/thrust/system/cuda/pointer.h
@@ -114,12 +114,10 @@ class pointer
   __host__ __device__
   pointer() : super_t() {}
 
-  #if THRUST_CPP_DIALECT >= 2011
   // NOTE: This is needed so that Thrust smart pointers can be used in
   // `std::unique_ptr`.
   __host__ __device__
   pointer(decltype(nullptr)) : super_t(nullptr) {}
-  #endif
 
   /*! This constructor allows construction of a <tt>pointer<const T></tt> from a <tt>T*</tt>.
    *
@@ -180,7 +178,6 @@ class pointer
     return super_t::operator=(other);
   }
 
-  #if THRUST_CPP_DIALECT >= 2011
   // NOTE: This is needed so that Thrust smart pointers can be used in
   // `std::unique_ptr`.
   __host__ __device__
@@ -189,7 +186,6 @@ class pointer
     super_t::operator=(nullptr);
     return *this;
   }
-  #endif
 };    // struct pointer
 
 /*! \p reference is a wrapped reference to an object stored in memory available to the \p cuda system.
diff --git a/thrust/system/cuda/vector.h b/thrust/system/cuda/vector.h
index 707f9ff7f..41db5bd1c 100644
--- a/thrust/system/cuda/vector.h
+++ b/thrust/system/cuda/vector.h
@@ -93,12 +93,10 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor moves from over another \p cuda::vector.
      *  \param x The other \p cuda::vector to move from.
      */
     vector(vector &&x);
-  #endif
 
     /*! This constructor copies from another Thrust vector-like object.
      *  \param x The other object to copy from.
@@ -125,13 +123,11 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector &operator=(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assignment operator moves from another \p cuda::vector.
      *  \param x The other \p cuda::vector to move from.
      *  \return <tt>*this</tt>
      */
-     vector &operator=(vector &&x);
-  #endif
+    vector &operator=(vector &&x);
 
     // XXX vector_base should take a Derived type so we don't have to define these superfluous assigns
     //
diff --git a/thrust/system/detail/adl/adjacent_difference.h b/thrust/system/detail/adl/adjacent_difference.h
index c6f6c7282..68bc08560 100644
--- a/thrust/system/detail/adl/adjacent_difference.h
+++ b/thrust/system/detail/adl/adjacent_difference.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/adjacent_difference.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/adjacent_difference.h>
-#include <thrust/system/cuda/detail/adjacent_difference.h>
-#include <thrust/system/omp/detail/adjacent_difference.h>
-#include <thrust/system/tbb/detail/adjacent_difference.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_ADJACENT_DIFFERENCE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/adjacent_difference.h>
 #include __THRUST_HOST_SYSTEM_ADJACENT_DIFFERENCE_HEADER
 #undef __THRUST_HOST_SYSTEM_ADJACENT_DIFFERENCE_HEADER
diff --git a/thrust/system/detail/adl/assign_value.h b/thrust/system/detail/adl/assign_value.h
index d38934aff..192e7ea36 100644
--- a/thrust/system/detail/adl/assign_value.h
+++ b/thrust/system/detail/adl/assign_value.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/assign_value.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/assign_value.h>
-#include <thrust/system/cuda/detail/assign_value.h>
-#include <thrust/system/omp/detail/assign_value.h>
-#include <thrust/system/tbb/detail/assign_value.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_ASSIGN_VALUE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/assign_value.h>
 #include __THRUST_HOST_SYSTEM_ASSIGN_VALUE_HEADER
 #undef __THRUST_HOST_SYSTEM_ASSIGN_VALUE_HEADER
diff --git a/thrust/system/detail/adl/binary_search.h b/thrust/system/detail/adl/binary_search.h
index 2f9ac06df..37fa75066 100644
--- a/thrust/system/detail/adl/binary_search.h
+++ b/thrust/system/detail/adl/binary_search.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/binary_search.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/binary_search.h>
-#include <thrust/system/cuda/detail/binary_search.h>
-#include <thrust/system/omp/detail/binary_search.h>
-#include <thrust/system/tbb/detail/binary_search.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_BINARY_SEARCH_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/binary_search.h>
 #include __THRUST_HOST_SYSTEM_BINARY_SEARCH_HEADER
 #undef __THRUST_HOST_SYSTEM_BINARY_SEARCH_HEADER
diff --git a/thrust/system/detail/adl/copy.h b/thrust/system/detail/adl/copy.h
index 0035b83ef..7201f5f8e 100644
--- a/thrust/system/detail/adl/copy.h
+++ b/thrust/system/detail/adl/copy.h
@@ -24,15 +24,6 @@
 
 #include <thrust/system/detail/sequential/copy.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/copy.h>
-#include <thrust/system/cuda/detail/copy.h>
-#include <thrust/system/omp/detail/copy.h>
-#include <thrust/system/tbb/detail/copy.h>
-#endif
 
 #define __THRUST_HOST_SYSTEM_COPY_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/copy.h>
 #include __THRUST_HOST_SYSTEM_COPY_HEADER
diff --git a/thrust/system/detail/adl/copy_if.h b/thrust/system/detail/adl/copy_if.h
index 31adaf8e1..7816599ea 100644
--- a/thrust/system/detail/adl/copy_if.h
+++ b/thrust/system/detail/adl/copy_if.h
@@ -24,15 +24,6 @@
 
 #include <thrust/system/detail/sequential/copy_if.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/copy_if.h>
-#include <thrust/system/cuda/detail/copy_if.h>
-#include <thrust/system/omp/detail/copy_if.h>
-#include <thrust/system/tbb/detail/copy_if.h>
-#endif
 
 #define __THRUST_HOST_SYSTEM_COPY_IF_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/copy_if.h>
 #include __THRUST_HOST_SYSTEM_COPY_IF_HEADER
diff --git a/thrust/system/detail/adl/count.h b/thrust/system/detail/adl/count.h
index 5d6f1f748..fb6f10669 100644
--- a/thrust/system/detail/adl/count.h
+++ b/thrust/system/detail/adl/count.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/count.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/count.h>
-#include <thrust/system/cuda/detail/count.h>
-#include <thrust/system/omp/detail/count.h>
-#include <thrust/system/tbb/detail/count.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_COUNT_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/count.h>
 #include __THRUST_HOST_SYSTEM_COUNT_HEADER
 #undef __THRUST_HOST_SYSTEM_COUNT_HEADER
diff --git a/thrust/system/detail/adl/equal.h b/thrust/system/detail/adl/equal.h
index 6b02e33b8..cbe673fa2 100644
--- a/thrust/system/detail/adl/equal.h
+++ b/thrust/system/detail/adl/equal.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/equal.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/equal.h>
-#include <thrust/system/cuda/detail/equal.h>
-#include <thrust/system/omp/detail/equal.h>
-#include <thrust/system/tbb/detail/equal.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_EQUAL_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/equal.h>
 #include __THRUST_HOST_SYSTEM_EQUAL_HEADER
 #undef __THRUST_HOST_SYSTEM_EQUAL_HEADER
diff --git a/thrust/system/detail/adl/extrema.h b/thrust/system/detail/adl/extrema.h
index 62fb39be9..2af0caffa 100644
--- a/thrust/system/detail/adl/extrema.h
+++ b/thrust/system/detail/adl/extrema.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/extrema.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/extrema.h>
-#include <thrust/system/cuda/detail/extrema.h>
-#include <thrust/system/omp/detail/extrema.h>
-#include <thrust/system/tbb/detail/extrema.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_EXTREMA_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/extrema.h>
 #include __THRUST_HOST_SYSTEM_EXTREMA_HEADER
 #undef __THRUST_HOST_SYSTEM_EXTREMA_HEADER
diff --git a/thrust/system/detail/adl/fill.h b/thrust/system/detail/adl/fill.h
index f76a81b4f..cbe33f7c9 100644
--- a/thrust/system/detail/adl/fill.h
+++ b/thrust/system/detail/adl/fill.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/fill.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/fill.h>
-#include <thrust/system/cuda/detail/fill.h>
-#include <thrust/system/omp/detail/fill.h>
-#include <thrust/system/tbb/detail/fill.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_FILL_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/fill.h>
 #include __THRUST_HOST_SYSTEM_FILL_HEADER
 #undef __THRUST_HOST_SYSTEM_FILL_HEADER
diff --git a/thrust/system/detail/adl/find.h b/thrust/system/detail/adl/find.h
index 8d85e09a3..89dbf468d 100644
--- a/thrust/system/detail/adl/find.h
+++ b/thrust/system/detail/adl/find.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/find.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/find.h>
-#include <thrust/system/cuda/detail/find.h>
-#include <thrust/system/omp/detail/find.h>
-#include <thrust/system/tbb/detail/find.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_FIND_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/find.h>
 #include __THRUST_HOST_SYSTEM_FIND_HEADER
 #undef __THRUST_HOST_SYSTEM_FIND_HEADER
diff --git a/thrust/system/detail/adl/for_each.h b/thrust/system/detail/adl/for_each.h
index 8509edca3..20dd8372e 100644
--- a/thrust/system/detail/adl/for_each.h
+++ b/thrust/system/detail/adl/for_each.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/for_each.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/for_each.h>
-#include <thrust/system/cuda/detail/for_each.h>
-#include <thrust/system/omp/detail/for_each.h>
-#include <thrust/system/tbb/detail/for_each.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_FOR_EACH_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/for_each.h>
 #include __THRUST_HOST_SYSTEM_FOR_EACH_HEADER
 #undef __THRUST_HOST_SYSTEM_FOR_EACH_HEADER
diff --git a/thrust/system/detail/adl/gather.h b/thrust/system/detail/adl/gather.h
index 242da3c90..7040f119a 100644
--- a/thrust/system/detail/adl/gather.h
+++ b/thrust/system/detail/adl/gather.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/gather.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/gather.h>
-#include <thrust/system/cuda/detail/gather.h>
-#include <thrust/system/omp/detail/gather.h>
-#include <thrust/system/tbb/detail/gather.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_GATHER_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/gather.h>
 #include __THRUST_HOST_SYSTEM_GATHER_HEADER
 #undef __THRUST_HOST_SYSTEM_GATHER_HEADER
diff --git a/thrust/system/detail/adl/generate.h b/thrust/system/detail/adl/generate.h
index 5b1d7b4ba..e19c4cd5e 100644
--- a/thrust/system/detail/adl/generate.h
+++ b/thrust/system/detail/adl/generate.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/generate.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/generate.h>
-#include <thrust/system/cuda/detail/generate.h>
-#include <thrust/system/omp/detail/generate.h>
-#include <thrust/system/tbb/detail/generate.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_GENERATE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/generate.h>
 #include __THRUST_HOST_SYSTEM_GENERATE_HEADER
 #undef __THRUST_HOST_SYSTEM_GENERATE_HEADER
diff --git a/thrust/system/detail/adl/get_value.h b/thrust/system/detail/adl/get_value.h
index 306eb423e..78bccfc4a 100644
--- a/thrust/system/detail/adl/get_value.h
+++ b/thrust/system/detail/adl/get_value.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/get_value.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/get_value.h>
-#include <thrust/system/cuda/detail/get_value.h>
-#include <thrust/system/omp/detail/get_value.h>
-#include <thrust/system/tbb/detail/get_value.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_GET_VALUE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/get_value.h>
 #include __THRUST_HOST_SYSTEM_GET_VALUE_HEADER
 #undef __THRUST_HOST_SYSTEM_GET_VALUE_HEADER
diff --git a/thrust/system/detail/adl/inner_product.h b/thrust/system/detail/adl/inner_product.h
index 9423b1bdb..fcefdf4c4 100644
--- a/thrust/system/detail/adl/inner_product.h
+++ b/thrust/system/detail/adl/inner_product.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/inner_product.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/inner_product.h>
-#include <thrust/system/cuda/detail/inner_product.h>
-#include <thrust/system/omp/detail/inner_product.h>
-#include <thrust/system/tbb/detail/inner_product.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_INNER_PRODUCT_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/inner_product.h>
 #include __THRUST_HOST_SYSTEM_INNER_PRODUCT_HEADER
 #undef __THRUST_HOST_SYSTEM_INNER_PRODUCT_HEADER
diff --git a/thrust/system/detail/adl/iter_swap.h b/thrust/system/detail/adl/iter_swap.h
index d9da52a62..8716a2ff0 100644
--- a/thrust/system/detail/adl/iter_swap.h
+++ b/thrust/system/detail/adl/iter_swap.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/iter_swap.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/iter_swap.h>
-#include <thrust/system/cuda/detail/iter_swap.h>
-#include <thrust/system/omp/detail/iter_swap.h>
-#include <thrust/system/tbb/detail/iter_swap.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_ITER_SWAP_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/iter_swap.h>
 #include __THRUST_HOST_SYSTEM_ITER_SWAP_HEADER
 #undef __THRUST_HOST_SYSTEM_ITER_SWAP_HEADER
diff --git a/thrust/system/detail/adl/logical.h b/thrust/system/detail/adl/logical.h
index bdaad4d29..313214e1a 100644
--- a/thrust/system/detail/adl/logical.h
+++ b/thrust/system/detail/adl/logical.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/logical.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/logical.h>
-#include <thrust/system/cuda/detail/logical.h>
-#include <thrust/system/omp/detail/logical.h>
-#include <thrust/system/tbb/detail/logical.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_LOGICAL_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/logical.h>
 #include __THRUST_HOST_SYSTEM_LOGICAL_HEADER
 #undef __THRUST_HOST_SYSTEM_LOGICAL_HEADER
diff --git a/thrust/system/detail/adl/malloc_and_free.h b/thrust/system/detail/adl/malloc_and_free.h
index c36db0270..1d36e8c50 100644
--- a/thrust/system/detail/adl/malloc_and_free.h
+++ b/thrust/system/detail/adl/malloc_and_free.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/malloc_and_free.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/malloc_and_free.h>
-#include <thrust/system/cuda/detail/malloc_and_free.h>
-#include <thrust/system/omp/detail/malloc_and_free.h>
-#include <thrust/system/tbb/detail/malloc_and_free.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_MALLOC_AND_FREE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/malloc_and_free.h>
 #include __THRUST_HOST_SYSTEM_MALLOC_AND_FREE_HEADER
 #undef __THRUST_HOST_SYSTEM_MALLOC_AND_FREE_HEADER
diff --git a/thrust/system/detail/adl/merge.h b/thrust/system/detail/adl/merge.h
index 7abca9bcf..ac6b7f3e3 100644
--- a/thrust/system/detail/adl/merge.h
+++ b/thrust/system/detail/adl/merge.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/merge.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/merge.h>
-#include <thrust/system/cuda/detail/merge.h>
-#include <thrust/system/omp/detail/merge.h>
-#include <thrust/system/tbb/detail/merge.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_MERGE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/merge.h>
 #include __THRUST_HOST_SYSTEM_MERGE_HEADER
 #undef __THRUST_HOST_SYSTEM_MERGE_HEADER
diff --git a/thrust/system/detail/adl/mismatch.h b/thrust/system/detail/adl/mismatch.h
index 74feb8269..03b4e4abb 100644
--- a/thrust/system/detail/adl/mismatch.h
+++ b/thrust/system/detail/adl/mismatch.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/mismatch.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/mismatch.h>
-#include <thrust/system/cuda/detail/mismatch.h>
-#include <thrust/system/omp/detail/mismatch.h>
-#include <thrust/system/tbb/detail/mismatch.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_MISMATCH_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/mismatch.h>
 #include __THRUST_HOST_SYSTEM_MISMATCH_HEADER
 #undef __THRUST_HOST_SYSTEM_MISMATCH_HEADER
diff --git a/thrust/system/detail/adl/partition.h b/thrust/system/detail/adl/partition.h
index a45f845a5..1ce31b6d6 100644
--- a/thrust/system/detail/adl/partition.h
+++ b/thrust/system/detail/adl/partition.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/partition.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/partition.h>
-#include <thrust/system/cuda/detail/partition.h>
-#include <thrust/system/omp/detail/partition.h>
-#include <thrust/system/tbb/detail/partition.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_PARTITION_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/partition.h>
 #include __THRUST_HOST_SYSTEM_PARTITION_HEADER
 #undef __THRUST_HOST_SYSTEM_PARTITION_HEADER
diff --git a/thrust/system/detail/adl/per_device_resource.h b/thrust/system/detail/adl/per_device_resource.h
index 721f49e03..566465346 100644
--- a/thrust/system/detail/adl/per_device_resource.h
+++ b/thrust/system/detail/adl/per_device_resource.h
@@ -24,13 +24,6 @@
 
 #include <thrust/system/detail/sequential/per_device_resource.h>
 
-#if 0
-#include <thrust/system/cpp/detail/per_device_resource.h>
-#include <thrust/system/cuda/detail/per_device_resource.h>
-#include <thrust/system/omp/detail/per_device_resource.h>
-#include <thrust/system/tbb/detail/per_device_resource.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_PER_DEVICE_RESOURCE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/per_device_resource.h>
 #include __THRUST_HOST_SYSTEM_PER_DEVICE_RESOURCE_HEADER
 #undef __THRUST_HOST_SYSTEM_PER_DEVICE_RESOURCE_HEADER
diff --git a/thrust/system/detail/adl/reduce.h b/thrust/system/detail/adl/reduce.h
index 8a9673b3f..8bbe623b5 100644
--- a/thrust/system/detail/adl/reduce.h
+++ b/thrust/system/detail/adl/reduce.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/reduce.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/reduce.h>
-#include <thrust/system/cuda/detail/reduce.h>
-#include <thrust/system/omp/detail/reduce.h>
-#include <thrust/system/tbb/detail/reduce.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_REDUCE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/reduce.h>
 #include __THRUST_HOST_SYSTEM_REDUCE_HEADER
 #undef __THRUST_HOST_SYSTEM_REDUCE_HEADER
diff --git a/thrust/system/detail/adl/reduce_by_key.h b/thrust/system/detail/adl/reduce_by_key.h
index 0605f9bef..0ce1c78ec 100644
--- a/thrust/system/detail/adl/reduce_by_key.h
+++ b/thrust/system/detail/adl/reduce_by_key.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/reduce_by_key.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/reduce_by_key.h>
-#include <thrust/system/cuda/detail/reduce_by_key.h>
-#include <thrust/system/omp/detail/reduce_by_key.h>
-#include <thrust/system/tbb/detail/reduce_by_key.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_REDUCE_BY_KEY_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/reduce_by_key.h>
 #include __THRUST_HOST_SYSTEM_REDUCE_BY_KEY_HEADER
 #undef __THRUST_HOST_SYSTEM_REDUCE_BY_KEY_HEADER
diff --git a/thrust/system/detail/adl/remove.h b/thrust/system/detail/adl/remove.h
index c281379d5..5aaf06280 100644
--- a/thrust/system/detail/adl/remove.h
+++ b/thrust/system/detail/adl/remove.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/remove.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/remove.h>
-#include <thrust/system/cuda/detail/remove.h>
-#include <thrust/system/omp/detail/remove.h>
-#include <thrust/system/tbb/detail/remove.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_REMOVE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/remove.h>
 #include __THRUST_HOST_SYSTEM_REMOVE_HEADER
 #undef __THRUST_HOST_SYSTEM_REMOVE_HEADER
diff --git a/thrust/system/detail/adl/replace.h b/thrust/system/detail/adl/replace.h
index d8fb5746f..6a73c9c62 100644
--- a/thrust/system/detail/adl/replace.h
+++ b/thrust/system/detail/adl/replace.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/replace.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/replace.h>
-#include <thrust/system/cuda/detail/replace.h>
-#include <thrust/system/omp/detail/replace.h>
-#include <thrust/system/tbb/detail/replace.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_REPLACE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/replace.h>
 #include __THRUST_HOST_SYSTEM_REPLACE_HEADER
 #undef __THRUST_HOST_SYSTEM_REPLACE_HEADER
diff --git a/thrust/system/detail/adl/reverse.h b/thrust/system/detail/adl/reverse.h
index f6bd8947e..64b2f8e28 100644
--- a/thrust/system/detail/adl/reverse.h
+++ b/thrust/system/detail/adl/reverse.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/reverse.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/reverse.h>
-#include <thrust/system/cuda/detail/reverse.h>
-#include <thrust/system/omp/detail/reverse.h>
-#include <thrust/system/tbb/detail/reverse.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_REVERSE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/reverse.h>
 #include __THRUST_HOST_SYSTEM_REVERSE_HEADER
 #undef __THRUST_HOST_SYSTEM_REVERSE_HEADER
diff --git a/thrust/system/detail/adl/scan.h b/thrust/system/detail/adl/scan.h
index a24910410..a4ded752b 100644
--- a/thrust/system/detail/adl/scan.h
+++ b/thrust/system/detail/adl/scan.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/scan.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/scan.h>
-#include <thrust/system/cuda/detail/scan.h>
-#include <thrust/system/omp/detail/scan.h>
-#include <thrust/system/tbb/detail/scan.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SCAN_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/scan.h>
 #include __THRUST_HOST_SYSTEM_SCAN_HEADER
 #undef __THRUST_HOST_SYSTEM_SCAN_HEADER
diff --git a/thrust/system/detail/adl/scan_by_key.h b/thrust/system/detail/adl/scan_by_key.h
index 94f73503c..d15351193 100644
--- a/thrust/system/detail/adl/scan_by_key.h
+++ b/thrust/system/detail/adl/scan_by_key.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/scan_by_key.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/scan_by_key.h>
-#include <thrust/system/cuda/detail/scan_by_key.h>
-#include <thrust/system/omp/detail/scan_by_key.h>
-#include <thrust/system/tbb/detail/scan_by_key.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SCAN_BY_KEY_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/scan_by_key.h>
 #include __THRUST_HOST_SYSTEM_SCAN_BY_KEY_HEADER
 #undef __THRUST_HOST_SYSTEM_SCAN_BY_KEY_HEADER
diff --git a/thrust/system/detail/adl/scatter.h b/thrust/system/detail/adl/scatter.h
index d9f42b28b..064bca452 100644
--- a/thrust/system/detail/adl/scatter.h
+++ b/thrust/system/detail/adl/scatter.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/scatter.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/scatter.h>
-#include <thrust/system/cuda/detail/scatter.h>
-#include <thrust/system/omp/detail/scatter.h>
-#include <thrust/system/tbb/detail/scatter.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SCATTER_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/scatter.h>
 #include __THRUST_HOST_SYSTEM_SCATTER_HEADER
 #undef __THRUST_HOST_SYSTEM_SCATTER_HEADER
diff --git a/thrust/system/detail/adl/sequence.h b/thrust/system/detail/adl/sequence.h
index d3c2a20f4..7d580a7f5 100644
--- a/thrust/system/detail/adl/sequence.h
+++ b/thrust/system/detail/adl/sequence.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/sequence.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/sequence.h>
-#include <thrust/system/cuda/detail/sequence.h>
-#include <thrust/system/omp/detail/sequence.h>
-#include <thrust/system/tbb/detail/sequence.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SEQUENCE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/sequence.h>
 #include __THRUST_HOST_SYSTEM_SEQUENCE_HEADER
 #undef __THRUST_HOST_SYSTEM_SEQUENCE_HEADER
diff --git a/thrust/system/detail/adl/set_operations.h b/thrust/system/detail/adl/set_operations.h
index 7d09355e1..9917fbed6 100644
--- a/thrust/system/detail/adl/set_operations.h
+++ b/thrust/system/detail/adl/set_operations.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/set_operations.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/set_operations.h>
-#include <thrust/system/cuda/detail/set_operations.h>
-#include <thrust/system/omp/detail/set_operations.h>
-#include <thrust/system/tbb/detail/set_operations.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SET_OPERATIONS_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/set_operations.h>
 #include __THRUST_HOST_SYSTEM_SET_OPERATIONS_HEADER
 #undef __THRUST_HOST_SYSTEM_SET_OPERATIONS_HEADER
diff --git a/thrust/system/detail/adl/sort.h b/thrust/system/detail/adl/sort.h
index 1f6118c90..e45e162e6 100644
--- a/thrust/system/detail/adl/sort.h
+++ b/thrust/system/detail/adl/sort.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/sort.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/sort.h>
-#include <thrust/system/cuda/detail/sort.h>
-#include <thrust/system/omp/detail/sort.h>
-#include <thrust/system/tbb/detail/sort.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SORT_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/sort.h>
 #include __THRUST_HOST_SYSTEM_SORT_HEADER
 #undef __THRUST_HOST_SYSTEM_SORT_HEADER
diff --git a/thrust/system/detail/adl/swap_ranges.h b/thrust/system/detail/adl/swap_ranges.h
index 1ca3719d9..e053e3b8e 100644
--- a/thrust/system/detail/adl/swap_ranges.h
+++ b/thrust/system/detail/adl/swap_ranges.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/swap_ranges.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/swap_ranges.h>
-#include <thrust/system/cuda/detail/swap_ranges.h>
-#include <thrust/system/omp/detail/swap_ranges.h>
-#include <thrust/system/tbb/detail/swap_ranges.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_SWAP_RANGES_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/swap_ranges.h>
 #include __THRUST_HOST_SYSTEM_SWAP_RANGES_HEADER
 #undef __THRUST_HOST_SYSTEM_SWAP_RANGES_HEADER
diff --git a/thrust/system/detail/adl/tabulate.h b/thrust/system/detail/adl/tabulate.h
index 6ae2b22a5..5f7b3de6e 100644
--- a/thrust/system/detail/adl/tabulate.h
+++ b/thrust/system/detail/adl/tabulate.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/tabulate.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/tabulate.h>
-#include <thrust/system/cuda/detail/tabulate.h>
-#include <thrust/system/omp/detail/tabulate.h>
-#include <thrust/system/tbb/detail/tabulate.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_TABULATE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/tabulate.h>
 #include __THRUST_HOST_SYSTEM_TABULATE_HEADER
 #undef __THRUST_HOST_SYSTEM_TABULATE_HEADER
diff --git a/thrust/system/detail/adl/temporary_buffer.h b/thrust/system/detail/adl/temporary_buffer.h
index 0cada5ee4..60f2613c6 100644
--- a/thrust/system/detail/adl/temporary_buffer.h
+++ b/thrust/system/detail/adl/temporary_buffer.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/temporary_buffer.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/temporary_buffer.h>
-#include <thrust/system/cuda/detail/temporary_buffer.h>
-#include <thrust/system/omp/detail/temporary_buffer.h>
-#include <thrust/system/tbb/detail/temporary_buffer.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_TEMPORARY_BUFFER_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/temporary_buffer.h>
 #include __THRUST_HOST_SYSTEM_TEMPORARY_BUFFER_HEADER
 #undef __THRUST_HOST_SYSTEM_TEMPORARY_BUFFER_HEADER
diff --git a/thrust/system/detail/adl/transform.h b/thrust/system/detail/adl/transform.h
index b70333093..a7edeb16e 100644
--- a/thrust/system/detail/adl/transform.h
+++ b/thrust/system/detail/adl/transform.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/transform.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/transform.h>
-#include <thrust/system/cuda/detail/transform.h>
-#include <thrust/system/omp/detail/transform.h>
-#include <thrust/system/tbb/detail/transform.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_TRANSFORM_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/transform.h>
 #include __THRUST_HOST_SYSTEM_TRANSFORM_HEADER
 #undef __THRUST_HOST_SYSTEM_TRANSFORM_HEADER
diff --git a/thrust/system/detail/adl/transform_reduce.h b/thrust/system/detail/adl/transform_reduce.h
index e3f9494df..d2eba6b4c 100644
--- a/thrust/system/detail/adl/transform_reduce.h
+++ b/thrust/system/detail/adl/transform_reduce.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/transform_reduce.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/transform_reduce.h>
-#include <thrust/system/cuda/detail/transform_reduce.h>
-#include <thrust/system/omp/detail/transform_reduce.h>
-#include <thrust/system/tbb/detail/transform_reduce.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_TRANSFORM_REDUCE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/transform_reduce.h>
 #include __THRUST_HOST_SYSTEM_TRANSFORM_REDUCE_HEADER
 #undef __THRUST_HOST_SYSTEM_TRANSFORM_REDUCE_HEADER
diff --git a/thrust/system/detail/adl/transform_scan.h b/thrust/system/detail/adl/transform_scan.h
index 3a05c7eee..80d0ae2c7 100644
--- a/thrust/system/detail/adl/transform_scan.h
+++ b/thrust/system/detail/adl/transform_scan.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/transform_scan.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/transform_scan.h>
-#include <thrust/system/cuda/detail/transform_scan.h>
-#include <thrust/system/omp/detail/transform_scan.h>
-#include <thrust/system/tbb/detail/transform_scan.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_TRANSFORM_SCAN_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/transform_scan.h>
 #include __THRUST_HOST_SYSTEM_TRANSFORM_SCAN_HEADER
 #undef __THRUST_HOST_SYSTEM_TRANSFORM_SCAN_HEADER
diff --git a/thrust/system/detail/adl/uninitialized_copy.h b/thrust/system/detail/adl/uninitialized_copy.h
index a13b18aa8..e2ef4ca38 100644
--- a/thrust/system/detail/adl/uninitialized_copy.h
+++ b/thrust/system/detail/adl/uninitialized_copy.h
@@ -24,15 +24,6 @@
 
 #include <thrust/system/detail/sequential/uninitialized_copy.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/uninitialized_copy.h>
-#include <thrust/system/cuda/detail/uninitialized_copy.h>
-#include <thrust/system/omp/detail/uninitialized_copy.h>
-#include <thrust/system/tbb/detail/uninitialized_copy.h>
-#endif
 
 #define __THRUST_HOST_SYSTEM_UNINITIALIZED_COPY_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/uninitialized_copy.h>
 #include __THRUST_HOST_SYSTEM_UNINITIALIZED_COPY_HEADER
diff --git a/thrust/system/detail/adl/uninitialized_fill.h b/thrust/system/detail/adl/uninitialized_fill.h
index 98b57836e..045b86f54 100644
--- a/thrust/system/detail/adl/uninitialized_fill.h
+++ b/thrust/system/detail/adl/uninitialized_fill.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/uninitialized_fill.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/uninitialized_fill.h>
-#include <thrust/system/cuda/detail/uninitialized_fill.h>
-#include <thrust/system/omp/detail/uninitialized_fill.h>
-#include <thrust/system/tbb/detail/uninitialized_fill.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_UNINITIALIZED_FILL_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/uninitialized_fill.h>
 #include __THRUST_HOST_SYSTEM_UNINITIALIZED_FILL_HEADER
 #undef __THRUST_HOST_SYSTEM_UNINITIALIZED_FILL_HEADER
diff --git a/thrust/system/detail/adl/unique.h b/thrust/system/detail/adl/unique.h
index 4082f5299..9f2b0692c 100644
--- a/thrust/system/detail/adl/unique.h
+++ b/thrust/system/detail/adl/unique.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/unique.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/unique.h>
-#include <thrust/system/cuda/detail/unique.h>
-#include <thrust/system/omp/detail/unique.h>
-#include <thrust/system/tbb/detail/unique.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_UNIQUE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/unique.h>
 #include __THRUST_HOST_SYSTEM_UNIQUE_HEADER
 #undef __THRUST_HOST_SYSTEM_UNIQUE_HEADER
diff --git a/thrust/system/detail/adl/unique_by_key.h b/thrust/system/detail/adl/unique_by_key.h
index dcf9acd42..685d8df62 100644
--- a/thrust/system/detail/adl/unique_by_key.h
+++ b/thrust/system/detail/adl/unique_by_key.h
@@ -24,16 +24,6 @@
 
 #include <thrust/system/detail/sequential/unique_by_key.h>
 
-// SCons can't see through the #defines below to figure out what this header
-// includes, so we fake it out by specifying all possible files we might end up
-// including inside an #if 0.
-#if 0
-#include <thrust/system/cpp/detail/unique_by_key.h>
-#include <thrust/system/cuda/detail/unique_by_key.h>
-#include <thrust/system/omp/detail/unique_by_key.h>
-#include <thrust/system/tbb/detail/unique_by_key.h>
-#endif
-
 #define __THRUST_HOST_SYSTEM_UNIQUE_BY_KEY_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/unique_by_key.h>
 #include __THRUST_HOST_SYSTEM_UNIQUE_BY_KEY_HEADER
 #undef __THRUST_HOST_SYSTEM_UNIQUE_BY_KEY_HEADER
diff --git a/thrust/system/detail/generic/shuffle.h b/thrust/system/detail/generic/shuffle.h
index a690c11c5..0f2eadb22 100644
--- a/thrust/system/detail/generic/shuffle.h
+++ b/thrust/system/detail/generic/shuffle.h
@@ -22,9 +22,6 @@
 
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/system/detail/generic/tag.h>
 
@@ -51,4 +48,3 @@ __host__ __device__ void shuffle_copy(
 
 #include <thrust/system/detail/generic/shuffle.inl>
 
-#endif
diff --git a/thrust/system/detail/generic/shuffle.inl b/thrust/system/detail/generic/shuffle.inl
index 80b45dc02..7c60f5865 100644
--- a/thrust/system/detail/generic/shuffle.inl
+++ b/thrust/system/detail/generic/shuffle.inl
@@ -15,9 +15,6 @@
  */
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/discard_iterator.h>
@@ -210,4 +207,3 @@ __host__ __device__ void shuffle_copy(
 }  // end namespace detail
 }  // end namespace system
 }  // end namespace thrust
-#endif
diff --git a/thrust/system/detail/sequential/execution_policy.h b/thrust/system/detail/sequential/execution_policy.h
index 81d52f140..b1f526b19 100644
--- a/thrust/system/detail/sequential/execution_policy.h
+++ b/thrust/system/detail/sequential/execution_policy.h
@@ -50,7 +50,7 @@ template<>
 // tag's definition comes before the generic definition of execution_policy
 struct tag : execution_policy<tag>
 {
-  __host__ __device__ THRUST_CONSTEXPR tag() {}
+  __host__ __device__ constexpr tag() {}
 };
 
 // allow conversion to tag when it is not a successor
diff --git a/thrust/system/omp/detail/par.h b/thrust/system/omp/detail/par.h
index fa88b2ccd..1d38df2cf 100644
--- a/thrust/system/omp/detail/par.h
+++ b/thrust/system/omp/detail/par.h
@@ -35,7 +35,7 @@ struct par_t : thrust::system::omp::detail::execution_policy<par_t>,
     thrust::system::omp::detail::execution_policy>
 {
   __host__ __device__
-  THRUST_CONSTEXPR par_t() : thrust::system::omp::detail::execution_policy<par_t>() {}
+  constexpr par_t() : thrust::system::omp::detail::execution_policy<par_t>() {}
 };
 
 
diff --git a/thrust/system/omp/detail/vector.inl b/thrust/system/omp/detail/vector.inl
index 3e08615f8..7104cc565 100644
--- a/thrust/system/omp/detail/vector.inl
+++ b/thrust/system/omp/detail/vector.inl
@@ -51,13 +51,11 @@ template<typename T, typename Allocator>
       : super_t(x)
 {}
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator>
-      ::vector(vector &&x)
-        : super_t(std::move(x))
-  {}
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(vector &&x)
+      : super_t(std::move(x))
+{}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -89,16 +87,14 @@ template<typename T, typename Allocator>
   return *this;
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator> &
-      vector<T,Allocator>
-        ::operator=(vector &&x)
-  {
-    super_t::operator=(std::move(x));
-    return *this;
-  }
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator> &
+    vector<T,Allocator>
+      ::operator=(vector &&x)
+{
+  super_t::operator=(std::move(x));
+  return *this;
+}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -119,7 +115,7 @@ template<typename T, typename Allocator>
   super_t::operator=(x);
   return *this;
 }
-      
+
 } // end omp
 } // end system
 } // end thrust
diff --git a/thrust/system/omp/memory.h b/thrust/system/omp/memory.h
index aa2bfd20c..25fc30e66 100644
--- a/thrust/system/omp/memory.h
+++ b/thrust/system/omp/memory.h
@@ -118,9 +118,7 @@ template<typename T>
   __host__ __device__
   inline allocator(const allocator<U> & other) : base(other) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   allocator & operator=(const allocator &) = default;
-#endif
 
   /*! Destructor has no effect.
    */
diff --git a/thrust/system/omp/pointer.h b/thrust/system/omp/pointer.h
index 36b6bed12..c71abffcc 100644
--- a/thrust/system/omp/pointer.h
+++ b/thrust/system/omp/pointer.h
@@ -168,12 +168,10 @@ template<typename T>
     __host__ __device__
     pointer() : super_t() {}
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     pointer(decltype(nullptr)) : super_t(nullptr) {}
-    #endif
 
     /*! This constructor allows construction of a <tt>pointer<const T></tt> from a <tt>T*</tt>.
      *
@@ -232,7 +230,6 @@ template<typename T>
       return super_t::operator=(other);
     }
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
@@ -241,7 +238,6 @@ template<typename T>
       super_t::operator=(nullptr);
       return *this;
     }
-    #endif
 }; // end pointer
 
 
diff --git a/thrust/system/omp/vector.h b/thrust/system/omp/vector.h
index 223ce4935..841f5b5e7 100644
--- a/thrust/system/omp/vector.h
+++ b/thrust/system/omp/vector.h
@@ -96,12 +96,10 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor moves another \p omp::vector.
      *  \param x The other \p omp::vector to move from.
      */
     vector(vector &&x);
-  #endif
 
     /*! This constructor copies from another Thrust vector-like object.
      *  \param x The other object to copy from.
@@ -128,15 +126,13 @@ template<typename T, typename Allocator = allocator<T> >
     *  \param x The other object to assign from.
     *  \return <tt>*this</tt>
     */
-   vector &operator=(const vector &x);
+    vector &operator=(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assignment operator moves another \p omp::vector.
      *  \param x The other \p omp::vector to move.
      *  \return <tt>*this</tt>
      */
-     vector &operator=(vector &&x);
-  #endif
+    vector &operator=(vector &&x);
 
     /*! Assignment operator assigns from a \c std::vector.
      *  \param x The \c std::vector to assign from.
diff --git a/thrust/system/tbb/detail/par.h b/thrust/system/tbb/detail/par.h
index a5d9c14cd..daabb537e 100644
--- a/thrust/system/tbb/detail/par.h
+++ b/thrust/system/tbb/detail/par.h
@@ -35,7 +35,7 @@ struct par_t : thrust::system::tbb::detail::execution_policy<par_t>,
     thrust::system::tbb::detail::execution_policy>
 {
   __host__ __device__
-  THRUST_CONSTEXPR par_t() : thrust::system::tbb::detail::execution_policy<par_t>() {}
+  constexpr par_t() : thrust::system::tbb::detail::execution_policy<par_t>() {}
 };
 
 
diff --git a/thrust/system/tbb/detail/vector.inl b/thrust/system/tbb/detail/vector.inl
index 5d9cb1c09..4370a1e40 100644
--- a/thrust/system/tbb/detail/vector.inl
+++ b/thrust/system/tbb/detail/vector.inl
@@ -51,13 +51,11 @@ template<typename T, typename Allocator>
       : super_t(x)
   {}
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator>
-      ::vector(vector &&x)
-        : super_t(std::move(x))
-  {}
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(vector &&x)
+      : super_t(std::move(x))
+{}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -89,16 +87,14 @@ template<typename T, typename Allocator>
   return *this;
 }
 
-#if THRUST_CPP_DIALECT >= 2011
-  template<typename T, typename Allocator>
-    vector<T,Allocator> &
-      vector<T,Allocator>
-        ::operator=(vector &&x)
-  {
-    super_t::operator=(std::move(x));
-    return *this;
-  }
-#endif
+template<typename T, typename Allocator>
+  vector<T,Allocator> &
+    vector<T,Allocator>
+      ::operator=(vector &&x)
+{
+  super_t::operator=(std::move(x));
+  return *this;
+}
 
 template<typename T, typename Allocator>
   template<typename OtherT, typename OtherAllocator>
@@ -119,7 +115,7 @@ template<typename T, typename Allocator>
   super_t::operator=(x);
   return *this;
 }
-    
+
 } // end tbb
 } // end system
 } // end thrust
diff --git a/thrust/system/tbb/memory.h b/thrust/system/tbb/memory.h
index f110410b2..98f3b00f8 100644
--- a/thrust/system/tbb/memory.h
+++ b/thrust/system/tbb/memory.h
@@ -118,9 +118,7 @@ template<typename T>
   __host__ __device__
   inline allocator(const allocator<U> & other) : base(other) {}
 
-#if THRUST_CPP_DIALECT >= 2011
   allocator & operator=(const allocator &) = default;
-#endif
 
   /*! Destructor has no effect.
    */
diff --git a/thrust/system/tbb/pointer.h b/thrust/system/tbb/pointer.h
index d2912508a..9e1ed1be8 100644
--- a/thrust/system/tbb/pointer.h
+++ b/thrust/system/tbb/pointer.h
@@ -162,12 +162,10 @@ template<typename T>
     __host__ __device__
     pointer() : super_t() {}
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
     pointer(decltype(nullptr)) : super_t(nullptr) {}
-    #endif
 
     /*! This constructor allows construction of a <tt>pointer<const T></tt> from a <tt>T*</tt>.
      *
@@ -226,7 +224,6 @@ template<typename T>
       return super_t::operator=(other);
     }
 
-    #if THRUST_CPP_DIALECT >= 2011
     // NOTE: This is needed so that Thrust smart pointers can be used in
     // `std::unique_ptr`.
     __host__ __device__
@@ -235,7 +232,6 @@ template<typename T>
       super_t::operator=(nullptr);
       return *this;
     }
-    #endif
 }; // end pointer
 
 
diff --git a/thrust/system/tbb/vector.h b/thrust/system/tbb/vector.h
index 9e12cdc09..41bf9e966 100644
--- a/thrust/system/tbb/vector.h
+++ b/thrust/system/tbb/vector.h
@@ -91,12 +91,10 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move constructor use the move semantic over another \p tbb::vector.
      *  \param x The other \p tbb::vector to move from.
      */
     vector(vector &&x);
-  #endif
 
     /*! This constructor copies from another Thrust vector-like object.
      *  \param x The other object to copy from.
@@ -125,13 +123,11 @@ template<typename T, typename Allocator = allocator<T> >
      */
     vector &operator=(const vector &x);
 
-  #if THRUST_CPP_DIALECT >= 2011
     /*! Move assignment operator use move semantic over another \p tbb::vector.
      *  \param x The other \p tbb::vector to move from.
      *  \return <tt>*this</tt>
      */
-     vector &operator=(vector &&x);
-  #endif
+    vector &operator=(vector &&x);
 
     /*! Assignment operator assigns from a \c std::vector.
      *  \param x The \c std::vector to assign from.
diff --git a/thrust/type_traits/integer_sequence.h b/thrust/type_traits/integer_sequence.h
index e28e4f95c..6939271cd 100644
--- a/thrust/type_traits/integer_sequence.h
+++ b/thrust/type_traits/integer_sequence.h
@@ -14,9 +14,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <type_traits>
 #include <utility>
@@ -167,11 +164,11 @@ template <typename T, std::size_t N>
 struct make_reversed_integer_sequence_impl;
 
 // Add a new element to the front of an integer_sequence<>.
-template <typename T, T I, typename Sequence> 
+template <typename T, T I, typename Sequence>
 struct integer_sequence_push_front_impl;
 
 // Add a new element to the back of an integer_sequence<>.
-template <typename T, T I, typename Sequence> 
+template <typename T, T I, typename Sequence>
 struct integer_sequence_push_back_impl;
 
 }
@@ -189,12 +186,12 @@ using make_reversed_index_sequence =
   make_reversed_integer_sequence<std::size_t, N>;
 
 // Add a new element to the front of an integer_sequence<>.
-template <typename T, T I, typename Sequence> 
+template <typename T, T I, typename Sequence>
 using integer_sequence_push_front =
   typename detail::integer_sequence_push_front_impl<T, I, Sequence>::type;
 
 // Add a new element to the back of an integer_sequence<>.
-template <typename T, T I, typename Sequence> 
+template <typename T, T I, typename Sequence>
 using integer_sequence_push_back =
   typename detail::integer_sequence_push_back_impl<T, I, Sequence>::type;
 
@@ -238,7 +235,7 @@ struct make_reversed_integer_sequence_impl<T, 1>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-template <typename T, T I0, T... Is> 
+template <typename T, T I0, T... Is>
 struct integer_sequence_push_front_impl<T, I0, integer_sequence<T, Is...> >
 {
   using type = integer_sequence<T, I0, Is...>;
@@ -246,7 +243,7 @@ struct integer_sequence_push_front_impl<T, I0, integer_sequence<T, Is...> >
 
 ///////////////////////////////////////////////////////////////////////////////
 
-template <typename T, T I0, T... Is> 
+template <typename T, T I0, T... Is>
 struct integer_sequence_push_back_impl<T, I0, integer_sequence<T, Is...> >
 {
   using type = integer_sequence<T, Is..., I0>;
@@ -258,5 +255,3 @@ struct integer_sequence_push_back_impl<T, I0, integer_sequence<T, Is...> >
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/type_traits/is_contiguous_iterator.h b/thrust/type_traits/is_contiguous_iterator.h
index 3e075bd28..3341bdc63 100644
--- a/thrust/type_traits/is_contiguous_iterator.h
+++ b/thrust/type_traits/is_contiguous_iterator.h
@@ -54,15 +54,8 @@ struct is_contiguous_iterator_impl;
 /// e.g. it points to elements that are contiguous in memory, and \c false_type
 /// otherwise.
 template <typename Iterator>
-#if THRUST_CPP_DIALECT >= 2011
 using is_contiguous_iterator =
-#else
-struct is_contiguous_iterator :
-#endif
   detail::is_contiguous_iterator_impl<Iterator>
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
diff --git a/thrust/type_traits/is_execution_policy.h b/thrust/type_traits/is_execution_policy.h
index 3f2f7ef80..7f478c726 100644
--- a/thrust/type_traits/is_execution_policy.h
+++ b/thrust/type_traits/is_execution_policy.h
@@ -27,15 +27,8 @@ namespace thrust
 /// Unary metafunction that is \c true if \c T is an \a ExecutionPolicy and
 /// \c false otherwise.
 template <typename T>
-#if THRUST_CPP_DIALECT >= 2011
 using is_execution_policy =
-#else
-struct is_execution_policy :
-#endif
   detail::is_base_of<detail::execution_policy_marker, T>
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 /// <CODE>constexpr bool</CODE> that is \c true if \c T is an \a ExecutionPolicy
diff --git a/thrust/type_traits/is_operator_less_or_greater_function_object.h b/thrust/type_traits/is_operator_less_or_greater_function_object.h
index 6efc00223..74f4d3703 100644
--- a/thrust/type_traits/is_operator_less_or_greater_function_object.h
+++ b/thrust/type_traits/is_operator_less_or_greater_function_object.h
@@ -44,15 +44,8 @@ struct is_operator_greater_function_object_impl;
 /// Unary metafunction returns \c true_type if \c FunctionObject is equivalent
 /// to \c operator<, and \c false_type otherwise.
 template <typename FunctionObject>
-#if THRUST_CPP_DIALECT >= 2011
 using is_operator_less_function_object =
-#else
-struct is_operator_less_function_object :
-#endif
   detail::is_operator_less_function_object_impl<FunctionObject>
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
@@ -66,15 +59,8 @@ constexpr bool is_operator_less_function_object_v
 /// Unary metafunction returns \c true_type if \c FunctionObject is equivalent
 /// to \c operator>, and \c false_type otherwise.
 template <typename FunctionObject>
-#if THRUST_CPP_DIALECT >= 2011
 using is_operator_greater_function_object =
-#else
-struct is_operator_greater_function_object :
-#endif
   detail::is_operator_greater_function_object_impl<FunctionObject>
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
@@ -88,19 +74,12 @@ constexpr bool is_operator_greater_function_object_v
 /// Unary metafunction returns \c true_type if \c FunctionObject is equivalent
 /// to either \c operator<, and \c false_type otherwise.
 template <typename FunctionObject>
-#if THRUST_CPP_DIALECT >= 2011
 using is_operator_less_or_greater_function_object =
-#else
-struct is_operator_less_or_greater_function_object :
-#endif
   integral_constant<
-    bool 
+    bool
   ,    detail::is_operator_less_function_object_impl<FunctionObject>::value
     || detail::is_operator_greater_function_object_impl<FunctionObject>::value
   >
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
diff --git a/thrust/type_traits/is_operator_plus_function_object.h b/thrust/type_traits/is_operator_plus_function_object.h
index 0b2ebb107..73577d0e5 100644
--- a/thrust/type_traits/is_operator_plus_function_object.h
+++ b/thrust/type_traits/is_operator_plus_function_object.h
@@ -40,15 +40,8 @@ struct is_operator_plus_function_object_impl;
 /// Unary metafunction returns \c true_type if \c FunctionObject is equivalent
 /// to \c operator<, and \c false_type otherwise.
 template <typename FunctionObject>
-#if THRUST_CPP_DIALECT >= 2011
 using is_operator_plus_function_object =
-#else
-struct is_operator_plus_function_object :
-#endif
   detail::is_operator_plus_function_object_impl<FunctionObject>
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
diff --git a/thrust/type_traits/is_trivially_relocatable.h b/thrust/type_traits/is_trivially_relocatable.h
index de38735d2..094313dcf 100644
--- a/thrust/type_traits/is_trivially_relocatable.h
+++ b/thrust/type_traits/is_trivially_relocatable.h
@@ -18,9 +18,7 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
-#if THRUST_CPP_DIALECT >= 2011
-  #include <type_traits>
-#endif
+#include <type_traits>
 
 namespace thrust
 {
@@ -33,20 +31,11 @@ struct is_trivially_relocatable_impl;
 
 } // namespace detail
 
-/// Unary metafunction returns \c true_type if \c T is \a TriviallyRelocatable, 
+/// Unary metafunction returns \c true_type if \c T is \a TriviallyRelocatable,
 /// e.g. can be bitwise copied (with a facility like \c memcpy), and
 /// \c false_type otherwise.
 template <typename T>
-#if THRUST_CPP_DIALECT >= 2011
-using is_trivially_relocatable =
-#else
-struct is_trivially_relocatable :
-#endif
-  detail::is_trivially_relocatable_impl<T>
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
-;
+using is_trivially_relocatable = detail::is_trivially_relocatable_impl<T>;
 
 #if THRUST_CPP_DIALECT >= 2014
 /// <code>constexpr bool</code> that is \c true if \c T is
@@ -60,22 +49,15 @@ constexpr bool is_trivially_relocatable_v = is_trivially_relocatable<T>::value;
 /// to \c To, e.g. can be bitwise copied (with a facility like \c memcpy), and
 /// \c false_type otherwise.
 template <typename From, typename To>
-#if THRUST_CPP_DIALECT >= 2011
 using is_trivially_relocatable_to =
-#else
-struct is_trivially_relocatable_to :
-#endif
   integral_constant<
     bool
   , detail::is_same<From, To>::value && is_trivially_relocatable<To>::value
   >
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
-/// <code>constexpr bool</code> that is \c true if \c From is 
+/// <code>constexpr bool</code> that is \c true if \c From is
 /// \a TriviallyRelocatable to \c To, e.g. can be copied bitwise (with a
 /// facility like \c memcpy), and \c false otherwise.
 template <typename From, typename To>
@@ -87,11 +69,7 @@ constexpr bool is_trivially_relocatable_to_v
 /// \c FromIterator is \a TriviallyRelocatable to the element type of
 /// \c ToIterator, and \c false_type otherwise.
 template <typename FromIterator, typename ToIterator>
-#if THRUST_CPP_DIALECT >= 2011
 using is_indirectly_trivially_relocatable_to =
-#else
-struct is_indirectly_trivially_relocatable_to :
-#endif
   integral_constant<
     bool
   ,    is_contiguous_iterator<FromIterator>::value
@@ -101,9 +79,6 @@ struct is_indirectly_trivially_relocatable_to :
          typename thrust::iterator_traits<ToIterator>::value_type
        >::value
   >
-#if THRUST_CPP_DIALECT < 2011
-{}
-#endif
 ;
 
 #if THRUST_CPP_DIALECT >= 2014
@@ -156,14 +131,10 @@ template <typename T>
 struct is_trivially_copyable_impl
     : integral_constant<
         bool,
-        #if THRUST_CPP_DIALECT >= 2011
-            #if defined(__GLIBCXX__) && __has_feature(is_trivially_copyable)
-                __is_trivially_copyable(T)
-            #elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC && THRUST_GCC_VERSION >= 50000
-                std::is_trivially_copyable<T>::value
-            #else
-                has_trivial_assign<T>::value
-            #endif
+        #if defined(__GLIBCXX__) && __has_feature(is_trivially_copyable)
+            __is_trivially_copyable(T)
+        #elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC && THRUST_GCC_VERSION >= 50000
+            std::is_trivially_copyable<T>::value
         #else
             has_trivial_assign<T>::value
         #endif
diff --git a/thrust/type_traits/logical_metafunctions.h b/thrust/type_traits/logical_metafunctions.h
index 5f86ee6a8..4b31e579c 100644
--- a/thrust/type_traits/logical_metafunctions.h
+++ b/thrust/type_traits/logical_metafunctions.h
@@ -13,9 +13,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011
 
 #include <type_traits>
 
@@ -24,7 +21,7 @@ namespace thrust
 
 #if THRUST_CPP_DIALECT >= 2017
 
-/// An \c integral_constant whose value is <code>(... && Ts::value)</code>. 
+/// An \c integral_constant whose value is <code>(... && Ts::value)</code>.
 template <typename... Ts>
 using conjunction = std::conjunction<Ts...>;
 
@@ -32,7 +29,7 @@ using conjunction = std::conjunction<Ts...>;
 template <typename... Ts>
 constexpr bool conjunction_v = conjunction<Ts...>::value;
 
-/// An \c integral_constant whose value is <code>(... || Ts::value)</code>. 
+/// An \c integral_constant whose value is <code>(... || Ts::value)</code>.
 template <typename... Ts>
 using disjunction = std::disjunction<Ts...>;
 
@@ -40,7 +37,7 @@ using disjunction = std::disjunction<Ts...>;
 template <typename... Ts>
 constexpr bool disjunction_v = disjunction<Ts...>::value;
 
-/// An \c integral_constant whose value is <code>!Ts::value</code>. 
+/// An \c integral_constant whose value is <code>!Ts::value</code>.
 template <typename T>
 using negation = std::negation<T>;
 
@@ -52,7 +49,7 @@ constexpr bool negation_v = negation<T>::value;
 
 #else // Older than C++17.
 
-/// An \c integral_constant whose value is <code>(... && Ts::value)</code>. 
+/// An \c integral_constant whose value is <code>(... && Ts::value)</code>.
 template <typename... Ts>
 struct conjunction;
 
@@ -77,7 +74,7 @@ struct conjunction<T0, T1, T2, TN...>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// An \c integral_constant whose value is <code>(... || Ts::value)</code>. 
+/// An \c integral_constant whose value is <code>(... || Ts::value)</code>.
 template <typename... Ts>
 struct disjunction;
 
@@ -99,7 +96,7 @@ struct disjunction<T0, TN...>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// An \c integral_constant whose value is <code>!T::value</code>. 
+/// An \c integral_constant whose value is <code>!T::value</code>.
 template <typename T>
 struct negation;
 
@@ -116,7 +113,7 @@ struct negation : std::integral_constant<bool, !T::value> {};
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// An \c integral_constant whose value is <code>(... && Bs)</code>. 
+/// An \c integral_constant whose value is <code>(... && Bs)</code>.
 template <bool... Bs>
 struct conjunction_value;
 
@@ -138,7 +135,7 @@ struct conjunction_value<B0, BN...>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// An \c integral_constant whose value is <code>(... || Bs)</code>. 
+/// An \c integral_constant whose value is <code>(... || Bs)</code>.
 template <bool... Bs>
 struct disjunction_value;
 
@@ -160,7 +157,7 @@ struct disjunction_value<B0, BN...>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/// An \c integral_constant whose value is <code>!B</code>. 
+/// An \c integral_constant whose value is <code>!B</code>.
 template <bool B>
 struct negation_value;
 
@@ -175,5 +172,3 @@ struct negation_value : std::integral_constant<bool, !B> {};
 
 } // end namespace thrust
 
-#endif // THRUST_CPP_DIALECT >= 2011
-
diff --git a/thrust/type_traits/remove_cvref.h b/thrust/type_traits/remove_cvref.h
index 4079bfe8e..10e8b5c74 100644
--- a/thrust/type_traits/remove_cvref.h
+++ b/thrust/type_traits/remove_cvref.h
@@ -37,10 +37,8 @@ struct remove_cvref
   >::type type;
 };
 
-#if THRUST_CPP_DIALECT >= 2011
 template <typename T>
 using remove_cvref_t = typename remove_cvref<T>::type;
-#endif
 
 #endif // THRUST_CPP_DIALECT >= 2020
 
diff --git a/thrust/type_traits/void_t.h b/thrust/type_traits/void_t.h
index 8ab56a3e8..f42213d3a 100644
--- a/thrust/type_traits/void_t.h
+++ b/thrust/type_traits/void_t.h
@@ -15,7 +15,7 @@
  */
 
 /*! \file void_t.h
- *  \brief C++17's `void_t`. 
+ *  \brief C++17's `void_t`.
  */
 
 #pragma once
@@ -29,35 +29,12 @@
 namespace thrust
 {
 
-#if THRUST_CPP_DIALECT >= 2011
-
-template <typename...> struct voider { using type = void; };
-
 #if THRUST_CPP_DIALECT >= 2017
 using std::void_t;
 #else
-template <typename... Ts> using void_t = typename voider<Ts...>::type;
-#endif
-
-#else // Older than C++11.
-
-template <
-  typename = void
-, typename = void
-, typename = void
-, typename = void
-, typename = void
-, typename = void
-, typename = void
-, typename = void
-, typename = void
-, typename = void
->
-struct voider
-{
-  typedef void type;
-};
+template <typename...> struct voider { using type = void; };
 
+template <typename... Ts> using void_t = typename voider<Ts...>::type;
 #endif
 
 } // end namespace thrust
diff --git a/thrust/zip_function.h b/thrust/zip_function.h
index faea59d4c..41b4ebe37 100644
--- a/thrust/zip_function.h
+++ b/thrust/zip_function.h
@@ -8,10 +8,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-#include <thrust/detail/cpp11_required.h>
-#include <thrust/detail/modern_gcc_required.h>
-
-#if THRUST_CPP_DIALECT >= 2011 && !defined(THRUST_LEGACY_GCC)
 
 #include <thrust/tuple.h>
 #include <thrust/type_traits/integer_sequence.h>
@@ -73,7 +69,7 @@ THRUST_DECLTYPE_RETURNS(
 } // namespace zip_detail
 } // namespace detail
 
-/*! \p zip_function is a function object that allows the easy use of N-ary 
+/*! \p zip_function is a function object that allows the easy use of N-ary
  *  function objects with \p zip_iterators without redefining them to take a
  *  \p tuple instead of N arguments.
  *
@@ -81,17 +77,17 @@ THRUST_DECLTYPE_RETURNS(
  *  the \p transform function and \p device_iterators can be extended to take 3
  *  arguments and \p zip_iterators without rewriting the functor in terms of
  *  \p tuple.
- * 
+ *
  *  The \p make_zip_function convenience function is provided to avoid having
- *  to explicitely define the type of the functor when creating a \p zip_function, 
+ *  to explicitely define the type of the functor when creating a \p zip_function,
  *  whic is especially helpful when using lambdas as the functor.
- *  
+ *
  *  \code
  *  #include <thrust/iterator/zip_iterator.h>
  *  #include <thrust/device_vector.h>
  *  #include <thrust/transform.h>
  *  #include <thrust/zip_function.h>
- * 
+ *
  *  struct SumTuple {
  *    float operator()(Tuple tup) {
  *      return std::get<0>(tup) + std::get<1>(tup) + std::get<2>(tup);
@@ -102,7 +98,7 @@ THRUST_DECLTYPE_RETURNS(
  *      return a + b + c;
  *    }
  *  };
- *  
+ *
  *  int main() {
  *    thrust::device_vector<float> A(3);
  *    thrust::device_vector<float> B(3);
@@ -111,28 +107,28 @@ THRUST_DECLTYPE_RETURNS(
  *    A[0] = 0.f; A[1] = 1.f; A[2] = 2.f;
  *    B[0] = 1.f; B[1] = 2.f; B[2] = 3.f;
  *    C[0] = 2.f; C[1] = 3.f; C[2] = 4.f;
- * 
+ *
  *    // The following four invocations of transform are equivalent
  *    // Transform with 3-tuple
  *    thrust::transform(thrust::make_zip_iterator(thrust::make_tuple(A.begin(), B.begin(), C.begin())),
  *                      thrust::make_zip_iterator(thrust::make_tuple(A.end(), B.end(), C.end())),
  *                      D.begin(),
  *                      SumTuple{});
- * 
+ *
  *    // Transform with 3 parameters
  *    thrust::zip_function<SumArgs> adapted{};
  *    thrust::transform(thrust::make_zip_iterator(thrust::make_tuple(A.begin(), B.begin(), C.begin())),
  *                      thrust::make_zip_iterator(thrust::make_tuple(A.end(), B.end(), C.end())),
  *                      D.begin(),
  *                      adapted);
- * 
+ *
  *    // Transform with 3 parameters with convenience function
  *    thrust::zip_function<SumArgs> adapted{};
  *    thrust::transform(thrust::make_zip_iterator(thrust::make_tuple(A.begin(), B.begin(), C.begin())),
  *                      thrust::make_zip_iterator(thrust::make_tuple(A.end(), B.end(), C.end())),
  *                      D.begin(),
  *                      thrust::make_zip_function(SumArgs{}));
- * 
+ *
  *    // Transform with 3 parameters with convenience function and lambda
  *    thrust::zip_function<SumArgs> adapted{};
  *    thrust::transform(thrust::make_zip_iterator(thrust::make_tuple(A.begin(), B.begin(), C.begin())),
@@ -144,7 +140,7 @@ THRUST_DECLTYPE_RETURNS(
  *    return 0;
  *  }
  *  \endcode
- * 
+ *
  *  \see make_zip_function
  *  \see zip_iterator
  */
@@ -183,7 +179,7 @@ class zip_function
 
   private:
     mutable Function func;
-}; 
+};
 
 /*! \p make_zip_function creates a \p zip_function from a function object.
  *
@@ -208,4 +204,3 @@ auto make_zip_function(Function&& fun) -> zip_function<typename std::decay<Funct
 
 } // end namespace thrust
 
-#endif