diff --git a/example/batched_determinant.cpp b/example/batched_determinant.cpp
index 21b9d7fe..af25f25e 100644
--- a/example/batched_determinant.cpp
+++ b/example/batched_determinant.cpp
@@ -17,7 +17,7 @@
 #include <boost/compute/system.hpp>
 #include <boost/compute/algorithm/transform.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace compute = boost::compute;
 
diff --git a/example/longest_vector.cpp b/example/longest_vector.cpp
index d2291274..9c3953ff 100644
--- a/example/longest_vector.cpp
+++ b/example/longest_vector.cpp
@@ -15,7 +15,7 @@
 #include <boost/compute/container/vector.hpp>
 #include <boost/compute/functional/geometry.hpp>
 #include <boost/compute/iterator/transform_iterator.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace compute = boost::compute;
 
diff --git a/example/monte_carlo.cpp b/example/monte_carlo.cpp
index d21e581a..638fcf70 100644
--- a/example/monte_carlo.cpp
+++ b/example/monte_carlo.cpp
@@ -16,7 +16,7 @@
 #include <boost/compute/container/vector.hpp>
 #include <boost/compute/iterator/buffer_iterator.hpp>
 #include <boost/compute/random/default_random_engine.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace compute = boost::compute;
 
diff --git a/example/point_centroid.cpp b/example/point_centroid.cpp
index 19f4be28..86480ef0 100644
--- a/example/point_centroid.cpp
+++ b/example/point_centroid.cpp
@@ -15,7 +15,7 @@
 #include <boost/compute/algorithm/copy.hpp>
 #include <boost/compute/algorithm/accumulate.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace compute = boost::compute;
 
diff --git a/include/boost/compute/algorithm/detail/count_if_with_reduce.hpp b/include/boost/compute/algorithm/detail/count_if_with_reduce.hpp
index 18a7a670..13838328 100644
--- a/include/boost/compute/algorithm/detail/count_if_with_reduce.hpp
+++ b/include/boost/compute/algorithm/detail/count_if_with_reduce.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/compute/algorithm/reduce.hpp>
 #include <boost/compute/iterator/transform_iterator.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/algorithm/detail/serial_find_extrema.hpp b/include/boost/compute/algorithm/detail/serial_find_extrema.hpp
index c108f564..1857ec30 100644
--- a/include/boost/compute/algorithm/detail/serial_find_extrema.hpp
+++ b/include/boost/compute/algorithm/detail/serial_find_extrema.hpp
@@ -12,7 +12,7 @@
 #define BOOST_COMPUTE_ALGORITHM_DETAIL_SERIAL_FIND_EXTREMA_HPP
 
 #include <boost/compute/command_queue.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/detail/meta_kernel.hpp>
 #include <boost/compute/detail/iterator_range_size.hpp>
 #include <boost/compute/container/detail/scalar.hpp>
diff --git a/include/boost/compute/container/dynamic_bitset.hpp b/include/boost/compute/container/dynamic_bitset.hpp
index 871135fc..c7e4fb63 100644
--- a/include/boost/compute/container/dynamic_bitset.hpp
+++ b/include/boost/compute/container/dynamic_bitset.hpp
@@ -17,7 +17,7 @@
 #include <boost/compute/algorithm/transform_reduce.hpp>
 #include <boost/compute/container/vector.hpp>
 #include <boost/compute/functional/integer.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/container/string.hpp b/include/boost/compute/container/string.hpp
index e5417332..422be6fa 100644
--- a/include/boost/compute/container/string.hpp
+++ b/include/boost/compute/container/string.hpp
@@ -11,7 +11,7 @@
 #ifndef BOOST_COMPUTE_CONTAINER_STRING_HPP
 #define BOOST_COMPUTE_CONTAINER_STRING_HPP
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/container/basic_string.hpp>
 
 namespace boost {
diff --git a/include/boost/compute/device.hpp b/include/boost/compute/device.hpp
index 8d45c219..ab4cbacc 100644
--- a/include/boost/compute/device.hpp
+++ b/include/boost/compute/device.hpp
@@ -19,7 +19,7 @@
 
 #include <boost/compute/config.hpp>
 #include <boost/compute/exception.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/detail/get_object_info.hpp>
 #include <boost/compute/detail/assert_cl_success.hpp>
 
diff --git a/include/boost/compute/event.hpp b/include/boost/compute/event.hpp
index 9609735d..d92b2e35 100644
--- a/include/boost/compute/event.hpp
+++ b/include/boost/compute/event.hpp
@@ -18,7 +18,7 @@
 #include <boost/compute/detail/duration.hpp>
 #include <boost/compute/detail/get_object_info.hpp>
 #include <boost/compute/detail/assert_cl_success.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/functional/detail/nvidia_ballot.hpp b/include/boost/compute/functional/detail/nvidia_ballot.hpp
index 728f5261..c1ceb753 100644
--- a/include/boost/compute/functional/detail/nvidia_ballot.hpp
+++ b/include/boost/compute/functional/detail/nvidia_ballot.hpp
@@ -12,7 +12,7 @@
 #define BOOST_COMPUTE_FUNCTIONAL_DETAIL_NVIDIA_BALLOT_HPP
 
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/functional/get.hpp b/include/boost/compute/functional/get.hpp
index bf14292d..add6e680 100644
--- a/include/boost/compute/functional/get.hpp
+++ b/include/boost/compute/functional/get.hpp
@@ -13,7 +13,7 @@
 
 #include <cstddef>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/type_traits/scalar_type.hpp>
 
 namespace boost {
diff --git a/include/boost/compute/functional/hash.hpp b/include/boost/compute/functional/hash.hpp
index 5015c8d1..7e789472 100644
--- a/include/boost/compute/functional/hash.hpp
+++ b/include/boost/compute/functional/hash.hpp
@@ -12,7 +12,7 @@
 #define BOOST_COMPUTE_FUNCTIONAL_HASH_HPP
 
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/interop/vtk/matrix4x4.hpp b/include/boost/compute/interop/vtk/matrix4x4.hpp
index 55162604..16f1f944 100644
--- a/include/boost/compute/interop/vtk/matrix4x4.hpp
+++ b/include/boost/compute/interop/vtk/matrix4x4.hpp
@@ -13,7 +13,7 @@
 
 #include <vtkMatrix4x4.h>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/random/bernoulli_distribution.hpp b/include/boost/compute/random/bernoulli_distribution.hpp
index f3dd4cea..8ed19931 100644
--- a/include/boost/compute/random/bernoulli_distribution.hpp
+++ b/include/boost/compute/random/bernoulli_distribution.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/detail/iterator_range_size.hpp>
 
 namespace boost {
diff --git a/include/boost/compute/random/discrete_distribution.hpp b/include/boost/compute/random/discrete_distribution.hpp
index 6ca07160..5374b7d9 100644
--- a/include/boost/compute/random/discrete_distribution.hpp
+++ b/include/boost/compute/random/discrete_distribution.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/algorithm/accumulate.hpp>
 #include <boost/compute/algorithm/copy.hpp>
 #include <boost/compute/algorithm/transform.hpp>
diff --git a/include/boost/compute/random/normal_distribution.hpp b/include/boost/compute/random/normal_distribution.hpp
index edf969c5..4642df2c 100644
--- a/include/boost/compute/random/normal_distribution.hpp
+++ b/include/boost/compute/random/normal_distribution.hpp
@@ -15,7 +15,7 @@
 
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/type_traits/make_vector_type.hpp>
 
 namespace boost {
diff --git a/include/boost/compute/random/uniform_int_distribution.hpp b/include/boost/compute/random/uniform_int_distribution.hpp
index ac8d2bf2..9d13954e 100644
--- a/include/boost/compute/random/uniform_int_distribution.hpp
+++ b/include/boost/compute/random/uniform_int_distribution.hpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/container/vector.hpp>
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/algorithm/copy_if.hpp>
 #include <boost/compute/algorithm/transform.hpp>
 
diff --git a/include/boost/compute/random/uniform_real_distribution.hpp b/include/boost/compute/random/uniform_real_distribution.hpp
index 95e31aed..6a04e26d 100644
--- a/include/boost/compute/random/uniform_real_distribution.hpp
+++ b/include/boost/compute/random/uniform_real_distribution.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/function.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/type_traits/common_type.hpp b/include/boost/compute/type_traits/common_type.hpp
index c3c07b4c..86839edb 100644
--- a/include/boost/compute/type_traits/common_type.hpp
+++ b/include/boost/compute/type_traits/common_type.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/type_traits/common_type.hpp>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 
diff --git a/include/boost/compute/type_traits/is_fundamental.hpp b/include/boost/compute/type_traits/is_fundamental.hpp
index 7e5fb48f..daa19773 100644
--- a/include/boost/compute/type_traits/is_fundamental.hpp
+++ b/include/boost/compute/type_traits/is_fundamental.hpp
@@ -11,7 +11,7 @@
 #ifndef BOOST_COMPUTE_TYPE_TRAITS_IS_FUNDAMENTAL_HPP
 #define BOOST_COMPUTE_TYPE_TRAITS_IS_FUNDAMENTAL_HPP
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/type_traits/make_vector_type.hpp b/include/boost/compute/type_traits/make_vector_type.hpp
index fc411555..150b9e10 100644
--- a/include/boost/compute/type_traits/make_vector_type.hpp
+++ b/include/boost/compute/type_traits/make_vector_type.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/type_traits/scalar_type.hpp b/include/boost/compute/type_traits/scalar_type.hpp
index b7e243a9..7ac0008d 100644
--- a/include/boost/compute/type_traits/scalar_type.hpp
+++ b/include/boost/compute/type_traits/scalar_type.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/type_traits/type_name.hpp b/include/boost/compute/type_traits/type_name.hpp
index 71eca7ab..10962608 100644
--- a/include/boost/compute/type_traits/type_name.hpp
+++ b/include/boost/compute/type_traits/type_name.hpp
@@ -14,7 +14,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/type_traits/vector_size.hpp b/include/boost/compute/type_traits/vector_size.hpp
index 3330122a..14d8a622 100644
--- a/include/boost/compute/type_traits/vector_size.hpp
+++ b/include/boost/compute/type_traits/vector_size.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 namespace boost {
 namespace compute {
diff --git a/include/boost/compute/types.hpp b/include/boost/compute/types.hpp
index ad0a1481..e561cd2c 100644
--- a/include/boost/compute/types.hpp
+++ b/include/boost/compute/types.hpp
@@ -15,8 +15,8 @@
 ///
 /// Meta-header to include all Boost.Compute types headers.
 
-#include <boost/compute/types/builtin.hpp>
 #include <boost/compute/types/complex.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/types/pair.hpp>
 #include <boost/compute/types/struct.hpp>
 #include <boost/compute/types/tuple.hpp>
diff --git a/include/boost/compute/types/builtin.hpp b/include/boost/compute/types/builtin.hpp
index b3c95826..11226720 100644
--- a/include/boost/compute/types/builtin.hpp
+++ b/include/boost/compute/types/builtin.hpp
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------//
-// Copyright (c) 2013 Kyle Lutz <kyle.r.lutz@gmail.com>
+// Copyright (c) 2013-2014 Kyle Lutz <kyle.r.lutz@gmail.com>
 //
 // Distributed under the Boost Software License, Version 1.0
 // See accompanying file LICENSE_1_0.txt or copy at
@@ -8,149 +8,5 @@
 // See http://kylelutz.github.com/compute for more information.
 //---------------------------------------------------------------------------//
 
-#ifndef BOOST_COMPUTE_TYPES_BUILTIN_HPP
-#define BOOST_COMPUTE_TYPES_BUILTIN_HPP
-
-#include <cstring>
-#include <ostream>
-
-#include <boost/preprocessor.hpp>
-
-#include <boost/compute/cl.hpp>
-
-namespace boost {
-namespace compute {
-
-// scalar data types
-typedef cl_char char_;
-typedef cl_uchar uchar_;
-typedef cl_short short_;
-typedef cl_ushort ushort_;
-typedef cl_int int_;
-typedef cl_uint uint_;
-typedef cl_long long_;
-typedef cl_ulong ulong_;
-typedef cl_float float_;
-typedef cl_double double_;
-
-// converts uchar to ::boost::compute::uchar_
-#define BOOST_COMPUTE_MAKE_SCALAR_TYPE(scalar) \
-    BOOST_PP_CAT(::boost::compute::scalar, _)
-
-// converts float, 4 to ::boost::compute::float4_
-#define BOOST_COMPUTE_MAKE_VECTOR_TYPE(scalar, size) \
-    BOOST_PP_CAT(BOOST_PP_CAT(::boost::compute::scalar, size), _)
-
-// vector data types
-template<class Scalar, size_t N>
-class vector_type
-{
-public:
-    typedef Scalar scalar_type;
-
-    vector_type()
-    {
-    }
-
-    vector_type(const vector_type<Scalar, N> &other)
-    {
-        std::memcpy(m_value, other.m_value, sizeof(m_value));
-    }
-
-    vector_type<Scalar, N>&
-    operator=(const vector_type<Scalar, N> &other)
-    {
-        std::memcpy(m_value, other.m_value, sizeof(m_value));
-        return *this;
-    }
-
-    size_t size() const
-    {
-        return N;
-    }
-
-    Scalar& operator[](size_t i)
-    {
-        return m_value[i];
-    }
-
-    Scalar operator[](size_t i) const
-    {
-        return m_value[i];
-    }
-
-    bool operator==(const vector_type<Scalar, N> &other) const
-    {
-        return std::memcmp(m_value, other.m_value, sizeof(m_value)) == 0;
-    }
-
-    bool operator!=(const vector_type<Scalar, N> &other) const
-    {
-        return !(*this == other);
-    }
-
-protected:
-    scalar_type m_value[N];
-};
-
-#define BOOST_COMPUTE_VECTOR_TYPE_CTOR_ARG_FUNCTION(z, i, _) \
-    BOOST_PP_COMMA_IF(i) scalar_type BOOST_PP_CAT(arg, i)
-#define BOOST_COMPUTE_VECTOR_TYPE_DECLARE_CTOR_ARGS(scalar, size) \
-    BOOST_PP_REPEAT(size, BOOST_COMPUTE_VECTOR_TYPE_CTOR_ARG_FUNCTION, _)
-#define BOOST_COMPUTE_VECTOR_TYPE_ASSIGN_CTOR_ARG(z, i, _) \
-    m_value[i] = BOOST_PP_CAT(arg, i);
-
-#define BOOST_COMPUTE_DECLARE_VECTOR_TYPE_CLASS(cl_scalar, size, class_name) \
-    class class_name : public vector_type<cl_scalar, size> \
-    { \
-    public: \
-        class_name() { } \
-        class_name( \
-            BOOST_PP_REPEAT(size, BOOST_COMPUTE_VECTOR_TYPE_CTOR_ARG_FUNCTION, _) \
-        ) \
-        { \
-          BOOST_PP_REPEAT(size, BOOST_COMPUTE_VECTOR_TYPE_ASSIGN_CTOR_ARG, _) \
-        } \
-    };
-
-#define BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, size) \
-    BOOST_COMPUTE_DECLARE_VECTOR_TYPE_CLASS(BOOST_PP_CAT(cl_, scalar), \
-                                            size, \
-                                            BOOST_PP_CAT(BOOST_PP_CAT(scalar, size), _)) \
-    \
-    inline std::ostream& operator<<( \
-        std::ostream &s, \
-        const BOOST_COMPUTE_MAKE_VECTOR_TYPE(scalar, size) &v) \
-    { \
-        s << BOOST_PP_STRINGIZE(BOOST_PP_CAT(scalar, size)) << "("; \
-        for(size_t i = 0; i < size; i++){\
-            s << v[i]; \
-            if(i != size - 1){\
-                s << ", "; \
-            } \
-        } \
-        s << ")"; \
-        return s; \
-    }
-
-#define BOOST_COMPUTE_DECLARE_VECTOR_TYPES(scalar) \
-    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 2) \
-    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 4) \
-    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 8) \
-    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 16) \
-
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(char)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(uchar)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(short)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(ushort)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(int)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(uint)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(long)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(ulong)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(float)
-BOOST_COMPUTE_DECLARE_VECTOR_TYPES(double)
-
-} // end compute namespace
-} // end boost namespace
-
-#endif // BOOST_COMPUTE_TYPES_BUILTIN_HPP
+// deprecated, use <boost/compute/types/fundamental.hpp> instead
+#include <boost/compute/types/fundamental.hpp>
diff --git a/include/boost/compute/types/complex.hpp b/include/boost/compute/types/complex.hpp
index 278f5647..ad1e2858 100644
--- a/include/boost/compute/types/complex.hpp
+++ b/include/boost/compute/types/complex.hpp
@@ -14,7 +14,7 @@
 #include <complex>
 
 #include <boost/compute/functional.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/type_traits/make_vector_type.hpp>
 #include <boost/compute/type_traits/type_name.hpp>
 #include <boost/compute/detail/meta_kernel.hpp>
diff --git a/include/boost/compute/types/fundamental.hpp b/include/boost/compute/types/fundamental.hpp
new file mode 100644
index 00000000..7c2fc2ee
--- /dev/null
+++ b/include/boost/compute/types/fundamental.hpp
@@ -0,0 +1,156 @@
+//---------------------------------------------------------------------------//
+// Copyright (c) 2013-2014 Kyle Lutz <kyle.r.lutz@gmail.com>
+//
+// Distributed under the Boost Software License, Version 1.0
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+// See http://kylelutz.github.com/compute for more information.
+//---------------------------------------------------------------------------//
+
+#ifndef BOOST_COMPUTE_TYPES_FUNDAMENTAL_HPP
+#define BOOST_COMPUTE_TYPES_FUNDAMENTAL_HPP
+
+#include <cstring>
+#include <ostream>
+
+#include <boost/preprocessor.hpp>
+
+#include <boost/compute/cl.hpp>
+
+namespace boost {
+namespace compute {
+
+// scalar data types
+typedef cl_char char_;
+typedef cl_uchar uchar_;
+typedef cl_short short_;
+typedef cl_ushort ushort_;
+typedef cl_int int_;
+typedef cl_uint uint_;
+typedef cl_long long_;
+typedef cl_ulong ulong_;
+typedef cl_float float_;
+typedef cl_double double_;
+
+// converts uchar to ::boost::compute::uchar_
+#define BOOST_COMPUTE_MAKE_SCALAR_TYPE(scalar) \
+    BOOST_PP_CAT(::boost::compute::scalar, _)
+
+// converts float, 4 to ::boost::compute::float4_
+#define BOOST_COMPUTE_MAKE_VECTOR_TYPE(scalar, size) \
+    BOOST_PP_CAT(BOOST_PP_CAT(::boost::compute::scalar, size), _)
+
+// vector data types
+template<class Scalar, size_t N>
+class vector_type
+{
+public:
+    typedef Scalar scalar_type;
+
+    vector_type()
+    {
+    }
+
+    vector_type(const vector_type<Scalar, N> &other)
+    {
+        std::memcpy(m_value, other.m_value, sizeof(m_value));
+    }
+
+    vector_type<Scalar, N>&
+    operator=(const vector_type<Scalar, N> &other)
+    {
+        std::memcpy(m_value, other.m_value, sizeof(m_value));
+        return *this;
+    }
+
+    size_t size() const
+    {
+        return N;
+    }
+
+    Scalar& operator[](size_t i)
+    {
+        return m_value[i];
+    }
+
+    Scalar operator[](size_t i) const
+    {
+        return m_value[i];
+    }
+
+    bool operator==(const vector_type<Scalar, N> &other) const
+    {
+        return std::memcmp(m_value, other.m_value, sizeof(m_value)) == 0;
+    }
+
+    bool operator!=(const vector_type<Scalar, N> &other) const
+    {
+        return !(*this == other);
+    }
+
+protected:
+    scalar_type m_value[N];
+};
+
+#define BOOST_COMPUTE_VECTOR_TYPE_CTOR_ARG_FUNCTION(z, i, _) \
+    BOOST_PP_COMMA_IF(i) scalar_type BOOST_PP_CAT(arg, i)
+#define BOOST_COMPUTE_VECTOR_TYPE_DECLARE_CTOR_ARGS(scalar, size) \
+    BOOST_PP_REPEAT(size, BOOST_COMPUTE_VECTOR_TYPE_CTOR_ARG_FUNCTION, _)
+#define BOOST_COMPUTE_VECTOR_TYPE_ASSIGN_CTOR_ARG(z, i, _) \
+    m_value[i] = BOOST_PP_CAT(arg, i);
+
+#define BOOST_COMPUTE_DECLARE_VECTOR_TYPE_CLASS(cl_scalar, size, class_name) \
+    class class_name : public vector_type<cl_scalar, size> \
+    { \
+    public: \
+        class_name() { } \
+        class_name( \
+            BOOST_PP_REPEAT(size, BOOST_COMPUTE_VECTOR_TYPE_CTOR_ARG_FUNCTION, _) \
+        ) \
+        { \
+          BOOST_PP_REPEAT(size, BOOST_COMPUTE_VECTOR_TYPE_ASSIGN_CTOR_ARG, _) \
+        } \
+    };
+
+#define BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, size) \
+    BOOST_COMPUTE_DECLARE_VECTOR_TYPE_CLASS(BOOST_PP_CAT(cl_, scalar), \
+                                            size, \
+                                            BOOST_PP_CAT(BOOST_PP_CAT(scalar, size), _)) \
+    \
+    inline std::ostream& operator<<( \
+        std::ostream &s, \
+        const BOOST_COMPUTE_MAKE_VECTOR_TYPE(scalar, size) &v) \
+    { \
+        s << BOOST_PP_STRINGIZE(BOOST_PP_CAT(scalar, size)) << "("; \
+        for(size_t i = 0; i < size; i++){\
+            s << v[i]; \
+            if(i != size - 1){\
+                s << ", "; \
+            } \
+        } \
+        s << ")"; \
+        return s; \
+    }
+
+#define BOOST_COMPUTE_DECLARE_VECTOR_TYPES(scalar) \
+    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 2) \
+    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 4) \
+    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 8) \
+    BOOST_COMPUTE_DECLARE_VECTOR_TYPE(scalar, 16) \
+
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(char)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(uchar)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(short)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(ushort)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(int)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(uint)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(long)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(ulong)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(float)
+BOOST_COMPUTE_DECLARE_VECTOR_TYPES(double)
+
+} // end compute namespace
+} // end boost namespace
+
+#endif // BOOST_COMPUTE_TYPES_FUNDAMENTAL_HPP
diff --git a/perf/perf_sort_by_key.cpp b/perf/perf_sort_by_key.cpp
index 5a28b767..69fddb16 100644
--- a/perf/perf_sort_by_key.cpp
+++ b/perf/perf_sort_by_key.cpp
@@ -16,7 +16,7 @@
 #include <boost/compute/algorithm/sort_by_key.hpp>
 #include <boost/compute/algorithm/is_sorted.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "perf.hpp"
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 906b8ee1..9c7d5322 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -167,7 +167,7 @@ add_compute_test("random.normal_distribution" test_normal_distribution.cpp)
 add_compute_test("random.uniform_int_distribution" test_uniform_int_distribution.cpp)
 add_compute_test("random.uniform_real_distribution" test_uniform_real_distribution.cpp)
 
