diff --git a/sprout/cstdlib/div.hpp b/sprout/cstdlib/div.hpp
index 530d7db9..ca83dbd0 100644
--- a/sprout/cstdlib/div.hpp
+++ b/sprout/cstdlib/div.hpp
@@ -13,7 +13,7 @@ namespace sprout {
 #		define SPROUT_DIV_T_TRAITS_IMPL(DIV_T) \
 		typedef DIV_T type; \
 		static SPROUT_CONSTEXPR std::size_t offsetof_quot = offsetof(DIV_T, quot); \
-		static SPROUT_CONSTEXPR std::size_t offsetof_rem = offsetof(DIV_T, rem);
+		static SPROUT_CONSTEXPR std::size_t offsetof_rem = offsetof(DIV_T, rem)
 
 		template<typename T>
 		struct div_t_traits {};
diff --git a/sprout/ctype/ascii.hpp b/sprout/ctype/ascii.hpp
index e598c63e..a51a2857 100644
--- a/sprout/ctype/ascii.hpp
+++ b/sprout/ctype/ascii.hpp
@@ -239,10 +239,10 @@ namespace sprout {
 		// tolower
 		// toupper
 		//
-		SPROUT_CTYPE_ASCII_DECL(char, SPROUT_PP_EMPTY());
-		SPROUT_CTYPE_ASCII_DECL(wchar_t, SPROUT_PP_EMPTY());
-		SPROUT_CTYPE_ASCII_DECL(char16_t, SPROUT_PP_EMPTY());
-		SPROUT_CTYPE_ASCII_DECL(char32_t, SPROUT_PP_EMPTY());
+		SPROUT_CTYPE_ASCII_DECL(char, SPROUT_PP_EMPTY())
+		SPROUT_CTYPE_ASCII_DECL(wchar_t, SPROUT_PP_EMPTY())
+		SPROUT_CTYPE_ASCII_DECL(char16_t, SPROUT_PP_EMPTY())
+		SPROUT_CTYPE_ASCII_DECL(char32_t, SPROUT_PP_EMPTY())
 	}	// namespace ascii
 
 	using sprout::ascii::isalnum;
diff --git a/sprout/ctype/wascii.hpp b/sprout/ctype/wascii.hpp
index df0f1ca7..d063bcc5 100644
--- a/sprout/ctype/wascii.hpp
+++ b/sprout/ctype/wascii.hpp
@@ -22,7 +22,7 @@ namespace sprout {
 		// towlower
 		// towupper
 		//
-		SPROUT_CTYPE_ASCII_DECL(wchar_t, w);
+		SPROUT_CTYPE_ASCII_DECL(wchar_t, w)
 	}	// namespace ascii
 
 	using sprout::ascii::iswalnum;
diff --git a/sprout/cwchar/wcscmp.hpp b/sprout/cwchar/wcscmp.hpp
index 67050b6b..3208a7cb 100644
--- a/sprout/cwchar/wcscmp.hpp
+++ b/sprout/cwchar/wcscmp.hpp
@@ -11,7 +11,7 @@ namespace sprout {
 			: !*s1 ? -1
 			: !*s2 ? 1
 			: *s1 == *s2 ? sprout::wcscmp(s1 + 1, s2 + 1)
-			: static_cast<unsigned wchar_t>(*s1) - static_cast<unsigned wchar_t>(*s2)
+			: *s1 - *s2
 			;
 	}
 }	// namespace sprout
diff --git a/sprout/cwchar/wcsncmp.hpp b/sprout/cwchar/wcsncmp.hpp
index 403c99c7..b2d2f193 100644
--- a/sprout/cwchar/wcsncmp.hpp
+++ b/sprout/cwchar/wcsncmp.hpp
@@ -12,7 +12,7 @@ namespace sprout {
 			: !*s1 ? -1
 			: !*s2 ? 1
 			: *s1 == *s2 ? sprout::wcsncmp(s1 + 1, s2 + 1, n - 1)
-			: static_cast<unsigned wchar_t>(*s1) - static_cast<unsigned wchar_t>(*s2)
+			: *s1 - *s2
 			;
 	}
 }	// namespace sprout
diff --git a/sprout/random/uniform_int_distribution.hpp b/sprout/random/uniform_int_distribution.hpp
index 0969c571..954ae0f5 100644
--- a/sprout/random/uniform_int_distribution.hpp
+++ b/sprout/random/uniform_int_distribution.hpp
@@ -339,7 +339,7 @@ namespace sprout {
 					base_result(eng.min()),
 					base_unsigned(sprout::random::detail::subtract<base_result>()(eng.max(), eng.min()))
 					);
-			};
+			}
 			template<typename Engine, typename T, typename Result>
 			SPROUT_CONSTEXPR sprout::random::detail::generate_uniform_int_result<T, Engine> generate_uniform_int_false_1(
 				Result const& rnd