--- a/make/lib/Lib-jdk.crypto.mscapi.gmk	Thu Apr 19 21:21:45 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.mscapi.gmk	Fri Apr 20 09:23:09 2018 +0200
@@ -29,11 +29,12 @@
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-#FIXME:LIBS severly broken includes!
   $(eval $(call SetupJdkLibrary, BUILD_LIBSUNMSCAPI, \
       NAME := sunmscapi, \
       OPTIMIZATION := LOW, \
       CXXFLAGS := $(CXXFLAGS_JDKLIB), \
+      HEADER_FLAGS := \
+          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := crypt32.lib advapi32.lib, \