diff --git a/include/stdex/base64.hpp b/include/stdex/base64.hpp
index 8e5bf1eea..9cf38d91f 100644
--- a/include/stdex/base64.hpp
+++ b/include/stdex/base64.hpp
@@ -16,14 +16,14 @@
 namespace stdex
 {
 	/// \cond internal
-	static const char base64_enc_lookup[64] = {
+	const char base64_enc_lookup[64] = {
 		'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
 		'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
 		'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
 		'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
 	};
 
-	static const uint8_t base64_dec_lookup[256] = {
+	const uint8_t base64_dec_lookup[256] = {
 	/*           0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F  */
 	/* 0 */    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 	/* 1 */    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
diff --git a/include/stdex/sgml_unicode.hpp b/include/stdex/sgml_unicode.hpp
index ff50adf35..cf7619f1c 100644
--- a/include/stdex/sgml_unicode.hpp
+++ b/include/stdex/sgml_unicode.hpp
@@ -13,7 +13,7 @@ namespace stdex
 		wchar_t unicode[3]; ///< Unicode string representation
 	};
 
-	static const sgml_unicode_pair sgml_unicode[] = {
+	const sgml_unicode_pair sgml_unicode[] = {
 		{ "AElig", L"\u00c6" },
 		{ "Aacgr", L"\u0386" },
 		{ "Aacute", L"\u00c1" },
@@ -1551,7 +1551,7 @@ namespace stdex
 		{ "zwnj", L"\u200c" },
 	};
 
-	static const size_t unicode_sgml[] = {
+	const size_t unicode_sgml[] = {
 		0x5b6,
 		0x48d,
 		0x30d,
diff --git a/include/stdex/string.hpp b/include/stdex/string.hpp
index 93bf29e78..5caad0898 100644
--- a/include/stdex/string.hpp
+++ b/include/stdex/string.hpp
@@ -79,7 +79,7 @@ namespace stdex
 	///
 	/// Reusable C locale
 	///
-	static locale locale_C(create_locale(LC_ALL, "C"));
+	const locale locale_C(create_locale(LC_ALL, "C"));
 
 	///
 	/// UTF-16 code unit
diff --git a/include/stdex/system.hpp b/include/stdex/system.hpp
index 0d0219fc5..03a4d0fc5 100644
--- a/include/stdex/system.hpp
+++ b/include/stdex/system.hpp
@@ -271,11 +271,11 @@ namespace stdex
 }
 
 #ifndef _WIN32
-static constexpr stdex::platform_id IMAGE_FILE_MACHINE_UNKNOWN = nullptr;
-static constexpr stdex::platform_id IMAGE_FILE_MACHINE_I386 = "i386";
-static constexpr stdex::platform_id IMAGE_FILE_MACHINE_AMD64 = "x86_64";
-static constexpr stdex::platform_id IMAGE_FILE_MACHINE_ARMNT = "arm";
-static constexpr stdex::platform_id IMAGE_FILE_MACHINE_ARM64 = "aarch64";
+constexpr stdex::platform_id IMAGE_FILE_MACHINE_UNKNOWN = nullptr;
+constexpr stdex::platform_id IMAGE_FILE_MACHINE_I386 = "i386";
+constexpr stdex::platform_id IMAGE_FILE_MACHINE_AMD64 = "x86_64";
+constexpr stdex::platform_id IMAGE_FILE_MACHINE_ARMNT = "arm";
+constexpr stdex::platform_id IMAGE_FILE_MACHINE_ARM64 = "aarch64";
 #endif
 
 namespace stdex