make/gensrc/GensrcX11Wrappers.gmk

*** 1,7 ****
  #
! # Copyright (c) 2012, 2014, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2012, 2017, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 90,101 ****
    ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
      MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
    endif
  
    SIZER_CFLAGS := \
        -I$(TOPDIR)/src/java.base/share/native/include \
!       -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \
        -I$(TOPDIR)/src/java.base/share/native/libjava \
        -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
        -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
--- 90,103 ----
    ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
      MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
    endif
  
    SIZER_CFLAGS := \
+       -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/libjava \
        -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
        -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \