diff --git a/include/sqlpp11/aggregate_functions/avg.h b/include/sqlpp11/aggregate_functions/avg.h
index b7f75feb..515e4225 100644
--- a/include/sqlpp11/aggregate_functions/avg.h
+++ b/include/sqlpp11/aggregate_functions/avg.h
@@ -123,6 +123,6 @@ namespace sqlpp
     static_assert(is_numeric_t<wrap_operand_t<T>>::value, "avg() requires a numeric value expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/aggregate_functions/count.h b/include/sqlpp11/aggregate_functions/count.h
index 8ff040e0..272e3c06 100644
--- a/include/sqlpp11/aggregate_functions/count.h
+++ b/include/sqlpp11/aggregate_functions/count.h
@@ -124,6 +124,6 @@ namespace sqlpp
     static_assert(is_expression_t<wrap_operand_t<T>>::value, "count() requires an expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/aggregate_functions/max.h b/include/sqlpp11/aggregate_functions/max.h
index 563faf25..16faaa47 100644
--- a/include/sqlpp11/aggregate_functions/max.h
+++ b/include/sqlpp11/aggregate_functions/max.h
@@ -100,6 +100,6 @@ namespace sqlpp
     static_assert(is_expression_t<wrap_operand_t<T>>::value, "max() requires an expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/aggregate_functions/min.h b/include/sqlpp11/aggregate_functions/min.h
index 5e7795bd..37604e03 100644
--- a/include/sqlpp11/aggregate_functions/min.h
+++ b/include/sqlpp11/aggregate_functions/min.h
@@ -100,6 +100,6 @@ namespace sqlpp
     static_assert(is_expression_t<wrap_operand_t<T>>::value, "min() requires an expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/aggregate_functions/sum.h b/include/sqlpp11/aggregate_functions/sum.h
index fe019144..b7a48c10 100644
--- a/include/sqlpp11/aggregate_functions/sum.h
+++ b/include/sqlpp11/aggregate_functions/sum.h
@@ -122,6 +122,6 @@ namespace sqlpp
     static_assert(is_numeric_t<wrap_operand_t<T>>::value, "sum() requires a numeric expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/alias.h b/include/sqlpp11/alias.h
index 7f2eb254..197862cf 100644
--- a/include/sqlpp11/alias.h
+++ b/include/sqlpp11/alias.h
@@ -70,6 +70,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/alias_operators.h b/include/sqlpp11/alias_operators.h
index 28fec0c0..b5b40074 100644
--- a/include/sqlpp11/alias_operators.h
+++ b/include/sqlpp11/alias_operators.h
@@ -40,5 +40,5 @@ namespace sqlpp
       return {*static_cast<const Expr*>(this)};
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/alias_provider.h b/include/sqlpp11/alias_provider.h
index 168af8ca..b77a9e20 100644
--- a/include/sqlpp11/alias_provider.h
+++ b/include/sqlpp11/alias_provider.h
@@ -100,7 +100,7 @@ namespace sqlpp
     SQLPP_ALIAS_PROVIDER(z)
     SQLPP_ALIAS_PROVIDER(left)
     SQLPP_ALIAS_PROVIDER(right)
-  }
-}
+  }  // namespace alias
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/all_of.h b/include/sqlpp11/all_of.h
index 47808d20..5de0a4fa 100644
--- a/include/sqlpp11/all_of.h
+++ b/include/sqlpp11/all_of.h
@@ -65,6 +65,6 @@ namespace sqlpp
       _serialize_check{};
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/any.h b/include/sqlpp11/any.h
index d232b19e..d8e86d04 100644
--- a/include/sqlpp11/any.h
+++ b/include/sqlpp11/any.h
@@ -76,6 +76,6 @@ namespace sqlpp
     // FIXME: can we accept non-values like NULL here?
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/assignment.h b/include/sqlpp11/assignment.h
index 37d8959d..529d20ae 100644
--- a/include/sqlpp11/assignment.h
+++ b/include/sqlpp11/assignment.h
@@ -77,6 +77,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/auto_alias.h b/include/sqlpp11/auto_alias.h
index 43caeb4e..f54628c5 100644
--- a/include/sqlpp11/auto_alias.h
+++ b/include/sqlpp11/auto_alias.h
@@ -56,10 +56,10 @@ namespace sqlpp
     {
       using type = expression_alias_t<T, typename T::_auto_alias_t>;
     };
-  }
+  }  // namespace detail
 
   template <typename T>
   using auto_alias_t = typename detail::auto_alias_impl<T>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/bad_expression.h b/include/sqlpp11/bad_expression.h
index 289d4f01..fa389420 100644
--- a/include/sqlpp11/bad_expression.h
+++ b/include/sqlpp11/bad_expression.h
@@ -53,6 +53,6 @@ namespace sqlpp
 
     static Context& _(const T&, Context&);
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/basic_expression_operators.h b/include/sqlpp11/basic_expression_operators.h
index 9798dba3..f4665b73 100644
--- a/include/sqlpp11/basic_expression_operators.h
+++ b/include/sqlpp11/basic_expression_operators.h
@@ -82,7 +82,7 @@ namespace sqlpp
     {
       using type = Expr<wrap_operand_t<Lhs>, wrap_operand_t<Rhs>>;
     };
-  }
+  }  // namespace detail
   template <template <typename Lhs, typename Rhs> class Expr, typename Lhs, typename Rhs>
   using comparison_expression_t =
       typename detail::comparison_expression_impl<check_comparison_t<Lhs, Rhs>::value, Expr, Lhs, Rhs>::type;
@@ -100,7 +100,7 @@ namespace sqlpp
     {
       using type = Expr<Lhs, Rhs...>;
     };
-  }
+  }  // namespace detail
   template <typename Check, template <typename Lhs, typename... Rhs> class Expr, typename Lhs, typename... Rhs>
   using in_expression_t = typename detail::in_expression_impl<Check::value, Expr, Lhs, Rhs...>::type;
 
@@ -300,6 +300,6 @@ namespace sqlpp
       return {*static_cast<const Expr*>(this)};
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/boolean_expression.h b/include/sqlpp11/boolean_expression.h
index db6ebab8..a7fcd4f1 100644
--- a/include/sqlpp11/boolean_expression.h
+++ b/include/sqlpp11/boolean_expression.h
@@ -78,6 +78,6 @@ namespace sqlpp
       return serialize(t._expr, context);
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/case.h b/include/sqlpp11/case.h
index cad77291..76daddd4 100644
--- a/include/sqlpp11/case.h
+++ b/include/sqlpp11/case.h
@@ -179,13 +179,13 @@ namespace sqlpp
 
     template <typename Check, typename When>
     auto case_when_impl(Check, When when) -> inconsistent<Check>;
-  }
+  }  // namespace detail
 
   template <typename When>
   auto case_when(When when) -> decltype(detail::case_when_impl(check_case_when_t<When>{}, when))
   {
     return detail::case_when_impl(check_case_when_t<When>{}, when);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/char_sequence.h b/include/sqlpp11/char_sequence.h
index 9b2a8796..58d294dd 100644
--- a/include/sqlpp11/char_sequence.h
+++ b/include/sqlpp11/char_sequence.h
@@ -53,6 +53,6 @@ namespace sqlpp
   template <std::size_t N, const char (&Input)[N]>
   using make_char_sequence =
       typename make_char_sequence_impl<sizeof(Input), Input, sqlpp::detail::make_index_sequence<sizeof(Input)>>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/chrono.h b/include/sqlpp11/chrono.h
index f6f8b4f0..157f51eb 100644
--- a/include/sqlpp11/chrono.h
+++ b/include/sqlpp11/chrono.h
@@ -51,7 +51,7 @@ namespace sqlpp
       const auto dp = floor<days>(t);
       return std::chrono::duration_cast<std::chrono::microseconds>(::date::make_time(t - dp).to_duration());
     }
-  }
-}
+  }  // namespace chrono
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/column.h b/include/sqlpp11/column.h
index 95c3ddb2..d12146ff 100644
--- a/include/sqlpp11/column.h
+++ b/include/sqlpp11/column.h
@@ -129,6 +129,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/column_fwd.h b/include/sqlpp11/column_fwd.h
index 46dd5b8a..68f025ca 100644
--- a/include/sqlpp11/column_fwd.h
+++ b/include/sqlpp11/column_fwd.h
@@ -31,6 +31,6 @@ namespace sqlpp
 {
   template <typename Table, typename ColumnSpec>
   struct column_t;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/connection.h b/include/sqlpp11/connection.h
index 7c30ad95..b569fd4a 100644
--- a/include/sqlpp11/connection.h
+++ b/include/sqlpp11/connection.h
@@ -32,6 +32,6 @@ namespace sqlpp
   struct connection
   {
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/consistent.h b/include/sqlpp11/consistent.h
index a49a13a5..6dbc8eb9 100644
--- a/include/sqlpp11/consistent.h
+++ b/include/sqlpp11/consistent.h
@@ -35,6 +35,6 @@ namespace sqlpp
   {
     static void _(){};
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/cte.h b/include/sqlpp11/cte.h
index 6ed4fd87..a57777b6 100644
--- a/include/sqlpp11/cte.h
+++ b/include/sqlpp11/cte.h
@@ -289,6 +289,6 @@ namespace sqlpp
   {
     return {};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/custom_query.h b/include/sqlpp11/custom_query.h
index 97cdcbd6..77f8ca45 100644
--- a/include/sqlpp11/custom_query.h
+++ b/include/sqlpp11/custom_query.h
@@ -59,7 +59,7 @@ namespace sqlpp
       using _result_type_provider = typename unhide<_maybe_hidden_result_type_provider>::type;
       using _result_methods_t = typename _result_type_provider::template _result_methods_t<_result_type_provider>;
     };
-  }
+  }  // namespace detail
 
   template <typename Database, typename... Parts>
   struct custom_query_t : private detail::custom_parts_t<Database, Parts...>::_result_methods_t
@@ -150,5 +150,5 @@ namespace sqlpp
 
     return custom_query_t<Database, wrap_operand_t<Parts>...>(parts...);
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/boolean/column_operators.h b/include/sqlpp11/data_types/boolean/column_operators.h
index 7a09d04e..3175a676 100644
--- a/include/sqlpp11/data_types/boolean/column_operators.h
+++ b/include/sqlpp11/data_types/boolean/column_operators.h
@@ -37,5 +37,5 @@ namespace sqlpp
   struct column_operators<Column, boolean>
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/boolean/data_type.h b/include/sqlpp11/data_types/boolean/data_type.h
index 4b445d27..dc8929db 100644
--- a/include/sqlpp11/data_types/boolean/data_type.h
+++ b/include/sqlpp11/data_types/boolean/data_type.h
@@ -41,6 +41,6 @@ namespace sqlpp
   };
 
   using bit = sqlpp::boolean;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/boolean/expression_operators.h b/include/sqlpp11/data_types/boolean/expression_operators.h
