--- a/src/java.base/share/native/libjava/io_util.c	Thu Oct 11 13:40:09 2018 +0100
+++ b/src/java.base/share/native/libjava/io_util.c	Thu Oct 11 14:10:13 2018 +0100
@@ -201,7 +201,7 @@
     }
 }
 
-JNIEXPORT void JNICALL
+void
 throwFileNotFoundException(JNIEnv *env, jstring path)
 {
     char buf[256];

--- a/src/java.base/share/native/libjava/io_util.h	Thu Oct 11 13:40:09 2018 +0100
+++ b/src/java.base/share/native/libjava/io_util.h	Thu Oct 11 14:10:13 2018 +0100
@@ -54,8 +54,7 @@
 void writeBytes(JNIEnv *env, jobject this, jbyteArray bytes, jint off,
                 jint len, jboolean append, jfieldID fid);
 void fileOpen(JNIEnv *env, jobject this, jstring path, jfieldID fid, int flags);
-JNIEXPORT void JNICALL
-throwFileNotFoundException(JNIEnv *env, jstring path);
+void throwFileNotFoundException(JNIEnv *env, jstring path);
 
 /*
  * Macros for managing platform strings.  The typical usage pattern is:

--- a/src/java.base/windows/native/libjava/io_util_md.c	Thu Oct 11 13:40:09 2018 +0100
+++ b/src/java.base/windows/native/libjava/io_util_md.c	Thu Oct 11 14:10:13 2018 +0100
@@ -213,8 +213,7 @@
     return pathbuf;
 }
 
-JNIEXPORT FD JNICALL
-winFileHandleOpen(JNIEnv *env, jstring path, int flags)
+FD winFileHandleOpen(JNIEnv *env, jstring path, int flags)
 {
     const DWORD access =
         (flags & O_WRONLY) ?  GENERIC_WRITE :

--- a/src/java.base/windows/native/libjava/io_util_md.h	Thu Oct 11 13:40:09 2018 +0100
+++ b/src/java.base/windows/native/libjava/io_util_md.h	Thu Oct 11 14:10:13 2018 +0100
@@ -56,8 +56,7 @@
  * Returns an opaque handle to file named by "path".  If an error occurs,
  * returns -1 and an exception is pending.
  */
-JNIEXPORT FD JNICALL
-winFileHandleOpen(JNIEnv *env, jstring path, int flags);
+FD winFileHandleOpen(JNIEnv *env, jstring path, int flags);
 
 /*
  * Macros to set/get fd from the java.io.FileDescriptor.

--- a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c	Thu Oct 11 13:40:09 2018 +0100
+++ b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c	Thu Oct 11 14:10:13 2018 +0100
@@ -26,7 +26,7 @@
 
 /*
  *  This file implements a binding between Java and the hsdis
- *  dissasembler.  It should compile on Linux/Solaris and Windows.
+ *  disassembler.  It should compile on Linux/Solaris and Windows.
  *  The only platform dependent pieces of the code for doing
  *  dlopen/dlsym to find the entry point in hsdis.  All the rest is
  *  standard JNI code.