--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk	Fri Apr 20 20:59:02 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk	Fri Apr 20 21:22:05 2018 +0200
@@ -29,12 +29,12 @@
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
-#FIXME:LIBS - severly broken includes!
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBJ2UCRYPTO, \
       NAME := j2ucrypto, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
+      HEADER_FLAGS := \
+          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
   ))