index 01bff9e0..246f56a0 100644
--- a/include/sqlpp11/data_types/boolean/expression_operators.h
+++ b/include/sqlpp11/data_types/boolean/expression_operators.h
@@ -59,6 +59,6 @@ namespace sqlpp
     using check = consistent_t;
     using type = logical_not_t<wrap_operand_t<T>>;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/boolean/operand.h b/include/sqlpp11/data_types/boolean/operand.h
index c5e68c01..da68d711 100644
--- a/include/sqlpp11/data_types/boolean/operand.h
+++ b/include/sqlpp11/data_types/boolean/operand.h
@@ -77,6 +77,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/boolean/parameter_value.h b/include/sqlpp11/data_types/boolean/parameter_value.h
index c233ec25..ee6375d0 100644
--- a/include/sqlpp11/data_types/boolean/parameter_value.h
+++ b/include/sqlpp11/data_types/boolean/parameter_value.h
@@ -47,6 +47,6 @@ namespace sqlpp
       target._bind_boolean_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/boolean/result_field.h b/include/sqlpp11/data_types/boolean/result_field.h
index 505ee062..a2c6db39 100644
--- a/include/sqlpp11/data_types/boolean/result_field.h
+++ b/include/sqlpp11/data_types/boolean/result_field.h
@@ -51,6 +51,6 @@ namespace sqlpp
       target._post_bind_boolean_result(index, &this->_value, &this->_is_null);
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/boolean/wrap_operand.h b/include/sqlpp11/data_types/boolean/wrap_operand.h
index 70bb44ed..3b66b452 100644
--- a/include/sqlpp11/data_types/boolean/wrap_operand.h
+++ b/include/sqlpp11/data_types/boolean/wrap_operand.h
@@ -38,6 +38,6 @@ namespace sqlpp
   {
     using type = boolean_operand;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/column_operators.h b/include/sqlpp11/data_types/column_operators.h
index cfb77dde..1273c465 100644
--- a/include/sqlpp11/data_types/column_operators.h
+++ b/include/sqlpp11/data_types/column_operators.h
@@ -36,6 +36,6 @@ namespace sqlpp
   {
     static_assert(wrong_t<column_operators>::value, "Missing column operators for ValueType");
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/day_point/column_operators.h b/include/sqlpp11/data_types/day_point/column_operators.h
index 42c11b2e..ea1fda0a 100644
--- a/include/sqlpp11/data_types/day_point/column_operators.h
+++ b/include/sqlpp11/data_types/day_point/column_operators.h
@@ -40,5 +40,5 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = is_valid_operand<day_point, T>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/day_point/data_type.h b/include/sqlpp11/data_types/day_point/data_type.h
index e0842bc0..0cddf09c 100644
--- a/include/sqlpp11/data_types/day_point/data_type.h
+++ b/include/sqlpp11/data_types/day_point/data_type.h
@@ -44,5 +44,5 @@ namespace sqlpp
   };
 
   using date = day_point;
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/day_point/expression_operators.h b/include/sqlpp11/data_types/day_point/expression_operators.h
index 4abaec98..2ff20718 100644
--- a/include/sqlpp11/data_types/day_point/expression_operators.h
+++ b/include/sqlpp11/data_types/day_point/expression_operators.h
@@ -38,5 +38,5 @@ namespace sqlpp
   struct expression_operators<Expression, day_point> : public basic_expression_operators<Expression>
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/day_point/operand.h b/include/sqlpp11/data_types/day_point/operand.h
index 58dd86a0..e913eb90 100644
--- a/include/sqlpp11/data_types/day_point/operand.h
+++ b/include/sqlpp11/data_types/day_point/operand.h
@@ -80,5 +80,5 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/day_point/parameter_value.h b/include/sqlpp11/data_types/day_point/parameter_value.h
index e60013c5..bb8b5387 100644
--- a/include/sqlpp11/data_types/day_point/parameter_value.h
+++ b/include/sqlpp11/data_types/day_point/parameter_value.h
@@ -49,5 +49,5 @@ namespace sqlpp
       target._bind_date_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/day_point/result_field.h b/include/sqlpp11/data_types/day_point/result_field.h
index 219a0844..520615ee 100644
--- a/include/sqlpp11/data_types/day_point/result_field.h
+++ b/include/sqlpp11/data_types/day_point/result_field.h
@@ -68,5 +68,5 @@ namespace sqlpp
     }
     return os;
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/day_point/wrap_operand.h b/include/sqlpp11/data_types/day_point/wrap_operand.h
index f083cde9..7e4f61c4 100644
--- a/include/sqlpp11/data_types/day_point/wrap_operand.h
+++ b/include/sqlpp11/data_types/day_point/wrap_operand.h
@@ -41,5 +41,5 @@ namespace sqlpp
   {
     using type = day_point_operand;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/column_operators.h b/include/sqlpp11/data_types/floating_point/column_operators.h
index bac7af5b..1949da6e 100644
--- a/include/sqlpp11/data_types/floating_point/column_operators.h
+++ b/include/sqlpp11/data_types/floating_point/column_operators.h
@@ -76,5 +76,5 @@ namespace sqlpp
       return {*static_cast<const Column*>(this), {*static_cast<const Column*>(this), rhs{t}}};
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/data_type.h b/include/sqlpp11/data_types/floating_point/data_type.h
index c99c4a0a..daacd358 100644
--- a/include/sqlpp11/data_types/floating_point/data_type.h
+++ b/include/sqlpp11/data_types/floating_point/data_type.h
@@ -39,5 +39,5 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = is_numeric_t<T>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/expression_operators.h b/include/sqlpp11/data_types/floating_point/expression_operators.h
index bb672cdd..063cf6e3 100644
--- a/include/sqlpp11/data_types/floating_point/expression_operators.h
+++ b/include/sqlpp11/data_types/floating_point/expression_operators.h
@@ -82,5 +82,5 @@ namespace sqlpp
     using check = consistent_t;
     using type = unary_minus_t<floating_point, wrap_operand_t<T>>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/operand.h b/include/sqlpp11/data_types/floating_point/operand.h
index e90b13ae..5a375288 100644
--- a/include/sqlpp11/data_types/floating_point/operand.h
+++ b/include/sqlpp11/data_types/floating_point/operand.h
@@ -75,5 +75,5 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/parameter_value.h b/include/sqlpp11/data_types/floating_point/parameter_value.h
index 86fa39c0..11df153f 100644
--- a/include/sqlpp11/data_types/floating_point/parameter_value.h
+++ b/include/sqlpp11/data_types/floating_point/parameter_value.h
@@ -49,5 +49,5 @@ namespace sqlpp
       target._bind_floating_point_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/result_field.h b/include/sqlpp11/data_types/floating_point/result_field.h
index 0c413539..2d298337 100644
--- a/include/sqlpp11/data_types/floating_point/result_field.h
+++ b/include/sqlpp11/data_types/floating_point/result_field.h
@@ -52,5 +52,5 @@ namespace sqlpp
       target._post_bind_floating_point_result(index, &this->_value, &this->_is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/floating_point/wrap_operand.h b/include/sqlpp11/data_types/floating_point/wrap_operand.h
index f8b53e40..3d79b160 100644
--- a/include/sqlpp11/data_types/floating_point/wrap_operand.h
+++ b/include/sqlpp11/data_types/floating_point/wrap_operand.h
@@ -39,5 +39,5 @@ namespace sqlpp
   {
     using type = floating_point_operand;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/integral/column_operators.h b/include/sqlpp11/data_types/integral/column_operators.h
index 2512c925..75872df5 100644
--- a/include/sqlpp11/data_types/integral/column_operators.h
+++ b/include/sqlpp11/data_types/integral/column_operators.h
@@ -77,6 +77,6 @@ namespace sqlpp
       return {*static_cast<const Column*>(this), {{*static_cast<const Column*>(this), rhs{t}}}};
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/integral/data_type.h b/include/sqlpp11/data_types/integral/data_type.h
index 59993fc7..957f8428 100644
--- a/include/sqlpp11/data_types/integral/data_type.h
+++ b/include/sqlpp11/data_types/integral/data_type.h
@@ -44,5 +44,5 @@ namespace sqlpp
   using smallint = integral;
   using integer = integral;
   using bigint = integral;
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/integral/expression_operators.h b/include/sqlpp11/data_types/integral/expression_operators.h
index a984447e..79006c2b 100644
--- a/include/sqlpp11/data_types/integral/expression_operators.h
+++ b/include/sqlpp11/data_types/integral/expression_operators.h
@@ -132,5 +132,5 @@ namespace sqlpp
     using check = consistent_t;
     using type = bitwise_or_t<wrap_operand_t<L>, integral, wrap_operand_t<R>>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/integral/operand.h b/include/sqlpp11/data_types/integral/operand.h
index 5e8e11b3..06a00e14 100644
--- a/include/sqlpp11/data_types/integral/operand.h
+++ b/include/sqlpp11/data_types/integral/operand.h
@@ -77,6 +77,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/integral/parameter_value.h b/include/sqlpp11/data_types/integral/parameter_value.h
index 1f00cc40..af98bb62 100644
--- a/include/sqlpp11/data_types/integral/parameter_value.h
+++ b/include/sqlpp11/data_types/integral/parameter_value.h
@@ -47,5 +47,5 @@ namespace sqlpp
       target._bind_integral_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/integral/result_field.h b/include/sqlpp11/data_types/integral/result_field.h
index a9d52fb1..aee172f9 100644
--- a/include/sqlpp11/data_types/integral/result_field.h
+++ b/include/sqlpp11/data_types/integral/result_field.h
@@ -51,5 +51,5 @@ namespace sqlpp
       target._post_bind_integral_result(index, &this->_value, &this->_is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/integral/wrap_operand.h b/include/sqlpp11/data_types/integral/wrap_operand.h
index 97148087..7be263e2 100644
--- a/include/sqlpp11/data_types/integral/wrap_operand.h
+++ b/include/sqlpp11/data_types/integral/wrap_operand.h
@@ -41,5 +41,5 @@ namespace sqlpp
   {
     using type = integral_operand;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/no_value/column_operators.h b/include/sqlpp11/data_types/no_value/column_operators.h
index d9a0dad1..10cf4ff8 100644
--- a/include/sqlpp11/data_types/no_value/column_operators.h
+++ b/include/sqlpp11/data_types/no_value/column_operators.h
@@ -37,5 +37,5 @@ namespace sqlpp
   struct column_operators<Base, no_value_t>
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/no_value/data_type.h b/include/sqlpp11/data_types/no_value/data_type.h
index 582c6063..8deb6bed 100644
--- a/include/sqlpp11/data_types/no_value/data_type.h
+++ b/include/sqlpp11/data_types/no_value/data_type.h
@@ -39,6 +39,6 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = wrong_t<T>;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/no_value/expression_operators.h b/include/sqlpp11/data_types/no_value/expression_operators.h
index 09cb55fe..ffd1552a 100644
--- a/include/sqlpp11/data_types/no_value/expression_operators.h
+++ b/include/sqlpp11/data_types/no_value/expression_operators.h
@@ -37,6 +37,6 @@ namespace sqlpp
   struct expression_operators<Expression, no_value_t> : public basic_expression_operators<Expression>
   {
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/no_value/operand.h b/include/sqlpp11/data_types/no_value/operand.h
index a74c105d..625e40d8 100644
--- a/include/sqlpp11/data_types/no_value/operand.h
+++ b/include/sqlpp11/data_types/no_value/operand.h
@@ -27,9 +27,4 @@
 #ifndef SQLPP11_DATA_TYPES_NO_VALUE_OPERAND_H
 #define SQLPP11_DATA_TYPES_NO_VALUE_OPERAND_H
 
-namespace sqlpp
-{
-  // There is no no_value operand
-}
-
 #endif
diff --git a/include/sqlpp11/data_types/no_value/parameter_value.h b/include/sqlpp11/data_types/no_value/parameter_value.h
index 3c6c2129..8c8f9916 100644
--- a/include/sqlpp11/data_types/no_value/parameter_value.h
+++ b/include/sqlpp11/data_types/no_value/parameter_value.h
@@ -27,9 +27,4 @@
 #ifndef SQLPP11_DATA_TYPES_NO_VALUE_PARAMETER_VALUE_H
 #define SQLPP11_DATA_TYPES_NO_VALUE_PARAMETER_VALUE_H
 
-namespace sqlpp
-{
-  // There is no no_value parameter
-}
-
 #endif
diff --git a/include/sqlpp11/data_types/no_value/result_field.h b/include/sqlpp11/data_types/no_value/result_field.h
index 45b59dc4..c1829f3e 100644
--- a/include/sqlpp11/data_types/no_value/result_field.h
+++ b/include/sqlpp11/data_types/no_value/result_field.h
@@ -67,6 +67,6 @@ namespace sqlpp
     os << "NULL";
     return os;
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/no_value/wrap_operand.h b/include/sqlpp11/data_types/no_value/wrap_operand.h
index e372f302..3814d04e 100644
--- a/include/sqlpp11/data_types/no_value/wrap_operand.h
+++ b/include/sqlpp11/data_types/no_value/wrap_operand.h
@@ -27,9 +27,4 @@
 #ifndef SQLPP11_DATA_TYPES_NO_VALUE_WRAP_OPERAND_H
 #define SQLPP11_DATA_TYPES_NO_VALUE_WRAP_OPERAND_H
 
-namespace sqlpp
-{
-  // There is no no_value operand
-}
-
 #endif
diff --git a/include/sqlpp11/data_types/parameter_value.h b/include/sqlpp11/data_types/parameter_value.h
index a2cffacc..c5841f75 100644
--- a/include/sqlpp11/data_types/parameter_value.h
+++ b/include/sqlpp11/data_types/parameter_value.h
@@ -36,6 +36,6 @@ namespace sqlpp
   {
     static_assert(wrong_t<parameter_value_t>::value, "Missing parameter value type for ValueType");
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/parameter_value_base.h b/include/sqlpp11/data_types/parameter_value_base.h
index 239a46f1..b75f78ca 100644
--- a/include/sqlpp11/data_types/parameter_value_base.h
+++ b/include/sqlpp11/data_types/parameter_value_base.h
@@ -94,5 +94,5 @@ namespace sqlpp
     _cpp_storage_type _value;
     bool _is_null;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/column_operators.h b/include/sqlpp11/data_types/text/column_operators.h
index b54ec011..8e1f7650 100644
--- a/include/sqlpp11/data_types/text/column_operators.h
+++ b/include/sqlpp11/data_types/text/column_operators.h
@@ -53,5 +53,5 @@ namespace sqlpp
               concat_t<Column, wrap_operand_t<T>>{*static_cast<const Column*>(this), rhs{t}}};
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/concat.h b/include/sqlpp11/data_types/text/concat.h
index 5b0fc86d..6102cc24 100644
--- a/include/sqlpp11/data_types/text/concat.h
+++ b/include/sqlpp11/data_types/text/concat.h
@@ -98,6 +98,6 @@ namespace sqlpp
 
     return {args...};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/text/data_type.h b/include/sqlpp11/data_types/text/data_type.h
index 7ced686c..d3ed84eb 100644
--- a/include/sqlpp11/data_types/text/data_type.h
+++ b/include/sqlpp11/data_types/text/data_type.h
@@ -45,5 +45,5 @@ namespace sqlpp
   using char_ = text;
   using binary = text;
   using varbinary = text;
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/expression_operators.h b/include/sqlpp11/data_types/text/expression_operators.h
index 4fac75d1..6802a795 100644
--- a/include/sqlpp11/data_types/text/expression_operators.h
+++ b/include/sqlpp11/data_types/text/expression_operators.h
@@ -76,5 +76,5 @@ namespace sqlpp
     using check = consistent_t;
     using type = concat_t<wrap_operand_t<L>, wrap_operand_t<R>>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/like.h b/include/sqlpp11/data_types/text/like.h
index 35d1b2ad..288e4cdb 100644
--- a/include/sqlpp11/data_types/text/like.h
+++ b/include/sqlpp11/data_types/text/like.h
@@ -93,6 +93,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/text/operand.h b/include/sqlpp11/data_types/text/operand.h
index f78fde2b..32014139 100644
--- a/include/sqlpp11/data_types/text/operand.h
+++ b/include/sqlpp11/data_types/text/operand.h
@@ -78,5 +78,5 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/parameter_value.h b/include/sqlpp11/data_types/text/parameter_value.h
index 4a17c17a..cf7bbf07 100644
--- a/include/sqlpp11/data_types/text/parameter_value.h
+++ b/include/sqlpp11/data_types/text/parameter_value.h
@@ -49,5 +49,5 @@ namespace sqlpp
       target._bind_text_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/result_field.h b/include/sqlpp11/data_types/text/result_field.h
index a3841a86..d75e4941 100644
--- a/include/sqlpp11/data_types/text/result_field.h
+++ b/include/sqlpp11/data_types/text/result_field.h
@@ -79,5 +79,5 @@ namespace sqlpp
       return os << e.value();
     }
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/text/wrap_operand.h b/include/sqlpp11/data_types/text/wrap_operand.h
index abc048c6..c2318e43 100644
--- a/include/sqlpp11/data_types/text/wrap_operand.h
+++ b/include/sqlpp11/data_types/text/wrap_operand.h
@@ -42,5 +42,5 @@ namespace sqlpp
   {
     using type = text_operand;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/column_operators.h b/include/sqlpp11/data_types/time_of_day/column_operators.h
index 4c6e9bd7..f0e9f023 100644
--- a/include/sqlpp11/data_types/time_of_day/column_operators.h
+++ b/include/sqlpp11/data_types/time_of_day/column_operators.h
@@ -40,5 +40,5 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = is_valid_operand<time_of_day, T>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/data_type.h b/include/sqlpp11/data_types/time_of_day/data_type.h
index 8a951c93..96881446 100644
--- a/include/sqlpp11/data_types/time_of_day/data_type.h
+++ b/include/sqlpp11/data_types/time_of_day/data_type.h
@@ -40,5 +40,5 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = is_time_of_day_t<T>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/expression_operators.h b/include/sqlpp11/data_types/time_of_day/expression_operators.h
index 6c089450..388ae1d8 100644
--- a/include/sqlpp11/data_types/time_of_day/expression_operators.h
+++ b/include/sqlpp11/data_types/time_of_day/expression_operators.h
@@ -39,5 +39,5 @@ namespace sqlpp
   struct expression_operators<Expression, time_of_day> : public basic_expression_operators<Expression>
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/operand.h b/include/sqlpp11/data_types/time_of_day/operand.h
index bf5f2c74..b628b95c 100644
--- a/include/sqlpp11/data_types/time_of_day/operand.h
+++ b/include/sqlpp11/data_types/time_of_day/operand.h
@@ -79,5 +79,5 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/parameter_value.h b/include/sqlpp11/data_types/time_of_day/parameter_value.h
index e694edf8..e062c32f 100644
--- a/include/sqlpp11/data_types/time_of_day/parameter_value.h
+++ b/include/sqlpp11/data_types/time_of_day/parameter_value.h
@@ -49,5 +49,5 @@ namespace sqlpp
       target._bind_time_of_day_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/result_field.h b/include/sqlpp11/data_types/time_of_day/result_field.h
index 6570a607..17e6bfd8 100644
--- a/include/sqlpp11/data_types/time_of_day/result_field.h
+++ b/include/sqlpp11/data_types/time_of_day/result_field.h
@@ -68,5 +68,5 @@ namespace sqlpp
     }
     return os;
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_of_day/wrap_operand.h b/include/sqlpp11/data_types/time_of_day/wrap_operand.h
index 902e970d..b4faf20c 100644
--- a/include/sqlpp11/data_types/time_of_day/wrap_operand.h
+++ b/include/sqlpp11/data_types/time_of_day/wrap_operand.h
@@ -37,5 +37,5 @@ namespace sqlpp
   {
     using type = time_of_day_operand<std::chrono::duration<Rep, Period>>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/column_operators.h b/include/sqlpp11/data_types/time_point/column_operators.h
index d95c3e14..96896a30 100644
--- a/include/sqlpp11/data_types/time_point/column_operators.h
+++ b/include/sqlpp11/data_types/time_point/column_operators.h
@@ -40,5 +40,5 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = is_valid_operand<time_point, T>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/data_type.h b/include/sqlpp11/data_types/time_point/data_type.h
index 01cdb574..6021b222 100644
--- a/include/sqlpp11/data_types/time_point/data_type.h
+++ b/include/sqlpp11/data_types/time_point/data_type.h
@@ -40,5 +40,5 @@ namespace sqlpp
     template <typename T>
     using _is_valid_operand = is_day_or_time_point_t<T>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/expression_operators.h b/include/sqlpp11/data_types/time_point/expression_operators.h
index 6c481cd1..5e4c0b4a 100644
--- a/include/sqlpp11/data_types/time_point/expression_operators.h
+++ b/include/sqlpp11/data_types/time_point/expression_operators.h
@@ -39,5 +39,5 @@ namespace sqlpp
   struct expression_operators<Expression, time_point> : public basic_expression_operators<Expression>
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/operand.h b/include/sqlpp11/data_types/time_point/operand.h
index ff63f712..d3053acd 100644
--- a/include/sqlpp11/data_types/time_point/operand.h
+++ b/include/sqlpp11/data_types/time_point/operand.h
@@ -82,5 +82,5 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/parameter_value.h b/include/sqlpp11/data_types/time_point/parameter_value.h
index b3ffa847..a05b0cf6 100644
--- a/include/sqlpp11/data_types/time_point/parameter_value.h
+++ b/include/sqlpp11/data_types/time_point/parameter_value.h
@@ -49,5 +49,5 @@ namespace sqlpp
       target._bind_date_time_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/result_field.h b/include/sqlpp11/data_types/time_point/result_field.h
index 806e5d61..2b6c4031 100644
--- a/include/sqlpp11/data_types/time_point/result_field.h
+++ b/include/sqlpp11/data_types/time_point/result_field.h
@@ -71,5 +71,5 @@ namespace sqlpp
     }
     return os;
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/time_point/wrap_operand.h b/include/sqlpp11/data_types/time_point/wrap_operand.h
index 9cb79824..7420870c 100644
--- a/include/sqlpp11/data_types/time_point/wrap_operand.h
+++ b/include/sqlpp11/data_types/time_point/wrap_operand.h
@@ -37,5 +37,5 @@ namespace sqlpp
   {
     using type = time_point_operand<Period>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/column_operators.h b/include/sqlpp11/data_types/unsigned_integral/column_operators.h
index ca5ee932..ec714121 100644
--- a/include/sqlpp11/data_types/unsigned_integral/column_operators.h
+++ b/include/sqlpp11/data_types/unsigned_integral/column_operators.h
@@ -77,6 +77,6 @@ namespace sqlpp
       return {*static_cast<const Column*>(this), {{*static_cast<const Column*>(this), rhs{t}}}};
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/data_type.h b/include/sqlpp11/data_types/unsigned_integral/data_type.h
index 11e3f234..84014b4d 100644
--- a/include/sqlpp11/data_types/unsigned_integral/data_type.h
+++ b/include/sqlpp11/data_types/unsigned_integral/data_type.h
@@ -44,5 +44,5 @@ namespace sqlpp
   using smallint_unsigned = unsigned_integral;
   using integer_unsigned = unsigned_integral;
   using bigint_unsigned = unsigned_integral;
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/expression_operators.h b/include/sqlpp11/data_types/unsigned_integral/expression_operators.h
index 1079ede5..b72ce3cb 100644
--- a/include/sqlpp11/data_types/unsigned_integral/expression_operators.h
+++ b/include/sqlpp11/data_types/unsigned_integral/expression_operators.h
@@ -113,5 +113,5 @@ namespace sqlpp
     using check = consistent_t;
     using type = bitwise_or_t<wrap_operand_t<L>, unsigned_integral, wrap_operand_t<R>>;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/operand.h b/include/sqlpp11/data_types/unsigned_integral/operand.h
index d6cbfaa5..7c6037e7 100644
--- a/include/sqlpp11/data_types/unsigned_integral/operand.h
+++ b/include/sqlpp11/data_types/unsigned_integral/operand.h
@@ -77,6 +77,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/parameter_value.h b/include/sqlpp11/data_types/unsigned_integral/parameter_value.h
index d12d0a9e..64e0b81d 100644
--- a/include/sqlpp11/data_types/unsigned_integral/parameter_value.h
+++ b/include/sqlpp11/data_types/unsigned_integral/parameter_value.h
@@ -47,5 +47,5 @@ namespace sqlpp
       target._bind_unsigned_integral_parameter(index, &_value, _is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/result_field.h b/include/sqlpp11/data_types/unsigned_integral/result_field.h
index 712d7092..19f68037 100644
--- a/include/sqlpp11/data_types/unsigned_integral/result_field.h
+++ b/include/sqlpp11/data_types/unsigned_integral/result_field.h
@@ -51,5 +51,5 @@ namespace sqlpp
       target._post_bind_unsigned_integral_result(index, &this->_value, &this->_is_null);
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h b/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h
index d97ccba2..1e9dd7cb 100644
--- a/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h
+++ b/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h
@@ -41,5 +41,5 @@ namespace sqlpp
   {
     using type = unsigned_integral_operand;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/default_value.h b/include/sqlpp11/default_value.h
index d9f96b22..663691c3 100644
--- a/include/sqlpp11/default_value.h
+++ b/include/sqlpp11/default_value.h
@@ -56,6 +56,6 @@ namespace sqlpp
   };
 
   constexpr default_value_t default_value = {};
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/copy_tuple_args.h b/include/sqlpp11/detail/copy_tuple_args.h
index 560ce341..83542c90 100644
--- a/include/sqlpp11/detail/copy_tuple_args.h
+++ b/include/sqlpp11/detail/copy_tuple_args.h
@@ -84,7 +84,7 @@ namespace sqlpp
     {
       return std::tuple_cat(as_column_tuple<Columns>::_(columns)...);
     }
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/enable_if.h b/include/sqlpp11/detail/enable_if.h
index 4c6224fb..c2c882b6 100644
--- a/include/sqlpp11/detail/enable_if.h
+++ b/include/sqlpp11/detail/enable_if.h
@@ -35,7 +35,7 @@ namespace sqlpp
   {
     template <bool B, typename T = void>
     using enable_if_t = typename std::enable_if<B, T>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/field_index_sequence.h b/include/sqlpp11/detail/field_index_sequence.h
index e62c19bb..22e2abc0 100644
--- a/include/sqlpp11/detail/field_index_sequence.h
+++ b/include/sqlpp11/detail/field_index_sequence.h
@@ -80,7 +80,7 @@ namespace sqlpp
     template <std::size_t StartIndex, typename... Fields>
     using make_field_index_sequence =
         typename make_field_index_sequence_impl<field_index_sequence<StartIndex>, Fields...>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/get_first.h b/include/sqlpp11/detail/get_first.h
index 8d19e189..85466f0e 100644
--- a/include/sqlpp11/detail/get_first.h
+++ b/include/sqlpp11/detail/get_first.h
@@ -51,7 +51,7 @@ namespace sqlpp
 
     template <template <typename> class Predicate, typename Default, typename... T>
     using get_first_if = typename get_first_if_impl<Predicate, Default, T...>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/get_last.h b/include/sqlpp11/detail/get_last.h
index 4cf280ca..3d64f97c 100644
--- a/include/sqlpp11/detail/get_last.h
+++ b/include/sqlpp11/detail/get_last.h
@@ -51,7 +51,7 @@ namespace sqlpp
 
     template <template <typename> class Predicate, typename Default, typename... T>
     using get_last_if = typename get_last_if_impl<Predicate, Default, T...>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/index_sequence.h b/include/sqlpp11/detail/index_sequence.h
index ae014e74..9e9d5df3 100644
--- a/include/sqlpp11/detail/index_sequence.h
+++ b/include/sqlpp11/detail/index_sequence.h
@@ -57,7 +57,7 @@ namespace sqlpp
 
     template <std::size_t N>
     using make_index_sequence = typename make_index_sequence_impl<index_sequence<>, N>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/pick_arg.h b/include/sqlpp11/detail/pick_arg.h
index 3d7abfec..5fa1e0d3 100644
--- a/include/sqlpp11/detail/pick_arg.h
+++ b/include/sqlpp11/detail/pick_arg.h
@@ -51,7 +51,7 @@ namespace sqlpp
     {
       return pick_arg_impl<Target>(statement, term, std::is_same<typename Target::_data_t, Term>());
     }
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/sum.h b/include/sqlpp11/detail/sum.h
index b2c74001..8a0b762b 100644
--- a/include/sqlpp11/detail/sum.h
+++ b/include/sqlpp11/detail/sum.h
@@ -54,7 +54,7 @@ namespace sqlpp
     {
       return arg + sum(rest...);
     }
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/type_set.h b/include/sqlpp11/detail/type_set.h
index 54d46ee7..ebbb2293 100644
--- a/include/sqlpp11/detail/type_set.h
+++ b/include/sqlpp11/detail/type_set.h
@@ -262,7 +262,7 @@ namespace sqlpp
 
     template <typename T>
     using make_name_of_set_t = typename make_name_of_set<T>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/type_vector.h b/include/sqlpp11/detail/type_vector.h
index b3c8c9fe..06cb4ba1 100644
--- a/include/sqlpp11/detail/type_vector.h
+++ b/include/sqlpp11/detail/type_vector.h
@@ -83,7 +83,7 @@ namespace sqlpp
     {
       static constexpr std::size_t value = sizeof...(T);
     };
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/detail/void.h b/include/sqlpp11/detail/void.h
index 4342f106..aa7d326d 100644
--- a/include/sqlpp11/detail/void.h
+++ b/include/sqlpp11/detail/void.h
@@ -39,7 +39,7 @@ namespace sqlpp
 
     template <typename T>
     using void_t = typename void_impl<T>::type;
-  }
-}
+  }  // namespace detail
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/dynamic_join.h b/include/sqlpp11/dynamic_join.h
index 368a3192..cf778234 100644
--- a/include/sqlpp11/dynamic_join.h
+++ b/include/sqlpp11/dynamic_join.h
@@ -61,6 +61,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/dynamic_pre_join.h b/include/sqlpp11/dynamic_pre_join.h
index fd02867f..4ca3b5fe 100644
--- a/include/sqlpp11/dynamic_pre_join.h
+++ b/include/sqlpp11/dynamic_pre_join.h
@@ -167,6 +167,6 @@ namespace sqlpp
   {
     return {dynamic_pre_join_t<cross_join_t, Table>{table}, {}};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/dynamic_select_column_list.h b/include/sqlpp11/dynamic_select_column_list.h
index 63d0c21e..09813055 100644
--- a/include/sqlpp11/dynamic_select_column_list.h
+++ b/include/sqlpp11/dynamic_select_column_list.h
@@ -106,6 +106,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/eval.h b/include/sqlpp11/eval.h
index 426189c4..d07faae7 100644
--- a/include/sqlpp11/eval.h
+++ b/include/sqlpp11/eval.h
@@ -61,6 +61,6 @@ namespace sqlpp
   {
     return eval(db, verbatim<ValueType>(sql_code));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/exception.h b/include/sqlpp11/exception.h
index 154ee777..36fcda9e 100644
--- a/include/sqlpp11/exception.h
+++ b/include/sqlpp11/exception.h
@@ -41,6 +41,6 @@ namespace sqlpp
     {
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/exists.h b/include/sqlpp11/exists.h
index 84d95fc4..2aaa9a50 100644
--- a/include/sqlpp11/exists.h
+++ b/include/sqlpp11/exists.h
@@ -98,6 +98,6 @@ namespace sqlpp
     static_assert(is_select_t<wrap_operand_t<T>>::value, "exists() requires a select expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/expression.h b/include/sqlpp11/expression.h
index ba8204fd..2d81a4f1 100644
--- a/include/sqlpp11/expression.h
+++ b/include/sqlpp11/expression.h
@@ -253,6 +253,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/expression_fwd.h b/include/sqlpp11/expression_fwd.h
index 52b42687..220ab439 100644
--- a/include/sqlpp11/expression_fwd.h
+++ b/include/sqlpp11/expression_fwd.h
@@ -147,7 +147,7 @@ namespace sqlpp
       using _traits = make_traits<ValueType>;
       static constexpr const char* _name = "|";
     };
-  }
+  }  // namespace op
 
   template <typename Lhs, typename O, typename Rhs>
   struct binary_expression_t;
@@ -234,7 +234,7 @@ namespace sqlpp
     {
       using type = typename Expr::_rhs_t;
     };
-  }
+  }  // namespace detail
 
   // workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
   template <typename Expr>
@@ -249,6 +249,6 @@ namespace sqlpp
 
   template <typename Expr>
   using rhs_t = typename detail::rhs_impl<Expr>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/expression_operators.h b/include/sqlpp11/expression_operators.h
index e3a44cb7..c2cefbcc 100644
--- a/include/sqlpp11/expression_operators.h
+++ b/include/sqlpp11/expression_operators.h
@@ -36,6 +36,6 @@ namespace sqlpp
   {
     static_assert(wrong_t<expression_operators>::value, "Missing expression operators for ValueType");
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/expression_return_types.h b/include/sqlpp11/expression_return_types.h
index 375e5103..95ac4619 100644
--- a/include/sqlpp11/expression_return_types.h
+++ b/include/sqlpp11/expression_return_types.h
@@ -138,6 +138,6 @@ namespace sqlpp
   };
   template <typename T, typename Defer>
   using return_type_unary_minus_t = typename return_type_unary_minus<T, Defer>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/field_spec.h b/include/sqlpp11/field_spec.h
index 43ae2d0b..2e1418de 100644
--- a/include/sqlpp11/field_spec.h
+++ b/include/sqlpp11/field_spec.h
@@ -110,10 +110,10 @@ namespace sqlpp
       using type =
           multi_field_spec_t<AliasProvider, std::tuple<typename make_field_spec_impl<Select, NamedExprs>::type...>>;
     };
-  }
+  }  // namespace detail
 
   template <typename Select, typename NamedExpr>
   using make_field_spec_t = typename detail::make_field_spec_impl<Select, NamedExpr>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/for_update.h b/include/sqlpp11/for_update.h
index cb201d4c..4e43c178 100644
--- a/include/sqlpp11/for_update.h
+++ b/include/sqlpp11/for_update.h
@@ -174,6 +174,6 @@ namespace sqlpp
   {
     return statement_t<void, no_for_update_t>().for_update(std::forward<T>(t));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h
index 48f81408..10fe08ec 100644
--- a/include/sqlpp11/from.h
+++ b/include/sqlpp11/from.h
@@ -319,6 +319,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_from_t>().dynamic_from(std::forward<T>(t));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/functions.h b/include/sqlpp11/functions.h
index 27fc6d4d..b8ddee36 100644
--- a/include/sqlpp11/functions.h
+++ b/include/sqlpp11/functions.h
@@ -132,6 +132,6 @@ namespace sqlpp
   {
     return name_of<T>::char_ptr();
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/group_by.h b/include/sqlpp11/group_by.h
index 43825788..240fe1b2 100644
--- a/include/sqlpp11/group_by.h
+++ b/include/sqlpp11/group_by.h
@@ -282,6 +282,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_group_by_t>().dynamic_group_by(std::forward<T>(t)...);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h
index 862e5c6e..9dbb33ca 100644
--- a/include/sqlpp11/having.h
+++ b/include/sqlpp11/having.h
@@ -320,6 +320,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_having_t>().dynamic_having(std::forward<T>(t));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/hidden.h b/include/sqlpp11/hidden.h
index 21991bc7..86065e80 100644
--- a/include/sqlpp11/hidden.h
+++ b/include/sqlpp11/hidden.h
@@ -62,5 +62,5 @@ namespace sqlpp
   {
     return {part};
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/in.h b/include/sqlpp11/in.h
index 243fa1b9..3cf4289d 100644
--- a/include/sqlpp11/in.h
+++ b/include/sqlpp11/in.h
@@ -130,6 +130,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/in_fwd.h b/include/sqlpp11/in_fwd.h
index 0c2fa7a7..4a5c8677 100644
--- a/include/sqlpp11/in_fwd.h
+++ b/include/sqlpp11/in_fwd.h
@@ -33,6 +33,6 @@ namespace sqlpp
   struct in_t;
   template <typename Operand, typename... Args>
   struct not_in_t;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/inconsistent.h b/include/sqlpp11/inconsistent.h
index 8eb8777b..82e83ec2 100644
--- a/include/sqlpp11/inconsistent.h
+++ b/include/sqlpp11/inconsistent.h
@@ -40,6 +40,6 @@ namespace sqlpp
   template <typename Check>
   using inconsistent = typename std::enable_if<not std::is_same<consistent_t, Check>::value, Check>::type;
 #endif
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/insert.h b/include/sqlpp11/insert.h
index e14c386c..a8573e58 100644
--- a/include/sqlpp11/insert.h
+++ b/include/sqlpp11/insert.h
@@ -129,6 +129,6 @@ namespace sqlpp
     static_assert(std::is_base_of<connection, Database>::value, "Invalid database parameter");
     return {blank_insert_t<Database>().into(table)};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/insert_value.h b/include/sqlpp11/insert_value.h
index 5354fc65..b0c7a1af 100644
--- a/include/sqlpp11/insert_value.h
+++ b/include/sqlpp11/insert_value.h
@@ -53,7 +53,7 @@ namespace sqlpp
         using _nodes = detail::type_vector<>;
       };
     };
-  }
+  }  // namespace detail
 
   template <typename Column>
   struct insert_value_t
