diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index f8fbe14cc38..c0c78ce95b6 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -560,8 +560,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced -fno-exceptions \
         -qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -Zc:wchar_t-"
   fi
 
   # CFLAGS C language level for JDK sources (hotspot only uses C++)
diff --git a/src/hotspot/os/windows/gc/x/xVirtualMemory_windows.cpp b/src/hotspot/os/windows/gc/x/xVirtualMemory_windows.cpp
index c9c891430fe..a54f1e3cbae 100644
--- a/src/hotspot/os/windows/gc/x/xVirtualMemory_windows.cpp
+++ b/src/hotspot/os/windows/gc/x/xVirtualMemory_windows.cpp
@@ -27,7 +27,7 @@
 #include "gc/x/xLargePages.inline.hpp"
 #include "gc/x/xMapper_windows.hpp"
 #include "gc/x/xSyscall_windows.hpp"
-#include "gc/x/xVirtualMemory.hpp"
+#include "gc/x/xVirtualMemory.inline.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 
diff --git a/src/hotspot/share/gc/x/xPhysicalMemory.cpp b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
index 20902cc05bc..9519ae93ee1 100644
--- a/src/hotspot/share/gc/x/xPhysicalMemory.cpp
+++ b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "gc/x/xArray.inline.hpp"
 #include "gc/x/xGlobals.hpp"
 #include "gc/x/xLargePages.inline.hpp"
+#include "gc/x/xList.inline.hpp"
 #include "gc/x/xNUMA.inline.hpp"
 #include "gc/x/xPhysicalMemory.inline.hpp"
 #include "logging/log.hpp"