diff --git a/src/intrusive_forward_list.h b/src/intrusive_forward_list.h
index 6d4cabcc..e804f6d2 100644
--- a/src/intrusive_forward_list.h
+++ b/src/intrusive_forward_list.h
@@ -129,7 +129,7 @@ namespace etl
   ///\ingroup intrusive_forward_list
   ///\note TLink must be a base of TValue.
   //***************************************************************************
-  template <typename TValue, typename TLink = etl::forward_link<>, const size_t COUNT_OPTION = etl::count_option::FAST_COUNT >
+  template <typename TValue, typename TLink = etl::forward_link<0>, const size_t COUNT_OPTION = etl::count_option::FAST_COUNT >
   class intrusive_forward_list
   {
   public:
diff --git a/src/intrusive_links.h b/src/intrusive_links.h
index d14bb749..7a4baf3c 100644
--- a/src/intrusive_links.h
+++ b/src/intrusive_links.h
@@ -131,7 +131,7 @@ namespace etl
   //***************************************************************************
   /// A forward link.
   //***************************************************************************
-  template <const size_t ID_ = 0, const size_t OPTION_ = etl::link_option::DEFAULT>
+  template <const size_t ID_, const size_t OPTION_ = etl::link_option::DEFAULT>
   struct forward_link
     : public __private_intrusive_links__::forward_link_base<forward_link<ID_, OPTION_>, ID_, OPTION_>
   {
@@ -370,7 +370,7 @@ namespace etl
   //***************************************************************************
   /// A bidirectional link.
   //***************************************************************************
-  template <const size_t ID_ = 0, const size_t OPTION_ = etl::link_option::DEFAULT>
+  template <const size_t ID_, const size_t OPTION_ = etl::link_option::DEFAULT>
   struct bidirectional_link
     : public __private_intrusive_links__::bidirectional_link_base<bidirectional_link<ID_, OPTION_>, ID_, OPTION_>
   {
@@ -683,7 +683,7 @@ namespace etl
   //***************************************************************************
   /// A tree link.
   //***************************************************************************
-  template <const size_t ID_ = 0, const size_t OPTION_ = etl::link_option::DEFAULT>
+  template <const size_t ID_, const size_t OPTION_ = etl::link_option::DEFAULT>
   struct tree_link
     : public __private_intrusive_links__::tree_link_base<tree_link<ID_, OPTION_>, ID_, OPTION_>
   {
diff --git a/src/iunordered_map.h b/src/iunordered_map.h
index 7c2b333b..e8447fa6 100644
--- a/src/iunordered_map.h
+++ b/src/iunordered_map.h
@@ -133,7 +133,7 @@ namespace etl
 
     typedef typename parameter_type<TKey>::type key_value_parameter_t;
 
-    typedef etl::forward_link<> link_t; // Default link.
+    typedef etl::forward_link<0> link_t; // Default link.
 
     // The nodes that store the elements.
     struct node_t : public link_t
diff --git a/src/iunordered_multimap.h b/src/iunordered_multimap.h
index 2d7459eb..2d2ba701 100644
--- a/src/iunordered_multimap.h
+++ b/src/iunordered_multimap.h
@@ -133,7 +133,7 @@ namespace etl
 
     typedef typename parameter_type<TKey>::type key_value_parameter_t;
 
-    typedef etl::forward_link<> link_t; // Default link.
+    typedef etl::forward_link<0> link_t; // Default link.
 
     // The nodes that store the elements.
     struct node_t : public link_t
diff --git a/src/iunordered_multiset.h b/src/iunordered_multiset.h
index 3c32b631..995836b5 100644
--- a/src/iunordered_multiset.h
+++ b/src/iunordered_multiset.h
@@ -130,7 +130,7 @@ namespace etl
 
     typedef typename parameter_type<TKey>::type key_value_parameter_t;
 
-    typedef etl::forward_link<> link_t;
+    typedef etl::forward_link<0> link_t;
 
     // The nodes that store the elements.
     struct node_t : public link_t
diff --git a/src/iunordered_set.h b/src/iunordered_set.h
index 3debe2ad..e11ac9c6 100644
--- a/src/iunordered_set.h
+++ b/src/iunordered_set.h
@@ -130,7 +130,7 @@ namespace etl
 
     typedef typename parameter_type<TKey>::type key_value_parameter_t;
 
-    typedef etl::forward_link<> link_t;
+    typedef etl::forward_link<0> link_t;
 
     // The nodes that store the elements.
     struct node_t : public link_t