3 files changed, 41 insertions, 35 deletions
diff --git a/common/dynload.cpp b/common/dynload.cpp
index 98d2c521..f1c2a7eb 100644
--- a/common/dynload.cpp
+++ b/common/dynload.cpp
@@ -6,6 +6,8 @@
 #include "strutils.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 void *LoadLib(const char *name)
 {
@@ -39,5 +41,4 @@ void *GetSymbol(void *handle, const char *name)
     if(err) sym = nullptr;
     return sym;
 }
-
 #endif
diff --git a/common/strutils.cpp b/common/strutils.cpp
index 0163de7b..870a0ed3 100644
--- a/common/strutils.cpp
+++ b/common/strutils.cpp
@@ -6,6 +6,41 @@
 #include <cstdlib>
 
 
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+std::string wstr_to_utf8(const WCHAR *wstr)
+{
+    std::string ret;
+
+    int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
+    if(len > 0)
+    {
+        ret.resize(len);
+        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &ret[0], len, nullptr, nullptr);
+        ret.pop_back();
+    }
+
+    return ret;
+}
+
+std::wstring utf8_to_wstr(const char *str)
+{
+    std::wstring ret;
+
+    int len = MultiByteToWideChar(CP_UTF8, 0, str, -1, nullptr, 0);
+    if(len > 0)
+    {
+        ret.resize(len);
+        MultiByteToWideChar(CP_UTF8, 0, str, -1, &ret[0], len);
+        ret.pop_back();
+    }
+
+    return ret;
+}
+#endif
+
 namespace al {
 
 al::optional<std::string> getenv(const char *envname)
diff --git a/common/strutils.h b/common/strutils.h
index db9b07c6..0c7a0e22 100644
--- a/common/strutils.h
+++ b/common/strutils.h
@@ -6,47 +6,17 @@
 #include "aloptional.h"
 
 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-
-inline std::string wstr_to_utf8(const WCHAR *wstr)
-{
-    std::string ret;
-
-    int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
-    if(len > 0)
-    {
-        ret.resize(len);
-        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &ret[0], len, nullptr, nullptr);
-        ret.pop_back();
-    }
-
-    return ret;
-}
-
-inline std::wstring utf8_to_wstr(const char *str)
-{
-    std::wstring ret;
-
-    int len = MultiByteToWideChar(CP_UTF8, 0, str, -1, nullptr, 0);
-    if(len > 0)
-    {
-        ret.resize(len);
-        MultiByteToWideChar(CP_UTF8, 0, str, -1, &ret[0], len);
-        ret.pop_back();
-    }
-
-    return ret;
-}
+#include <wchar.h>
 
+std::string wstr_to_utf8(const wchar_t *wstr);
+std::wstring utf8_to_wstr(const char *str);
 #endif
 
 namespace al {
 
 al::optional<std::string> getenv(const char *envname);
 #ifdef _WIN32
-al::optional<std::wstring> getenv(const WCHAR *envname);
+al::optional<std::wstring> getenv(const wchar_t *envname);
 #endif
 
 } // namespace al