diff -r f4048e6f33ba -r a28c4627d44c make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Fri May 04 01:35:03 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Fri May 04 01:42:32 2018 +0200
@@ -74,7 +74,7 @@
   LIBMLIB_IMAGE_V_SRC := \
      libmlib_image \
      common/awt/medialib \
-    #
+     #
 
   LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
       $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
@@ -83,7 +83,6 @@
     LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
   endif
 
-
   BUILD_LIBMLIB_IMAGE_V_EXFILES := \
       awt_ImagingLib.c \
       mlib_c_ImageAffine_BC.c \
@@ -165,6 +164,21 @@
       #
 endif
 
+LIBAWT_EXTRA_HEADER_DIRS := \
+    $(LIBAWT_DEFAULT_HEADER_DIRS) \
+    $(call GetJavaHeaderDir, java.base) \
+    libawt/awt/medialib \
+    libawt/java2d/d3d \
+    libawt/java2d/opengl \
+    libawt/java2d/windows \
+    libawt/windows \
+    common/awt/medialib \
+    libmlib_image \
+    include \
+    java.base:libjava \
+    java.base:include \
+    #
+
 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
 
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
@@ -202,21 +216,6 @@
   LIBAWT_CFLAGS += -fgcse-after-reload
 endif
 
-LIBAWT_EXTRA_HEADER_DIRS := \
-    $(LIBAWT_DEFAULT_HEADER_DIRS) \
-    $(call GetJavaHeaderDir, java.base) \
-    libawt/awt/medialib \
-    libawt/java2d/d3d \
-    libawt/java2d/opengl \
-    libawt/java2d/windows \
-    libawt/windows \
-    common/awt/medialib \
-    libmlib_image \
-    include \
-    java.base:libjava \
-    java.base:include \
-    #
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     NAME := awt, \
     EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \