make/hotspot/lib/CompileJvm.gmk

*** 57,68 ****
      $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \
      -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \
      -I$(TOPDIR)/src/hotspot/share/precompiled \
      -I$(TOPDIR)/src/hotspot/share/include \
      -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
!     -I$(TOPDIR)/src/java.base/share/native/include \
!     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include \
      -I$(TOPDIR)/src/java.base/share/native/libjimage \
      #
  
  # INCLUDE_SUFFIX_* is only meant for including the proper
  # platform files. Don't use it to guard code. Use the value of
--- 57,68 ----
      $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \
      -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \
      -I$(TOPDIR)/src/hotspot/share/precompiled \
      -I$(TOPDIR)/src/hotspot/share/include \
      -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
!     -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
!     -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
      -I$(TOPDIR)/src/java.base/share/native/libjimage \
      #
  
  # INCLUDE_SUFFIX_* is only meant for including the proper
  # platform files. Don't use it to guard code. Use the value of