diff --git a/sprout/generator/generator_access_traits.hpp b/sprout/generator/generator_access_traits.hpp
index c98bf9f6..d5f423ee 100644
--- a/sprout/generator/generator_access_traits.hpp
+++ b/sprout/generator/generator_access_traits.hpp
@@ -12,6 +12,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/tuple/tuple.hpp>
+#include <sprout/type_traits/identity.hpp>
 #include <sprout/type_traits/integral_constant.hpp>
 
 namespace sprout {
diff --git a/sprout/math/bernoulli.hpp b/sprout/math/bernoulli.hpp
index 10d83134..9d56de59 100644
--- a/sprout/math/bernoulli.hpp
+++ b/sprout/math/bernoulli.hpp
@@ -18,7 +18,7 @@ namespace sprout {
 	namespace math {
 		namespace detail {
 #		define SPROUT_BERNOULLI_TABLE_DEF_FLOAT \
-			table_type{{ \
+			{{ \
 				1.F, \
 				1.F / 6, \
 				-1.F / 30, \
@@ -54,7 +54,7 @@ namespace sprout {
 				-2.09380059113463784091e38F \
 			}}
 #		define SPROUT_BERNOULLI_TABLE_DEF_DOUBLE \
-			table_type{{ \
+			{{ \
 				1., \
 				1. / 6, \
 				-1. / 30, \
@@ -108,7 +108,7 @@ namespace sprout {
 				-2.838224957069370695926e78 \
 			}}
 #		define SPROUT_BERNOULLI_TABLE_DEF_LONG_DOUBLE \
-			table_type{{ \
+			{{ \
 				1.L, \
 				1.L / 6, \
 				-1.L / 30, \
diff --git a/sprout/math/factorial.hpp b/sprout/math/factorial.hpp
index e5060c8d..9fe5f02c 100644
--- a/sprout/math/factorial.hpp
+++ b/sprout/math/factorial.hpp
@@ -21,7 +21,7 @@ namespace sprout {
 	namespace math {
 		namespace detail {
 #		define SPROUT_FACTORIAL_TABLE_DEF_INT_1 \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
@@ -30,7 +30,7 @@ namespace sprout {
 				120 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_UINT_1 \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
@@ -39,7 +39,7 @@ namespace sprout {
 				120 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_INT_2 \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
@@ -50,7 +50,7 @@ namespace sprout {
 				5040 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_UINT_2 \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
@@ -62,7 +62,7 @@ namespace sprout {
 				40320 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_INT_4 \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
@@ -77,7 +77,7 @@ namespace sprout {
 				39916800 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_UINT_4 \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
@@ -92,7 +92,7 @@ namespace sprout {
 				39916800 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_INT_8 \
-			table_type{{ \
+			{{ \
 				SPROUT_INT64_C(1), \
 				SPROUT_INT64_C(1), \
 				SPROUT_INT64_C(2), \
@@ -116,7 +116,7 @@ namespace sprout {
 				SPROUT_INT64_C(2432902008176640000) \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_UINT_8 \
-			table_type{{ \
+			{{ \
 				SPROUT_UINT64_C(1), \
 				SPROUT_UINT64_C(1), \
 				SPROUT_UINT64_C(2), \
@@ -140,7 +140,7 @@ namespace sprout {
 				SPROUT_UINT64_C(2432902008176640000) \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_FLOAT \
-			table_type{{ \
+			{{ \
 				1.0F, \
 				1.0F, \
 				2.0F, \
@@ -178,7 +178,7 @@ namespace sprout {
 				0.29523279903960414084761860964352e39F \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_DOUBLE \
-			table_type{{ \
+			{{ \
 				1.0, \
 				1.0, \
 				2.0, \
@@ -352,7 +352,7 @@ namespace sprout {
 				0.7257415615307998967396728211129263114717e307 \
 			}}
 #		define SPROUT_FACTORIAL_TABLE_DEF_LONG_DOUBLE \
-			table_type{{ \
+			{{ \
 				1.0L, \
 				1.0L, \
 				2.0L, \
diff --git a/sprout/random/binomial_distribution.hpp b/sprout/random/binomial_distribution.hpp
index 8b6127ee..21445d89 100644
--- a/sprout/random/binomial_distribution.hpp
+++ b/sprout/random/binomial_distribution.hpp
@@ -30,7 +30,7 @@ namespace sprout {
 	namespace random {
 		namespace detail {
 #		define SPROUT_BINOMIAL_TABLE_DEF \
-			table_type{{ \
+			{{ \
 				1, \
 				1, \
 				2, \
diff --git a/sprout/type/type_tuple.hpp b/sprout/type/type_tuple.hpp
index e7bd2450..9026d0df 100644
--- a/sprout/type/type_tuple.hpp
+++ b/sprout/type/type_tuple.hpp
@@ -18,8 +18,8 @@
 #include <sprout/type/iterator.hpp>
 #include <sprout/type/iterator/index_iterator.hpp>
 #include <sprout/type/rebind_types.hpp>
-#include <sprout/type_traits/integral_constant.hpp>
 #include <sprout/type_traits/identity.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
 
 namespace sprout {
 	namespace types {
diff --git a/sprout/type_traits/is_convert_constructible.hpp b/sprout/type_traits/is_convert_constructible.hpp
index 17735360..f6c0a36f 100644
--- a/sprout/type_traits/is_convert_constructible.hpp
+++ b/sprout/type_traits/is_convert_constructible.hpp
@@ -10,6 +10,7 @@
 
 #include <utility>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/identity.hpp>
 #include <sprout/type_traits/integral_constant.hpp>
 
 namespace sprout {
diff --git a/sprout/uuid/detail/table.hpp b/sprout/uuid/detail/table.hpp
index 94c717ec..5595721d 100644
--- a/sprout/uuid/detail/table.hpp
+++ b/sprout/uuid/detail/table.hpp
@@ -77,7 +77,7 @@ namespace sprout {
 			struct values;
 
 #		define SPROUT_UUID_TABLE_DEF \
-			table_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
+			{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
 
 			template<>
 			struct values<void> {
diff --git a/sprout/weed/detail/bdigits.hpp b/sprout/weed/detail/bdigits.hpp
index 85bc4b20..9897a0f1 100644
--- a/sprout/weed/detail/bdigits.hpp
+++ b/sprout/weed/detail/bdigits.hpp
@@ -72,7 +72,7 @@ namespace sprout {
 			struct bvalues;
 
 #		define SPROUT_WEED_BDIGITS_TABLE_DEF \
-			table_type{{0, 1}}
+			{{0, 1}}
 
 			template<>
 			struct bvalues<void> {
diff --git a/sprout/weed/detail/digits.hpp b/sprout/weed/detail/digits.hpp
index 2168c4b7..2e96c262 100644
--- a/sprout/weed/detail/digits.hpp
+++ b/sprout/weed/detail/digits.hpp
@@ -72,7 +72,7 @@ namespace sprout {
 			struct values;
 
 #		define SPROUT_WEED_DIGITS_TABLE_DEF \
-			table_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}}
+			{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}}
 
 			template<>
 			struct values<void> {
diff --git a/sprout/weed/detail/odigits.hpp b/sprout/weed/detail/odigits.hpp
index ecf7bf85..3b655fee 100644
--- a/sprout/weed/detail/odigits.hpp
+++ b/sprout/weed/detail/odigits.hpp
@@ -72,7 +72,7 @@ namespace sprout {
 			struct ovalues;
 
 #		define SPROUT_WEED_ODIGITS_TABLE_DEF \
-			table_type{{0, 1, 2, 3, 4, 5, 6, 7}}
+			{{0, 1, 2, 3, 4, 5, 6, 7}}
 
 			template<>
 			struct ovalues<void> {
diff --git a/sprout/weed/detail/xdigits.hpp b/sprout/weed/detail/xdigits.hpp
index 26386439..f62fc741 100644
--- a/sprout/weed/detail/xdigits.hpp
+++ b/sprout/weed/detail/xdigits.hpp
@@ -72,7 +72,7 @@ namespace sprout {
 			struct xvalues;
 
 #		define SPROUT_WEED_XDIGITS_TABLE_DEF \
-			table_type{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
+			{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 10, 11, 12, 13, 14, 15}}
 
 			template<>
 			struct xvalues<void> {