diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
index 2e00952376d9..22ba0a75ab0b 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
@@ -20,6 +20,7 @@ namespace __sanitizer {
 
 #ifdef _WIN32
 class MemoryMappingLayout {
+ public:
   MemoryMappingLayout() {
     UNIMPLEMENTED();
   }
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
index 5f3ae5b04fc9..f5d3fca1cc8b 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
@@ -77,6 +77,7 @@ bool MemoryRangeIsAvailable(uptr range_start, uptr range_end) {
 
 void *MapFileToMemory(const char *file_name, uptr *buff_size) {
   UNIMPLEMENTED();
+  return 0;
 }
 
 const char *GetEnv(const char *name) {