diff --git a/include/etl/flat_multimap.h b/include/etl/flat_multimap.h
index d6c3aefc..8244862f 100644
--- a/include/etl/flat_multimap.h
+++ b/include/etl/flat_multimap.h
@@ -499,7 +499,7 @@ namespace etl
     //*********************************************************************
     size_t count(key_parameter_t key) const
     {
-      return refmap_t::count(key);;
+      return refmap_t::count(key);
     }
 
     //*********************************************************************
diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
index 49ec0e97..57d0c565 100644
--- a/include/etl/intrusive_forward_list.h
+++ b/include/etl/intrusive_forward_list.h
@@ -248,7 +248,7 @@ namespace etl
     //*************************************************************************
     bool is_trivial_list() const
     {
-      return (start_link.link_type::etl_next == nullptr) || (start_link.link_type::etl_next->etl_next == nullptr);;
+      return (start_link.link_type::etl_next == nullptr) || (start_link.link_type::etl_next->etl_next == nullptr);
     }
 
     //*************************************************************************
@@ -598,7 +598,7 @@ namespace etl
     //*************************************************************************
     const_reference front() const
     {
-      return static_cast<const value_type&>(*(this->get_head()));;
+      return static_cast<const value_type&>(*(this->get_head()));
     }
 
     //*************************************************************************
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
index 9c5c2ef0..b7b575b1 100644
--- a/include/etl/intrusive_list.h
+++ b/include/etl/intrusive_list.h
@@ -667,7 +667,7 @@ namespace etl
     //*************************************************************************
     const_reference front() const
     {
-      return *static_cast<const value_type*>(this->get_head());;
+      return *static_cast<const value_type*>(this->get_head());
     }
 
     //*************************************************************************
@@ -683,7 +683,7 @@ namespace etl
     //*************************************************************************
     const_reference back() const
     {
-      return *static_cast<const value_type*>(this->get_tail());;
+      return *static_cast<const value_type*>(this->get_tail());
     }
 
     //*************************************************************************
diff --git a/include/etl/queue_mpmc_mutex.h b/include/etl/queue_mpmc_mutex.h
index 16ec5e53..35279d11 100644
--- a/include/etl/queue_mpmc_mutex.h
+++ b/include/etl/queue_mpmc_mutex.h
@@ -308,7 +308,7 @@ namespace etl
       value = p_buffer[read_index];
       p_buffer[read_index].~T();
 
-      read_index = get_next_index(read_index, MAX_SIZE);;
+      read_index = get_next_index(read_index, MAX_SIZE);
 
       --current_size;
 
diff --git a/include/etl/queue_spsc_isr.h b/include/etl/queue_spsc_isr.h
index dc5922cb..d09f6c37 100644
--- a/include/etl/queue_spsc_isr.h
+++ b/include/etl/queue_spsc_isr.h
@@ -193,7 +193,7 @@ namespace etl
       value = p_buffer[read_index];
       p_buffer[read_index].~T();
 
-      read_index = get_next_index(read_index, MAX_SIZE);;
+      read_index = get_next_index(read_index, MAX_SIZE);
 
       --current_size;
 
diff --git a/include/etl/reference_flat_multiset.h b/include/etl/reference_flat_multiset.h
index 1cf5ca32..8c63f6ff 100644
--- a/include/etl/reference_flat_multiset.h
+++ b/include/etl/reference_flat_multiset.h
@@ -548,7 +548,7 @@ namespace etl
     //*********************************************************************
     void erase(iterator first, iterator last)
     {
-      lookup.erase(first.ilookup, last.ilookup);;
+      lookup.erase(first.ilookup, last.ilookup);
     }
 
     //*************************************************************************
diff --git a/include/etl/reference_flat_set.h b/include/etl/reference_flat_set.h
index cfbc4793..7e934307 100644
--- a/include/etl/reference_flat_set.h
+++ b/include/etl/reference_flat_set.h
@@ -528,7 +528,7 @@ namespace etl
     //*********************************************************************
     void erase(iterator first, iterator last)
     {
-      lookup.erase(first.ilookup, last.ilookup);;
+      lookup.erase(first.ilookup, last.ilookup);
     }
 
     //*************************************************************************
diff --git a/include/etl/stl/alternate/limits.h b/include/etl/stl/alternate/limits.h
index 231d7736..5d9677d5 100644
--- a/include/etl/stl/alternate/limits.h
+++ b/include/etl/stl/alternate/limits.h
@@ -121,7 +121,7 @@ SOFTWARE.
 
   template <typename T> const bool etl_integral_type<T>::is_specialized = true;
   template <typename T> const int etl_integral_type<T>::digits = (CHAR_BIT * sizeof(T)) - (etl::is_signed<T>::value ? 1 : 0);
-  template <typename T> const int etl_integral_type<T>::digits10 = ETL_LOG2(digits);;
+  template <typename T> const int etl_integral_type<T>::digits10 = ETL_LOG2(digits);
   template <typename T> const int etl_integral_type<T>::max_digits10 = 0;
   template <typename T> const bool etl_integral_type<T>::is_signed = etl::is_signed<T>::value;
   template <typename T> const bool etl_integral_type<T>::is_integer = true;
diff --git a/include/etl/string_view.h b/include/etl/string_view.h
index 10240fed..39ccd7ff 100644
--- a/include/etl/string_view.h
+++ b/include/etl/string_view.h
@@ -630,17 +630,17 @@ namespace etl
 
     size_type find_last_of(T c, size_type position = npos) const
     {
-      return find_last_of(etl::basic_string_view<T, TTraits>(&c, 1), position);;
+      return find_last_of(etl::basic_string_view<T, TTraits>(&c, 1), position);
     }
 
     size_type find_last_of(const T* text, size_type position, size_type count) const
     {
-      return find_last_of(etl::basic_string_view<T, TTraits>(text, count), position);;
+      return find_last_of(etl::basic_string_view<T, TTraits>(text, count), position);
     }
 
     size_type find_last_of(const T* text, size_type position = npos) const
     {
-      return find_last_of(etl::basic_string_view<T, TTraits>(text), position);;
+      return find_last_of(etl::basic_string_view<T, TTraits>(text), position);
     }
 
     //*************************************************************************
@@ -733,17 +733,17 @@ namespace etl
 
     size_type find_last_not_of(T c, size_type position = npos) const
     {
-      return find_last_not_of(etl::basic_string_view<T, TTraits>(&c, 1), position);;
+      return find_last_not_of(etl::basic_string_view<T, TTraits>(&c, 1), position);
     }
 
     size_type find_last_not_of(const T* text, size_type position, size_type count) const
     {
-      return find_last_not_of(etl::basic_string_view<T, TTraits>(text, count), position);;
+      return find_last_not_of(etl::basic_string_view<T, TTraits>(text, count), position);
     }
 
     size_type find_last_not_of(const T* text, size_type position = npos) const
     {
-      return find_last_not_of(etl::basic_string_view<T, TTraits>(text), position);;
+      return find_last_not_of(etl::basic_string_view<T, TTraits>(text), position);
     }
 
     //*************************************************************************