diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp
index f29e5155..4be0249b 100644
--- a/include/boost/unordered/detail/implementation.hpp
+++ b/include/boost/unordered/detail/implementation.hpp
@@ -2097,8 +2097,7 @@ namespace boost {
       //
       // all no throw
 
-      template <typename Node>
-      struct l_iterator
+      template <typename Node> struct l_iterator
       {
 #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
         template <typename Node2>
@@ -2157,8 +2156,7 @@ namespace boost {
         }
       };
 
-      template <typename Node>
-      struct cl_iterator
+      template <typename Node> struct cl_iterator
       {
         friend struct boost::unordered::iterator_detail::l_iterator<Node>;
 
@@ -2224,8 +2222,7 @@ namespace boost {
         }
       };
 
-      template <typename Node>
-      struct iterator
+      template <typename Node> struct iterator
       {
 #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
         template <typename>
@@ -2279,8 +2276,7 @@ namespace boost {
         }
       };
 
-      template <typename Node>
-      struct c_iterator
+      template <typename Node> struct c_iterator
       {
         friend struct boost::unordered::iterator_detail::iterator<Node>;
 
@@ -3251,8 +3247,8 @@ namespace boost {
         void delete_buckets()
         {
           if (buckets_) {
-            node_pointer n =
-              static_cast<node_pointer>(get_bucket_pointer(bucket_count_)->next_);
+            node_pointer n = static_cast<node_pointer>(
+              get_bucket_pointer(bucket_count_)->next_);
 
             if (bucket::extra_node) {
               node_pointer next = next_node(n);
@@ -3569,7 +3565,8 @@ namespace boost {
             link_pointer start_node = this->get_previous_start();
 
             if (start_node->next_) {
-              this->get_bucket_pointer(node_bucket(next_node(start_node)))->next_ = n;
+              this->get_bucket_pointer(node_bucket(next_node(start_node)))
+                ->next_ = n;
             }
 
             b->next_ = start_node;
@@ -4092,7 +4089,8 @@ namespace boost {
               link_pointer start_node = this->get_previous_start();
 
               if (start_node->next_) {
-                this->get_bucket_pointer(this->node_bucket(next_node(start_node)))
+                this
+                  ->get_bucket_pointer(this->node_bucket(next_node(start_node)))
                   ->next_ = n;
               }
 
diff --git a/test/helpers/input_iterator.hpp b/test/helpers/input_iterator.hpp
index 6cf7c175..ab1a818b 100644
--- a/test/helpers/input_iterator.hpp
+++ b/test/helpers/input_iterator.hpp
@@ -24,8 +24,7 @@ namespace test {
     proxy& operator=(proxy const&);
   };
 
-  template <class Iterator>
-  struct input_iterator_adaptor
+  template <class Iterator> struct input_iterator_adaptor
   {
     typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::value_type
       value_type;
@@ -65,8 +64,7 @@ namespace test {
     return input_iterator_adaptor<Iterator>(it);
   }
 
-  template <class Iterator>
-  struct copy_iterator_adaptor
+  template <class Iterator> struct copy_iterator_adaptor
   {
     typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::value_type
       value_type;
diff --git a/test/helpers/list.hpp b/test/helpers/list.hpp
index 3c94e279..d39c766e 100644
--- a/test/helpers/list.hpp
+++ b/test/helpers/list.hpp
@@ -81,8 +81,7 @@ namespace test {
       list_data& operator=(list_data const&);
     };
 
-    template <typename T>
-    class list_iterator
+    template <typename T> class list_iterator
     {
       friend class list_const_iterator<T>;
       friend class test::list<T>;
@@ -118,8 +117,7 @@ namespace test {
       bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
     };
 
-    template <typename T>
-    class list_const_iterator
+    template <typename T> class list_const_iterator
     {
       friend class list_iterator<T>;
       friend class test::list<T>;