Fix merge mistake

Author: electricbrass

common/m_fileio_posix.cpp

@@ -33,6 +33,7 @@
 #include "m_fileio.h"
 
 #include <sstream>
+#include <filesystem>
 
 #include <errno.h>
 #include <pwd.h>
@@ -51,6 +52,8 @@
 #include "m_ostring.h"
 #include "w_wad.h"
 
+namespace fs = std::filesystem;
+
 std::string M_GetBinaryDir()
 {
 #if defined(GEKKO)
@@ -139,7 +142,7 @@ std::string M_GetUserDir()
 {
 	fs::path path = M_GetHomeDir();
 	path /= ".odamex";
-	return path;
+	return path.string();
 }
 
 std::string M_GetWriteDir()

common/m_fileio_win32.cpp

@@ -36,9 +36,7 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 
-#include "cmdlib.h"
 #include "i_system.h"
-#include "m_ostring.h"
 
 std::string M_GetBinaryDir()
 {