@@ -114,6 +114,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h
index 995d454d..62f947f7 100644
--- a/include/sqlpp11/insert_value_list.h
+++ b/include/sqlpp11/insert_value_list.h
@@ -60,7 +60,7 @@ namespace sqlpp
       using set_columns = detail::make_type_set_t<First, Columns...>;
       static constexpr bool value = detail::is_subset_of<required_columns, set_columns>::value;
     };
-  }
+  }  // namespace detail
 
   struct insert_default_values_data_t
   {
@@ -642,6 +642,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_insert_value_list_t>().dynamic_set(assignments...);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/interpret.h b/include/sqlpp11/interpret.h
index c5793baf..41fee4e5 100644
--- a/include/sqlpp11/interpret.h
+++ b/include/sqlpp11/interpret.h
@@ -36,6 +36,6 @@ namespace sqlpp
   {
     return interpreter_t<Context, T>::_(t, context);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/interpret_tuple.h b/include/sqlpp11/interpret_tuple.h
index a95133bd..a0daedc6 100644
--- a/include/sqlpp11/interpret_tuple.h
+++ b/include/sqlpp11/interpret_tuple.h
@@ -78,6 +78,6 @@ namespace sqlpp
     return interpret_tuple_impl(t, separator, context, std::false_type{},
                                 detail::make_index_sequence<std::tuple_size<Tuple>::value>{});
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/interpretable.h b/include/sqlpp11/interpretable.h
index d18f2612..ff492afe 100644
--- a/include/sqlpp11/interpretable.h
+++ b/include/sqlpp11/interpretable.h
@@ -135,6 +135,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/interpretable_list.h b/include/sqlpp11/interpretable_list.h
index b36f4132..08fe1c99 100644
--- a/include/sqlpp11/interpretable_list.h
+++ b/include/sqlpp11/interpretable_list.h
@@ -108,6 +108,6 @@ namespace sqlpp
   {
     return serializable_list_interpreter_t<Context, T>::_(t, separator, context);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/interpreter.h b/include/sqlpp11/interpreter.h
index 71bc17c0..b40ace6f 100644
--- a/include/sqlpp11/interpreter.h
+++ b/include/sqlpp11/interpreter.h
@@ -39,6 +39,6 @@ namespace sqlpp
       static_assert(wrong_t<interpreter_t>::value, "missing interpreter specialization");
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h
index 6d5b6204..0d0fd6e5 100644
--- a/include/sqlpp11/into.h
+++ b/include/sqlpp11/into.h
@@ -209,6 +209,6 @@ namespace sqlpp
   {
     return statement_t<void, no_into_t>().into(std::forward<T>(t));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/is_not_null.h b/include/sqlpp11/is_not_null.h
index f5d6ac3e..de763f7b 100644
--- a/include/sqlpp11/is_not_null.h
+++ b/include/sqlpp11/is_not_null.h
@@ -83,6 +83,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/is_null.h b/include/sqlpp11/is_null.h
index df3f86de..38275d4b 100644
--- a/include/sqlpp11/is_null.h
+++ b/include/sqlpp11/is_null.h
@@ -83,6 +83,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/is_null_fwd.h b/include/sqlpp11/is_null_fwd.h
index d57e41b6..e0e420bf 100644
--- a/include/sqlpp11/is_null_fwd.h
+++ b/include/sqlpp11/is_null_fwd.h
@@ -33,6 +33,6 @@ namespace sqlpp
   struct is_null_t;
   template <typename Operand>
   struct is_not_null_t;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/join.h b/include/sqlpp11/join.h
index 40c942e9..cf05da0d 100644
--- a/include/sqlpp11/join.h
+++ b/include/sqlpp11/join.h
@@ -95,6 +95,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/join_types.h b/include/sqlpp11/join_types.h
index fbc45182..55561981 100644
--- a/include/sqlpp11/join_types.h
+++ b/include/sqlpp11/join_types.h
@@ -68,6 +68,6 @@ namespace sqlpp
 
     static constexpr const char* _name = " CROSS";
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h
index 1623775b..08186baf 100644
--- a/include/sqlpp11/limit.h
+++ b/include/sqlpp11/limit.h
@@ -328,6 +328,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_limit_t>().dynamic_limit();
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/logic.h b/include/sqlpp11/logic.h
index 9ec11a46..c82003ab 100644
--- a/include/sqlpp11/logic.h
+++ b/include/sqlpp11/logic.h
@@ -84,7 +84,7 @@ namespace sqlpp
 
     template <typename T>
     using identity_t = T;
-  }
-}
+  }  // namespace logic
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/multi_column.h b/include/sqlpp11/multi_column.h
index ad1a6e63..ba3573fb 100644
--- a/include/sqlpp11/multi_column.h
+++ b/include/sqlpp11/multi_column.h
@@ -133,13 +133,13 @@ namespace sqlpp
     template <typename... Columns>
     using make_multi_column_t =
         copy_tuple_args_t<multi_column_t, void, decltype(column_tuple_merge(std::declval<Columns>()...))>;
-  }
+  }  // namespace detail
 
   template <typename... Columns>
   auto multi_column(Columns... columns) -> detail::make_multi_column_t<Columns...>
   {
     return detail::make_multi_column_t<Columns...>(std::tuple_cat(detail::as_column_tuple<Columns>::_(columns)...));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/named_interpretable.h b/include/sqlpp11/named_interpretable.h
index 16ce28b6..019f8602 100644
--- a/include/sqlpp11/named_interpretable.h
+++ b/include/sqlpp11/named_interpretable.h
@@ -145,6 +145,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/no_data.h b/include/sqlpp11/no_data.h
index 8b7bbe87..783733b8 100644
--- a/include/sqlpp11/no_data.h
+++ b/include/sqlpp11/no_data.h
@@ -47,5 +47,5 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/no_name.h b/include/sqlpp11/no_name.h
index cacaea30..515376a2 100644
--- a/include/sqlpp11/no_name.h
+++ b/include/sqlpp11/no_name.h
@@ -32,5 +32,5 @@ namespace sqlpp
   struct no_name_t
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/noop.h b/include/sqlpp11/noop.h
index cdca0941..1caa43c4 100644
--- a/include/sqlpp11/noop.h
+++ b/include/sqlpp11/noop.h
@@ -97,5 +97,5 @@ namespace sqlpp
   struct is_noop : std::is_same<T, noop>
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/not_in.h b/include/sqlpp11/not_in.h
index a9ac1fff..91605e1e 100644
--- a/include/sqlpp11/not_in.h
+++ b/include/sqlpp11/not_in.h
@@ -130,6 +130,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/null.h b/include/sqlpp11/null.h
index 18b89ba0..080b5fea 100644
--- a/include/sqlpp11/null.h
+++ b/include/sqlpp11/null.h
@@ -51,6 +51,6 @@ namespace sqlpp
   };
 
   constexpr null_t null = {};
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h
index b77cd500..bfb457a0 100644
--- a/include/sqlpp11/offset.h
+++ b/include/sqlpp11/offset.h
@@ -342,6 +342,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_offset_t>().dynamic_offset();
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/on.h b/include/sqlpp11/on.h
index 3ac8733a..1da2dfa5 100644
--- a/include/sqlpp11/on.h
+++ b/include/sqlpp11/on.h
@@ -88,6 +88,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/operand_check.h b/include/sqlpp11/operand_check.h
index d4f5803f..6775334e 100644
--- a/include/sqlpp11/operand_check.h
+++ b/include/sqlpp11/operand_check.h
@@ -70,6 +70,6 @@ namespace sqlpp
 
   template <typename L, template <typename> class LPred, typename R, template <typename> class RPred>
   using unwrapped_binary_operand_check_t = typename binary_operand_check<L, LPred, R, RPred>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/order_by.h b/include/sqlpp11/order_by.h
index 6420155c..65648188 100644
--- a/include/sqlpp11/order_by.h
+++ b/include/sqlpp11/order_by.h
@@ -280,6 +280,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_order_by_t>().dynamic_order_by(std::forward<T>(t)...);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/parameter.h b/include/sqlpp11/parameter.h
index 1dcc5c2f..a9d28533 100644
--- a/include/sqlpp11/parameter.h
+++ b/include/sqlpp11/parameter.h
@@ -84,6 +84,6 @@ namespace sqlpp
     static_assert(is_alias_provider_t<AliasProvider>::value, "second argument is not an alias provider");
     return {};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/parameter_list.h b/include/sqlpp11/parameter_list.h
index 9c05fb08..bc61ffbf 100644
--- a/include/sqlpp11/parameter_list.h
+++ b/include/sqlpp11/parameter_list.h
@@ -67,6 +67,6 @@ namespace sqlpp
 
   template <typename Exp>
   using make_parameter_list_t = parameter_list_t<parameters_of<Exp>>;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/policy_update.h b/include/sqlpp11/policy_update.h
index 9832880b..e47da9ee 100644
--- a/include/sqlpp11/policy_update.h
+++ b/include/sqlpp11/policy_update.h
@@ -67,6 +67,6 @@ namespace sqlpp
 
   template <typename Check, typename Policies, typename Needle, typename Replacement>
   using new_statement_t = typename new_statement_impl<Check, Policies, Needle, Replacement>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/portable_static_assert.h b/include/sqlpp11/portable_static_assert.h
