--- a/make/lib/Awt2dLibraries.gmk	Fri Apr 20 10:02:55 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Fri Apr 20 10:20:36 2018 +0200
@@ -105,17 +105,12 @@
 
 ################################################################################
 
-# FIXME:LIBS -- does not work. :(
-#LIBAWT_DIRS := \
-#    $(call FindSrcDirsForLib, java.desktop, awt) \
-#    $(call FindSrcDirsForComponent, java.desktop, common/awt) \
-#    #
-
 LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \
     $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
     $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
     $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
     #
+
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
 endif
@@ -141,14 +136,15 @@
   LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
 endif
 
-LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  LIBAWT_EXFILES += \
+      java2d/d3d/D3DShaderGen.c \
+      awt/image/cvutils/img_colors.c \
+      #
+endif
 
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
-  LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
-      $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
   LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
-
-  LIBAWT_ASFLAGS = -P -xarch=v9a
 else
   LIBAWT_EXCLUDES += \
       $(TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
@@ -157,23 +153,20 @@
       #
 endif
 
+LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
+
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
+  LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
+      $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
+
+  LIBAWT_ASFLAGS = -P -xarch=v9a
+endif
+
 ifneq ($(OPENJDK_TARGET_OS), solaris)
   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  # Why does libawt need java.base headers?
-  LIBAWT_HEADER_FLAGS += \
-      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
-      -I$(TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(TOPDIR)/src/java.desktop/share/native/include \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-      #
-  LIBAWT_EXFILES += \
-      java2d/d3d/D3DShaderGen.c \
-      awt/image/cvutils/img_colors.c \
-      #
-
   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
     LIBAWT_CFLAGS += -DMLIB_OS64BIT