-add_compute_test("types.builtin" test_types.cpp)
+add_compute_test("types.fundamental" test_types.cpp)
 add_compute_test("types.complex" test_complex.cpp)
 add_compute_test("types.pair" test_pair.cpp)
 add_compute_test("types.tuple" test_tuple.cpp)
diff --git a/test/test_find_end.cpp b/test/test_find_end.cpp
index 91aacb01..a0130959 100644
--- a/test/test_find_end.cpp
+++ b/test/test_find_end.cpp
@@ -15,7 +15,7 @@
 #include <boost/compute/algorithm/copy_n.hpp>
 #include <boost/compute/algorithm/find_end.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_functional_get.cpp b/test/test_functional_get.cpp
index f6dff85d..012a8f8b 100644
--- a/test/test_functional_get.cpp
+++ b/test/test_functional_get.cpp
@@ -16,7 +16,7 @@
 
 #include <boost/compute/types/pair.hpp>
 #include <boost/compute/types/tuple.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 #include <boost/compute/functional/get.hpp>
 #include <boost/compute/type_traits/result_of.hpp>
 
diff --git a/test/test_includes.cpp b/test/test_includes.cpp
index e5437a90..5a5fd255 100644
--- a/test/test_includes.cpp
+++ b/test/test_includes.cpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/includes.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_search.cpp b/test/test_search.cpp
index 2e4fe8d5..7368bd55 100644
--- a/test/test_search.cpp
+++ b/test/test_search.cpp
@@ -15,7 +15,7 @@
 #include <boost/compute/algorithm/copy_n.hpp>
 #include <boost/compute/algorithm/search.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_search_n.cpp b/test/test_search_n.cpp
index bf6e1032..b02de689 100644
--- a/test/test_search_n.cpp
+++ b/test/test_search_n.cpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/search_n.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_set_difference.cpp b/test/test_set_difference.cpp
index 4fada0b0..dba51722 100644
--- a/test/test_set_difference.cpp
+++ b/test/test_set_difference.cpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/set_difference.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_set_intersection.cpp b/test/test_set_intersection.cpp
index f0056027..fec81780 100644
--- a/test/test_set_intersection.cpp
+++ b/test/test_set_intersection.cpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/set_intersection.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_set_symmetric_difference.cpp b/test/test_set_symmetric_difference.cpp
index 9a211850..1ed6fbae 100644
--- a/test/test_set_symmetric_difference.cpp
+++ b/test/test_set_symmetric_difference.cpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/set_symmetric_difference.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_set_union.cpp b/test/test_set_union.cpp
index 12e68e73..40f1dc1f 100644
--- a/test/test_set_union.cpp
+++ b/test/test_set_union.cpp
@@ -14,7 +14,7 @@
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/set_union.hpp>
 #include <boost/compute/container/vector.hpp>
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 #include "check_macros.hpp"
 #include "context_setup.hpp"
diff --git a/test/test_types.cpp b/test/test_types.cpp
index 4b526913..51ae109d 100644
--- a/test/test_types.cpp
+++ b/test/test_types.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <sstream>
 
-#include <boost/compute/types/builtin.hpp>
+#include <boost/compute/types/fundamental.hpp>
 
 BOOST_AUTO_TEST_CASE(vector_ctor)
 {