index 936b3ab9..c71f9d73 100644
--- a/include/sqlpp11/portable_static_assert.h
+++ b/include/sqlpp11/portable_static_assert.h
@@ -57,7 +57,7 @@ namespace sqlpp
     {
       using type = consistent_t;
     };
-  }
+  }  // namespace detail
 
   template <bool Consistent, typename Assert>
   using static_check_t = typename detail::static_check_impl<Consistent, Assert>::type;
@@ -84,10 +84,10 @@ namespace sqlpp
     {
       using type = consistent_t;
     };
-  }
+  }  // namespace detail
 
   template <typename... StaticChecks>
   using static_combined_check_t = typename detail::static_combined_check_impl<StaticChecks...>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/pre_join.h b/include/sqlpp11/pre_join.h
index 28e5f67f..f460efda 100644
--- a/include/sqlpp11/pre_join.h
+++ b/include/sqlpp11/pre_join.h
@@ -158,7 +158,7 @@ namespace sqlpp
 
     template <typename JoinType, typename Lhs, typename Rhs>
     auto join_impl(Lhs lhs, Rhs rhs) -> decltype(join_impl<JoinType>(check_pre_join_t<Lhs, Rhs>{}, lhs, rhs));
-  }
+  }  // namespace detail
 
   template <typename Lhs, typename Rhs>
   auto join(Lhs lhs, Rhs rhs) -> decltype(detail::join_impl<inner_join_t>(lhs, rhs))
