diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 28f26b280b34..33c65e4f8f15 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -244,6 +244,7 @@ endif
 common_sources = \
 	$(platform_sources)	\
 	$(unity_sources)	\
+	oop.c	\
 	appdomain.c	\
 	assembly-load-context.c	\
 	domain.c	\
diff --git a/mono/metadata/oop.c b/mono/metadata/oop.c
index bcf1c1f3ce7a..5354ecf96314 100644
--- a/mono/metadata/oop.c
+++ b/mono/metadata/oop.c
@@ -110,7 +110,7 @@ gsize read_nt_string(char* buffer, gsize max_size, const void* address)
     }
 
     // Ensure there's a null-terminator
-    buffer[min(read, max_size-1)] = '\0';
+    buffer[MIN(read, max_size-1)] = '\0';
 
     return read;
 }
@@ -425,7 +425,7 @@ mono_unity_oop_get_stack_frame_details(
         const MonoMethod* method = read_pointer(OFFSET_MEMBER(MonoJitInfo, ji, d.method));
         const MonoClass* klass = read_pointer(OFFSET_MEMBER(MonoMethod, method, klass));
         const MonoImage* image = read_pointer(OFFSET_MEMBER(MonoClass, klass, image));
-        size_t classNameLen = max(frameDetails->classNameLen, 256);
+        size_t classNameLen = MAX(frameDetails->classNameLen, 256);
         char* className = (char*)malloc(classNameLen);
         char* nsName = (char*)malloc(classNameLen);
 
@@ -446,14 +446,14 @@ mono_unity_oop_get_stack_frame_details(
                 read_pointer(OFFSET_MEMBER(MonoClass, klass, name)));
             
             if (*nsName) {
-                frameDetails->classNameLen = sprintf_s(
+                frameDetails->classNameLen = g_snprintf(
                     frameDetails->className,
                     frameDetails->classNameLen,
                     "%s.%s",
                     nsName,
                     className);
             } else {
-                frameDetails->classNameLen = sprintf_s(
+                frameDetails->classNameLen = g_snprintf(
                     frameDetails->className,
                     frameDetails->classNameLen,
                     "%s",