diff --git a/source/shared_lib/include/platform/common/platform_common.h b/source/shared_lib/include/platform/common/platform_common.h
index 2a7cf0b1b..a6311eaa6 100644
--- a/source/shared_lib/include/platform/common/platform_common.h
+++ b/source/shared_lib/include/platform/common/platform_common.h
@@ -241,8 +241,8 @@ namespace Shared {
 		bool EndsWith(const string &str, const string& key);
 
 		string endPathWithSlash(string &path, bool requireOSSlash = false);
-		void trimPathWithStartingSlash(string &path);
-		void updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true);
+		string trimPathWithStartingSlash(string &path);
+		string updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true);
 		string formatPath(string path);
 
 		string replaceAllHTMLEntities(string& context);
@@ -265,7 +265,6 @@ namespace Shared {
 		void showCursor(bool b);
 		bool isKeyDown(int virtualKey);
 		//bool isKeyDown(SDLKey key);
-		string getCommandLine();
 
 		string getUserHome();
 
diff --git a/source/shared_lib/include/platform/sdl/platform_util.h b/source/shared_lib/include/platform/sdl/platform_util.h
index 2ec1b1cc4..58fd5fbd6 100644
--- a/source/shared_lib/include/platform/sdl/platform_util.h
+++ b/source/shared_lib/include/platform/sdl/platform_util.h
@@ -71,8 +71,6 @@ namespace Shared {
 		void message(const string &message,bool isNonGraphicalModeEnabled, const string &writepath);
 		void exceptionMessage(const exception &excp);
 
-		string getCommandLine();
-
 		// WINDOWS
 		#else
 
@@ -98,11 +96,8 @@ namespace Shared {
 		#if !defined(__GNUC__)
 			virtual void handle(LPEXCEPTION_POINTERS pointers)=0;
 		#endif
-			static string codeToStr(DWORD code);
 		};
 
-		LONG WINAPI UnhandledExceptionFilter2(struct _EXCEPTION_POINTERS *ExceptionInfo);
-
 		// =====================================================
 		//	Misc
 		// =====================================================
@@ -113,7 +108,6 @@ namespace Shared {
 
 		void message(string message, bool isNonGraphicalModeEnabled,const string &writepath);
 		void exceptionMessage(const exception &excp);
-		string getCommandLine();
 		void init_win32();
 		void done_win32();
 		void ontop_win32(int width, int height);
diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp
index ea7cdb720..75c2e0b23 100644
--- a/source/shared_lib/sources/platform/common/platform_common.cpp
+++ b/source/shared_lib/sources/platform/common/platform_common.cpp
@@ -572,14 +572,15 @@ namespace Shared {
 			return path;
 		}
 
-		void trimPathWithStartingSlash(string &path) {
+		string trimPathWithStartingSlash(string &path) {
 			if (StartsWith(path, "/") == true || StartsWith(path, "\\") == true) {
 				path.erase(path.begin(), path.begin() + 1);
 				//printf("************* trimPathWithStartingSlash changed path [%s]\n",path.c_str());
 			}
+			return path;
 		}
 
-		void updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck) {
+		string updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck) {
 			// Update paths with /./
 			string::size_type pos = path.find("/./");
 			if (pos != string::npos && pos != 0) {
@@ -683,6 +684,7 @@ namespace Shared {
 					printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str());
 				}
 			*/
+			return path;
 		}
 
 		string getCRCCacheFilePath() {