@@ -203,13 +203,13 @@ namespace sqlpp
 
     template <typename Lhs, typename Rhs>
     auto cross_join_impl(Lhs lhs, Rhs rhs) -> decltype(cross_join_impl(check_pre_join_t<Lhs, Rhs>{}, lhs, rhs));
-  }
+  }  // namespace detail
 
   template <typename Lhs, typename Rhs>
   auto cross_join(Lhs lhs, Rhs rhs) -> decltype(detail::cross_join_impl(lhs, rhs))
   {
     return {pre_join_t<cross_join_t, Lhs, Rhs>{lhs, rhs}, {}};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/prepared_execute.h b/include/sqlpp11/prepared_execute.h
index ef004b1d..68d200e7 100644
--- a/include/sqlpp11/prepared_execute.h
+++ b/include/sqlpp11/prepared_execute.h
@@ -57,6 +57,6 @@ namespace sqlpp
     _parameter_list_t params;
     mutable _prepared_statement_t _prepared_statement;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/prepared_insert.h b/include/sqlpp11/prepared_insert.h
index df53d8ee..25b02fd1 100644
--- a/include/sqlpp11/prepared_insert.h
+++ b/include/sqlpp11/prepared_insert.h
@@ -57,6 +57,6 @@ namespace sqlpp
     _parameter_list_t params;
     mutable _prepared_statement_t _prepared_statement;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/prepared_remove.h b/include/sqlpp11/prepared_remove.h
index 4815a8c7..bcf4c794 100644
--- a/include/sqlpp11/prepared_remove.h
+++ b/include/sqlpp11/prepared_remove.h
@@ -57,6 +57,6 @@ namespace sqlpp
     _parameter_list_t params;
     mutable _prepared_statement_t _prepared_statement;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/prepared_select.h b/include/sqlpp11/prepared_select.h
index c91fc330..fb68d490 100644
--- a/include/sqlpp11/prepared_select.h
+++ b/include/sqlpp11/prepared_select.h
@@ -60,6 +60,6 @@ namespace sqlpp
     _dynamic_names_t _dynamic_names;
     mutable _prepared_statement_t _prepared_statement;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/prepared_update.h b/include/sqlpp11/prepared_update.h
index cc238fe7..885e8056 100644
--- a/include/sqlpp11/prepared_update.h
+++ b/include/sqlpp11/prepared_update.h
@@ -57,6 +57,6 @@ namespace sqlpp
     _parameter_list_t params;
     mutable _prepared_statement_t _prepared_statement;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/remove.h b/include/sqlpp11/remove.h
index ca9ec6b2..4b1abfe7 100644
--- a/include/sqlpp11/remove.h
+++ b/include/sqlpp11/remove.h
@@ -128,6 +128,6 @@ namespace sqlpp
     static_assert(std::is_base_of<connection, Database>::value, "Invalid database parameter");
     return {blank_remove_t<Database>().from(table)};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/result.h b/include/sqlpp11/result.h
index 88c65336..109cdfed 100644
--- a/include/sqlpp11/result.h
+++ b/include/sqlpp11/result.h
@@ -140,6 +140,6 @@ namespace sqlpp
       _result.next(_result_row);
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/result_field.h b/include/sqlpp11/result_field.h
index 53344f5e..66b2d90a 100644
--- a/include/sqlpp11/result_field.h
+++ b/include/sqlpp11/result_field.h
@@ -66,5 +66,5 @@ namespace sqlpp
   {
     return serialize(rf, os);
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/result_field_base.h b/include/sqlpp11/result_field_base.h
index 9776910c..caf74de3 100644
--- a/include/sqlpp11/result_field_base.h
+++ b/include/sqlpp11/result_field_base.h
@@ -129,5 +129,5 @@ namespace sqlpp
     bool _is_null;
     _cpp_storage_type _value;
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/result_row.h
index a388efa5..17b3949c 100644
--- a/include/sqlpp11/result_row.h
+++ b/include/sqlpp11/result_row.h
@@ -176,7 +176,7 @@ namespace sqlpp
         (void)swallow{(result_field<Db, Is, FieldSpecs>::_apply(callable), 0)...};
       }
     };
