diff -r 00776cd28457 -r a6cb200daa5d make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -203,7 +203,6 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         -I$(call FindHeaderDirForModule, java.base) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/d3d)) \
@@ -321,7 +320,6 @@
         NAME := awt_xawt, \
         SRC := $(LIBAWT_XAWT_DIRS), \
         HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_xawt/awt)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \
@@ -385,7 +383,6 @@
     CFLAGS_solaris := -xc99=no_lib, \
     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)), \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
@@ -432,8 +429,6 @@
     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
     DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -470,7 +465,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(LIBAWT_HEADLESS_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \
@@ -614,7 +608,6 @@
     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
     CFLAGS_windows = -DCC_NOEX, \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \
@@ -684,7 +677,6 @@
       CXXFLAGS := $(CXXFLAGS_JDKLIB) \
           $(LIBJAWT_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \
@@ -868,7 +860,6 @@
       CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \
@@ -922,7 +913,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(LIBAWT_LWAWT_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/java2d/opengl)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/font)) \
@@ -976,7 +966,6 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \