--- a/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h	Tue Feb 13 12:39:56 2018 +0100
+++ b/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h	Tue Feb 13 13:02:19 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #ifndef __ORIG_MLIB_IMAGE_PROTO_H
 #define __ORIG_MLIB_IMAGE_PROTO_H
 
+#include "jni.h"
 #include <mlib_types.h>
 #include <mlib_status.h>
 #include <mlib_image_types.h>
@@ -43,12 +44,6 @@
 #endif // __USE_J2D_NAMES
 
 #if defined ( _MSC_VER )
-#define J2D_MLIB_PUBLIC __declspec(dllexport)
-#else
-#define J2D_MLIB_PUBLIC
-#endif /* _MSC_VER */
-
-#if defined ( _MSC_VER )
 #if ! defined ( __MEDIALIB_OLD_NAMES )
 #define __MEDIALIB_OLD_NAMES
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -1059,7 +1054,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageCreate mlib_ImageCreate
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 mlib_image * __mlib_ImageCreate(mlib_type type,
                                 mlib_s32 channels,
                                 mlib_s32 width,
@@ -1069,7 +1064,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageCreateStruct mlib_ImageCreateStruct
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 mlib_image * __mlib_ImageCreateStruct(mlib_type type,
                                       mlib_s32 channels,
                                       mlib_s32 width,
@@ -1091,7 +1086,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageDelete mlib_ImageDelete
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 void  __mlib_ImageDelete(mlib_image *img);
 
 
@@ -1421,7 +1416,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageAffine mlib_ImageAffine
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 mlib_status  __mlib_ImageAffine(mlib_image *dst,
                                 const mlib_image *src,
                                 const mlib_d64 *mtx,
@@ -2302,7 +2297,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageLookUp mlib_ImageLookUp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 mlib_status  __mlib_ImageLookUp(mlib_image *dst,
                                 const mlib_image *src,
                                 const void **table);
@@ -2631,7 +2626,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvKernelConvert mlib_ImageConvKernelConvert
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 mlib_status  __mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
                                            mlib_s32 *iscale,
                                            const mlib_d64 *fkernel,
@@ -2643,7 +2638,7 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvMxN mlib_ImageConvMxN
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
+JNIEXPORT
 mlib_status  __mlib_ImageConvMxN(mlib_image *dst,
                                  const mlib_image *src,
                                  const mlib_s32 *kernel,