-  }
+  }  // namespace detail
 
   template <typename Db, typename... FieldSpecs>
   struct result_row_t
@@ -409,6 +409,6 @@ namespace sqlpp
   {
     row._apply(callable);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/result_row_fwd.h b/include/sqlpp11/result_row_fwd.h
index 668bec5e..3562ad9f 100644
--- a/include/sqlpp11/result_row_fwd.h
+++ b/include/sqlpp11/result_row_fwd.h
@@ -34,6 +34,6 @@ namespace sqlpp
 
   template <typename Db, typename... FieldSpecs>
   struct dynamic_result_row_t;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/rhs_wrap.h b/include/sqlpp11/rhs_wrap.h
index fd055547..cd30dc01 100644
--- a/include/sqlpp11/rhs_wrap.h
+++ b/include/sqlpp11/rhs_wrap.h
@@ -111,7 +111,7 @@ namespace sqlpp
         return t.is_null();
       }
     };
-  }
+  }  // namespace detail
 
   template <typename Expr, bool TrivialValueIsNull>
   struct rhs_wrap_t
@@ -165,6 +165,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/schema.h b/include/sqlpp11/schema.h
index 77f825cf..c5a94af1 100644
--- a/include/sqlpp11/schema.h
+++ b/include/sqlpp11/schema.h
@@ -51,6 +51,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/schema_qualified_table.h b/include/sqlpp11/schema_qualified_table.h
index bc3f109a..efbd748e 100644
--- a/include/sqlpp11/schema_qualified_table.h
+++ b/include/sqlpp11/schema_qualified_table.h
@@ -87,6 +87,6 @@ namespace sqlpp
 
     return {schema, table};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 149b6d42..93ba15f4 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -110,5 +110,5 @@ namespace sqlpp
     static_assert(std::is_base_of<connection, Database>::value, "Invalid database parameter");
     return blank_select_t<Database>().columns(columns...);
   }
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h
index d1086d54..79f6f543 100644
--- a/include/sqlpp11/select_column_list.h
+++ b/include/sqlpp11/select_column_list.h
@@ -64,7 +64,7 @@ namespace sqlpp
                                   tag::is_selectable>;
       using _alias_t = typename Column::_alias_t;
     };
-  }
+  }  // namespace detail
 
   // SELECTED COLUMNS DATA
   template <typename Database, typename... Columns>
@@ -299,7 +299,7 @@ namespace sqlpp
     template <typename Database, typename... Columns>
     using make_select_column_list_t =
         copy_tuple_args_t<select_column_list_t, Database, decltype(column_tuple_merge(std::declval<Columns>()...))>;
-  }
+  }  // namespace detail
 
   SQLPP_PORTABLE_STATIC_ASSERT(assert_selected_colums_are_selectable_t, "selected columns must be selectable");
   template <typename... T>
@@ -454,6 +454,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_select_column_list_t>().dynamic_columns(std::forward<T>(t)...);
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/select_flag_list.h b/include/sqlpp11/select_flag_list.h
index 10ff7f39..bde6b0d1 100644
--- a/include/sqlpp11/select_flag_list.h
+++ b/include/sqlpp11/select_flag_list.h
@@ -269,6 +269,6 @@ namespace sqlpp
   {
     return statement_t<Database, no_select_flag_list_t>().dynamic_flags(std::forward<T>(t));
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/select_flags.h b/include/sqlpp11/select_flags.h
index 2486a943..cd6c6dc2 100644
--- a/include/sqlpp11/select_flags.h
+++ b/include/sqlpp11/select_flags.h
@@ -91,6 +91,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/select_pseudo_table.h b/include/sqlpp11/select_pseudo_table.h
index d396c4be..d0128c11 100644
--- a/include/sqlpp11/select_pseudo_table.h
+++ b/include/sqlpp11/select_pseudo_table.h
@@ -86,6 +86,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/serialize.h b/include/sqlpp11/serialize.h
index 9d672f82..cc367f63 100644
--- a/include/sqlpp11/serialize.h
+++ b/include/sqlpp11/serialize.h
@@ -52,6 +52,6 @@ namespace sqlpp
 
     return context;
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/serializer.h b/include/sqlpp11/serializer.h
index 66fbd8fe..9955aeb6 100644
--- a/include/sqlpp11/serializer.h
+++ b/include/sqlpp11/serializer.h
@@ -44,6 +44,6 @@ namespace sqlpp
       _serialize_check{};
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/serializer_context.h b/include/sqlpp11/serializer_context.h
index 89966bff..e4c02a99 100644
--- a/include/sqlpp11/serializer_context.h
+++ b/include/sqlpp11/serializer_context.h
@@ -61,6 +61,6 @@ namespace sqlpp
 
     std::ostream& _os;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/simple_column.h b/include/sqlpp11/simple_column.h
index ae8951f7..143254c7 100644
--- a/include/sqlpp11/simple_column.h
+++ b/include/sqlpp11/simple_column.h
@@ -66,6 +66,6 @@ namespace sqlpp
   {
     return {c};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h
index e277b944..1c6cfeb7 100644
--- a/include/sqlpp11/single_table.h
+++ b/include/sqlpp11/single_table.h
@@ -203,6 +203,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/some.h b/include/sqlpp11/some.h
index 9947a599..2c0ced17 100644
--- a/include/sqlpp11/some.h
+++ b/include/sqlpp11/some.h
@@ -76,6 +76,6 @@ namespace sqlpp
                   "some() requires a single column select expression as argument");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/sort_order.h b/include/sqlpp11/sort_order.h
index 65faba33..538fc3fe 100644
--- a/include/sqlpp11/sort_order.h
+++ b/include/sqlpp11/sort_order.h
@@ -70,6 +70,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index cb050de9..e53c24ae 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -150,7 +150,7 @@ namespace sqlpp
       using _parameter_check = typename std::
           conditional<detail::type_vector_size<_parameters>::value == 0, consistent_t, assert_no_parameters_t>::type;
     };
-  }
+  }  // namespace detail
 
   template <typename Db, typename... Policies>
   struct statement_t : public Policies::template _base_t<detail::statement_policies_t<Db, Policies...>>...,
