Improve handling main() with UTF-8 args on Windows

3 files changed, 4 insertions, 5 deletions

diff --git a/utils/makemhr/makemhr.cpp b/utils/makemhr/makemhr.cpp
index ba1d5d68..96823745 100644
--- a/utils/makemhr/makemhr.cpp
+++ b/utils/makemhr/makemhr.cpp
@@ -1534,8 +1534,6 @@ int main(int argc, char *argv[])
     double limit;
     int opt;
 
-    GET_UNICODE_ARGS(&argc, &argv);
-
     if(argc < 2)
     {
         fprintf(stdout, "HRTF Processing and Composition Utility\n\n");
diff --git a/utils/openal-info.c b/utils/openal-info.c
index 46e66d45..1788d118 100644
--- a/utils/openal-info.c
+++ b/utils/openal-info.c
@@ -31,6 +31,9 @@
 #include "AL/al.h"
 #include "AL/alext.h"
 
+#include "win_main_utf8.h"
+
+
 #ifndef ALC_ENUMERATE_ALL_EXT
 #define ALC_DEFAULT_ALL_DEVICES_SPECIFIER        0x1012
 #define ALC_ALL_DEVICES_SPECIFIER                0x1013
diff --git a/utils/sofa-info.cpp b/utils/sofa-info.cpp
index 6117b1e6..26a2ee3f 100644
--- a/utils/sofa-info.cpp
+++ b/utils/sofa-info.cpp
@@ -27,10 +27,10 @@
 #include <vector>
 
 #include "sofa-support.h"
-#include "win_main_utf8.h"
 
 #include "mysofa.h"
 
+#include "win_main_utf8.h"
 
 using uint = unsigned int;
 
@@ -118,8 +118,6 @@ static void SofaInfo(const char *filename)
 
 int main(int argc, char *argv[])
 {
-    GET_UNICODE_ARGS(&argc, &argv);
-
     if(argc != 2)
     {
         fprintf(stdout, "Usage: %s <sofa-file>\n", argv[0]);