--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp	Thu Jun 07 15:01:13 2018 +0200
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp	Thu Jun 07 15:07:38 2018 +0200
@@ -37,8 +37,13 @@
 #include <wincrypt.h>
 #include <stdio.h>
 #include <memory>
+#include "sun_security_mscapi_Key.h"
+#include "sun_security_mscapi_KeyStore.h"
 #include "sun_security_mscapi_PRNG.h"
-// FIXME:LIBS many more!
+#include "sun_security_mscapi_RSACipher.h"
+#include "sun_security_mscapi_RSAKeyPairGenerator.h"
+#include "sun_security_mscapi_RSAPublicKey.h"
+#include "sun_security_mscapi_RSASignature.h"
 
 #define OID_EKU_ANY         "2.5.29.37.0"
 

--- a/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c	Thu Jun 07 15:01:13 2018 +0200
+++ b/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c	Thu Jun 07 15:07:38 2018 +0200
@@ -30,13 +30,13 @@
 #include "jni_util.h"
 #include "nativeCrypto.h"
 #include "nativeFunc.h"
-#include "com_oracle_security_ucrypto_UcryptoProvider.h"
+#include "com_oracle_security_ucrypto_NativeCipher.h"
 #include "com_oracle_security_ucrypto_NativeDigest.h"
-#include "com_oracle_security_ucrypto_NativeCipher.h"
+#include "com_oracle_security_ucrypto_NativeKey.h"
 #include "com_oracle_security_ucrypto_NativeKey.h"
+#include "com_oracle_security_ucrypto_NativeRSACipher.h"
 #include "com_oracle_security_ucrypto_NativeRSASignature.h"
-#include "com_oracle_security_ucrypto_NativeRSACipher.h"
-#include "com_oracle_security_ucrypto_NativeKey.h"
+#include "com_oracle_security_ucrypto_UcryptoProvider.h"
 
 /*
  * Dumps out byte array in hex with and name and length info