@@ -321,6 +321,6 @@ namespace sqlpp
       using _consistency_check = consistent_t;
     };
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/statement_fwd.h b/include/sqlpp11/statement_fwd.h
index 48895e86..c626dba9 100644
--- a/include/sqlpp11/statement_fwd.h
+++ b/include/sqlpp11/statement_fwd.h
@@ -31,6 +31,6 @@ namespace sqlpp
 {
   template <typename Db, typename... Policies>
   struct statement_t;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/table.h b/include/sqlpp11/table.h
index b260d590..8b5d4c1e 100644
--- a/include/sqlpp11/table.h
+++ b/include/sqlpp11/table.h
@@ -124,6 +124,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h
index 7d4bb684..20398b88 100644
--- a/include/sqlpp11/table_alias.h
+++ b/include/sqlpp11/table_alias.h
@@ -116,6 +116,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/table_ref.h b/include/sqlpp11/table_ref.h
index c7011311..8a0c32a1 100644
--- a/include/sqlpp11/table_ref.h
+++ b/include/sqlpp11/table_ref.h
@@ -50,6 +50,6 @@ namespace sqlpp
   {
     return t;
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/transaction.h b/include/sqlpp11/transaction.h
index 038dc624..8ceaf7e0 100644
--- a/include/sqlpp11/transaction.h
+++ b/include/sqlpp11/transaction.h
@@ -114,6 +114,6 @@ namespace sqlpp
   {
     return {db, report_unfinished_transaction, isolation};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/tvin.h b/include/sqlpp11/tvin.h
index ba473539..ce1c0443 100644
--- a/include/sqlpp11/tvin.h
+++ b/include/sqlpp11/tvin.h
@@ -86,7 +86,7 @@ namespace sqlpp
     {
       using type = tvin_t<T>;
     };
-  }
+  }  // namespace detail
   template <typename T>
   using allow_tvin_t = typename detail::allow_tvin_impl<T>::type;
 
@@ -132,7 +132,7 @@ namespace sqlpp
     {
       using type = std::true_type;
     };
-  }
+  }  // namespace detail
   template <typename T>
   using is_tvin_t = typename detail::is_tvin_impl<T>::type;
 
@@ -164,6 +164,6 @@ namespace sqlpp
                   "tvin() used with invalid type (only string and primitive types allowed)");
     return {{operand}};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h
index 4974d194..4f0a2051 100644
--- a/include/sqlpp11/type_traits.h
+++ b/include/sqlpp11/type_traits.h
@@ -52,7 +52,7 @@ namespace sqlpp
     {
       using type = typename T::_traits::_value_type;
     };
-  }
+  }  // namespace detail
   template <typename T>
   using value_type_of = typename detail::value_type_of_impl<T>::type;
 
@@ -112,7 +112,7 @@ namespace sqlpp
     struct can_be_null
     {
     };
-  }
+  }  // namespace tag
 
   namespace detail
   {
@@ -128,7 +128,7 @@ namespace sqlpp
     {
       using type = std::true_type;
     };
-  }
+  }  // namespace detail
   template <typename T>
   using column_spec_can_be_null_t = typename detail::column_spec_can_be_null_impl<T>::type;
 
@@ -241,7 +241,7 @@ namespace sqlpp
     {
       using type = typename T::_nodes;
     };
-  }
+  }  // namespace detail
   template <typename T>
   using nodes_of = typename detail::nodes_of_impl<T>::type;
 
@@ -336,7 +336,7 @@ namespace sqlpp
       using type =
           logic::all_t<sizeof...(Nodes) != 0, is_aggregate_expression_impl<KnownAggregates, Nodes>::type::value...>;
     };
-  }
+  }  // namespace detail
   template <typename KnownAggregates, typename T>
   using is_aggregate_expression_t = typename detail::is_aggregate_expression_impl<KnownAggregates, T>::type;
 
@@ -357,7 +357,7 @@ namespace sqlpp
     {
       using type = detail::type_vector_cat_t<typename parameters_of_impl<Nodes>::type...>;
     };
-  }
+  }  // namespace detail
   template <typename T>
   using parameters_of = typename detail::parameters_of_impl<T>::type;
 
@@ -534,6 +534,6 @@ namespace sqlpp
 
   template <typename Db>
   using serializer_context_of = typename serializer_context_of_impl<Db>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/unconditional.h b/include/sqlpp11/unconditional.h
index 6f905a2c..4d48b573 100644
--- a/include/sqlpp11/unconditional.h
+++ b/include/sqlpp11/unconditional.h
@@ -32,5 +32,5 @@ namespace sqlpp
   struct unconditional_t
   {
   };
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/union.h b/include/sqlpp11/union.h
index a54dc69f..346c959c 100644
--- a/include/sqlpp11/union.h
+++ b/include/sqlpp11/union.h
@@ -266,6 +266,6 @@ namespace sqlpp
     return statement_t<void, no_union_t>().union_distinct(std::forward<T>(t));
   }
   */
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/union_data.h b/include/sqlpp11/union_data.h
index 054c8694..6f426568 100644
--- a/include/sqlpp11/union_data.h
+++ b/include/sqlpp11/union_data.h
@@ -65,6 +65,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/union_flags.h b/include/sqlpp11/union_flags.h
index 01853c67..fb726ed3 100644
--- a/include/sqlpp11/union_flags.h
+++ b/include/sqlpp11/union_flags.h
@@ -69,6 +69,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/update.h b/include/sqlpp11/update.h
index 12b01fe1..bf7cbcb1 100644
--- a/include/sqlpp11/update.h
+++ b/include/sqlpp11/update.h
@@ -118,6 +118,6 @@ namespace sqlpp
     static_assert(std::is_base_of<connection, Database>::value, "Invalid database parameter");
     return {blank_update_t<Database>().single_table(table)};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index f75267d1..6ce91515 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -162,7 +162,7 @@ namespace sqlpp
     {
       static constexpr auto value = detail::must_not_update_impl<typename lhs<Assignment>::type>::type::value;
     };
-  }
+  }  // namespace detail
 
   template <typename... Assignments>
   using check_update_set_t = static_combined_check_t<
@@ -301,6 +301,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/using.h b/include/sqlpp11/using.h
index 1fa74538..ea332937 100644
--- a/include/sqlpp11/using.h
+++ b/include/sqlpp11/using.h
@@ -257,6 +257,6 @@ namespace sqlpp
       return context;
     }
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/value.h b/include/sqlpp11/value.h
index 42c7a1aa..b2b0a24b 100644
--- a/include/sqlpp11/value.h
+++ b/include/sqlpp11/value.h
@@ -38,6 +38,6 @@ namespace sqlpp
                   "value() is to be called with non-sql-type like int, or string");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/value_or_null.h b/include/sqlpp11/value_or_null.h
index d9d45c68..e7be8253 100644
--- a/include/sqlpp11/value_or_null.h
+++ b/include/sqlpp11/value_or_null.h
@@ -67,6 +67,6 @@ namespace sqlpp
                   "value_or_null() is to be called with non-sql-type like int, or string");
     return {t};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/value_type.h b/include/sqlpp11/value_type.h
index ccf04109..86148857 100644
--- a/include/sqlpp11/value_type.h
+++ b/include/sqlpp11/value_type.h
@@ -34,5 +34,5 @@ namespace sqlpp
 {
   template <typename T>
   using value_type_t = value_type_of<wrap_operand_t<T>>;
-}
+}  // namespace sqlpp
 #endif
diff --git a/include/sqlpp11/value_type_fwd.h b/include/sqlpp11/value_type_fwd.h
index a3e4bb34..943c354a 100644
--- a/include/sqlpp11/value_type_fwd.h
+++ b/include/sqlpp11/value_type_fwd.h
@@ -51,6 +51,6 @@ namespace sqlpp
         and ValueType::template _is_valid_assignment_operand<T>::value  // the correct value type is required, of course
         ;
   };
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/verbatim.h b/include/sqlpp11/verbatim.h
index 3bb61a68..1f0c6d3d 100644
--- a/include/sqlpp11/verbatim.h
+++ b/include/sqlpp11/verbatim.h
@@ -77,6 +77,6 @@ namespace sqlpp
   {
     return {s};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/verbatim_table.h b/include/sqlpp11/verbatim_table.h
index 7c7ac713..0b0b0c26 100644
--- a/include/sqlpp11/verbatim_table.h
+++ b/include/sqlpp11/verbatim_table.h
@@ -48,7 +48,7 @@ namespace sqlpp
       };
       using _traits = make_traits<no_value_t>;
     };
-  }
+  }  // namespace detail
 
   struct verbatim_table_t : public table_t<verbatim_table_t, detail::unusable_pseudo_column_t>
   {
@@ -90,6 +90,6 @@ namespace sqlpp
   {
     return {name};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index c3792983..20211322 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -405,6 +405,6 @@ namespace sqlpp
   {
     return statement_t<void, no_where_t<false>>().unconditionally();
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/with.h b/include/sqlpp11/with.h
index 92c545b6..3dfc8c65 100644
--- a/include/sqlpp11/with.h
+++ b/include/sqlpp11/with.h
@@ -217,6 +217,6 @@ namespace sqlpp
                   "at least one expression in with is an incomplete common table expression");
     return {{cte...}};
   }
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/without_table_check.h b/include/sqlpp11/without_table_check.h
index 5ed744ad..5d1fe46a 100644
--- a/include/sqlpp11/without_table_check.h
+++ b/include/sqlpp11/without_table_check.h
@@ -65,7 +65,7 @@ namespace sqlpp
 
     return {expr};
   }
-}
+}  // namespace sqlpp
 
 #endif
 
diff --git a/include/sqlpp11/wrap_operand.h b/include/sqlpp11/wrap_operand.h
index 0ad7085f..b14b03e3 100644
--- a/include/sqlpp11/wrap_operand.h
+++ b/include/sqlpp11/wrap_operand.h
@@ -37,6 +37,6 @@ namespace sqlpp
 
   template <typename T>
   using wrap_operand_t = typename wrap_operand<T>::type;
-}
+}  // namespace sqlpp
 
 #endif
diff --git a/include/sqlpp11/wrong.h b/include/sqlpp11/wrong.h
index 05226646..1ed403e0 100644
--- a/include/sqlpp11/wrong.h
+++ b/include/sqlpp11/wrong.h
@@ -41,8 +41,8 @@ namespace sqlpp
     {
       using type = std::false_type;
     };
-  }
+  }  // namespace detail
   template <typename... T>
   using wrong_t = typename detail::wrong<T...>::type;
-}
+}  // namespace sqlpp
 #endif